diff --git a/.browserslistrc b/.browserslistrc
index 54dd3aaf34..0376af4bcc 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -1,7 +1,9 @@
 [production]
 defaults
-not IE 11
+> 0.2%
+ios >= 15.6
 not dead
+not OperaMini all
 
 [development]
 supports es6-module
diff --git a/.bundler-audit.yml b/.bundler-audit.yml
new file mode 100644
index 0000000000..9c4d4511f1
--- /dev/null
+++ b/.bundler-audit.yml
@@ -0,0 +1,8 @@
+---
+ignore:
+  # devise-two-factor advisory about brute-forcing TOTP
+  # We have rate-limits on authentication endpoints in place (including second
+  # factor verification) since Mastodon v3.2.0
+  - CVE-2024-0227
+  - CVE-2024-27456
+  - CVE-2023-51774
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 21ee078d60..97331f74ea 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.3
+    image: libretranslate/libretranslate:v1.5.7
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000000..0330da8377
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,4 @@
+# Required by ActiveRecord encryption feature
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
diff --git a/.env.test b/.env.test
index 2f8c1afd6e..539bdeb795 100644
--- a/.env.test
+++ b/.env.test
@@ -3,3 +3,10 @@ NODE_ENV=production
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
+# Elasticsearch
+ES_PREFIX=test
+
+# Required by ActiveRecord encryption feature
+ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
+ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
+ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
diff --git a/.eslintrc.js b/.eslintrc.js
index 1b36bcee25..759003b55e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -123,7 +123,7 @@ module.exports = defineConfig({
     'react/react-in-jsx-scope': 'off', // not needed with new JSX transform
     'react/self-closing-comp': 'error',
 
-    // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/src/index.js
+    // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.8.0/src/index.js#L46
     'jsx-a11y/accessible-emoji': 'warn',
     'jsx-a11y/click-events-have-key-events': 'off',
     'jsx-a11y/label-has-associated-control': 'off',
@@ -165,7 +165,7 @@ module.exports = defineConfig({
     //   },
     // ],
     'jsx-a11y/no-noninteractive-tabindex': 'off',
-    'jsx-a11y/no-onchange': 'warn',
+    'jsx-a11y/no-onchange': 'off',
     // recommended is full 'error'
     'jsx-a11y/no-static-element-interactions': [
       'warn',
@@ -176,7 +176,7 @@ module.exports = defineConfig({
       },
     ],
 
-    // See https://github.com/import-js/eslint-plugin-import/blob/main/config/recommended.js
+    // See https://github.com/import-js/eslint-plugin-import/blob/v2.29.1/config/recommended.js
     'import/extensions': [
       'error',
       'always',
@@ -338,7 +338,6 @@ module.exports = defineConfig({
         'plugin:import/typescript',
         'plugin:promise/recommended',
         'plugin:jsdoc/recommended-typescript',
-        'plugin:prettier/recommended',
       ],
 
       parserOptions: {
@@ -347,6 +346,9 @@ module.exports = defineConfig({
       },
 
       rules: {
+        // Disable formatting rules that have been enabled in the base config
+        'indent': 'off',
+
         'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
 
         '@typescript-eslint/consistent-type-definitions': ['warn', 'interface'],
@@ -361,6 +363,7 @@ module.exports = defineConfig({
             "message": "Use typed hooks `useAppDispatch` and `useAppSelector` instead."
           }
         ],
+        "@typescript-eslint/restrict-template-expressions": ['warn', { allowNumber: true }],
         'jsdoc/require-jsdoc': 'off',
 
         // Those rules set stricter rules for TS files
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..fa7a0c5353
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://fantia.jp/fanclubs/484677
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
new file mode 100644
index 0000000000..10421eed7b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -0,0 +1,74 @@
+name: バグ報告
+description: kmyblueのバグ報告（ただし情報改竄、秘密情報の漏洩、システムの破損などが発生するバグは、こちらではなく「Security」タブよりセキュリティインシデントとして報告してください）
+labels: [bug]
+body:
+  - type: textarea
+    attributes:
+      label: バグの再現手順
+      description: どのように操作したらバグが発生したのか、バグが発生する直前までの手順を順番に詳しく教えてください
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 期待する動作
+      description: どのように動いてほしかったですか？
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 実際の動作
+      description: どのようなバグが発生しましたか？
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 詳しい情報
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: バグが発生したkmyblueサーバーのドメイン
+      description: サーバー固有の問題の可能性もありますので、プライバシー上可能な範囲内で、できるだけ書いてください
+      placeholder: kmy.blue
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: バグが発生したkmyblueのバージョン
+      description: |
+        Mastodonではなくkmyblueのバージョンを記述してください。例えばバージョン表記が `v4.2.0+kmyblue.5.1-LTS` の場合、バージョンは `5.1`になります
+
+        バージョンは、PCだと画面左下、スマホだと概要画面の一番下に書いてあります
+      placeholder: '5.1'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: ブラウザの名前
+      description: |
+        ブラウザの名前を書いてください。可能であればバージョンも併記してください
+      placeholder: Firefox 105.0.3
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: OS
+      description: |
+        あなたのOSと、できればバージョンも教えてください。スマホの場合は、「Android」「iPhone」にバージョンをつけてください
+      placeholder: Windows11
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: その他の詳細情報
+      description: |
+        あなたの環境が特殊な場合、詳しいことを教えてください（例: VPS、tor、学内LANなど）
+
+        サーバー管理者の場合は、Ruby、Node.jsのバージョン、Cloudflareの使用可否なども可能なら書いてください
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml b/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
deleted file mode 100644
index 20e27d103c..0000000000
--- a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Bug Report (Web Interface)
-description: If you are using Mastodon's web interface and something is not working as expected
-labels: [bug, 'status/to triage', 'area/web interface']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Make sure that you are submitting a new bug that was not previously reported or already fixed.
-
-        Please use a concise and distinct title for the issue.
-  - type: textarea
-    attributes:
-      label: Steps to reproduce the problem
-      description: What were you trying to do?
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Expected behaviour
-      description: What should have happened?
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Actual behaviour
-      description: What happened?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Detailed description
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Mastodon instance
-      description: The address of the Mastodon instance where you experienced the issue
-      placeholder: mastodon.social
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Mastodon version
-      description: |
-        This is displayed at the bottom of the About page, eg. `v4.1.2+nightly-20230627`
-      placeholder: v4.1.2
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Browser name and version
-      description: |
-        What browser are you using when getting this bug? Please specify the version as well.
-      placeholder: Firefox 105.0.3
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Operating system
-      description: |
-        What OS are you running? Please specify the version as well.
-      placeholder: macOS 13.4.1
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Technical details
-      description: |
-        Any additional technical details you may have. This can include the full error log, inspector's output…
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
new file mode 100644
index 0000000000..10fb4bb23b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -0,0 +1,16 @@
+name: 機能要望
+description: 機能の提案
+labels: [enhancement]
+body:
+  - type: textarea
+    attributes:
+      label: 欲しい機能
+      description: 欲しい機能の詳細を書いてください
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 必要性
+      description: この機能はあなたにとってなぜ必要でしょうか？どういった状況で使われるものですか？
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
deleted file mode 100644
index 49d5f57209..0000000000
--- a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Bug Report (server / API)
-description: |
-  If something is not working as expected, but is not from using the web interface.
-labels: [bug, 'status/to triage']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Make sure that you are submitting a new bug that was not previously reported or already fixed.
-
-        Please use a concise and distinct title for the issue.
-  - type: textarea
-    attributes:
-      label: Steps to reproduce the problem
-      description: What were you trying to do?
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Expected behaviour
-      description: What should have happened?
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Actual behaviour
-      description: What happened?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Detailed description
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Mastodon instance
-      description: The address of the Mastodon instance where you experienced the issue
-      placeholder: mastodon.social
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: Mastodon version
-      description: |
-        This is displayed at the bottom of the About page, eg. `v4.1.2+nightly-20230627`
-      placeholder: v4.1.2
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Technical details
-      description: |
-        Any additional technical details you may have, like logs or error traces
-      value: |
-        If this is happening on your own Mastodon server, please fill out those:
-        - Ruby version: (from `ruby --version`, eg. v3.1.2)
-        - Node.js version: (from `node --version`, eg. v18.16.0)
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/3.feature_request.yml b/.github/ISSUE_TEMPLATE/3.feature_request.yml
deleted file mode 100644
index 2cabcf61e0..0000000000
--- a/.github/ISSUE_TEMPLATE/3.feature_request.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Feature Request
-description: I have a suggestion
-labels: [suggestion]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Please use a concise and distinct title for the issue.
-
-        Consider: Could it be implemented as a 3rd party app using the REST API instead?
-  - type: textarea
-    attributes:
-      label: Pitch
-      description: Describe your idea for a feature. Make sure it has not already been suggested/implemented/turned down before.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Why do you think this feature is needed? Who would benefit from it?
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/3.spec_change_request.yml b/.github/ISSUE_TEMPLATE/3.spec_change_request.yml
new file mode 100644
index 0000000000..e71befe859
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3.spec_change_request.yml
@@ -0,0 +1,28 @@
+name: 仕様変更・改善要望
+description: 既存の仕様や挙動変更の要望
+labels: [specchange]
+body:
+  - type: markdown
+    attributes:
+      value: 意図したものとは明らかに異なる挙動をしているものはバグとして、もともと仕様として決められた動きをしているものを変更したいときはこちらでお願いします
+  - type: textarea
+    attributes:
+      label: 挙動を変更してほしい機能や動作
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 現在の挙動
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 変更してほしい新しい挙動
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 必要性
+      description: この変更はあなたにとってなぜ必要でしょうか？どういった状況で使われるものですか？
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index f5d3196528..0086358db1 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1 @@
-blank_issues_enabled: false
-contact_links:
-  - name: GitHub Discussions
-    url: https://github.com/mastodon/mastodon/discussions
-    about: Please ask and answer questions here.
+blank_issues_enabled: true
diff --git a/.github/actions/setup-javascript/action.yml b/.github/actions/setup-javascript/action.yml
index 07fd4d08d3..808adc7de6 100644
--- a/.github/actions/setup-javascript/action.yml
+++ b/.github/actions/setup-javascript/action.yml
@@ -23,7 +23,7 @@ runs:
       shell: bash
       run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
diff --git a/.github/codecov.yml b/.github/codecov.yml
index 5532c49618..9d6413a106 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,3 +1,4 @@
+comment: false # Do not leave PR comments
 coverage:
   status:
     project:
@@ -8,6 +9,3 @@ coverage:
       default:
         # Github status check is not blocking
         informational: true
-comment:
-  # Only write a comment in PR if there are changes
-  require_changes: true
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index dab99829a1..378d4fc83c 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -125,6 +125,29 @@
       ],
       groupName: null, // We dont want them to belong to any group
     },
+    {
+      // Group all RuboCop packages with `rubocop` in the same PR
+      matchManagers: ['bundler'],
+      matchPackageNames: ['rubocop'],
+      matchPackagePrefixes: ['rubocop-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'RuboCop (non-major)',
+    },
+    {
+      // Group all RSpec packages with `rspec` in the same PR
+      matchManagers: ['bundler'],
+      matchPackageNames: ['rspec'],
+      matchPackagePrefixes: ['rspec-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'RSpec (non-major)',
+    },
+    {
+      // Group all opentelemetry-ruby packages in the same PR
+      matchManagers: ['bundler'],
+      matchPackagePrefixes: ['opentelemetry-'],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'opentelemetry-ruby (non-major)',
+    },
     // Add labels depending on package manager
     { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] },
     { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] },
diff --git a/.github/stylelint-matcher.json b/.github/stylelint-matcher.json
deleted file mode 100644
index cdfd4086bd..0000000000
--- a/.github/stylelint-matcher.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "problemMatcher": [
-    {
-      "owner": "stylelint",
-      "pattern": [
-        {
-          "regexp": "^([^\\s].*)$",
-          "file": 1
-        },
-        {
-          "regexp": "^\\s+((\\d+):(\\d+))?\\s+(✖|×)\\s+(.*)\\s{2,}(.*)$",
-          "line": 2,
-          "column": 3,
-          "message": 5,
-          "code": 6,
-          "loop": true
-        }
-      ]
-    }
-  ]
-}
diff --git a/.github/workflows/build-container-image.yml b/.github/workflows/build-container-image.yml
deleted file mode 100644
index e100e15821..0000000000
--- a/.github/workflows/build-container-image.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      platforms:
-        required: true
-        type: string
-      cache:
-        type: boolean
-        default: true
-      use_native_arm64_builder:
-        type: boolean
-      push_to_images:
-        type: string
-      version_prerelease:
-        type: string
-      version_metadata:
-        type: string
-      flavor:
-        type: string
-      tags:
-        type: string
-      labels:
-        type: string
-      file_to_build:
-        type: string
-
-jobs:
-  build-image:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: docker/setup-qemu-action@v3
-        if: contains(inputs.platforms, 'linux/arm64') && !inputs.use_native_arm64_builder
-
-      - uses: docker/setup-buildx-action@v3
-        id: buildx
-        if: ${{ !(inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')) }}
-
-      - name: Start a local Docker Builder
-        if: inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')
-        run: |
-          docker run --rm -d --name buildkitd -p 1234:1234 --privileged moby/buildkit:latest --addr tcp://0.0.0.0:1234
-
-      - uses: docker/setup-buildx-action@v3
-        id: buildx-native
-        if: inputs.use_native_arm64_builder && contains(inputs.platforms, 'linux/arm64')
-        with:
-          driver: remote
-          endpoint: tcp://localhost:1234
-          platforms: linux/amd64
-          append: |
-            - endpoint: tcp://${{ vars.DOCKER_BUILDER_HETZNER_ARM64_01_HOST }}:13865
-              platforms: linux/arm64
-              name: mastodon-docker-builder-arm64-01
-              driver-opts:
-                - servername=mastodon-docker-builder-arm64-01
-        env:
-          BUILDER_NODE_1_AUTH_TLS_CACERT: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_CACERT }}
-          BUILDER_NODE_1_AUTH_TLS_CERT: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_CERT }}
-          BUILDER_NODE_1_AUTH_TLS_KEY: ${{ secrets.DOCKER_BUILDER_HETZNER_ARM64_01_KEY }}
-
-      - name: Log in to Docker Hub
-        if: contains(inputs.push_to_images, 'tootsuite')
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Log in to the Github Container registry
-        if: contains(inputs.push_to_images, 'ghcr.io')
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: docker/metadata-action@v5
-        id: meta
-        if: ${{ inputs.push_to_images != '' }}
-        with:
-          images: ${{ inputs.push_to_images }}
-          flavor: ${{ inputs.flavor }}
-          tags: ${{ inputs.tags }}
-          labels: ${{ inputs.labels }}
-
-      - uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ inputs.file_to_build }}
-          build-args: |
-            MASTODON_VERSION_PRERELEASE=${{ inputs.version_prerelease }}
-            MASTODON_VERSION_METADATA=${{ inputs.version_metadata }}
-          platforms: ${{ inputs.platforms }}
-          provenance: false
-          builder: ${{ steps.buildx.outputs.name || steps.buildx-native.outputs.name }}
-          push: ${{ inputs.push_to_images != '' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: ${{ inputs.cache && 'type=gha' || '' }}
-          cache-to: ${{ inputs.cache && 'type=gha,mode=max' || '' }}
diff --git a/.github/workflows/build-push-pr.yml b/.github/workflows/build-push-pr.yml
deleted file mode 100644
index 72baed5121..0000000000
--- a/.github/workflows/build-push-pr.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Build container image for PR
-on:
-  pull_request:
-    types: [labeled, synchronize, reopened, ready_for_review, opened]
-
-permissions:
-  contents: read
-  packages: write
-
-jobs:
-  compute-suffix:
-    runs-on: ubuntu-latest
-    # This is only allowed to run if:
-    # - the PR branch is in the `mastodon/mastodon` repository
-    # - the PR is not a draft
-    # - the PR has the "build-image" label
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'build-image') }}
-    steps:
-      # Repository needs to be cloned so `git rev-parse` below works
-      - name: Clone repository
-        uses: actions/checkout@v4
-      - id: version_vars
-        run: |
-          echo mastodon_version_metadata=pr-${{ github.event.pull_request.number }}-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
-    outputs:
-      metadata: ${{ steps.version_vars.outputs.mastodon_version_metadata }}
-
-  build-image:
-    needs: compute-suffix
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
-      push_to_images: |
-        ghcr.io/mastodon/mastodon
-      version_metadata: ${{ needs.compute-suffix.outputs.metadata }}
-      flavor: |
-        latest=auto
-      tags: |
-        type=ref,event=pr
-    secrets: inherit
-
-  build-image-streaming:
-    needs: compute-suffix
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
-      push_to_images: |
-        ghcr.io/mastodon/mastodon-streaming
-      version_metadata: ${{ needs.compute-suffix.outputs.metadata }}
-      flavor: |
-        latest=auto
-      tags: |
-        type=ref,event=pr
-    secrets: inherit
diff --git a/.github/workflows/build-releases.yml b/.github/workflows/build-releases.yml
deleted file mode 100644
index 3f0bef32ac..0000000000
--- a/.github/workflows/build-releases.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Build container release images
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: read
-  packages: write
-
-jobs:
-  build-image:
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
-      push_to_images: |
-        tootsuite/mastodon
-        ghcr.io/mastodon/mastodon
-      # Do not use cache when building releases, so apt update is always ran and the release always contain the latest packages
-      cache: false
-      # Only tag with latest when ran against the latest stable branch
-      # This needs to be updated after each minor version release
-      flavor: |
-        latest=${{ startsWith(github.ref, 'refs/tags/v4.2.') }}
-      tags: |
-        type=pep440,pattern={{raw}}
-        type=pep440,pattern=v{{major}}.{{minor}}
-    secrets: inherit
-
-  build-image-streaming:
-    if: startsWith(github.ref, 'refs/tags/v4.3.')
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
-      push_to_images: |
-        tootsuite/mastodon-streaming
-        ghcr.io/mastodon/mastodon-streaming
-      # Do not use cache when building releases, so apt update is always ran and the release always contain the latest packages
-      cache: false
-      # Only tag with latest when ran against the latest stable branch
-      # This needs to be updated after each minor version release
-      flavor: |
-        latest=${{ startsWith(github.ref, 'refs/tags/v4.3.') }}
-      tags: |
-        type=pep440,pattern={{raw}}
-        type=pep440,pattern=v{{major}}.{{minor}}
-    secrets: inherit
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-security.yml
similarity index 83%
rename from .github/workflows/build-nightly.yml
rename to .github/workflows/build-security.yml
index 7c6f74b457..1e2455d3d9 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-security.yml
@@ -1,8 +1,6 @@
-name: Build nightly container image
+name: Build security nightly container image
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
 
 permissions:
   contents: read
@@ -17,7 +15,7 @@ jobs:
         env:
           TZ: Etc/UTC
         run: |
-          echo mastodon_version_prerelease=nightly.$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT
+          echo mastodon_version_prerelease=nightly.$(date --date='next day' +'%Y-%m-%d')-security>> $GITHUB_OUTPUT
     outputs:
       prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }}
 
@@ -40,7 +38,7 @@ jobs:
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
-        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+        type=raw,value=${{ needs.compute-suffix.outputs.prerelease }}
     secrets: inherit
 
   build-image-streaming:
@@ -62,5 +60,5 @@ jobs:
       tags: |
         type=raw,value=edge
         type=raw,value=nightly
-        type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }}
+        type=raw,value=${{ needs.compute-suffix.outputs.prerelease }}
     secrets: inherit
diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml
deleted file mode 100644
index d3988d2f1a..0000000000
--- a/.github/workflows/crowdin-download.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Crowdin / Download translations
-on:
-  schedule:
-    - cron: '17 4 * * *' # Every day
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  download-translations:
-    runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Increase Git http.postBuffer
-        # This is needed due to a bug in Ubuntu's cURL version?
-        # See https://github.com/orgs/community/discussions/55820
-        run: |
-          git config --global http.version HTTP/1.1
-          git config --global http.postBuffer 157286400
-
-      # Download the translation files from Crowdin
-      - name: crowdin action
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          crowdin_branch_name: main
-          push_translations: false
-          create_pull_request: false
-        env:
-          CROWDIN_PROJECT_ID: ${{ vars.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-      # As the files are extracted from a Docker container, they belong to root:root
-      # We need to fix this before the next steps
-      - name: Fix file permissions
-        run: sudo chown -R runner:docker .
-
-      # This is needed to run the normalize step
-      - name: Set up Ruby environment
-        uses: ./.github/actions/setup-ruby
-
-      - name: Run i18n normalize task
-        run: bundle exec i18n-tasks normalize
-
-      # Create or update the pull request
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5.0.2
-        with:
-          commit-message: 'New Crowdin translations'
-          title: 'New Crowdin Translations (automated)'
-          author: 'GitHub Actions <noreply@github.com>'
-          body: |
-            New Crowdin translations, automated with Github Actions
-
-            See `.github/workflows/crowdin-download.yml`
-
-            This PR will be updated every day with new translations.
-
-            Due to a limitation in Github Actions, checks are not running on this PR without manual action.
-            If you want to run the checks, then close and re-open it.
-          branch: i18n/crowdin/translations
-          base: main
-          labels: i18n
diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
deleted file mode 100644
index 705af12c02..0000000000
--- a/.github/workflows/crowdin-upload.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Crowdin / Upload translations
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - crowdin.yml
-      - app/javascript/mastodon/locales/en.json
-      - config/locales/en.yml
-      - config/locales/simple_form.en.yml
-      - config/locales/activerecord.en.yml
-      - config/locales/devise.en.yml
-      - config/locales/doorkeeper.en.yml
-      - .github/workflows/crowdin-upload.yml
-
-jobs:
-  upload-translations:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: crowdin action
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: true
-          upload_translations: false
-          download_translations: false
-          crowdin_branch_name: main
-
-        env:
-          CROWDIN_PROJECT_ID: ${{ vars.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
new file mode 100644
index 0000000000..2d483b5022
--- /dev/null
+++ b/.github/workflows/format-check.yml
@@ -0,0 +1,18 @@
+name: Check formatting
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Set up Javascript environment
+        uses: ./.github/actions/setup-javascript
+
+      - name: Check formatting with Prettier
+        run: yarn format:check
diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
index 7229bec582..d3b8035cd8 100644
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@@ -38,9 +38,5 @@ jobs:
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
 
-      - uses: xt0rted/stylelint-problem-matcher@v1
-
-      - run: echo "::add-matcher::.github/stylelint-matcher.json"
-
       - name: Stylelint
-        run: yarn lint:sass
+        run: yarn lint:css -f github
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index 8dcab845ee..25615b720d 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -36,4 +36,4 @@ jobs:
       - name: Run haml-lint
         run: |
           echo "::add-matcher::.github/workflows/haml-lint-problem-matcher.json"
-          bundle exec haml-lint
+          bundle exec haml-lint --reporter github
diff --git a/.github/workflows/lint-json.yml b/.github/workflows/lint-json.yml
deleted file mode 100644
index 7796bf92c4..0000000000
--- a/.github/workflows/lint-json.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: JSON Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.json'
-      - '.github/workflows/lint-json.yml'
-      - '!app/javascript/mastodon/locales/*.json'
-
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.json'
-      - '.github/workflows/lint-json.yml'
-      - '!app/javascript/mastodon/locales/*.json'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:json
diff --git a/.github/workflows/lint-md.yml b/.github/workflows/lint-md.yml
deleted file mode 100644
index 51c59937a3..0000000000
--- a/.github/workflows/lint-md.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Markdown Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - '.github/workflows/lint-md.yml'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.md'
-      - '!AUTHORS.md'
-      - 'package.json'
-      - 'yarn.lock'
-
-  pull_request:
-    paths:
-      - '.github/workflows/lint-md.yml'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.md'
-      - '!AUTHORS.md'
-      - 'package.json'
-      - 'yarn.lock'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:md
diff --git a/.github/workflows/lint-yml.yml b/.github/workflows/lint-yml.yml
deleted file mode 100644
index 908bdef5cc..0000000000
--- a/.github/workflows/lint-yml.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: YML Linting
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.yaml'
-      - '**/*.yml'
-      - '.github/workflows/lint-yml.yml'
-      - '!config/locales/*.yml'
-
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'yarn.lock'
-      - '.nvmrc'
-      - '.prettier*'
-      - '**/*.yaml'
-      - '**/*.yml'
-      - '.github/workflows/lint-yml.yml'
-      - '!config/locales/*.yml'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-
-      - name: Set up Javascript environment
-        uses: ./.github/actions/setup-javascript
-
-      - name: Prettier
-        run: yarn lint:yml
diff --git a/.github/workflows/test-image-build.yml b/.github/workflows/test-image-build.yml
deleted file mode 100644
index 980e071897..0000000000
--- a/.github/workflows/test-image-build.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Test container image build
-on:
-  pull_request:
-    paths:
-      - .github/workflows/build-nightly.yml
-      - .github/workflows/build-push-pr.yml
-      - .github/workflows/build-releases.yml
-      - .github/workflows/test-image-build.yml
-      - Dockerfile
-      - streaming/Dockerfile
-permissions:
-  contents: read
-
-jobs:
-  build-image:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: Dockerfile
-      platforms: linux/amd64 # Testing only on native platform so it is performant
-      cache: true
-
-  build-image-streaming:
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-streaming
-      cancel-in-progress: true
-
-    uses: ./.github/workflows/build-container-image.yml
-    with:
-      file_to_build: streaming/Dockerfile
-      platforms: linux/amd64 # Testing only on native platform so it is performant
-      cache: true
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 79622b6c1f..481afdba30 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
 
-      - name: Jest testing
+      - name: JavaScript testing
         run: yarn jest --reporters github-actions summary
diff --git a/.github/workflows/test-migrations-one-step.yml b/.github/workflows/test-migrations-one-step.yml
index 5dca8e376d..1ff5cc06b9 100644
--- a/.github/workflows/test-migrations-one-step.yml
+++ b/.github/workflows/test-migrations-one-step.yml
@@ -78,23 +78,8 @@ jobs:
       - name: Create database
         run: './bin/rails db:create'
 
-      - name: Run migrations up to v2.0.0
-        run: './bin/rails db:migrate VERSION=20171010025614'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2'
-
-      - name: Run migrations up to v2.4.0
-        run: './bin/rails db:migrate VERSION=20180514140000'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4'
-
-      - name: Run migrations up to v2.4.3
-        run: './bin/rails db:migrate VERSION=20180707154237'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4_3'
+      - name: Run historical migrations with data population
+        run: './bin/rails tests:migrations:prepare_database'
 
       - name: Run all remaining migrations
         run: './bin/rails db:migrate'
diff --git a/.github/workflows/test-migrations-two-step.yml b/.github/workflows/test-migrations-two-step.yml
index 59485d285d..6698847315 100644
--- a/.github/workflows/test-migrations-two-step.yml
+++ b/.github/workflows/test-migrations-two-step.yml
@@ -45,6 +45,7 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
+
       redis:
         image: redis:7-alpine
         options: >-
@@ -77,28 +78,11 @@ jobs:
       - name: Create database
         run: './bin/rails db:create'
 
-      - name: Run migrations up to v2.0.0
-        run: './bin/rails db:migrate VERSION=20171010025614'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2'
-
-      - name: Run pre-deployment migrations up to v2.4.0
-        run: './bin/rails db:migrate VERSION=20180514140000'
+      - name: Run historical migrations with data population
+        run: './bin/rails tests:migrations:prepare_database'
         env:
           SKIP_POST_DEPLOYMENT_MIGRATIONS: true
 
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4'
-
-      - name: Run migrations up to v2.4.3
-        run: './bin/rails db:migrate VERSION=20180707154237'
-        env:
-          SKIP_POST_DEPLOYMENT_MIGRATIONS: true
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4_3'
-
       - name: Run all remaining pre-deployment migrations
         run: './bin/rails db:migrate'
         env:
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index ae25648a0b..5892c59066 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -28,6 +28,9 @@ jobs:
     env:
       RAILS_ENV: ${{ matrix.mode }}
       BUNDLE_WITH: ${{ matrix.mode }}
+      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: precompile_placeholder
+      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: precompile_placeholder
+      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: precompile_placeholder
       OTP_SECRET: precompile_placeholder
       SECRET_KEY_BASE: precompile_placeholder
 
@@ -52,7 +55,7 @@ jobs:
         run: |
           tar --exclude={"*.br","*.gz"} -zcf artifacts.tar.gz public/assets public/packs*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: matrix.mode == 'test'
         with:
           path: |-
@@ -106,18 +109,19 @@ jobs:
       CAS_ENABLED: true
       BUNDLE_WITH: 'pam_authentication test'
       GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
+      ES_ENABLED: false
 
     strategy:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
+          - '3.2'
           - '.ruby-version'
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './'
           name: ${{ github.sha }}
@@ -139,9 +143,11 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: coverage/lcov/mastodon.lcov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   test-e2e:
     name: End to End testing
@@ -181,19 +187,22 @@ jobs:
       DISABLE_SIMPLECOV: true
       RAILS_ENV: test
       BUNDLE_WITH: test
+      ES_ENABLED: false
+      LOCAL_DOMAIN: localhost:3000
+      LOCAL_HTTPS: false
 
     strategy:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
+          - '3.2'
           - '.ruby-version'
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './public'
           name: ${{ github.sha }}
@@ -210,21 +219,21 @@ jobs:
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
 
-      - run: bundle exec rake spec:system
+      - run: bin/rspec spec/system --tag streaming --tag js
 
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: e2e-logs-${{ matrix.ruby-version }}
           path: log/
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: e2e-screenshots
-          path: tmp/screenshots/
+          path: tmp/capybara/
 
   test-search:
     name: Elastic Search integration testing
@@ -257,8 +266,8 @@ jobs:
         ports:
           - 6379:6379
 
-      search:
-        image: ${{ matrix.search-image }}
+      elasticsearch:
+        image: ${{ contains(matrix.search-image, 'elasticsearch') && matrix.search-image || '' }}
         env:
           discovery.type: single-node
           xpack.security.enabled: false
@@ -270,6 +279,20 @@ jobs:
         ports:
           - 9200:9200
 
+      opensearch:
+        image: ${{ contains(matrix.search-image, 'opensearch') && matrix.search-image || '' }}
+        env:
+          discovery.type: single-node
+          DISABLE_INSTALL_DEMO_CONFIG: true
+          DISABLE_SECURITY_PLUGIN: true
+        options: >-
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+
     env:
       DB_HOST: localhost
       DB_USER: postgres
@@ -285,19 +308,21 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
+          - '3.2'
           - '.ruby-version'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
         include:
           - ruby-version: '.ruby-version'
             search-image: docker.elastic.co/elasticsearch/elasticsearch:8.10.2
+          - ruby-version: '.ruby-version'
+            search-image: opensearchproject/opensearch:2
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './public'
           name: ${{ github.sha }}
@@ -317,15 +342,105 @@ jobs:
       - run: bin/rspec --tag search
 
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-search-logs-${{ matrix.ruby-version }}
           path: log/
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-search-screenshots
-          path: tmp/screenshots/
+          path: tmp/capybara/
+
+  test-back-and-return:
+    name: Back to original and return test
+    runs-on: ubuntu-latest
+
+    needs:
+      - build
+
+    services:
+      postgres:
+        image: postgres:14-alpine
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+      redis:
+        image: redis:7-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    env:
+      DB_HOST: localhost
+      DB_USER: postgres
+      DB_PASS: postgres
+      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
+      RAILS_ENV: test
+      ALLOW_NOPAM: true
+      PAM_ENABLED: true
+      PAM_DEFAULT_SERVICE: pam_test
+      PAM_CONTROLLED_SERVICE: pam_test_controlled
+      OIDC_ENABLED: true
+      OIDC_SCOPE: read
+      SAML_ENABLED: true
+      CAS_ENABLED: true
+      BUNDLE_WITH: 'pam_authentication test'
+      GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
+      ES_ENABLED: false
+      BACK_UPSTREAM_FORCE: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '.ruby-version'
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: './'
+          name: ${{ github.sha }}
+
+      - name: Expand archived asset artifacts
+        run: |
+          tar xvzf artifacts.tar.gz
+
+      - name: Set up Ruby environment
+        uses: ./.github/actions/setup-ruby
+        with:
+          ruby-version: ${{ matrix.ruby-version}}
+          additional-system-dependencies: ffmpeg imagemagick libpam-dev
+
+      - name: Load database schema
+        run: './bin/rails db:create db:schema:load db:seed'
+
+      - name: Back to upstream schema
+        run: 'bundle exec rake dangerous:back_upstream'
+
+      - name: Return to kmyblue
+        run: './bin/rails db:migrate'
+
+      - run: bin/rspec
+
+      - name: Upload coverage reports to Codecov
+        if: matrix.ruby-version == '.ruby-version'
+        uses: codecov/codecov-action@v3
+        with:
+          files: coverage/lcov/mastodon-back-ret.lcov
diff --git a/.gitignore b/.gitignore
index c5af8eb67f..4106e3f7f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,10 +24,12 @@
 /public/packs-test
 .env
 .env.production
-.env.development
 /node_modules/
 /build/
 
+# Ignore elasticsearch config
+/.elasticsearch.yml
+
 # Ignore Vagrant files
 .vagrant/
 
@@ -69,3 +71,6 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Ignore dotenv .local files
+.env*.local
diff --git a/.haml-lint.yml b/.haml-lint.yml
index 8cfcaec8d9..7dbc88e9db 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -2,7 +2,6 @@ inherits_from: .haml-lint_todo.yml
 
 exclude:
   - 'vendor/**/*'
-  - lib/templates/haml/scaffold/_form.html.haml
 
 require:
   - ./lib/linter/haml_middle_dot.rb
@@ -13,4 +12,6 @@ linters:
   MiddleDot:
     enabled: true
   LineLength:
-    max: 320
+    max: 300
+  ViewLength:
+    max: 200 # Override default value of 100 inherited from rubocop
diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index af2d2e8f4e..841561291f 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -10,4 +10,27 @@ linters:
   # Offense count: 1
   LineLength:
     exclude:
+      - 'app/views/admin/ng_rules/_ng_rule_fields.html.haml'
       - 'app/views/admin/roles/_form.html.haml'
+
+  # Offense count: 9
+  RuboCop:
+    exclude:
+      - 'app/views/home/index.html.haml'
+
+  ViewLength:
+    exclude:
+      - 'app/views/admin/accounts/index.html.haml'
+      - 'app/views/admin/instances/show.html.haml'
+      - 'app/views/admin/ng_rules/_ng_rule_fields.html.haml'
+      - 'app/views/admin/settings/discovery/show.html.haml'
+      - 'app/views/settings/preferences/appearance/show.html.haml'
+      - 'app/views/settings/preferences/other/show.html.haml'
+
+  InstanceVariables:
+    exclude:
+      - 'app/views/application/_sidebar.html.haml'
+      - 'app/views/admin/ng_rules/_ng_rule_fields.html.haml'
+      - 'app/views/admin/ng_words/keywords/_ng_word.html.haml'
+      - 'app/views/admin/ng_words/white_list/_specified_domain.html.haml'
+      - 'app/views/admin/sensitive_words/_sensitive_word.html.haml'
diff --git a/.husky/pre-commit b/.husky/pre-commit
index d2ae35e84b..3723623171 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn lint-staged
diff --git a/.nvmrc b/.nvmrc
index a3597ecbd1..973f49d55c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.11
+20.13
diff --git a/.prettierignore b/.prettierignore
index 51850b2b28..6b2f0c1889 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -54,6 +54,13 @@
 # Ignore Docker option files
 docker-compose.override.yml
 
+# Ignore public
+/public/assets
+/public/emoji
+/public/packs
+/public/packs-test
+/public/system
+
 # Ignore emoji map file
 /app/javascript/mastodon/features/emoji/emoji_map.json
 
@@ -74,4 +81,5 @@ app/javascript/styles/mastodon/reset.scss
 # Ignore the generated AUTHORS.md
 AUTHORS.md
 
+# Process a few selected JS files
 !lint-staged.config.js
diff --git a/.rubocop.yml b/.rubocop.yml
index a06621d660..5596727890 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,12 +9,13 @@ inherit_mode:
 require:
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-performance
   - rubocop-capybara
   - ./lib/linter/rubocop_middle_dot
 
 AllCops:
-  TargetRubyVersion: 3.0 # Set to minimum supported version of CI
+  TargetRubyVersion: 3.1 # Set to minimum supported version of CI
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true
@@ -22,7 +23,7 @@ AllCops:
   CacheRootDirectory: tmp
   NewCops: enable # Opt-in to newly added rules
   Exclude:
-    - db/schema.rb
+    - 'db/schema.rb'
     - 'bin/*'
     - 'node_modules/**/*'
     - 'Vagrantfile'
@@ -39,13 +40,7 @@ Layout/FirstHashElementIndentation:
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_layout.html#layoutlinelength
 Layout/LineLength:
-  Max: 320 # Default of 120 causes a duplicate entry in generated todo file
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_lint.html#lintuselessaccessmodifier
-Lint/UselessAccessModifier:
-  ContextCreatingMethods:
-    - class_methods
+  Max: 300 # Default of 120 causes a duplicate entry in generated todo file
 
 ## Disable most Metrics/*Length cops
 # Reason: those are often triggered and force significant refactors when this happend
@@ -73,12 +68,18 @@ Metrics/ModuleLength:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsabcsize
 Metrics/AbcSize:
   Exclude:
+    - 'app/serializers/initial_state_serializer.rb'
     - 'lib/mastodon/cli/*.rb'
 
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
 Metrics/CyclomaticComplexity:
   Exclude:
+    - 'app/lib/feed_manager.rb'
+    - 'app/policies/status_policy.rb'
+    - 'app/services/activitypub/process_account_service.rb'
+    - 'app/services/delivery_antenna_service.rb'
+    - 'app/services/post_status_service.rb'
     - lib/mastodon/cli/*.rb
 
 # Reason:
@@ -86,6 +87,17 @@ Metrics/CyclomaticComplexity:
 Metrics/ParameterLists:
   CountKeywordArgs: false
 
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'app/policies/status_policy.rb'
+    - 'app/services/delivery_antenna_service.rb'
+    - 'app/services/post_status_service.rb'
+
+# Reason: Prefer seeing a variable name
+# https://docs.rubocop.org/rubocop/cops_naming.html#namingblockforwarding
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
+
 # Reason: Prevailing style is argument file paths
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsfilepath
 Rails/FilePath:
@@ -96,22 +108,26 @@ Rails/FilePath:
 Rails/HttpStatus:
   EnforcedStyle: numeric
 
-# Reason: Allowed in `tootctl` CLI code and in boot ENV checker
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
-Rails/Exit:
-  Exclude:
-    - 'config/boot.rb'
-    - 'lib/mastodon/cli/*.rb'
-
 # Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/auth/*'
 
-Rails/SkipsModelValidations:
+# Reason: These tasks are doing local work which do not need full env loaded
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
+Rails/RakeEnvironment:
   Exclude:
-    - 'db/*migrate/**/*'
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/emojis.rake'
+    - 'lib/tasks/mastodon.rake'
+    - 'lib/tasks/repo.rake'
+    - 'lib/tasks/statistics.rake'
+
+# Reason: There are appropriate times to use these features
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
+Rails/SkipsModelValidations:
+  Enabled: false
 
 # Reason: We want to preserve the ability to migrate from arbitrary old versions,
 # and cannot guarantee that every installation has run every migration as they upgrade.
@@ -124,6 +140,11 @@ Rails/UnusedIgnoredColumns:
 Rails/NegateInclude:
   Enabled: false
 
+# Reason: Enforce default limit, but allow some elements to span lines
+# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecexamplelength
+RSpec/ExampleLength:
+  CountAsOne: ['array', 'heredoc', 'method_call']
+
 # Reason: Deprecated cop, will be removed in 3.0, replaced by SpecFilePathFormat
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
@@ -139,11 +160,6 @@ RSpec/NamedSubject:
 RSpec/NotToNot:
   EnforcedStyle: to_not
 
-# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
-RSpec/Rails/HttpStatus:
-  EnforcedStyle: numeric
-
 # Reason: Match overrides from Rspec/FilePath rule above
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecspecfilepathformat
 RSpec/SpecFilePathFormat:
@@ -154,6 +170,11 @@ RSpec/SpecFilePathFormat:
     OEmbedController: oembed_controller
     OStatus: ostatus
 
+# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
+# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
+RSpecRails/HttpStatus:
+  EnforcedStyle: numeric
+
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_style.html#styleclassandmodulechildren
 Style/ClassAndModuleChildren:
@@ -164,10 +185,25 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+# Reason: Route redirects are not token-formatted and must be skipped
+# https://docs.rubocop.org/rubocop/cops_style.html#styleformatstringtoken
+Style/FormatStringToken:
+  inherit_mode:
+    merge:
+      - AllowedMethods # The rubocop-rails config adds `redirect`
+  AllowedMethods:
+    - redirect_with_vary
+
+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop/cops_style.html#stylehashaslastarrayitem
+Style/HashAsLastArrayItem:
+  Enabled: false
+
 # Reason: Enforce modern Ruby style
 # https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
+  EnforcedShorthandSyntax: either
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_style.html#stylenumericliterals
@@ -187,16 +223,16 @@ Style/PercentLiteralDelimiters:
 Style/RedundantBegin:
   Enabled: false
 
+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantfetchblock
+Style/RedundantFetchBlock:
+  Enabled: false
+
 # Reason: Overridden to reduce implicit StandardError rescues
 # https://docs.rubocop.org/rubocop/cops_style.html#stylerescuestandarderror
 Style/RescueStandardError:
   EnforcedStyle: implicit
 
-# Reason: Simplify some spec layouts
-# https://docs.rubocop.org/rubocop/cops_style.html#stylesemicolon
-Style/Semicolon:
-  AllowAsExpressionSeparator: true
-
 # Reason: Originally disabled for CodeClimate, and no config consensus has been found
 # https://docs.rubocop.org/rubocop/cops_style.html#stylesymbolarray
 Style/SymbolArray:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 602d99c9f0..119df96090 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,25 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.59.0.
+# using RuboCop version 1.63.5.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/models/account.rb'
-
 Lint/NonLocalExitFromIterator:
   Exclude:
     - 'app/helpers/jsonld_helper.rb'
@@ -43,119 +29,27 @@ Metrics/PerceivedComplexity:
 
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 22
+  Max: 18
 
 RSpec/MultipleExpectations:
-  Max: 8
+  Max: 7
 
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 17
+  Exclude:
+    - 'spec/lib/activitypub/activity/create_spec.rb'
+    - 'spec/services/delete_account_service_spec.rb'
+    - 'spec/services/fan_out_on_write_service_spec.rb'
 
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/concerns/account/associations.rb'
-    - 'app/models/status.rb'
-    - 'app/models/tag.rb'
-
 Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-    - 'lib/tasks/db.rake'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-    - 'lib/tasks/repo.rake'
-    - 'lib/tasks/statistics.rake'
-
-# Configuration parameters: ForbiddenMethods, AllowedMethods.
-# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'app/controllers/admin/invites_controller.rb'
-    - 'app/controllers/concerns/session_tracking_concern.rb'
-    - 'app/models/concerns/account/merging.rb'
-    - 'app/models/concerns/expireable.rb'
-    - 'app/models/status.rb'
-    - 'app/models/trends/links.rb'
-    - 'app/models/trends/preview_card_batch.rb'
-    - 'app/models/trends/preview_card_provider_batch.rb'
-    - 'app/models/trends/status_batch.rb'
-    - 'app/models/trends/statuses.rb'
-    - 'app/models/trends/tag_batch.rb'
-    - 'app/models/trends/tags.rb'
-    - 'app/models/user.rb'
-    - 'app/services/activitypub/process_status_update_service.rb'
-    - 'app/services/approve_appeal_service.rb'
-    - 'app/services/block_domain_service.rb'
-    - 'app/services/delete_account_service.rb'
-    - 'app/services/process_mentions_service.rb'
-    - 'app/services/unallow_domain_service.rb'
-    - 'app/services/unblock_domain_service.rb'
-    - 'app/services/update_status_service.rb'
-    - 'app/workers/activitypub/post_upgrade_worker.rb'
-    - 'app/workers/move_worker.rb'
-    - 'app/workers/scheduler/ip_cleanup_scheduler.rb'
-    - 'app/workers/scheduler/scheduled_statuses_scheduler.rb'
-    - 'lib/mastodon/cli/accounts.rb'
-    - 'lib/mastodon/cli/maintenance.rb'
-    - 'spec/lib/activitypub/activity/follow_spec.rb'
-    - 'spec/services/follow_service_spec.rb'
-    - 'spec/services/update_account_service_spec.rb'
-
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
-    - 'app/models/account_alias.rb'
-    - 'app/models/custom_filter_status.rb'
-    - 'app/models/identity.rb'
-    - 'app/models/webauthn_credential.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: exists, where
-Rails/WhereExists:
-  Exclude:
-    - 'app/controllers/activitypub/inboxes_controller.rb'
-    - 'app/controllers/admin/email_domain_blocks_controller.rb'
-    - 'app/lib/activitypub/activity/create.rb'
-    - 'app/lib/delivery_failure_tracker.rb'
-    - 'app/lib/feed_manager.rb'
-    - 'app/lib/status_cache_hydrator.rb'
-    - 'app/lib/suspicious_sign_in_detector.rb'
-    - 'app/models/concerns/account/interactions.rb'
-    - 'app/models/featured_tag.rb'
-    - 'app/models/poll.rb'
-    - 'app/models/session_activation.rb'
-    - 'app/models/status.rb'
-    - 'app/models/user.rb'
-    - 'app/policies/status_policy.rb'
-    - 'app/serializers/rest/announcement_serializer.rb'
-    - 'app/serializers/rest/tag_serializer.rb'
-    - 'app/services/activitypub/fetch_remote_status_service.rb'
-    - 'app/services/vote_service.rb'
-    - 'app/validators/reaction_validator.rb'
-    - 'app/validators/vote_validator.rb'
-    - 'app/workers/move_worker.rb'
-    - 'lib/tasks/tests.rake'
-    - 'spec/models/account_spec.rb'
-    - 'spec/services/activitypub/process_collection_service_spec.rb'
-    - 'spec/services/purge_domain_service_spec.rb'
-    - 'spec/services/unallow_domain_service_spec.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: ==, equal?, eql?
@@ -164,17 +58,12 @@ Style/ClassEqualityComparison:
     - 'app/helpers/jsonld_helper.rb'
     - 'app/serializers/activitypub/outbox_serializer.rb'
 
-Style/ClassVars:
-  Exclude:
-    - 'config/initializers/devise.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
   Exclude:
     - 'app/lib/redis_configuration.rb'
     - 'app/lib/translation_service.rb'
-    - 'config/environments/development.rb'
     - 'config/environments/production.rb'
     - 'config/initializers/2_limited_federation_mode.rb'
     - 'config/initializers/3_omniauth.rb'
@@ -184,9 +73,8 @@ Style/FetchEnvVar:
     - 'config/initializers/paperclip.rb'
     - 'config/initializers/vapid.rb'
     - 'lib/mastodon/redis_config.rb'
-    - 'lib/premailer_webpack_strategy.rb'
     - 'lib/tasks/repo.rake'
-    - 'spec/features/profile_spec.rb'
+    - 'spec/system/profile_spec.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
@@ -194,7 +82,6 @@ Style/FetchEnvVar:
 # AllowedMethods: redirect
 Style/FormatStringToken:
   Exclude:
-    - 'app/models/privacy_policy.rb'
     - 'config/initializers/devise.rb'
     - 'lib/paperclip/color_extractor.rb'
 
@@ -208,10 +95,6 @@ Style/GlobalStdStream:
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
-    - 'app/controllers/admin/confirmations_controller.rb'
-    - 'app/controllers/auth/confirmations_controller.rb'
-    - 'app/controllers/auth/passwords_controller.rb'
-    - 'app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb'
     - 'app/lib/activitypub/activity/block.rb'
     - 'app/lib/request.rb'
     - 'app/lib/request_pool.rb'
@@ -235,35 +118,14 @@ Style/GuardClause:
     - 'lib/mastodon/cli/accounts.rb'
     - 'lib/mastodon/cli/maintenance.rb'
     - 'lib/mastodon/cli/media.rb'
-    - 'lib/paperclip/attachment_extensions.rb'
     - 'lib/tasks/repo.rake'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces
-Style/HashAsLastArrayItem:
-  Exclude:
-    - 'app/controllers/admin/statuses_controller.rb'
-    - 'app/controllers/api/v1/statuses_controller.rb'
-    - 'app/models/concerns/account/counters.rb'
-    - 'app/models/concerns/status/threading_concern.rb'
-    - 'app/models/status.rb'
-    - 'app/services/batched_remove_status_service.rb'
-    - 'app/services/notify_service.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
   Exclude:
     - 'app/serializers/rest/web_push_subscription_serializer.rb'
     - 'app/services/import_service.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/initializers/devise.rb'
-    - 'config/initializers/ffmpeg.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
@@ -298,13 +160,6 @@ Style/OptionalBooleanParameter:
     - 'app/workers/unfollow_follow_worker.rb'
     - 'lib/mastodon/redis_config.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'config/deploy.rb'
-    - 'config/initializers/doorkeeper.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
@@ -318,16 +173,6 @@ Style/RedundantConstantBase:
     - 'config/environments/production.rb'
     - 'config/initializers/sidekiq.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SafeForConstants.
-Style/RedundantFetchBlock:
-  Exclude:
-    - 'config/initializers/1_hosts.rb'
-    - 'config/initializers/chewy.rb'
-    - 'config/initializers/devise.rb'
-    - 'config/initializers/paperclip.rb'
-    - 'config/puma.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
@@ -335,59 +180,12 @@ Style/SafeNavigation:
   Exclude:
     - 'app/models/concerns/account/finder_concern.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'lib/devise/strategies/two_factor_ldap_authenticatable.rb'
-    - 'lib/devise/strategies/two_factor_pam_authenticatable.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SingleArgumentDig:
-  Exclude:
-    - 'lib/webpacker/manifest_extensions.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'config/initializers/paperclip.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/initializers/backtrace_silencers.rb'
-    - 'config/initializers/http_client_proxy.rb'
-    - 'config/initializers/rack_attack.rb'
-    - 'config/initializers/webauthn.rb'
-    - 'config/routes.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'config/environments/development.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'config/initializers/paperclip.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'config/environments/production.rb'
-    - 'config/environments/test.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
diff --git a/.ruby-version b/.ruby-version
index be94e6f53d..bea438e9ad 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.1
diff --git a/.simplecov b/.simplecov
deleted file mode 100644
index fbd0207bec..0000000000
--- a/.simplecov
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['CI']
-  require 'simplecov-lcov'
-  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
-  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
-else
-  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
-end
-
-SimpleCov.start 'rails' do
-  enable_coverage :branch
-
-  add_filter 'lib/linter'
-
-  add_group 'Libraries', 'lib'
-  add_group 'Policies', 'app/policies'
-  add_group 'Presenters', 'app/presenters'
-  add_group 'Serializers', 'app/serializers'
-  add_group 'Services', 'app/services'
-  add_group 'Validators', 'app/validators'
-end
diff --git a/AUTHORS_KB.md b/AUTHORS_KB.md
new file mode 100644
index 0000000000..2cda5fd31d
--- /dev/null
+++ b/AUTHORS_KB.md
@@ -0,0 +1,18 @@
+# Authors for kmyblue fork
+
+## 貢献者
+
+kmyblueフォークは、以下の方の貢献によって成り立っています。  
+本家Mastodonの貢献者については、`AUTHORS.md`をご覧ください。
+
+- [aoisensi](https://github.com/aoisensi)
+- [KMY](https://github.com/kmycode)
+- [S-H-GAMELINKS](https://github.com/S-H-GAMELINKS)
+- [Yuicho](https://github.com/yuicho)
+
+## 特記
+
+kmyblueフォークの開発にあたって、API・Activity仕様の設計（一部機能については内部仕様）策定の過程で下記リポジトリのコードを参考にしました。  
+kmyblueフォークに直接貢献したわけではありませんが、以下のリポジトリにある絵文字リアクション機能・検索範囲機能のコードのうち一部にkmyblueへ転写した箇所がございますため、お名前記載させていただきます。
+
+- [Fedibird](https://github.com/fedibird/mastodon)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f775fcfa8..a53790afaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,101 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.7] - 2024-02-16
+
+### Fixed
+
+- Fix OmniAuth tests and edge cases in error handling ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29201), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/29207))
+- Fix new installs by upgrading to the latest release of the `nsa` gem, instead of a no longer existing commit ([mjankowski](https://github.com/mastodon/mastodon/pull/29065))
+
+### Security
+
+- Fix insufficient checking of remote posts ([GHSA-jhrq-qvrm-qr36](https://github.com/mastodon/mastodon/security/advisories/GHSA-jhrq-qvrm-qr36))
+
+## [4.2.6] - 2024-02-14
+
+### Security
+
+- Update the `sidekiq-unique-jobs` dependency (see [GHSA-cmh9-rx85-xj38](https://github.com/mhenrixon/sidekiq-unique-jobs/security/advisories/GHSA-cmh9-rx85-xj38))
+  In addition, we have disabled the web interface for `sidekiq-unique-jobs` out of caution.
+  If you need it, you can re-enable it by setting `ENABLE_SIDEKIQ_UNIQUE_JOBS_UI=true`.
+  If you only need to clear all locks, you can now use `bundle exec rake sidekiq_unique_jobs:delete_all_locks`.
+- Update the `nokogiri` dependency (see [GHSA-xc9x-jj77-9p9j](https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-xc9x-jj77-9p9j))
+- Disable administrative Doorkeeper routes ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/29187))
+- Fix ongoing streaming sessions not being invalidated when applications get deleted in some cases ([GHSA-7w3c-p9j8-mq3x](https://github.com/mastodon/mastodon/security/advisories/GHSA-7w3c-p9j8-mq3x))
+  In some rare cases, the streaming server was not notified of access tokens revocation on application deletion.
+- Change external authentication behavior to never reattach a new identity to an existing user by default ([GHSA-vm39-j3vx-pch3](https://github.com/mastodon/mastodon/security/advisories/GHSA-vm39-j3vx-pch3))
+  Up until now, Mastodon has allowed new identities from external authentication providers to attach to an existing local user based on their verified e-mail address.
+  This allowed upgrading users from a database-stored password to an external authentication provider, or move from one authentication provider to another.
+  However, this behavior may be unexpected, and means that when multiple authentication providers are configured, the overall security would be that of the least secure authentication provider.
+  For these reasons, this behavior is now locked under the `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH` environment variable.
+  In addition, regardless of this environment variable, Mastodon will refuse to attach two identities from the same authentication provider to the same account.
+
+## [4.2.5] - 2024-02-01
+
+### Security
+
+- Fix insufficient origin validation (CVE-2024-23832, [GHSA-3fjr-858r-92rw](https://github.com/mastodon/mastodon/security/advisories/GHSA-3fjr-858r-92rw))
+
+## [4.2.4] - 2024-01-24
+
+### Fixed
+
+- Fix error when processing remote files with unusually long names ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28823))
+- Fix processing of compacted single-item JSON-LD collections ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28816))
+- Retry 401 errors on replies fetching ([ShadowJonathan](https://github.com/mastodon/mastodon/pull/28788))
+- Fix `RecordNotUnique` errors in LinkCrawlWorker ([tribela](https://github.com/mastodon/mastodon/pull/28748))
+- Fix Mastodon not correctly processing HTTP Signatures with query strings ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28443), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/28476))
+- Fix potential redirection loop of streaming endpoint ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28665))
+- Fix streaming API redirection ignoring the port of `streaming_api_base_url` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28558))
+- Fix error when processing link preview with an array as `inLanguage` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28252))
+- Fix unsupported time zone or locale preventing sign-up ([Gargron](https://github.com/mastodon/mastodon/pull/28035))
+- Fix "Hide these posts from home" list setting not refreshing when switching lists ([brianholley](https://github.com/mastodon/mastodon/pull/27763))
+- Fix missing background behind dismissable banner in web UI ([Gargron](https://github.com/mastodon/mastodon/pull/27479))
+- Fix line wrapping of language selection button with long locale codes ([gunchleoc](https://github.com/mastodon/mastodon/pull/27100), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27127))
+- Fix `Undo Announce` activity not being sent to non-follower authors ([MitarashiDango](https://github.com/mastodon/mastodon/pull/18482))
+- Fix N+1s because of association preloaders not actually getting called ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28339))
+- Fix empty column explainer getting cropped under certain conditions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28337))
+- Fix `LinkCrawlWorker` error when encountering empty OEmbed response ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28268))
+- Fix call to inefficient `delete_matched` cache method in domain blocks ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28367))
+
+### Security
+
+- Add rate-limit of TOTP authentication attempts at controller level ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/28801))
+
+## [4.2.3] - 2023-12-05
+
+### Fixed
+
+- Fix dependency on `json-canonicalization` version that has been made unavailable since last release
+
+## [4.2.2] - 2023-12-04
+
+### Changed
+
+- Change dismissed banners to be stored server-side ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27055))
+- Change GIF max matrix size error to explicitly mention GIF files ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27927))
+- Change `Follow` activities delivery to bypass availability check ([ShadowJonathan](https://github.com/mastodon/mastodon/pull/27586))
+- Change single-column navigation notice to be displayed outside of the logo container ([renchap](https://github.com/mastodon/mastodon/pull/27462), [renchap](https://github.com/mastodon/mastodon/pull/27476))
+- Change Content-Security-Policy to be tighter on media paths ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26889))
+- Change post language code to include country code when relevant ([gunchleoc](https://github.com/mastodon/mastodon/pull/27099), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27207))
+
+### Fixed
+
+- Fix upper border radius of onboarding columns ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27890))
+- Fix incoming status creation date not being restricted to standard ISO8601 ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27655), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/28081))
+- Fix some posts from threads received out-of-order sometimes not being inserted into timelines ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27653))
+- Fix posts from force-sensitized accounts being able to trend ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27620))
+- Fix error when trying to delete already-deleted file with OpenStack Swift ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27569))
+- Fix batch attachment deletion when using OpenStack Swift ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27554))
+- Fix processing LDSigned activities from actors with unknown public keys ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27474))
+- Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27459))
+- Fix report processing notice not mentioning the report number when performing a custom action ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27442))
+- Fix handling of `inLanguage` attribute in preview card processing ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27423))
+- Fix own posts being removed from home timeline when unfollowing a used hashtag ([kmycode](https://github.com/mastodon/mastodon/pull/27391))
+- Fix some link anchors being recognized as hashtags ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27271), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27584))
+- Fix format-dependent redirects being cached regardless of requested format ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27634))
+
 ## [4.2.1] - 2023-10-10
 
 ### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b68a9bde3e..43f8a79249 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,50 +1,35 @@
-# Contributing
+# CONTRIBUTING
 
-Thank you for considering contributing to Mastodon 🐘
+kmyblueは、コミュニティの意見も聞くには聞きますが導入する・しないは管理人が決定します。
 
-You can contribute in the following ways:
+## バグ報告
 
-- Finding and reporting bugs
-- Translating the Mastodon interface into various languages
-- Contributing code to Mastodon by fixing bugs or implementing features
-- Improving the documentation
+バグについて、L最新よりも過去のバージョンへの対応は、LTSや特別な場合以外は行いません。
 
-If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
+以下のいずれかの方法で報告してください。
 
-## API Changes and Additions
+- [GitHub Issues](https://github.com/kmycode/mastodon/issues) （セキュリティインシデントはここの一番下から）
+- [kmyblue開発者への連絡](https://kmy.blue/@askyq)
+- [kmyblue開発者へのメール](https://kmy.blue/about)
 
-Please note that any changes or additions made to the API should have an accompanying pull request on [our documentation repository](https://github.com/mastodon/documentation).
+## 翻訳、プルリクエスト
 
-## Bug reports
+新しい機能や既存機能の修正については、プルリクエストのためにコードを作成する前に、まずGitHub Issuesで機能の提案を行いkmyblue開発者の考えを聞くことをおすすめします。バグ修正、翻訳、テストコードなどは基本受け入れますが、依存モジュールのバージョンアップについては特別な事情がなければ本家Mastodonよりも先に行かないようにしてください。
 
-Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/mastodon/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
+プルリクエストのタイトルには、プルリクエストの内容が明確になるようなものを設定してください。
 
-## Translations
+### kmyblueの開発方針
 
-You can submit translations via [Crowdin](https://crowdin.com/project/mastodon). They are periodically merged into the codebase.
+下記のものに矛盾がなければ、あとは管理人の意向次第です。
 
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)](https://crowdin.com/project/mastodon)
+- **自分の投稿を見せたくない人に見せない**
+- **他人の見たくない投稿を見ない**
+- ただし本家Mastodonで上記原則に矛盾した機能が追加された場合は従う
+- 画面を騒がしくするような機能（絵文字を大きく表示するなど）は追加しないか、控えめにする。ただし他のソフトウェアにも導入され利用者が多くいる場合などは別途判断して、オプトアウト可能な設定項目とともに追加する
+- 負荷を著しく上げるような機能はできるだけ追加しない
 
-## Pull requests
+kmyblueが意図的に実装していない機能は、例えば以下のものがあります。詳しい理由が知りたい場合は[この記事を参照するか](https://note.com/kmycode/n/n463410b5e03c)、別途お問い合わせください。もちろん明確な根拠がある場合、あなたはこれに抗議する権利を有しますが、あなたがこのkmyblueをフォークして新しいリポジトリを作るほうがより自由でしょう。
 
-**Please use clean, concise titles for your pull requests.** Unless the pull request is about refactoring code, updating dependencies or other internal tasks, assume that the person reading the pull request title is not a programmer or Mastodon developer, but instead a Mastodon user or server administrator, and **try to describe your change or fix from their perspective**. We use commit squashing, so the final commit in the main branch will carry the title of the pull request, and commits from the main branch are fed into the changelog. The changelog is separated into [keepachangelog.com categories](https://keepachangelog.com/en/1.0.0/), and while that spec does not prescribe how the entries ought to be named, for easier sorting, start your pull request titles using one of the verbs "Add", "Change", "Deprecate", "Remove", or "Fix" (present tense).
-
-Example:
-
-| Not ideal                            | Better                                                        |
-| ------------------------------------ | ------------------------------------------------------------- |
-| Fixed NoMethodError in RemovalWorker | Fix nil error when removing statuses caused by race condition |
-
-It is not always possible to phrase every change in such a manner, but it is desired.
-
-**The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged.** Splitting tasks into multiple smaller pull requests is often preferable.
-
-**Pull requests that do not pass automated checks may not be reviewed**. In particular, you need to keep in mind:
-
-- Unit and integration tests (rspec, jest)
-- Code style rules (rubocop, eslint)
-- Normalization of locale files (i18n-tasks)
-
-## Documentation
-
-The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/documentation](https://github.com/mastodon/documentation).
+- お気に入り一覧の公開
+- ブックマーク分類の公開
+- Fedibird、Misskeyにあるような詳細な画面表示オプション
diff --git a/Dockerfile b/Dockerfile
index 96f8b5cd27..4278242bc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
@@ -7,20 +7,20 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.2"]
-ARG RUBY_VERSION="3.2.2"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
+ARG RUBY_VERSION="3.3.1"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.2.2-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
-# Overwrite existance of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+# Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
 # Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
 ARG MASTODON_VERSION_METADATA=""
@@ -29,7 +29,7 @@ ARG MASTODON_VERSION_METADATA=""
 # See: https://docs.joinmastodon.org/admin/config/#rails_serve_static_files
 ARG RAILS_SERVE_STATIC_FILES="true"
 # Allow to use YJIT compiler
-# See: https://github.com/ruby/ruby/blob/master/doc/yjit/yjit.md
+# See: https://github.com/ruby/ruby/blob/v3_2_4/doc/yjit/yjit.md
 ARG RUBY_YJIT_ENABLE="1"
 # Timezone used by the Docker container and runtime, change with [--build-arg TZ=Europe/Berlin]
 ARG TZ="Etc/UTC"
@@ -205,7 +205,12 @@ ARG TARGETPLATFORM
 
 RUN \
 # Use Ruby on Rails to create Mastodon assets
-  OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile; \
+  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=precompile_placeholder \
+  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=precompile_placeholder \
+  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=precompile_placeholder \
+  OTP_SECRET=precompile_placeholder \
+  SECRET_KEY_BASE=precompile_placeholder \
+  bundle exec rails assets:precompile; \
 # Cleanup temporary files
   rm -fr /opt/mastodon/tmp;
 
@@ -257,4 +262,4 @@ USER mastodon
 # Expose default Puma ports
 EXPOSE 3000
 # Set container tini as default entry point
-ENTRYPOINT ["/usr/bin/tini", "--"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/tini", "--"]
diff --git a/FEDERATION.md b/FEDERATION.md
index e3721d7241..2819fa935a 100644
--- a/FEDERATION.md
+++ b/FEDERATION.md
@@ -1,19 +1,35 @@
-## ActivityPub federation in Mastodon
+# Federation
+
+## Supported federation protocols and standards
+
+- [ActivityPub](https://www.w3.org/TR/activitypub/) (Server-to-Server)
+- [WebFinger](https://webfinger.net/)
+- [Http Signatures](https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures)
+- [NodeInfo](https://nodeinfo.diaspora.software/)
+
+## Supported FEPs
+
+- [FEP-67ff: FEDERATION.md](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md)
+- [FEP-f1d5: NodeInfo in Fediverse Software](https://codeberg.org/fediverse/fep/src/branch/main/fep/f1d5/fep-f1d5.md)
+- [FEP-8fcf: Followers collection synchronization across servers](https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md)
+- [FEP-5feb: Search indexing consent for actors](https://codeberg.org/fediverse/fep/src/branch/main/fep/5feb/fep-5feb.md)
+
+## ActivityPub in Mastodon
 
 Mastodon largely follows the ActivityPub server-to-server specification but it makes uses of some non-standard extensions, some of which are required for interacting with Mastodon at all.
 
-Supported vocabulary: https://docs.joinmastodon.org/spec/activitypub/
+- [Supported ActivityPub vocabulary](https://docs.joinmastodon.org/spec/activitypub/)
 
 ### Required extensions
 
-#### Webfinger
+#### WebFinger
 
 In Mastodon, users are identified by a `username` and `domain` pair (e.g., `Gargron@mastodon.social`).
 This is used both for discovery and for unambiguously mentioning users across the fediverse. Furthermore, this is part of Mastodon's database design from its very beginnings.
 
 As a result, Mastodon requires that each ActivityPub actor uniquely maps back to an `acct:` URI that can be resolved via WebFinger.
 
-More information and examples are available at: https://docs.joinmastodon.org/spec/webfinger/
+- [WebFinger information and examples](https://docs.joinmastodon.org/spec/webfinger/)
 
 #### HTTP Signatures
 
@@ -21,11 +37,13 @@ In order to authenticate activities, Mastodon relies on HTTP Signatures, signing
 
 Mastodon requires all `POST` requests to be signed, and MAY require `GET` requests to be signed, depending on the configuration of the Mastodon server.
 
-More information on HTTP Signatures, as well as examples, can be found here: https://docs.joinmastodon.org/spec/security/#http
+- [HTTP Signatures information and examples](https://docs.joinmastodon.org/spec/security/#http)
 
 ### Optional extensions
 
-- Linked-Data Signatures: https://docs.joinmastodon.org/spec/security/#ld
-- Bearcaps: https://docs.joinmastodon.org/spec/bearcaps/
-- Followers collection synchronization: https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md
-- Search indexing consent for actors: https://codeberg.org/fediverse/fep/src/branch/main/fep/5feb/fep-5feb.md
+- [Linked-Data Signatures](https://docs.joinmastodon.org/spec/security/#ld)
+- [Bearcaps](https://docs.joinmastodon.org/spec/bearcaps/)
+
+### Additional documentation
+
+- [Mastodon documentation](https://docs.joinmastodon.org/)
diff --git a/Gemfile b/Gemfile
index 2d4e504ac7..240dcce95a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 3.0.0'
+ruby '>= 3.1.0'
 
-gem 'puma', '~> 6.3'
-gem 'rails', '~> 7.1.1'
 gem 'propshaft'
-gem 'thor', '~> 1.2'
+gem 'puma', '~> 6.3'
 gem 'rack', '~> 2.2.7'
+gem 'rails', '~> 7.1.1'
+gem 'thor', '~> 1.2'
 
 # For why irb is in the Gemfile, see: https://ruby.social/@st0012/111444685161478182
 gem 'irb', '~> 1.8'
 
+gem 'dotenv'
 gem 'haml-rails', '~>2.0'
 gem 'pg', '~> 1.5'
 gem 'pghero'
-gem 'dotenv-rails', '~> 2.8'
 
 gem 'aws-sdk-s3', '~> 1.123', require: false
+gem 'blurhash', '~> 0.1'
 gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
-gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.17.0', require: false
+gem 'bootsnap', '~> 1.18.0', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
-gem 'devise-two-factor', '~> 4.1'
+gem 'devise-two-factor'
 
 group :pam_authentication, optional: true do
   gem 'devise_pam_authenticatable2', '~> 9.2'
@@ -39,11 +39,11 @@ end
 
 gem 'net-ldap', '~> 0.18'
 
-gem 'omniauth-cas', '~> 3.0.0.beta.1'
-gem 'omniauth-saml', '~> 2.0'
-gem 'omniauth_openid_connect', '~> 0.6.1'
 gem 'omniauth', '~> 2.0'
+gem 'omniauth-cas', '~> 3.0.0.beta.1'
+gem 'omniauth_openid_connect', '~> 0.6.1'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
+gem 'omniauth-saml', '~> 2.0'
 
 gem 'color_diff', '~> 0.1'
 gem 'csv', '~> 3.2'
@@ -53,48 +53,49 @@ gem 'ed25519', '~> 1.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
-gem 'redis-namespace', '~> 1.10'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 5.1'
+gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.6.2'
+gem 'i18n'
 gem 'idn-ruby', require: 'idn'
+gem 'inline_svg'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
+gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa', github: 'jhawthorn/nsa', ref: 'e020fcc3a54d993ab45b7194d89ab720296c111b'
+gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
-gem 'posix-spawn'
+gem 'premailer-rails'
 gem 'public_suffix', '~> 5.0'
 gem 'pundit', '~> 2.3'
-gem 'premailer-rails'
 gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 2.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 7.0'
 gem 'redcarpet', '~> 3.6'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
-gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
+gem 'redis-namespace', '~> 1.10'
 gem 'rqrcode', '~> 2.2'
 gem 'ruby-progressbar', '~> 1.13'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.7'
 gem 'sidekiq', '~> 6.5'
+gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'sidekiq-scheduler', '~> 5.0'
 gem 'sidekiq-unique-jobs', '~> 7.1'
-gem 'sidekiq-bulk', '~> 0.2.0'
-gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
-gem 'stoplight', '~> 3.0.1'
-gem 'strong_migrations', '1.7.0'
+gem 'simple-navigation', '~> 4.4'
+gem 'stoplight', '~> 4.1'
+gem 'strong_migrations', '1.8.0'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'
+gem 'webauthn', '~> 3.0'
 gem 'webpacker', '~> 5.4'
 gem 'webpush', github: 'ClearlyClaire/webpush', ref: 'f14a4d52e201128b1b00245d11b6de80d6cfdcd9'
-gem 'webauthn', '~> 3.0'
 
 gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
@@ -102,6 +103,24 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'private_address_check', '~> 0.5'
 
+group :opentelemetry do
+  gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
+  gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
+  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
+  gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
+  gem 'opentelemetry-instrumentation-excon', '~> 0.22.0', require: false
+  gem 'opentelemetry-instrumentation-faraday', '~> 0.24.1', require: false
+  gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false
+  gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false
+  gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.27.1', require: false
+  gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.30.0', require: false
+  gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
+  gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false
+  gem 'opentelemetry-sdk', '~> 1.4', require: false
+end
+
 group :test do
   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab
   gem 'rspec-github', '~> 2.4', require: false
@@ -112,8 +131,8 @@ group :test do
   # RSpec helpers for email specs
   gem 'email_spec'
 
-  # Extra RSpec extenion methods and helpers for sidekiq
-  gem 'rspec-sidekiq', '~> 4.0'
+  # Extra RSpec extension methods and helpers for sidekiq
+  gem 'rspec-sidekiq', '~> 5.0'
 
   # Browser integration testing
   gem 'capybara', '~> 3.39'
@@ -123,13 +142,7 @@ group :test do
   gem 'database_cleaner-active_record'
 
   # Used to mock environment variables
-  gem 'climate_control', '~> 0.2'
-
-  # Generating fake data for specs
-  gem 'faker', '~> 3.2'
-
-  # Generate test objects for specs
-  gem 'fabrication', '~> 2.30'
+  gem 'climate_control'
 
   # Add back helpers functions removed in Rails 5.1
   gem 'rails-controller-testing', '~> 1.0'
@@ -165,7 +178,7 @@ group :development do
 
   # Preview mail in the browser
   gem 'letter_opener', '~> 1.8'
-  gem 'letter_opener_web', '~> 2.0'
+  gem 'letter_opener_web', '~> 3.0'
 
   # Security analysis CLI tools
   gem 'brakeman', '~> 6.0', require: false
@@ -182,6 +195,12 @@ group :development, :test do
   # Interactive Debugging tools
   gem 'debug', '~> 1.8'
 
+  # Generate fake data values
+  gem 'faker', '~> 3.2'
+
+  # Generate factory objects
+  gem 'fabrication', '~> 2.30'
+
   # Profiling tools
   gem 'memory_profiler', require: false
   gem 'ruby-prof', require: false
@@ -196,12 +215,14 @@ group :production do
   gem 'lograge', '~> 0.12'
 end
 
+gem 'cocoon', '~> 1.2'
 gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 gem 'xorcist', '~> 1.1'
-gem 'cocoon', '~> 1.2'
 
 gem 'net-http', '~> 0.4.0'
 gem 'rubyzip', '~> 2.3'
 
 gem 'hcaptcha', '~> 7.1'
+
+gem 'mail', '~> 2.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index e9c62eb115..6001c73db4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,49 +7,38 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
-GIT
-  remote: https://github.com/jhawthorn/nsa.git
-  revision: e020fcc3a54d993ab45b7194d89ab720296c111b
-  ref: e020fcc3a54d993ab45b7194d89ab720296c111b
-  specs:
-    nsa (0.2.8)
-      activesupport (>= 4.2, < 7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -57,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -75,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -108,22 +97,20 @@ GEM
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    attr_encrypted (4.0.0)
-      encryptor (~> 3.0.0)
-    attr_required (1.0.1)
+    attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.873.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.929.0)
+    aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.81.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -143,21 +130,14 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
-    bigdecimal (3.1.5)
-    bindata (2.4.15)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    bigdecimal (3.1.8)
+    bindata (2.5.0)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     blurhash (0.1.7)
-    bootsnap (1.17.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    brakeman (6.1.1)
+    brakeman (6.1.2)
       racc
     browser (5.3.1)
     brpoplpush-redis_script (0.1.3)
@@ -167,97 +147,91 @@ GEM
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     case_transform (0.2)
       activesupport
-    cbor (0.5.9.6)
+    cbor (0.5.9.8)
     charlock_holmes (0.7.7)
-    chewy (7.4.0)
+    chewy (7.6.0)
       activesupport (>= 5.2)
-      elasticsearch (>= 7.12.0, < 7.14.0)
+      elasticsearch (>= 7.14.0, < 8)
       elasticsearch-dsl
     chunky_png (1.4.0)
-    climate_control (0.2.0)
+    climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.14.0)
+    css_parser (1.17.1)
       addressable
-    csv (3.2.8)
+    csv (3.3.0)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    debug_inspector (1.1.0)
-    devise (4.9.3)
+    debug_inspector (1.2.0)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-two-factor (4.1.1)
+    devise-two-factor (5.0.0)
       activesupport (~> 7.0)
-      attr_encrypted (>= 1.3, < 5, != 2)
       devise (~> 4.0)
       railties (~> 7.0)
       rotp (~> 6.0)
     devise_pam_authenticatable2 (9.2.0)
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.8)
+    domain_name (0.6.20240107)
+    doorkeeper (5.6.9)
       railties (>= 5)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
+    dotenv (3.1.2)
+    drb (2.2.1)
     ed25519 (1.3.0)
-    elasticsearch (7.13.3)
-      elasticsearch-api (= 7.13.3)
-      elasticsearch-transport (= 7.13.3)
-    elasticsearch-api (7.13.3)
+    elasticsearch (7.17.10)
+      elasticsearch-api (= 7.17.10)
+      elasticsearch-transport (= 7.17.10)
+    elasticsearch-api (7.17.10)
       multi_json
     elasticsearch-dsl (0.1.10)
-    elasticsearch-transport (7.13.3)
-      faraday (~> 1)
+    elasticsearch-transport (7.17.10)
+      faraday (>= 1, < 3)
       multi_json
     email_spec (2.2.2)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
       mail (~> 2.7)
-    encryptor (3.0.0)
     erubi (1.12.0)
-    et-orbi (1.2.7)
+    et-orbi (1.2.11)
       tzinfo
-    excon (0.109.0)
+    excon (0.110.0)
     fabrication (2.31.0)
-    faker (3.2.2)
+    faker (3.3.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
@@ -285,10 +259,10 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fast_blank (1.0.1)
-    fastimage (2.3.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    fastimage (2.3.1)
+    ffi (1.16.3)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
     fog-core (2.4.0)
       builder
@@ -298,11 +272,11 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-openstack (1.1.0)
+    fog-openstack (1.1.1)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
     formatador (1.1.0)
-    fugit (1.8.1)
+    fugit (1.10.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -310,6 +284,9 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-protobuf (3.25.3)
+    googleapis-common-protos-types (1.14.0)
+      google-protobuf (~> 3.18)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
@@ -319,39 +296,39 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.53.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
-    highline (2.1.0)
+    highline (3.0.1)
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (5.1.1)
+    http (5.2.0)
       addressable (~> 2.8)
+      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.4.0)
+      llhttp-ffi (~> 0.5.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
-    httplog (1.6.2)
+    httplog (1.6.3)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -360,14 +337,17 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
-    io-console (0.7.1)
-    irb (1.11.1)
-      rdoc
+    inline_svg (1.9.0)
+      activesupport (>= 3.0)
+      nokogiri (>= 1.6)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.7.1)
+    json (2.7.2)
     json-canonicalization (1.0.0)
-    json-jwt (1.15.3)
+    json-jwt (1.15.3.1)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -382,7 +362,7 @@ GEM
     json-ld-preloaded (3.3.0)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (4.1.1)
+    json-schema (4.3.0)
       addressable (>= 2.8)
     jsonapi-renderer (0.2.2)
     jwt (2.7.1)
@@ -398,24 +378,24 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kt-paperclip (7.2.1)
+    kt-paperclip (7.2.2)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)
       mime-types
-      terrapin (~> 0.6.0)
+      terrapin (>= 0.6.0, < 2.0)
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
-    letter_opener_web (2.0.0)
-      actionmailer (>= 5.2)
-      letter_opener (~> 1.7)
-      railties (>= 5.2)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
+    letter_opener_web (3.0.0)
+      actionmailer (>= 6.1)
+      letter_opener (~> 1.9)
+      railties (>= 6.1)
       rexml
     link_header (0.0.8)
-    llhttp-ffi (0.4.0)
+    llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     lograge (0.14.0)
@@ -431,7 +411,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
     matrix (0.4.2)
@@ -442,19 +422,19 @@ GEM
     memory_profiler (1.0.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    mini_portile2 (2.8.6)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.4)
+    net-imap (0.4.11)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -462,19 +442,24 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.16.0)
+    nio4r (2.7.1)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nsa (0.3.0)
+      activesupport (>= 4.2, < 7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      sidekiq (>= 3.5)
+      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.3)
       bigdecimal (>= 3.0)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-cas (3.0.0.beta.1)
+    omniauth-cas (3.0.0)
       addressable (~> 2.8)
       nokogiri (~> 1.12)
       omniauth (~> 2.1)
@@ -501,20 +486,109 @@ GEM
     openssl (3.2.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
+    opentelemetry-api (1.2.5)
+    opentelemetry-common (0.20.1)
+      opentelemetry-api (~> 1.0)
+    opentelemetry-exporter-otlp (0.26.3)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos-types (~> 1.3)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-sdk (~> 1.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-helpers-sql-obfuscation (0.1.0)
+      opentelemetry-common (~> 0.20)
+    opentelemetry-instrumentation-action_pack (0.9.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+      opentelemetry-instrumentation-rack (~> 0.21)
+    opentelemetry-instrumentation-action_view (0.7.0)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_job (0.7.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_model_serializers (0.20.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_record (0.7.2)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-active_support (0.5.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-base (0.22.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-registry (~> 0.1)
+    opentelemetry-instrumentation-concurrent_ruby (0.21.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-excon (0.22.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-faraday (0.24.2)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-http (0.23.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-http_client (0.22.4)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-net_http (0.22.4)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-pg (0.27.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-helpers-sql-obfuscation
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-rack (0.24.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-rails (0.30.1)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-instrumentation-action_pack (~> 0.9.0)
+      opentelemetry-instrumentation-action_view (~> 0.7.0)
+      opentelemetry-instrumentation-active_job (~> 0.7.0)
+      opentelemetry-instrumentation-active_record (~> 0.7.0)
+      opentelemetry-instrumentation-active_support (~> 0.5.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-redis (0.25.4)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-instrumentation-sidekiq (0.25.3)
+      opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.20.0)
+      opentelemetry-instrumentation-base (~> 0.22.1)
+    opentelemetry-registry (0.3.1)
+      opentelemetry-api (~> 1.1)
+    opentelemetry-sdk (1.4.1)
+      opentelemetry-api (~> 1.1)
+      opentelemetry-common (~> 0.20)
+      opentelemetry-registry (~> 0.2)
+      opentelemetry-semantic_conventions
+    opentelemetry-semantic_conventions (1.10.0)
+      opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
-    ox (2.14.17)
+    ox (2.14.18)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.4)
-    pghero (3.4.0)
+    pg (1.5.6)
+    pghero (3.4.1)
       activerecord (>= 6)
-    posix-spawn (0.3.15)
-    premailer (1.21.0)
+    premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -530,17 +604,17 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.1)
+    pundit (2.3.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
-    rack-cors (2.0.1)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-oauth2 (1.21.3)
       activesupport
@@ -548,31 +622,32 @@ GEM
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.5)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-proxy (0.7.7)
       rack
-    rack-proxy (0.7.6)
-      rack
-    rack-session (1.0.1)
+    rack-session (1.0.2)
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -584,25 +659,25 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rdf (3.3.1)
       bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-normalize (0.6.1)
-      rdf (~> 3.2)
-    rdoc (6.6.2)
+    rdf-normalize (0.7.0)
+      rdf (~> 3.3)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -610,78 +685,82 @@ GEM
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.8.3)
-    reline (0.4.2)
+    regexp_parser (2.9.0)
+    reline (0.5.7)
       io-console (~> 0.5)
-    request_store (1.5.1)
+    request_store (1.6.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rotp (6.3.0)
-    rouge (4.1.2)
+    rouge (4.2.1)
     rpam2 (4.0.2)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-sidekiq (4.1.0)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-sidekiq (5.0.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.12.1)
-    rubocop (1.59.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.20.2)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.1)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.15.0)
+    ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby2_keywords (0.0.5)
@@ -693,10 +772,11 @@ GEM
     sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    scenic (1.7.0)
+    scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.21.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -711,7 +791,7 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.31)
+    sidekiq-unique-jobs (7.1.33)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)
@@ -729,14 +809,14 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    smart_properties (1.17.0)
-    stackprof (0.2.25)
+    stackprof (0.2.26)
     statsd-ruby (1.5.0)
-    stoplight (3.0.2)
+    stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.0)
-    strong_migrations (1.7.0)
+    strong_migrations (1.8.0)
       activerecord (>= 5.2)
+    strscan (3.1.0)
     swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -745,10 +825,10 @@ GEM
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
-    test-prof (1.3.1)
-    thor (1.3.0)
+    terrapin (1.0.1)
+      climate_control
+    test-prof (1.3.3)
+    thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)
@@ -764,19 +844,19 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.2)
+    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
-    uri (0.12.2)
+    uri (0.13.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -797,7 +877,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -815,7 +895,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby
@@ -828,14 +908,14 @@ DEPENDENCIES
   better_errors (~> 2.9)
   binding_of_caller (~> 1.0)
   blurhash (~> 0.1)
-  bootsnap (~> 1.17.0)
+  bootsnap (~> 1.18.0)
   brakeman (~> 6.0)
   browser
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
   charlock_holmes (~> 0.7.7)
   chewy (~> 7.3)
-  climate_control (~> 0.2)
+  climate_control
   cocoon (~> 1.2)
   color_diff (~> 0.1)
   concurrent-ruby
@@ -844,11 +924,11 @@ DEPENDENCIES
   database_cleaner-active_record
   debug (~> 1.8)
   devise (~> 4.9)
-  devise-two-factor (~> 4.1)
+  devise-two-factor
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
   doorkeeper (~> 5.6)
-  dotenv-rails (~> 2.8)
+  dotenv
   ed25519 (~> 1.3)
   email_spec
   fabrication (~> 2.30)
@@ -863,11 +943,13 @@ DEPENDENCIES
   hcaptcha (~> 7.1)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 5.1)
+  http (~> 5.2.0)
   http_accept_language (~> 2.1)
   httplog (~> 1.6.2)
+  i18n
   i18n-tasks (~> 1.0)
   idn-ruby
+  inline_svg
   irb (~> 1.8)
   json-ld
   json-ld-preloaded (~> 3.2)
@@ -875,9 +957,10 @@ DEPENDENCIES
   kaminari (~> 1.2)
   kt-paperclip (~> 7.2)
   letter_opener (~> 1.8)
-  letter_opener_web (~> 2.0)
+  letter_opener_web (~> 3.0)
   link_header (~> 0.0)
   lograge (~> 0.12)
+  mail (~> 2.8)
   mario-redis-lock (~> 1.2)
   md-paperclip-azure (~> 2.2)
   memory_profiler
@@ -885,18 +968,32 @@ DEPENDENCIES
   net-http (~> 0.4.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa!
+  nsa
   oj (~> 3.14)
   omniauth (~> 2.0)
   omniauth-cas (~> 3.0.0.beta.1)
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
+  opentelemetry-exporter-otlp (~> 0.26.3)
+  opentelemetry-instrumentation-active_job (~> 0.7.1)
+  opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
+  opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)
+  opentelemetry-instrumentation-excon (~> 0.22.0)
+  opentelemetry-instrumentation-faraday (~> 0.24.1)
+  opentelemetry-instrumentation-http (~> 0.23.2)
+  opentelemetry-instrumentation-http_client (~> 0.22.3)
+  opentelemetry-instrumentation-net_http (~> 0.22.4)
+  opentelemetry-instrumentation-pg (~> 0.27.1)
+  opentelemetry-instrumentation-rack (~> 0.24.1)
+  opentelemetry-instrumentation-rails (~> 0.30.0)
+  opentelemetry-instrumentation-redis (~> 0.25.3)
+  opentelemetry-instrumentation-sidekiq (~> 0.25.2)
+  opentelemetry-sdk (~> 1.4)
   ox (~> 2.14)
   parslet
   pg (~> 1.5)
   pghero
-  posix-spawn
   premailer-rails
   private_address_check (~> 0.5)
   propshaft
@@ -917,7 +1014,7 @@ DEPENDENCIES
   rqrcode (~> 2.2)
   rspec-github (~> 2.4)
   rspec-rails (~> 6.0)
-  rspec-sidekiq (~> 4.0)
+  rspec-sidekiq (~> 5.0)
   rubocop
   rubocop-capybara
   rubocop-performance
@@ -938,8 +1035,8 @@ DEPENDENCIES
   simplecov (~> 0.22)
   simplecov-lcov (~> 0.8)
   stackprof
-  stoplight (~> 3.0.1)
-  strong_migrations (= 1.7.0)
+  stoplight (~> 4.1)
+  strong_migrations (= 1.8.0)
   test-prof
   thor (~> 1.2)
   tty-prompt (~> 0.23)
@@ -952,7 +1049,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.4.20
+   2.5.9
diff --git a/README.md b/README.md
index 267f0ed295..e438d0bd7b 100644
--- a/README.md
+++ b/README.md
@@ -1,142 +1,112 @@
-<h1><picture>
-  <source media="(prefers-color-scheme: dark)" srcset="./lib/assets/wordmark.dark.png?raw=true">
-  <source media="(prefers-color-scheme: light)" srcset="./lib/assets/wordmark.light.png?raw=true">
-  <img alt="Mastodon" src="./lib/assets/wordmark.light.png?raw=true" height="34">
-</picture></h1>
+# ![kmyblue icon](https://raw.githubusercontent.com/kmycode/mastodon/kb_development/app/javascript/icons/favicon-32x32.png) kmyblue
 
-[![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
-[![Ruby Testing](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]
+[![Ruby Testing](https://github.com/kmycode/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/kmycode/mastodon/actions/workflows/test-ruby.yml)
 
-[releases]: https://github.com/mastodon/mastodon/releases
-[crowdin]: https://crowdin.com/project/mastodon
+kmyblueは[Mastodon](https://github.com/mastodon/mastodon)のフォークです。創作作家のためのMastodonを目指して開発しました。
 
-Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, and video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub!)
+kmyblueはフォーク名であり、同時に[サーバー名](https://kmy.blue)でもあります。以下は特に記述がない限り、フォークとしてのkmyblueをさします。
 
-Click below to **learn more** in a video:
+kmyblueは AGPL ライセンスで公開されているため、どなたでも自由にフォークし、このソースコードを元に自分でサーバーを立てて公開することができます。確かにサーバーkmyblueは創作作家向けのものですが、フォークとしてのkmyblueはAGPLでライセンスつけられており、ルールは全くの別物です。創作活動の一部（エロ関係含む）または全体を否定するコミュニティなどにも平等にお使いいただけます。サーバーkmyblueのルールを適用する必要もなく、「Anyone But Kmyblue」なルールを設定することすら許容されます。  
+kmyblueは、特に非収載投稿の検索が強化されているため、ローカルタイムラインに掲載されていない投稿も検索・購読することが可能な場合があります。閉鎖的なコミュニティ、あまり目立ちたくないコミュニティには特に強力な機能を提供します。それ以外のコミュニティに対しても、kmyblueはプライバシーを考慮したうえで強力な検索・購読機能を提供するため、汎用サーバーとして利用するにもある程度十分な機能が揃っています。
 
-[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]
+ただしkmyblueにおいて**テストコードは飾り**でしかありません。これはkmyblueを利用する人が本家Mastodonより圧倒的に少なく、バグやセキュリティインシデントを発見するだけの人数が足りないことを意味します。kmyblueは対策として自動テストを拡充しています。独自機能のテストを記述するだけでなく、本家のテストコードの補強も行っておりますが、確認漏れは必ず発生するものです。不具合が発生しても自己責任になります。既知のバグもいくつかありますし、直す予定のないものも含まれます。
 
-[youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE
+テストコード、Lint どちらも動いています。
 
-## Navigation
+## インストール方法
 
-- [Project homepage 🐘](https://joinmastodon.org)
-- [Support the development via Patreon][patreon]
-- [View sponsors](https://joinmastodon.org/sponsors)
-- [Blog](https://blog.joinmastodon.org)
-- [Documentation](https://docs.joinmastodon.org)
-- [Roadmap](https://joinmastodon.org/roadmap)
-- [Official Docker image](https://github.com/mastodon/mastodon/pkgs/container/mastodon)
-- [Browse Mastodon servers](https://joinmastodon.org/communities)
-- [Browse Mastodon apps](https://joinmastodon.org/apps)
+[Wiki](https://github.com/kmycode/mastodon/wiki/Installation)を参照してください。
 
-[patreon]: https://www.patreon.com/mastodon
+## 開発への参加方法
 
-## Features
+CONTRIBUTING.mdを参照してください。
 
-<img src="/app/javascript/images/elephant_ui_working.svg?raw=true" align="right" width="30%" />
+## テスト
 
-### No vendor lock-in: Fully interoperable with any conforming platform
+```
+# デバッグ実行（以下のいずれか）
+foreman start
+DB_USER=postgres DB_PASS=password foreman start
 
-It doesn't have to be Mastodon; whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
+# 一部を除く全てのテストを行う
+RAILS_ENV=test bundle exec rspec spec
 
-### Real-time, chronological timeline updates
+# ElasticSearch連携テストを行う
+新
+RAILS_ENV=test ES_ENABLED=true bundle exec rspec --tag search
+旧
+RAILS_ENV=test ES_ENABLED=true RUN_SEARCH_SPECS=true bundle exec rspec spec/search
+```
 
-Updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
+## kmyblueのブランチ
 
-### Media attachments like images and short videos
+- **main** - 管理者が本家MastodonにPRするときに使うことがあります
+- **kb_development** - 開発中の最新のソースコードです。メジャーバージョンアップデートは通常このブランチから公開されます
+- **kb_lts** - LTSの管理に使います。LTSはこのブランチから公開されます
+- **kb_patch** - 修正パッチの管理に使います。マイナーバージョンアップデートは通常このブランチから公開されます
 
-Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos loop continuously!
+## kmyblueの強み
 
-### Safety and moderation tools
+追加の詳細は下記記事もご覧ください。
 
-Mastodon includes private posts, locked accounts, phrase filtering, muting, blocking, and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
+https://note.com/kmycode/n/n5fd5e823ed40
 
-### OAuth2 and a straightforward REST API
+以下に書いているもの以外にも多数の機能が存在します。
 
-Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Streaming APIs. This results in a rich app ecosystem with a lot of choices!
+### 本家Mastodonへの積極的追従
 
-## Deployment
+kmyblueは、追加機能を控えめにする代わりに本家Mastodonに積極的に追従を行います。kmyblueの追加機能そのままに、Mastodonの新機能も利用できるよう調整を行います。
 
-### Tech stack
+### ゆるやかな内輪での運用
 
-- **Ruby on Rails** powers the REST API and other web pages
-- **React.js** and Redux are used for the dynamic parts of the interface
-- **Node.js** powers the streaming API
+kmyblueは同人向けサーバーとして出発したため、同人作家に需要のある「内輪ノリを外部にできるだけもらさない」という部分に特化しています。
 
-### Requirements
+「ローカル公開」という機能によって、「ローカルタイムラインに流すが他のサーバーの連合タイムラインに流さない」投稿が可能です。ただしMisskeyのローカル限定とは異なり、他のサーバーのフォロワーのタイムラインにも投稿は流れます。自分のサーバーの中で内輪で盛り上がって、他のサーバーの連合タイムラインには外面だけの投稿を流すことも可能です。
 
-- **PostgreSQL** 12+
-- **Redis** 4+
-- **Ruby** 2.7+
-- **Node.js** 16+
+「サークル」という機能によって、特定のフォロワーにだけ見える投稿を行うことも可能です。その投稿に返信することで、相手サークルの会話に参加することも可能です。ただしサークル投稿を正常に処理できるソフトウェアは現在、kmyblue・Fedibirdに限ります。
 
-The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
+また、通常のMastodonでは公開投稿を他のサーバーの人に自由に検索できるようにすることも可能ですが、kmyblueでは非収載投稿に対して同様の設定が可能です。つまり、ローカルタイムラインにも連合タイムラインにも流れない、誰かの目に自然に触れることはない、でも特定キーワードを使った検索では引っかかりたい、そのような需要に対応できます。
 
-## Development
+内輪とは自分のサーバーに限ったものではありません。内輪同士で複数のサーバーを運営するとき、お互いが深く繋がれるフレンドサーバーというシステムも用意しています。
 
-### Vagrant
+ただしkmyblueは、同時に連合も重視しています。ローカル限定投稿など、連合を大きく制限させるような機能は作る予定はありません。
 
-A **Vagrant** configuration is included for development purposes. To use it, complete the following steps:
+### 少人数サーバーでの運用
 
-- Install Vagrant and Virtualbox
-- Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
-- Run `vagrant up`
-- Run `vagrant ssh -c "cd /vagrant && foreman start"`
-- Open `http://mastodon.local` in your browser
+kmyblueは、人の少ないサーバーでの運用を考慮して設計しています。そのため、他のサーバーのアカウントの購読機能はFedibirdほど発達していませんし、人の多いサーバー向けの独自改造もほとんど存在しません。
 
-### MacOS
+ただしサーバーの負荷については一部度外視している部分があります。たとえば絵文字リアクション機能はサーバーへ著しい負荷をかける場合があります。絵文字リアクション機能そのものを無効にする管理者オプションも存在します。
 
-To set up **MacOS** for native development, complete the following steps:
+もちろん人の多いサーバーでの運用が不便になるような修正は行っていません。人の多いサーバーでもそのままお使いいただけます。
 
-- Install the latest stable Ruby version (use a Ruby version manager for easy installation and management of Ruby versions)
-- Run `brew install postgresql@14`
-- Run `brew install redis`
-- Run `brew install imagemagick`
-- Run `brew install libidn`
-- Install Foreman or a similar tool (such as [overmind](https://github.com/DarthSim/overmind)) to handle multiple process launching.
-- Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from .nvmrc
-- Run `corepack enable && corepack prepare`
-- Run `bundle exec rails db:setup` (optionally prepend `RAILS_ENV=development` to target the dev environment)
-- Finally, run `overmind start -f Procfile.dev`
+### 比較的高い防御力
 
-### Docker
+kmyblueでは、「Fediverseは将来的に荒むのではないか」「Fediverseは将来的にスパムに溢れるのではないか」を念頭に設計している部分があります。
 
-For development with **Docker**, complete the following steps:
+個別ユーザー向けの設定項目が複数あります。
 
-- Install Docker Desktop
-- Run `docker compose -f .devcontainer/docker-compose.yml up -d`
-- Run `docker compose -f .devcontainer/docker-compose.yml exec app .devcontainer/post-create.sh`
-- Finally, run `docker compose -f .devcontainer/docker-compose.yml exec app foreman start -f Procfile.dev`
+- Misskeyは、たとえMastodonの投稿であっても非収載投稿を自由に検索できますが、kmyblueではそれをブロックできるユーザー設定が存在します
+- 他の人からの絵文字リアクションの受け入れを制限する設定も可能であり、例えば他のサーバーから好ましくない絵文字リアクションを受け取ることを防止できます
+- 公開タイムラインの引用表示はデフォルトで無効になっています。不快な投稿を引用したものが公開タイムラインに流れても、ある程度は防止できます
+  - フィルター（ワードミュート）は、引用された投稿の内容にも適用されます。この場合、引用投稿そのものが表示されなくなります
+- 自分のフォローしている相手の投稿をフィルターから除外する設定が存在します。防御を上げすぎると不便な箇所が出てくるので、そちらも緩和できるよう可能な限り配慮しています
 
-If you are using an IDE with [support for the Development Container specification](https://containers.dev/supporting), it will run the above `docker compose` commands automatically. For **Visual Studio Code** this requires the [Dev Container extension](https://containers.dev/supporting#dev-containers).
+管理者向けには、スパムへの利用を前提とした正規表現可能なNGワード設定、細かい指定が可能な拡張ドメインブロック機能を用意しています。
 
-### GitHub Codespaces
+ただし防御力の高さは自由を犠牲にします。例えばkmyblueは、絵文字リアクションの表示サイズ調整機能など、MisskeyやFedibirdには当たり前のようにある表示設定は存在しません。騒がしくなるようなものはあまり作りたいとは考えていません。
 
-To get you coding in just a few minutes, GitHub Codespaces provides a web-based version of Visual Studio Code and a cloud-hosted development environment fully configured with the software needed for this project..
+### その他の主な機能
 
-- Click this button to create a new codespace:<br>
-  [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=52281283&devcontainer_path=.devcontainer%2Fcodespaces%2Fdevcontainer.json)
-- Wait for the environment to build. This will take a few minutes.
-- When the editor is ready, run `foreman start -f Procfile.dev` in the terminal.
-- After a few seconds, a popup will appear with a button labeled _Open in Browser_. This will open Mastodon.
-- On the _Ports_ tab, right click on the “stream” row and select _Port visibility_ → _Public_.
+- 絵文字リアクションによる手軽な交流
+- 絵文字デッキによる頻繁に使用する絵文字の登録・選択
+- 検索機能の強化（検索許可）
+- 投稿の引用
+- ブックマークの分類
 
-## Contributing
+## kmyblueは何でないか
 
-Mastodon is **free, open-source software** licensed under **AGPLv3**.
+kmyblueは、Misskeyではありません。絵文字リアクションなどMisskeyと同様の機能はありますが、根本的にUIの使い勝手が違う他にも、例えばブックマークを分類できてもそれを公開する機能を作っていません。Misskeyは「楽しむ」をコンセプトにしていますが、kmyblueはMastodonの思想を受け継ぎ、炎上や喧騒を避けることのできる落ち着いた場所を目指しています。そのため、思想に合わない機能は実装しないか、大幅に弱体化しています。
 
-You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository or submit translations using Crowdin. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
+kmyblueは、Fedibirdではありません。確かにローカルタイムラインを無効にしFedibirdのような運営を可能にする設定は存在します。しかしkmyblueは本家追従を優先する観点からWebで対応する範囲をある程度絞り込んでいるため、Fedibirdにあるような豊富な表示設定は作っていません。絵文字の大きさすら調整することはできません。また、Fedibirdではアカウントの購読機能があります。kmyblueにも同様の機能はあるものの、Fedibirdのように一発ですぐできるようなUIではありません。購読機能は相手のフォローを伴わないため、特に利用者に擬似的なフォロー体験を与えるアカウント購読は、人の少ない小規模サーバーには向いていません。これは、小規模サーバーの運用を想定しているkmyblueがあえて作っていない部分です。
 
-**IRC channel**: #mastodon on irc.libera.chat
-
-## License
-
-Copyright (C) 2016-2024 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+kmyblueは、企業・政府機関向けに開発されたものではありません。そもそも管理者はセキュリティに関する資格や専門知識を有しておらず、高度なセキュリティの求められる機関向けのソフトウェアを制作する能力はありません。kmyblueは確かに本家Mastodonに対して大幅に機能を追加していますが、そもそも個人によるフォークは、開発者が飽きたらそこで終わりというリスクも伴います。高い信頼性・安全性を保証することはできないので、導入の際はご自身で安全を十分に確認してからお使いになることを強くおすすめします。
diff --git a/SECURITY.md b/SECURITY.md
index 81472b01b4..d5b27adfac 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,20 +1,25 @@
-# Security Policy
+# セキュリティポリシー
 
-If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can either:
+kmyblueのプログラムにおいてセキュリティインシデントを発見した場合、kmyblueに報告してください。
 
-- open a [Github security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
-- reach us at <security@joinmastodon.org>
+kmyblueにセキュリティインシデントを報告する場合、以下の手順を踏んでください。
 
-You should _not_ report such issues on public GitHub issues or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.
+- [こちらのリンクから新規インシデントを起票してください](https://github.com/kmycode/mastodon/security/advisories/new)
+- メール <tt@kmycode.net>、または[@askyq@kmy.blue](https://kmy.blue/@askyq)宛に、**セキュリティインシデントを起票したことだけ**を連絡してください。セキュリティインシデントの内容は、絶対に連絡に含めないでください（リンクくらいなら含めていいかな）
 
-## Scope
+他のkmyblueフォークの利用者の安全のために少しでも時間稼ぎをしなければいけないので、この問題をIssueを含む公開された場所で記述しないでください。
 
-A "vulnerability in Mastodon" is a vulnerability in the code distributed through our main source code repository on GitHub. Vulnerabilities that are specific to a given installation (e.g. misconfiguration) should be reported to the owner of that installation and not us.
+## 範囲
 
-## Supported Versions
+こちらが対応できる範囲は、当リポジトリで公開しているソースコードのみとなります。当リポジトリの依存パッケージ内に問題がある場合は、そちらに報告してください。
 
-| Version | Supported |
-| ------- | --------- |
-| 4.2.x   | Yes       |
-| 4.1.x   | Yes       |
-| < 4.1   | No        |
+もしあなたに専門知識があり、それが本家Mastodon由来の問題であると信じるに足る根拠がある場合、kmyblueではなくMastodonのほうに報告してください。kmyblueに報告されても、Mastodonより先に修正してしまうことでMastodonにセキュリティリスクを発生させる可能性がありますし、本家Mastodonの対応を待つにしてもkmyblueのほうに来てしまったセキュリティインシデントの対応に困ります（本家がなかなか対応してくれない可能性を考えると削除しづらい）。もし間違ってkmyblueに来た場合、kmyblue開発者の責任で振り分けを行います。
+
+## サポートするバージョン
+
+下記以外のバージョンは、セキュリティインシデントを起票されても対応しません。
+
+- 最新メジャーバージョン、かつ、最新マイナーバージョン
+  - 最新メジャーバージョンのサポートは、次のメジャーバージョンが出た時点で終了します
+- LTS
+  - LTSのサポートは、次のLTSが出た時点で終了します（ただし移行期間があってもいいと思ってるので、１〜３ヶ月以内ならセキュリティインシデントの程度に応じて対応する可能性があります）
diff --git a/Vagrantfile b/Vagrantfile
index 6f0f511095..8a95e91f36 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -173,6 +173,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Otherwise, you can access the site at http://localhost:3000 and http://localhost:4000 , http://localhost:8080
   config.vm.network :forwarded_port, guest: 3000, host: 3000
+  config.vm.network :forwarded_port, guest: 3035, host: 3035
   config.vm.network :forwarded_port, guest: 4000, host: 4000
   config.vm.network :forwarded_port, guest: 8080, host: 8080
   config.vm.network :forwarded_port, guest: 9200, host: 9200
@@ -188,7 +189,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.post_up_message = <<MESSAGE
 To start server
-  $ vagrant ssh -c "cd /vagrant && foreman start"
+  $ vagrant ssh -c "cd /vagrant && bin/dev"
 MESSAGE
 
 end
diff --git a/app/chewy/accounts_index.rb b/app/chewy/accounts_index.rb
index 59f2f991f2..d70a96c444 100644
--- a/app/chewy/accounts_index.rb
+++ b/app/chewy/accounts_index.rb
@@ -3,68 +3,28 @@
 class AccountsIndex < Chewy::Index
   include DatetimeClampingConcern
 
-  settings index: index_preset(refresh_interval: '30s'), analysis: {
-    filter: {
-      english_stop: {
-        type: 'stop',
-        stopwords: '_english_',
-      },
-
-      english_stemmer: {
-        type: 'stemmer',
-        language: 'english',
-      },
-
-      english_possessive_stemmer: {
-        type: 'stemmer',
-        language: 'possessive_english',
-      },
-    },
-
-    analyzer: {
-      natural: {
-        tokenizer: 'standard',
-        filter: %w(
-          lowercase
-          asciifolding
-          cjk_width
-          elision
-          english_possessive_stemmer
-          english_stop
-          english_stemmer
-        ),
-      },
-
-      verbatim: {
-        tokenizer: 'standard',
-        filter: %w(lowercase asciifolding cjk_width),
-      },
-
-      edge_ngram: {
-        tokenizer: 'edge_ngram',
-        filter: %w(lowercase asciifolding cjk_width),
-      },
-    },
-
-    tokenizer: {
-      edge_ngram: {
-        type: 'edge_ngram',
-        min_gram: 1,
-        max_gram: 15,
-      },
-    },
-  }
+  # ElasticSearch config is moved to "/config/elasticsearch.default.yml".
+  # Edit it when original Mastodon changed ElasticSearch config.
+  settings index: index_preset(refresh_interval: '30s'), analysis: ChewyConfig.instance.accounts
 
   index_scope ::Account.searchable.includes(:account_stat)
 
   root date_detection: false do
     field(:id, type: 'long')
-    field(:following_count, type: 'long')
-    field(:followers_count, type: 'long')
+    field(:following_count, type: 'long', value: ->(account) { account.public_following_count })
+    field(:followers_count, type: 'long', value: ->(account) { account.public_followers_count })
     field(:properties, type: 'keyword', value: ->(account) { account.searchable_properties })
     field(:last_status_at, type: 'date', value: ->(account) { clamp_date(account.last_status_at || account.created_at) })
-    field(:display_name, type: 'text', analyzer: 'verbatim') { field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'verbatim' }
-    field(:username, type: 'text', analyzer: 'verbatim', value: ->(account) { [account.username, account.domain].compact.join('@') }) { field :edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'verbatim' }
-    field(:text, type: 'text', analyzer: 'verbatim', value: ->(account) { account.searchable_text }) { field :stemmed, type: 'text', analyzer: 'natural' }
+    field(:domain, type: 'keyword', value: ->(account) { account.domain || '' })
+    field(:display_name, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('display_name', 'analyzer')) do
+      field :edge_ngram, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('display_name', 'edge_ngram', 'analyzer'), search_analyzer: ChewyConfig.instance.accounts_analyzers.dig('display_name', 'edge_ngram', 'search_analyzer')
+    end
+    field(:username, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('username', 'analyzer'), value: lambda { |account|
+                                                                                                                           [account.username, account.domain].compact.join('@')
+                                                                                                                         }) do
+      field :edge_ngram, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('username', 'edge_ngram', 'analyzer'),
+                         search_analyzer: ChewyConfig.instance.accounts_analyzers.dig('username', 'edge_ngram', 'search_analyzer')
+    end
+    field(:text, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('text', 'analyzer'), value: ->(account) { account.searchable_text }) { field(:stemmed, type: 'text', analyzer: ChewyConfig.instance.accounts_analyzers.dig('text', 'stemmed', 'analyzer')) }
   end
 end
diff --git a/app/chewy/public_statuses_index.rb b/app/chewy/public_statuses_index.rb
index 09a4dfc093..b71406d3e3 100644
--- a/app/chewy/public_statuses_index.rb
+++ b/app/chewy/public_statuses_index.rb
@@ -3,66 +3,22 @@
 class PublicStatusesIndex < Chewy::Index
   include DatetimeClampingConcern
 
-  settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: {
-    filter: {
-      english_stop: {
-        type: 'stop',
-        stopwords: '_english_',
-      },
-
-      english_stemmer: {
-        type: 'stemmer',
-        language: 'english',
-      },
-
-      english_possessive_stemmer: {
-        type: 'stemmer',
-        language: 'possessive_english',
-      },
-    },
-
-    analyzer: {
-      verbatim: {
-        tokenizer: 'uax_url_email',
-        filter: %w(lowercase),
-      },
-
-      content: {
-        tokenizer: 'standard',
-        filter: %w(
-          lowercase
-          asciifolding
-          cjk_width
-          elision
-          english_possessive_stemmer
-          english_stop
-          english_stemmer
-        ),
-      },
-
-      hashtag: {
-        tokenizer: 'keyword',
-        filter: %w(
-          word_delimiter_graph
-          lowercase
-          asciifolding
-          cjk_width
-        ),
-      },
-    },
-  }
+  # ElasticSearch config is moved to "/config/elasticsearch.default.yml".
+  # Edit it when original Mastodon changed ElasticSearch config.
+  settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: ChewyConfig.instance.public_statuses
 
   index_scope ::Status.unscoped
                       .kept
                       .indexable
-                      .includes(:media_attachments, :preloadable_poll, :tags, preview_cards_status: :preview_card)
+                      .includes(:media_attachments, :preloadable_poll, :tags, :account, preview_cards_status: :preview_card)
 
   root date_detection: false do
     field(:id, type: 'long')
     field(:account_id, type: 'long')
-    field(:text, type: 'text', analyzer: 'verbatim', value: ->(status) { status.searchable_text }) { field(:stemmed, type: 'text', analyzer: 'content') }
-    field(:tags, type: 'text', analyzer: 'hashtag', value: ->(status) { status.tags.map(&:display_name) })
+    field(:text, type: 'text', analyzer: ChewyConfig.instance.public_statuses_analyzers.dig('text', 'analyzer'), value: ->(status) { status.searchable_text }) { field(:stemmed, type: 'text', analyzer: ChewyConfig.instance.public_statuses_analyzers.dig('text', 'stemmed', 'analyzer')) }
+    field(:tags, type: 'text', analyzer: ChewyConfig.instance.public_statuses_analyzers.dig('tags', 'analyzer'), value: ->(status) { status.tags.map(&:display_name) })
     field(:language, type: 'keyword')
+    field(:domain, type: 'keyword', value: ->(status) { status.account.domain || '' })
     field(:properties, type: 'keyword', value: ->(status) { status.searchable_properties })
     field(:created_at, type: 'date', value: ->(status) { clamp_date(status.created_at) })
   end
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index e739ccecb4..44cb86d755 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -3,64 +3,49 @@
 class StatusesIndex < Chewy::Index
   include DatetimeClampingConcern
 
-  settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: {
-    filter: {
-      english_stop: {
-        type: 'stop',
-        stopwords: '_english_',
-      },
+  # ElasticSearch config is moved to "/config/elasticsearch.default.yml".
+  # Edit it when original Mastodon changed ElasticSearch config.
+  settings index: index_preset(refresh_interval: '30s', number_of_shards: 5), analysis: ChewyConfig.instance.statuses
 
-      english_stemmer: {
-        type: 'stemmer',
-        language: 'english',
-      },
-
-      english_possessive_stemmer: {
-        type: 'stemmer',
-        language: 'possessive_english',
-      },
-    },
-
-    analyzer: {
-      verbatim: {
-        tokenizer: 'uax_url_email',
-        filter: %w(lowercase),
-      },
-
-      content: {
-        tokenizer: 'standard',
-        filter: %w(
-          lowercase
-          asciifolding
-          cjk_width
-          elision
-          english_possessive_stemmer
-          english_stop
-          english_stemmer
-        ),
-      },
-
-      hashtag: {
-        tokenizer: 'keyword',
-        filter: %w(
-          word_delimiter_graph
-          lowercase
-          asciifolding
-          cjk_width
-        ),
-      },
-    },
-  }
-
-  index_scope ::Status.unscoped.kept.without_reblogs.includes(:media_attachments, :local_mentioned, :local_favorited, :local_reblogged, :local_bookmarked, :tags, preview_cards_status: :preview_card, preloadable_poll: :local_voters), delete_if: ->(status) { status.searchable_by.empty? }
+  index_scope ::Status.unscoped.kept.without_reblogs.includes(
+    :account,
+    :media_attachments,
+    :local_mentioned,
+    :local_favorited,
+    :local_reblogged,
+    :local_bookmarked,
+    :local_emoji_reacted,
+    :tags,
+    :local_referenced,
+    preview_cards_status: :preview_card,
+    preloadable_poll: :local_voters
+  ),
+              delete_if: lambda { |status|
+                           if status.searchability == 'direct'
+                             status.searchable_by.empty?
+                           else
+                             status.searchability == 'limited' ? !status.local? : false
+                           end
+                         }
 
   root date_detection: false do
     field(:id, type: 'long')
     field(:account_id, type: 'long')
-    field(:text, type: 'text', analyzer: 'verbatim', value: ->(status) { status.searchable_text }) { field(:stemmed, type: 'text', analyzer: 'content') }
-    field(:tags, type: 'text', analyzer: 'hashtag',  value: ->(status) { status.tags.map(&:display_name) })
+    field(:text, type: 'text', analyzer: ChewyConfig.instance.statuses_analyzers.dig('text', 'analyzer'), value: ->(status) { status.searchable_text }) { field(:stemmed, type: 'text', analyzer: ChewyConfig.instance.statuses_analyzers.dig('text', 'stemmed', 'analyzer')) }
+    field(:tags, type: 'text', analyzer: ChewyConfig.instance.statuses_analyzers.dig('tags', 'analyzer'), value: ->(status) { status.tags.map(&:display_name) })
     field(:searchable_by, type: 'long', value: ->(status) { status.searchable_by })
+    field(:mentioned_by, type: 'long', value: ->(status) { status.mentioned_by })
+    field(:favourited_by, type: 'long', value: ->(status) { status.favourited_by })
+    field(:reblogged_by, type: 'long', value: ->(status) { status.reblogged_by })
+    field(:bookmarked_by, type: 'long', value: ->(status) { status.bookmarked_by })
+    field(:bookmark_categoried_by, type: 'long', value: ->(status) { status.bookmark_categoried_by })
+    field(:emoji_reacted_by, type: 'long', value: ->(status) { status.emoji_reacted_by })
+    field(:referenced_by, type: 'long', value: ->(status) { status.referenced_by })
+    field(:voted_by, type: 'long', value: ->(status) { status.voted_by })
+    field(:searchability, type: 'keyword', value: ->(status) { status.compute_searchability })
+    field(:visibility, type: 'keyword', value: ->(status) { status.searchable_visibility })
     field(:language, type: 'keyword')
+    field(:domain, type: 'keyword', value: ->(status) { status.account.domain || '' })
     field(:properties, type: 'keyword', value: ->(status) { status.searchable_properties })
     field(:created_at, type: 'date', value: ->(status) { clamp_date(status.created_at) })
   end
diff --git a/app/chewy/tags_index.rb b/app/chewy/tags_index.rb
index c99218a47f..965718e83e 100644
--- a/app/chewy/tags_index.rb
+++ b/app/chewy/tags_index.rb
@@ -3,36 +3,9 @@
 class TagsIndex < Chewy::Index
   include DatetimeClampingConcern
 
-  settings index: index_preset(refresh_interval: '30s'), analysis: {
-    analyzer: {
-      content: {
-        tokenizer: 'keyword',
-        filter: %w(
-          word_delimiter_graph
-          lowercase
-          asciifolding
-          cjk_width
-        ),
-      },
-
-      edge_ngram: {
-        tokenizer: 'edge_ngram',
-        filter: %w(
-          lowercase
-          asciifolding
-          cjk_width
-        ),
-      },
-    },
-
-    tokenizer: {
-      edge_ngram: {
-        type: 'edge_ngram',
-        min_gram: 2,
-        max_gram: 15,
-      },
-    },
-  }
+  # ElasticSearch config is moved to "/config/elasticsearch.default.yml".
+  # Edit it when original Mastodon changed ElasticSearch config.
+  settings index: index_preset(refresh_interval: '30s'), analysis: ChewyConfig.instance.tags
 
   index_scope ::Tag.listable
 
@@ -41,7 +14,9 @@ class TagsIndex < Chewy::Index
   end
 
   root date_detection: false do
-    field(:name, type: 'text', analyzer: 'content', value: :display_name) { field(:edge_ngram, type: 'text', analyzer: 'edge_ngram', search_analyzer: 'content') }
+    field(:name, type: 'text', analyzer: ChewyConfig.instance.tags_analyzers.dig('name', 'analyzer'), value: :display_name) do
+      field(:edge_ngram, type: 'text', analyzer: ChewyConfig.instance.tags_analyzers.dig('name', 'edge_ngram', 'analyzer'), search_analyzer: ChewyConfig.instance.tags_analyzers.dig('name', 'edge_ngram', 'search_analyzer'))
+    end
     field(:reviewed, type: 'boolean', value: ->(tag) { tag.reviewed? })
     field(:usage, type: 'long', value: ->(tag, crutches) { tag.history.aggregate(crutches.time_period).accounts })
     field(:last_status_at, type: 'date', value: ->(tag) { clamp_date(tag.last_status_at || tag.created_at) })
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4e475fe782..98e68bd873 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -25,7 +25,7 @@ class AccountsController < ApplicationController
 
         limit     = params[:limit].present? ? [params[:limit].to_i, PAGE_SIZE_MAX].min : PAGE_SIZE
         @statuses = filtered_statuses.without_reblogs.limit(limit)
-        @statuses = cache_collection(@statuses, Status)
+        @statuses = preload_collection(@statuses, Status)
       end
 
       format.json do
@@ -46,7 +46,11 @@ class AccountsController < ApplicationController
   end
 
   def default_statuses
-    @account.statuses.where(visibility: [:public, :unlisted])
+    if current_account.present?
+      @account.statuses.distributable_visibility
+    else
+      @account.statuses.distributable_visibility_for_anonymous
+    end
   end
 
   def only_media_scope
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb
index 388d4b9e1d..c2563c492e 100644
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class ActivityPub::BaseController < Api::BaseController
+  include SignatureVerification
+  include AccountOwnedConcern
+
   skip_before_action :require_authenticated_user!
   skip_before_action :require_not_suspended!
   skip_around_action :set_locale
diff --git a/app/controllers/activitypub/claims_controller.rb b/app/controllers/activitypub/claims_controller.rb
index 339333e462..480baaf2bc 100644
--- a/app/controllers/activitypub/claims_controller.rb
+++ b/app/controllers/activitypub/claims_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::ClaimsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   skip_before_action :authenticate_user!
 
   before_action :require_account_signature!
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 2188eb72a3..c25362c9bc 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::CollectionsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? }
 
   before_action :require_account_signature!, if: :authorized_fetch_mode?
@@ -21,7 +18,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
   def set_items
     case params[:id]
     when 'featured'
-      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
+      @items = for_signed_account { preload_collection(@account.pinned_statuses, Status) }
       @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
     when 'tags'
       @items = for_signed_account { @account.featured_tags }
diff --git a/app/controllers/activitypub/contexts_controller.rb b/app/controllers/activitypub/contexts_controller.rb
new file mode 100644
index 0000000000..a3263ed82e
--- /dev/null
+++ b/app/controllers/activitypub/contexts_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ActivityPub::ContextsController < ActivityPub::BaseController
+  include SignatureVerification
+
+  vary_by -> { 'Signature' if authorized_fetch_mode? }
+
+  before_action :set_context
+
+  def show
+    expires_in 3.minutes, public: true
+    render json: @context,
+           serializer: ActivityPub::ContextSerializer,
+           adapter: ActivityPub::Adapter,
+           content_type: 'application/activity+json'
+  end
+
+  private
+
+  def set_context
+    @context = Conversation.find(params[:id])
+  end
+end
diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
index 976caa3445..392dd36bcd 100644
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseController
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? }
 
   before_action :require_account_signature!
@@ -24,7 +21,7 @@ class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseContro
   end
 
   def set_items
-    @items = @account.followers.where(Account.arel_table[:uri].matches("#{Account.sanitize_sql_like(uri_prefix)}/%", false, true)).or(@account.followers.where(uri: uri_prefix)).pluck(:uri)
+    @items = @account.followers.matches_uri_prefix(uri_prefix).pluck(:uri)
   end
 
   def collection_presenter
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 5ee85474e7..49cfc8ad1c 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::InboxesController < ActivityPub::BaseController
-  include SignatureVerification
   include JsonLdHelper
-  include AccountOwnedConcern
 
   before_action :skip_unknown_actor_activity
   before_action :require_actor_signature!
@@ -24,7 +22,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
 
   def unknown_affected_account?
     json = Oj.load(body, mode: :strict)
-    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists?
+    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.exists?(uri: json['actor'])
   rescue Oj::ParseError
     false
   end
@@ -62,11 +60,10 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
     return if raw_params.blank? || ENV['DISABLE_FOLLOWERS_SYNCHRONIZATION'] == 'true' || signed_request_account.nil?
 
     # Re-using the syntax for signature parameters
-    tree   = SignatureParamsParser.new.parse(raw_params)
-    params = SignatureParamsTransformer.new.apply(tree)
+    params = SignatureParser.parse(raw_params)
 
     ActivityPub::PrepareFollowersSynchronizationService.new.call(signed_request_account, params)
-  rescue Parslet::ParseFailed
+  rescue SignatureParser::ParsingError
     Rails.logger.warn 'Error parsing Collection-Synchronization header'
   end
 
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index bf10ba762a..82b1830941 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -3,9 +3,6 @@
 class ActivityPub::OutboxesController < ActivityPub::BaseController
   LIMIT = 20
 
-  include SignatureVerification
-  include AccountOwnedConcern
-
   vary_by -> { 'Signature' if authorized_fetch_mode? || page_requested? }
 
   before_action :require_account_signature!, if: :authorized_fetch_mode?
@@ -37,7 +34,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
       ActivityPub::CollectionPresenter.new(
         id: outbox_url,
         type: :ordered,
-        size: @account.statuses_count,
+        size: @account.user&.setting_hide_statuses_count ? 0 : @account.statuses_count,
         first: outbox_url(page: true),
         last: outbox_url(page: true, min_id: 0)
       )
@@ -63,7 +60,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   def set_statuses
     return unless page_requested?
 
-    @statuses = cache_collection_paginated_by_id(
+    @statuses = preload_collection_paginated_by_id(
       AccountStatusesFilter.new(@account, signed_request_account).results,
       Status,
       LIMIT,
diff --git a/app/controllers/activitypub/references_controller.rb b/app/controllers/activitypub/references_controller.rb
new file mode 100644
index 0000000000..8f41fd6922
--- /dev/null
+++ b/app/controllers/activitypub/references_controller.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+class ActivityPub::ReferencesController < ActivityPub::BaseController
+  include SignatureVerification
+  include Authorization
+  include AccountOwnedConcern
+
+  before_action :require_signature!, if: :authorized_fetch_mode?
+  before_action :set_status
+
+  def index
+    expires_in 0, public: public_fetch_mode?
+    render json: references_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json', skip_activities: true
+  end
+
+  private
+
+  def pundit_user
+    signed_request_account
+  end
+
+  def set_status
+    @status = @account.statuses.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def load_statuses
+    cached_references
+  end
+
+  def cached_references
+    preload_collection(Status.where(id: results).reorder(:id), Status)
+  end
+
+  def results
+    @results ||= begin
+      references = @status.reference_objects.order(target_status_id: :asc)
+      references = references.where('target_status_id > ?', page_params[:min_id]) if page_params[:min_id].present?
+      references = references.limit(limit_param(references_limit))
+      references.pluck(:target_status_id)
+    end
+  end
+
+  def references_limit
+    StatusReference::REFERENCES_LIMIT
+  end
+
+  def pagination_min_id
+    results.last
+  end
+
+  def records_continue?
+    results.size == limit_param(references_limit)
+  end
+
+  def references_collection_presenter
+    page = ActivityPub::CollectionPresenter.new(
+      id: ActivityPub::TagManager.instance.references_uri_for(@status, page_params),
+      type: :unordered,
+      part_of: ActivityPub::TagManager.instance.references_uri_for(@status),
+      items: load_statuses.map(&:uri),
+      next: next_page
+    )
+
+    return page if page_requested?
+
+    ActivityPub::CollectionPresenter.new(
+      type: :unordered,
+      id: ActivityPub::TagManager.instance.references_uri_for(@status),
+      first: page
+    )
+  end
+
+  def page_requested?
+    truthy_param?(:page)
+  end
+
+  def next_page
+    return unless records_continue?
+
+    ActivityPub::TagManager.instance.references_uri_for(@status, page_params.merge(min_id: pagination_min_id))
+  end
+
+  def page_params
+    params_slice(:min_id, :limit).merge(page: true)
+  end
+end
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index c38ff89d1c..11aac48c9c 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::RepliesController < ActivityPub::BaseController
-  include SignatureVerification
   include Authorization
-  include AccountOwnedConcern
 
   DESCENDANTS_LIMIT = 60
 
@@ -33,7 +31,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
 
   def set_replies
     @replies = only_other_accounts? ? Status.where.not(account_id: @account.id).joins(:account).merge(Account.without_suspended) : @account.statuses
-    @replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted])
+    @replies = @replies.distributable_visibility.where(in_reply_to_id: @status.id)
     @replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id])
   end
 
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 9beb8fde6b..724af2360d 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -3,13 +3,13 @@
 module Admin
   class AccountsController < BaseController
     before_action :set_account, except: [:index, :batch]
-    before_action :require_remote_account!, only: [:redownload]
+    before_action :require_remote_account!, only: [:redownload, :approve_remote, :reject_remote]
     before_action :require_local_account!, only: [:enable, :memorialize, :approve, :reject]
 
     def index
       authorize :account, :index?
 
-      @accounts = filtered_accounts.page(params[:page])
+      @accounts = filtered_accounts.page(params[:page]).without_count
       @form     = Form::AccountBatch.new
     end
 
@@ -66,6 +66,20 @@ module Admin
       redirect_to admin_accounts_path(status: 'pending'), notice: I18n.t('admin.accounts.rejected_msg', username: @account.acct)
     end
 
+    def approve_remote
+      authorize @account, :approve_remote?
+      @account.approve_remote!
+      log_action :approve_remote, @account
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.approved_msg', username: @account.acct)
+    end
+
+    def reject_remote
+      authorize @account, :reject_remote?
+      @account.reject_remote!
+      log_action :reject_remote, @account
+      redirect_to admin_account_path(@account.id), notice: I18n.t('admin.accounts.rejected_msg', username: @account.acct)
+    end
+
     def destroy
       authorize @account, :destroy?
       Admin::AccountDeletionWorker.perform_async(@account.id)
@@ -128,7 +142,7 @@ module Admin
     def unblock_email
       authorize @account, :unblock_email?
 
-      CanonicalEmailBlock.where(reference_account: @account).delete_all
+      CanonicalEmailBlock.matching_account(@account).delete_all
 
       log_action :unblock_email, @account
 
@@ -168,6 +182,12 @@ module Admin
         'approve'
       elsif params[:reject]
         'reject'
+      elsif params[:approve_remote]
+        'approve_remote'
+      elsif params[:approve_remote_domain]
+        'approve_remote_domain'
+      elsif params[:reject_remote]
+        'reject_remote'
       end
     end
   end
diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index 37a00ad225..8b8e83fde7 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -6,7 +6,7 @@ module Admin
 
     def index
       authorize :audit_log, :index?
-      @auditable_accounts = Account.where(id: Admin::ActionLog.select('distinct account_id')).select(:id, :username)
+      @auditable_accounts = Account.auditable.select(:id, :username)
     end
 
     private
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index 6f4e426797..702550eecc 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -3,11 +3,11 @@
 module Admin
   class ConfirmationsController < BaseController
     before_action :set_user
-    before_action :check_confirmation, only: [:resend]
+    before_action :redirect_confirmed_user, only: [:resend], if: :user_confirmed?
 
     def create
       authorize @user, :confirm?
-      @user.confirm!
+      @user.mark_email_as_confirmed!
       log_action :confirm, @user
       redirect_to admin_accounts_path
     end
@@ -25,11 +25,13 @@ module Admin
 
     private
 
-    def check_confirmation
-      if @user.confirmed?
-        flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
-        redirect_to admin_accounts_path
-      end
+    def redirect_confirmed_user
+      flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
+      redirect_to admin_accounts_path
+    end
+
+    def user_confirmed?
+      @user.confirmed?
     end
   end
 end
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
index 00d069cdfb..34368f08a2 100644
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@@ -2,10 +2,12 @@
 
 module Admin
   class CustomEmojisController < BaseController
+    before_action :set_custom_emoji, only: [:edit, :update]
+
     def index
       authorize :custom_emoji, :index?
 
-      @custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page])
+      @custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]).without_count
       @form          = Form::CustomEmojiBatch.new
     end
 
@@ -15,6 +17,10 @@ module Admin
       @custom_emoji = CustomEmoji.new
     end
 
+    def edit
+      authorize :custom_emoji, :create?
+    end
+
     def create
       authorize :custom_emoji, :create?
 
@@ -28,6 +34,19 @@ module Admin
       end
     end
 
+    def update
+      authorize :custom_emoji, :create?
+
+      @custom_emoji.assign_attributes(update_params)
+
+      if @custom_emoji.save
+        log_action :update, @custom_emoji
+        redirect_to admin_custom_emojis_path(filter_params), notice: I18n.t('admin.custom_emojis.updated_msg')
+      else
+        render :new
+      end
+    end
+
     def batch
       authorize :custom_emoji, :index?
 
@@ -43,8 +62,16 @@ module Admin
 
     private
 
+    def set_custom_emoji
+      @custom_emoji = CustomEmoji.find(params[:id])
+    end
+
     def resource_params
-      params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
+      params.require(:custom_emoji).permit(:shortcode, :image, :category_id, :visible_in_picker, :aliases_raw, :license)
+    end
+
+    def update_params
+      params.require(:custom_emoji).permit(:category_id, :visible_in_picker, :aliases_raw, :license)
     end
 
     def filtered_custom_emojis
diff --git a/app/controllers/admin/domain_allows_controller.rb b/app/controllers/admin/domain_allows_controller.rb
index 31be1978bb..b0f139e3a8 100644
--- a/app/controllers/admin/domain_allows_controller.rb
+++ b/app/controllers/admin/domain_allows_controller.rb
@@ -25,6 +25,8 @@ class Admin::DomainAllowsController < Admin::BaseController
   def destroy
     authorize @domain_allow, :destroy?
     UnallowDomainService.new.call(@domain_allow)
+    log_action :destroy, @domain_allow
+
     redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.destroyed_msg')
   end
 
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 325b33df80..2a2faf9cce 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -88,15 +88,19 @@ module Admin
     end
 
     def update_params
-      params.require(:domain_block).permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+      params.require(:domain_block).permit(:severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
+                                           :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag,
+                                           :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
     end
 
     def form_domain_block_batch_params
-      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate])
+      params.require(:form_domain_block_batch).permit(domain_blocks_attributes: [:enabled, :domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers,
+                                                                                 :reject_send_sensitive, :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription,
+                                                                                 :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden])
     end
 
     def action_from_button
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index ff754bc0b4..faa0a061a6 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -38,7 +38,7 @@ module Admin
           log_action :create, @email_domain_block
 
           (@email_domain_block.other_domains || []).uniq.each do |domain|
-            next if EmailDomainBlock.where(domain: domain).exists?
+            next if EmailDomainBlock.exists?(domain: domain)
 
             other_email_domain_block = EmailDomainBlock.create!(domain: domain, allow_with_approval: @email_domain_block.allow_with_approval, parent: @email_domain_block)
             log_action :create, other_email_domain_block
diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
index ffc4478172..8d7350c765 100644
--- a/app/controllers/admin/export_domain_blocks_controller.rb
+++ b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -36,7 +36,17 @@ module Admin
                                        reject_reports: row.fetch('#reject_reports', false),
                                        private_comment: @global_private_comment,
                                        public_comment: row['#public_comment'],
-                                       obfuscate: row.fetch('#obfuscate', false))
+                                       obfuscate: row.fetch('#obfuscate', false),
+                                       reject_favourite: row.fetch('#reject_favourite', false),
+                                       reject_send_sensitive: row.fetch('#reject_send_sensitive', false),
+                                       reject_hashtag: row.fetch('#reject_hashtag', false),
+                                       reject_straight_follow: row.fetch('#reject_straight_follow', false),
+                                       reject_new_follow: row.fetch('#reject_new_follow', false),
+                                       hidden: row.fetch('#hidden', false),
+                                       detect_invalid_subscription: row.fetch('#detect_invalid_subscription', false),
+                                       reject_reply_exclude_followers: row.fetch('#reject_reply_exclude_followers', false),
+                                       reject_friend: row.fetch('#reject_friend', false),
+                                       block_trends: row.fetch('#block_trends', false))
 
         if domain_block.invalid?
           flash.now[:alert] = I18n.t('admin.export_domain_blocks.invalid_domain_block', error: domain_block.errors.full_messages.join(', '))
@@ -49,7 +59,7 @@ module Admin
         next
       end
 
-      @warning_domains = Instance.where(domain: @domain_blocks.map(&:domain)).where('EXISTS (SELECT 1 FROM follows JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id WHERE accounts.domain = instances.domain)').pluck(:domain)
+      @warning_domains = instances_from_imported_blocks.pluck(:domain)
     rescue ActionController::ParameterMissing
       flash.now[:alert] = I18n.t('admin.export_domain_blocks.no_file')
       set_dummy_import!
@@ -58,18 +68,56 @@ module Admin
 
     private
 
+    def instances_from_imported_blocks
+      Instance.with_domain_follows(@domain_blocks.map(&:domain))
+    end
+
     def export_filename
       'domain_blocks.csv'
     end
 
     def export_headers
-      %w(#domain #severity #reject_media #reject_reports #public_comment #obfuscate)
+      %w(
+        #domain
+        #severity
+        #reject_media
+        #reject_reports
+        #public_comment
+        #obfuscate
+        #reject_favourite
+        #reject_send_sensitive
+        #reject_hashtag
+        #reject_straight_follow
+        #reject_new_follow
+        #hidden
+        #detect_invalid_subscription
+        #reject_reply_exclude_followers
+        #reject_friend
+        #block_trends
+      )
     end
 
     def export_data
       CSV.generate(headers: export_headers, write_headers: true) do |content|
         DomainBlock.with_limitations.order(id: :asc).each do |instance|
-          content << [instance.domain, instance.severity, instance.reject_media, instance.reject_reports, instance.public_comment, instance.obfuscate]
+          content << [
+            instance.domain,
+            instance.severity,
+            instance.reject_media,
+            instance.reject_reports,
+            instance.public_comment,
+            instance.obfuscate,
+            instance.reject_favourite,
+            instance.reject_send_sensitive,
+            instance.reject_hashtag,
+            instance.reject_straight_follow,
+            instance.reject_new_follow,
+            instance.hidden,
+            instance.detect_invalid_subscription,
+            instance.reject_reply_exclude_followers,
+            instance.reject_friend,
+            instance.block_trends,
+          ]
         end
       end
     end
diff --git a/app/controllers/admin/friend_servers_controller.rb b/app/controllers/admin/friend_servers_controller.rb
new file mode 100644
index 0000000000..729d3b3912
--- /dev/null
+++ b/app/controllers/admin/friend_servers_controller.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Admin
+  class FriendServersController < BaseController
+    before_action :set_friend, except: [:index, :new, :create]
+    before_action :warn_signatures_not_enabled!, only: [:new, :edit, :create, :follow, :unfollow, :accept, :reject]
+
+    def index
+      authorize :friend_server, :update?
+      @friends = FriendDomain.all
+    end
+
+    def new
+      authorize :friend_server, :update?
+      @friend = FriendDomain.new
+    end
+
+    def edit
+      authorize :friend_server, :update?
+    end
+
+    def create
+      authorize :friend_server, :update?
+
+      @friend = FriendDomain.new(resource_params)
+
+      if @friend.save
+        @friend.follow!
+        redirect_to admin_friend_servers_path
+      else
+        render action: :new
+      end
+    end
+
+    def update
+      authorize :friend_server, :update?
+
+      if @friend.update(update_resource_params)
+        redirect_to admin_friend_servers_path
+      else
+        render action: :edit
+      end
+    end
+
+    def destroy
+      authorize :friend_server, :update?
+      @friend.destroy
+      redirect_to admin_friend_servers_path
+    end
+
+    def follow
+      authorize :friend_server, :update?
+      @friend.follow!
+      render action: :edit
+    end
+
+    def unfollow
+      authorize :friend_server, :update?
+      @friend.unfollow!
+      render action: :edit
+    end
+
+    def accept
+      authorize :friend_server, :update?
+      @friend.accept!
+      render action: :edit
+    end
+
+    def reject
+      authorize :friend_server, :update?
+      @friend.reject!
+      render action: :edit
+    end
+
+    private
+
+    def set_friend
+      @friend = FriendDomain.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:friend_domain).permit(:domain, :inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts)
+    end
+
+    def update_resource_params
+      params.require(:friend_domain).permit(:inbox_url, :available, :pseudo_relay, :delivery_local, :unlocked, :allow_all_posts)
+    end
+
+    def warn_signatures_not_enabled!
+      flash.now[:error] = I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_rule_histories_controller.rb b/app/controllers/admin/ng_rule_histories_controller.rb
new file mode 100644
index 0000000000..9dccefaf49
--- /dev/null
+++ b/app/controllers/admin/ng_rule_histories_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgRuleHistoriesController < BaseController
+    before_action :set_ng_rule
+    before_action :set_histories
+
+    PER_PAGE = 20
+
+    def show
+      authorize :ng_words, :show?
+    end
+
+    private
+
+    def set_ng_rule
+      @ng_rule = ::NgRule.find(params[:id])
+    end
+
+    def set_histories
+      @histories = NgRuleHistory.where(ng_rule_id: params[:id]).order(id: :desc).page(params[:page]).per(PER_PAGE)
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_rules_controller.rb b/app/controllers/admin/ng_rules_controller.rb
new file mode 100644
index 0000000000..f37424cced
--- /dev/null
+++ b/app/controllers/admin/ng_rules_controller.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgRulesController < BaseController
+    before_action :set_ng_rule, only: [:edit, :update, :destroy, :duplicate]
+
+    def index
+      authorize :ng_words, :show?
+
+      @ng_rules = ::NgRule.order(id: :asc)
+    end
+
+    def new
+      authorize :ng_words, :show?
+
+      @ng_rule = ::NgRule.build
+    end
+
+    def edit
+      authorize :ng_words, :show?
+    end
+
+    def create
+      authorize :ng_words, :create?
+
+      begin
+        test_words!
+      rescue
+        flash[:alert] = I18n.t('admin.ng_rules.test_error')
+        redirect_to new_admin_ng_rule_path
+        return
+      end
+
+      @ng_rule = ::NgRule.build(resource_params)
+
+      if @ng_rule.save
+        redirect_to admin_ng_rules_path
+      else
+        render :new
+      end
+    end
+
+    def update
+      authorize :ng_words, :create?
+
+      begin
+        test_words!
+      rescue
+        flash[:alert] = I18n.t('admin.ng_rules.test_error')
+        redirect_to edit_admin_ng_rule_path(id: @ng_rule.id)
+        return
+      end
+
+      if @ng_rule.update(resource_params)
+        redirect_to admin_ng_rules_path
+      else
+        render :edit
+      end
+    end
+
+    def duplicate
+      authorize :ng_words, :create?
+
+      @ng_rule = @ng_rule.copy!
+
+      flash[:alert] = I18n.t('admin.ng_rules.copy_error') unless @ng_rule.save
+
+      redirect_to admin_ng_rules_path
+    end
+
+    def destroy
+      authorize :ng_words, :create?
+
+      @ng_rule.destroy
+      redirect_to admin_ng_rules_path
+    end
+
+    private
+
+    def set_ng_rule
+      @ng_rule = ::NgRule.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:ng_rule).permit(:title, :expires_in, :available, :account_domain, :account_username, :account_display_name,
+                                      :account_note, :account_field_name, :account_field_value, :account_avatar_state,
+                                      :account_header_state, :account_include_local, :status_spoiler_text, :status_text, :status_tag,
+                                      :status_sensitive_state, :status_cw_state, :status_media_state, :status_poll_state,
+                                      :status_mention_state, :status_reference_state,
+                                      :status_quote_state, :status_reply_state, :status_media_threshold, :status_poll_threshold,
+                                      :status_mention_threshold, :status_allow_follower_mention,
+                                      :reaction_allow_follower, :emoji_reaction_name, :emoji_reaction_origin_domain,
+                                      :status_reference_threshold, :account_allow_followed_by_local, :record_history_also_local,
+                                      status_visibility: [], status_searchability: [], reaction_type: [])
+    end
+
+    def test_words!
+      arr = [
+        resource_params[:account_domain],
+        resource_params[:account_username],
+        resource_params[:account_display_name],
+        resource_params[:account_note],
+        resource_params[:account_field_name],
+        resource_params[:account_field_value],
+        resource_params[:status_spoiler_text],
+        resource_params[:status_text],
+        resource_params[:status_tag],
+        resource_params[:emoji_reaction_name],
+        resource_params[:emoji_reaction_origin_domain],
+      ].compact_blank.join("\n")
+
+      Admin::NgRule.extract_test!(arr) if arr.present?
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_words/keywords_controller.rb b/app/controllers/admin/ng_words/keywords_controller.rb
new file mode 100644
index 0000000000..9af38fab7b
--- /dev/null
+++ b/app/controllers/admin/ng_words/keywords_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgWords::KeywordsController < NgWordsController
+    def show
+      super
+      @ng_words = ::NgWord.caches.presence || [::NgWord.new]
+    end
+
+    protected
+
+    def validate
+      begin
+        ::NgWord.save_from_raws(settings_params_test)
+        return true
+      rescue
+        flash[:alert] = I18n.t('admin.ng_words.test_error')
+        redirect_to after_update_redirect_path
+      end
+
+      false
+    end
+
+    private
+
+    def after_update_redirect_path
+      admin_ng_words_keywords_path
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_words/settings_controller.rb b/app/controllers/admin/ng_words/settings_controller.rb
new file mode 100644
index 0000000000..63edadfce5
--- /dev/null
+++ b/app/controllers/admin/ng_words/settings_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgWords::SettingsController < NgWordsController
+    protected
+
+    def after_update_redirect_path
+      admin_ng_words_settings_path
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_words/white_list_controller.rb b/app/controllers/admin/ng_words/white_list_controller.rb
new file mode 100644
index 0000000000..8fdb7df327
--- /dev/null
+++ b/app/controllers/admin/ng_words/white_list_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgWords::WhiteListController < NgWordsController
+    def show
+      super
+      @white_list_domains = SpecifiedDomain.white_list_domain_caches.presence || [SpecifiedDomain.new]
+    end
+
+    protected
+
+    def validate
+      begin
+        SpecifiedDomain.save_from_raws_as_white_list(settings_params_list)
+        return true
+      rescue
+        flash[:alert] = I18n.t('admin.ng_words.save_error')
+        redirect_to after_update_redirect_path
+      end
+
+      false
+    end
+
+    def after_update_redirect_path
+      admin_ng_words_white_list_path
+    end
+
+    private
+
+    def settings_params_list
+      params.require(:form_admin_settings)[:specified_domains]
+    end
+  end
+end
diff --git a/app/controllers/admin/ng_words_controller.rb b/app/controllers/admin/ng_words_controller.rb
new file mode 100644
index 0000000000..a70a435fa4
--- /dev/null
+++ b/app/controllers/admin/ng_words_controller.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgWordsController < BaseController
+    def show
+      authorize :ng_words, :show?
+
+      @admin_settings = Form::AdminSettings.new
+    end
+
+    def create
+      authorize :ng_words, :create?
+
+      return unless validate
+
+      @admin_settings = Form::AdminSettings.new(settings_params)
+
+      if @admin_settings.save
+        flash[:notice] = I18n.t('generic.changes_saved_msg')
+        redirect_to after_update_redirect_path
+      else
+        render :show
+      end
+    end
+
+    protected
+
+    def validate
+      true
+    end
+
+    def after_update_redirect_path
+      admin_ng_words_path
+    end
+
+    private
+
+    def settings_params
+      params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
+    end
+
+    def settings_params_test
+      params.require(:form_admin_settings)[:ng_words_test]
+    end
+  end
+end
diff --git a/app/controllers/admin/ngword_histories_controller.rb b/app/controllers/admin/ngword_histories_controller.rb
new file mode 100644
index 0000000000..90f13db2fe
--- /dev/null
+++ b/app/controllers/admin/ngword_histories_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Admin
+  class NgwordHistoriesController < BaseController
+    before_action :set_histories
+
+    PER_PAGE = 20
+
+    def index
+      authorize :ng_words, :show?
+    end
+
+    private
+
+    def set_histories
+      @histories = NgwordHistory.order(id: :desc).page(params[:page]).per(PER_PAGE)
+    end
+  end
+end
diff --git a/app/controllers/admin/reports/actions_controller.rb b/app/controllers/admin/reports/actions_controller.rb
index 554f7906f8..5572108d59 100644
--- a/app/controllers/admin/reports/actions_controller.rb
+++ b/app/controllers/admin/reports/actions_controller.rb
@@ -12,7 +12,7 @@ class Admin::Reports::ActionsController < Admin::BaseController
     authorize @report, :show?
 
     case action_from_button
-    when 'delete', 'mark_as_sensitive'
+    when 'delete', 'mark_as_sensitive', 'force_cw'
       status_batch_action = Admin::StatusBatchAction.new(
         type: action_from_button,
         status_ids: @report.status_ids,
@@ -52,6 +52,8 @@ class Admin::Reports::ActionsController < Admin::BaseController
       'delete'
     elsif params[:mark_as_sensitive]
       'mark_as_sensitive'
+    elsif params[:force_cw]
+      'force_cw'
     elsif params[:silence]
       'silence'
     elsif params[:suspend]
diff --git a/app/controllers/admin/rules_controller.rb b/app/controllers/admin/rules_controller.rb
index d31aec6ea8..b8def22ba3 100644
--- a/app/controllers/admin/rules_controller.rb
+++ b/app/controllers/admin/rules_controller.rb
@@ -53,7 +53,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:rule).permit(:text, :priority)
+      params.require(:rule).permit(:text, :hint, :priority)
     end
   end
 end
diff --git a/app/controllers/admin/sensitive_words_controller.rb b/app/controllers/admin/sensitive_words_controller.rb
new file mode 100644
index 0000000000..24cdd4efcb
--- /dev/null
+++ b/app/controllers/admin/sensitive_words_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Admin
+  class SensitiveWordsController < BaseController
+    def show
+      authorize :sensitive_words, :show?
+
+      @admin_settings = Form::AdminSettings.new
+      @sensitive_words = ::SensitiveWord.caches.presence || [::SensitiveWord.new]
+    end
+
+    def create
+      authorize :sensitive_words, :create?
+
+      begin
+        ::SensitiveWord.save_from_raws(settings_params_test)
+      rescue
+        flash[:alert] = I18n.t('admin.ng_words.test_error')
+        redirect_to after_update_redirect_path
+        return
+      end
+
+      @admin_settings = Form::AdminSettings.new(settings_params)
+
+      if @admin_settings.save
+        flash[:notice] = I18n.t('generic.changes_saved_msg')
+        redirect_to after_update_redirect_path
+      else
+        render :index
+      end
+    end
+
+    private
+
+    def after_update_redirect_path
+      admin_sensitive_words_path
+    end
+
+    def settings_params
+      params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
+    end
+
+    def settings_params_test
+      params.require(:form_admin_settings)[:sensitive_words_test]
+    end
+  end
+end
diff --git a/app/controllers/admin/settings/registrations_controller.rb b/app/controllers/admin/settings/registrations_controller.rb
index b4a74349c0..6dbc86df9a 100644
--- a/app/controllers/admin/settings/registrations_controller.rb
+++ b/app/controllers/admin/settings/registrations_controller.rb
@@ -1,9 +1,18 @@
 # frozen_string_literal: true
 
 class Admin::Settings::RegistrationsController < Admin::SettingsController
+  include RegistrationLimitationHelper
+
+  before_action :set_limitation_counts, only: :show # rubocop:disable Rails/LexicallyScopedActionFilter
+
   private
 
   def after_update_redirect_path
     admin_settings_registrations_path
   end
+
+  def set_limitation_counts
+    @current_users_count = user_count_for_registration
+    @current_users_count_today = today_increase_user_count
+  end
 end
diff --git a/app/controllers/admin/site_uploads_controller.rb b/app/controllers/admin/site_uploads_controller.rb
index a5d2cf41cf..96e61cf6bb 100644
--- a/app/controllers/admin/site_uploads_controller.rb
+++ b/app/controllers/admin/site_uploads_controller.rb
@@ -9,7 +9,7 @@ module Admin
 
       @site_upload.destroy!
 
-      redirect_to admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
+      redirect_back fallback_location: admin_settings_path, notice: I18n.t('admin.site_uploads.destroyed_msg')
     end
 
     private
diff --git a/app/controllers/admin/special_domains_controller.rb b/app/controllers/admin/special_domains_controller.rb
new file mode 100644
index 0000000000..0ddbf26786
--- /dev/null
+++ b/app/controllers/admin/special_domains_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Admin
+  class SpecialDomainsController < BaseController
+    def show
+      authorize :instance, :show?
+
+      @admin_settings = Form::AdminSettings.new
+    end
+
+    def create
+      authorize :instance, :destroy?
+
+      @admin_settings = Form::AdminSettings.new(settings_params)
+
+      if @admin_settings.save
+        flash[:notice] = I18n.t('generic.changes_saved_msg')
+        redirect_to after_update_redirect_path
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def after_update_redirect_path
+      admin_special_domains_path
+    end
+
+    def settings_params
+      params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
+    end
+  end
+end
diff --git a/app/controllers/admin/special_instances_controller.rb b/app/controllers/admin/special_instances_controller.rb
new file mode 100644
index 0000000000..3fd35d474e
--- /dev/null
+++ b/app/controllers/admin/special_instances_controller.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Admin
+  class SpecialInstancesController < BaseController
+    def show
+      authorize :instance, :show?
+
+      @admin_settings = Form::AdminSettings.new
+    end
+
+    def create
+      authorize :instance, :destroy?
+
+      @admin_settings = Form::AdminSettings.new(settings_params)
+
+      if @admin_settings.save
+        flash[:notice] = I18n.t('generic.changes_saved_msg')
+        redirect_to after_update_redirect_path
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def after_update_redirect_path
+      admin_special_instances_path
+    end
+
+    def settings_params
+      params.require(:form_admin_settings).permit(*Form::AdminSettings::KEYS)
+    end
+  end
+end
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index e53b22dca3..2070a7c70c 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -4,7 +4,7 @@ module Admin
   class StatusesController < BaseController
     before_action :set_account
     before_action :set_statuses, except: :show
-    before_action :set_status, only: :show
+    before_action :set_status, only: [:show, :remove_history, :remove_media, :force_sensitive, :force_cw, :remove_status]
 
     PER_PAGE = 20
 
@@ -29,6 +29,65 @@ module Admin
       redirect_to after_create_redirect_path
     end
 
+    def remove_history
+      authorize [:admin, @status], :show?
+      UpdateStatusService.new.call(
+        @status,
+        edit_status_account_id,
+        no_history: true,
+        bypass_validation: true
+      )
+      log_action(:remove_history, @status)
+      redirect_to admin_account_status_path
+    end
+
+    def remove_media
+      authorize [:admin, @status], :show?
+      UpdateStatusService.new.call(
+        @status,
+        edit_status_account_id,
+        media_ids: [],
+        media_attributes: [],
+        bypass_validation: true
+      )
+      log_action(:remove_media, @status)
+      redirect_to admin_account_status_path
+    end
+
+    def force_sensitive
+      authorize [:admin, @status], :show?
+      UpdateStatusService.new.call(
+        @status,
+        edit_status_account_id,
+        sensitive: true,
+        bypass_validation: true
+      )
+      log_action(:force_sensitive, @status)
+      redirect_to admin_account_status_path
+    end
+
+    def force_cw
+      authorize [:admin, @status], :show?
+      UpdateStatusService.new.call(
+        @status,
+        edit_status_account_id,
+        spoiler_text: 'CW',
+        bypass_validation: true
+      )
+      log_action(:force_cw, @status)
+      redirect_to admin_account_status_path
+    end
+
+    def remove_status
+      authorize [:admin, @status], :show?
+      @status.discard_with_reblogs
+      StatusPin.find_by(status: @status)&.destroy
+      @status.account.statuses_count = @status.account.statuses_count - 1
+      RemovalWorker.perform_async(@status.id, { 'redraft' => false })
+      log_action(:remove_status, @status)
+      redirect_to admin_account_path
+    end
+
     private
 
     def batched_ordered_status_edits
@@ -62,6 +121,13 @@ module Admin
       @statuses = Admin::StatusFilter.new(@account, filter_params).results.preload(:application, :preloadable_poll, :media_attachments, active_mentions: :account, reblog: [:account, :application, :preloadable_poll, :media_attachments, active_mentions: :account]).page(params[:page]).per(PER_PAGE)
     end
 
+    def edit_status_account_id
+      return @edit_account_id || @account.id if @edit_account_checked
+
+      @edit_account_checked = true
+      @edit_account_id = Account.representative.id
+    end
+
     def filter_params
       params.slice(*Admin::StatusFilter::KEYS).permit(*Admin::StatusFilter::KEYS)
     end
diff --git a/app/controllers/antennas_controller.rb b/app/controllers/antennas_controller.rb
new file mode 100644
index 0000000000..ca7ee5d2a2
--- /dev/null
+++ b/app/controllers/antennas_controller.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class AntennasController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
+  before_action :set_antenna, only: [:edit, :update, :destroy]
+  before_action :set_body_classes
+  before_action :set_cache_headers
+
+  def index
+    @antennas = current_account.antennas.includes(:antenna_domains).includes(:antenna_tags).includes(:antenna_accounts)
+  end
+
+  def edit; end
+
+  def update
+    if @antenna.update(resource_params)
+      redirect_to antennas_path
+    else
+      render action: :edit
+    end
+  end
+
+  def destroy
+    @antenna.destroy
+    redirect_to antennas_path
+  end
+
+  private
+
+  def set_antenna
+    @antenna = current_account.antennas.find(params[:id])
+  end
+
+  def resource_params
+    params.require(:antenna).permit(:title, :available, :expires_in)
+  end
+
+  def thin_resource_params
+    params.require(:antenna).permit(:title)
+  end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+
+  def set_cache_headers
+    response.cache_control.replace(private: true, no_store: true)
+  end
+end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 98fa1897ef..cc4e22d27d 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 class Api::BaseController < ApplicationController
-  DEFAULT_STATUSES_LIMIT = 20
-  DEFAULT_ACCOUNTS_LIMIT = 40
+  DEFAULT_STATUSES_LIMIT       = 20
+  DEFAULT_ACCOUNTS_LIMIT       = 40
 
   include Api::RateLimitHeaders
   include Api::AccessTokenTrackingConcern
   include Api::CachingConcern
   include Api::ContentSecurityPolicy
+  include Api::ErrorHandling
+  include Api::Pagination
 
   skip_before_action :require_functional!, unless: :limited_federation_mode?
 
@@ -18,51 +20,6 @@ class Api::BaseController < ApplicationController
 
   protect_from_forgery with: :null_session
 
-  rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
-    render json: { error: e.to_s }, status: 422
-  end
-
-  rescue_from ActiveRecord::RecordNotUnique do
-    render json: { error: 'Duplicate record' }, status: 422
-  end
-
-  rescue_from Date::Error do
-    render json: { error: 'Invalid date supplied' }, status: 422
-  end
-
-  rescue_from ActiveRecord::RecordNotFound do
-    render json: { error: 'Record not found' }, status: 404
-  end
-
-  rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do
-    render json: { error: 'Remote data could not be fetched' }, status: 503
-  end
-
-  rescue_from OpenSSL::SSL::SSLError do
-    render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
-  end
-
-  rescue_from Mastodon::NotPermittedError do
-    render json: { error: 'This action is not allowed' }, status: 403
-  end
-
-  rescue_from Seahorse::Client::NetworkingError do |e|
-    Rails.logger.warn "Storage server error: #{e}"
-    render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
-  end
-
-  rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight do
-    render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
-  end
-
-  rescue_from Mastodon::RateLimitExceededError do
-    render json: { error: I18n.t('errors.429') }, status: 429
-  end
-
-  rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e|
-    render json: { error: e.to_s }, status: 400
-  end
-
   def doorkeeper_unauthorized_render_options(error: nil)
     { json: { error: error.try(:description) || 'Not authorized' } }
   end
@@ -73,13 +30,6 @@ class Api::BaseController < ApplicationController
 
   protected
 
-  def set_pagination_headers(next_path = nil, prev_path = nil)
-    links = []
-    links << [next_path, [%w(rel next)]] if next_path
-    links << [prev_path, [%w(rel prev)]] if prev_path
-    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
-  end
-
   def limit_param(default_limit)
     return default_limit unless params[:limit]
 
@@ -108,10 +58,6 @@ class Api::BaseController < ApplicationController
     render json: { error: 'Your login is currently disabled' }, status: 403 if current_user&.account&.unavailable?
   end
 
-  def require_valid_pagination_options!
-    render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
-  end
-
   def require_user!
     if !current_user
       render json: { error: 'This method requires an authenticated user' }, status: 422
@@ -140,10 +86,6 @@ class Api::BaseController < ApplicationController
 
   private
 
-  def pagination_options_invalid?
-    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
-  end
-
   def respond_with_error(code)
     render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code
   end
diff --git a/app/controllers/api/v1/accounts/antennas_controller.rb b/app/controllers/api/v1/accounts/antennas_controller.rb
new file mode 100644
index 0000000000..957a4fb555
--- /dev/null
+++ b/app/controllers/api/v1/accounts/antennas_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::AntennasController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_account
+
+  def index
+    @antennas = @account.suspended? ? [] : @account.joined_antennas.where(account: current_account)
+    render json: @antennas, each_serializer: REST::AntennaSerializer
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/circles_controller.rb b/app/controllers/api/v1/accounts/circles_controller.rb
new file mode 100644
index 0000000000..1b21eb7ce4
--- /dev/null
+++ b/app/controllers/api/v1/accounts/circles_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::CirclesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_account
+
+  def index
+    @circles = @account.suspended? ? [] : @account.joined_circles.where(account: current_account)
+    render json: @circles, each_serializer: REST::CircleSerializer
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 8f31336b9f..daa7f87364 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::CredentialsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, except: [:update]
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts', :'read:me' }, except: [:update]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:update]
   before_action :require_user!
 
@@ -31,6 +31,8 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
       :locked,
       :bot,
       :discoverable,
+      :searchability,
+      :dissubscribable,
       :hide_collections,
       :indexable,
       fields_attributes: [:name, :value]
@@ -45,6 +47,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
     {
       settings_attributes: {
         default_privacy: source_params.fetch(:privacy, @account.user.setting_default_privacy),
+        default_searchability: source_params.fetch(:searchability, @account.user.setting_default_searchability),
         default_sensitive: source_params.fetch(:sensitive, @account.user.setting_default_sensitive),
         default_language: source_params.fetch(:language, @account.user.setting_default_language),
       },
diff --git a/app/controllers/api/v1/accounts/exclude_antennas_controller.rb b/app/controllers/api/v1/accounts/exclude_antennas_controller.rb
new file mode 100644
index 0000000000..c1f5c5981c
--- /dev/null
+++ b/app/controllers/api/v1/accounts/exclude_antennas_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::ExcludeAntennasController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_account
+
+  def index
+    @antennas = @account.suspended? ? [] : current_account.antennas.where('exclude_accounts @> \'[?]\'', @account.id)
+    render json: @antennas, each_serializer: REST::AntennaSerializer
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 21b1095f18..449866fa55 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
     return [] if hide_results?
 
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? || current_account.id == @account.id
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil? || current_account.id == @account.id
     scope.merge(paginated_follows).to_a
   end
 
@@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:active_relationships, :account_stat).references(:active_relationships)
+    Account.includes(:active_relationships, :account_stat, :user).references(:active_relationships)
   end
 
   def paginated_follows
@@ -41,10 +41,6 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_followers_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 1db521f79c..c4f4313f8f 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
     return [] if hide_results?
 
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? || current_account.id == @account.id
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil? || current_account.id == @account.id
     scope.merge(paginated_follows).to_a
   end
 
@@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:passive_relationships, :account_stat).references(:passive_relationships)
+    Account.includes(:passive_relationships, :account_stat, :user).references(:passive_relationships)
   end
 
   def paginated_follows
@@ -41,10 +41,6 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_following_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index 3061fcb7e7..0ac7858e16 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -18,6 +18,7 @@ class Api::V1::Accounts::SearchController < Api::BaseController
       limit: limit_param(DEFAULT_ACCOUNTS_LIMIT),
       resolve: truthy_param?(:resolve),
       following: truthy_param?(:following),
+      follower: truthy_param?(:follower),
       offset: params[:offset]
     )
   end
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index fe4279302f..6213f6f9e1 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -4,12 +4,14 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_account
 
-  after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
+  after_action :insert_pagination_headers
 
   def index
     cache_if_unauthenticated!
     @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
@@ -19,11 +21,11 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def load_statuses
-    @account.unavailable? ? [] : cached_account_statuses
+    @account.unavailable? ? [] : preloaded_account_statuses
   end
 
-  def cached_account_statuses
-    cache_collection_paginated_by_id(
+  def preloaded_account_statuses
+    preload_collection_paginated_by_id(
       AccountStatusesFilter.new(@account, current_account, params).results,
       Status,
       limit_param(DEFAULT_STATUSES_LIMIT),
@@ -35,10 +37,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
     params.slice(:limit, *AccountStatusesFilter::KEYS).permit(:limit, *AccountStatusesFilter::KEYS).merge(core_params)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_account_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -51,11 +49,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
     @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
 
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 23fc85b475..881aec13e2 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -9,16 +9,22 @@ class Api::V1::AccountsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :follow, :write, :'write:blocks' }, only: [:block, :unblock]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:create]
 
-  before_action :require_user!, except: [:show, :create]
-  before_action :set_account, except: [:create]
-  before_action :check_account_approval, except: [:create]
-  before_action :check_account_confirmation, except: [:create]
+  before_action :require_user!, except: [:index, :show, :create]
+  before_action :set_account, except: [:index, :create]
+  before_action :set_accounts, only: [:index]
+  before_action :check_account_approval, except: [:index, :create]
+  before_action :check_account_confirmation, except: [:index, :create]
   before_action :check_enabled_registrations, only: [:create]
+  before_action :check_accounts_limit, only: [:index]
 
   skip_before_action :require_authenticated_user!, only: :create
 
   override_rate_limit_headers :follow, family: :follows
 
+  def index
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
   def show
     cache_if_unauthenticated!
     render json: @account, serializer: REST::AccountSerializer
@@ -38,7 +44,12 @@ class Api::V1::AccountsController < Api::BaseController
 
   def follow
     follow  = FollowService.new.call(current_user.account, @account, reblogs: params.key?(:reblogs) ? truthy_param?(:reblogs) : nil, notify: params.key?(:notify) ? truthy_param?(:notify) : nil, languages: params.key?(:languages) ? params[:languages] : nil, with_rate_limit: true)
-    options = @account.locked? || current_user.account.silenced? ? {} : { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify?, languages: follow.languages } }, requested_map: { @account.id => false } }
+    options = if @account.locked? || current_user.account.silenced? || (current_user.account.bot? && @account.user&.setting_lock_follow_from_bot)
+                {}
+              else
+                { following_map: { @account.id => { reblogs: follow.show_reblogs?, notify: follow.notify?, languages: follow.languages } },
+                  requested_map: { @account.id => false } }
+              end
 
     render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(**options)
   end
@@ -79,6 +90,10 @@ class Api::V1::AccountsController < Api::BaseController
     @account = Account.find(params[:id])
   end
 
+  def set_accounts
+    @accounts = Account.where(id: account_ids).without_unapproved
+  end
+
   def check_account_approval
     raise(ActiveRecord::RecordNotFound) if @account.local? && @account.user_pending?
   end
@@ -87,10 +102,22 @@ class Api::V1::AccountsController < Api::BaseController
     raise(ActiveRecord::RecordNotFound) if @account.local? && !@account.user_confirmed?
   end
 
+  def check_accounts_limit
+    raise(Mastodon::ValidationError) if account_ids.size > DEFAULT_ACCOUNTS_LIMIT
+  end
+
   def relationships(**options)
     AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
   end
 
+  def account_ids
+    Array(accounts_params[:ids]).uniq.map(&:to_i)
+  end
+
+  def accounts_params
+    params.permit(ids: [])
+  end
+
   def account_params
     params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone, :invite_code)
   end
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb
index ff9cae6398..ff6f41e01d 100644
--- a/app/controllers/api/v1/admin/accounts_controller.rb
+++ b/app/controllers/api/v1/admin/accounts_controller.rb
@@ -125,10 +125,6 @@ class Api::V1::Admin::AccountsController < Api::BaseController
     translated_params
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_accounts_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -137,12 +133,8 @@ class Api::V1::Admin::AccountsController < Api::BaseController
     api_v1_admin_accounts_url(pagination_params(min_id: pagination_since_id)) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
index 7b192b979f..701f668de6 100644
--- a/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/canonical_email_blocks_controller.rb
@@ -65,10 +65,6 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
     @canonical_email_block = CanonicalEmailBlock.find(params[:id])
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_canonical_email_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -77,12 +73,8 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
     api_v1_admin_canonical_email_blocks_url(pagination_params(min_id: pagination_since_id)) unless @canonical_email_blocks.empty?
   end
 
-  def pagination_max_id
-    @canonical_email_blocks.last.id
-  end
-
-  def pagination_since_id
-    @canonical_email_blocks.first.id
+  def pagination_collection
+    @canonical_email_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/domain_allows_controller.rb b/app/controllers/api/v1/admin/domain_allows_controller.rb
index dd54d67106..a7ae84e306 100644
--- a/app/controllers/api/v1/admin/domain_allows_controller.rb
+++ b/app/controllers/api/v1/admin/domain_allows_controller.rb
@@ -61,10 +61,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
     DomainAllow.all
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_domain_allows_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -73,12 +69,8 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
     api_v1_admin_domain_allows_url(pagination_params(min_id: pagination_since_id)) unless @domain_allows.empty?
   end
 
-  def pagination_max_id
-    @domain_allows.last.id
-  end
-
-  def pagination_since_id
-    @domain_allows.first.id
+  def pagination_collection
+    @domain_allows
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/domain_blocks_controller.rb b/app/controllers/api/v1/admin/domain_blocks_controller.rb
index 2538c7c7c2..e225de1f2f 100644
--- a/app/controllers/api/v1/admin/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/domain_blocks_controller.rb
@@ -29,10 +29,11 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   def create
     authorize :domain_block, :create?
 
+    @domain_block = DomainBlock.new(resource_params)
     existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
-    return render json: existing_domain_block, serializer: REST::Admin::ExistingDomainBlockErrorSerializer, status: 422 if existing_domain_block.present?
+    return render json: existing_domain_block, serializer: REST::Admin::ExistingDomainBlockErrorSerializer, status: 422 if conflicts_with_existing_block?(@domain_block, existing_domain_block)
 
-    @domain_block = DomainBlock.create!(resource_params)
+    @domain_block.save!
     DomainBlockWorker.perform_async(@domain_block.id)
     log_action :create, @domain_block
     render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
@@ -55,6 +56,10 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
 
   private
 
+  def conflicts_with_existing_block?(domain_block, existing_domain_block)
+    existing_domain_block.present? && (existing_domain_block.domain == TagManager.instance.normalize_domain(domain_block.domain) || !domain_block.stricter_than?(existing_domain_block))
+  end
+
   def set_domain_blocks
     @domain_blocks = filtered_domain_blocks.order(id: :desc).to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
@@ -69,11 +74,8 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def domain_block_params
-    params.permit(:severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
-  end
-
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
+    params.permit(:severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_reports, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+                  :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :private_comment, :public_comment, :obfuscate, :hidden)
   end
 
   def next_path
@@ -84,12 +86,8 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
     api_v1_admin_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @domain_blocks.empty?
   end
 
-  def pagination_max_id
-    @domain_blocks.last.id
-  end
-
-  def pagination_since_id
-    @domain_blocks.first.id
+  def pagination_collection
+    @domain_blocks
   end
 
   def records_continue?
@@ -101,6 +99,7 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
+    params.permit(:domain, :severity, :reject_media, :reject_favourite, :reject_reply_exclude_followers, :reject_send_sensitive, :reject_hashtag, :reject_straight_follow,
+                  :reject_new_follow, :reject_friend, :block_trends, :detect_invalid_subscription, :reject_reports, :private_comment, :public_comment, :obfuscate, :hidden)
   end
 end
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
index df54b9f0a4..bdedb9d040 100644
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -58,10 +58,6 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
     params.permit(:domain, :allow_with_approval)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_email_domain_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -70,12 +66,8 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
     api_v1_admin_email_domain_blocks_url(pagination_params(min_id: pagination_since_id)) unless @email_domain_blocks.empty?
   end
 
-  def pagination_max_id
-    @email_domain_blocks.last.id
-  end
-
-  def pagination_since_id
-    @email_domain_blocks.first.id
+  def pagination_collection
+    @email_domain_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/ip_blocks_controller.rb b/app/controllers/api/v1/admin/ip_blocks_controller.rb
index 61c1912344..3625781149 100644
--- a/app/controllers/api/v1/admin/ip_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/ip_blocks_controller.rb
@@ -63,10 +63,6 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
     params.permit(:ip, :severity, :comment, :expires_in)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_ip_blocks_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -75,12 +71,8 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
     api_v1_admin_ip_blocks_url(pagination_params(min_id: pagination_since_id)) unless @ip_blocks.empty?
   end
 
-  def pagination_max_id
-    @ip_blocks.last.id
-  end
-
-  def pagination_since_id
-    @ip_blocks.first.id
+  def pagination_collection
+    @ip_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/reports_controller.rb b/app/controllers/api/v1/admin/reports_controller.rb
index 9dfb181a28..9b5beeab67 100644
--- a/app/controllers/api/v1/admin/reports_controller.rb
+++ b/app/controllers/api/v1/admin/reports_controller.rb
@@ -35,6 +35,7 @@ class Api::V1::Admin::ReportsController < Api::BaseController
   def update
     authorize @report, :update?
     @report.update!(report_params)
+    log_action :update, @report
     render json: @report, serializer: REST::Admin::ReportSerializer
   end
 
@@ -88,10 +89,6 @@ class Api::V1::Admin::ReportsController < Api::BaseController
     params.permit(*FILTER_PARAMS)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_reports_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -100,12 +97,8 @@ class Api::V1::Admin::ReportsController < Api::BaseController
     api_v1_admin_reports_url(pagination_params(min_id: pagination_since_id)) unless @reports.empty?
   end
 
-  def pagination_max_id
-    @reports.last.id
-  end
-
-  def pagination_since_id
-    @reports.first.id
+  def pagination_collection
+    @reports
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index 6a7c9f5bf3..c754980720 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -44,10 +44,6 @@ class Api::V1::Admin::TagsController < Api::BaseController
     params.permit(:display_name, :trendable, :usable, :listable)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_tags_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -56,12 +52,8 @@ class Api::V1::Admin::TagsController < Api::BaseController
     api_v1_admin_tags_url(pagination_params(min_id: pagination_since_id)) unless @tags.empty?
   end
 
-  def pagination_max_id
-    @tags.last.id
-  end
-
-  def pagination_since_id
-    @tags.first.id
+  def pagination_collection
+    @tags
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
index 5d9fcc82c0..8bb5e22716 100644
--- a/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
+++ b/app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb
@@ -42,10 +42,6 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
     @providers = PreviewCardProvider.all.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_admin_trends_links_preview_card_providers_url(pagination_params(max_id: pagination_max_id)) if records_continue?
   end
@@ -54,12 +50,8 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
     api_v1_admin_trends_links_preview_card_providers_url(pagination_params(min_id: pagination_since_id)) unless @providers.empty?
   end
 
-  def pagination_max_id
-    @providers.last.id
-  end
-
-  def pagination_since_id
-    @providers.first.id
+  def pagination_collection
+    @providers
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/annual_reports_controller.rb b/app/controllers/api/v1/annual_reports_controller.rb
new file mode 100644
index 0000000000..9bc8e68ac2
--- /dev/null
+++ b/app/controllers/api/v1/annual_reports_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Api::V1::AnnualReportsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
+  before_action :require_user!
+  before_action :set_annual_report, except: :index
+
+  def index
+    with_read_replica do
+      @presenter = AnnualReportsPresenter.new(GeneratedAnnualReport.where(account_id: current_account.id).pending)
+      @relationships = StatusRelationshipsPresenter.new(@presenter.statuses, current_account.id)
+    end
+
+    render json: @presenter,
+           serializer: REST::AnnualReportsSerializer,
+           relationships: @relationships
+  end
+
+  def read
+    @annual_report.view!
+    render_empty
+  end
+
+  private
+
+  def set_annual_report
+    @annual_report = GeneratedAnnualReport.find_by!(account_id: current_account.id, year: params[:id])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/accounts_controller.rb b/app/controllers/api/v1/antennas/accounts_controller.rb
new file mode 100644
index 0000000000..c50cbcdf3f
--- /dev/null
+++ b/app/controllers/api/v1/antennas/accounts_controller.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::AccountsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  after_action :insert_pagination_headers, only: :show
+
+  def show
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  def create
+    ApplicationRecord.transaction do
+      antenna_accounts.each do |account|
+        @antenna.antenna_accounts.create!(account: account, exclude: false)
+        @antenna.update!(any_accounts: false) if @antenna.any_accounts
+      end
+    end
+
+    render_empty
+  end
+
+  def destroy
+    AntennaAccount.where(antenna: @antenna, account_id: account_ids).destroy_all
+    @antenna.update!(any_accounts: true) unless @antenna.antenna_accounts.where(exclude: false).any?
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def load_accounts
+    if unlimited?
+      @antenna.accounts.without_suspended.includes(:account_stat).all
+    else
+      @antenna.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+    end
+  end
+
+  def antenna_accounts
+    Account.find(account_ids)
+  end
+
+  def account_ids
+    Array(resource_params[:account_ids])
+  end
+
+  def resource_params
+    params.permit(account_ids: [])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    api_v1_list_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    return if unlimited?
+
+    api_v1_list_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
+  end
+
+  def pagination_max_id
+    @accounts.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/antennas/domains_controller.rb b/app/controllers/api/v1/antennas/domains_controller.rb
new file mode 100644
index 0000000000..554b8d613c
--- /dev/null
+++ b/app/controllers/api/v1/antennas/domains_controller.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::DomainsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def show
+    @domains = load_domains
+    @exclude_domains = load_exclude_domains
+    render json: { domains: @domains, exclude_domains: @exclude_domains }
+  end
+
+  def create
+    ApplicationRecord.transaction do
+      domains.each do |domain|
+        @antenna.antenna_domains.create!(name: domain, exclude: false)
+        @antenna.update!(any_domains: false) if @antenna.any_domains
+      end
+    end
+
+    render_empty
+  end
+
+  def destroy
+    AntennaDomain.where(antenna: @antenna, name: domains).destroy_all
+    @antenna.update!(any_domains: true) unless @antenna.antenna_domains.where(exclude: false).any?
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def load_domains
+    @antenna.antenna_domains.pluck(:name)
+  end
+
+  def load_exclude_domains
+    @antenna.exclude_domains || []
+  end
+
+  def domains
+    Array(resource_params[:domains])
+  end
+
+  def resource_params
+    params.permit(domains: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/exclude_accounts_controller.rb b/app/controllers/api/v1/antennas/exclude_accounts_controller.rb
new file mode 100644
index 0000000000..cdb9173c11
--- /dev/null
+++ b/app/controllers/api/v1/antennas/exclude_accounts_controller.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::ExcludeAccountsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  after_action :insert_pagination_headers, only: :show
+
+  def show
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  def create
+    new_accounts = @antenna.exclude_accounts || []
+    antenna_accounts.each do |account|
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.duplicate_account') if new_accounts.include?(account.id)
+
+      new_accounts << account.id
+    end
+
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.accounts') if new_accounts.size > Antenna::ACCOUNTS_PER_ANTENNA_LIMIT
+
+    @antenna.update!(exclude_accounts: new_accounts)
+
+    render_empty
+  end
+
+  def destroy
+    new_accounts = @antenna.exclude_accounts || []
+    new_accounts -= antenna_accounts.pluck(:id)
+
+    @antenna.update!(exclude_accounts: new_accounts)
+
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def load_accounts
+    return [] if @antenna.exclude_accounts.nil?
+
+    if unlimited?
+      Account.where(id: @antenna.exclude_accounts).without_suspended.includes(:account_stat).all
+    else
+      Account.where(id: @antenna.exclude_accounts).without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+    end
+  end
+
+  def antenna_accounts
+    Account.find(account_ids)
+  end
+
+  def account_ids
+    Array(resource_params[:account_ids])
+  end
+
+  def resource_params
+    params.permit(account_ids: [])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    api_v1_list_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    return if unlimited?
+
+    api_v1_list_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
+  end
+
+  def pagination_max_id
+    @accounts.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/antennas/exclude_domains_controller.rb b/app/controllers/api/v1/antennas/exclude_domains_controller.rb
new file mode 100644
index 0000000000..235a44d593
--- /dev/null
+++ b/app/controllers/api/v1/antennas/exclude_domains_controller.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::ExcludeDomainsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def create
+    new_domains = @antenna.exclude_domains || []
+    domains.each do |domain|
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.duplicate_domain') if new_domains.include?(domain)
+
+      new_domains << domain
+    end
+
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.domains') if new_domains.size > Antenna::KEYWORDS_PER_ANTENNA_LIMIT
+
+    @antenna.update!(exclude_domains: new_domains)
+
+    render_empty
+  end
+
+  def destroy
+    new_domains = @antenna.exclude_domains || []
+    new_domains -= domains
+
+    @antenna.update!(exclude_domains: new_domains)
+
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def domains
+    Array(resource_params[:domains])
+  end
+
+  def resource_params
+    params.permit(domains: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/exclude_keywords_controller.rb b/app/controllers/api/v1/antennas/exclude_keywords_controller.rb
new file mode 100644
index 0000000000..171dac5f80
--- /dev/null
+++ b/app/controllers/api/v1/antennas/exclude_keywords_controller.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::ExcludeKeywordsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def create
+    new_keywords = @antenna.exclude_keywords || []
+    keywords.each do |keyword|
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.duplicate_keyword') if new_keywords.include?(keyword)
+
+      new_keywords << keyword
+    end
+
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.keywords') if new_keywords.size > Antenna::KEYWORDS_PER_ANTENNA_LIMIT
+
+    @antenna.update!(exclude_keywords: new_keywords)
+
+    render_empty
+  end
+
+  def destroy
+    new_keywords = @antenna.exclude_keywords || []
+    new_keywords -= keywords
+
+    @antenna.update!(exclude_keywords: new_keywords)
+
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def keywords
+    Array(resource_params[:keywords])
+  end
+
+  def resource_params
+    params.permit(keywords: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/exclude_tags_controller.rb b/app/controllers/api/v1/antennas/exclude_tags_controller.rb
new file mode 100644
index 0000000000..bf9e087369
--- /dev/null
+++ b/app/controllers/api/v1/antennas/exclude_tags_controller.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::ExcludeTagsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def create
+    new_tags = @antenna.exclude_tags || []
+    tags.map(&:id).each do |tag|
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.duplicate_tag') if new_tags.include?(tag)
+
+      new_tags << tag
+    end
+
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.tags') if new_tags.size > Antenna::TAGS_PER_ANTENNA_LIMIT
+
+    @antenna.update!(exclude_tags: new_tags)
+
+    render_empty
+  end
+
+  def destroy
+    new_tags = @antenna.exclude_tags || []
+    new_tags -= exist_tags.pluck(:id)
+
+    @antenna.update!(exclude_tags: new_tags)
+
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def tags
+    Tag.find_or_create_by_names(Array(resource_params[:tags]))
+  end
+
+  def exist_tags
+    Tag.matching_name(Array(resource_params[:tags]))
+  end
+
+  def resource_params
+    params.permit(tags: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/keywords_controller.rb b/app/controllers/api/v1/antennas/keywords_controller.rb
new file mode 100644
index 0000000000..5260a66bc0
--- /dev/null
+++ b/app/controllers/api/v1/antennas/keywords_controller.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::KeywordsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def show
+    @keywords = load_keywords
+    @exclude_keywords = load_exclude_keywords
+    render json: { keywords: @keywords, exclude_keywords: @exclude_keywords }
+  end
+
+  def create
+    new_keywords = @antenna.keywords || []
+    keywords.each do |keyword|
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.duplicate_keyword') if new_keywords.include?(keyword)
+      raise Mastodon::ValidationError, I18n.t('antennas.errors.too_short_keyword') if keyword.length < 2
+
+      new_keywords << keyword
+    end
+
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.keywords') if new_keywords.size > Antenna::KEYWORDS_PER_ANTENNA_LIMIT
+
+    @antenna.update!(keywords: new_keywords, any_keywords: new_keywords.empty?)
+
+    render_empty
+  end
+
+  def destroy
+    new_keywords = @antenna.keywords || []
+    new_keywords -= keywords
+
+    @antenna.update!(keywords: new_keywords, any_keywords: new_keywords.empty?)
+
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def load_keywords
+    @antenna.keywords || []
+  end
+
+  def load_exclude_keywords
+    @antenna.exclude_keywords || []
+  end
+
+  def keywords
+    Array(resource_params[:keywords])
+  end
+
+  def resource_params
+    params.permit(keywords: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas/tags_controller.rb b/app/controllers/api/v1/antennas/tags_controller.rb
new file mode 100644
index 0000000000..fe0bb6b4eb
--- /dev/null
+++ b/app/controllers/api/v1/antennas/tags_controller.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class Api::V1::Antennas::TagsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_antenna
+
+  def show
+    @tags = load_tags
+    @exclude_tags = load_exclude_tags
+    render json: { tags: @tags, exclude_tags: @exclude_tags.pluck(:name) }
+  end
+
+  def create
+    ApplicationRecord.transaction do
+      tags.each do |tag|
+        @antenna.antenna_tags.create!(tag: tag, exclude: false)
+        @antenna.update!(any_tags: false) if @antenna.any_tags
+      end
+    end
+
+    render_empty
+  end
+
+  def destroy
+    AntennaTag.where(antenna: @antenna, tag: exist_tags).destroy_all
+    @antenna.update!(any_tags: true) unless @antenna.antenna_tags.where(exclude: false).any?
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:antenna_id])
+  end
+
+  def load_tags
+    @antenna.tags.pluck(:name)
+  end
+
+  def load_exclude_tags
+    Tag.where(id: @antenna.exclude_tags || [])
+  end
+
+  def tags
+    Tag.find_or_create_by_names(Array(resource_params[:tags]))
+  end
+
+  def exist_tags
+    Tag.matching_name(Array(resource_params[:tags]))
+  end
+
+  def resource_params
+    params.permit(tags: [])
+  end
+end
diff --git a/app/controllers/api/v1/antennas_controller.rb b/app/controllers/api/v1/antennas_controller.rb
new file mode 100644
index 0000000000..37bfb7f552
--- /dev/null
+++ b/app/controllers/api/v1/antennas_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Api::V1::AntennasController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show]
+
+  before_action :require_user!
+  before_action :set_antenna, except: [:index, :create]
+
+  rescue_from ArgumentError do |e|
+    render json: { error: e.to_s }, status: 422
+  end
+
+  def index
+    @antennas = Antenna.where(account: current_account).all
+    render json: @antennas, each_serializer: REST::AntennaSerializer
+  end
+
+  def show
+    render json: @antenna, serializer: REST::AntennaSerializer
+  end
+
+  def create
+    @antenna = Antenna.create!(antenna_params.merge(account: current_account, list_id: 0))
+    render json: @antenna, serializer: REST::AntennaSerializer
+  end
+
+  def update
+    @antenna.update!(antenna_params)
+    render json: @antenna, serializer: REST::AntennaSerializer
+  end
+
+  def destroy
+    @antenna.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:id])
+  end
+
+  def antenna_params
+    params.permit(:title, :list_id, :insert_feeds, :stl, :ltl, :with_media_only, :ignore_reblog)
+  end
+end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 06a8bfa891..234ab2e82c 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::BlocksController < Api::BaseController
   end
 
   def paginated_blocks
-    @paginated_blocks ||= Block.eager_load(target_account: :account_stat)
+    @paginated_blocks ||= Block.eager_load(target_account: [:account_stat, :user])
                                .joins(:target_account)
                                .merge(Account.without_suspended)
                                .where(account: current_account)
@@ -28,10 +28,6 @@ class Api::V1::BlocksController < Api::BaseController
                                )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -40,12 +36,8 @@ class Api::V1::BlocksController < Api::BaseController
     api_v1_blocks_url pagination_params(since_id: pagination_since_id) unless paginated_blocks.empty?
   end
 
-  def pagination_max_id
-    paginated_blocks.last.id
-  end
-
-  def pagination_since_id
-    paginated_blocks.first.id
+  def pagination_collection
+    paginated_blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/bookmark_categories/statuses_controller.rb b/app/controllers/api/v1/bookmark_categories/statuses_controller.rb
new file mode 100644
index 0000000000..a195fce97d
--- /dev/null
+++ b/app/controllers/api/v1/bookmark_categories/statuses_controller.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+class Api::V1::BookmarkCategories::StatusesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_bookmark_category
+
+  after_action :insert_pagination_headers, only: :show
+
+  def show
+    @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
+  def create
+    ApplicationRecord.transaction do
+      bookmark_category_statuses.each do |status|
+        Bookmark.find_or_create_by!(account: current_account, status: status)
+        @bookmark_category.statuses << status
+      end
+    end
+
+    render_empty
+  end
+
+  def destroy
+    BookmarkCategoryStatus.where(bookmark_category: @bookmark_category, status_id: status_ids).destroy_all
+    render_empty
+  end
+
+  private
+
+  def set_bookmark_category
+    @bookmark_category = current_account.bookmark_categories.find(params[:bookmark_category_id])
+  end
+
+  def load_statuses
+    if unlimited?
+      @bookmark_category.statuses.includes(:status_stat).all
+    else
+      @bookmark_category.statuses.includes(:status_stat).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
+    end
+  end
+
+  def bookmark_category_statuses
+    Status.find(status_ids)
+  end
+
+  def status_ids
+    Array(resource_params[:status_ids])
+  end
+
+  def resource_params
+    params.permit(status_ids: [])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    api_v1_bookmark_category_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    return if unlimited?
+
+    api_v1_bookmark_category_statuses_url pagination_params(since_id: pagination_since_id) unless @statuses.empty?
+  end
+
+  def pagination_max_id
+    @statuses.last.id
+  end
+
+  def pagination_since_id
+    @statuses.first.id
+  end
+
+  def records_continue?
+    @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/bookmark_categories_controller.rb b/app/controllers/api/v1/bookmark_categories_controller.rb
new file mode 100644
index 0000000000..c32828630d
--- /dev/null
+++ b/app/controllers/api/v1/bookmark_categories_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Api::V1::BookmarkCategoriesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show]
+
+  before_action :require_user!
+  before_action :set_bookmark_category, except: [:index, :create]
+
+  rescue_from ArgumentError do |e|
+    render json: { error: e.to_s }, status: 422
+  end
+
+  def index
+    @bookmark_categories = BookmarkCategory.where(account: current_account).all
+    render json: @bookmark_categories, each_serializer: REST::BookmarkCategorySerializer
+  end
+
+  def show
+    render json: @bookmark_category, serializer: REST::BookmarkCategorySerializer
+  end
+
+  def create
+    @bookmark_category = BookmarkCategory.create!(bookmark_category_params.merge(account: current_account))
+    render json: @bookmark_category, serializer: REST::BookmarkCategorySerializer
+  end
+
+  def update
+    @bookmark_category.update!(bookmark_category_params)
+    render json: @bookmark_category, serializer: REST::BookmarkCategorySerializer
+  end
+
+  def destroy
+    @bookmark_category.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_bookmark_category
+    @bookmark_category = BookmarkCategory.where(account: current_account).find(params[:id])
+  end
+
+  def bookmark_category_params
+    params.permit(:title)
+  end
+end
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/api/v1/bookmarks_controller.rb
index 498eb16f44..a2209d812e 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@@ -7,17 +7,19 @@ class Api::V1::BookmarksController < Api::BaseController
 
   def index
     @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
 
   def load_statuses
-    cached_bookmarks
+    preloaded_bookmarks
   end
 
-  def cached_bookmarks
-    cache_collection(results.map(&:status), Status)
+  def preloaded_bookmarks
+    preload_collection(results.map(&:status), Status)
   end
 
   def results
@@ -31,10 +33,6 @@ class Api::V1::BookmarksController < Api::BaseController
     current_account.bookmarks
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -43,12 +41,8 @@ class Api::V1::BookmarksController < Api::BaseController
     api_v1_bookmarks_url pagination_params(min_id: pagination_since_id) unless results.empty?
   end
 
-  def pagination_max_id
-    results.last.id
-  end
-
-  def pagination_since_id
-    results.first.id
+  def pagination_collection
+    results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/circles/accounts_controller.rb b/app/controllers/api/v1/circles/accounts_controller.rb
new file mode 100644
index 0000000000..e0d43bd950
--- /dev/null
+++ b/app/controllers/api/v1/circles/accounts_controller.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+class Api::V1::Circles::AccountsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
+
+  before_action :require_user!
+  before_action :set_circle
+
+  after_action :insert_pagination_headers, only: :show
+
+  def show
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  def create
+    ApplicationRecord.transaction do
+      circle_accounts.each do |account|
+        @circle.accounts << account
+      end
+    end
+
+    render_empty
+  end
+
+  def destroy
+    CircleAccount.where(circle: @circle, account_id: account_ids).destroy_all
+    render_empty
+  end
+
+  private
+
+  def set_circle
+    @circle = Circle.where(account: current_account).find(params[:circle_id])
+  end
+
+  def load_accounts
+    if unlimited?
+      @circle.accounts.without_suspended.includes(:account_stat).all
+    else
+      @circle.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+    end
+  end
+
+  def circle_accounts
+    Account.find(account_ids)
+  end
+
+  def account_ids
+    Array(resource_params[:account_ids])
+  end
+
+  def resource_params
+    params.permit(account_ids: [])
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    api_v1_circle_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    return if unlimited?
+
+    api_v1_circle_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
+  end
+
+  def pagination_max_id
+    @accounts.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/circles/statuses_controller.rb b/app/controllers/api/v1/circles/statuses_controller.rb
new file mode 100644
index 0000000000..705731936b
--- /dev/null
+++ b/app/controllers/api/v1/circles/statuses_controller.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+class Api::V1::Circles::StatusesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
+
+  before_action :require_user!
+  before_action :set_circle
+
+  after_action :insert_pagination_headers, only: :show
+
+  def show
+    @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
+  private
+
+  def set_circle
+    @circle = current_account.circles.find(params[:circle_id])
+  end
+
+  def load_statuses
+    if unlimited?
+      @circle.statuses.includes(:status_stat).all
+    else
+      @circle.statuses.includes(:status_stat).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
+    end
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    api_v1_circle_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    return if unlimited?
+
+    api_v1_circle_statuses_url pagination_params(since_id: pagination_since_id) unless @statuses.empty?
+  end
+
+  def pagination_max_id
+    @statuses.last.id
+  end
+
+  def pagination_since_id
+    @statuses.first.id
+  end
+
+  def records_continue?
+    @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/circles_controller.rb b/app/controllers/api/v1/circles_controller.rb
new file mode 100644
index 0000000000..53c9adf14e
--- /dev/null
+++ b/app/controllers/api/v1/circles_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Api::V1::CirclesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show]
+
+  before_action :require_user!
+  before_action :set_circle, except: [:index, :create]
+
+  rescue_from ArgumentError do |e|
+    render json: { error: e.to_s }, status: 422
+  end
+
+  def index
+    @circles = Circle.where(account: current_account).all
+    render json: @circles, each_serializer: REST::CircleSerializer
+  end
+
+  def show
+    render json: @circle, serializer: REST::CircleSerializer
+  end
+
+  def create
+    @circle = Circle.create!(circle_params.merge(account: current_account))
+    render json: @circle, serializer: REST::CircleSerializer
+  end
+
+  def update
+    @circle.update!(circle_params)
+    render json: @circle, serializer: REST::CircleSerializer
+  end
+
+  def destroy
+    @circle.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_circle
+    @circle = Circle.where(account: current_account).find(params[:id])
+  end
+
+  def circle_params
+    params.permit(:title)
+  end
+end
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index 6a3567e624..a95c816e1c 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -53,10 +53,6 @@ class Api::V1::ConversationsController < Api::BaseController
                        .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_conversations_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
index 68cf4384f7..d3de220393 100644
--- a/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
+++ b/app/controllers/api/v1/crypto/encrypted_messages_controller.rb
@@ -29,10 +29,6 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
     @encrypted_messages = @current_device.encrypted_messages.to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_crypto_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -41,12 +37,8 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
     api_v1_crypto_encrypted_messages_url pagination_params(min_id: pagination_since_id) unless @encrypted_messages.empty?
   end
 
-  def pagination_max_id
-    @encrypted_messages.last.id
-  end
-
-  def pagination_since_id
-    @encrypted_messages.first.id
+  def pagination_collection
+    @encrypted_messages
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/directories_controller.rb b/app/controllers/api/v1/directories_controller.rb
index e79b20ce42..6c540404ea 100644
--- a/app/controllers/api/v1/directories_controller.rb
+++ b/app/controllers/api/v1/directories_controller.rb
@@ -27,7 +27,7 @@ class Api::V1::DirectoriesController < Api::BaseController
       scope.merge!(local_account_scope) if local_accounts?
       scope.merge!(account_exclusion_scope) if current_account
       scope.merge!(account_domain_block_scope) if current_account && !local_accounts?
-    end
+    end.includes(:account_stat, user: :role)
   end
 
   def local_accounts?
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 34def3c44a..3dee2d176c 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -38,10 +38,6 @@ class Api::V1::DomainBlocksController < Api::BaseController
     current_account.domain_blocks
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_domain_blocks_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -50,12 +46,8 @@ class Api::V1::DomainBlocksController < Api::BaseController
     api_v1_domain_blocks_url pagination_params(since_id: pagination_since_id) unless @blocks.empty?
   end
 
-  def pagination_max_id
-    @blocks.last.id
-  end
-
-  def pagination_since_id
-    @blocks.first.id
+  def pagination_collection
+    @blocks
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/emoji_reactions_controller.rb b/app/controllers/api/v1/emoji_reactions_controller.rb
new file mode 100644
index 0000000000..5e913eef2a
--- /dev/null
+++ b/app/controllers/api/v1/emoji_reactions_controller.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class Api::V1::EmojiReactionsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:favourites' }
+  before_action :require_user!
+  after_action :insert_pagination_headers
+
+  def index
+    @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
+  end
+
+  private
+
+  def load_statuses
+    cached_emoji_reactions
+  end
+
+  def cached_emoji_reactions
+    preload_collection(results.map(&:status), EmojiReaction)
+  end
+
+  def results
+    @results ||= account_emoji_reactions.joins(:status).eager_load(:status).to_a_paginated_by_id(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+  end
+
+  def account_emoji_reactions
+    current_account.emoji_reactions
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_emoji_reactions_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_emoji_reactions_url pagination_params(min_id: pagination_since_id) unless results.empty?
+  end
+
+  def pagination_max_id
+    results.last.id
+  end
+
+  def pagination_since_id
+    results.first.id
+  end
+
+  def records_continue?
+    results.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 46e3fcd647..9a723d89e4 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -25,11 +25,7 @@ class Api::V1::EndorsementsController < Api::BaseController
   end
 
   def endorsed_accounts
-    current_account.endorsed_accounts.includes(:account_stat).without_suspended
-  end
-
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
+    current_account.endorsed_accounts.includes(:account_stat, :user).without_suspended
   end
 
   def next_path
@@ -44,12 +40,8 @@ class Api::V1::EndorsementsController < Api::BaseController
     api_v1_endorsements_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index faf1bda96a..95c795468b 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -7,17 +7,19 @@ class Api::V1::FavouritesController < Api::BaseController
 
   def index
     @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
 
   def load_statuses
-    cached_favourites
+    preloaded_favourites
   end
 
-  def cached_favourites
-    cache_collection(results.map(&:status), Status)
+  def preloaded_favourites
+    preload_collection(results.map(&:status), Status)
   end
 
   def results
@@ -31,10 +33,6 @@ class Api::V1::FavouritesController < Api::BaseController
     current_account.favourites
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_favourites_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -43,12 +41,8 @@ class Api::V1::FavouritesController < Api::BaseController
     api_v1_favourites_url pagination_params(min_id: pagination_since_id) unless results.empty?
   end
 
-  def pagination_max_id
-    results.last.id
-  end
-
-  def pagination_since_id
-    results.first.id
+  def pagination_collection
+    results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/featured_tags/suggestions_controller.rb b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
index 76633210a1..9c72e4380d 100644
--- a/app/controllers/api/v1/featured_tags/suggestions_controller.rb
+++ b/app/controllers/api/v1/featured_tags/suggestions_controller.rb
@@ -12,6 +12,6 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
   private
 
   def set_recently_used_tags
-    @recently_used_tags = Tag.recently_used(current_account).where.not(id: current_account.featured_tags).limit(10)
+    @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10)
   end
 end
diff --git a/app/controllers/api/v1/filters_controller.rb b/app/controllers/api/v1/filters_controller.rb
index ed98acce30..4345b61ac7 100644
--- a/app/controllers/api/v1/filters_controller.rb
+++ b/app/controllers/api/v1/filters_controller.rb
@@ -52,11 +52,11 @@ class Api::V1::FiltersController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
+    params.permit(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :whole_word, context: [])
   end
 
   def filter_params
-    resource_params.slice(:phrase, :expires_in, :irreversible, :context)
+    resource_params.slice(:phrase, :expires_in, :irreversible, :exclude_follows, :exclude_localusers, :with_quote, :context)
   end
 
   def keyword_params
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index ee717ebbcc..7ffd7614bb 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -37,7 +37,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
   end
 
   def default_accounts
-    Account.without_suspended.includes(:follow_requests, :account_stat).references(:follow_requests)
+    Account.without_suspended.includes(:follow_requests, :account_stat, :user).references(:follow_requests)
   end
 
   def paginated_follow_requests
@@ -48,10 +48,6 @@ class Api::V1::FollowRequestsController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_follow_requests_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb
index eae2bdc010..8888612b16 100644
--- a/app/controllers/api/v1/followed_tags_controller.rb
+++ b/app/controllers/api/v1/followed_tags_controller.rb
@@ -22,10 +22,6 @@ class Api::V1::FollowedTagsController < Api::BaseController
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_followed_tags_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -34,12 +30,8 @@ class Api::V1::FollowedTagsController < Api::BaseController
     api_v1_followed_tags_url pagination_params(since_id: pagination_since_id) unless @results.empty?
   end
 
-  def pagination_max_id
-    @results.last.id
-  end
-
-  def pagination_since_id
-    @results.first.id
+  def pagination_collection
+    @results
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 8e12cb7b65..aecf391049 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController
 
   def load_accounts
     if unlimited?
-      @list.accounts.without_suspended.includes(:account_stat).all
+      @list.accounts.without_suspended.includes(:account_stat, :user).all
     else
-      @list.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+      @list.accounts.without_suspended.includes(:account_stat, :user).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
     end
   end
 
@@ -55,10 +55,6 @@ class Api::V1::Lists::AccountsController < Api::BaseController
     params.permit(account_ids: [])
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     return if unlimited?
 
@@ -71,12 +67,8 @@ class Api::V1::Lists::AccountsController < Api::BaseController
     api_v1_list_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
   end
 
-  def pagination_max_id
-    @accounts.last.id
-  end
-
-  def pagination_since_id
-    @accounts.first.id
+  def pagination_collection
+    @accounts
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb
index 4bbbed2673..0bacd7fdb0 100644
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@@ -31,6 +31,9 @@ class Api::V1::ListsController < Api::BaseController
   end
 
   def destroy
+    antenna = Antenna.find_by(list_id: @list.id)
+    antenna.update!(list_id: 0) if antenna.present?
+
     @list.destroy!
     render_empty
   end
@@ -42,6 +45,6 @@ class Api::V1::ListsController < Api::BaseController
   end
 
   def list_params
-    params.permit(:title, :replies_policy, :exclusive)
+    params.permit(:title, :replies_policy, :exclusive, :notify)
   end
 end
diff --git a/app/controllers/api/v1/markers_controller.rb b/app/controllers/api/v1/markers_controller.rb
index f8dfba8a94..8eaf7767df 100644
--- a/app/controllers/api/v1/markers_controller.rb
+++ b/app/controllers/api/v1/markers_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::MarkersController < Api::BaseController
       @markers = {}
 
       resource_params.each_pair do |timeline, timeline_params|
-        @markers[timeline] = current_user.markers.find_or_initialize_by(timeline: timeline)
+        @markers[timeline] = current_user.markers.find_or_create_by(timeline: timeline)
         @markers[timeline].update!(timeline_params)
       end
     end
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 555485823c..dbfd7e103a 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::MutesController < Api::BaseController
   end
 
   def paginated_mutes
-    @paginated_mutes ||= Mute.eager_load(:target_account)
+    @paginated_mutes ||= Mute.eager_load(target_account: [:account_stat, :user])
                              .joins(:target_account)
                              .merge(Account.without_suspended)
                              .where(account: current_account)
@@ -28,10 +28,6 @@ class Api::V1::MutesController < Api::BaseController
                              )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_mutes_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -40,12 +36,8 @@ class Api::V1::MutesController < Api::BaseController
     api_v1_mutes_url pagination_params(since_id: pagination_since_id) unless paginated_mutes.empty?
   end
 
-  def pagination_max_id
-    paginated_mutes.last.id
-  end
-
-  def pagination_since_id
-    paginated_mutes.first.id
+  def pagination_collection
+    paginated_mutes
   end
 
   def records_continue?
diff --git a/app/controllers/api/v1/notifications/policies_controller.rb b/app/controllers/api/v1/notifications/policies_controller.rb
new file mode 100644
index 0000000000..1ec336f9a5
--- /dev/null
+++ b/app/controllers/api/v1/notifications/policies_controller.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class Api::V1::Notifications::PoliciesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :show
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: :update
+
+  before_action :require_user!
+  before_action :set_policy
+
+  def show
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  def update
+    @policy.update!(resource_params)
+    render json: @policy, serializer: REST::NotificationPolicySerializer
+  end
+
+  private
+
+  def set_policy
+    @policy = NotificationPolicy.find_or_initialize_by(account: current_account)
+
+    with_read_replica do
+      @policy.summarize!
+    end
+  end
+
+  def resource_params
+    params.permit(
+      :filter_not_following,
+      :filter_not_followers,
+      :filter_new_accounts,
+      :filter_private_mentions
+    )
+  end
+end
diff --git a/app/controllers/api/v1/notifications/requests_controller.rb b/app/controllers/api/v1/notifications/requests_controller.rb
new file mode 100644
index 0000000000..0e58379a38
--- /dev/null
+++ b/app/controllers/api/v1/notifications/requests_controller.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+class Api::V1::Notifications::RequestsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
+
+  before_action :require_user!
+  before_action :set_request, except: :index
+
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    with_read_replica do
+      @requests = load_requests
+      @relationships = relationships
+    end
+
+    render json: @requests, each_serializer: REST::NotificationRequestSerializer, relationships: @relationships
+  end
+
+  def show
+    render json: @request, serializer: REST::NotificationRequestSerializer
+  end
+
+  def accept
+    AcceptNotificationRequestService.new.call(@request)
+    render_empty
+  end
+
+  def dismiss
+    @request.update!(dismissed: true)
+    render_empty
+  end
+
+  private
+
+  def load_requests
+    requests = NotificationRequest.where(account: current_account).where(dismissed: truthy_param?(:dismissed) || false).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
+      limit_param(DEFAULT_ACCOUNTS_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+
+    NotificationRequest.preload_cache_collection(requests) do |statuses|
+      preload_collection(statuses, Status)
+    end
+  end
+
+  def relationships
+    StatusRelationshipsPresenter.new(@requests.map(&:last_status), current_user&.account_id)
+  end
+
+  def set_request
+    @request = NotificationRequest.where(account: current_account).find(params[:id])
+  end
+
+  def next_path
+    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
+  end
+
+  def prev_path
+    api_v1_notifications_requests_url pagination_params(min_id: pagination_since_id) unless @requests.empty?
+  end
+
+  def pagination_max_id
+    @requests.last.id
+  end
+
+  def pagination_since_id
+    @requests.first.id
+  end
+
+  def pagination_params(core_params)
+    params.slice(:dismissed).permit(:dismissed).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 406ab97538..1d0aa10d2e 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -41,7 +41,7 @@ class Api::V1::NotificationsController < Api::BaseController
     )
 
     Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
-      cache_collection(target_statuses, Status)
+      preload_collection(target_statuses, Status)
     end
   end
 
@@ -49,7 +49,8 @@ class Api::V1::NotificationsController < Api::BaseController
     current_account.notifications.without_suspended.browserable(
       types: Array(browserable_params[:types]),
       exclude_types: Array(browserable_params[:exclude_types]),
-      from_account_id: browserable_params[:account_id]
+      from_account_id: browserable_params[:account_id],
+      include_filtered: truthy_param?(:include_filtered)
     )
   end
 
@@ -57,10 +58,6 @@ class Api::V1::NotificationsController < Api::BaseController
     @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
   end
@@ -69,19 +66,15 @@ class Api::V1::NotificationsController < Api::BaseController
     api_v1_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
   end
 
-  def pagination_max_id
-    @notifications.last.id
-  end
-
-  def pagination_since_id
-    @notifications.first.id
+  def pagination_collection
+    @notifications
   end
 
   def browserable_params
-    params.permit(:account_id, types: [], exclude_types: [])
+    params.permit(:account_id, :include_filtered, types: [], exclude_types: [])
   end
 
   def pagination_params(core_params)
-    params.slice(:limit, :account_id, :types, :exclude_types).permit(:limit, :account_id, types: [], exclude_types: []).merge(core_params)
+    params.slice(:limit, :account_id, :types, :exclude_types, :include_filtered).permit(:limit, :account_id, :include_filtered, types: [], exclude_types: []).merge(core_params)
   end
 end
diff --git a/app/controllers/api/v1/peers/search_controller.rb b/app/controllers/api/v1/peers/search_controller.rb
index 0c503d9bc5..1780554c5d 100644
--- a/app/controllers/api/v1/peers/search_controller.rb
+++ b/app/controllers/api/v1/peers/search_controller.rb
@@ -27,7 +27,7 @@ class Api::V1::Peers::SearchController < Api::BaseController
       @domains = InstancesIndex.query(function_score: {
         query: {
           prefix: {
-            domain: TagManager.instance.normalize_domain(params[:q].strip),
+            domain: normalized_domain,
           },
         },
 
@@ -37,11 +37,18 @@ class Api::V1::Peers::SearchController < Api::BaseController
         },
       }).limit(10).pluck(:domain)
     else
-      domain = params[:q].strip
-      domain = TagManager.instance.normalize_domain(domain)
-      @domains = Instance.searchable.where(Instance.arel_table[:domain].matches("#{Instance.sanitize_sql_like(domain)}%", false, true)).limit(10).pluck(:domain)
+      domain = normalized_domain
+      @domains = Instance.searchable.domain_starts_with(domain).limit(10).pluck(:domain)
     end
   rescue Addressable::URI::InvalidURIError
     @domains = []
   end
+
+  def normalized_domain
+    TagManager.instance.normalize_domain(query_value)
+  end
+
+  def query_value
+    params[:q].strip
+  end
 end
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index 3634acf956..e1ad89ee3e 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 class Api::V1::Push::SubscriptionsController < Api::BaseController
+  include Redisable
+  include Lockable
+
   before_action -> { doorkeeper_authorize! :push }
   before_action :require_user!
-  before_action :set_push_subscription
+  before_action :set_push_subscription, only: [:show, :update]
   before_action :check_push_subscription, only: [:show, :update]
 
   def show
@@ -11,16 +14,18 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   end
 
   def create
-    @push_subscription&.destroy!
+    with_redis_lock("push_subscription:#{current_user.id}") do
+      destroy_web_push_subscriptions!
 
-    @push_subscription = Web::PushSubscription.create!(
-      endpoint: subscription_params[:endpoint],
-      key_p256dh: subscription_params[:keys][:p256dh],
-      key_auth: subscription_params[:keys][:auth],
-      data: data_params,
-      user_id: current_user.id,
-      access_token_id: doorkeeper_token.id
-    )
+      @push_subscription = Web::PushSubscription.create!(
+        endpoint: subscription_params[:endpoint],
+        key_p256dh: subscription_params[:keys][:p256dh],
+        key_auth: subscription_params[:keys][:auth],
+        data: data_params,
+        user_id: current_user.id,
+        access_token_id: doorkeeper_token.id
+      )
+    end
 
     render json: @push_subscription, serializer: REST::WebPushSubscriptionSerializer
   end
@@ -31,14 +36,18 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   end
 
   def destroy
-    @push_subscription&.destroy!
+    destroy_web_push_subscriptions!
     render_empty
   end
 
   private
 
+  def destroy_web_push_subscriptions!
+    doorkeeper_token.web_push_subscriptions.destroy_all
+  end
+
   def set_push_subscription
-    @push_subscription = Web::PushSubscription.find_by(access_token_id: doorkeeper_token.id)
+    @push_subscription = doorkeeper_token.web_push_subscriptions.first
   end
 
   def check_push_subscription
diff --git a/app/controllers/api/v1/reaction_deck_controller.rb b/app/controllers/api/v1/reaction_deck_controller.rb
new file mode 100644
index 0000000000..6229eb89d4
--- /dev/null
+++ b/app/controllers/api/v1/reaction_deck_controller.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+class Api::V1::ReactionDeckController < Api::BaseController
+  include RoutingHelper
+
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index]
+  before_action -> { doorkeeper_authorize! :write, :'write:lists' }, only: [:create]
+
+  before_action :require_user!
+  before_action :set_deck, only: [:index, :create]
+
+  rescue_from ArgumentError do |e|
+    render json: { error: e.to_s }, status: 422
+  end
+
+  def index
+    render json: remove_metas(@deck)
+  end
+
+  def create
+    deck = []
+
+    shortcodes = []
+    (deck_params['emojis'] || []).each do |shortcode|
+      shortcodes << shortcode.delete(':')
+      break if shortcodes.length >= User::REACTION_DECK_MAX
+    end
+
+    custom_emojis = CustomEmoji.where(shortcode: shortcodes, domain: nil)
+
+    shortcodes.each do |shortcode|
+      custom_emoji = custom_emojis.find { |em| em.shortcode == shortcode }
+
+      emoji_data = {}
+
+      if custom_emoji
+        emoji_data['name'] = custom_emoji.shortcode
+        emoji_data['url'] = full_asset_url(custom_emoji.image.url)
+        emoji_data['static_url'] = full_asset_url(custom_emoji.image.url(:static))
+        emoji_data['width'] = custom_emoji.image_width
+        emoji_data['height'] = custom_emoji.image_height
+        emoji_data['custom_emoji_id'] = custom_emoji.id
+      else
+        emoji_data['name'] = shortcode
+      end
+
+      deck << emoji_data
+    end
+
+    current_user.settings['reaction_deck'] = deck.to_json
+    current_user.save!
+
+    render json: remove_metas(deck)
+  end
+
+  private
+
+  def set_deck
+    deck = current_user.setting_reaction_deck ? JSON.parse(current_user.setting_reaction_deck) : []
+    @deck = remove_unused_custom_emojis(deck)
+  end
+
+  def remove_unused_custom_emojis(deck)
+    custom_ids = []
+    deck.each do |item|
+      custom_ids << item['custom_emoji_id'].to_i if item.key?('custom_emoji_id')
+    end
+    custom_emojis = CustomEmoji.where(id: custom_ids)
+
+    deck.each do |item|
+      next if item['custom_emoji_id'].nil?
+
+      custom_emoji = custom_emojis.find { |em| em.id == item['custom_emoji_id'].to_i }
+      remove = custom_emoji.nil? || custom_emoji.disabled
+      item['remove'] = remove if remove
+    end
+    deck.filter { |item| !item.key?('remove') }
+  end
+
+  def remove_metas(deck)
+    deck.tap do |d|
+      d.each do |item|
+        item.delete('custom_emoji_id')
+        # item.delete('id') if item.key?('id')
+      end
+    end
+  end
+
+  def deck_params
+    params
+  end
+end
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
index 2220b6d22e..1217ed014e 100644
--- a/app/controllers/api/v1/scheduled_statuses_controller.rb
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -47,10 +47,6 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
     params.slice(:limit).permit(:limit).merge(core_params)
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
@@ -63,11 +59,7 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
     @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
 
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 end
diff --git a/app/controllers/api/v1/statuses/bookmark_categories_controller.rb b/app/controllers/api/v1/statuses/bookmark_categories_controller.rb
new file mode 100644
index 0000000000..9d65b96296
--- /dev/null
+++ b/app/controllers/api/v1/statuses/bookmark_categories_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::BookmarkCategoriesController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_status
+
+  def index
+    @statuses = @status.deleted_at.present? ? [] : @status.joined_bookmark_categories.where(account: current_account)
+    render json: @statuses, each_serializer: REST::BookmarkCategorySerializer
+  end
+
+  private
+
+  def set_status
+    @status = Status.find(params[:status_id])
+  end
+end
diff --git a/app/controllers/api/v1/statuses/emoji_reactioned_by_accounts_controller.rb b/app/controllers/api/v1/statuses/emoji_reactioned_by_accounts_controller.rb
new file mode 100644
index 0000000000..9c2fb3d4a5
--- /dev/null
+++ b/app/controllers/api/v1/statuses/emoji_reactioned_by_accounts_controller.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::EmojiReactionedByAccountsController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }
+  before_action :set_status
+  after_action :insert_pagination_headers
+
+  def index
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::EmojiReactionAccountSerializer
+  end
+
+  private
+
+  def load_accounts
+    return [] unless Setting.enable_emoji_reaction
+    return [] if current_account.nil? && @status.account.emoji_reaction_policy != :allow
+    return [] if current_account.present? && !@status.account.show_emoji_reaction?(current_account)
+
+    scope = default_accounts
+    scope = scope.where.not(account_id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope.merge(paginated_emoji_reactions).to_a
+  end
+
+  def default_accounts
+    EmojiReaction
+      .where(status_id: @status.id)
+      .includes(:account)
+      .where(account: { suspended_at: nil })
+  end
+
+  def paginated_emoji_reactions
+    EmojiReaction.paginate_by_max_id(
+      limit_param(DEFAULT_ACCOUNTS_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_status_emoji_reactioned_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_status_emoji_reactioned_by_index_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
+  end
+
+  def pagination_max_id
+    @accounts.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/statuses/emoji_reactions_controller.rb b/app/controllers/api/v1/statuses/emoji_reactions_controller.rb
new file mode 100644
index 0000000000..1f103beb71
--- /dev/null
+++ b/app/controllers/api/v1/statuses/emoji_reactions_controller.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::EmojiReactionsController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :write, :'write:favourites' }
+  before_action :require_user!
+  before_action :set_status, only: %i(create update)
+  before_action :set_status_without_authorize, only: [:destroy]
+
+  def create
+    create_private(params[:emoji] || params[:id])
+  end
+
+  # For compatible with Fedibird API
+  def update
+    create_private(params[:id])
+  end
+
+  def destroy
+    emoji = params[:emoji] || params[:id]
+
+    if emoji
+      shortcode, domain = emoji.split('@')
+      emoji_reaction = EmojiReaction.where(account_id: current_account.id).where(status_id: @status.id).where(name: shortcode)
+                                    .find { |reaction| domain == '' ? reaction.custom_emoji.nil? : reaction.custom_emoji&.domain == domain }
+
+      authorize @status, :show? if emoji_reaction.nil?
+
+      UnEmojiReactService.new.call(current_account, @status, emoji_reaction) if emoji_reaction.present?
+    else
+      authorize @status, :show?
+    end
+
+    render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(
+      [@status], current_account.id
+    )
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  private
+
+  def create_private(emoji)
+    count = EmojiReaction.where(account: current_account, status: @status).count
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.limit_reached') if count >= EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.disabled') unless Setting.enable_emoji_reaction
+
+    EmojiReactService.new.call(current_account, @status, emoji)
+    render json: @status, serializer: REST::StatusSerializer
+  end
+
+  def set_status
+    set_status_without_authorize
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def set_status_without_authorize
+    @status = Status.find(params[:status_id])
+  end
+end
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 3cca246ce8..bbc8082e0c 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -14,14 +14,14 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
 
   def load_accounts
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
     scope.merge(paginated_favourites).to_a
   end
 
   def default_accounts
     Account
       .without_suspended
-      .includes(:favourites, :account_stat)
+      .includes(:favourites, :account_stat, :user)
       .references(:favourites)
       .where(favourites: { status_id: @status.id })
   end
@@ -34,10 +34,6 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_status_favourited_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/statuses/mentioned_accounts_controller.rb b/app/controllers/api/v1/statuses/mentioned_accounts_controller.rb
new file mode 100644
index 0000000000..4d905ef1a6
--- /dev/null
+++ b/app/controllers/api/v1/statuses/mentioned_accounts_controller.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::MentionedAccountsController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }
+  before_action :set_status
+  after_action :insert_pagination_headers
+
+  def index
+    cache_if_unauthenticated!
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  private
+
+  def load_accounts
+    scope = default_accounts
+    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope.merge(paginated_mentioned_users).to_a
+  end
+
+  def default_accounts
+    Account
+      .without_suspended
+      .includes(:mentions, :account_stat)
+      .references(:mentions)
+      .where(mentions: { status_id: @status.id })
+  end
+
+  def paginated_mentioned_users
+    Mention.paginate_by_max_id(
+      limit_param(DEFAULT_ACCOUNTS_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_status_mentioned_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_status_mentioned_by_index_url pagination_params(since_id: pagination_since_id) unless @accounts.empty?
+  end
+
+  def pagination_max_id
+    @accounts.last.mentions.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.mentions.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show_mentioned_users?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index dd3e60846b..bac96b032b 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -14,26 +14,22 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
 
   def load_accounts
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
     scope.merge(paginated_statuses).to_a
   end
 
   def default_accounts
-    Account.without_suspended.includes(:statuses, :account_stat).references(:statuses)
+    Account.without_suspended.includes(:statuses, :account_stat, :user).references(:statuses)
   end
 
   def paginated_statuses
-    Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted]).paginate_by_max_id(
+    Status.where(reblog_of_id: @status.id).distributable_visibility.paginate_by_max_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params[:max_id],
       params[:since_id]
     )
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def next_path
     api_v1_status_reblogged_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
diff --git a/app/controllers/api/v1/statuses/referred_by_statuses_controller.rb b/app/controllers/api/v1/statuses/referred_by_statuses_controller.rb
new file mode 100644
index 0000000000..c13c5ff0e8
--- /dev/null
+++ b/app/controllers/api/v1/statuses/referred_by_statuses_controller.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::ReferredByStatusesController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }
+  before_action :set_status
+  after_action :insert_pagination_headers
+
+  def index
+    @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
+  end
+
+  private
+
+  def load_statuses
+    cached_references
+  end
+
+  def cached_references
+    results
+  end
+
+  def results
+    return @results if @results
+
+    account     = current_user&.account
+    statuses    = Status.where(id: @status.referenced_by_status_objects.select(:status_id))
+    account_ids = statuses.map(&:account_id).uniq
+    domains     = statuses.filter_map(&:account_domain).uniq
+    relations   = account&.relations_map(account_ids, domains) || {}
+
+    statuses = preload_collection_paginated_by_id(
+      statuses,
+      Status,
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+
+    @results = statuses.filter { |status| !StatusFilter.new(status, account, relations).filtered? }
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_status_referred_by_index_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_status_referred_by_index_url pagination_params(min_id: pagination_since_id) unless results.empty?
+  end
+
+  def pagination_max_id
+    results.last.id
+  end
+
+  def pagination_since_id
+    results.first.id
+  end
+
+  def records_continue?
+    results.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 064e7632a8..e8636f2138 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -5,9 +5,11 @@ class Api::V1::StatusesController < Api::BaseController
 
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :update, :destroy]
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :update, :destroy]
-  before_action :require_user!, except:  [:show, :context]
-  before_action :set_status, only:       [:show, :context]
-  before_action :set_thread, only:       [:create]
+  before_action :require_user!, except:      [:index, :show, :context]
+  before_action :set_statuses, only:         [:index]
+  before_action :set_status, only:           [:show, :context]
+  before_action :set_thread, only:           [:create]
+  before_action :check_statuses_limit, only: [:index]
 
   override_rate_limit_headers :create, family: :statuses
   override_rate_limit_headers :update, family: :statuses
@@ -23,9 +25,14 @@ class Api::V1::StatusesController < Api::BaseController
   DESCENDANTS_LIMIT       = 60
   DESCENDANTS_DEPTH_LIMIT = 20
 
+  def index
+    @statuses = preload_collection(@statuses, Status)
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
   def show
     cache_if_unauthenticated!
-    @status = cache_collection([@status], Status).first
+    @status = preload_collection([@status], Status).first
     render json: @status, serializer: REST::StatusSerializer
   end
 
@@ -44,11 +51,20 @@ class Api::V1::StatusesController < Api::BaseController
 
     ancestors_results   = @status.in_reply_to_id.nil? ? [] : @status.ancestors(ancestors_limit, current_account)
     descendants_results = @status.descendants(descendants_limit, current_account, descendants_depth_limit)
-    loaded_ancestors    = cache_collection(ancestors_results, Status)
-    loaded_descendants  = cache_collection(descendants_results, Status)
+    references_results  = @status.readable_references(current_account)
+    loaded_ancestors    = preload_collection(ancestors_results, Status)
+    loaded_descendants  = preload_collection(descendants_results, Status)
+    loaded_references   = preload_collection(references_results, Status)
 
-    @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
-    statuses = [@status] + @context.ancestors + @context.descendants
+    if params[:with_reference]
+      loaded_references.reject! { |status| loaded_ancestors.any? { |ancestor| ancestor.id == status.id } }
+    else
+      loaded_ancestors = (loaded_ancestors + loaded_references).uniq(&:id)
+      loaded_references = []
+    end
+
+    @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants, references: loaded_references)
+    statuses = [@status] + @context.ancestors + @context.descendants + @context.references
 
     render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
   end
@@ -61,7 +77,11 @@ class Api::V1::StatusesController < Api::BaseController
       media_ids: status_params[:media_ids],
       sensitive: status_params[:sensitive],
       spoiler_text: status_params[:spoiler_text],
+      markdown: status_params[:markdown],
       visibility: status_params[:visibility],
+      force_visibility: status_params[:force_visibility],
+      searchability: status_params[:searchability],
+      circle_id: status_params[:circle_id],
       language: status_params[:language],
       scheduled_at: status_params[:scheduled_at],
       application: doorkeeper_token.application,
@@ -71,13 +91,9 @@ class Api::V1::StatusesController < Api::BaseController
       with_rate_limit: true
     )
 
-    render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
+    render json: @status, serializer: serializer_for_status
   rescue PostStatusService::UnexpectedMentionsError => e
-    unexpected_accounts = ActiveModel::Serializer::CollectionSerializer.new(
-      e.accounts,
-      serializer: REST::AccountSerializer
-    )
-    render json: { error: e.message, unexpected_accounts: unexpected_accounts }, status: 422
+    render json: unexpected_accounts_error_json(e), status: 422
   end
 
   def update
@@ -93,6 +109,7 @@ class Api::V1::StatusesController < Api::BaseController
       sensitive: status_params[:sensitive],
       language: status_params[:language],
       spoiler_text: status_params[:spoiler_text],
+      markdown: status_params[:markdown],
       poll: status_params[:poll]
     )
 
@@ -115,6 +132,10 @@ class Api::V1::StatusesController < Api::BaseController
 
   private
 
+  def set_statuses
+    @statuses = Status.permitted_statuses_from_ids(status_ids, current_account)
+  end
+
   def set_status
     @status = Status.find(params[:id])
     authorize @status, :show?
@@ -129,6 +150,18 @@ class Api::V1::StatusesController < Api::BaseController
     render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
   end
 
+  def check_statuses_limit
+    raise(Mastodon::ValidationError) if status_ids.size > DEFAULT_STATUSES_LIMIT
+  end
+
+  def status_ids
+    Array(statuses_params[:ids]).uniq.map(&:to_i)
+  end
+
+  def statuses_params
+    params.permit(ids: [])
+  end
+
   def status_params
     params.permit(
       :status,
@@ -136,8 +169,13 @@ class Api::V1::StatusesController < Api::BaseController
       :sensitive,
       :spoiler_text,
       :visibility,
+      :force_visibility,
+      :searchability,
+      :circle_id,
       :language,
+      :markdown,
       :scheduled_at,
+      :status_reference_ids,
       allowed_mentions: [],
       media_ids: [],
       media_attributes: [
@@ -155,6 +193,21 @@ class Api::V1::StatusesController < Api::BaseController
     )
   end
 
+  def serializer_for_status
+    @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
+  end
+
+  def unexpected_accounts_error_json(error)
+    {
+      error: error.message,
+      unexpected_accounts: serialized_accounts(error.accounts),
+    }
+  end
+
+  def serialized_accounts(accounts)
+    ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
+  end
+
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v1/timelines/antenna_controller.rb b/app/controllers/api/v1/timelines/antenna_controller.rb
new file mode 100644
index 0000000000..69554361be
--- /dev/null
+++ b/app/controllers/api/v1/timelines/antenna_controller.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class Api::V1::Timelines::AntennaController < Api::V1::Timelines::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_antenna
+  before_action :set_statuses
+
+  PERMITTED_PARAMS = %i(limit).freeze
+
+  def show
+    render json: @statuses,
+           each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
+  end
+
+  private
+
+  def set_antenna
+    @antenna = Antenna.where(account: current_account).find(params[:id])
+  end
+
+  def set_statuses
+    @statuses = cached_list_statuses
+  end
+
+  def cached_list_statuses
+    preload_collection list_statuses, Status
+  end
+
+  def list_statuses
+    list_feed.get(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id],
+      params[:min_id]
+    )
+  end
+
+  def list_feed
+    AntennaFeed.new(@antenna)
+  end
+
+  def next_path
+    api_v1_timelines_antenna_url params[:id], next_path_params
+  end
+
+  def prev_path
+    api_v1_timelines_antenna_url params[:id], prev_path_params
+  end
+end
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
index 173e173cc9..e79eba79ee 100644
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -5,16 +5,8 @@ class Api::V1::Timelines::BaseController < Api::BaseController
 
   private
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
   end
 
   def next_path_params
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 36fdbea647..e48c5ae251 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -10,22 +10,24 @@ class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
     with_read_replica do
       @statuses = load_statuses
       @relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+      @emoji_reactions = EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
     end
 
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: @relationships,
+           emoji_reaction_permitted_account_ids: @emoji_reactions,
            status: account_home_feed.regenerating? ? 206 : 200
   end
 
   private
 
   def load_statuses
-    cached_home_statuses
+    preloaded_home_statuses
   end
 
-  def cached_home_statuses
-    cache_collection home_statuses, Status
+  def preloaded_home_statuses
+    preload_collection home_statuses, Status
   end
 
   def home_statuses
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index 14b884ecd9..d8cdbdb74c 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -21,11 +21,11 @@ class Api::V1::Timelines::ListController < Api::V1::Timelines::BaseController
   end
 
   def set_statuses
-    @statuses = cached_list_statuses
+    @statuses = preloaded_list_statuses
   end
 
-  def cached_list_statuses
-    cache_collection list_statuses, Status
+  def preloaded_list_statuses
+    preload_collection list_statuses, Status
   end
 
   def list_statuses
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 35af8dc4b5..cb56d309d4 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -8,7 +8,9 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
   def show
     cache_if_unauthenticated!
     @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
@@ -18,11 +20,11 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
   end
 
   def load_statuses
-    cached_public_statuses_page
+    preloaded_public_statuses_page
   end
 
-  def cached_public_statuses_page
-    cache_collection(public_statuses, Status)
+  def preloaded_public_statuses_page
+    preload_collection(public_statuses, Status)
   end
 
   def public_statuses
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 4ba439dbb2..761a4299b8 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -9,7 +9,9 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
   def show
     cache_if_unauthenticated!
     @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+    render json: @statuses, each_serializer: REST::StatusSerializer,
+           relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
+           emoji_reaction_permitted_account_ids: EmojiReactionAccountsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
@@ -23,11 +25,11 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
   end
 
   def load_statuses
-    cached_tagged_statuses
+    preloaded_tagged_statuses
   end
 
-  def cached_tagged_statuses
-    @tag.nil? ? [] : cache_collection(tag_timeline_statuses, Status)
+  def preloaded_tagged_statuses
+    @tag.nil? ? [] : preload_collection(tag_timeline_statuses, Status)
   end
 
   def tag_timeline_statuses
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb
index 57cfa0b7e4..8edf5bbcef 100644
--- a/app/controllers/api/v1/trends/links_controller.rb
+++ b/app/controllers/api/v1/trends/links_controller.rb
@@ -34,10 +34,6 @@ class Api::V1::Trends::LinksController < Api::BaseController
     scope
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v1/trends/statuses_controller.rb b/app/controllers/api/v1/trends/statuses_controller.rb
index c186864c3b..c6fbbce167 100644
--- a/app/controllers/api/v1/trends/statuses_controller.rb
+++ b/app/controllers/api/v1/trends/statuses_controller.rb
@@ -20,7 +20,7 @@ class Api::V1::Trends::StatusesController < Api::BaseController
 
   def set_statuses
     @statuses = if enabled?
-                  cache_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status)
+                  preload_collection(statuses_from_trends.offset(offset_param).limit(limit_param(DEFAULT_STATUSES_LIMIT)), Status)
                 else
                   []
                 end
@@ -32,10 +32,6 @@ class Api::V1::Trends::StatusesController < Api::BaseController
     scope
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb
index aca3dd7089..6d3855a90a 100644
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@@ -30,10 +30,6 @@ class Api::V1::Trends::TagsController < Api::BaseController
     Trends.tags.query.allowed
   end
 
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
   def pagination_params(core_params)
     params.slice(:limit).permit(:limit).merge(core_params)
   end
diff --git a/app/controllers/api/v2/filters_controller.rb b/app/controllers/api/v2/filters_controller.rb
index 2fcdeeae45..0b63caa36a 100644
--- a/app/controllers/api/v2/filters_controller.rb
+++ b/app/controllers/api/v2/filters_controller.rb
@@ -35,7 +35,7 @@ class Api::V2::FiltersController < Api::BaseController
   private
 
   def set_filters
-    @filters = current_account.custom_filters.includes(:keywords)
+    @filters = current_account.custom_filters.includes(:keywords, :statuses)
   end
 
   def set_filter
@@ -43,6 +43,6 @@ class Api::V2::FiltersController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
+    params.permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :with_quote, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 end
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index 3cfc6e7919..a701cbe582 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -3,7 +3,7 @@
 class Api::V2::SearchController < Api::BaseController
   include Authorization
 
-  RESULTS_LIMIT = 20
+  RESULTS_LIMIT = 40
 
   before_action -> { authorize_if_got_token! :read, :'read:search' }
   before_action :validate_search_params!
@@ -63,6 +63,6 @@ class Api::V2::SearchController < Api::BaseController
   end
 
   def search_params
-    params.permit(:type, :offset, :min_id, :max_id, :account_id, :following)
+    params.permit(:type, :offset, :min_id, :max_id, :account_id, :following, :searchability)
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5f8725f6fc..66e0f7e305 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
   include UserTrackingConcern
   include SessionTrackingConcern
   include CacheConcern
+  include PreloadingConcern
   include DomainControlHelper
   include DatabaseHelper
   include AuthorizedFetchHelper
@@ -129,7 +130,7 @@ class ApplicationController < ActionController::Base
   end
 
   def single_user_mode?
-    @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.where('id > 0').exists?
+    @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.without_internal.exists?
   end
 
   def use_seamless_external_login?
@@ -178,7 +179,7 @@ class ApplicationController < ActionController::Base
 
     respond_to do |format|
       format.any  { render 'errors/self_destruct', layout: 'auth', status: 410, formats: [:html] }
-      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: code }
+      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[410] }, status: 410 }
     end
   end
 
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index d9cd630905..a99dceeb25 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -2,12 +2,13 @@
 
 class Auth::ConfirmationsController < Devise::ConfirmationsController
   include Auth::CaptchaConcern
+  include RegistrationLimitationHelper
 
   layout 'auth'
 
   before_action :set_body_classes
   before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
-  before_action :require_unconfirmed!
+  before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?
 
   before_action :extend_csp_for_captcha!, only: [:show, :confirm_captcha]
   before_action :require_captcha_if_needed!, only: [:show]
@@ -16,6 +17,11 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
   skip_before_action :require_functional!
 
   def show
+    if reach_registrations_limit? && !current_user&.valid_invitation?
+      render :limitation_error
+      return
+    end
+
     old_session_values = session.to_hash
     reset_session
     session.update old_session_values.except('session_id')
@@ -65,10 +71,12 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
     @confirmation_user.nil? || @confirmation_user.confirmed?
   end
 
-  def require_unconfirmed!
-    if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
-      redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
-    end
+  def redirect_confirmed_user
+    redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
+  end
+
+  def signed_in_confirmed_user?
+    user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
   end
 
   def set_body_classes
diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index 707b50ef9e..9d496220a3 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -7,7 +7,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def self.provides_callback_for(provider)
     define_method provider do
       @provider = provider
-      @user = User.find_for_oauth(request.env['omniauth.auth'], current_user)
+      @user = User.find_for_omniauth(request.env['omniauth.auth'], current_user)
 
       if @user.persisted?
         record_login_activity
@@ -17,6 +17,9 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
         session["devise.#{provider}_data"] = request.env['omniauth.auth']
         redirect_to new_user_registration_url
       end
+    rescue ActiveRecord::RecordInvalid
+      flash[:alert] = I18n.t('devise.failure.omniauth_user_creation_failure') if is_navigational_format?
+      redirect_to new_user_session_url
     end
   end
 
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index a752194d5b..de001f062b 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -2,7 +2,7 @@
 
 class Auth::PasswordsController < Devise::PasswordsController
   skip_before_action :check_self_destruct!
-  before_action :check_validity_of_reset_password_token, only: :edit
+  before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
   before_action :set_body_classes
 
   layout 'auth'
@@ -19,11 +19,9 @@ class Auth::PasswordsController < Devise::PasswordsController
 
   private
 
-  def check_validity_of_reset_password_token
-    unless reset_password_token_is_valid?
-      flash[:error] = I18n.t('auth.invalid_reset_password_token')
-      redirect_to new_password_path(resource_name)
-    end
+  def redirect_invalid_reset_token
+    flash[:error] = I18n.t('auth.invalid_reset_password_token')
+    redirect_to new_password_path(resource_name)
   end
 
   def set_body_classes
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 148ad53755..6ed7b2baac 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Auth::SessionsController < Devise::SessionsController
+  include Redisable
+
+  MAX_2FA_ATTEMPTS_PER_HOUR = 10
+
   layout 'auth'
 
   skip_before_action :check_self_destruct!
@@ -130,9 +134,23 @@ class Auth::SessionsController < Devise::SessionsController
     session.delete(:attempt_user_updated_at)
   end
 
+  def clear_2fa_attempt_from_user(user)
+    redis.del(second_factor_attempts_key(user))
+  end
+
+  def check_second_factor_rate_limits(user)
+    attempts, = redis.multi do |multi|
+      multi.incr(second_factor_attempts_key(user))
+      multi.expire(second_factor_attempts_key(user), 1.hour)
+    end
+
+    attempts >= MAX_2FA_ATTEMPTS_PER_HOUR
+  end
+
   def on_authentication_success(user, security_measure)
     @on_authentication_success_called = true
 
+    clear_2fa_attempt_from_user(user)
     clear_attempt_from_session
 
     user.update_sign_in!(new_sign_in: true)
@@ -163,5 +181,16 @@ class Auth::SessionsController < Devise::SessionsController
       ip: request.remote_ip,
       user_agent: request.user_agent
     )
+
+    # Only send a notification email every hour at most
+    return if redis.get("2fa_failure_notification:#{user.id}").present?
+
+    redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour)
+
+    UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later!
+  end
+
+  def second_factor_attempts_key(user)
+    "2fa_auth_attempts:#{user.id}:#{Time.now.utc.hour}"
   end
 end
diff --git a/app/controllers/concerns/api/error_handling.rb b/app/controllers/concerns/api/error_handling.rb
new file mode 100644
index 0000000000..ad559fe2d7
--- /dev/null
+++ b/app/controllers/concerns/api/error_handling.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Api::ErrorHandling
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
+      render json: { error: e.to_s }, status: 422
+    end
+
+    rescue_from ActiveRecord::RecordNotUnique do
+      render json: { error: 'Duplicate record' }, status: 422
+    end
+
+    rescue_from Date::Error do
+      render json: { error: 'Invalid date supplied' }, status: 422
+    end
+
+    rescue_from ActiveRecord::RecordNotFound do
+      render json: { error: 'Record not found' }, status: 404
+    end
+
+    rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do
+      render json: { error: 'Remote data could not be fetched' }, status: 503
+    end
+
+    rescue_from OpenSSL::SSL::SSLError do
+      render json: { error: 'Remote SSL certificate could not be verified' }, status: 503
+    end
+
+    rescue_from Mastodon::NotPermittedError do
+      render json: { error: 'This action is not allowed' }, status: 403
+    end
+
+    rescue_from Seahorse::Client::NetworkingError do |e|
+      Rails.logger.warn "Storage server error: #{e}"
+      render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
+    end
+
+    rescue_from Mastodon::RaceConditionError, Stoplight::Error::RedLight do
+      render json: { error: 'There was a temporary problem serving your request, please try again' }, status: 503
+    end
+
+    rescue_from Mastodon::RateLimitExceededError do
+      render json: { error: I18n.t('errors.429') }, status: 429
+    end
+
+    rescue_from ActionController::ParameterMissing, Mastodon::InvalidParameterError do |e|
+      render json: { error: e.to_s }, status: 400
+    end
+  end
+end
diff --git a/app/controllers/concerns/api/pagination.rb b/app/controllers/concerns/api/pagination.rb
new file mode 100644
index 0000000000..d84a1d99f7
--- /dev/null
+++ b/app/controllers/concerns/api/pagination.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Api::Pagination
+  extend ActiveSupport::Concern
+
+  protected
+
+  def pagination_max_id
+    pagination_collection.last.id
+  end
+
+  def pagination_since_id
+    pagination_collection.first.id
+  end
+
+  def set_pagination_headers(next_path = nil, prev_path = nil)
+    links = []
+    links << [next_path, [%w(rel next)]] if next_path
+    links << [prev_path, [%w(rel prev)]] if prev_path
+    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
+  end
+
+  def require_valid_pagination_options!
+    render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
+  end
+
+  private
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def pagination_options_invalid?
+    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
+  end
+end
diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
index effdb8d21c..404164751a 100644
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@@ -66,6 +66,11 @@ module Auth::TwoFactorAuthenticationConcern
   end
 
   def authenticate_with_two_factor_via_otp(user)
+    if check_second_factor_rate_limits(user)
+      flash.now[:alert] = I18n.t('users.rate_limited')
+      return prompt_for_two_factor(user)
+    end
+
     if valid_otp_attempt?(user)
       on_authentication_success(user, :otp)
     else
diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index 62f763fe2f..3dc0ea840a 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -28,6 +28,16 @@ module CacheConcern
   def render_with_cache(**options)
     raise ArgumentError, 'Only JSON render calls are supported' unless options.key?(:json) || block_given?
 
+    if options.delete(:cancel_cache)
+      if block_given?
+        options[:json] = yield
+      elsif options[:json].is_a?(Symbol)
+        options[:json] = send(options[:json])
+      end
+
+      return render(options)
+    end
+
     key        = options.delete(:key) || [[params[:controller], params[:action]].join('/'), options[:json].respond_to?(:cache_key) ? options[:json].cache_key : nil, options[:fields].nil? ? nil : options[:fields].join(',')].compact.join(':')
     expires_in = options.delete(:expires_in) || 3.minutes
     body       = Rails.cache.read(key, raw: true)
@@ -45,28 +55,4 @@ module CacheConcern
       Rails.cache.write(key, response.body, expires_in: expires_in, raw: true)
     end
   end
-
-  def cache_collection(raw, klass)
-    return raw unless klass.respond_to?(:with_includes)
-
-    raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
-    return [] if raw.empty?
-
-    cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
-
-    uncached_ids = raw.map(&:id) - cached_keys_with_value.keys
-
-    klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!)
-
-    unless uncached_ids.empty?
-      uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
-      Rails.cache.write_multi(uncached.values.to_h { |i| [i, i] })
-    end
-
-    raw.filter_map { |item| cached_keys_with_value[item.id] || uncached[item.id] }
-  end
-
-  def cache_collection_paginated_by_id(raw, klass, limit, options)
-    cache_collection raw.cache_ids.to_a_paginated_by_id(limit, options), klass
-  end
 end
diff --git a/app/controllers/concerns/preloading_concern.rb b/app/controllers/concerns/preloading_concern.rb
new file mode 100644
index 0000000000..61e2213649
--- /dev/null
+++ b/app/controllers/concerns/preloading_concern.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PreloadingConcern
+  extend ActiveSupport::Concern
+
+  def preload_collection(scope, klass)
+    return scope unless klass.respond_to?(:preload_cacheable_associations)
+
+    scope.to_a.tap do |records|
+      klass.preload_cacheable_associations(records)
+    end
+  end
+
+  def preload_collection_paginated_by_id(scope, klass, limit, options)
+    preload_collection scope.to_a_paginated_by_id(limit, options), klass
+  end
+end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 35391e64c4..68f09ee023 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -12,39 +12,6 @@ module SignatureVerification
 
   class SignatureVerificationError < StandardError; end
 
-  class SignatureParamsParser < Parslet::Parser
-    rule(:token)         { match("[0-9a-zA-Z!#$%&'*+.^_`|~-]").repeat(1).as(:token) }
-    rule(:quoted_string) { str('"') >> (qdtext | quoted_pair).repeat.as(:quoted_string) >> str('"') }
-    # qdtext and quoted_pair are not exactly according to spec but meh
-    rule(:qdtext)        { match('[^\\\\"]') }
-    rule(:quoted_pair)   { str('\\') >> any }
-    rule(:bws)           { match('\s').repeat }
-    rule(:param)         { (token.as(:key) >> bws >> str('=') >> bws >> (token | quoted_string).as(:value)).as(:param) }
-    rule(:comma)         { bws >> str(',') >> bws }
-    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
-    rule(:buggy_prefix)  { str('Signature ') }
-    rule(:params)        { buggy_prefix.maybe >> (param >> (comma >> param).repeat).as(:params) }
-    root(:params)
-  end
-
-  class SignatureParamsTransformer < Parslet::Transform
-    rule(params: subtree(:param)) do
-      (param.is_a?(Array) ? param : [param]).each_with_object({}) { |(key, value), hash| hash[key] = value }
-    end
-
-    rule(param: { key: simple(:key), value: simple(:val) }) do
-      [key, val]
-    end
-
-    rule(quoted_string: simple(:string)) do
-      string.to_s
-    end
-
-    rule(token: simple(:string)) do
-      string.to_s
-    end
-  end
-
   def require_account_signature!
     render json: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
   end
@@ -99,7 +66,7 @@ module SignatureVerification
     compare_signed_string = build_signed_string(include_query_string: false)
     return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
-    actor = stoplight_wrap_request { actor_refresh_key!(actor) }
+    actor = stoplight_wrapper.run { actor_refresh_key!(actor) }
 
     raise SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil?
 
@@ -135,12 +102,8 @@ module SignatureVerification
   end
 
   def signature_params
-    @signature_params ||= begin
-      raw_signature = request.headers['Signature']
-      tree          = SignatureParamsParser.new.parse(raw_signature)
-      SignatureParamsTransformer.new.apply(tree)
-    end
-  rescue Parslet::ParseFailed
+    @signature_params ||= SignatureParser.parse(request.headers['Signature'])
+  rescue SignatureParser::ParsingError
     raise SignatureVerificationError, 'Error parsing signature parameters'
   end
 
@@ -263,10 +226,10 @@ module SignatureVerification
     end
 
     if key_id.start_with?('acct:')
-      stoplight_wrap_request { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
+      stoplight_wrapper.run { ResolveAccountService.new.call(key_id.delete_prefix('acct:'), suppress_errors: false) }
     elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
       account   = ActivityPub::TagManager.instance.uri_to_actor(key_id)
-      account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false, suppress_errors: false) }
+      account ||= stoplight_wrapper.run { ActivityPub::FetchRemoteKeyService.new.call(key_id, suppress_errors: false) }
       account
     end
   rescue Mastodon::PrivateNetworkAddressError => e
@@ -275,12 +238,11 @@ module SignatureVerification
     raise SignatureVerificationError, e.message
   end
 
-  def stoplight_wrap_request(&block)
-    Stoplight("source:#{request.remote_ip}", &block)
+  def stoplight_wrapper
+    Stoplight("source:#{request.remote_ip}")
       .with_threshold(1)
       .with_cool_off_time(5.minutes.seconds)
       .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-      .run
   end
 
   def actor_refresh_key!(actor)
diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index 5687d6e5b6..b8c909877b 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -21,10 +21,19 @@ module WebAppControllerConcern
   def redirect_unauthenticated_to_permalinks!
     return if user_signed_in? && current_account.moved_to_account_id.nil?
 
-    redirect_path = PermalinkRedirector.new(request.path).redirect_path
-    return if redirect_path.blank?
+    permalink_redirector = PermalinkRedirector.new(request.path)
+    return if permalink_redirector.redirect_path.blank?
 
     expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in?
-    redirect_to(redirect_path)
+
+    respond_to do |format|
+      format.html do
+        redirect_to(permalink_redirector.redirect_confirmation_path, allow_other_host: false)
+      end
+
+      format.json do
+        redirect_to(permalink_redirector.redirect_uri, allow_other_host: true)
+      end
+    end
   end
 end
diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
index 62f8e0d772..eb6417698a 100644
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@@ -16,6 +16,6 @@ class CustomCssController < ActionController::Base # rubocop:disable Rails/Appli
   helper_method :custom_css_styles
 
   def set_user_roles
-    @user_roles = UserRole.where(highlighted: true).where.not(color: [nil, ''])
+    @user_roles = UserRole.providing_styles
   end
 end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index bd9964426b..0b7f9f9e68 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -49,7 +49,7 @@ class FiltersController < ApplicationController
   end
 
   def resource_params
-    params.require(:custom_filter).permit(:title, :expires_in, :filter_action, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
+    params.require(:custom_filter).permit(:title, :expires_in, :filter_action, :exclude_follows, :exclude_localusers, :exclude_quote, context: [], keywords_attributes: [:id, :keyword, :whole_word, :_destroy])
   end
 
   def set_body_classes
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 5effd9495e..44d90ec671 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -62,7 +62,7 @@ class FollowerAccountsController < ApplicationController
       ActivityPub::CollectionPresenter.new(
         id: account_followers_url(@account, page: params.fetch(:page, 1)),
         type: :ordered,
-        size: @account.followers_count,
+        size: @account.public_followers_count,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
         part_of: account_followers_url(@account),
         next: next_page_url,
@@ -72,7 +72,7 @@ class FollowerAccountsController < ApplicationController
       ActivityPub::CollectionPresenter.new(
         id: account_followers_url(@account),
         type: :ordered,
-        size: @account.followers_count,
+        size: @account.public_followers_count,
         first: page_url(1)
       )
     end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 268fad96d0..87a702f711 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -65,7 +65,7 @@ class FollowingAccountsController < ApplicationController
       ActivityPub::CollectionPresenter.new(
         id: account_following_index_url(@account, page: params.fetch(:page, 1)),
         type: :ordered,
-        size: @account.following_count,
+        size: @account.public_following_count,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
         part_of: account_following_index_url(@account),
         next: next_page_url,
@@ -75,7 +75,7 @@ class FollowingAccountsController < ApplicationController
       ActivityPub::CollectionPresenter.new(
         id: account_following_index_url(@account),
         type: :ordered,
-        size: @account.following_count,
+        size: @account.public_following_count,
         first: page_url(1)
       )
     end
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index 8422d74bc3..f2b1eaa3e7 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -6,6 +6,8 @@ class InstanceActorsController < ActivityPub::BaseController
   serialization_scope nil
 
   before_action :set_account
+
+  skip_before_action :authenticate_user! # From `AccountOwnedConcern`
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
@@ -16,6 +18,11 @@ class InstanceActorsController < ActivityPub::BaseController
 
   private
 
+  # Skips various `before_action` from `AccountOwnedConcern`
+  def account_required?
+    false
+  end
+
   def set_account
     @account = Account.representative
   end
diff --git a/app/controllers/intents_controller.rb b/app/controllers/intents_controller.rb
index ea024e30e6..65c315208d 100644
--- a/app/controllers/intents_controller.rb
+++ b/app/controllers/intents_controller.rb
@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
 class IntentsController < ApplicationController
-  before_action :check_uri
+  EXPECTED_SCHEME = 'web+mastodon'
 
+  before_action :handle_invalid_uri, unless: :valid_uri?
   rescue_from Addressable::URI::InvalidURIError, with: :handle_invalid_uri
 
   def show
-    if uri.scheme == 'web+mastodon'
-      case uri.host
-      when 'follow'
-        return redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:'))
-      when 'share'
-        return redirect_to share_path(text: uri.query_values['text'])
-      end
+    case uri.host
+    when 'follow'
+      redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:'))
+    when 'share'
+      redirect_to share_path(text: uri.query_values['text'])
+    else
+      handle_invalid_uri
     end
-
-    not_found
   end
 
   private
 
-  def check_uri
-    not_found if uri.blank?
+  def valid_uri?
+    uri.present? && uri.scheme == EXPECTED_SCHEME
   end
 
   def handle_invalid_uri
diff --git a/app/controllers/redirect/accounts_controller.rb b/app/controllers/redirect/accounts_controller.rb
new file mode 100644
index 0000000000..713ccf2ca1
--- /dev/null
+++ b/app/controllers/redirect/accounts_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Redirect::AccountsController < Redirect::BaseController
+  private
+
+  def set_resource
+    @resource = Account.find(params[:id])
+    not_found if @resource.local?
+  end
+end
diff --git a/app/controllers/redirect/base_controller.rb b/app/controllers/redirect/base_controller.rb
new file mode 100644
index 0000000000..90894ec1ed
--- /dev/null
+++ b/app/controllers/redirect/base_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Redirect::BaseController < ApplicationController
+  vary_by 'Accept-Language'
+
+  before_action :set_resource
+  before_action :set_app_body_class
+
+  def show
+    @redirect_path = ActivityPub::TagManager.instance.url_for(@resource)
+
+    render 'redirects/show', layout: 'application'
+  end
+
+  private
+
+  def set_app_body_class
+    @body_classes = 'app-body'
+  end
+
+  def set_resource
+    raise NotImplementedError
+  end
+end
diff --git a/app/controllers/redirect/statuses_controller.rb b/app/controllers/redirect/statuses_controller.rb
new file mode 100644
index 0000000000..37a938c651
--- /dev/null
+++ b/app/controllers/redirect/statuses_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Redirect::StatusesController < Redirect::BaseController
+  private
+
+  def set_resource
+    @resource = Status.find(params[:id])
+    not_found if @resource.local? || !@resource.distributable?
+  end
+end
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index d4b7205681..6849979b11 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -13,7 +13,7 @@ class Settings::ApplicationsController < Settings::BaseController
   def new
     @application = Doorkeeper::Application.new(
       redirect_uri: Doorkeeper.configuration.native_redirect_uri,
-      scopes: 'read write follow'
+      scopes: 'read:me'
     )
   end
 
diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index c384402650..90c112e219 100644
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def set_recently_used_tags
-    @recently_used_tags = Tag.recently_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
+    @recently_used_tags = Tag.suggestions_for_account(current_account).limit(10)
   end
 
   def featured_tag_params
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 983caf22fa..569aa07c53 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -31,7 +31,7 @@ class Settings::ImportsController < Settings::BaseController
   def show; end
 
   def failures
-    @bulk_import = current_account.bulk_imports.where(state: :finished).find(params[:id])
+    @bulk_import = current_account.bulk_imports.state_finished.find(params[:id])
 
     respond_to do |format|
       format.csv do
@@ -92,7 +92,7 @@ class Settings::ImportsController < Settings::BaseController
   end
 
   def set_bulk_import
-    @bulk_import = current_account.bulk_imports.where(state: :unconfirmed).find(params[:id])
+    @bulk_import = current_account.bulk_imports.state_unconfirmed.find(params[:id])
   end
 
   def set_recent_imports
diff --git a/app/controllers/settings/preferences/base_controller.rb b/app/controllers/settings/preferences/base_controller.rb
index c1f8b49898..ce6e2bba44 100644
--- a/app/controllers/settings/preferences/base_controller.rb
+++ b/app/controllers/settings/preferences/base_controller.rb
@@ -19,6 +19,16 @@ class Settings::Preferences::BaseController < Settings::BaseController
   end
 
   def user_params
+    original_user_params.tap do |params|
+      params[:settings_attributes]&.merge!(disabled_visibilities_params[:settings_attributes] || {})
+    end
+  end
+
+  def original_user_params
     params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
   end
+
+  def disabled_visibilities_params
+    params.require(:user).permit(settings_attributes: { enabled_visibilities: [] })
+  end
 end
diff --git a/app/controllers/settings/preferences/other_controller.rb b/app/controllers/settings/preferences/other_controller.rb
index a19fbf5c48..02925fa6e5 100644
--- a/app/controllers/settings/preferences/other_controller.rb
+++ b/app/controllers/settings/preferences/other_controller.rb
@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class Settings::Preferences::OtherController < Settings::Preferences::BaseController
+  include DtlHelper
+
+  def show
+    @dtl_enabled = dtl_enabled?
+    @dtl_tag = dtl_tag_name
+  end
+
   private
 
   def after_update_redirect_path
diff --git a/app/controllers/settings/preferences/reaching_controller.rb b/app/controllers/settings/preferences/reaching_controller.rb
new file mode 100644
index 0000000000..bd3e6ae9b2
--- /dev/null
+++ b/app/controllers/settings/preferences/reaching_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Settings::Preferences::ReachingController < Settings::Preferences::BaseController
+  private
+
+  def after_update_redirect_path
+    settings_preferences_reaching_path
+  end
+end
diff --git a/app/controllers/settings/privacy_extra_controller.rb b/app/controllers/settings/privacy_extra_controller.rb
new file mode 100644
index 0000000000..49c71d5071
--- /dev/null
+++ b/app/controllers/settings/privacy_extra_controller.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Settings::PrivacyExtraController < Settings::BaseController
+  before_action :set_account
+
+  def show; end
+
+  def update
+    if UpdateAccountService.new.call(@account, account_params.except(:settings))
+      current_user.update!(settings_attributes: account_params[:settings])
+      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      redirect_to settings_privacy_extra_path, notice: I18n.t('generic.changes_saved_msg')
+    else
+      render :show
+    end
+  end
+
+  private
+
+  def account_params
+    params.require(:account).permit(:subscription_policy, settings: UserSettings.keys)
+  end
+
+  def set_account
+    @account = current_account
+  end
+end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 8ae69b7fe0..a023b073b3 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -20,7 +20,8 @@ class Settings::ProfilesController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :bot, fields_attributes: [:name, :value])
+    # params.require(:account).permit(:display_name, :note, :bio_markdown, :avatar, :header, :locked, :my_actor_type, :searchability, :dissubscribable, :discoverable, :discoverable_local, :hide_collections, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :bio_markdown, :avatar, :header, :bot, :my_actor_type, :dissubscribable, fields_attributes: [:name, :value])
   end
 
   def set_account
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
index c86ede4f3a..9714d54f95 100644
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@@ -6,8 +6,8 @@ module Settings
       skip_before_action :check_self_destruct!
       skip_before_action :require_functional!
 
-      before_action :require_otp_enabled
-      before_action :require_webauthn_enabled, only: [:index, :destroy]
+      before_action :redirect_invalid_otp, unless: -> { current_user.otp_enabled? }
+      before_action :redirect_invalid_webauthn, only: [:index, :destroy], unless: -> { current_user.webauthn_enabled? }
 
       def index; end
       def new; end
@@ -85,18 +85,14 @@ module Settings
 
       private
 
-      def require_otp_enabled
-        unless current_user.otp_enabled?
-          flash[:error] = t('webauthn_credentials.otp_required')
-          redirect_to settings_two_factor_authentication_methods_path
-        end
+      def redirect_invalid_otp
+        flash[:error] = t('webauthn_credentials.otp_required')
+        redirect_to settings_two_factor_authentication_methods_path
       end
 
-      def require_webauthn_enabled
-        unless current_user.webauthn_enabled?
-          flash[:error] = t('webauthn_credentials.not_enabled')
-          redirect_to settings_two_factor_authentication_methods_path
-        end
+      def redirect_invalid_webauthn
+        flash[:error] = t('webauthn_credentials.not_enabled')
+        redirect_to settings_two_factor_authentication_methods_path
       end
     end
   end
diff --git a/app/controllers/severed_relationships_controller.rb b/app/controllers/severed_relationships_controller.rb
new file mode 100644
index 0000000000..168e85e3fe
--- /dev/null
+++ b/app/controllers/severed_relationships_controller.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class SeveredRelationshipsController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
+  before_action :set_body_classes
+  before_action :set_cache_headers
+
+  before_action :set_event, only: [:following, :followers]
+
+  def index
+    @events = AccountRelationshipSeveranceEvent.where(account: current_account)
+  end
+
+  def following
+    respond_to do |format|
+      format.csv { send_data following_data, filename: "following-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" }
+    end
+  end
+
+  def followers
+    respond_to do |format|
+      format.csv { send_data followers_data, filename: "followers-#{@event.target_name}-#{@event.created_at.to_date.iso8601}.csv" }
+    end
+  end
+
+  private
+
+  def set_event
+    @event = AccountRelationshipSeveranceEvent.find(params[:id])
+  end
+
+  def following_data
+    CSV.generate(headers: ['Account address', 'Show boosts', 'Notify on new posts', 'Languages'], write_headers: true) do |csv|
+      @event.severed_relationships.active.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+        csv << [acct(follow.target_account), follow.show_reblogs, follow.notify, follow.languages&.join(', ')]
+      end
+    end
+  end
+
+  def followers_data
+    CSV.generate(headers: ['Account address'], write_headers: true) do |csv|
+      @event.severed_relationships.passive.about_local_account(current_account).includes(:remote_account).reorder(id: :desc).each do |follow|
+        csv << [acct(follow.account)]
+      end
+    end
+  end
+
+  def acct(account)
+    account.local? ? account.local_username_and_domain : account.acct
+  end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+
+  def set_cache_headers
+    response.cache_control.replace(private: true, no_store: true)
+  end
+end
diff --git a/app/controllers/statuses_cleanup_controller.rb b/app/controllers/statuses_cleanup_controller.rb
index 4a3fc10ca4..04c3c0e05c 100644
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@@ -31,7 +31,7 @@ class StatusesCleanupController < ApplicationController
   end
 
   def resource_params
-    params.require(:account_statuses_cleanup_policy).permit(:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :min_favs, :min_reblogs)
+    params.require(:account_statuses_cleanup_policy).permit(:enabled, :min_status_age, :keep_direct, :keep_pinned, :keep_polls, :keep_media, :keep_self_fav, :keep_self_bookmark, :keep_self_emoji, :min_favs, :min_reblogs, :min_emojis)
   end
 
   def set_body_classes
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index db7eddd78b..be87161cc8 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -29,15 +29,15 @@ class StatusesController < ApplicationController
       end
 
       format.json do
-        expires_in 3.minutes, public: true if @status.distributable? && public_fetch_mode?
-        render_with_cache json: @status, content_type: 'application/activity+json', serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter
+        expires_in 3.minutes, public: true if @status.distributable? && public_fetch_mode? && !misskey_software? && !@status.expires?
+        render_with_cache json: @status, content_type: 'application/activity+json', serializer: status_activity_serializer, adapter: ActivityPub::Adapter, cancel_cache: misskey_software?
       end
     end
   end
 
   def activity
-    expires_in 3.minutes, public: @status.distributable? && public_fetch_mode?
-    render_with_cache json: ActivityPub::ActivityPresenter.from_status(@status), content_type: 'application/activity+json', serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter
+    expires_in 3.minutes, public: @status.distributable? && public_fetch_mode? && !misskey_software?
+    render_with_cache json: ActivityPub::ActivityPresenter.from_status(@status, for_misskey: misskey_software?), content_type: 'application/activity+json', serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter, cancel_cache: misskey_software?
   end
 
   def embed
@@ -61,11 +61,41 @@ class StatusesController < ApplicationController
 
   def set_status
     @status = @account.statuses.find(params[:id])
-    authorize @status, :show?
+
+    if request.authorization.present? && request.authorization.match(/^Bearer /i)
+      raise Mastodon::NotPermittedError unless @status.capability_tokens.find_by(token: request.authorization.gsub(/^Bearer /i, ''))
+    elsif request.format == :json && @status.expires?
+      raise Mastodon::NotPermittedError unless StatusPolicy.new(signed_request_account, @status).show_activity?
+    else
+      authorize @status, :show?
+    end
   rescue Mastodon::NotPermittedError
     not_found
   end
 
+  def misskey_software?
+    return @misskey_software if defined?(@misskey_software)
+
+    @misskey_software = false
+
+    return false if !@status.local? || signed_request_account&.domain.blank? || !@status.sending_maybe_compromised_privacy?
+
+    return @misskey_software = true if DomainBlock.detect_invalid_subscription?(signed_request_account.domain)
+
+    info = InstanceInfo.find_by(domain: signed_request_account.domain)
+    return false if info.nil?
+
+    @misskey_software = %w(misskey calckey cherrypick sharkey).include?(info.software)
+  end
+
+  def status_activity_serializer
+    if misskey_software?
+      ActivityPub::NoteForMisskeySerializer
+    else
+      ActivityPub::NoteSerializer
+    end
+  end
+
   def redirect_to_original
     redirect_to(ActivityPub::TagManager.instance.url_for(@status.reblog), allow_other_host: true) if @status.reblog?
   end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index b0bdbde956..d6c0d872c8 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -45,7 +45,7 @@ class TagsController < ApplicationController
   end
 
   def set_statuses
-    @statuses = cache_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
+    @statuses = preload_collection(TagFeed.new(@tag, nil, local: @local).get(limit_param), Status)
   end
 
   def limit_param
diff --git a/app/controllers/well_known/oauth_metadata_controller.rb b/app/controllers/well_known/oauth_metadata_controller.rb
new file mode 100644
index 0000000000..c80be2d652
--- /dev/null
+++ b/app/controllers/well_known/oauth_metadata_controller.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module WellKnown
+  class OauthMetadataController < ActionController::Base # rubocop:disable Rails/ApplicationController
+    include CacheConcern
+
+    # Prevent `active_model_serializer`'s `ActionController::Serialization` from calling `current_user`
+    # and thus re-issuing session cookies
+    serialization_scope nil
+
+    def show
+      # Due to this document potentially changing between Mastodon versions (as
+      # new OAuth scopes are added), we don't use expires_in to cache upstream,
+      # instead just caching in the rails cache:
+      render_with_cache(
+        json: ::OauthMetadataPresenter.new,
+        serializer: ::OauthMetadataSerializer,
+        content_type: 'application/json',
+        expires_in: 15.minutes
+      )
+    end
+  end
+end
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 6301919a9e..6136c82ce7 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -27,21 +27,25 @@ module AccountsHelper
     end
   end
 
+  def account_formatted_stat(value)
+    number_to_human(value, precision: 3, strip_insignificant_zeros: true)
+  end
+
   def account_description(account)
     prepend_str = [
       [
-        number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
-        I18n.t('accounts.posts', count: account.statuses_count),
+        account_formatted_stat(account.public_statuses_count),
+        I18n.t('accounts.posts', count: account.public_statuses_count),
       ].join(' '),
 
       [
-        number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
-        I18n.t('accounts.following', count: account.following_count),
+        account_formatted_stat(account.public_following_count),
+        I18n.t('accounts.following', count: account.public_following_count),
       ].join(' '),
 
       [
-        number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
-        I18n.t('accounts.followers', count: account.followers_count),
+        account_formatted_stat(account.public_followers_count),
+        I18n.t('accounts.followers', count: account.public_followers_count),
       ].join(' '),
     ].join(', ')
 
diff --git a/app/helpers/admin/accounts_helper.rb b/app/helpers/admin/accounts_helper.rb
index a936797e88..a2d2f75308 100644
--- a/app/helpers/admin/accounts_helper.rb
+++ b/app/helpers/admin/accounts_helper.rb
@@ -7,6 +7,7 @@ module Admin::AccountsHelper
       [t('admin.accounts.moderation.silenced'), 'silenced'],
       [t('admin.accounts.moderation.disabled'), 'disabled'],
       [t('admin.accounts.moderation.suspended'), 'suspended'],
+      [t('admin.accounts.moderation.remote_pending'), 'remote_pending'],
       [safe_join([t('admin.accounts.moderation.pending'), "(#{pending_user_count_label})"], ' '), 'pending'],
     ]
   end
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 4018ef6b1c..4355b5f787 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -23,7 +23,9 @@ module Admin::ActionLogsHelper
       link_to log.human_identifier, disputes_strike_path(log.target_id)
     when 'Announcement'
       link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id)
-    when 'IpBlock', 'Instance', 'CustomEmoji'
+    when 'CustomEmoji'
+      link_to log.human_identifier, edit_admin_custom_emoji_path(log.target_id)
+    when 'IpBlock', 'Instance'
       log.human_identifier
     when 'CanonicalEmailBlock'
       content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4f7f66985d..8dee31e18d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module ApplicationHelper
+  include RegistrationLimitationHelper
+
   DANGEROUS_SCOPES = %w(
     read
     write
@@ -28,20 +30,12 @@ module ApplicationHelper
     number_to_human(number, **options)
   end
 
-  def active_nav_class(*paths)
-    paths.any? { |path| current_page?(path) } ? 'active' : ''
-  end
-
-  def show_landing_strip?
-    !user_signed_in? && !single_user_mode?
-  end
-
   def open_registrations?
-    Setting.registrations_mode == 'open'
+    Setting.registrations_mode == 'open' && registrations_in_time?
   end
 
   def approved_registrations?
-    Setting.registrations_mode == 'approved'
+    Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?)
   end
 
   def closed_registrations?
@@ -121,8 +115,16 @@ module ApplicationHelper
     content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
   end
 
+  def material_symbol(icon, attributes = {})
+    inline_svg_tag(
+      "400-24px/#{icon}.svg",
+      class: %w(icon).concat(attributes[:class].to_s.split),
+      role: :img
+    )
+  end
+
   def check_icon
-    content_tag(:svg, tag.path('fill-rule': 'evenodd', 'clip-rule': 'evenodd', d: 'M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z'), xmlns: 'http://www.w3.org/2000/svg', viewBox: '0 0 20 20', fill: 'currentColor')
+    inline_svg_tag 'check.svg'
   end
 
   def visibility_icon(status)
@@ -130,6 +132,10 @@ module ApplicationHelper
       fa_icon('globe', title: I18n.t('statuses.visibilities.public'))
     elsif status.unlisted_visibility?
       fa_icon('unlock', title: I18n.t('statuses.visibilities.unlisted'))
+    elsif status.public_unlisted_visibility?
+      fa_icon('cloud', title: I18n.t('statuses.visibilities.public_unlisted'))
+    elsif status.login_visibility?
+      fa_icon('key', title: I18n.t('statuses.visibilities.login'))
     elsif status.private_visibility? || status.limited_visibility?
       fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
     elsif status.direct_visibility?
@@ -195,10 +201,14 @@ module ApplicationHelper
       text: [params[:title], params[:text], params[:url]].compact.join(' '),
     }
 
-    permit_visibilities = %w(public unlisted private direct)
-    default_privacy     = current_account&.user&.setting_default_privacy
+    permit_visibilities = %w(public unlisted public_unlisted login private direct)
+    permit_searchabilities = %w(public unlisted public_unlisted login private direct)
+    default_privacy = current_account&.user&.setting_default_privacy
     permit_visibilities.shift(permit_visibilities.index(default_privacy) + 1) if default_privacy.present?
     state_params[:visibility] = params[:visibility] if permit_visibilities.include? params[:visibility]
+    default_searchability = current_account&.user&.setting_default_searchability
+    permit_searchabilities.shift(permit_searchabilities.index(default_privacy) + 1) if default_searchability.present?
+    state_params[:searchability] = params[:searchability] if permit_searchabilities.include? params[:searchability]
 
     if user_signed_in? && current_user.functional?
       state_params[:settings]          = state_params[:settings].merge(Web::Setting.find_by(user: current_user)&.data || {})
@@ -213,7 +223,7 @@ module ApplicationHelper
       state_params[:moved_to_account] = current_account.moved_to_account
     end
 
-    state_params[:owner] = Account.local.without_suspended.where('id > 0').first if single_user_mode?
+    state_params[:owner] = Account.local.without_suspended.without_internal.first if single_user_mode?
 
     json = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(state_params), serializer: InitialStateSerializer).to_json
     # rubocop:disable Rails/OutputSafety
@@ -240,6 +250,22 @@ module ApplicationHelper
     EmojiFormatter.new(html, custom_emojis, other_options.merge(animate: prefers_autoplay?)).to_s
   end
 
+  def prerender_custom_emojis_from_hash(html, custom_emojis_hash)
+    prerender_custom_emojis(html, JSON.parse([custom_emojis_hash].to_json, object_class: OpenStruct)) # rubocop:disable Style/OpenStructUse
+  end
+
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+
+  def favicon_path(size = '48')
+    instance_presenter.favicon&.file&.url(size)
+  end
+
+  def app_icon_path(size = '48')
+    instance_presenter.app_icon&.file&.url(size)
+  end
+
   private
 
   def storage_host_var
diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb
index 2b9c233c23..8201f36e3c 100644
--- a/app/helpers/branding_helper.rb
+++ b/app/helpers/branding_helper.rb
@@ -19,17 +19,6 @@ module BrandingHelper
   end
 
   def render_logo
-    image_pack_tag('logo.svg', alt: 'Mastodon', class: 'logo logo--icon')
-  end
-
-  def render_symbol(version = :icon)
-    path = case version
-           when :icon
-             'logo-symbol-icon.svg'
-           when :wordmark
-             'logo-symbol-wordmark.svg'
-           end
-
-    render(file: Rails.root.join('app', 'javascript', 'images', path)).html_safe # rubocop:disable Rails/OutputSafety
+    image_tag(frontend_asset_path('images/logo.svg'), alt: 'Mastodon', class: 'logo logo--icon')
   end
 end
diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index 945ef9b91a..804c48c7b0 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -23,13 +23,31 @@ module ContextHelper
     indexable: { 'toot' => 'http://joinmastodon.org/ns#', 'indexable' => 'toot:indexable' },
     memorial: { 'toot' => 'http://joinmastodon.org/ns#', 'memorial' => 'toot:memorial' },
     voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
+    emoji_reactions: { 'fedibird' => 'http://fedibird.com/ns#', 'emojiReactions' => { '@id' => 'fedibird:emojiReactions', '@type' => '@id' } },
+    searchable_by: { 'fedibird' => 'http://fedibird.com/ns#', 'searchableBy' => { '@id' => 'fedibird:searchableBy', '@type' => '@id' } },
+    subscribable_by: { 'kmyblue' => 'http://kmy.blue/ns#', 'subscribableBy' => { '@id' => 'kmyblue:subscribableBy', '@type' => '@id' } },
+    limited_scope: { 'kmyblue' => 'http://kmy.blue/ns#', 'limitedScope' => 'kmyblue:limitedScope' },
+    other_setting: { 'fedibird' => 'http://fedibird.com/ns#', 'otherSetting' => 'fedibird:otherSetting' },
+    references: { 'fedibird' => 'http://fedibird.com/ns#', 'references' => { '@id' => 'fedibird:references', '@type' => '@id' } },
+    quote_uri: { 'fedibird' => 'http://fedibird.com/ns#', 'quoteUri' => 'fedibird:quoteUri' },
+    keywords: { 'schema' => 'http://schema.org#', 'keywords' => 'schema:keywords' },
+    license: { 'schema' => 'http://schema.org#', 'license' => 'schema:license' },
     olm: {
-      'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId',
+      'toot' => 'http://joinmastodon.org/ns#',
+      'Device' => 'toot:Device',
+      'Ed25519Signature' => 'toot:Ed25519Signature',
+      'Ed25519Key' => 'toot:Ed25519Key',
+      'Curve25519Key' => 'toot:Curve25519Key',
+      'EncryptedMessage' => 'toot:EncryptedMessage',
+      'publicKeyBase64' => 'toot:publicKeyBase64',
+      'deviceId' => 'toot:deviceId',
       'claim' => { '@type' => '@id', '@id' => 'toot:claim' },
       'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' },
       'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' },
       'devices' => { '@type' => '@id', '@id' => 'toot:devices' },
-      'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText'
+      'messageFranking' => 'toot:messageFranking',
+      'messageType' => 'toot:messageType',
+      'cipherText' => 'toot:cipherText',
     },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
   }.freeze
@@ -39,13 +57,11 @@ module ContextHelper
   end
 
   def serialized_context(named_contexts_map, context_extensions_map)
-    context_array = []
-
     named_contexts     = named_contexts_map.keys
     context_extensions = context_extensions_map.keys
 
-    named_contexts.each do |key|
-      context_array << NAMED_CONTEXT_MAP[key]
+    context_array = named_contexts.map do |key|
+      NAMED_CONTEXT_MAP[key]
     end
 
     extensions = context_extensions.each_with_object({}) do |key, h|
diff --git a/app/helpers/dtl_helper.rb b/app/helpers/dtl_helper.rb
new file mode 100644
index 0000000000..aa2c414c5f
--- /dev/null
+++ b/app/helpers/dtl_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DtlHelper
+  def dtl_enabled?
+    ENV.fetch('DTL_ENABLED', 'false') == 'true'
+  end
+
+  def dtl_tag_name
+    ENV.fetch('DTL_TAG', 'kmyblue')
+  end
+end
diff --git a/app/helpers/follow_helper.rb b/app/helpers/follow_helper.rb
new file mode 100644
index 0000000000..d7d7ff35e9
--- /dev/null
+++ b/app/helpers/follow_helper.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module FollowHelper
+  def request_pending_follow?(source_account, target_account)
+    target_account.locked? || source_account.silenced? || block_straight_follow?(source_account) ||
+      ((source_account.bot? || proxy_account?(source_account)) && target_account.user&.setting_lock_follow_from_bot)
+  end
+
+  def block_straight_follow?(account)
+    return false if account.local?
+
+    DomainBlock.reject_straight_follow?(account.domain)
+  end
+
+  def proxy_account?(account)
+    (account.username.downcase.include?('_proxy') ||
+     account.username.downcase.end_with?('proxy') ||
+     account.username.downcase.include?('_bot_') ||
+     account.username.downcase.end_with?('bot') ||
+     account.display_name&.downcase&.include?('proxy') ||
+     account.display_name&.include?('プロキシ') ||
+     account.note&.include?('プロキシ')) &&
+      (account.following_count.zero? || account.following_count > account.followers_count) &&
+      proxyable_software?(account)
+  end
+
+  def proxyable_software?(account)
+    return false if account.local?
+
+    info = InstanceInfo.find_by(domain: account.domain)
+    return false if info.nil?
+
+    %w(misskey calckey firefish meisskey cherrypick sharkey).include?(info.software)
+  end
+end
diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb
index 7d1423e52d..f0faf69b43 100644
--- a/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@@ -18,8 +18,16 @@ module FormattingHelper
   end
   module_function :extract_status_plain_text
 
+  def extract_status_plain_text_with_spoiler_text(status)
+    PlainTextFormatter.new("#{status.spoiler_text}\n#{status.text}", status.local?).to_s
+  end
+
   def status_content_format(status)
-    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+    html_aware_format(status.text, status.local?, markdown: status.markdown, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+  end
+
+  def emoji_name_format(emoji_reaction, status)
+    html_aware_format(emoji_reaction['url'].present? ? ":#{emoji_reaction['name']}:" : emoji_reaction['name'], status.local?, markdown: status.markdown)
   end
 
   def rss_status_content_format(status)
@@ -49,19 +57,19 @@ module FormattingHelper
     prerender_custom_emojis(
       safe_join([before_html, html, after_html]),
       status.emojis,
-      style: 'width: 1.1em; height: 1.1em; object-fit: contain; vertical-align: middle; margin: -.2ex .15em .2ex'
+      style: 'min-width: 1.1em; height: 1.1em; object-fit: contain; vertical-align: middle; margin: -.2ex .15em .2ex'
     ).to_str
   end
 
   def account_bio_format(account)
-    html_aware_format(account.note, account.local?)
+    html_aware_format(account.note, account.local?, markdown: account.user&.setting_bio_markdown)
   end
 
   def account_field_value_format(field, with_rel_me: true)
     if field.verified? && !field.account.local?
       TextFormatter.shortened_link(field.value_for_verification)
     else
-      html_aware_format(field.value, field.account.local?, with_rel_me: with_rel_me, with_domains: true, multiline: false)
+      html_aware_format(field.value, field.account.local?, markdown: false, with_rel_me: with_rel_me, with_domains: true, multiline: false)
     end
   end
 end
diff --git a/app/helpers/high_load_helper.rb b/app/helpers/high_load_helper.rb
new file mode 100644
index 0000000000..b4606c039f
--- /dev/null
+++ b/app/helpers/high_load_helper.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module HighLoadHelper
+  def allow_high_load?
+    ENV.fetch('ALLOW_HIGH_LOAD', 'true') == 'true'
+  end
+  module_function :allow_high_load?
+end
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index ce3ff094f6..75901e3ff1 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -51,6 +51,14 @@ module JsonLdHelper
     end
   end
 
+  def as_array_ex(value)
+    if value.is_a?(Hash)
+      []
+    else
+      as_array(value)
+    end
+  end
+
   def value_or_id(value)
     value.is_a?(String) || value.nil? ? value : value['id']
   end
@@ -111,7 +119,7 @@ module JsonLdHelper
         patch_for_forwarding!(value, compacted_value)
       elsif value.is_a?(Array)
         compacted_value = [compacted_value] unless compacted_value.is_a?(Array)
-        return if value.size != compacted_value.size
+        next if value.size != compacted_value.size
 
         compacted[key] = value.zip(compacted_value).map do |v, vc|
           if v.is_a?(Hash) && vc.is_a?(Hash)
@@ -155,8 +163,8 @@ module JsonLdHelper
     end
   end
 
-  def fetch_resource(uri, id, on_behalf_of = nil)
-    unless id
+  def fetch_resource(uri, id_is_known, on_behalf_of = nil, request_options: {})
+    unless id_is_known
       json = fetch_resource_without_id_validation(uri, on_behalf_of)
 
       return if !json.is_a?(Hash) || unsupported_uri_scheme?(json['id'])
@@ -164,17 +172,29 @@ module JsonLdHelper
       uri = json['id']
     end
 
-    json = fetch_resource_without_id_validation(uri, on_behalf_of)
+    json = fetch_resource_without_id_validation(uri, on_behalf_of, request_options: request_options)
     json.present? && json['id'] == uri ? json : nil
   end
 
-  def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false)
+  def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false, request_options: {})
     on_behalf_of ||= Account.representative
 
-    build_request(uri, on_behalf_of).perform do |response|
+    build_request(uri, on_behalf_of, options: request_options).perform do |response|
       raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
 
-      body_to_json(response.body_with_limit) if response.code == 200
+      body_to_json(response.body_with_limit) if response.code == 200 && valid_activitypub_content_type?(response)
+    end
+  end
+
+  def valid_activitypub_content_type?(response)
+    return true if response.mime_type == 'application/activity+json'
+
+    # When the mime type is `application/ld+json`, we need to check the profile,
+    # but `http.rb` does not parse it for us.
+    return false unless response.mime_type == 'application/ld+json'
+
+    response.headers[HTTP::Headers::CONTENT_TYPE]&.split(';')&.map(&:strip)&.any? do |str|
+      str.start_with?('profile="') && str[9...-1].split.include?('https://www.w3.org/ns/activitystreams')
     end
   end
 
@@ -204,8 +224,8 @@ module JsonLdHelper
     response.code == 501 || ((400...500).cover?(response.code) && ![401, 408, 429].include?(response.code))
   end
 
-  def build_request(uri, on_behalf_of = nil)
-    Request.new(:get, uri).tap do |request|
+  def build_request(uri, on_behalf_of = nil, options: {})
+    Request.new(:get, uri, **options).tap do |request|
       request.on_behalf_of(on_behalf_of) if on_behalf_of
       request.add_headers('Accept' => 'application/activity+json, application/ld+json')
     end
diff --git a/app/helpers/kmyblue_capabilities_helper.rb b/app/helpers/kmyblue_capabilities_helper.rb
new file mode 100644
index 0000000000..075869ee60
--- /dev/null
+++ b/app/helpers/kmyblue_capabilities_helper.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module KmyblueCapabilitiesHelper
+  def fedibird_capabilities
+    capabilities = %i(
+      enable_wide_emoji
+      kmyblue_searchability
+      searchability
+      kmyblue_markdown
+      kmyblue_reaction_deck
+      kmyblue_visibility_login
+      status_reference
+      visibility_mutual
+      visibility_limited
+      kmyblue_limited_scope
+      kmyblue_antenna
+      kmyblue_bookmark_category
+      kmyblue_quote
+      kmyblue_searchability_limited
+      kmyblue_circle_history
+      kmyblue_list_notification
+      kmyblue_server_features
+    )
+
+    capabilities << :full_text_search if Chewy.enabled?
+    if Setting.enable_emoji_reaction
+      capabilities << :emoji_reaction
+      capabilities << :enable_wide_emoji_reaction
+    end
+    capabilities << :kmyblue_visibility_public_unlisted if Setting.enable_public_unlisted_visibility
+    capabilities << :kmyblue_searchability_public_unlisted if Setting.enable_public_unlisted_visibility
+    capabilities << :kmyblue_no_public_visibility unless Setting.enable_public_visibility
+    capabilities << :timeline_no_local unless Setting.enable_local_timeline
+
+    capabilities
+  end
+
+  def capabilities_for_nodeinfo
+    capabilities = %i(
+      enable_wide_emoji
+      status_reference
+      quote
+      emoji_keywords
+      circle
+    )
+
+    if Setting.enable_emoji_reaction
+      capabilities << :emoji_reaction
+      capabilities << :enable_wide_emoji_reaction
+    end
+
+    capabilities
+  end
+end
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 87f0f288d3..9e1c0a7db1 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -109,6 +109,7 @@ module LanguagesHelper
     mn: ['Mongolian', 'Монгол хэл'].freeze,
     mr: ['Marathi', 'मराठी'].freeze,
     ms: ['Malay', 'Bahasa Melayu'].freeze,
+    'ms-Arab': ['Jawi Malay', 'بهاس ملايو'].freeze,
     mt: ['Maltese', 'Malti'].freeze,
     my: ['Burmese', 'ဗမာစာ'].freeze,
     na: ['Nauru', 'Ekakairũ Naoero'].freeze,
@@ -127,7 +128,7 @@ module LanguagesHelper
     om: ['Oromo', 'Afaan Oromoo'].freeze,
     or: ['Oriya', 'ଓଡ଼ିଆ'].freeze,
     os: ['Ossetian', 'ирон æвзаг'].freeze,
-    pa: ['Panjabi', 'ਪੰਜਾਬੀ'].freeze,
+    pa: ['Punjabi', 'ਪੰਜਾਬੀ'].freeze,
     pi: ['Pāli', 'पाऴि'].freeze,
     pl: ['Polish', 'Polski'].freeze,
     ps: ['Pashto', 'پښتو'].freeze,
@@ -191,15 +192,20 @@ module LanguagesHelper
     chr: ['Cherokee', 'ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ'].freeze,
     ckb: ['Sorani (Kurdish)', 'سۆرانی'].freeze,
     cnr: ['Montenegrin', 'crnogorski'].freeze,
+    csb: ['Kashubian', 'Kaszëbsczi'].freeze,
     jbo: ['Lojban', 'la .lojban.'].freeze,
     kab: ['Kabyle', 'Taqbaylit'].freeze,
     ldn: ['Láadan', 'Láadan'].freeze,
     lfn: ['Lingua Franca Nova', 'lingua franca nova'].freeze,
+    moh: ['Mohawk', 'Kanienʼkéha'].freeze,
+    nds: ['Low German', 'Plattdüütsch'].freeze,
+    pdc: ['Pennsylvania Dutch', 'Pennsilfaani-Deitsch'].freeze,
     sco: ['Scots', 'Scots'].freeze,
     sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,
     smj: ['Lule Sami', 'Julevsámegiella'].freeze,
     szl: ['Silesian', 'ślůnsko godka'].freeze,
     tok: ['Toki Pona', 'toki pona'].freeze,
+    vai: ['Vai', 'ꕙꔤ'].freeze,
     xal: ['Kalmyk', 'Хальмг келн'].freeze,
     zba: ['Balaibalan', 'باليبلن'].freeze,
     zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze,
diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb
index 8ee04383ec..34b656411e 100644
--- a/app/helpers/mascot_helper.rb
+++ b/app/helpers/mascot_helper.rb
@@ -2,7 +2,7 @@
 
 module MascotHelper
   def mascot_url
-    full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
+    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
   def instance_presenter
diff --git a/app/helpers/ng_rule_helper.rb b/app/helpers/ng_rule_helper.rb
new file mode 100644
index 0000000000..104442b117
--- /dev/null
+++ b/app/helpers/ng_rule_helper.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module NgRuleHelper
+  def check_invalid_status_for_ng_rule!(account, **options)
+    (check_for_ng_rule!(account, **options) { |rule| !rule.check_status_or_record! }).none?
+  end
+
+  def check_invalid_reaction_for_ng_rule!(account, **options)
+    (check_for_ng_rule!(account, **options) { |rule| !rule.check_reaction_or_record! }).none?
+  end
+
+  private
+
+  def check_for_ng_rule!(account, **options, &block)
+    NgRule.cached_rules
+          .map { |raw_rule| Admin::NgRule.new(raw_rule, account, **options) }
+          .filter(&block)
+  end
+
+  def do_account_action_for_rule!(account, action)
+    case action
+    when :silence
+      account.silence!
+    when :suspend
+      account.suspend!
+    end
+  end
+end
diff --git a/app/helpers/react_component_helper.rb b/app/helpers/react_component_helper.rb
index ce616e8306..821a6f1e2d 100644
--- a/app/helpers/react_component_helper.rb
+++ b/app/helpers/react_component_helper.rb
@@ -15,9 +15,20 @@ module ReactComponentHelper
     div_tag_with_data(data)
   end
 
+  def serialized_media_attachments(media_attachments)
+    media_attachments.map { |attachment| serialized_attachment(attachment) }
+  end
+
   private
 
   def div_tag_with_data(data)
     content_tag(:div, nil, data: data)
   end
+
+  def serialized_attachment(attachment)
+    ActiveModelSerializers::SerializableResource.new(
+      attachment,
+      serializer: REST::MediaAttachmentSerializer
+    ).as_json
+  end
 end
diff --git a/app/helpers/registration_helper.rb b/app/helpers/registration_helper.rb
index ef5462ac88..c3db46c027 100644
--- a/app/helpers/registration_helper.rb
+++ b/app/helpers/registration_helper.rb
@@ -3,8 +3,10 @@
 module RegistrationHelper
   extend ActiveSupport::Concern
 
+  include RegistrationLimitationHelper
+
   def allowed_registration?(remote_ip, invite)
-    !Rails.configuration.x.single_user_mode && !omniauth_only? && (registrations_open? || invite&.valid_for_use?) && !ip_blocked?(remote_ip)
+    !Rails.configuration.x.single_user_mode && !omniauth_only? && ((registrations_open? && !reach_registrations_limit?) || invite&.valid_for_use?) && !ip_blocked?(remote_ip)
   end
 
   def registrations_open?
diff --git a/app/helpers/registration_limitation_helper.rb b/app/helpers/registration_limitation_helper.rb
new file mode 100644
index 0000000000..56523b816c
--- /dev/null
+++ b/app/helpers/registration_limitation_helper.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module RegistrationLimitationHelper
+  def reach_registrations_limit?
+    ((Setting.registrations_limit.presence || 0).positive? && Setting.registrations_limit <= user_count_for_registration) ||
+      ((Setting.registrations_limit_per_day.presence || 0).positive? && Setting.registrations_limit_per_day <= today_increase_user_count)
+  end
+
+  def user_count_for_registration
+    Rails.cache.fetch('registrations:user_count') { User.confirmed.enabled.joins(:account).merge(Account.without_suspended).count }
+  end
+
+  def today_increase_user_count
+    today_date = Time.now.utc.beginning_of_day.to_i
+    count = 0
+
+    if Rails.cache.fetch('registrations:today_date') { today_date } == today_date
+      count = Rails.cache.fetch('registrations:today_increase_user_count') { today_increase_user_count_value }
+    else
+      count = today_increase_user_count_value
+      Rails.cache.write('registrations:today_date', today_date)
+      Rails.cache.write('registrations:today_increase_user_count', count)
+    end
+
+    count
+  end
+
+  def today_increase_user_count_value
+    User.confirmed.enabled.where('users.created_at >= ?', Time.now.utc.beginning_of_day).joins(:account).merge(Account.without_suspended).count
+  end
+
+  def registrations_in_time?
+    start_hour = Setting.registrations_start_hour
+    end_hour = Setting.registrations_end_hour
+    secondary_start_hour = Setting.registrations_secondary_start_hour
+    secondary_end_hour = Setting.registrations_secondary_end_hour
+
+    start_hour = 0           unless start_hour.is_a?(Integer)
+    end_hour = 0             unless end_hour.is_a?(Integer)
+    secondary_start_hour = 0 unless secondary_start_hour.is_a?(Integer)
+    secondary_end_hour = 0   unless secondary_end_hour.is_a?(Integer)
+
+    return true if start_hour >= end_hour && secondary_start_hour >= secondary_end_hour
+
+    current_hour = Time.now.utc.hour
+
+    (start_hour < end_hour && end_hour.positive? && current_hour.between?(start_hour, end_hour - 1)) ||
+      (secondary_start_hour < secondary_end_hour && secondary_end_hour.positive? && current_hour.between?(secondary_start_hour, secondary_end_hour - 1))
+  end
+
+  def reset_registration_limit_caches!
+    Rails.cache.delete('registrations:user_count')
+    Rails.cache.delete('registrations:today_increase_user_count')
+  end
+end
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 2fb9ce72cb..15d988f64d 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -24,8 +24,12 @@ module RoutingHelper
     Rails.configuration.action_controller.asset_host || root_url
   end
 
-  def full_pack_url(source, **options)
-    full_asset_url(asset_pack_path(source, **options))
+  def frontend_asset_path(source, **options)
+    asset_pack_path("media/#{source}", **options)
+  end
+
+  def frontend_asset_url(source, **options)
+    full_asset_url(frontend_asset_path(source, **options))
   end
 
   def use_storage?
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index 286c53d834..8ded11e03d 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -4,14 +4,6 @@ module StatusesHelper
   EMBEDDED_CONTROLLER = 'statuses'
   EMBEDDED_ACTION = 'embed'
 
-  def link_to_newer(url)
-    link_to t('statuses.show_newer'), url, class: 'load-more load-gap'
-  end
-
-  def link_to_older(url)
-    link_to t('statuses.show_older'), url, class: 'load-more load-gap'
-  end
-
   def nothing_here(extra_classes = '')
     content_tag(:div, class: "nothing-here #{extra_classes}") do
       t('accounts.nothing_here')
@@ -71,8 +63,14 @@ module StatusesHelper
       fa_icon 'globe fw'
     when 'unlisted'
       fa_icon 'unlock fw'
+    when 'public_unlisted'
+      fa_icon 'cloud fw'
+    when 'login'
+      fa_icon 'key fw'
     when 'private'
       fa_icon 'lock fw'
+    when 'limited'
+      fa_icon 'get-pocket fw'
     when 'direct'
       fa_icon 'at fw'
     end
diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
new file mode 100644
index 0000000000..d15259851c
--- /dev/null
+++ b/app/helpers/theme_helper.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ThemeHelper
+  def theme_style_tags(theme)
+    if theme == 'system'
+      stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') +
+        stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
+    else
+      stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
+    end
+  end
+
+  def theme_color_tags(theme)
+    if theme == 'system'
+      tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') +
+        tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)')
+    else
+      tag.meta name: 'theme-color', content: theme_color_for(theme)
+    end
+  end
+
+  private
+
+  def theme_color_for(theme)
+    theme == 'mastodon-light' ? Themes::THEME_COLORS[:light] : Themes::THEME_COLORS[:dark]
+  end
+end
diff --git a/app/javascript/entrypoints/admin.tsx b/app/javascript/entrypoints/admin.tsx
new file mode 100644
index 0000000000..64192f54ad
--- /dev/null
+++ b/app/javascript/entrypoints/admin.tsx
@@ -0,0 +1,440 @@
+import './public-path';
+import { createRoot } from 'react-dom/client';
+
+import Rails from '@rails/ujs';
+
+import ready from '../mastodon/ready';
+
+const setAnnouncementEndsAttributes = (target: HTMLInputElement) => {
+  const valid = target.value && target.validity.valid;
+  const element = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_ends_at',
+  );
+
+  if (!element) return;
+
+  if (valid) {
+    element.classList.remove('optional');
+    element.required = true;
+    element.min = target.value;
+  } else {
+    element.classList.add('optional');
+    element.removeAttribute('required');
+    element.removeAttribute('min');
+  }
+};
+
+Rails.delegate(
+  document,
+  'input[type="datetime-local"]#announcement_starts_at',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      setAnnouncementEndsAttributes(target);
+  },
+);
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+const showSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  selectAllMatchingElement?.classList.add('active');
+};
+
+const hideSelectAll = () => {
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    'input#select_all_matching',
+  );
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  selectAllMatchingElement?.classList.remove('active');
+  selectedMsg?.classList.remove('active');
+  notSelectedMsg?.classList.add('active');
+  if (hiddenField) hiddenField.value = '0';
+};
+
+Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  document
+    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
+    .forEach((content) => {
+      content.checked = target.checked;
+    });
+
+  if (selectAllMatchingElement) {
+    if (target.checked) {
+      showSelectAll();
+    } else {
+      hideSelectAll();
+    }
+  }
+});
+
+Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
+  const hiddenField = document.querySelector<HTMLInputElement>(
+    '#select_all_matching',
+  );
+
+  if (!hiddenField) return;
+
+  const active = hiddenField.value === '1';
+  const selectedMsg = document.querySelector(
+    '.batch-table__select-all .selected',
+  );
+  const notSelectedMsg = document.querySelector(
+    '.batch-table__select-all .not-selected',
+  );
+
+  if (!selectedMsg || !notSelectedMsg) return;
+
+  if (active) {
+    hiddenField.value = '0';
+    selectedMsg.classList.remove('active');
+    notSelectedMsg.classList.add('active');
+  } else {
+    hiddenField.value = '1';
+    notSelectedMsg.classList.remove('active');
+    selectedMsg.classList.add('active');
+  }
+});
+
+Rails.delegate(document, batchCheckboxClassName, 'change', () => {
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  const selectAllMatchingElement = document.querySelector(
+    '.batch-table__select-all',
+  );
+
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+
+    if (selectAllMatchingElement) {
+      if (checkAllElement.checked) {
+        showSelectAll();
+      } else {
+        hideSelectAll();
+      }
+    }
+  }
+});
+
+Rails.delegate(
+  document,
+  '.filter-subset--with-select select',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) target.form?.submit();
+  },
+);
+
+const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
+  const rejectMediaDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_media',
+  );
+  const rejectReportsDiv = document.querySelector(
+    '.input.with_label.domain_block_reject_reports',
+  );
+
+  if (rejectMediaDiv && rejectMediaDiv instanceof HTMLElement) {
+    rejectMediaDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+
+  if (rejectReportsDiv && rejectReportsDiv instanceof HTMLElement) {
+    rejectReportsDiv.style.display =
+      target.value === 'suspend' ? 'none' : 'block';
+  }
+};
+
+Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+  if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
+});
+
+const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
+  const bootstrapTimelineAccountsField =
+    document.querySelector<HTMLInputElement>(
+      '#form_admin_settings_bootstrap_timeline_accounts',
+    );
+
+  if (bootstrapTimelineAccountsField) {
+    bootstrapTimelineAccountsField.disabled = !target.checked;
+    if (target.checked) {
+      bootstrapTimelineAccountsField.parentElement?.classList.remove(
+        'disabled',
+      );
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.remove(
+        'disabled',
+      );
+    } else {
+      bootstrapTimelineAccountsField.parentElement?.classList.add('disabled');
+      bootstrapTimelineAccountsField.parentElement?.parentElement?.classList.add(
+        'disabled',
+      );
+    }
+  }
+};
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_enable_bootstrap_timeline_accounts',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLInputElement)
+      onEnableBootstrapTimelineAccountsChange(target);
+  },
+);
+
+const onChangeRegistrationMode = (target: HTMLSelectElement) => {
+  const enabled = target.value === 'approved';
+
+  document
+    .querySelectorAll<HTMLElement>(
+      '.form_admin_settings_registrations_mode .warning-hint',
+    )
+    .forEach((warning_hint) => {
+      warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
+    });
+
+  const toggleEnabled = (input: HTMLInputElement, value: boolean) => {
+    input.disabled = !value;
+    if (value) {
+      let element: HTMLElement | null = input;
+      do {
+        element.classList.remove('disabled');
+        element = element.parentElement;
+      } while (element && !element.classList.contains('fields-group'));
+    } else {
+      let element: HTMLElement | null = input;
+      do {
+        element.classList.add('disabled');
+        element = element.parentElement;
+      } while (element && !element.classList.contains('fields-group'));
+    }
+  };
+
+  document
+    .querySelectorAll<HTMLInputElement>(
+      'input#form_admin_settings_require_invite_text',
+    )
+    .forEach((input) => {
+      toggleEnabled(input, enabled);
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>(
+      '#form_admin_settings_registrations_start_hour, #form_admin_settings_registrations_end_hour, #form_admin_settings_registrations_secondary_start_hour, #form_admin_settings_registrations_secondary_end_hour',
+    )
+    .forEach((input) => {
+      toggleEnabled(input, target.value === 'open');
+    });
+};
+
+const convertUTCDateTimeToLocal = (value: string) => {
+  const date = new Date(value + 'Z');
+  const twoChars = (x: number) => x.toString().padStart(2, '0');
+  return `${date.getFullYear()}-${twoChars(date.getMonth() + 1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
+};
+
+function convertLocalDatetimeToUTC(value: string) {
+  const date = new Date(value);
+  const fullISO8601 = date.toISOString();
+  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
+}
+
+Rails.delegate(
+  document,
+  '#form_admin_settings_registrations_mode',
+  'change',
+  ({ target }) => {
+    if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
+  },
+);
+
+const addTableRow = (tableId: string) => {
+  const templateElement = document.querySelector(`#${tableId} .template-row`)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+  const tableElement = document.querySelector(`#${tableId} tbody`)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+
+  if (
+    typeof templateElement === 'undefined' ||
+    typeof tableElement === 'undefined'
+  )
+    return;
+
+  let temporaryId = 0;
+  tableElement
+    .querySelectorAll<HTMLInputElement>('.temporary_id')
+    .forEach((input) => {
+      if (parseInt(input.value) + 1 > temporaryId) {
+        temporaryId = parseInt(input.value) + 1;
+      }
+    });
+
+  const cloned = templateElement.cloneNode(true) as HTMLTableRowElement;
+  cloned.className = '';
+  cloned.querySelector<HTMLInputElement>('.temporary_id')!.value = // eslint-disable-line @typescript-eslint/no-non-null-assertion
+    temporaryId.toString();
+  cloned
+    .querySelectorAll<HTMLInputElement>('input[type=checkbox]')
+    .forEach((input) => {
+      input.value = temporaryId.toString();
+    });
+  tableElement.appendChild(cloned);
+};
+
+const removeTableRow = (target: EventTarget | null, tableId: string) => {
+  const tableRowElement = (target as HTMLElement).closest('tr') as Node;
+  const tableElement = document.querySelector(`#${tableId} tbody`)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+
+  if (
+    typeof tableRowElement === 'undefined' ||
+    typeof tableElement === 'undefined'
+  )
+    return;
+
+  tableElement.removeChild(tableRowElement);
+};
+
+const setupTableList = (id: string) => {
+  Rails.delegate(document, `#${id} .add-row-button`, 'click', (ev) => {
+    ev.preventDefault();
+    addTableRow(id);
+  });
+
+  Rails.delegate(document, `#${id} .delete-row-button`, 'click', (ev) => {
+    ev.preventDefault();
+    removeTableRow(ev.target, id);
+  });
+};
+
+setupTableList('sensitive-words-table');
+setupTableList('ng-words-table');
+setupTableList('white-list-table');
+
+async function mountReactComponent(element: Element) {
+  const componentName = element.getAttribute('data-admin-component');
+  const stringProps = element.getAttribute('data-props');
+
+  if (!stringProps) return;
+
+  const componentProps = JSON.parse(stringProps) as object;
+
+  const { default: AdminComponent } = await import(
+    '@/mastodon/containers/admin_component'
+  );
+
+  const { default: Component } = (await import(
+    `@/mastodon/components/admin/${componentName}`
+  )) as { default: React.ComponentType };
+
+  const root = createRoot(element);
+
+  root.render(
+    <AdminComponent>
+      <Component {...componentProps} />
+    </AdminComponent>,
+  );
+}
+
+ready(() => {
+  const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
+    'select#domain_block_severity',
+  );
+  if (domainBlockSeveritySelect)
+    onDomainBlockSeverityChange(domainBlockSeveritySelect);
+
+  const enableBootstrapTimelineAccounts =
+    document.querySelector<HTMLInputElement>(
+      'input#form_admin_settings_enable_bootstrap_timeline_accounts',
+    );
+  if (enableBootstrapTimelineAccounts)
+    onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
+
+  const registrationMode = document.querySelector<HTMLSelectElement>(
+    'select#form_admin_settings_registrations_mode',
+  );
+  if (registrationMode) onChangeRegistrationMode(registrationMode);
+
+  const checkAllElement = document.querySelector<HTMLInputElement>(
+    'input#batch_checkbox_all',
+  );
+  if (checkAllElement) {
+    const allCheckboxes = Array.from(
+      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+    );
+    checkAllElement.checked = allCheckboxes.every((content) => content.checked);
+    checkAllElement.indeterminate =
+      !checkAllElement.checked &&
+      allCheckboxes.some((content) => content.checked);
+  }
+
+  document
+    .querySelector('a#add-instance-button')
+    ?.addEventListener('click', (e) => {
+      const domain = document.querySelector<HTMLInputElement>(
+        'input[type="text"]#by_domain',
+      )?.value;
+
+      if (domain && e.target instanceof HTMLAnchorElement) {
+        const url = new URL(e.target.href);
+        url.searchParams.set('_domain', domain);
+        e.target.href = url.toString();
+      }
+    });
+
+  document
+    .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+    .forEach((element) => {
+      if (element.value) {
+        element.value = convertUTCDateTimeToLocal(element.value);
+      }
+      if (element.placeholder) {
+        element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
+      }
+    });
+
+  Rails.delegate(document, 'form', 'submit', ({ target }) => {
+    if (target instanceof HTMLFormElement)
+      target
+        .querySelectorAll<HTMLInputElement>('input[type="datetime-local"]')
+        .forEach((element) => {
+          if (element.value && element.validity.valid) {
+            element.value = convertLocalDatetimeToUTC(element.value);
+          }
+        });
+  });
+
+  const announcementStartsAt = document.querySelector<HTMLInputElement>(
+    'input[type="datetime-local"]#announcement_starts_at',
+  );
+  if (announcementStartsAt) {
+    setAnnouncementEndsAttributes(announcementStartsAt);
+  }
+
+  document.querySelectorAll('[data-admin-component]').forEach((element) => {
+    void mountReactComponent(element);
+  });
+}).catch((reason: unknown) => {
+  throw reason;
+});
diff --git a/app/javascript/packs/application.js b/app/javascript/entrypoints/application.ts
similarity index 81%
rename from app/javascript/packs/application.js
rename to app/javascript/entrypoints/application.ts
index d13388b479..1087b1c4cb 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/entrypoints/application.ts
@@ -1,5 +1,5 @@
 import './public-path';
-import main from "mastodon/main";
+import main from 'mastodon/main';
 
 import { start } from '../mastodon/common';
 import { loadLocale } from '../mastodon/locales';
@@ -10,6 +10,6 @@ start();
 loadPolyfills()
   .then(loadLocale)
   .then(main)
-  .catch(e => {
+  .catch((e: unknown) => {
     console.error(e);
   });
diff --git a/app/javascript/packs/error.js b/app/javascript/entrypoints/error.ts
similarity index 64%
rename from app/javascript/packs/error.js
rename to app/javascript/entrypoints/error.ts
index 6376dc2f5d..db68484f3a 100644
--- a/app/javascript/packs/error.js
+++ b/app/javascript/entrypoints/error.ts
@@ -2,7 +2,9 @@ import './public-path';
 import ready from '../mastodon/ready';
 
 ready(() => {
-  const image = document.querySelector('img');
+  const image = document.querySelector<HTMLImageElement>('img');
+
+  if (!image) return;
 
   image.addEventListener('mouseenter', () => {
     image.src = '/oops.gif';
@@ -11,4 +13,6 @@ ready(() => {
   image.addEventListener('mouseleave', () => {
     image.src = '/oops.png';
   });
+}).catch((e: unknown) => {
+  console.error(e);
 });
diff --git a/app/javascript/packs/inert.js b/app/javascript/entrypoints/inert.ts
similarity index 100%
rename from app/javascript/packs/inert.js
rename to app/javascript/entrypoints/inert.ts
diff --git a/app/javascript/packs/mailer.js b/app/javascript/entrypoints/mailer.ts
similarity index 100%
rename from app/javascript/packs/mailer.js
rename to app/javascript/entrypoints/mailer.ts
diff --git a/app/javascript/packs/public-path.js b/app/javascript/entrypoints/public-path.ts
similarity index 69%
rename from app/javascript/packs/public-path.js
rename to app/javascript/entrypoints/public-path.ts
index f4d166a771..ac4b9355b9 100644
--- a/app/javascript/packs/public-path.js
+++ b/app/javascript/entrypoints/public-path.ts
@@ -2,7 +2,7 @@
 // to share the same assets regardless of instance configuration.
 // See https://webpack.js.org/guides/public-path/#on-the-fly
 
-function removeOuterSlashes(string) {
+function removeOuterSlashes(string: string) {
   return string.replace(/^\/*/, '').replace(/\/*$/, '');
 }
 
@@ -15,7 +15,9 @@ function formatPublicPath(host = '', path = '') {
   return `${formattedHost}/${formattedPath}/`;
 }
 
-const cdnHost = document.querySelector('meta[name=cdn-host]');
+const cdnHost = document.querySelector<HTMLMetaElement>('meta[name=cdn-host]');
 
-// eslint-disable-next-line no-undef
-__webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH);
+__webpack_public_path__ = formatPublicPath(
+  cdnHost ? cdnHost.content : '',
+  process.env.PUBLIC_OUTPUT_PATH,
+);
diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
new file mode 100644
index 0000000000..d45927226c
--- /dev/null
+++ b/app/javascript/entrypoints/public.tsx
@@ -0,0 +1,462 @@
+import { createRoot } from 'react-dom/client';
+
+import './public-path';
+
+import { IntlMessageFormat } from 'intl-messageformat';
+import type { MessageDescriptor, PrimitiveType } from 'react-intl';
+import { defineMessages } from 'react-intl';
+
+import Rails from '@rails/ujs';
+import axios from 'axios';
+import { throttle } from 'lodash';
+
+import { start } from '../mastodon/common';
+import { timeAgoString } from '../mastodon/components/relative_timestamp';
+import emojify from '../mastodon/features/emoji/emoji';
+import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
+import { loadLocale, getLocale } from '../mastodon/locales';
+import { loadPolyfills } from '../mastodon/polyfills';
+import ready from '../mastodon/ready';
+
+import 'cocoon-js-vanilla';
+
+start();
+
+const messages = defineMessages({
+  usernameTaken: {
+    id: 'username.taken',
+    defaultMessage: 'That username is taken. Try another',
+  },
+  passwordExceedsLength: {
+    id: 'password_confirmation.exceeds_maxlength',
+    defaultMessage: 'Password confirmation exceeds the maximum password length',
+  },
+  passwordDoesNotMatch: {
+    id: 'password_confirmation.mismatching',
+    defaultMessage: 'Password confirmation does not match',
+  },
+});
+
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  ready(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0].scrollHeight,
+      },
+      '*',
+    );
+  }).catch((e: unknown) => {
+    console.error('Error in setHeightMessage postMessage', e);
+  });
+});
+
+function loaded() {
+  const { messages: localeData } = getLocale();
+
+  const locale = document.documentElement.lang;
+
+  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: 'numeric',
+  });
+
+  const dateFormat = new Intl.DateTimeFormat(locale, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  });
+
+  const timeFormat = new Intl.DateTimeFormat(locale, {
+    timeStyle: 'short',
+  });
+
+  const formatMessage = (
+    { id, defaultMessage }: MessageDescriptor,
+    values?: Record<string, PrimitiveType>,
+  ) => {
+    let message: string | undefined = undefined;
+
+    if (id) message = localeData[id];
+
+    if (!message) message = defaultMessage as string;
+
+    const messageFormat = new IntlMessageFormat(message, locale);
+    return messageFormat.format(values) as string;
+  };
+
+  document.querySelectorAll('.emojify').forEach((content) => {
+    content.innerHTML = emojify(content.innerHTML);
+  });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const formattedDate = dateTimeFormat.format(datetime);
+
+      content.title = formattedDate;
+      content.textContent = formattedDate;
+    });
+
+  const isToday = (date: Date) => {
+    const today = new Date();
+
+    return (
+      date.getDate() === today.getDate() &&
+      date.getMonth() === today.getMonth() &&
+      date.getFullYear() === today.getFullYear()
+    );
+  };
+  const todayFormat = new IntlMessageFormat(
+    localeData['relative_format.today'] || 'Today at {time}',
+    locale,
+  );
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.relative-formatted')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+
+      let formattedContent: string;
+
+      if (isToday(datetime)) {
+        const formattedTime = timeFormat.format(datetime);
+
+        formattedContent = todayFormat.format({
+          time: formattedTime,
+        }) as string;
+      } else {
+        formattedContent = dateFormat.format(datetime);
+      }
+
+      content.title = formattedContent;
+      content.textContent = formattedContent;
+    });
+
+  document
+    .querySelectorAll<HTMLTimeElement>('time.time-ago')
+    .forEach((content) => {
+      const datetime = new Date(content.dateTime);
+      const now = new Date();
+
+      const timeGiven = content.dateTime.includes('T');
+      content.title = timeGiven
+        ? dateTimeFormat.format(datetime)
+        : dateFormat.format(datetime);
+      content.textContent = timeAgoString(
+        {
+          formatMessage,
+          formatDate: (date: Date, options) =>
+            new Intl.DateTimeFormat(locale, options).format(date),
+        },
+        datetime,
+        now.getTime(),
+        now.getFullYear(),
+        timeGiven,
+      );
+    });
+
+  const reactComponents = document.querySelectorAll('[data-component]');
+
+  if (reactComponents.length > 0) {
+    import(
+      /* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container'
+    )
+      .then(({ default: MediaContainer }) => {
+        reactComponents.forEach((component) => {
+          Array.from(component.children).forEach((child) => {
+            component.removeChild(child);
+          });
+        });
+
+        const content = document.createElement('div');
+
+        const root = createRoot(content);
+        root.render(
+          <MediaContainer locale={locale} components={reactComponents} />,
+        );
+        document.body.appendChild(content);
+
+        return true;
+      })
+      .catch((error: unknown) => {
+        console.error(error);
+      });
+  }
+
+  Rails.delegate(
+    document,
+    'input#user_account_attributes_username',
+    'input',
+    throttle(
+      ({ target }) => {
+        if (!(target instanceof HTMLInputElement)) return;
+
+        if (target.value && target.value.length > 0) {
+          axios
+            .get('/api/v1/accounts/lookup', { params: { acct: target.value } })
+            .then(() => {
+              target.setCustomValidity(formatMessage(messages.usernameTaken));
+              return true;
+            })
+            .catch(() => {
+              target.setCustomValidity('');
+            });
+        } else {
+          target.setCustomValidity('');
+        }
+      },
+      500,
+      { leading: false, trailing: true },
+    ),
+  );
+
+  Rails.delegate(
+    document,
+    '#user_password,#user_password_confirmation',
+    'input',
+    () => {
+      const password = document.querySelector<HTMLInputElement>(
+        'input#user_password',
+      );
+      const confirmation = document.querySelector<HTMLInputElement>(
+        'input#user_password_confirmation',
+      );
+      if (!confirmation || !password) return;
+
+      if (
+        confirmation.value &&
+        confirmation.value.length > password.maxLength
+      ) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordExceedsLength),
+        );
+      } else if (password.value && password.value !== confirmation.value) {
+        confirmation.setCustomValidity(
+          formatMessage(messages.passwordDoesNotMatch),
+        );
+      } else {
+        confirmation.setCustomValidity('');
+      }
+    },
+  );
+
+  Rails.delegate(
+    document,
+    'button.status__content__spoiler-link',
+    'click',
+    function () {
+      if (!(this instanceof HTMLButtonElement)) return;
+
+      const statusEl = this.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      if (statusEl.dataset.spoiler === 'expanded') {
+        statusEl.dataset.spoiler = 'folded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_more'] || 'Show more',
+          locale,
+        ).format() as string;
+      } else {
+        statusEl.dataset.spoiler = 'expanded';
+        this.textContent = new IntlMessageFormat(
+          localeData['status.show_less'] || 'Show less',
+          locale,
+        ).format() as string;
+      }
+    },
+  );
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.status__content__spoiler-link')
+    .forEach((spoilerLink) => {
+      const statusEl = spoilerLink.parentNode?.parentNode;
+
+      if (
+        !(
+          statusEl instanceof HTMLDivElement &&
+          statusEl.classList.contains('.status__content')
+        )
+      )
+        return;
+
+      const message =
+        statusEl.dataset.spoiler === 'expanded'
+          ? localeData['status.show_less'] || 'Show less'
+          : localeData['status.show_more'] || 'Show more';
+      spoilerLink.textContent = new IntlMessageFormat(
+        message,
+        locale,
+      ).format() as string;
+    });
+}
+
+Rails.delegate(
+  document,
+  '#edit_profile input[type=file]',
+  'change',
+  ({ target }) => {
+    if (!(target instanceof HTMLInputElement)) return;
+
+    const avatar = document.querySelector<HTMLImageElement>(
+      `img#${target.id}-preview`,
+    );
+
+    if (!avatar) return;
+
+    let file: File | undefined;
+    if (target.files) file = target.files[0];
+
+    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
+
+    if (url) avatar.src = url;
+  },
+);
+
+Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
+  if (!(target instanceof HTMLInputElement)) return;
+
+  target.focus();
+  target.select();
+  target.setSelectionRange(0, target.value.length);
+});
+
+Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
+  if (!(target instanceof HTMLButtonElement)) return;
+
+  const input = target.parentNode?.querySelector<HTMLInputElement>(
+    '.input-copy__wrapper input',
+  );
+
+  if (!input) return;
+
+  const oldReadOnly = input.readOnly;
+
+  input.readOnly = false;
+  input.focus();
+  input.select();
+  input.setSelectionRange(0, input.value.length);
+
+  try {
+    if (document.execCommand('copy')) {
+      input.blur();
+
+      const parent = target.parentElement;
+
+      if (!parent) return;
+      parent.classList.add('copied');
+
+      setTimeout(() => {
+        parent.classList.remove('copied');
+      }, 700);
+    }
+  } catch (err) {
+    console.error(err);
+  }
+
+  input.readOnly = oldReadOnly;
+});
+
+const toggleSidebar = () => {
+  const sidebar = document.querySelector<HTMLUListElement>('.sidebar ul');
+  const toggleButton = document.querySelector<HTMLAnchorElement>(
+    'a.sidebar__toggle__icon',
+  );
+
+  if (!sidebar || !toggleButton) return;
+
+  if (sidebar.classList.contains('visible')) {
+    document.body.style.overflow = '';
+    toggleButton.setAttribute('aria-expanded', 'false');
+  } else {
+    document.body.style.overflow = 'hidden';
+    toggleButton.setAttribute('aria-expanded', 'true');
+  }
+
+  toggleButton.classList.toggle('active');
+  sidebar.classList.toggle('visible');
+};
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
+  toggleSidebar();
+});
+
+Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', (e) => {
+  if (e.key === ' ' || e.key === 'Enter') {
+    e.preventDefault();
+    toggleSidebar();
+  }
+});
+
+Rails.delegate(document, 'img.custom-emoji', 'mouseover', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.original)
+    target.src = target.dataset.original;
+});
+Rails.delegate(document, 'img.custom-emoji', 'mouseout', ({ target }) => {
+  if (target instanceof HTMLImageElement && target.dataset.static)
+    target.src = target.dataset.static;
+});
+
+// Empty the honeypot fields in JS in case something like an extension
+// automatically filled them.
+Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
+  [
+    'user_website',
+    'user_confirm_password',
+    'registration_user_website',
+    'registration_user_confirm_password',
+  ].forEach((id) => {
+    const field = document.querySelector<HTMLInputElement>(`input#${id}`);
+    if (field) {
+      field.value = '';
+    }
+  });
+});
+
+function main() {
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
+}
+
+loadPolyfills()
+  .then(loadLocale)
+  .then(main)
+  .then(loadKeyboardExtensions)
+  .catch((error: unknown) => {
+    console.error(error);
+  });
diff --git a/app/javascript/packs/remote_interaction_helper.ts b/app/javascript/entrypoints/remote_interaction_helper.ts
similarity index 100%
rename from app/javascript/packs/remote_interaction_helper.ts
rename to app/javascript/entrypoints/remote_interaction_helper.ts
diff --git a/app/javascript/packs/share.jsx b/app/javascript/entrypoints/share.tsx
similarity index 61%
rename from app/javascript/packs/share.jsx
rename to app/javascript/entrypoints/share.tsx
index 0f3b84549d..7926250851 100644
--- a/app/javascript/packs/share.jsx
+++ b/app/javascript/entrypoints/share.tsx
@@ -2,7 +2,7 @@ import './public-path';
 import { createRoot } from 'react-dom/client';
 
 import { start } from '../mastodon/common';
-import ComposeContainer  from '../mastodon/containers/compose_container';
+import ComposeContainer from '../mastodon/containers/compose_container';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
@@ -13,18 +13,24 @@ function loaded() {
 
   if (mountNode) {
     const attr = mountNode.getAttribute('data-props');
-    if(!attr) return;
 
-    const props = JSON.parse(attr);
+    if (!attr) return;
+
+    const props = JSON.parse(attr) as object;
     const root = createRoot(mountNode);
+
     root.render(<ComposeContainer {...props} />);
   }
 }
 
 function main() {
-  ready(loaded);
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
 }
 
-loadPolyfills().then(main).catch(error => {
-  console.error(error);
-});
+loadPolyfills()
+  .then(main)
+  .catch((error: unknown) => {
+    console.error(error);
+  });
diff --git a/app/javascript/entrypoints/sign_up.ts b/app/javascript/entrypoints/sign_up.ts
new file mode 100644
index 0000000000..880738fcb7
--- /dev/null
+++ b/app/javascript/entrypoints/sign_up.ts
@@ -0,0 +1,48 @@
+import './public-path';
+import axios from 'axios';
+
+import ready from '../mastodon/ready';
+
+async function checkConfirmation() {
+  const response = await axios.get('/api/v1/emails/check_confirmation');
+
+  if (response.data) {
+    window.location.href = '/start';
+  }
+}
+
+ready(() => {
+  setInterval(() => {
+    void checkConfirmation();
+  }, 5000);
+
+  document
+    .querySelectorAll<HTMLButtonElement>('button.timer-button')
+    .forEach((button) => {
+      let counter = 30;
+
+      const container = document.createElement('span');
+
+      const updateCounter = () => {
+        container.innerText = ` (${counter})`;
+      };
+
+      updateCounter();
+
+      const countdown = setInterval(() => {
+        counter--;
+
+        if (counter === 0) {
+          button.disabled = false;
+          button.removeChild(container);
+          clearInterval(countdown);
+        } else {
+          updateCounter();
+        }
+      }, 1000);
+
+      button.appendChild(container);
+    });
+}).catch((e: unknown) => {
+  throw e;
+});
diff --git a/app/javascript/entrypoints/two_factor_authentication.ts b/app/javascript/entrypoints/two_factor_authentication.ts
new file mode 100644
index 0000000000..981481694b
--- /dev/null
+++ b/app/javascript/entrypoints/two_factor_authentication.ts
@@ -0,0 +1,197 @@
+import * as WebAuthnJSON from '@github/webauthn-json';
+import axios, { AxiosError } from 'axios';
+
+import ready from '../mastodon/ready';
+
+import 'regenerator-runtime/runtime';
+
+type PublicKeyCredentialCreationOptionsJSON =
+  WebAuthnJSON.CredentialCreationOptionsJSON['publicKey'];
+
+function exceptionHasAxiosError(
+  error: unknown,
+): error is AxiosError<{ error: unknown }> {
+  return (
+    error instanceof AxiosError &&
+    typeof error.response?.data === 'object' &&
+    'error' in error.response.data
+  );
+}
+
+function logAxiosResponseError(error: unknown) {
+  if (exceptionHasAxiosError(error)) console.error(error);
+}
+
+function getCSRFToken() {
+  return document
+    .querySelector<HTMLMetaElement>('meta[name="csrf-token"]')
+    ?.getAttribute('content');
+}
+
+function hideFlashMessages() {
+  document.querySelectorAll('.flash-message').forEach((flashMessage) => {
+    flashMessage.classList.add('hidden');
+  });
+}
+
+async function callback(
+  url: string,
+  body:
+    | {
+        credential: WebAuthnJSON.PublicKeyCredentialWithAttestationJSON;
+        nickname: string;
+      }
+    | {
+        user: { credential: WebAuthnJSON.PublicKeyCredentialWithAssertionJSON };
+      },
+) {
+  try {
+    const response = await axios.post<{ redirect_path: string }>(
+      url,
+      JSON.stringify(body),
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          'X-CSRF-Token': getCSRFToken(),
+        },
+      },
+    );
+
+    window.location.replace(response.data.redirect_path);
+  } catch (error) {
+    if (error instanceof AxiosError && error.response?.status === 422) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+
+      logAxiosResponseError(error);
+    } else {
+      console.error(error);
+    }
+  }
+}
+
+async function handleWebauthnCredentialRegistration(nickname: string) {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      '/settings/security_keys/options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.create({
+        publicKey: credentialOptions,
+      });
+
+      const params = {
+        credential: credential,
+        nickname: nickname,
+      };
+
+      await callback('/settings/security_keys', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+async function handleWebauthnCredentialAuthentication() {
+  try {
+    const response = await axios.get<PublicKeyCredentialCreationOptionsJSON>(
+      'sessions/security_key_options',
+    );
+
+    const credentialOptions = response.data;
+
+    try {
+      const credential = await WebAuthnJSON.get({
+        publicKey: credentialOptions,
+      });
+
+      const params = { user: { credential: credential } };
+      void callback('sign_in', params);
+    } catch (error) {
+      const errorMessage = document.getElementById(
+        'security-key-error-message',
+      );
+      errorMessage?.classList.remove('hidden');
+      console.error(error);
+    }
+  } catch (error) {
+    logAxiosResponseError(error);
+  }
+}
+
+ready(() => {
+  if (!WebAuthnJSON.supported()) {
+    const unsupported_browser_message = document.getElementById(
+      'unsupported-browser-message',
+    );
+    if (unsupported_browser_message) {
+      unsupported_browser_message.classList.remove('hidden');
+      const button = document.querySelector<HTMLButtonElement>(
+        'button.btn.js-webauthn',
+      );
+      if (button) button.disabled = true;
+    }
+  }
+
+  const webAuthnCredentialRegistrationForm =
+    document.querySelector<HTMLFormElement>('form#new_webauthn_credential');
+  if (webAuthnCredentialRegistrationForm) {
+    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+
+      if (!(event.target instanceof HTMLFormElement)) return;
+
+      const nickname = event.target.querySelector<HTMLInputElement>(
+        'input[name="new_webauthn_credential[nickname]"]',
+      );
+
+      if (nickname?.value) {
+        void handleWebauthnCredentialRegistration(nickname.value);
+      } else {
+        nickname?.focus();
+      }
+    });
+  }
+
+  const webAuthnCredentialAuthenticationForm =
+    document.getElementById('webauthn-form');
+  if (webAuthnCredentialAuthenticationForm) {
+    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
+      event.preventDefault();
+      void handleWebauthnCredentialAuthentication();
+    });
+
+    const otpAuthenticationForm = document.getElementById(
+      'otp-authentication-form',
+    );
+
+    const linkToOtp = document.getElementById('link-to-otp');
+
+    linkToOtp?.addEventListener('click', () => {
+      webAuthnCredentialAuthenticationForm.classList.add('hidden');
+      otpAuthenticationForm?.classList.remove('hidden');
+      hideFlashMessages();
+    });
+
+    const linkToWebAuthn = document.getElementById('link-to-webauthn');
+    linkToWebAuthn?.addEventListener('click', () => {
+      otpAuthenticationForm?.classList.add('hidden');
+      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
+      hideFlashMessages();
+    });
+  }
+}).catch((e: unknown) => {
+  throw e;
+});
diff --git a/app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2 b/app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2
new file mode 100644
index 0000000000..e6345f2e3d
Binary files /dev/null and b/app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2 differ
diff --git a/app/javascript/icons/android-chrome-144x144.png b/app/javascript/icons/android-chrome-144x144.png
old mode 100644
new mode 100755
index 698fb4a260..d636e94c43
Binary files a/app/javascript/icons/android-chrome-144x144.png and b/app/javascript/icons/android-chrome-144x144.png differ
diff --git a/app/javascript/icons/android-chrome-192x192.png b/app/javascript/icons/android-chrome-192x192.png
old mode 100644
new mode 100755
index 2b6b632648..4a2681ffb9
Binary files a/app/javascript/icons/android-chrome-192x192.png and b/app/javascript/icons/android-chrome-192x192.png differ
diff --git a/app/javascript/icons/android-chrome-256x256.png b/app/javascript/icons/android-chrome-256x256.png
old mode 100644
new mode 100755
index 51e3849a26..8fab493ede
Binary files a/app/javascript/icons/android-chrome-256x256.png and b/app/javascript/icons/android-chrome-256x256.png differ
diff --git a/app/javascript/icons/android-chrome-36x36.png b/app/javascript/icons/android-chrome-36x36.png
old mode 100644
new mode 100755
index 925f69c4fc..335d012db1
Binary files a/app/javascript/icons/android-chrome-36x36.png and b/app/javascript/icons/android-chrome-36x36.png differ
diff --git a/app/javascript/icons/android-chrome-384x384.png b/app/javascript/icons/android-chrome-384x384.png
old mode 100644
new mode 100755
index 9d256a83cb..02b1e6fced
Binary files a/app/javascript/icons/android-chrome-384x384.png and b/app/javascript/icons/android-chrome-384x384.png differ
diff --git a/app/javascript/icons/android-chrome-48x48.png b/app/javascript/icons/android-chrome-48x48.png
old mode 100644
new mode 100755
index bcfe7475d0..43cf411b8c
Binary files a/app/javascript/icons/android-chrome-48x48.png and b/app/javascript/icons/android-chrome-48x48.png differ
diff --git a/app/javascript/icons/android-chrome-512x512.png b/app/javascript/icons/android-chrome-512x512.png
old mode 100644
new mode 100755
index bffacfb699..1856b80c7c
Binary files a/app/javascript/icons/android-chrome-512x512.png and b/app/javascript/icons/android-chrome-512x512.png differ
diff --git a/app/javascript/icons/android-chrome-72x72.png b/app/javascript/icons/android-chrome-72x72.png
old mode 100644
new mode 100755
index 16679d5731..335008bf85
Binary files a/app/javascript/icons/android-chrome-72x72.png and b/app/javascript/icons/android-chrome-72x72.png differ
diff --git a/app/javascript/icons/android-chrome-96x96.png b/app/javascript/icons/android-chrome-96x96.png
old mode 100644
new mode 100755
index 9ade87cf32..d1cb095822
Binary files a/app/javascript/icons/android-chrome-96x96.png and b/app/javascript/icons/android-chrome-96x96.png differ
diff --git a/app/javascript/icons/apple-touch-icon-1024x1024.png b/app/javascript/icons/apple-touch-icon-1024x1024.png
old mode 100644
new mode 100755
index 8ec371eb27..c2a2d516ef
Binary files a/app/javascript/icons/apple-touch-icon-1024x1024.png and b/app/javascript/icons/apple-touch-icon-1024x1024.png differ
diff --git a/app/javascript/icons/apple-touch-icon-114x114.png b/app/javascript/icons/apple-touch-icon-114x114.png
old mode 100644
new mode 100755
index e1563f51e5..218b415439
Binary files a/app/javascript/icons/apple-touch-icon-114x114.png and b/app/javascript/icons/apple-touch-icon-114x114.png differ
diff --git a/app/javascript/icons/apple-touch-icon-120x120.png b/app/javascript/icons/apple-touch-icon-120x120.png
old mode 100644
new mode 100755
index e9a5f5b0e5..be53bc7c10
Binary files a/app/javascript/icons/apple-touch-icon-120x120.png and b/app/javascript/icons/apple-touch-icon-120x120.png differ
diff --git a/app/javascript/icons/apple-touch-icon-144x144.png b/app/javascript/icons/apple-touch-icon-144x144.png
old mode 100644
new mode 100755
index 698fb4a260..cbb055732f
Binary files a/app/javascript/icons/apple-touch-icon-144x144.png and b/app/javascript/icons/apple-touch-icon-144x144.png differ
diff --git a/app/javascript/icons/apple-touch-icon-152x152.png b/app/javascript/icons/apple-touch-icon-152x152.png
old mode 100644
new mode 100755
index 0cc93cc288..3a7975c054
Binary files a/app/javascript/icons/apple-touch-icon-152x152.png and b/app/javascript/icons/apple-touch-icon-152x152.png differ
diff --git a/app/javascript/icons/apple-touch-icon-167x167.png b/app/javascript/icons/apple-touch-icon-167x167.png
old mode 100644
new mode 100755
index 9bbbf53120..25be4eb5f5
Binary files a/app/javascript/icons/apple-touch-icon-167x167.png and b/app/javascript/icons/apple-touch-icon-167x167.png differ
diff --git a/app/javascript/icons/apple-touch-icon-180x180.png b/app/javascript/icons/apple-touch-icon-180x180.png
old mode 100644
new mode 100755
index 329b803b91..dc0e9bc20b
Binary files a/app/javascript/icons/apple-touch-icon-180x180.png and b/app/javascript/icons/apple-touch-icon-180x180.png differ
diff --git a/app/javascript/icons/apple-touch-icon-57x57.png b/app/javascript/icons/apple-touch-icon-57x57.png
old mode 100644
new mode 100755
index e00e142c64..bb0dc957cd
Binary files a/app/javascript/icons/apple-touch-icon-57x57.png and b/app/javascript/icons/apple-touch-icon-57x57.png differ
diff --git a/app/javascript/icons/apple-touch-icon-60x60.png b/app/javascript/icons/apple-touch-icon-60x60.png
old mode 100644
new mode 100755
index 011285b564..9143a0bf07
Binary files a/app/javascript/icons/apple-touch-icon-60x60.png and b/app/javascript/icons/apple-touch-icon-60x60.png differ
diff --git a/app/javascript/icons/apple-touch-icon-72x72.png b/app/javascript/icons/apple-touch-icon-72x72.png
old mode 100644
new mode 100755
index 16679d5731..2b7d19484c
Binary files a/app/javascript/icons/apple-touch-icon-72x72.png and b/app/javascript/icons/apple-touch-icon-72x72.png differ
diff --git a/app/javascript/icons/apple-touch-icon-76x76.png b/app/javascript/icons/apple-touch-icon-76x76.png
old mode 100644
new mode 100755
index 83c8748876..0985e33bcb
Binary files a/app/javascript/icons/apple-touch-icon-76x76.png and b/app/javascript/icons/apple-touch-icon-76x76.png differ
diff --git a/app/javascript/icons/favicon-16x16.png b/app/javascript/icons/favicon-16x16.png
old mode 100644
new mode 100755
index eed8e0035c..1326ba0462
Binary files a/app/javascript/icons/favicon-16x16.png and b/app/javascript/icons/favicon-16x16.png differ
diff --git a/app/javascript/icons/favicon-32x32.png b/app/javascript/icons/favicon-32x32.png
old mode 100644
new mode 100755
index 9165746bcf..f5058cb0a5
Binary files a/app/javascript/icons/favicon-32x32.png and b/app/javascript/icons/favicon-32x32.png differ
diff --git a/app/javascript/icons/favicon-48x48.png b/app/javascript/icons/favicon-48x48.png
old mode 100644
new mode 100755
index 259676c0a9..6253d054c7
Binary files a/app/javascript/icons/favicon-48x48.png and b/app/javascript/icons/favicon-48x48.png differ
diff --git a/app/javascript/images/check.svg b/app/javascript/images/check.svg
new file mode 100644
index 0000000000..8a0ebe878d
--- /dev/null
+++ b/app/javascript/images/check.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" />
+</svg>
\ No newline at end of file
diff --git a/app/javascript/images/mailer-new/common/header-bg-end.png b/app/javascript/images/mailer-new/common/header-bg-end.png
new file mode 100644
index 0000000000..900196678a
Binary files /dev/null and b/app/javascript/images/mailer-new/common/header-bg-end.png differ
diff --git a/app/javascript/images/mailer-new/common/header-bg-start.png b/app/javascript/images/mailer-new/common/header-bg-start.png
new file mode 100644
index 0000000000..0037c1ad93
Binary files /dev/null and b/app/javascript/images/mailer-new/common/header-bg-start.png differ
diff --git a/app/javascript/images/mailer-new/common/logo-footer.png b/app/javascript/images/mailer-new/common/logo-footer.png
new file mode 100644
index 0000000000..2baafd8d7f
Binary files /dev/null and b/app/javascript/images/mailer-new/common/logo-footer.png differ
diff --git a/app/javascript/images/mailer-new/common/logo-header.png b/app/javascript/images/mailer-new/common/logo-header.png
new file mode 100644
index 0000000000..46a6bddaa1
Binary files /dev/null and b/app/javascript/images/mailer-new/common/logo-header.png differ
diff --git a/app/javascript/images/mailer-new/heading/2fa-disabled.png b/app/javascript/images/mailer-new/heading/2fa-disabled.png
new file mode 100644
index 0000000000..b1e342a87c
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/2fa-disabled.png differ
diff --git a/app/javascript/images/mailer-new/heading/2fa-enabled.png b/app/javascript/images/mailer-new/heading/2fa-enabled.png
new file mode 100644
index 0000000000..3ce3e04f84
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/2fa-enabled.png differ
diff --git a/app/javascript/images/mailer-new/heading/2fa-recovery.png b/app/javascript/images/mailer-new/heading/2fa-recovery.png
new file mode 100644
index 0000000000..cefb21e1eb
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/2fa-recovery.png differ
diff --git a/app/javascript/images/mailer-new/heading/LICENSE b/app/javascript/images/mailer-new/heading/LICENSE
new file mode 100644
index 0000000000..974db1ac4b
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/heading/README.md b/app/javascript/images/mailer-new/heading/README.md
new file mode 100644
index 0000000000..ecd4b949e7
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/heading/appeal-approved.png b/app/javascript/images/mailer-new/heading/appeal-approved.png
new file mode 100755
index 0000000000..b2476ec346
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/appeal-approved.png differ
diff --git a/app/javascript/images/mailer-new/heading/appeal-rejected.png b/app/javascript/images/mailer-new/heading/appeal-rejected.png
new file mode 100644
index 0000000000..7ae38ad0c1
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/appeal-rejected.png differ
diff --git a/app/javascript/images/mailer-new/heading/archive.png b/app/javascript/images/mailer-new/heading/archive.png
new file mode 100644
index 0000000000..b0c7fad84d
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/archive.png differ
diff --git a/app/javascript/images/mailer-new/heading/boost.png b/app/javascript/images/mailer-new/heading/boost.png
new file mode 100644
index 0000000000..e33b759976
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/boost.png differ
diff --git a/app/javascript/images/mailer-new/heading/email.png b/app/javascript/images/mailer-new/heading/email.png
new file mode 100644
index 0000000000..c922c5239e
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/email.png differ
diff --git a/app/javascript/images/mailer-new/heading/favorite.png b/app/javascript/images/mailer-new/heading/favorite.png
new file mode 100644
index 0000000000..0e483ee9b2
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/favorite.png differ
diff --git a/app/javascript/images/mailer-new/heading/follow.png b/app/javascript/images/mailer-new/heading/follow.png
new file mode 100644
index 0000000000..ff5b7e0042
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/follow.png differ
diff --git a/app/javascript/images/mailer-new/heading/key-added.png b/app/javascript/images/mailer-new/heading/key-added.png
new file mode 100755
index 0000000000..82dcd464bf
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/key-added.png differ
diff --git a/app/javascript/images/mailer-new/heading/key-deleted.png b/app/javascript/images/mailer-new/heading/key-deleted.png
new file mode 100755
index 0000000000..2930f591a0
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/key-deleted.png differ
diff --git a/app/javascript/images/mailer-new/heading/key-disabled.png b/app/javascript/images/mailer-new/heading/key-disabled.png
new file mode 100755
index 0000000000..e0f259359a
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/key-disabled.png differ
diff --git a/app/javascript/images/mailer-new/heading/key-enabled.png b/app/javascript/images/mailer-new/heading/key-enabled.png
new file mode 100644
index 0000000000..b2476ec346
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/key-enabled.png differ
diff --git a/app/javascript/images/mailer-new/heading/login.png b/app/javascript/images/mailer-new/heading/login.png
new file mode 100644
index 0000000000..89a6e9ee33
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/login.png differ
diff --git a/app/javascript/images/mailer-new/heading/mention.png b/app/javascript/images/mailer-new/heading/mention.png
new file mode 100644
index 0000000000..c4dccff8ef
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/mention.png differ
diff --git a/app/javascript/images/mailer-new/heading/password.png b/app/javascript/images/mailer-new/heading/password.png
new file mode 100755
index 0000000000..552c7c0687
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/password.png differ
diff --git a/app/javascript/images/mailer-new/heading/user.png b/app/javascript/images/mailer-new/heading/user.png
new file mode 100644
index 0000000000..f1dd58a18d
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/user.png differ
diff --git a/app/javascript/images/mailer-new/heading/warning.png b/app/javascript/images/mailer-new/heading/warning.png
new file mode 100755
index 0000000000..7764837abe
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/warning.png differ
diff --git a/app/javascript/images/mailer-new/store-icons/btn-app-store.png b/app/javascript/images/mailer-new/store-icons/btn-app-store.png
new file mode 100644
index 0000000000..ee3bd9385c
Binary files /dev/null and b/app/javascript/images/mailer-new/store-icons/btn-app-store.png differ
diff --git a/app/javascript/images/mailer-new/store-icons/btn-google-play.png b/app/javascript/images/mailer-new/store-icons/btn-google-play.png
new file mode 100644
index 0000000000..ed43ff29aa
Binary files /dev/null and b/app/javascript/images/mailer-new/store-icons/btn-google-play.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/LICENSE b/app/javascript/images/mailer-new/welcome-icons/LICENSE
new file mode 100644
index 0000000000..974db1ac4b
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/welcome-icons/README.md b/app/javascript/images/mailer-new/welcome-icons/README.md
new file mode 100644
index 0000000000..ecd4b949e7
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/welcome-icons/apps_step-off.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-off.png
new file mode 100755
index 0000000000..ca270f5478
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/apps_step-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/apps_step-on.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-on.png
new file mode 100644
index 0000000000..fd631bf97e
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/apps_step-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png
new file mode 100644
index 0000000000..dfcdd04e16
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png
new file mode 100644
index 0000000000..c3776d17df
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/follow_step-off.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-off.png
new file mode 100755
index 0000000000..a262454d2d
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/follow_step-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/follow_step-on.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-on.png
new file mode 100644
index 0000000000..3ac011539b
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/follow_step-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/post_step-off.png b/app/javascript/images/mailer-new/welcome-icons/post_step-off.png
new file mode 100755
index 0000000000..972de65a56
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/post_step-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/post_step-on.png b/app/javascript/images/mailer-new/welcome-icons/post_step-on.png
new file mode 100644
index 0000000000..aa318e66c8
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/post_step-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/share_step-off.png b/app/javascript/images/mailer-new/welcome-icons/share_step-off.png
new file mode 100755
index 0000000000..f45e9a2c9a
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/share_step-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome-icons/share_step-on.png b/app/javascript/images/mailer-new/welcome-icons/share_step-on.png
new file mode 100644
index 0000000000..98782d9317
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome-icons/share_step-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome/checkbox-off.png b/app/javascript/images/mailer-new/welcome/checkbox-off.png
new file mode 100644
index 0000000000..51c190efe6
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/checkbox-off.png differ
diff --git a/app/javascript/images/mailer-new/welcome/checkbox-on.png b/app/javascript/images/mailer-new/welcome/checkbox-on.png
new file mode 100644
index 0000000000..162095e7df
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/checkbox-on.png differ
diff --git a/app/javascript/images/mailer-new/welcome/feature_audience.png b/app/javascript/images/mailer-new/welcome/feature_audience.png
new file mode 100644
index 0000000000..902de133b4
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/feature_audience.png differ
diff --git a/app/javascript/images/mailer-new/welcome/feature_control.png b/app/javascript/images/mailer-new/welcome/feature_control.png
new file mode 100644
index 0000000000..1afb6c238c
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/feature_control.png differ
diff --git a/app/javascript/images/mailer-new/welcome/feature_creativity.png b/app/javascript/images/mailer-new/welcome/feature_creativity.png
new file mode 100644
index 0000000000..3365856699
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/feature_creativity.png differ
diff --git a/app/javascript/images/mailer-new/welcome/feature_moderation.png b/app/javascript/images/mailer-new/welcome/feature_moderation.png
new file mode 100644
index 0000000000..7cee9b29b8
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/feature_moderation.png differ
diff --git a/app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png b/app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png
new file mode 100644
index 0000000000..ec1ad5c957
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/purple-extra-soft-spacer.png differ
diff --git a/app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png b/app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png
new file mode 100644
index 0000000000..ba8f6dd3d9
Binary files /dev/null and b/app/javascript/images/mailer-new/welcome/purple-extra-soft-wave.png differ
diff --git a/app/javascript/images/warning-stripes.svg b/app/javascript/images/warning-stripes.svg
new file mode 100755
index 0000000000..9d68acdada
--- /dev/null
+++ b/app/javascript/images/warning-stripes.svg
@@ -0,0 +1,25 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_253_1286)">
+<rect width="5" height="80" fill="url(#paint0_linear_253_1286)"/>
+<line x1="-0.860365" y1="6.80136" x2="10.6078" y2="-1.22871" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="14.8314" x2="10.6078" y2="6.80132" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="22.8615" x2="10.6078" y2="14.8314" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="30.8916" x2="10.6078" y2="22.8615" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="38.9216" x2="10.6078" y2="30.8915" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="46.9517" x2="10.6078" y2="38.9216" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="54.9818" x2="10.6078" y2="46.9517" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="63.0118" x2="10.6078" y2="54.9817" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="71.0419" x2="10.6078" y2="63.0118" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="79.072" x2="10.6078" y2="71.0419" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="87.102" x2="10.6078" y2="79.072" stroke="black" stroke-width="3"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_253_1286" x1="2.5" y1="0" x2="2.5" y2="80" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FEC84B"/>
+<stop offset="1" stop-color="#F79009"/>
+</linearGradient>
+<clipPath id="clip0_253_1286">
+<rect width="5" height="80" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/javascript/mastodon/actions/antennas.js b/app/javascript/mastodon/actions/antennas.js
new file mode 100644
index 0000000000..4716897586
--- /dev/null
+++ b/app/javascript/mastodon/actions/antennas.js
@@ -0,0 +1,986 @@
+import api from '../api';
+
+import { showAlertForError } from './alerts';
+import { importFetchedAccounts } from './importer';
+
+export const ANTENNA_FETCH_REQUEST = 'ANTENNA_FETCH_REQUEST';
+export const ANTENNA_FETCH_SUCCESS = 'ANTENNA_FETCH_SUCCESS';
+export const ANTENNA_FETCH_FAIL    = 'ANTENNA_FETCH_FAIL';
+
+export const ANTENNAS_FETCH_REQUEST = 'ANTENNAS_FETCH_REQUEST';
+export const ANTENNAS_FETCH_SUCCESS = 'ANTENNAS_FETCH_SUCCESS';
+export const ANTENNAS_FETCH_FAIL    = 'ANTENNAS_FETCH_FAIL';
+
+export const ANTENNA_EDITOR_TITLE_CHANGE = 'ANTENNA_EDITOR_TITLE_CHANGE';
+export const ANTENNA_EDITOR_RESET        = 'ANTENNA_EDITOR_RESET';
+export const ANTENNA_EDITOR_SETUP        = 'ANTENNA_EDITOR_SETUP';
+
+export const ANTENNA_CREATE_REQUEST = 'ANTENNA_CREATE_REQUEST';
+export const ANTENNA_CREATE_SUCCESS = 'ANTENNA_CREATE_SUCCESS';
+export const ANTENNA_CREATE_FAIL    = 'ANTENNA_CREATE_FAIL';
+
+export const ANTENNA_UPDATE_REQUEST = 'ANTENNA_UPDATE_REQUEST';
+export const ANTENNA_UPDATE_SUCCESS = 'ANTENNA_UPDATE_SUCCESS';
+export const ANTENNA_UPDATE_FAIL    = 'ANTENNA_UPDATE_FAIL';
+
+export const ANTENNA_DELETE_REQUEST = 'ANTENNA_DELETE_REQUEST';
+export const ANTENNA_DELETE_SUCCESS = 'ANTENNA_DELETE_SUCCESS';
+export const ANTENNA_DELETE_FAIL    = 'ANTENNA_DELETE_FAIL';
+
+export const ANTENNA_ACCOUNTS_FETCH_REQUEST = 'ANTENNA_ACCOUNTS_FETCH_REQUEST';
+export const ANTENNA_ACCOUNTS_FETCH_SUCCESS = 'ANTENNA_ACCOUNTS_FETCH_SUCCESS';
+export const ANTENNA_ACCOUNTS_FETCH_FAIL    = 'ANTENNA_ACCOUNTS_FETCH_FAIL';
+
+export const ANTENNA_EDITOR_SUGGESTIONS_CHANGE = 'ANTENNA_EDITOR_SUGGESTIONS_CHANGE';
+export const ANTENNA_EDITOR_SUGGESTIONS_READY  = 'ANTENNA_EDITOR_SUGGESTIONS_READY';
+export const ANTENNA_EDITOR_SUGGESTIONS_CLEAR  = 'ANTENNA_EDITOR_SUGGESTIONS_CLEAR';
+
+export const ANTENNA_EDITOR_ADD_REQUEST = 'ANTENNA_EDITOR_ADD_REQUEST';
+export const ANTENNA_EDITOR_ADD_SUCCESS = 'ANTENNA_EDITOR_ADD_SUCCESS';
+export const ANTENNA_EDITOR_ADD_FAIL    = 'ANTENNA_EDITOR_ADD_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_REQUEST = 'ANTENNA_EDITOR_REMOVE_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_SUCCESS = 'ANTENNA_EDITOR_REMOVE_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_FAIL    = 'ANTENNA_EDITOR_REMOVE_FAIL';
+
+export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST';
+export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS';
+export const ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL    = 'ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL';
+
+export const ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_FAIL    = 'ANTENNA_EDITOR_ADD_EXCLUDE_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL    = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL';
+
+export const ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST = 'ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST';
+export const ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS = 'ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS';
+export const ANTENNA_EDITOR_FETCH_DOMAINS_FAIL    = 'ANTENNA_EDITOR_FETCH_DOMAINS_FAIL';
+
+export const ANTENNA_EDITOR_ADD_DOMAIN_REQUEST = 'ANTENNA_EDITOR_ADD_DOMAIN_REQUEST';
+export const ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS';
+export const ANTENNA_EDITOR_ADD_DOMAIN_FAIL    = 'ANTENNA_EDITOR_ADD_DOMAIN_FAIL';
+
+export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDEDOMAIN_REQUEST';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL    = 'ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL    = 'ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL    = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL';
+
+export const ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST = 'ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST';
+export const ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS = 'ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS';
+export const ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL    = 'ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL';
+
+export const ANTENNA_EDITOR_ADD_KEYWORD_REQUEST = 'ANTENNA_EDITOR_ADD_KEYWORD_REQUEST';
+export const ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS';
+export const ANTENNA_EDITOR_ADD_KEYWORD_FAIL    = 'ANTENNA_EDITOR_ADD_KEYWORD_FAIL';
+
+export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL    = 'ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL    = 'ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL    = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL';
+
+export const ANTENNA_EDITOR_FETCH_TAGS_REQUEST = 'ANTENNA_EDITOR_FETCH_TAGS_REQUEST';
+export const ANTENNA_EDITOR_FETCH_TAGS_SUCCESS = 'ANTENNA_EDITOR_FETCH_TAGS_SUCCESS';
+export const ANTENNA_EDITOR_FETCH_TAGS_FAIL    = 'ANTENNA_EDITOR_FETCH_TAGS_FAIL';
+
+export const ANTENNA_EDITOR_ADD_TAG_REQUEST = 'ANTENNA_EDITOR_ADD_TAG_REQUEST';
+export const ANTENNA_EDITOR_ADD_TAG_SUCCESS = 'ANTENNA_EDITOR_ADD_TAG_SUCCESS';
+export const ANTENNA_EDITOR_ADD_TAG_FAIL    = 'ANTENNA_EDITOR_ADD_TAG_FAIL';
+
+export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS';
+export const ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL    = 'ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_TAG_REQUEST = 'ANTENNA_EDITOR_REMOVE_TAG_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_TAG_SUCCESS = 'ANTENNA_EDITOR_REMOVE_TAG_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_TAG_FAIL    = 'ANTENNA_EDITOR_REMOVE_TAG_FAIL';
+
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS';
+export const ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL    = 'ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL';
+
+export const ANTENNA_ADDER_RESET = 'ANTENNA_ADDER_RESET';
+export const ANTENNA_ADDER_SETUP = 'ANTENNA_ADDER_SETUP';
+
+export const ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST = 'ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST';
+export const ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS = 'ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS';
+export const ANTENNA_ADDER_ANTENNAS_FETCH_FAIL    = 'ANTENNA_ADDER_ANTENNAS_FETCH_FAIL';
+
+export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST';
+export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS';
+export const ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL    = 'ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL';
+
+export const fetchAntenna = id => (dispatch, getState) => {
+  if (getState().getIn(['antennas', id])) {
+    return;
+  }
+
+  dispatch(fetchAntennaRequest(id));
+
+  api(getState).get(`/api/v1/antennas/${id}`)
+    .then(({ data }) => dispatch(fetchAntennaSuccess(data)))
+    .catch(err => dispatch(fetchAntennaFail(id, err)));
+};
+
+export const fetchAntennaRequest = id => ({
+  type: ANTENNA_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAntennaSuccess = antenna => ({
+  type: ANTENNA_FETCH_SUCCESS,
+  antenna,
+});
+
+export const fetchAntennaFail = (id, error) => ({
+  type: ANTENNA_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchAntennas = () => (dispatch, getState) => {
+  dispatch(fetchAntennasRequest());
+
+  api(getState).get('/api/v1/antennas')
+    .then(({ data }) => dispatch(fetchAntennasSuccess(data)))
+    .catch(err => dispatch(fetchAntennasFail(err)));
+};
+
+export const fetchAntennasRequest = () => ({
+  type: ANTENNAS_FETCH_REQUEST,
+});
+
+export const fetchAntennasSuccess = antennas => ({
+  type: ANTENNAS_FETCH_SUCCESS,
+  antennas,
+});
+
+export const fetchAntennasFail = error => ({
+  type: ANTENNAS_FETCH_FAIL,
+  error,
+});
+
+export const submitAntennaEditor = shouldReset => (dispatch, getState) => {
+  const antennaId = getState().getIn(['antennaEditor', 'antennaId']);
+  const title  = getState().getIn(['antennaEditor', 'title']);
+
+  if (antennaId === null) {
+    dispatch(createAntenna(title, shouldReset));
+  } else {
+    dispatch(updateAntenna(antennaId, title, shouldReset));
+  }
+};
+
+export const setupAntennaEditor = antennaId => (dispatch, getState) => {
+  dispatch({
+    type: ANTENNA_EDITOR_SETUP,
+    antenna: getState().getIn(['antennas', antennaId]),
+  });
+
+  dispatch(fetchAntennaAccounts(antennaId));
+};
+
+export const setupExcludeAntennaEditor = antennaId => (dispatch, getState) => {
+  dispatch({
+    type: ANTENNA_EDITOR_SETUP,
+    antenna: getState().getIn(['antennas', antennaId]),
+  });
+
+  dispatch(fetchAntennaExcludeAccounts(antennaId));
+};
+
+export const changeAntennaEditorTitle = value => ({
+  type: ANTENNA_EDITOR_TITLE_CHANGE,
+  value,
+});
+
+export const createAntenna = (title, shouldReset) => (dispatch, getState) => {
+  dispatch(createAntennaRequest());
+
+  api(getState).post('/api/v1/antennas', { title }).then(({ data }) => {
+    dispatch(createAntennaSuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetAntennaEditor());
+    }
+  }).catch(err => dispatch(createAntennaFail(err)));
+};
+
+export const createAntennaRequest = () => ({
+  type: ANTENNA_CREATE_REQUEST,
+});
+
+export const createAntennaSuccess = antenna => ({
+  type: ANTENNA_CREATE_SUCCESS,
+  antenna,
+});
+
+export const createAntennaFail = error => ({
+  type: ANTENNA_CREATE_FAIL,
+  error,
+});
+
+export const updateAntenna = (id, title, shouldReset, list_id, stl, ltl, with_media_only, ignore_reblog, insert_feeds) => (dispatch, getState) => {
+  dispatch(updateAntennaRequest(id));
+
+  api(getState).put(`/api/v1/antennas/${id}`, { title, list_id, stl, ltl, with_media_only, ignore_reblog, insert_feeds }).then(({ data }) => {
+    dispatch(updateAntennaSuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetAntennaEditor());
+    }
+  }).catch(err => dispatch(updateAntennaFail(id, err)));
+};
+
+export const updateAntennaRequest = id => ({
+  type: ANTENNA_UPDATE_REQUEST,
+  id,
+});
+
+export const updateAntennaSuccess = antenna => ({
+  type: ANTENNA_UPDATE_SUCCESS,
+  antenna,
+});
+
+export const updateAntennaFail = (id, error) => ({
+  type: ANTENNA_UPDATE_FAIL,
+  id,
+  error,
+});
+
+export const resetAntennaEditor = () => ({
+  type: ANTENNA_EDITOR_RESET,
+});
+
+export const deleteAntenna = id => (dispatch, getState) => {
+  dispatch(deleteAntennaRequest(id));
+
+  api(getState).delete(`/api/v1/antennas/${id}`)
+    .then(() => dispatch(deleteAntennaSuccess(id)))
+    .catch(err => dispatch(deleteAntennaFail(id, err)));
+};
+
+export const deleteAntennaRequest = id => ({
+  type: ANTENNA_DELETE_REQUEST,
+  id,
+});
+
+export const deleteAntennaSuccess = id => ({
+  type: ANTENNA_DELETE_SUCCESS,
+  id,
+});
+
+export const deleteAntennaFail = (id, error) => ({
+  type: ANTENNA_DELETE_FAIL,
+  id,
+  error,
+});
+
+export const fetchAntennaAccounts = antennaId => (dispatch, getState) => {
+  dispatch(fetchAntennaAccountsRequest(antennaId));
+
+  api(getState).get(`/api/v1/antennas/${antennaId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchAntennaAccountsSuccess(antennaId, data));
+  }).catch(err => dispatch(fetchAntennaAccountsFail(antennaId, err)));
+};
+
+export const fetchAntennaAccountsRequest = id => ({
+  type: ANTENNA_ACCOUNTS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAntennaAccountsSuccess = (id, accounts, next) => ({
+  type: ANTENNA_ACCOUNTS_FETCH_SUCCESS,
+  id,
+  accounts,
+  next,
+});
+
+export const fetchAntennaAccountsFail = (id, error) => ({
+  type: ANTENNA_ACCOUNTS_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchAntennaExcludeAccounts = antennaId => (dispatch, getState) => {
+  dispatch(fetchAntennaExcludeAccountsRequest(antennaId));
+
+  api(getState).get(`/api/v1/antennas/${antennaId}/exclude_accounts`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchAntennaExcludeAccountsSuccess(antennaId, data));
+  }).catch(err => dispatch(fetchAntennaExcludeAccountsFail(antennaId, err)));
+};
+
+export const fetchAntennaExcludeAccountsRequest = id => ({
+  type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAntennaExcludeAccountsSuccess = (id, accounts, next) => ({
+  type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS,
+  id,
+  accounts,
+  next,
+});
+
+export const fetchAntennaExcludeAccountsFail = (id, error) => ({
+  type: ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchAntennaSuggestions = q => (dispatch, getState) => {
+  const params = {
+    q,
+    resolve: false,
+  };
+
+  api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchAntennaSuggestionsReady(q, data));
+  }).catch(error => dispatch(showAlertForError(error)));
+};
+
+export const fetchAntennaSuggestionsReady = (query, accounts) => ({
+  type: ANTENNA_EDITOR_SUGGESTIONS_READY,
+  query,
+  accounts,
+});
+
+export const clearAntennaSuggestions = () => ({
+  type: ANTENNA_EDITOR_SUGGESTIONS_CLEAR,
+});
+
+export const changeAntennaSuggestions = value => ({
+  type: ANTENNA_EDITOR_SUGGESTIONS_CHANGE,
+  value,
+});
+
+export const addToAntennaEditor = accountId => (dispatch, getState) => {
+  dispatch(addToAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId));
+};
+
+export const addToAntenna = (antennaId, accountId) => (dispatch, getState) => {
+  dispatch(addToAntennaRequest(antennaId, accountId));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/accounts`, { account_ids: [accountId] })
+    .then(() => dispatch(addToAntennaSuccess(antennaId, accountId)))
+    .catch(err => dispatch(addToAntennaFail(antennaId, accountId, err)));
+};
+
+export const addToAntennaRequest = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_ADD_REQUEST,
+  antennaId,
+  accountId,
+});
+
+export const addToAntennaSuccess = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_ADD_SUCCESS,
+  antennaId,
+  accountId,
+});
+
+export const addToAntennaFail = (antennaId, accountId, error) => ({
+  type: ANTENNA_EDITOR_ADD_FAIL,
+  antennaId,
+  accountId,
+  error,
+});
+
+export const addExcludeToAntennaEditor = accountId => (dispatch, getState) => {
+  dispatch(addExcludeToAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId));
+};
+
+export const addExcludeToAntenna = (antennaId, accountId) => (dispatch, getState) => {
+  dispatch(addExcludeToAntennaRequest(antennaId, accountId));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/exclude_accounts`, { account_ids: [accountId] })
+    .then(() => dispatch(addExcludeToAntennaSuccess(antennaId, accountId)))
+    .catch(err => dispatch(addExcludeToAntennaFail(antennaId, accountId, err)));
+};
+
+export const addExcludeToAntennaRequest = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_REQUEST,
+  antennaId,
+  accountId,
+});
+
+export const addExcludeToAntennaSuccess = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS,
+  antennaId,
+  accountId,
+});
+
+export const addExcludeToAntennaFail = (antennaId, accountId, error) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_FAIL,
+  antennaId,
+  accountId,
+  error,
+});
+
+export const removeFromAntennaEditor = accountId => (dispatch, getState) => {
+  dispatch(removeFromAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId));
+};
+
+export const removeFromAntenna = (antennaId, accountId) => (dispatch, getState) => {
+  dispatch(removeFromAntennaRequest(antennaId, accountId));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/accounts`, { params: { account_ids: [accountId] } })
+    .then(() => dispatch(removeFromAntennaSuccess(antennaId, accountId)))
+    .catch(err => dispatch(removeFromAntennaFail(antennaId, accountId, err)));
+};
+
+export const removeFromAntennaRequest = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_REMOVE_REQUEST,
+  antennaId,
+  accountId,
+});
+
+export const removeFromAntennaSuccess = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_REMOVE_SUCCESS,
+  antennaId,
+  accountId,
+});
+
+export const removeFromAntennaFail = (antennaId, accountId, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_FAIL,
+  antennaId,
+  accountId,
+  error,
+});
+
+export const removeExcludeFromAntennaEditor = accountId => (dispatch, getState) => {
+  dispatch(removeExcludeFromAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId));
+};
+
+export const removeExcludeFromAntenna = (antennaId, accountId) => (dispatch, getState) => {
+  dispatch(removeExcludeFromAntennaRequest(antennaId, accountId));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_accounts`, { params: { account_ids: [accountId] } })
+    .then(() => dispatch(removeExcludeFromAntennaSuccess(antennaId, accountId)))
+    .catch(err => dispatch(removeExcludeFromAntennaFail(antennaId, accountId, err)));
+};
+
+export const removeExcludeFromAntennaRequest = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_REQUEST,
+  antennaId,
+  accountId,
+});
+
+export const removeExcludeFromAntennaSuccess = (antennaId, accountId) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS,
+  antennaId,
+  accountId,
+});
+
+export const removeExcludeFromAntennaFail = (antennaId, accountId, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_FAIL,
+  antennaId,
+  accountId,
+  error,
+});
+
+export const fetchAntennaDomains = antennaId => (dispatch, getState) => {
+  dispatch(fetchAntennaDomainsRequest(antennaId));
+
+  api(getState).get(`/api/v1/antennas/${antennaId}/domains`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(fetchAntennaDomainsSuccess(antennaId, data));
+  }).catch(err => dispatch(fetchAntennaDomainsFail(antennaId, err)));
+};
+
+export const fetchAntennaDomainsRequest = id => ({
+  type: ANTENNA_EDITOR_FETCH_DOMAINS_REQUEST,
+  id,
+});
+
+export const fetchAntennaDomainsSuccess = (id, domains) => ({
+  type: ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS,
+  id,
+  domains,
+});
+
+export const fetchAntennaDomainsFail = (id, error) => ({
+  type: ANTENNA_EDITOR_FETCH_DOMAINS_FAIL,
+  id,
+  error,
+});
+
+export const addDomainToAntenna = (antennaId, domain) => (dispatch, getState) => {
+  dispatch(addDomainToAntennaRequest(antennaId, domain));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/domains`, { domains: [domain] })
+    .then(() => dispatch(addDomainToAntennaSuccess(antennaId, domain)))
+    .catch(err => dispatch(addDomainToAntennaFail(antennaId, domain, err)));
+};
+
+export const addDomainToAntennaRequest = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_ADD_DOMAIN_REQUEST,
+  antennaId,
+  domain,
+});
+
+export const addDomainToAntennaSuccess = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS,
+  antennaId,
+  domain,
+});
+
+export const addDomainToAntennaFail = (antennaId, domain, error) => ({
+  type: ANTENNA_EDITOR_ADD_DOMAIN_FAIL,
+  antennaId,
+  domain,
+  error,
+});
+
+export const removeDomainFromAntenna = (antennaId, domain) => (dispatch, getState) => {
+  dispatch(removeDomainFromAntennaRequest(antennaId, domain));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/domains`, { params: { domains: [domain] } })
+    .then(() => dispatch(removeDomainFromAntennaSuccess(antennaId, domain)))
+    .catch(err => dispatch(removeDomainFromAntennaFail(antennaId, domain, err)));
+};
+
+export const removeDomainFromAntennaRequest = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_REMOVE_DOMAIN_REQUEST,
+  antennaId,
+  domain,
+});
+
+export const removeDomainFromAntennaSuccess = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS,
+  antennaId,
+  domain,
+});
+
+export const removeDomainFromAntennaFail = (antennaId, domain, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_DOMAIN_FAIL,
+  antennaId,
+  domain,
+  error,
+});
+
+export const addExcludeDomainToAntenna = (antennaId, domain) => (dispatch, getState) => {
+  dispatch(addExcludeDomainToAntennaRequest(antennaId, domain));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/exclude_domains`, { domains: [domain] })
+    .then(() => dispatch(addExcludeDomainToAntennaSuccess(antennaId, domain)))
+    .catch(err => dispatch(addExcludeDomainToAntennaFail(antennaId, domain, err)));
+};
+
+export const addExcludeDomainToAntennaRequest = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_REQUEST,
+  antennaId,
+  domain,
+});
+
+export const addExcludeDomainToAntennaSuccess = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS,
+  antennaId,
+  domain,
+});
+
+export const addExcludeDomainToAntennaFail = (antennaId, domain, error) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_FAIL,
+  antennaId,
+  domain,
+  error,
+});
+
+export const removeExcludeDomainFromAntenna = (antennaId, domain) => (dispatch, getState) => {
+  dispatch(removeExcludeDomainFromAntennaRequest(antennaId, domain));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_domains`, { params: { domains: [domain] } })
+    .then(() => dispatch(removeExcludeDomainFromAntennaSuccess(antennaId, domain)))
+    .catch(err => dispatch(removeExcludeDomainFromAntennaFail(antennaId, domain, err)));
+};
+
+export const removeExcludeDomainFromAntennaRequest = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_REQUEST,
+  antennaId,
+  domain,
+});
+
+export const removeExcludeDomainFromAntennaSuccess = (antennaId, domain) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS,
+  antennaId,
+  domain,
+});
+
+export const removeExcludeDomainFromAntennaFail = (antennaId, domain, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_FAIL,
+  antennaId,
+  domain,
+  error,
+});
+
+export const fetchAntennaKeywords = antennaId => (dispatch, getState) => {
+  dispatch(fetchAntennaKeywordsRequest(antennaId));
+
+  api(getState).get(`/api/v1/antennas/${antennaId}/keywords`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(fetchAntennaKeywordsSuccess(antennaId, data));
+  }).catch(err => dispatch(fetchAntennaKeywordsFail(antennaId, err)));
+};
+
+export const fetchAntennaKeywordsRequest = id => ({
+  type: ANTENNA_EDITOR_FETCH_KEYWORDS_REQUEST,
+  id,
+});
+
+export const fetchAntennaKeywordsSuccess = (id, keywords) => ({
+  type: ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS,
+  id,
+  keywords,
+});
+
+export const fetchAntennaKeywordsFail = (id, error) => ({
+  type: ANTENNA_EDITOR_FETCH_KEYWORDS_FAIL,
+  id,
+  error,
+});
+
+export const addKeywordToAntenna = (antennaId, keyword) => (dispatch, getState) => {
+  dispatch(addKeywordToAntennaRequest(antennaId, keyword));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/keywords`, { keywords: [keyword] })
+    .then(() => dispatch(addKeywordToAntennaSuccess(antennaId, keyword)))
+    .catch(err => dispatch(addKeywordToAntennaFail(antennaId, keyword, err)));
+};
+
+export const addKeywordToAntennaRequest = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_ADD_KEYWORD_REQUEST,
+  antennaId,
+  keyword,
+});
+
+export const addKeywordToAntennaSuccess = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS,
+  antennaId,
+  keyword,
+});
+
+export const addKeywordToAntennaFail = (antennaId, keyword, error) => ({
+  type: ANTENNA_EDITOR_ADD_KEYWORD_FAIL,
+  antennaId,
+  keyword,
+  error,
+});
+
+export const removeKeywordFromAntenna = (antennaId, keyword) => (dispatch, getState) => {
+  dispatch(removeKeywordFromAntennaRequest(antennaId, keyword));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/keywords`, { params: { keywords: [keyword] } })
+    .then(() => dispatch(removeKeywordFromAntennaSuccess(antennaId, keyword)))
+    .catch(err => dispatch(removeKeywordFromAntennaFail(antennaId, keyword, err)));
+};
+
+export const removeKeywordFromAntennaRequest = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_REMOVE_KEYWORD_REQUEST,
+  antennaId,
+  keyword,
+});
+
+export const removeKeywordFromAntennaSuccess = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS,
+  antennaId,
+  keyword,
+});
+
+export const removeKeywordFromAntennaFail = (antennaId, keyword, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_KEYWORD_FAIL,
+  antennaId,
+  keyword,
+  error,
+});
+
+export const addExcludeKeywordToAntenna = (antennaId, keyword) => (dispatch, getState) => {
+  dispatch(addExcludeKeywordToAntennaRequest(antennaId, keyword));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/exclude_keywords`, { keywords: [keyword] })
+    .then(() => dispatch(addExcludeKeywordToAntennaSuccess(antennaId, keyword)))
+    .catch(err => dispatch(addExcludeKeywordToAntennaFail(antennaId, keyword, err)));
+};
+
+export const addExcludeKeywordToAntennaRequest = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_REQUEST,
+  antennaId,
+  keyword,
+});
+
+export const addExcludeKeywordToAntennaSuccess = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS,
+  antennaId,
+  keyword,
+});
+
+export const addExcludeKeywordToAntennaFail = (antennaId, keyword, error) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_FAIL,
+  antennaId,
+  keyword,
+  error,
+});
+
+export const removeExcludeKeywordFromAntenna = (antennaId, keyword) => (dispatch, getState) => {
+  dispatch(removeExcludeKeywordFromAntennaRequest(antennaId, keyword));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_keywords`, { params: { keywords: [keyword] } })
+    .then(() => dispatch(removeExcludeKeywordFromAntennaSuccess(antennaId, keyword)))
+    .catch(err => dispatch(removeExcludeKeywordFromAntennaFail(antennaId, keyword, err)));
+};
+
+export const removeExcludeKeywordFromAntennaRequest = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_REQUEST,
+  antennaId,
+  keyword,
+});
+
+export const removeExcludeKeywordFromAntennaSuccess = (antennaId, keyword) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS,
+  antennaId,
+  keyword,
+});
+
+export const removeExcludeKeywordFromAntennaFail = (antennaId, keyword, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_FAIL,
+  antennaId,
+  keyword,
+  error,
+});
+
+export const fetchAntennaTags = antennaId => (dispatch, getState) => {
+  dispatch(fetchAntennaTagsRequest(antennaId));
+
+  api(getState).get(`/api/v1/antennas/${antennaId}/tags`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(fetchAntennaTagsSuccess(antennaId, data));
+  }).catch(err => dispatch(fetchAntennaTagsFail(antennaId, err)));
+};
+
+export const fetchAntennaTagsRequest = id => ({
+  type: ANTENNA_EDITOR_FETCH_TAGS_REQUEST,
+  id,
+});
+
+export const fetchAntennaTagsSuccess = (id, tags) => ({
+  type: ANTENNA_EDITOR_FETCH_TAGS_SUCCESS,
+  id,
+  tags,
+});
+
+export const fetchAntennaTagsFail = (id, error) => ({
+  type: ANTENNA_EDITOR_FETCH_TAGS_FAIL,
+  id,
+  error,
+});
+
+export const addTagToAntenna = (antennaId, tag) => (dispatch, getState) => {
+  dispatch(addTagToAntennaRequest(antennaId, tag));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/tags`, { tags: [tag] })
+    .then(() => dispatch(addTagToAntennaSuccess(antennaId, tag)))
+    .catch(err => dispatch(addTagToAntennaFail(antennaId, tag, err)));
+};
+
+export const addTagToAntennaRequest = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_ADD_TAG_REQUEST,
+  antennaId,
+  tag,
+});
+
+export const addTagToAntennaSuccess = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_ADD_TAG_SUCCESS,
+  antennaId,
+  tag,
+});
+
+export const addTagToAntennaFail = (antennaId, tag, error) => ({
+  type: ANTENNA_EDITOR_ADD_TAG_FAIL,
+  antennaId,
+  tag,
+  error,
+});
+
+export const removeTagFromAntenna = (antennaId, tag) => (dispatch, getState) => {
+  dispatch(removeTagFromAntennaRequest(antennaId, tag));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/tags`, { params: { tags: [tag] } })
+    .then(() => dispatch(removeTagFromAntennaSuccess(antennaId, tag)))
+    .catch(err => dispatch(removeTagFromAntennaFail(antennaId, tag, err)));
+};
+
+export const removeTagFromAntennaRequest = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_REMOVE_TAG_REQUEST,
+  antennaId,
+  tag,
+});
+
+export const removeTagFromAntennaSuccess = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_REMOVE_TAG_SUCCESS,
+  antennaId,
+  tag,
+});
+
+export const removeTagFromAntennaFail = (antennaId, tag, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_TAG_FAIL,
+  antennaId,
+  tag,
+  error,
+});
+
+export const addExcludeTagToAntenna = (antennaId, tag) => (dispatch, getState) => {
+  dispatch(addExcludeTagToAntennaRequest(antennaId, tag));
+
+  api(getState).post(`/api/v1/antennas/${antennaId}/exclude_tags`, { tags: [tag] })
+    .then(() => dispatch(addExcludeTagToAntennaSuccess(antennaId, tag)))
+    .catch(err => dispatch(addExcludeTagToAntennaFail(antennaId, tag, err)));
+};
+
+export const addExcludeTagToAntennaRequest = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_REQUEST,
+  antennaId,
+  tag,
+});
+
+export const addExcludeTagToAntennaSuccess = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS,
+  antennaId,
+  tag,
+});
+
+export const addExcludeTagToAntennaFail = (antennaId, tag, error) => ({
+  type: ANTENNA_EDITOR_ADD_EXCLUDE_TAG_FAIL,
+  antennaId,
+  tag,
+  error,
+});
+
+export const removeExcludeTagFromAntenna = (antennaId, tag) => (dispatch, getState) => {
+  dispatch(removeExcludeTagFromAntennaRequest(antennaId, tag));
+
+  api(getState).delete(`/api/v1/antennas/${antennaId}/exclude_tags`, { params: { tags: [tag] } })
+    .then(() => dispatch(removeExcludeTagFromAntennaSuccess(antennaId, tag)))
+    .catch(err => dispatch(removeExcludeTagFromAntennaFail(antennaId, tag, err)));
+};
+
+export const removeExcludeTagFromAntennaRequest = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_REQUEST,
+  antennaId,
+  tag,
+});
+
+export const removeExcludeTagFromAntennaSuccess = (antennaId, tag) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS,
+  antennaId,
+  tag,
+});
+
+export const removeExcludeTagFromAntennaFail = (antennaId, tag, error) => ({
+  type: ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_FAIL,
+  antennaId,
+  tag,
+  error,
+});
+
+export const resetAntennaAdder = () => ({
+  type: ANTENNA_ADDER_RESET,
+});
+
+export const setupAntennaAdder = accountId => (dispatch, getState) => {
+  dispatch({
+    type: ANTENNA_ADDER_SETUP,
+    account: getState().getIn(['accounts', accountId]),
+  });
+  dispatch(fetchAntennas());
+  dispatch(fetchAccountAntennas(accountId));
+};
+
+export const setupExcludeAntennaAdder = accountId => (dispatch, getState) => {
+  dispatch({
+    type: ANTENNA_ADDER_SETUP,
+    account: getState().getIn(['accounts', accountId]),
+  });
+  dispatch(fetchAntennas());
+  dispatch(fetchExcludeAccountAntennas(accountId));
+};
+
+export const fetchAccountAntennas = accountId => (dispatch, getState) => {
+  dispatch(fetchAccountAntennasRequest(accountId));
+
+  api(getState).get(`/api/v1/accounts/${accountId}/antennas`)
+    .then(({ data }) => dispatch(fetchAccountAntennasSuccess(accountId, data)))
+    .catch(err => dispatch(fetchAccountAntennasFail(accountId, err)));
+};
+
+export const fetchAccountAntennasRequest = id => ({
+  type:ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAccountAntennasSuccess = (id, antennas) => ({
+  type: ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS,
+  id,
+  antennas,
+});
+
+export const fetchAccountAntennasFail = (id, err) => ({
+  type: ANTENNA_ADDER_ANTENNAS_FETCH_FAIL,
+  id,
+  err,
+});
+
+export const fetchExcludeAccountAntennas = accountId => (dispatch, getState) => {
+  dispatch(fetchExcludeAccountAntennasRequest(accountId));
+
+  api(getState).get(`/api/v1/accounts/${accountId}/exclude_antennas`)
+    .then(({ data }) => dispatch(fetchExcludeAccountAntennasSuccess(accountId, data)))
+    .catch(err => dispatch(fetchExcludeAccountAntennasFail(accountId, err)));
+};
+
+export const fetchExcludeAccountAntennasRequest = id => ({
+  type:ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchExcludeAccountAntennasSuccess = (id, antennas) => ({
+  type: ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS,
+  id,
+  antennas,
+});
+
+export const fetchExcludeAccountAntennasFail = (id, err) => ({
+  type: ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL,
+  id,
+  err,
+});
+
+export const addToAntennaAdder = antennaId => (dispatch, getState) => {
+  dispatch(addToAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId'])));
+};
+
+export const removeFromAntennaAdder = antennaId => (dispatch, getState) => {
+  dispatch(removeFromAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId'])));
+};
+
+export const addExcludeToAntennaAdder = antennaId => (dispatch, getState) => {
+  dispatch(addExcludeToAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId'])));
+};
+
+export const removeExcludeFromAntennaAdder = antennaId => (dispatch, getState) => {
+  dispatch(removeExcludeFromAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId'])));
+};
+
diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index e293657ad3..54296d0905 100644
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -12,8 +12,6 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
 export function fetchBlocks() {
   return (dispatch, getState) => {
     dispatch(fetchBlocksRequest());
@@ -90,11 +88,12 @@ export function expandBlocksFail(error) {
 
 export function initBlockModal(account) {
   return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
+    dispatch(openModal({
+      modalType: 'BLOCK',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/mastodon/actions/bookmark_categories.js b/app/javascript/mastodon/actions/bookmark_categories.js
new file mode 100644
index 0000000000..7d458b85ec
--- /dev/null
+++ b/app/javascript/mastodon/actions/bookmark_categories.js
@@ -0,0 +1,394 @@
+import { bookmarkCategoryNeeded } from 'mastodon/initial_state';
+import { makeGetStatus } from 'mastodon/selectors';
+
+import api, { getLinks } from '../api';
+
+import { importFetchedStatuses } from './importer';
+import { unbookmark } from './interactions';
+
+export const BOOKMARK_CATEGORY_FETCH_REQUEST = 'BOOKMARK_CATEGORY_FETCH_REQUEST';
+export const BOOKMARK_CATEGORY_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_FETCH_SUCCESS';
+export const BOOKMARK_CATEGORY_FETCH_FAIL    = 'BOOKMARK_CATEGORY_FETCH_FAIL';
+
+export const BOOKMARK_CATEGORIES_FETCH_REQUEST = 'BOOKMARK_CATEGORIES_FETCH_REQUEST';
+export const BOOKMARK_CATEGORIES_FETCH_SUCCESS = 'BOOKMARK_CATEGORIES_FETCH_SUCCESS';
+export const BOOKMARK_CATEGORIES_FETCH_FAIL    = 'BOOKMARK_CATEGORIES_FETCH_FAIL';
+
+export const BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE = 'BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE';
+export const BOOKMARK_CATEGORY_EDITOR_RESET        = 'BOOKMARK_CATEGORY_EDITOR_RESET';
+export const BOOKMARK_CATEGORY_EDITOR_SETUP        = 'BOOKMARK_CATEGORY_EDITOR_SETUP';
+
+export const BOOKMARK_CATEGORY_CREATE_REQUEST = 'BOOKMARK_CATEGORY_CREATE_REQUEST';
+export const BOOKMARK_CATEGORY_CREATE_SUCCESS = 'BOOKMARK_CATEGORY_CREATE_SUCCESS';
+export const BOOKMARK_CATEGORY_CREATE_FAIL    = 'BOOKMARK_CATEGORY_CREATE_FAIL';
+
+export const BOOKMARK_CATEGORY_UPDATE_REQUEST = 'BOOKMARK_CATEGORY_UPDATE_REQUEST';
+export const BOOKMARK_CATEGORY_UPDATE_SUCCESS = 'BOOKMARK_CATEGORY_UPDATE_SUCCESS';
+export const BOOKMARK_CATEGORY_UPDATE_FAIL    = 'BOOKMARK_CATEGORY_UPDATE_FAIL';
+
+export const BOOKMARK_CATEGORY_DELETE_REQUEST = 'BOOKMARK_CATEGORY_DELETE_REQUEST';
+export const BOOKMARK_CATEGORY_DELETE_SUCCESS = 'BOOKMARK_CATEGORY_DELETE_SUCCESS';
+export const BOOKMARK_CATEGORY_DELETE_FAIL    = 'BOOKMARK_CATEGORY_DELETE_FAIL';
+
+export const BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST = 'BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST';
+export const BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS';
+export const BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL    = 'BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL';
+
+export const BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST = 'BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST';
+export const BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS';
+export const BOOKMARK_CATEGORY_EDITOR_ADD_FAIL    = 'BOOKMARK_CATEGORY_EDITOR_ADD_FAIL';
+
+export const BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST';
+export const BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS';
+export const BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL    = 'BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL';
+
+export const BOOKMARK_CATEGORY_ADDER_RESET = 'BOOKMARK_CATEGORY_ADDER_RESET';
+export const BOOKMARK_CATEGORY_ADDER_SETUP = 'BOOKMARK_CATEGORY_ADDER_SETUP';
+
+export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST';
+export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS';
+export const BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL    = 'BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL';
+
+export const BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST';
+export const BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS';
+export const BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL    = 'BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL';
+
+export const fetchBookmarkCategory = id => (dispatch, getState) => {
+  if (getState().getIn(['bookmark_categories', id])) {
+    return;
+  }
+
+  dispatch(fetchBookmarkCategoryRequest(id));
+
+  api(getState).get(`/api/v1/bookmark_categories/${id}`)
+    .then(({ data }) => dispatch(fetchBookmarkCategorySuccess(data)))
+    .catch(err => dispatch(fetchBookmarkCategoryFail(id, err)));
+};
+
+export const fetchBookmarkCategoryRequest = id => ({
+  type: BOOKMARK_CATEGORY_FETCH_REQUEST,
+  id,
+});
+
+export const fetchBookmarkCategorySuccess = bookmarkCategory => ({
+  type: BOOKMARK_CATEGORY_FETCH_SUCCESS,
+  bookmarkCategory,
+});
+
+export const fetchBookmarkCategoryFail = (id, error) => ({
+  type: BOOKMARK_CATEGORY_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchBookmarkCategories = () => (dispatch, getState) => {
+  dispatch(fetchBookmarkCategoriesRequest());
+
+  api(getState).get('/api/v1/bookmark_categories')
+    .then(({ data }) => dispatch(fetchBookmarkCategoriesSuccess(data)))
+    .catch(err => dispatch(fetchBookmarkCategoriesFail(err)));
+};
+
+export const fetchBookmarkCategoriesRequest = () => ({
+  type: BOOKMARK_CATEGORIES_FETCH_REQUEST,
+});
+
+export const fetchBookmarkCategoriesSuccess = bookmarkCategories => ({
+  type: BOOKMARK_CATEGORIES_FETCH_SUCCESS,
+  bookmarkCategories,
+});
+
+export const fetchBookmarkCategoriesFail = error => ({
+  type: BOOKMARK_CATEGORIES_FETCH_FAIL,
+  error,
+});
+
+export const submitBookmarkCategoryEditor = shouldReset => (dispatch, getState) => {
+  const bookmarkCategoryId = getState().getIn(['bookmarkCategoryEditor', 'bookmarkCategoryId']);
+  const title  = getState().getIn(['bookmarkCategoryEditor', 'title']);
+
+  if (bookmarkCategoryId === null) {
+    dispatch(createBookmarkCategory(title, shouldReset));
+  } else {
+    dispatch(updateBookmarkCategory(bookmarkCategoryId, title, shouldReset));
+  }
+};
+
+export const setupBookmarkCategoryEditor = bookmarkCategoryId => (dispatch, getState) => {
+  dispatch({
+    type: BOOKMARK_CATEGORY_EDITOR_SETUP,
+    bookmarkCategory: getState().getIn(['bookmark_categories', bookmarkCategoryId]),
+  });
+
+  dispatch(fetchBookmarkCategoryStatuses(bookmarkCategoryId));
+};
+
+export const changeBookmarkCategoryEditorTitle = value => ({
+  type: BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE,
+  value,
+});
+
+export const createBookmarkCategory = (title, shouldReset) => (dispatch, getState) => {
+  dispatch(createBookmarkCategoryRequest());
+
+  api(getState).post('/api/v1/bookmark_categories', { title }).then(({ data }) => {
+    dispatch(createBookmarkCategorySuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetBookmarkCategoryEditor());
+    }
+  }).catch(err => dispatch(createBookmarkCategoryFail(err)));
+};
+
+export const createBookmarkCategoryRequest = () => ({
+  type: BOOKMARK_CATEGORY_CREATE_REQUEST,
+});
+
+export const createBookmarkCategorySuccess = bookmarkCategory => ({
+  type: BOOKMARK_CATEGORY_CREATE_SUCCESS,
+  bookmarkCategory,
+});
+
+export const createBookmarkCategoryFail = error => ({
+  type: BOOKMARK_CATEGORY_CREATE_FAIL,
+  error,
+});
+
+export const updateBookmarkCategory = (id, title, shouldReset) => (dispatch, getState) => {
+  dispatch(updateBookmarkCategoryRequest(id));
+
+  api(getState).put(`/api/v1/bookmark_categories/${id}`, { title }).then(({ data }) => {
+    dispatch(updateBookmarkCategorySuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetBookmarkCategoryEditor());
+    }
+  }).catch(err => dispatch(updateBookmarkCategoryFail(id, err)));
+};
+
+export const updateBookmarkCategoryRequest = id => ({
+  type: BOOKMARK_CATEGORY_UPDATE_REQUEST,
+  id,
+});
+
+export const updateBookmarkCategorySuccess = bookmarkCategory => ({
+  type: BOOKMARK_CATEGORY_UPDATE_SUCCESS,
+  bookmarkCategory,
+});
+
+export const updateBookmarkCategoryFail = (id, error) => ({
+  type: BOOKMARK_CATEGORY_UPDATE_FAIL,
+  id,
+  error,
+});
+
+export const resetBookmarkCategoryEditor = () => ({
+  type: BOOKMARK_CATEGORY_EDITOR_RESET,
+});
+
+export const deleteBookmarkCategory = id => (dispatch, getState) => {
+  dispatch(deleteBookmarkCategoryRequest(id));
+
+  api(getState).delete(`/api/v1/bookmark_categories/${id}`)
+    .then(() => dispatch(deleteBookmarkCategorySuccess(id)))
+    .catch(err => dispatch(deleteBookmarkCategoryFail(id, err)));
+};
+
+export const deleteBookmarkCategoryRequest = id => ({
+  type: BOOKMARK_CATEGORY_DELETE_REQUEST,
+  id,
+});
+
+export const deleteBookmarkCategorySuccess = id => ({
+  type: BOOKMARK_CATEGORY_DELETE_SUCCESS,
+  id,
+});
+
+export const deleteBookmarkCategoryFail = (id, error) => ({
+  type: BOOKMARK_CATEGORY_DELETE_FAIL,
+  id,
+  error,
+});
+
+export const fetchBookmarkCategoryStatuses = bookmarkCategoryId => (dispatch, getState) => {
+  dispatch(fetchBookmarkCategoryStatusesRequest(bookmarkCategoryId));
+
+  api(getState).get(`/api/v1/bookmark_categories/${bookmarkCategoryId}/statuses`).then((response) => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedStatuses(response.data));
+    dispatch(fetchBookmarkCategoryStatusesSuccess(bookmarkCategoryId, response.data, next ? next.uri : null));
+  }).catch(err => dispatch(fetchBookmarkCategoryStatusesFail(bookmarkCategoryId, err)));
+};
+
+export const fetchBookmarkCategoryStatusesRequest = id => ({
+  type: BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST,
+  id,
+});
+
+export const fetchBookmarkCategoryStatusesSuccess = (id, statuses, next) => ({
+  type: BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS,
+  id,
+  statuses,
+  next,
+});
+
+export const fetchBookmarkCategoryStatusesFail = (id, error) => ({
+  type: BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const addToBookmarkCategory = (bookmarkCategoryId, statusId) => (dispatch, getState) => {
+  dispatch(addToBookmarkCategoryRequest(bookmarkCategoryId, statusId));
+
+  api(getState).post(`/api/v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { status_ids: [statusId] })
+    .then(() => dispatch(addToBookmarkCategorySuccess(bookmarkCategoryId, statusId)))
+    .catch(err => dispatch(addToBookmarkCategoryFail(bookmarkCategoryId, statusId, err)));
+};
+
+export const addToBookmarkCategoryRequest = (bookmarkCategoryId, statusId) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST,
+  bookmarkCategoryId,
+  statusId,
+});
+
+export const addToBookmarkCategorySuccess = (bookmarkCategoryId, statusId) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS,
+  bookmarkCategoryId,
+  statusId,
+});
+
+export const addToBookmarkCategoryFail = (bookmarkCategoryId, statusId, error) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_ADD_FAIL,
+  bookmarkCategoryId,
+  statusId,
+  error,
+});
+
+export const removeFromBookmarkCategory = (bookmarkCategoryId, statusId) => (dispatch, getState) => {
+  dispatch(removeFromBookmarkCategoryRequest(bookmarkCategoryId, statusId));
+
+  api(getState).delete(`/api/v1/bookmark_categories/${bookmarkCategoryId}/statuses`, { params: { status_ids: [statusId] } })
+    .then(() => dispatch(removeFromBookmarkCategorySuccess(bookmarkCategoryId, statusId)))
+    .catch(err => dispatch(removeFromBookmarkCategoryFail(bookmarkCategoryId, statusId, err)));
+};
+
+export const removeFromBookmarkCategoryRequest = (bookmarkCategoryId, statusId) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_REMOVE_REQUEST,
+  bookmarkCategoryId,
+  statusId,
+});
+
+export const removeFromBookmarkCategorySuccess = (bookmarkCategoryId, statusId) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS,
+  bookmarkCategoryId,
+  statusId,
+});
+
+export const removeFromBookmarkCategoryFail = (bookmarkCategoryId, statusId, error) => ({
+  type: BOOKMARK_CATEGORY_EDITOR_REMOVE_FAIL,
+  bookmarkCategoryId,
+  statusId,
+  error,
+});
+
+export const resetBookmarkCategoryAdder = () => ({
+  type: BOOKMARK_CATEGORY_ADDER_RESET,
+});
+
+export const setupBookmarkCategoryAdder = statusId => (dispatch, getState) => {
+  dispatch({
+    type: BOOKMARK_CATEGORY_ADDER_SETUP,
+    status: getState().getIn(['statuses', statusId]),
+  });
+  dispatch(fetchBookmarkCategories());
+  dispatch(fetchStatusBookmarkCategories(statusId));
+};
+
+export const fetchStatusBookmarkCategories = statusId => (dispatch, getState) => {
+  dispatch(fetchStatusBookmarkCategoriesRequest(statusId));
+
+  api(getState).get(`/api/v1/statuses/${statusId}/bookmark_categories`)
+    .then(({ data }) => dispatch(fetchStatusBookmarkCategoriesSuccess(statusId, data)))
+    .catch(err => dispatch(fetchStatusBookmarkCategoriesFail(statusId, err)));
+};
+
+export const fetchStatusBookmarkCategoriesRequest = id => ({
+  type:BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST,
+  id,
+});
+
+export const fetchStatusBookmarkCategoriesSuccess = (id, bookmarkCategories) => ({
+  type: BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS,
+  id,
+  bookmarkCategories,
+});
+
+export const fetchStatusBookmarkCategoriesFail = (id, err) => ({
+  type: BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL,
+  id,
+  err,
+});
+
+export const addToBookmarkCategoryAdder = bookmarkCategoryId => (dispatch, getState) => {
+  dispatch(addToBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId'])));
+};
+
+export const removeFromBookmarkCategoryAdder = bookmarkCategoryId => (dispatch, getState) => {
+  if (bookmarkCategoryNeeded) {
+    const categories = getState().getIn(['bookmarkCategoryAdder', 'bookmarkCategories', 'items']);
+    if (categories && categories.count() <= 1) {
+      const status = makeGetStatus()(getState(), { id: getState().getIn(['bookmarkCategoryAdder', 'statusId']) });
+      dispatch(unbookmark(status));
+    } else {
+      dispatch(removeFromBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId'])));
+    }
+  } else {
+    dispatch(removeFromBookmarkCategory(bookmarkCategoryId, getState().getIn(['bookmarkCategoryAdder', 'statusId'])));
+  }
+};
+
+export function expandBookmarkCategoryStatuses(bookmarkCategoryId) {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['bookmark_categories', bookmarkCategoryId, 'next'], null);
+
+    if (url === null || getState().getIn(['bookmark_categories', bookmarkCategoryId, 'isLoading'])) {
+      return;
+    }
+
+    dispatch(expandBookmarkCategoryStatusesRequest(bookmarkCategoryId));
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(expandBookmarkCategoryStatusesSuccess(bookmarkCategoryId, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandBookmarkCategoryStatusesFail(bookmarkCategoryId, error));
+    });
+  };
+}
+
+export function expandBookmarkCategoryStatusesRequest(id) {
+  return {
+    type: BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST,
+    id,
+  };
+}
+
+export function expandBookmarkCategoryStatusesSuccess(id, statuses, next) {
+  return {
+    type: BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS,
+    id,
+    statuses,
+    next,
+  };
+}
+
+export function expandBookmarkCategoryStatusesFail(id, error) {
+  return {
+    type: BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL,
+    id,
+    error,
+  };
+}
+
diff --git a/app/javascript/mastodon/actions/bookmarks.js b/app/javascript/mastodon/actions/bookmarks.js
index 0b16f61e63..91c1d61e10 100644
--- a/app/javascript/mastodon/actions/bookmarks.js
+++ b/app/javascript/mastodon/actions/bookmarks.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied bookmark_categories.js
+
 import api, { getLinks } from '../api';
 
 import { importFetchedStatuses } from './importer';
diff --git a/app/javascript/mastodon/actions/boosts.js b/app/javascript/mastodon/actions/boosts.js
deleted file mode 100644
index 1fc2e391e2..0000000000
--- a/app/javascript/mastodon/actions/boosts.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { openModal } from './modal';
-
-export const BOOSTS_INIT_MODAL = 'BOOSTS_INIT_MODAL';
-export const BOOSTS_CHANGE_PRIVACY = 'BOOSTS_CHANGE_PRIVACY';
-
-export function initBoostModal(props) {
-  return (dispatch, getState) => {
-    const default_privacy = getState().getIn(['compose', 'default_privacy']);
-
-    const privacy = props.status.get('visibility') === 'private' ? 'private' : default_privacy;
-
-    dispatch({
-      type: BOOSTS_INIT_MODAL,
-      privacy,
-    });
-
-    dispatch(openModal({
-      modalType: 'BOOST',
-      modalProps: props,
-    }));
-  };
-}
-
-
-export function changeBoostPrivacy(privacy) {
-  return dispatch => {
-    dispatch({
-      type: BOOSTS_CHANGE_PRIVACY,
-      privacy,
-    });
-  };
-}
diff --git a/app/javascript/mastodon/actions/circles.js b/app/javascript/mastodon/actions/circles.js
new file mode 100644
index 0000000000..7ed41b4045
--- /dev/null
+++ b/app/javascript/mastodon/actions/circles.js
@@ -0,0 +1,470 @@
+import api, { getLinks } from '../api';
+
+import { showAlertForError } from './alerts';
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+
+export const CIRCLE_FETCH_REQUEST = 'CIRCLE_FETCH_REQUEST';
+export const CIRCLE_FETCH_SUCCESS = 'CIRCLE_FETCH_SUCCESS';
+export const CIRCLE_FETCH_FAIL    = 'CIRCLE_FETCH_FAIL';
+
+export const CIRCLES_FETCH_REQUEST = 'CIRCLES_FETCH_REQUEST';
+export const CIRCLES_FETCH_SUCCESS = 'CIRCLES_FETCH_SUCCESS';
+export const CIRCLES_FETCH_FAIL    = 'CIRCLES_FETCH_FAIL';
+
+export const CIRCLE_EDITOR_TITLE_CHANGE = 'CIRCLE_EDITOR_TITLE_CHANGE';
+export const CIRCLE_EDITOR_RESET        = 'CIRCLE_EDITOR_RESET';
+export const CIRCLE_EDITOR_SETUP        = 'CIRCLE_EDITOR_SETUP';
+
+export const CIRCLE_CREATE_REQUEST = 'CIRCLE_CREATE_REQUEST';
+export const CIRCLE_CREATE_SUCCESS = 'CIRCLE_CREATE_SUCCESS';
+export const CIRCLE_CREATE_FAIL    = 'CIRCLE_CREATE_FAIL';
+
+export const CIRCLE_UPDATE_REQUEST = 'CIRCLE_UPDATE_REQUEST';
+export const CIRCLE_UPDATE_SUCCESS = 'CIRCLE_UPDATE_SUCCESS';
+export const CIRCLE_UPDATE_FAIL    = 'CIRCLE_UPDATE_FAIL';
+
+export const CIRCLE_DELETE_REQUEST = 'CIRCLE_DELETE_REQUEST';
+export const CIRCLE_DELETE_SUCCESS = 'CIRCLE_DELETE_SUCCESS';
+export const CIRCLE_DELETE_FAIL    = 'CIRCLE_DELETE_FAIL';
+
+export const CIRCLE_ACCOUNTS_FETCH_REQUEST = 'CIRCLE_ACCOUNTS_FETCH_REQUEST';
+export const CIRCLE_ACCOUNTS_FETCH_SUCCESS = 'CIRCLE_ACCOUNTS_FETCH_SUCCESS';
+export const CIRCLE_ACCOUNTS_FETCH_FAIL    = 'CIRCLE_ACCOUNTS_FETCH_FAIL';
+
+export const CIRCLE_EDITOR_SUGGESTIONS_CHANGE = 'CIRCLE_EDITOR_SUGGESTIONS_CHANGE';
+export const CIRCLE_EDITOR_SUGGESTIONS_READY  = 'CIRCLE_EDITOR_SUGGESTIONS_READY';
+export const CIRCLE_EDITOR_SUGGESTIONS_CLEAR  = 'CIRCLE_EDITOR_SUGGESTIONS_CLEAR';
+
+export const CIRCLE_EDITOR_ADD_REQUEST = 'CIRCLE_EDITOR_ADD_REQUEST';
+export const CIRCLE_EDITOR_ADD_SUCCESS = 'CIRCLE_EDITOR_ADD_SUCCESS';
+export const CIRCLE_EDITOR_ADD_FAIL    = 'CIRCLE_EDITOR_ADD_FAIL';
+
+export const CIRCLE_EDITOR_REMOVE_REQUEST = 'CIRCLE_EDITOR_REMOVE_REQUEST';
+export const CIRCLE_EDITOR_REMOVE_SUCCESS = 'CIRCLE_EDITOR_REMOVE_SUCCESS';
+export const CIRCLE_EDITOR_REMOVE_FAIL    = 'CIRCLE_EDITOR_REMOVE_FAIL';
+
+export const CIRCLE_ADDER_RESET = 'CIRCLE_ADDER_RESET';
+export const CIRCLE_ADDER_SETUP = 'CIRCLE_ADDER_SETUP';
+
+export const CIRCLE_ADDER_CIRCLES_FETCH_REQUEST = 'CIRCLE_ADDER_CIRCLES_FETCH_REQUEST';
+export const CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS = 'CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS';
+export const CIRCLE_ADDER_CIRCLES_FETCH_FAIL    = 'CIRCLE_ADDER_CIRCLES_FETCH_FAIL';
+
+export const CIRCLE_STATUSES_FETCH_REQUEST = 'CIRCLE_STATUSES_FETCH_REQUEST';
+export const CIRCLE_STATUSES_FETCH_SUCCESS = 'CIRCLE_STATUSES_FETCH_SUCCESS';
+export const CIRCLE_STATUSES_FETCH_FAIL    = 'CIRCLE_STATUSES_FETCH_FAIL';
+
+export const CIRCLE_STATUSES_EXPAND_REQUEST = 'CIRCLE_STATUSES_EXPAND_REQUEST';
+export const CIRCLE_STATUSES_EXPAND_SUCCESS = 'CIRCLE_STATUSES_EXPAND_SUCCESS';
+export const CIRCLE_STATUSES_EXPAND_FAIL    = 'CIRCLE_STATUSES_EXPAND_FAIL';
+
+export const fetchCircle = id => (dispatch, getState) => {
+  if (getState().getIn(['circles', id])) {
+    return;
+  }
+
+  dispatch(fetchCircleRequest(id));
+
+  api(getState).get(`/api/v1/circles/${id}`)
+    .then(({ data }) => dispatch(fetchCircleSuccess(data)))
+    .catch(err => dispatch(fetchCircleFail(id, err)));
+};
+
+export const fetchCircleRequest = id => ({
+  type: CIRCLE_FETCH_REQUEST,
+  id,
+});
+
+export const fetchCircleSuccess = circle => ({
+  type: CIRCLE_FETCH_SUCCESS,
+  circle,
+});
+
+export const fetchCircleFail = (id, error) => ({
+  type: CIRCLE_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchCircles = () => (dispatch, getState) => {
+  dispatch(fetchCirclesRequest());
+
+  api(getState).get('/api/v1/circles')
+    .then(({ data }) => dispatch(fetchCirclesSuccess(data)))
+    .catch(err => dispatch(fetchCirclesFail(err)));
+};
+
+export const fetchCirclesRequest = () => ({
+  type: CIRCLES_FETCH_REQUEST,
+});
+
+export const fetchCirclesSuccess = circles => ({
+  type: CIRCLES_FETCH_SUCCESS,
+  circles,
+});
+
+export const fetchCirclesFail = error => ({
+  type: CIRCLES_FETCH_FAIL,
+  error,
+});
+
+export const submitCircleEditor = shouldReset => (dispatch, getState) => {
+  const circleId = getState().getIn(['circleEditor', 'circleId']);
+  const title  = getState().getIn(['circleEditor', 'title']);
+
+  if (circleId === null) {
+    dispatch(createCircle(title, shouldReset));
+  } else {
+    dispatch(updateCircle(circleId, title, shouldReset));
+  }
+};
+
+export const setupCircleEditor = circleId => (dispatch, getState) => {
+  dispatch({
+    type: CIRCLE_EDITOR_SETUP,
+    circle: getState().getIn(['circles', circleId]),
+  });
+
+  dispatch(fetchCircleAccounts(circleId));
+};
+
+export const changeCircleEditorTitle = value => ({
+  type: CIRCLE_EDITOR_TITLE_CHANGE,
+  value,
+});
+
+export const createCircle = (title, shouldReset) => (dispatch, getState) => {
+  dispatch(createCircleRequest());
+
+  api(getState).post('/api/v1/circles', { title }).then(({ data }) => {
+    dispatch(createCircleSuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetCircleEditor());
+    }
+  }).catch(err => dispatch(createCircleFail(err)));
+};
+
+export const createCircleRequest = () => ({
+  type: CIRCLE_CREATE_REQUEST,
+});
+
+export const createCircleSuccess = circle => ({
+  type: CIRCLE_CREATE_SUCCESS,
+  circle,
+});
+
+export const createCircleFail = error => ({
+  type: CIRCLE_CREATE_FAIL,
+  error,
+});
+
+export const updateCircle = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
+  dispatch(updateCircleRequest(id));
+
+  api(getState).put(`/api/v1/circles/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
+    dispatch(updateCircleSuccess(data));
+
+    if (shouldReset) {
+      dispatch(resetCircleEditor());
+    }
+  }).catch(err => dispatch(updateCircleFail(id, err)));
+};
+
+export const updateCircleRequest = id => ({
+  type: CIRCLE_UPDATE_REQUEST,
+  id,
+});
+
+export const updateCircleSuccess = circle => ({
+  type: CIRCLE_UPDATE_SUCCESS,
+  circle,
+});
+
+export const updateCircleFail = (id, error) => ({
+  type: CIRCLE_UPDATE_FAIL,
+  id,
+  error,
+});
+
+export const resetCircleEditor = () => ({
+  type: CIRCLE_EDITOR_RESET,
+});
+
+export const deleteCircle = id => (dispatch, getState) => {
+  dispatch(deleteCircleRequest(id));
+
+  api(getState).delete(`/api/v1/circles/${id}`)
+    .then(() => dispatch(deleteCircleSuccess(id)))
+    .catch(err => dispatch(deleteCircleFail(id, err)));
+};
+
+export const deleteCircleRequest = id => ({
+  type: CIRCLE_DELETE_REQUEST,
+  id,
+});
+
+export const deleteCircleSuccess = id => ({
+  type: CIRCLE_DELETE_SUCCESS,
+  id,
+});
+
+export const deleteCircleFail = (id, error) => ({
+  type: CIRCLE_DELETE_FAIL,
+  id,
+  error,
+});
+
+export const fetchCircleAccounts = circleId => (dispatch, getState) => {
+  dispatch(fetchCircleAccountsRequest(circleId));
+
+  api(getState).get(`/api/v1/circles/${circleId}/accounts`, { params: { limit: 0 } }).then(({ data }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchCircleAccountsSuccess(circleId, data));
+  }).catch(err => dispatch(fetchCircleAccountsFail(circleId, err)));
+};
+
+export const fetchCircleAccountsRequest = id => ({
+  type: CIRCLE_ACCOUNTS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchCircleAccountsSuccess = (id, accounts, next) => ({
+  type: CIRCLE_ACCOUNTS_FETCH_SUCCESS,
+  id,
+  accounts,
+  next,
+});
+
+export const fetchCircleAccountsFail = (id, error) => ({
+  type: CIRCLE_ACCOUNTS_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const fetchCircleSuggestions = q => (dispatch, getState) => {
+  const params = {
+    q,
+    resolve: false,
+    follower: true,
+  };
+
+  api(getState).get('/api/v1/accounts/search', { params }).then(({ data }) => {
+    dispatch(importFetchedAccounts(data));
+    dispatch(fetchCircleSuggestionsReady(q, data));
+  }).catch(error => dispatch(showAlertForError(error)));
+};
+
+export const fetchCircleSuggestionsReady = (query, accounts) => ({
+  type: CIRCLE_EDITOR_SUGGESTIONS_READY,
+  query,
+  accounts,
+});
+
+export const clearCircleSuggestions = () => ({
+  type: CIRCLE_EDITOR_SUGGESTIONS_CLEAR,
+});
+
+export const changeCircleSuggestions = value => ({
+  type: CIRCLE_EDITOR_SUGGESTIONS_CHANGE,
+  value,
+});
+
+export const addToCircleEditor = accountId => (dispatch, getState) => {
+  dispatch(addToCircle(getState().getIn(['circleEditor', 'circleId']), accountId));
+};
+
+export const addToCircle = (circleId, accountId) => (dispatch, getState) => {
+  dispatch(addToCircleRequest(circleId, accountId));
+
+  api(getState).post(`/api/v1/circles/${circleId}/accounts`, { account_ids: [accountId] })
+    .then(() => dispatch(addToCircleSuccess(circleId, accountId)))
+    .catch(err => dispatch(addToCircleFail(circleId, accountId, err)));
+};
+
+export const addToCircleRequest = (circleId, accountId) => ({
+  type: CIRCLE_EDITOR_ADD_REQUEST,
+  circleId,
+  accountId,
+});
+
+export const addToCircleSuccess = (circleId, accountId) => ({
+  type: CIRCLE_EDITOR_ADD_SUCCESS,
+  circleId,
+  accountId,
+});
+
+export const addToCircleFail = (circleId, accountId, error) => ({
+  type: CIRCLE_EDITOR_ADD_FAIL,
+  circleId,
+  accountId,
+  error,
+});
+
+export const removeFromCircleEditor = accountId => (dispatch, getState) => {
+  dispatch(removeFromCircle(getState().getIn(['circleEditor', 'circleId']), accountId));
+};
+
+export const removeFromCircle = (circleId, accountId) => (dispatch, getState) => {
+  dispatch(removeFromCircleRequest(circleId, accountId));
+
+  api(getState).delete(`/api/v1/circles/${circleId}/accounts`, { params: { account_ids: [accountId] } })
+    .then(() => dispatch(removeFromCircleSuccess(circleId, accountId)))
+    .catch(err => dispatch(removeFromCircleFail(circleId, accountId, err)));
+};
+
+export const removeFromCircleRequest = (circleId, accountId) => ({
+  type: CIRCLE_EDITOR_REMOVE_REQUEST,
+  circleId,
+  accountId,
+});
+
+export const removeFromCircleSuccess = (circleId, accountId) => ({
+  type: CIRCLE_EDITOR_REMOVE_SUCCESS,
+  circleId,
+  accountId,
+});
+
+export const removeFromCircleFail = (circleId, accountId, error) => ({
+  type: CIRCLE_EDITOR_REMOVE_FAIL,
+  circleId,
+  accountId,
+  error,
+});
+
+export const resetCircleAdder = () => ({
+  type: CIRCLE_ADDER_RESET,
+});
+
+export const setupCircleAdder = accountId => (dispatch, getState) => {
+  dispatch({
+    type: CIRCLE_ADDER_SETUP,
+    account: getState().getIn(['accounts', accountId]),
+  });
+  dispatch(fetchCircles());
+  dispatch(fetchAccountCircles(accountId));
+};
+
+export const fetchAccountCircles = accountId => (dispatch, getState) => {
+  dispatch(fetchAccountCirclesRequest(accountId));
+
+  api(getState).get(`/api/v1/accounts/${accountId}/circles`)
+    .then(({ data }) => dispatch(fetchAccountCirclesSuccess(accountId, data)))
+    .catch(err => dispatch(fetchAccountCirclesFail(accountId, err)));
+};
+
+export const fetchAccountCirclesRequest = id => ({
+  type:CIRCLE_ADDER_CIRCLES_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAccountCirclesSuccess = (id, circles) => ({
+  type: CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS,
+  id,
+  circles,
+});
+
+export const fetchAccountCirclesFail = (id, err) => ({
+  type: CIRCLE_ADDER_CIRCLES_FETCH_FAIL,
+  id,
+  err,
+});
+
+export const addToCircleAdder = circleId => (dispatch, getState) => {
+  dispatch(addToCircle(circleId, getState().getIn(['circleAdder', 'accountId'])));
+};
+
+export const removeFromCircleAdder = circleId => (dispatch, getState) => {
+  dispatch(removeFromCircle(circleId, getState().getIn(['circleAdder', 'accountId'])));
+};
+
+export function fetchCircleStatuses(circleId) {
+  return (dispatch, getState) => {
+    if (getState().getIn(['circles', circleId, 'isLoading'])) {
+      return;
+    }
+    const items = getState().getIn(['circles', circleId, 'items']);
+    if (items && items.size > 0) {
+      return;
+    }
+
+    dispatch(fetchCircleStatusesRequest(circleId));
+
+    api(getState).get(`/api/v1/circles/${circleId}/statuses`).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchCircleStatusesSuccess(circleId, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(fetchCircleStatusesFail(circleId, error));
+    });
+  };
+}
+
+export function fetchCircleStatusesRequest(id) {
+  return {
+    type: CIRCLE_STATUSES_FETCH_REQUEST,
+    id,
+  };
+}
+
+export function fetchCircleStatusesSuccess(id, statuses, next) {
+  return {
+    type: CIRCLE_STATUSES_FETCH_SUCCESS,
+    id,
+    statuses,
+    next,
+  };
+}
+
+export function fetchCircleStatusesFail(id, error) {
+  return {
+    type: CIRCLE_STATUSES_FETCH_FAIL,
+    id,
+    error,
+  };
+}
+
+export function expandCircleStatuses(circleId) {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['circles', circleId, 'next'], null);
+
+    if (url === null || getState().getIn(['circles', circleId, 'isLoading'])) {
+      return;
+    }
+
+    dispatch(expandCircleStatusesRequest(circleId));
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(expandCircleStatusesSuccess(circleId, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandCircleStatusesFail(circleId, error));
+    });
+  };
+}
+
+export function expandCircleStatusesRequest(id) {
+  return {
+    type: CIRCLE_STATUSES_EXPAND_REQUEST,
+    id,
+  };
+}
+
+export function expandCircleStatusesSuccess(id, statuses, next) {
+  return {
+    type: CIRCLE_STATUSES_EXPAND_SUCCESS,
+    id,
+    statuses,
+    next,
+  };
+}
+
+export function expandCircleStatusesFail(id, error) {
+  return {
+    type: CIRCLE_STATUSES_EXPAND_FAIL,
+    id,
+    error,
+  };
+}
+
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 6abfd6157e..b013e134fe 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -28,6 +28,8 @@ export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
 export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
 export const COMPOSE_RESET           = 'COMPOSE_RESET';
 
+export const COMPOSE_WITH_CIRCLE_SUCCESS = 'COMPOSE_WITH_CIRCLE_SUCCESS';
+
 export const COMPOSE_UPLOAD_REQUEST    = 'COMPOSE_UPLOAD_REQUEST';
 export const COMPOSE_UPLOAD_SUCCESS    = 'COMPOSE_UPLOAD_SUCCESS';
 export const COMPOSE_UPLOAD_FAIL       = 'COMPOSE_UPLOAD_FAIL';
@@ -54,11 +56,16 @@ export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
 export const COMPOSE_SENSITIVITY_CHANGE  = 'COMPOSE_SENSITIVITY_CHANGE';
 export const COMPOSE_SPOILERNESS_CHANGE  = 'COMPOSE_SPOILERNESS_CHANGE';
 export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
+export const COMPOSE_MARKDOWN_CHANGE     = 'COMPOSE_MARKDOWN_CHANGE';
 export const COMPOSE_VISIBILITY_CHANGE   = 'COMPOSE_VISIBILITY_CHANGE';
+export const COMPOSE_SEARCHABILITY_CHANGE= 'COMPOSE_SEARCHABILITY_CHANGE';
 export const COMPOSE_COMPOSING_CHANGE    = 'COMPOSE_COMPOSING_CHANGE';
 export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
 
 export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
+export const COMPOSE_EXPIRATION_INSERT = 'COMPOSE_EXPIRATION_INSERT';
+export const COMPOSE_FEATURED_TAG_INSERT = 'COMPOSE_FEATURED_TAG_INSERT';
+export const COMPOSE_REFERENCE_INSERT = 'COMPOSE_REFERENCE_INSERT';
 
 export const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST';
 export const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
@@ -71,10 +78,13 @@ export const COMPOSE_POLL_OPTION_CHANGE   = 'COMPOSE_POLL_OPTION_CHANGE';
 export const COMPOSE_POLL_OPTION_REMOVE   = 'COMPOSE_POLL_OPTION_REMOVE';
 export const COMPOSE_POLL_SETTINGS_CHANGE = 'COMPOSE_POLL_SETTINGS_CHANGE';
 
+export const COMPOSE_CIRCLE_CHANGE = 'COMPOSE_CIRCLE_CHANGE';
+
 export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL';
 
 export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION';
 export const COMPOSE_CHANGE_MEDIA_FOCUS       = 'COMPOSE_CHANGE_MEDIA_FOCUS';
+export const COMPOSE_CHANGE_MEDIA_ORDER       = 'COMPOSE_CHANGE_MEDIA_ORDER';
 
 export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
 export const COMPOSE_FOCUS = 'COMPOSE_FOCUS';
@@ -168,6 +178,8 @@ export function submitCompose(routerHistory) {
     const status   = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
     const statusId = getState().getIn(['compose', 'id'], null);
+    const circleId = getState().getIn(['compose', 'circle_id'], null);
+    const privacy  = getState().getIn(['compose', 'privacy']);
 
     if ((!status || !status.length) && media.size === 0) {
       return;
@@ -203,9 +215,12 @@ export function submitCompose(routerHistory) {
         in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
         media_ids: media.map(item => item.get('id')),
         media_attributes,
-        sensitive: getState().getIn(['compose', 'sensitive']),
+        sensitive: media.size > 0 ? getState().getIn(['compose', 'spoiler']) : false,
         spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
+        markdown: getState().getIn(['compose', 'markdown']),
         visibility: getState().getIn(['compose', 'privacy']),
+        searchability: getState().getIn(['compose', 'searchability']),
+        circle_id: getState().getIn(['compose', 'circle_id']),
         poll: getState().getIn(['compose', 'poll'], null),
         language: getState().getIn(['compose', 'language']),
       },
@@ -234,16 +249,20 @@ export function submitCompose(routerHistory) {
         dispatch(importFetchedStatus({ ...response.data }));
       }
 
-      if (statusId === null && response.data.visibility !== 'direct') {
+      if (statusId === null && response.data.visibility_ex !== 'direct') {
         insertIfOnline('home');
       }
 
-      if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') {
+      if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility_ex === 'public') {
         insertIfOnline('community');
         insertIfOnline('public');
         insertIfOnline(`account:${response.data.account.id}`);
       }
 
+      if (statusId === null && privacy === 'circle' && circleId !== null && circleId !== 0) {
+        dispatch(submitComposeWithCircleSuccess({ ...response.data }, circleId));
+      }
+
       dispatch(showAlert({
         message: statusId === null ? messages.published : messages.saved,
         action: messages.open,
@@ -269,6 +288,14 @@ export function submitComposeSuccess(status) {
   };
 }
 
+export function submitComposeWithCircleSuccess(status, circleId) {
+  return {
+    type: COMPOSE_WITH_CIRCLE_SUCCESS,
+    status,
+    circleId,
+  };
+}
+
 export function submitComposeFail(error) {
   return {
     type: COMPOSE_SUBMIT_FAIL,
@@ -281,6 +308,8 @@ export function uploadCompose(files) {
     const uploadLimit = 4;
     const media = getState().getIn(['compose', 'media_attachments']);
     const pending = getState().getIn(['compose', 'pending_media_attachments']);
+    const defaultSensitive = getState().getIn(['compose', 'default_sensitive']);
+    const spoiler = getState().getIn(['compose', 'spoiler']);
     const progress = new Array(files.length).fill(0);
 
     let total = Array.from(files).reduce((a, v) => a + v.size, 0);
@@ -290,15 +319,10 @@ export function uploadCompose(files) {
       return;
     }
 
-    if (getState().getIn(['compose', 'poll'])) {
-      dispatch(showAlert({ message: messages.uploadErrorPoll }));
-      return;
-    }
-
     dispatch(uploadComposeRequest());
 
     for (const [i, file] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
+      if (media.size + i >= 4) break;
 
       const data = new FormData();
       data.append('file', file);
@@ -314,6 +338,10 @@ export function uploadCompose(files) {
 
         if (status === 200) {
           dispatch(uploadComposeSuccess(data, file));
+
+          if (defaultSensitive && !spoiler && (media.size + i) === 0) {
+            dispatch(changeComposeSpoilerness());
+          }
         } else if (status === 202) {
           dispatch(uploadComposeProcessing());
 
@@ -744,6 +772,12 @@ export function changeComposeSpoilerText(text) {
   };
 }
 
+export function changeComposeMarkdown() {
+  return {
+    type: COMPOSE_MARKDOWN_CHANGE,
+  };
+}
+
 export function changeComposeVisibility(value) {
   return {
     type: COMPOSE_VISIBILITY_CHANGE,
@@ -751,6 +785,13 @@ export function changeComposeVisibility(value) {
   };
 }
 
+export function changeComposeSearchability(value) {
+  return {
+    type: COMPOSE_SEARCHABILITY_CHANGE,
+    value,
+  };
+}
+
 export function insertEmojiCompose(position, emoji, needsSpace) {
   return {
     type: COMPOSE_EMOJI_INSERT,
@@ -760,6 +801,31 @@ export function insertEmojiCompose(position, emoji, needsSpace) {
   };
 }
 
+export function insertExpirationCompose(position, data) {
+  return {
+    type: COMPOSE_EXPIRATION_INSERT,
+    position,
+    data,
+  };
+}
+
+export function insertFeaturedTagCompose(position, data) {
+  return {
+    type: COMPOSE_FEATURED_TAG_INSERT,
+    position,
+    data,
+  };
+}
+
+export function insertReferenceCompose(position, url, attributeType) {
+  return {
+    type: COMPOSE_REFERENCE_INSERT,
+    position,
+    url,
+    attributeType,
+  };
+}
+
 export function changeComposing(value) {
   return {
     type: COMPOSE_COMPOSING_CHANGE,
@@ -786,11 +852,12 @@ export function addPollOption(title) {
   };
 }
 
-export function changePollOption(index, title) {
+export function changePollOption(index, title, maxOptions) {
   return {
     type: COMPOSE_POLL_OPTION_CHANGE,
     index,
     title,
+    maxOptions,
   };
 }
 
@@ -808,3 +875,16 @@ export function changePollSettings(expiresIn, isMultiple) {
     isMultiple,
   };
 }
+
+export const changeMediaOrder = (a, b) => ({
+  type: COMPOSE_CHANGE_MEDIA_ORDER,
+  a,
+  b,
+});
+
+export function changeCircle(circleId) {
+  return {
+    type: COMPOSE_CIRCLE_CHANGE,
+    circleId,
+  };
+}
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 718002613f..55c0a6ce9d 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -1,6 +1,8 @@
 import api, { getLinks } from '../api';
 
 import { blockDomainSuccess, unblockDomainSuccess } from "./domain_blocks_typed";
+import { openModal } from './modal';
+
 
 export * from "./domain_blocks_typed";
 
@@ -150,3 +152,12 @@ export function expandDomainBlocksFail(error) {
     error,
   };
 }
+
+export const initDomainBlockModal = account => dispatch => dispatch(openModal({
+  modalType: 'DOMAIN_BLOCK',
+  modalProps: {
+    domain: account.get('acct').split('@')[1],
+    acct: account.get('acct'),
+    accountId: account.get('id'),
+  },
+}));
diff --git a/app/javascript/mastodon/actions/emoji_reactions.js b/app/javascript/mastodon/actions/emoji_reactions.js
new file mode 100644
index 0000000000..6b97b1f743
--- /dev/null
+++ b/app/javascript/mastodon/actions/emoji_reactions.js
@@ -0,0 +1,94 @@
+import api, { getLinks } from '../api';
+
+import { importFetchedStatuses } from './importer';
+
+export const EMOJI_REACTED_STATUSES_FETCH_REQUEST = 'EMOJI_REACTED_STATUSES_FETCH_REQUEST';
+export const EMOJI_REACTED_STATUSES_FETCH_SUCCESS = 'EMOJI_REACTED_STATUSES_FETCH_SUCCESS';
+export const EMOJI_REACTED_STATUSES_FETCH_FAIL    = 'EMOJI_REACTED_STATUSES_FETCH_FAIL';
+
+export const EMOJI_REACTED_STATUSES_EXPAND_REQUEST = 'EMOJI_REACTED_STATUSES_EXPAND_REQUEST';
+export const EMOJI_REACTED_STATUSES_EXPAND_SUCCESS = 'EMOJI_REACTED_STATUSES_EXPAND_SUCCESS';
+export const EMOJI_REACTED_STATUSES_EXPAND_FAIL    = 'EMOJI_REACTED_STATUSES_EXPAND_FAIL';
+
+export function fetchEmojiReactedStatuses() {
+  return (dispatch, getState) => {
+    if (getState().getIn(['status_lists', 'emoji_reactions', 'isLoading'])) {
+      return;
+    }
+
+    dispatch(fetchEmojiReactedStatusesRequest());
+
+    api(getState).get('/api/v1/emoji_reactions').then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchEmojiReactedStatusesSuccess(response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(fetchEmojiReactedStatusesFail(error));
+    });
+  };
+}
+
+export function fetchEmojiReactedStatusesRequest() {
+  return {
+    type: EMOJI_REACTED_STATUSES_FETCH_REQUEST,
+    skipLoading: true,
+  };
+}
+
+export function fetchEmojiReactedStatusesSuccess(statuses, next) {
+  return {
+    type: EMOJI_REACTED_STATUSES_FETCH_SUCCESS,
+    statuses,
+    next,
+    skipLoading: true,
+  };
+}
+
+export function fetchEmojiReactedStatusesFail(error) {
+  return {
+    type: EMOJI_REACTED_STATUSES_FETCH_FAIL,
+    error,
+    skipLoading: true,
+  };
+}
+
+export function expandEmojiReactedStatuses() {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['status_lists', 'emoji_reactions', 'next'], null);
+
+    if (url === null || getState().getIn(['status_lists', 'emoji_reactions', 'isLoading'])) {
+      return;
+    }
+
+    dispatch(expandEmojiReactedStatusesRequest());
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(expandEmojiReactedStatusesSuccess(response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(expandEmojiReactedStatusesFail(error));
+    });
+  };
+}
+
+export function expandEmojiReactedStatusesRequest() {
+  return {
+    type: EMOJI_REACTED_STATUSES_EXPAND_REQUEST,
+  };
+}
+
+export function expandEmojiReactedStatusesSuccess(statuses, next) {
+  return {
+    type: EMOJI_REACTED_STATUSES_EXPAND_SUCCESS,
+    statuses,
+    next,
+  };
+}
+
+export function expandEmojiReactedStatusesFail(error) {
+  return {
+    type: EMOJI_REACTED_STATUSES_EXPAND_FAIL,
+    error,
+  };
+}
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 2d4d4e6206..e5e2c481aa 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied emoji_reactions.js
+
 import api, { getLinks } from '../api';
 
 import { importFetchedStatuses } from './importer';
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js
index 16f191b584..906e384354 100644
--- a/app/javascript/mastodon/actions/importer/index.js
+++ b/app/javascript/mastodon/actions/importer/index.js
@@ -72,6 +72,10 @@ export function importFetchedStatuses(statuses) {
         processStatus(status.reblog);
       }
 
+      if (status.quote && status.quote.id && !getState().getIn(['statuses', status.id])) {
+        processStatus(status.quote);
+      }
+
       if (status.poll && status.poll.id) {
         pushUnique(polls, normalizePoll(status.poll, getState().getIn(['polls', status.poll.id])));
       }
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index b5a30343e4..05b6250761 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -1,7 +1,7 @@
 import escapeTextContentForBrowser from 'escape-html';
 
 import emojify from '../../features/emoji/emoji';
-import { expandSpoilers } from '../../initial_state';
+import { expandSpoilers, me } from '../../initial_state';
 
 const domParser = new DOMParser();
 
@@ -40,6 +40,14 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.filtered = status.filtered.map(normalizeFilterResult);
   }
 
+  if (status.emoji_reactions) {
+    normalStatus.emoji_reactions = normalizeEmojiReactions(status.emoji_reactions);
+  }
+
+  if (!status.visibility_ex) {
+    normalStatus.visibility_ex = status.visibility;
+  }
+
   // Only calculate these values when status first encountered and
   // when the underlying values change. Otherwise keep the ones
   // already in the reducer
@@ -50,6 +58,11 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
 
+    // for quoted post
+    if (!normalStatus.filtered && normalOldStatus.get('filtered')) {
+      normalStatus.filtered = normalOldStatus.get('filtered');
+    }
+
     if (normalOldStatus.get('translation')) {
       normalStatus.translation = normalOldStatus.get('translation');
     }
@@ -61,6 +74,10 @@ export function normalizeStatus(status, normalOldStatus) {
       normalStatus.spoiler_text = '';
     }
 
+    if (normalStatus.emojis && normalStatus.emojis.some((emoji) => emoji.is_sensitive) && !normalStatus.spoiler_text) {
+      normalStatus.spoiler_text = '[Contains sensitive custom emoji(s)]';
+    }
+
     const spoilerText   = normalStatus.spoiler_text || '';
     const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
     const emojiMap      = makeEmojiMap(normalStatus.emojis);
@@ -86,6 +103,17 @@ export function normalizeStatus(status, normalOldStatus) {
   return normalStatus;
 }
 
+export function normalizeEmojiReactions(emoji_reactions) {
+  const myAccountId = me;
+  let converted = [];
+  for (let emoji_reaction of emoji_reactions) {
+    let obj = emoji_reaction;
+    obj.me = obj.account_ids.some((id) => id === myAccountId);
+    converted.push(obj);
+  }
+  return converted;
+}
+
 export function normalizeStatusTranslation(translation, status) {
   const emojiMap = makeEmojiMap(status.get('emojis').toJS());
 
diff --git a/app/javascript/mastodon/actions/interactions.js b/app/javascript/mastodon/actions/interactions.js
index 7d0144438a..640c5c3128 100644
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -1,7 +1,7 @@
 import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
-import { importFetchedAccounts, importFetchedStatus } from './importer';
+import { importFetchedAccounts, importFetchedStatus, importFetchedStatuses } from './importer';
 
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
@@ -15,6 +15,10 @@ export const FAVOURITE_REQUEST = 'FAVOURITE_REQUEST';
 export const FAVOURITE_SUCCESS = 'FAVOURITE_SUCCESS';
 export const FAVOURITE_FAIL    = 'FAVOURITE_FAIL';
 
+export const EMOJIREACT_REQUEST = 'EMOJIREACT_REQUEST';
+export const EMOJIREACT_SUCCESS = 'EMOJIREACT_SUCCESS';
+export const EMOJIREACT_FAIL    = 'EMOJIREACT_FAIL';
+
 export const UNREBLOG_REQUEST = 'UNREBLOG_REQUEST';
 export const UNREBLOG_SUCCESS = 'UNREBLOG_SUCCESS';
 export const UNREBLOG_FAIL    = 'UNREBLOG_FAIL';
@@ -23,6 +27,10 @@ export const UNFAVOURITE_REQUEST = 'UNFAVOURITE_REQUEST';
 export const UNFAVOURITE_SUCCESS = 'UNFAVOURITE_SUCCESS';
 export const UNFAVOURITE_FAIL    = 'UNFAVOURITE_FAIL';
 
+export const UNEMOJIREACT_REQUEST = 'UNEMOJIREACT_REQUEST';
+export const UNEMOJIREACT_SUCCESS = 'UNEMOJIREACT_SUCCESS';
+export const UNEMOJIREACT_FAIL    = 'UNEMOJIREACT_FAIL';
+
 export const REBLOGS_FETCH_REQUEST = 'REBLOGS_FETCH_REQUEST';
 export const REBLOGS_FETCH_SUCCESS = 'REBLOGS_FETCH_SUCCESS';
 export const REBLOGS_FETCH_FAIL    = 'REBLOGS_FETCH_FAIL';
@@ -33,7 +41,19 @@ export const FAVOURITES_FETCH_FAIL    = 'FAVOURITES_FETCH_FAIL';
 
 export const FAVOURITES_EXPAND_REQUEST = 'FAVOURITES_EXPAND_REQUEST';
 export const FAVOURITES_EXPAND_SUCCESS = 'FAVOURITES_EXPAND_SUCCESS';
-export const FAVOURITES_EXPAND_FAIL = 'FAVOURITES_EXPAND_FAIL';
+export const FAVOURITES_EXPAND_FAIL    = 'FAVOURITES_EXPAND_FAIL';
+
+export const STATUS_REFERENCES_FETCH_REQUEST = 'STATUS_REFERENCES_FETCH_REQUEST';
+export const STATUS_REFERENCES_FETCH_SUCCESS = 'STATUS_REFERENCES_FETCH_SUCCESS';
+export const STATUS_REFERENCES_FETCH_FAIL    = 'STATUS_REFERENCES_FETCH_FAIL';
+
+export const EMOJI_REACTIONS_FETCH_REQUEST = 'EMOJI_REACTIONS_FETCH_REQUEST';
+export const EMOJI_REACTIONS_FETCH_SUCCESS = 'EMOJI_REACTIONS_FETCH_SUCCESS';
+export const EMOJI_REACTIONS_FETCH_FAIL    = 'EMOJI_REACTIONS_FETCH_FAIL';
+
+export const EMOJI_REACTIONS_EXPAND_REQUEST = 'EMOJI_REACTIONS_EXPAND_REQUEST';
+export const EMOJI_REACTIONS_EXPAND_SUCCESS = 'EMOJI_REACTIONS_EXPAND_SUCCESS';
+export const EMOJI_REACTIONS_EXPAND_FAIL    = 'EMOJI_REACTIONS_EXPAND_FAIL';
 
 export const PIN_REQUEST = 'PIN_REQUEST';
 export const PIN_SUCCESS = 'PIN_SUCCESS';
@@ -51,6 +71,14 @@ export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
 export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
 export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
+export const MENTIONED_USERS_FETCH_REQUEST = 'MENTIONED_USERS_FETCH_REQUEST';
+export const MENTIONED_USERS_FETCH_SUCCESS = 'MENTIONED_USERS_FETCH_SUCCESS';
+export const MENTIONED_USERS_FETCH_FAIL    = 'MENTIONED_USERS_FETCH_FAIL';
+
+export const MENTIONED_USERS_EXPAND_REQUEST = 'MENTIONED_USERS_EXPAND_REQUEST';
+export const MENTIONED_USERS_EXPAND_SUCCESS = 'MENTIONED_USERS_EXPAND_SUCCESS';
+export const MENTIONED_USERS_EXPAND_FAIL    = 'MENTIONED_USERS_EXPAND_FAIL';
+
 export function reblog(status, visibility) {
   return function (dispatch, getState) {
     dispatch(reblogRequest(status));
@@ -205,6 +233,91 @@ export function unfavouriteFail(status, error) {
   };
 }
 
+export function emojiReact(status, emoji) {
+  return function (dispatch, getState) {
+    dispatch(emojiReactRequest(status, emoji));
+
+    const api_emoji = typeof emoji !== 'string' ? (emoji.custom ? (emoji.name + (emoji.domain || '')) : emoji.native) : emoji;
+
+    api(getState).post(`/api/v1/statuses/${status.get('id')}/emoji_reactions`, { emoji: api_emoji }).then(function (response) {
+      dispatch(importFetchedStatus(response.data));
+      dispatch(emojiReactSuccess(status, emoji));
+    }).catch(function (error) {
+      dispatch(emojiReactFail(status, emoji, error));
+    });
+  };
+}
+
+export function unEmojiReact(status, emoji) {
+  return (dispatch, getState) => {
+    dispatch(unEmojiReactRequest(status, emoji));
+
+    api(getState).post(`/api/v1/statuses/${status.get('id')}/emoji_unreaction`, { emoji }).then((response) => {
+      // TODO: do not update because this api has a bug
+      dispatch(importFetchedStatus(response.data));
+      dispatch(unEmojiReactSuccess(status, emoji));
+    }).catch(error => {
+      dispatch(unEmojiReactFail(status, emoji, error));
+    });
+  };
+}
+
+export function emojiReactRequest(status, emoji) {
+  return {
+    type: EMOJIREACT_REQUEST,
+    status: status,
+    emoji: emoji,
+    skipLoading: true,
+  };
+}
+
+export function emojiReactSuccess(status, emoji) {
+  return {
+    type: EMOJIREACT_SUCCESS,
+    status: status,
+    emoji: emoji,
+    skipLoading: true,
+  };
+}
+
+export function emojiReactFail(status, emoji, error) {
+  return {
+    type: EMOJIREACT_FAIL,
+    status: status,
+    emoji: emoji,
+    error: error,
+    skipLoading: true,
+  };
+}
+
+export function unEmojiReactRequest(status, emoji) {
+  return {
+    type: UNEMOJIREACT_REQUEST,
+    status: status,
+    emoji: emoji,
+    skipLoading: true,
+  };
+}
+
+export function unEmojiReactSuccess(status, emoji) {
+  return {
+    type: UNEMOJIREACT_SUCCESS,
+    status: status,
+    emoji: emoji,
+    skipLoading: true,
+  };
+}
+
+export function unEmojiReactFail(status, emoji, error) {
+  return {
+    type: UNEMOJIREACT_FAIL,
+    status: status,
+    emoji: emoji,
+    error: error,
+    skipLoading: true,
+  };
+}
+
 export function bookmark(status) {
   return function (dispatch, getState) {
     dispatch(bookmarkRequest(status));
@@ -441,6 +554,120 @@ export function expandFavouritesFail(id, error) {
   };
 }
 
+export function fetchEmojiReactions(id) {
+  return (dispatch, getState) => {
+    dispatch(fetchEmojiReactionsRequest(id));
+
+    api(getState).get(`/api/v1/statuses/${id}/emoji_reactioned_by`).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedAccounts(response.data.map((er) => er.account)));
+      dispatch(fetchEmojiReactionsSuccess(id, response.data, next ? next.uri : null));
+    }).catch(error => {
+      dispatch(fetchEmojiReactionsFail(id, error));
+    });
+  };
+}
+
+export function fetchEmojiReactionsRequest(id) {
+  return {
+    type: EMOJI_REACTIONS_FETCH_REQUEST,
+    id,
+  };
+}
+
+export function fetchEmojiReactionsSuccess(id, accounts, next) {
+  return {
+    type: EMOJI_REACTIONS_FETCH_SUCCESS,
+    id,
+    accounts,
+    next,
+  };
+}
+
+export function fetchEmojiReactionsFail(id, error) {
+  return {
+    type: EMOJI_REACTIONS_FETCH_FAIL,
+    error,
+  };
+}
+
+export function expandEmojiReactions(id) {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['user_lists', 'emoji_reactioned_by', id, 'next']);
+    if (url === null) {
+      return;
+    }
+
+    dispatch(expandEmojiReactionsRequest(id));
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+
+      dispatch(importFetchedAccounts(response.data.map((er) => er.account)));
+      dispatch(expandEmojiReactionsSuccess(id, response.data, next ? next.uri : null));
+    }).catch(error => dispatch(expandEmojiReactionsFail(id, error)));
+  };
+}
+
+export function expandEmojiReactionsRequest(id) {
+  return {
+    type: EMOJI_REACTIONS_EXPAND_REQUEST,
+    id,
+  };
+}
+
+export function expandEmojiReactionsSuccess(id, accounts, next) {
+  return {
+    type: EMOJI_REACTIONS_EXPAND_SUCCESS,
+    id,
+    accounts,
+    next,
+  };
+}
+
+export function expandEmojiReactionsFail(id, error) {
+  return {
+    type: EMOJI_REACTIONS_EXPAND_FAIL,
+    id,
+    error,
+  };
+}
+
+export function fetchStatusReferences(id) {
+  return (dispatch, getState) => {
+    dispatch(fetchStatusReferencesRequest(id));
+
+    api(getState).get(`/api/v1/statuses/${id}/referred_by`).then(response => {
+      dispatch(importFetchedStatuses(response.data));
+      dispatch(fetchStatusReferencesSuccess(id, response.data));
+    }).catch(error => {
+      dispatch(fetchStatusReferencesFail(id, error));
+    });
+  };
+}
+
+export function fetchStatusReferencesRequest(id) {
+  return {
+    type: STATUS_REFERENCES_FETCH_REQUEST,
+    id,
+  };
+}
+
+export function fetchStatusReferencesSuccess(id, statuses) {
+  return {
+    type: STATUS_REFERENCES_FETCH_SUCCESS,
+    id,
+    statuses,
+  };
+}
+
+export function fetchStatusReferencesFail(id, error) {
+  return {
+    type: STATUS_REFERENCES_FETCH_FAIL,
+    error,
+  };
+}
+
 export function pin(status) {
   return (dispatch, getState) => {
     dispatch(pinRequest(status));
@@ -516,3 +743,85 @@ export function unpinFail(status, error) {
     skipLoading: true,
   };
 }
+
+export function fetchMentionedUsers(id) {
+  return (dispatch, getState) => {
+    dispatch(fetchMentionedUsersRequest(id));
+
+    api(getState).get(`/api/v1/statuses/${id}/mentioned_by`).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(fetchMentionedUsersSuccess(id, response.data, next ? next.uri : null));
+      dispatch(fetchRelationships(response.data.map(item => item.id)));
+    }).catch(error => {
+      dispatch(fetchMentionedUsersFail(id, error));
+    });
+  };
+}
+
+export function fetchMentionedUsersRequest(id) {
+  return {
+    type: MENTIONED_USERS_FETCH_REQUEST,
+    id,
+  };
+}
+
+export function fetchMentionedUsersSuccess(id, accounts, next) {
+  return {
+    type: MENTIONED_USERS_FETCH_SUCCESS,
+    id,
+    accounts,
+    next,
+  };
+}
+
+export function fetchMentionedUsersFail(id, error) {
+  return {
+    type: MENTIONED_USERS_FETCH_FAIL,
+    id,
+    error,
+  };
+}
+
+export function expandMentionedUsers(id) {
+  return (dispatch, getState) => {
+    const url = getState().getIn(['user_lists', 'mentioned_users', id, 'next']);
+    if (url === null) {
+      return;
+    }
+
+    dispatch(expandMentionedUsersRequest(id));
+
+    api(getState).get(url).then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(expandMentionedUsersSuccess(id, response.data, next ? next.uri : null));
+      dispatch(fetchRelationships(response.data.map(item => item.id)));
+    }).catch(error => dispatch(expandMentionedUsersFail(id, error)));
+  };
+}
+
+export function expandMentionedUsersRequest(id) {
+  return {
+    type: MENTIONED_USERS_EXPAND_REQUEST,
+    id,
+  };
+}
+
+export function expandMentionedUsersSuccess(id, accounts, next) {
+  return {
+    type: MENTIONED_USERS_EXPAND_SUCCESS,
+    id,
+    accounts,
+    next,
+  };
+}
+
+export function expandMentionedUsersFail(id, error) {
+  return {
+    type: MENTIONED_USERS_EXPAND_FAIL,
+    id,
+    error,
+  };
+}
diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
index b0789cd426..e494a40a5d 100644
--- a/app/javascript/mastodon/actions/lists.js
+++ b/app/javascript/mastodon/actions/lists.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied circles.js, antennas.js
+
 import api from '../api';
 
 import { showAlertForError } from './alerts';
@@ -151,10 +153,15 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, isExclusive, replies_policy, notify) => (dispatch, getState) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
+  api(getState).put(`/api/v1/lists/${id}`, {
+    title,
+    replies_policy,
+    exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive,
+    notify: typeof notify === 'undefined' ? undefined : !!notify,
+  }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
@@ -238,7 +245,6 @@ export const fetchListSuggestions = q => (dispatch, getState) => {
   const params = {
     q,
     resolve: false,
-    limit: 4,
     following: true,
   };
 
diff --git a/app/javascript/mastodon/actions/markers.js b/app/javascript/mastodon/actions/markers.js
deleted file mode 100644
index cfc329a8b7..0000000000
--- a/app/javascript/mastodon/actions/markers.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { List as ImmutableList } from 'immutable';
-
-import { debounce } from 'lodash';
-
-import api from '../api';
-import { compareId } from '../compare_id';
-
-export const MARKERS_FETCH_REQUEST = 'MARKERS_FETCH_REQUEST';
-export const MARKERS_FETCH_SUCCESS = 'MARKERS_FETCH_SUCCESS';
-export const MARKERS_FETCH_FAIL    = 'MARKERS_FETCH_FAIL';
-export const MARKERS_SUBMIT_SUCCESS = 'MARKERS_SUBMIT_SUCCESS';
-
-export const synchronouslySubmitMarkers = () => (dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  // The Fetch API allows us to perform requests that will be carried out
-  // after the page closes. But that only works if the `keepalive` attribute
-  // is supported.
-  if (window.fetch && 'keepalive' in new Request('')) {
-    fetch('/api/v1/markers', {
-      keepalive: true,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify(params),
-    });
-
-    return;
-  } else if (navigator && navigator.sendBeacon) {
-    // Failing that, we can use sendBeacon, but we have to encode the data as
-    // FormData for DoorKeeper to recognize the token.
-    const formData = new FormData();
-
-    formData.append('bearer_token', accessToken);
-
-    for (const [id, value] of Object.entries(params)) {
-      formData.append(`${id}[last_read_id]`, value.last_read_id);
-    }
-
-    if (navigator.sendBeacon('/api/v1/markers', formData)) {
-      return;
-    }
-  }
-
-  // If neither Fetch nor sendBeacon worked, try to perform a synchronous
-  // request.
-  try {
-    const client = new XMLHttpRequest();
-
-    client.open('POST', '/api/v1/markers', false);
-    client.setRequestHeader('Content-Type', 'application/json');
-    client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
-    client.send(JSON.stringify(params));
-  } catch (e) {
-    // Do not make the BeforeUnload handler error out
-  }
-};
-
-const _buildParams = (state) => {
-  const params = {};
-
-  const lastHomeId         = state.getIn(['timelines', 'home', 'items'], ImmutableList()).find(item => item !== null);
-  const lastNotificationId = state.getIn(['notifications', 'lastReadId']);
-
-  if (lastHomeId && compareId(lastHomeId, state.getIn(['markers', 'home'])) > 0) {
-    params.home = {
-      last_read_id: lastHomeId,
-    };
-  }
-
-  if (lastNotificationId && compareId(lastNotificationId, state.getIn(['markers', 'notifications'])) > 0) {
-    params.notifications = {
-      last_read_id: lastNotificationId,
-    };
-  }
-
-  return params;
-};
-
-const debouncedSubmitMarkers = debounce((dispatch, getState) => {
-  const accessToken = getState().getIn(['meta', 'access_token'], '');
-  const params      = _buildParams(getState());
-
-  if (Object.keys(params).length === 0 || accessToken === '') {
-    return;
-  }
-
-  api(getState).post('/api/v1/markers', params).then(() => {
-    dispatch(submitMarkersSuccess(params));
-  }).catch(() => {});
-}, 300000, { leading: true, trailing: true });
-
-export function submitMarkersSuccess({ home, notifications }) {
-  return {
-    type: MARKERS_SUBMIT_SUCCESS,
-    home: (home || {}).last_read_id,
-    notifications: (notifications || {}).last_read_id,
-  };
-}
-
-export function submitMarkers(params = {}) {
-  const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
-
-  if (params.immediate === true) {
-    debouncedSubmitMarkers.flush();
-  }
-
-  return result;
-}
-
-export const fetchMarkers = () => (dispatch, getState) => {
-  const params = { timeline: ['notifications'] };
-
-  dispatch(fetchMarkersRequest());
-
-  api(getState).get('/api/v1/markers', { params }).then(response => {
-    dispatch(fetchMarkersSuccess(response.data));
-  }).catch(error => {
-    dispatch(fetchMarkersFail(error));
-  });
-};
-
-export function fetchMarkersRequest() {
-  return {
-    type: MARKERS_FETCH_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersSuccess(markers) {
-  return {
-    type: MARKERS_FETCH_SUCCESS,
-    markers,
-    skipLoading: true,
-  };
-}
-
-export function fetchMarkersFail(error) {
-  return {
-    type: MARKERS_FETCH_FAIL,
-    error,
-    skipLoading: true,
-    skipAlert: true,
-  };
-}
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
new file mode 100644
index 0000000000..91f78ee286
--- /dev/null
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -0,0 +1,146 @@
+import { debounce } from 'lodash';
+
+import type { MarkerJSON } from 'mastodon/api_types/markers';
+import type { AppDispatch, RootState } from 'mastodon/store';
+import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
+
+import api, { authorizationTokenFromState } from '../api';
+import { compareId } from '../compare_id';
+
+export const synchronouslySubmitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  async (_args, { getState }) => {
+    const accessToken = authorizationTokenFromState(getState);
+    const params = buildPostMarkersParams(getState());
+
+    if (Object.keys(params).length === 0 || !accessToken) {
+      return;
+    }
+
+    // The Fetch API allows us to perform requests that will be carried out
+    // after the page closes. But that only works if the `keepalive` attribute
+    // is supported.
+    if ('fetch' in window && 'keepalive' in new Request('')) {
+      await fetch('/api/v1/markers', {
+        keepalive: true,
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${accessToken}`,
+        },
+        body: JSON.stringify(params),
+      });
+
+      return;
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    } else if ('navigator' && 'sendBeacon' in navigator) {
+      // Failing that, we can use sendBeacon, but we have to encode the data as
+      // FormData for DoorKeeper to recognize the token.
+      const formData = new FormData();
+
+      formData.append('bearer_token', accessToken);
+
+      for (const [id, value] of Object.entries(params)) {
+        if (value.last_read_id)
+          formData.append(`${id}[last_read_id]`, value.last_read_id);
+      }
+
+      if (navigator.sendBeacon('/api/v1/markers', formData)) {
+        return;
+      }
+    }
+
+    // If neither Fetch nor sendBeacon worked, try to perform a synchronous
+    // request.
+    try {
+      const client = new XMLHttpRequest();
+
+      client.open('POST', '/api/v1/markers', false);
+      client.setRequestHeader('Content-Type', 'application/json');
+      client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
+      client.send(JSON.stringify(params));
+    } catch (e) {
+      // Do not make the BeforeUnload handler error out
+    }
+  },
+);
+
+interface MarkerParam {
+  last_read_id?: string;
+}
+
+function getLastNotificationId(state: RootState): string | undefined {
+  // @ts-expect-error state.notifications is not yet typed
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+  return state.getIn(['notifications', 'lastReadId']);
+}
+
+const buildPostMarkersParams = (state: RootState) => {
+  const params = {} as { home?: MarkerParam; notifications?: MarkerParam };
+
+  const lastNotificationId = getLastNotificationId(state);
+
+  if (
+    lastNotificationId &&
+    compareId(lastNotificationId, state.markers.notifications) > 0
+  ) {
+    params.notifications = {
+      last_read_id: lastNotificationId,
+    };
+  }
+
+  return params;
+};
+
+export const submitMarkersAction = createAppAsyncThunk<{
+  home: string | undefined;
+  notifications: string | undefined;
+}>('markers/submitAction', async (_args, { getState }) => {
+  const accessToken = authorizationTokenFromState(getState);
+  const params = buildPostMarkersParams(getState());
+
+  if (Object.keys(params).length === 0 || accessToken === '') {
+    return { home: undefined, notifications: undefined };
+  }
+
+  await api(getState).post<MarkerJSON>('/api/v1/markers', params);
+
+  return {
+    home: params.home?.last_read_id,
+    notifications: params.notifications?.last_read_id,
+  };
+});
+
+const debouncedSubmitMarkers = debounce(
+  (dispatch: AppDispatch) => {
+    void dispatch(submitMarkersAction());
+  },
+  300000,
+  {
+    leading: true,
+    trailing: true,
+  },
+);
+
+export const submitMarkers = createAppAsyncThunk(
+  'markers/submit',
+  (params: { immediate?: boolean }, { dispatch }) => {
+    debouncedSubmitMarkers(dispatch);
+
+    if (params.immediate) {
+      debouncedSubmitMarkers.flush();
+    }
+  },
+);
+
+export const fetchMarkers = createAppAsyncThunk(
+  'markers/fetch',
+  async (_args, { getState }) => {
+    const response = await api(getState).get<Record<string, MarkerJSON>>(
+      `/api/v1/markers`,
+      { params: { timeline: ['notifications'] } },
+    );
+
+    return { markers: response.data };
+  },
+);
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index fb041078b8..99c113f414 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -12,10 +12,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';
 
-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-export const MUTES_CHANGE_DURATION = 'MUTES_CHANGE_DURATION';
-
 export function fetchMutes() {
   return (dispatch, getState) => {
     dispatch(fetchMutesRequest());
@@ -92,26 +88,12 @@ export function expandMutesFail(error) {
 
 export function initMuteModal(account) {
   return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'MUTE' }));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
-
-export function changeMuteDuration(duration) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_CHANGE_DURATION,
-      duration,
-    });
+    dispatch(openModal({
+      modalType: 'MUTE',
+      modalProps: {
+        accountId: account.get('id'),
+        acct: account.get('acct'),
+      },
+    }));
   };
 }
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index eafbf42d1b..c8b1178d77 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -4,7 +4,7 @@ import { defineMessages } from 'react-intl';
 import { List as ImmutableList } from 'immutable';
 
 import { compareId } from 'mastodon/compare_id';
-import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
+import { enableEmojiReaction, usePendingItems as preferPendingItems } from 'mastodon/initial_state';
 
 import api, { getLinks } from '../api';
 import { unescapeHTML } from '../utils/html';
@@ -21,6 +21,7 @@ import { submitMarkers } from './markers';
 import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
+import { STATUS_EMOJI_REACTION_UPDATE } from './statuses';
 
 export * from "./notifications_typed";
 
@@ -44,6 +45,38 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
+export const NOTIFICATION_POLICY_FETCH_REQUEST = 'NOTIFICATION_POLICY_FETCH_REQUEST';
+export const NOTIFICATION_POLICY_FETCH_SUCCESS = 'NOTIFICATION_POLICY_FETCH_SUCCESS';
+export const NOTIFICATION_POLICY_FETCH_FAIL    = 'NOTIFICATION_POLICY_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
+export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
+export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
+
+export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST';
+export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS';
+export const NOTIFICATION_REQUESTS_EXPAND_FAIL    = 'NOTIFICATION_REQUESTS_EXPAND_FAIL';
+
+export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST';
+export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATION_REQUEST_FETCH_FAIL    = 'NOTIFICATION_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST';
+export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS';
+export const NOTIFICATION_REQUEST_ACCEPT_FAIL    = 'NOTIFICATION_REQUEST_ACCEPT_FAIL';
+
+export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST';
+export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
+export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
+
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
+export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
+
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
@@ -61,6 +94,14 @@ export const loadPending = () => ({
   type: NOTIFICATIONS_LOAD_PENDING,
 });
 
+export function updateEmojiReactions(emoji_reaction) {
+  return (dispatch) =>
+    dispatch({
+      type: STATUS_EMOJI_REACTION_UPDATE,
+      emoji_reaction,
+    });
+}
+
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
@@ -73,7 +114,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
     if (['mention', 'status'].includes(notification.type) && notification.status.filtered) {
       const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications'));
 
-      if (filters.some(result => result.filter.filter_action === 'hide')) {
+      if (filters.some(result => result.filter.filter_action_ex === 'hide')) {
         return;
       }
 
@@ -130,10 +171,13 @@ const excludeTypesFromFilter = filter => {
     'follow',
     'follow_request',
     'favourite',
+    'emoji_reaction',
     'reblog',
+    'status_reference',
     'mention',
     'poll',
     'status',
+    'list_status',
     'update',
     'admin.sign_up',
     'admin.report',
@@ -162,11 +206,16 @@ export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
       }
     }
 
+    let exclude_types = activeFilter === 'all'
+      ? excludeTypesFromSettings(getState())
+      : excludeTypesFromFilter(activeFilter);
+    if (!enableEmojiReaction && !exclude_types.includes('emoji_reaction')) {
+      exclude_types.push('emoji_reaction');
+    }
+
     const params = {
       max_id: maxId,
-      exclude_types: activeFilter === 'all'
-        ? excludeTypesFromSettings(getState())
-        : excludeTypesFromFilter(activeFilter),
+      exclude_types,
     };
 
     if (!params.max_id && (notifications.get('items', ImmutableList()).size + notifications.get('pendingItems', ImmutableList()).size) > 0) {
@@ -313,3 +362,270 @@ export function setBrowserPermission (value) {
     value,
   };
 }
+
+export const fetchNotificationPolicy = () => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).get('/api/v1/notifications/policy').then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationPolicyRequest = () => ({
+  type: NOTIFICATION_POLICY_FETCH_REQUEST,
+});
+
+export const fetchNotificationPolicySuccess = policy => ({
+  type: NOTIFICATION_POLICY_FETCH_SUCCESS,
+  policy,
+});
+
+export const fetchNotificationPolicyFail = error => ({
+  type: NOTIFICATION_POLICY_FETCH_FAIL,
+  error,
+});
+
+export const updateNotificationsPolicy = params => (dispatch, getState) => {
+  dispatch(fetchNotificationPolicyRequest());
+
+  api(getState).put('/api/v1/notifications/policy', params).then(({ data }) => {
+    dispatch(fetchNotificationPolicySuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationPolicyFail(err));
+  });
+};
+
+export const fetchNotificationRequests = () => (dispatch, getState) => {
+  const params = {};
+
+  if (getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  if (getState().getIn(['notificationRequests', 'items'])?.size > 0) {
+    params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']);
+  }
+
+  dispatch(fetchNotificationRequestsRequest());
+
+  api(getState).get('/api/v1/notifications/requests', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestsFail(err));
+  });
+};
+
+export const fetchNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_FETCH_REQUEST,
+});
+
+export const fetchNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  requests,
+  next,
+});
+
+export const fetchNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationRequests = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationRequestsRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
+    dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationRequestsFail(err));
+  });
+};
+
+export const expandNotificationRequestsRequest = () => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+});
+
+export const expandNotificationRequestsSuccess = (requests, next) => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  requests,
+  next,
+});
+
+export const expandNotificationRequestsFail = error => ({
+  type: NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  error,
+});
+
+export const fetchNotificationRequest = id => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+
+  if (current.getIn(['item', 'id']) === id || current.get('isLoading')) {
+    return;
+  }
+
+  dispatch(fetchNotificationRequestRequest(id));
+
+  api(getState).get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
+    dispatch(fetchNotificationRequestSuccess(data));
+  }).catch(err => {
+    dispatch(fetchNotificationRequestFail(id, err));
+  });
+};
+
+export const fetchNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_FETCH_REQUEST,
+  id,
+});
+
+export const fetchNotificationRequestSuccess = request => ({
+  type: NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  request,
+});
+
+export const fetchNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_FETCH_FAIL,
+  id,
+  error,
+});
+
+export const acceptNotificationRequest = id => (dispatch, getState) => {
+  dispatch(acceptNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
+    dispatch(acceptNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(acceptNotificationRequestFail(id, err));
+  });
+};
+
+export const acceptNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  id,
+});
+
+export const acceptNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS,
+  id,
+});
+
+export const acceptNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_ACCEPT_FAIL,
+  id,
+  error,
+});
+
+export const dismissNotificationRequest = id => (dispatch, getState) => {
+  dispatch(dismissNotificationRequestRequest(id));
+
+  api(getState).post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
+    dispatch(dismissNotificationRequestSuccess(id));
+  }).catch(err => {
+    dispatch(dismissNotificationRequestFail(id, err));
+  });
+};
+
+export const dismissNotificationRequestRequest = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  id,
+});
+
+export const dismissNotificationRequestSuccess = id => ({
+  type: NOTIFICATION_REQUEST_DISMISS_SUCCESS,
+  id,
+});
+
+export const dismissNotificationRequestFail = (id, error) => ({
+  type: NOTIFICATION_REQUEST_DISMISS_FAIL,
+  id,
+  error,
+});
+
+export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
+  const current = getState().getIn(['notificationRequests', 'current']);
+  const params = { account_id: accountId };
+
+  if (current.getIn(['item', 'account']) === accountId) {
+    if (current.getIn(['notifications', 'isLoading'])) {
+      return;
+    }
+
+    if (current.getIn(['notifications', 'items'])?.size > 0) {
+      params.since_id = current.getIn(['notifications', 'items', 0, 'id']);
+    }
+  }
+
+  dispatch(fetchNotificationsForRequestRequest());
+
+  api(getState).get('/api/v1/notifications', { params }).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
+    dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(fetchNotificationsForRequestFail(err));
+  });
+};
+
+export const fetchNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+});
+
+export const fetchNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  notifications,
+  next,
+});
+
+export const fetchNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  error,
+});
+
+export const expandNotificationsForRequest = () => (dispatch, getState) => {
+  const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']);
+
+  if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) {
+    return;
+  }
+
+  dispatch(expandNotificationsForRequestRequest());
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next');
+    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
+    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
+    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
+
+    dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
+  }).catch(err => {
+    dispatch(expandNotificationsForRequestFail(err));
+  });
+};
+
+export const expandNotificationsForRequestRequest = () => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+});
+
+export const expandNotificationsForRequestSuccess = (notifications, next) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  notifications,
+  next,
+});
+
+export const expandNotificationsForRequestFail = (error) => ({
+  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+  error,
+});
diff --git a/app/javascript/mastodon/actions/picture_in_picture.js b/app/javascript/mastodon/actions/picture_in_picture.js
deleted file mode 100644
index 898375abeb..0000000000
--- a/app/javascript/mastodon/actions/picture_in_picture.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// @ts-check
-
-export const PICTURE_IN_PICTURE_DEPLOY = 'PICTURE_IN_PICTURE_DEPLOY';
-export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
-
-/**
- * @typedef MediaProps
- * @property {string} src
- * @property {boolean} muted
- * @property {number} volume
- * @property {number} currentTime
- * @property {string} poster
- * @property {string} backgroundColor
- * @property {string} foregroundColor
- * @property {string} accentColor
- */
-
-/**
- * @param {string} statusId
- * @param {string} accountId
- * @param {string} playerType
- * @param {MediaProps} props
- * @returns {object}
- */
-export const deployPictureInPicture = (statusId, accountId, playerType, props) => {
-  // @ts-expect-error
-  return (dispatch, getState) => {
-    // Do not open a player for a toot that does not exist
-    if (getState().hasIn(['statuses', statusId])) {
-      dispatch({
-        type: PICTURE_IN_PICTURE_DEPLOY,
-        statusId,
-        accountId,
-        playerType,
-        props,
-      });
-    }
-  };
-};
-
-/*
- * @return {object}
- */
-export const removePictureInPicture = () => ({
-  type: PICTURE_IN_PICTURE_REMOVE,
-});
diff --git a/app/javascript/mastodon/actions/picture_in_picture.ts b/app/javascript/mastodon/actions/picture_in_picture.ts
new file mode 100644
index 0000000000..d34b508a33
--- /dev/null
+++ b/app/javascript/mastodon/actions/picture_in_picture.ts
@@ -0,0 +1,31 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { PIPMediaProps } from 'mastodon/reducers/picture_in_picture';
+import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
+
+interface DeployParams {
+  statusId: string;
+  accountId: string;
+  playerType: 'audio' | 'video';
+  props: PIPMediaProps;
+}
+
+export const removePictureInPicture = createAction('pip/remove');
+
+export const deployPictureInPictureAction =
+  createAction<DeployParams>('pip/deploy');
+
+export const deployPictureInPicture = createAppAsyncThunk(
+  'pip/deploy',
+  (args: DeployParams, { dispatch, getState }) => {
+    const { statusId } = args;
+
+    // Do not open a player for a toot that does not exist
+
+    // @ts-expect-error state.statuses is not yet typed
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    if (getState().hasIn(['statuses', statusId])) {
+      dispatch(deployPictureInPictureAction(args));
+    }
+  },
+);
diff --git a/app/javascript/mastodon/actions/reaction_deck.js b/app/javascript/mastodon/actions/reaction_deck.js
new file mode 100644
index 0000000000..11510d5d0d
--- /dev/null
+++ b/app/javascript/mastodon/actions/reaction_deck.js
@@ -0,0 +1,79 @@
+import api from '../api';
+
+export const REACTION_DECK_FETCH_REQUEST = 'REACTION_DECK_FETCH_REQUEST';
+export const REACTION_DECK_FETCH_SUCCESS = 'REACTION_DECK_FETCH_SUCCESS';
+export const REACTION_DECK_FETCH_FAIL    = 'REACTION_DECK_FETCH_FAIL';
+
+export const REACTION_DECK_UPDATE_REQUEST = 'REACTION_DECK_UPDATE_REQUEST';
+export const REACTION_DECK_UPDATE_SUCCESS = 'REACTION_DECK_UPDATE_SUCCESS';
+export const REACTION_DECK_UPDATE_FAIL = 'REACTION_DECK_UPDATE_FAIL';
+
+export function fetchReactionDeck() {
+  return (dispatch, getState) => {
+    dispatch(fetchReactionDeckRequest());
+
+    api(getState).get('/api/v1/reaction_deck').then(response => {
+      dispatch(fetchReactionDeckSuccess(response.data));
+    }).catch(error => {
+      dispatch(fetchReactionDeckFail(error));
+    });
+  };
+}
+
+export function fetchReactionDeckRequest() {
+  return {
+    type: REACTION_DECK_FETCH_REQUEST,
+    skipLoading: true,
+  };
+}
+
+export function fetchReactionDeckSuccess(emojis) {
+  return {
+    type: REACTION_DECK_FETCH_SUCCESS,
+    emojis,
+    skipLoading: true,
+  };
+}
+
+export function fetchReactionDeckFail(error) {
+  return {
+    type: REACTION_DECK_FETCH_FAIL,
+    error,
+    skipLoading: true,
+  };
+}
+
+export function updateReactionDeck(emojis) {
+  return (dispatch, getState) => {
+    dispatch(updateReactionDeckRequest());
+
+    api(getState).post('/api/v1/reaction_deck', { emojis }).then(response => {
+      dispatch(updateReactionDeckSuccess(response.data));
+    }).catch(error => {
+      dispatch(updateReactionDeckFail(error));
+    });
+  };
+}
+
+export function updateReactionDeckRequest() {
+  return {
+    type: REACTION_DECK_UPDATE_REQUEST,
+    skipLoading: true,
+  };
+}
+
+export function updateReactionDeckSuccess(emojis) {
+  return {
+    type: REACTION_DECK_UPDATE_SUCCESS,
+    emojis,
+    skipLoading: true,
+  };
+}
+
+export function updateReactionDeckFail(error) {
+  return {
+    type: REACTION_DECK_UPDATE_FAIL,
+    error,
+    skipLoading: true,
+  };
+}
diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index 38a089b486..a34a490e76 100644
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -179,6 +179,11 @@ export const openURL = (value, history, onFailure) => (dispatch, getState) => {
 
 export const clickSearchResult = (q, type) => (dispatch, getState) => {
   const previous = getState().getIn(['search', 'recent']);
+
+  if (previous.some(x => x.get('q') === q && x.get('type') === type)) {
+    return;
+  }
+
   const me = getState().getIn(['meta', 'me']);
   const current = previous.add(fromJS({ type, q })).takeLast(4);
 
@@ -207,4 +212,4 @@ export const hydrateSearch = () => (dispatch, getState) => {
   if (history !== null) {
     dispatch(updateSearchHistory(history));
   }
-};
\ No newline at end of file
+};
diff --git a/app/javascript/mastodon/actions/settings.js b/app/javascript/mastodon/actions/settings.js
index 3685b0684e..fbd89f9d4b 100644
--- a/app/javascript/mastodon/actions/settings.js
+++ b/app/javascript/mastodon/actions/settings.js
@@ -20,7 +20,7 @@ export function changeSetting(path, value) {
 }
 
 const debouncedSave = debounce((dispatch, getState) => {
-  if (getState().getIn(['settings', 'saved'])) {
+  if (getState().getIn(['settings', 'saved']) || !getState().getIn(['meta', 'me'])) {
     return;
   }
 
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3aed807358..9807e6f67c 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -39,6 +39,8 @@ export const STATUS_TRANSLATE_SUCCESS = 'STATUS_TRANSLATE_SUCCESS';
 export const STATUS_TRANSLATE_FAIL    = 'STATUS_TRANSLATE_FAIL';
 export const STATUS_TRANSLATE_UNDO    = 'STATUS_TRANSLATE_UNDO';
 
+export const STATUS_EMOJI_REACTION_UPDATE = 'STATUS_EMOJI_REACTION_UPDATE';
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
@@ -178,9 +180,9 @@ export function fetchContext(id) {
   return (dispatch, getState) => {
     dispatch(fetchContextRequest(id));
 
-    api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
-      dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants)));
-      dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
+    api(getState).get(`/api/v1/statuses/${id}/context?with_reference=1`).then(response => {
+      dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants).concat(response.data.references)));
+      dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants, response.data.references));
 
     }).catch(error => {
       if (error.response && error.response.status === 404) {
@@ -199,12 +201,13 @@ export function fetchContextRequest(id) {
   };
 }
 
-export function fetchContextSuccess(id, ancestors, descendants) {
+export function fetchContextSuccess(id, ancestors, descendants, references) {
   return {
     type: CONTEXT_FETCH_SUCCESS,
     id,
     ancestors,
     descendants,
+    references,
     statuses: ancestors.concat(descendants),
   };
 }
@@ -348,3 +351,8 @@ export const undoStatusTranslation = (id, pollId) => ({
   id,
   pollId,
 });
+
+export const updateEmojiReaction = (emoji_reaction) => ({
+  type: STATUS_EMOJI_REACTION_UPDATE,
+  emoji_reaction,
+});
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 9daeb3c60f..6517e5ad20 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -10,7 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
-import { updateNotifications, expandNotifications } from './notifications';
+import { updateNotifications, expandNotifications, updateEmojiReactions } from './notifications';
 import { updateStatus } from './statuses';
 import {
   updateTimeline,
@@ -22,6 +22,7 @@ import {
   fillPublicTimelineGaps,
   fillCommunityTimelineGaps,
   fillListTimelineGaps,
+  fillAntennaTimelineGaps,
 } from './timelines';
 
 /**
@@ -102,6 +103,10 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           // @ts-expect-error
           dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
           break;
+        case 'emoji_reaction':
+          // @ts-expect-error
+          dispatch(updateEmojiReactions(JSON.parse(data.payload)));
+          break;
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
@@ -181,3 +186,10 @@ export const connectDirectStream = () =>
  */
 export const connectListStream = listId =>
   connectTimelineStream(`list:${listId}`, 'list', { list: listId }, { fillGaps: () => fillListTimelineGaps(listId) });
+
+/**
+ * @param {string} antennaId
+ * @returns {function(): void}
+ */
+export const connectAntennaStream = antennaId =>
+  connectTimelineStream(`antenna:${antennaId}`, 'antenna', { antenna: antennaId }, { fillGaps: () => fillAntennaTimelineGaps(antennaId) });
diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
index 870a311024..8eafe38b21 100644
--- a/app/javascript/mastodon/actions/suggestions.js
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -54,12 +54,5 @@ export const dismissSuggestion = accountId => (dispatch, getState) => {
     id: accountId,
   });
 
-  api(getState).delete(`/api/v1/suggestions/${accountId}`).then(() => {
-    dispatch(fetchSuggestionsRequest());
-
-    api(getState).get('/api/v2/suggestions').then(response => {
-      dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-      dispatch(fetchSuggestionsSuccess(response.data));
-    }).catch(error => dispatch(fetchSuggestionsFail(error)));
-  }).catch(() => {});
+  api(getState).delete(`/api/v1/suggestions/${accountId}`).catch(() => {});
 };
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 08561c71f4..786eb7e4b3 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -21,6 +21,10 @@ export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
 export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
 
 export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
+export const TIMELINE_INSERT          = 'TIMELINE_INSERT';
+
+export const TIMELINE_SUGGESTIONS = 'inline-follow-suggestions';
+export const TIMELINE_GAP = null;
 
 export const loadPending = timeline => ({
   type: TIMELINE_LOAD_PENDING,
@@ -112,9 +116,19 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
+
       dispatch(importFetchedStatuses(response.data));
       dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
 
+      if (timelineId === 'home' && !isLoadingMore && !isLoadingRecent) {
+        const now = new Date();
+        const fittingIndex = response.data.findIndex(status => now - (new Date(status.created_at)) > 4 * 3600 * 1000);
+
+        if (fittingIndex !== -1) {
+          dispatch(insertIntoTimeline(timelineId, TIMELINE_SUGGESTIONS, Math.max(1, fittingIndex)));
+        }
+      }
+
       if (timelineId === 'home') {
         dispatch(submitMarkers());
       }
@@ -149,6 +163,7 @@ export const expandAccountTimeline         = (accountId, { maxId, withReplies, t
 export const expandAccountFeaturedTimeline = (accountId, { tagged } = {}) => expandTimeline(`account:${accountId}:pinned${tagged ? `:${tagged}` : ''}`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true, tagged });
 export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
 export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
+export const expandAntennaTimeline         = (id, { maxId } = {}, done = noOp) => expandTimeline(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, { max_id: maxId }, done);
 export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
   return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
     max_id: maxId,
@@ -163,6 +178,7 @@ export const fillHomeTimelineGaps      = (done = noOp) => fillTimelineGaps('home
 export const fillPublicTimelineGaps    = ({ onlyMedia, onlyRemote } = {}, done = noOp) => fillTimelineGaps(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, only_media: !!onlyMedia }, done);
 export const fillCommunityTimelineGaps = ({ onlyMedia } = {}, done = noOp) => fillTimelineGaps(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, only_media: !!onlyMedia }, done);
 export const fillListTimelineGaps      = (id, done = noOp) => fillTimelineGaps(`list:${id}`, `/api/v1/timelines/list/${id}`, {}, done);
+export const fillAntennaTimelineGaps   = (id, done = noOp) => fillTimelineGaps(`antenna:${id}`, `/api/v1/timelines/antenna/${id}`, {}, done);
 
 export function expandTimelineRequest(timeline, isLoadingMore) {
   return {
@@ -221,3 +237,10 @@ export const markAsPartial = timeline => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
 });
+
+export const insertIntoTimeline = (timeline, key, index) => ({
+  type: TIMELINE_INSERT,
+  timeline,
+  index,
+  key,
+});
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index f262fd8570..de597a3e3b 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -29,9 +29,14 @@ const setCSRFHeader = () => {
 
 void ready(setCSRFHeader);
 
+export const authorizationTokenFromState = (getState?: GetState) => {
+  return (
+    getState && (getState().meta.get('access_token', '') as string | false)
+  );
+};
+
 const authorizationHeaderFromState = (getState?: GetState) => {
-  const accessToken =
-    getState && (getState().meta.get('access_token', '') as string);
+  const accessToken = authorizationTokenFromState(getState);
 
   if (!accessToken) {
     return {};
diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts
index 5bf3e64288..41694af4b4 100644
--- a/app/javascript/mastodon/api_types/accounts.ts
+++ b/app/javascript/mastodon/api_types/accounts.ts
@@ -12,6 +12,32 @@ export interface ApiAccountRoleJSON {
   name: string;
 }
 
+export interface ApiAccountOtherSettingsJSON {
+  noindex: boolean;
+  hide_network: boolean;
+  hide_statuses_count: boolean;
+  hide_following_count: boolean;
+  hide_followers_count: boolean;
+  translatable_private: boolean;
+  link_preview: boolean;
+  allow_quote: boolean;
+  emoji_reaction_policy:
+    | 'allow'
+    | 'outside_only'
+    | 'following_only'
+    | 'followers_only'
+    | 'mutuals_only'
+    | 'block';
+  subscription_policy: 'allow' | 'followers_only' | 'block';
+}
+
+export interface ApiServerFeaturesJSON {
+  circle: boolean;
+  emoji_reaction: boolean;
+  quote: boolean;
+  status_reference: boolean;
+}
+
 // See app/serializers/rest/account_serializer.rb
 export interface ApiAccountJSON {
   acct: string;
@@ -22,6 +48,7 @@ export interface ApiAccountJSON {
   discoverable: boolean;
   indexable: boolean;
   display_name: string;
+  emoji_reaction_available_server: boolean;
   emojis: ApiCustomEmojiJSON[];
   fields: ApiAccountFieldJSON[];
   followers_count: number;
@@ -34,7 +61,10 @@ export interface ApiAccountJSON {
   locked: boolean;
   noindex?: boolean;
   note: string;
+  other_settings: ApiAccountOtherSettingsJSON;
   roles?: ApiAccountJSON[];
+  server_features: ApiServerFeaturesJSON;
+  subscribable: boolean;
   statuses_count: number;
   uri: string;
   url: string;
diff --git a/app/javascript/mastodon/api_types/custom_emoji.ts b/app/javascript/mastodon/api_types/custom_emoji.ts
index 05144d6f68..9f25e6e410 100644
--- a/app/javascript/mastodon/api_types/custom_emoji.ts
+++ b/app/javascript/mastodon/api_types/custom_emoji.ts
@@ -5,4 +5,9 @@ export interface ApiCustomEmojiJSON {
   url: string;
   category?: string;
   visible_in_picker: boolean;
+  width?: number;
+  height?: number;
+  sensitive?: boolean;
+  aliases?: string[];
+  license?: string;
 }
diff --git a/app/javascript/mastodon/api_types/markers.ts b/app/javascript/mastodon/api_types/markers.ts
new file mode 100644
index 0000000000..f7664fd7c1
--- /dev/null
+++ b/app/javascript/mastodon/api_types/markers.ts
@@ -0,0 +1,7 @@
+// See app/serializers/rest/account_serializer.rb
+
+export interface MarkerJSON {
+  last_read_id: string;
+  version: string;
+  updated_at: string;
+}
diff --git a/app/javascript/mastodon/api_types/media_attachments.ts b/app/javascript/mastodon/api_types/media_attachments.ts
new file mode 100644
index 0000000000..fc027ccd2a
--- /dev/null
+++ b/app/javascript/mastodon/api_types/media_attachments.ts
@@ -0,0 +1,22 @@
+// See app/serializers/rest/media_attachment_serializer.rb
+
+export type MediaAttachmentType =
+  | 'image'
+  | 'gifv'
+  | 'video'
+  | 'unknown'
+  | 'audio';
+
+export interface ApiMediaAttachmentJSON {
+  id: string;
+  type: MediaAttachmentType;
+  url: string;
+  preview_url: string;
+  remoteUrl: string;
+  preview_remote_url: string;
+  text_url: string;
+  // TODO: how to define this?
+  meta: unknown;
+  description?: string;
+  blurhash: string;
+}
diff --git a/app/javascript/mastodon/api_types/polls.ts b/app/javascript/mastodon/api_types/polls.ts
new file mode 100644
index 0000000000..8181f7b813
--- /dev/null
+++ b/app/javascript/mastodon/api_types/polls.ts
@@ -0,0 +1,23 @@
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+
+// See app/serializers/rest/poll_serializer.rb
+
+export interface ApiPollOptionJSON {
+  title: string;
+  votes_count: number;
+}
+
+export interface ApiPollJSON {
+  id: string;
+  expires_at: string;
+  expired: boolean;
+  multiple: boolean;
+  votes_count: number;
+  voters_count: number;
+
+  options: ApiPollOptionJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  voted: boolean;
+  own_votes: number[];
+}
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
new file mode 100644
index 0000000000..51dccd14d6
--- /dev/null
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -0,0 +1,97 @@
+// See app/serializers/rest/status_serializer.rb
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+import type { ApiMediaAttachmentJSON } from './media_attachments';
+import type { ApiPollJSON } from './polls';
+
+// See app/modals/status.rb visibility+limited_scope
+export type StatusVisibility =
+  | 'public'
+  | 'unlisted'
+  | 'private'
+  | 'direct'
+  | 'public_unlisted'
+  | 'login'
+  | 'mutual'
+  | 'circle'
+  | 'personal'
+  | 'reply'
+  | 'limited';
+
+export interface ApiStatusApplicationJSON {
+  name: string;
+  website: string;
+}
+
+export interface ApiTagJSON {
+  name: string;
+  url: string;
+}
+
+export interface ApiMentionJSON {
+  id: string;
+  username: string;
+  url: string;
+  acct: string;
+}
+
+export interface ApiPreviewCardJSON {
+  url: string;
+  title: string;
+  description: string;
+  language: string;
+  type: string;
+  author_name: string;
+  author_url: string;
+  provider_name: string;
+  provider_url: string;
+  html: string;
+  width: number;
+  height: number;
+  image: string;
+  image_description: string;
+  embed_url: string;
+  blurhash: string;
+  published_at: string;
+}
+
+export interface ApiStatusJSON {
+  id: string;
+  created_at: string;
+  in_reply_to_id?: string;
+  in_reply_to_account_id?: string;
+  sensitive: boolean;
+  spoiler_text?: string;
+  visibility: StatusVisibility;
+  language: string;
+  uri: string;
+  url: string;
+  replies_count: number;
+  reblogs_count: number;
+  favorites_count: number;
+  edited_at?: string;
+
+  favorited?: boolean;
+  reblogged?: boolean;
+  muted?: boolean;
+  bookmarked?: boolean;
+  pinned?: boolean;
+
+  // filtered: FilterResult[]
+  filtered: unknown; // TODO
+  content?: string;
+  text?: string;
+
+  reblog?: ApiStatusJSON;
+  application?: ApiStatusApplicationJSON;
+  account: ApiAccountJSON;
+  media_attachments: ApiMediaAttachmentJSON[];
+  mentions: ApiMentionJSON[];
+
+  tags: ApiTagJSON[];
+  emojis: ApiCustomEmojiJSON[];
+
+  card?: ApiPreviewCardJSON;
+  poll?: ApiPollJSON;
+}
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 0ec8449343..511568aa0f 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -2,7 +2,7 @@ import Rails from '@rails/ujs';
 import 'font-awesome/css/font-awesome.css';
 
 export function start() {
-  require.context('../images/', true);
+  require.context('../images/', true, /\.(jpg|png|svg)$/);
 
   try {
     Rails.start();
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
index 1c37278483..dc955b7abe 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
@@ -9,7 +9,11 @@ exports[`<AutosuggestEmoji /> renders emoji with custom url 1`] = `
     className="emojione"
     src="http://example.com/emoji.png"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
 
@@ -22,6 +26,10 @@ exports[`<AutosuggestEmoji /> renders native emoji 1`] = `
     className="emojione"
     src="/emoji/1f499.svg"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index f82dd9153a..980dc9e100 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -1,17 +1,19 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { EmptyAccount } from 'mastodon/components/empty_account';
 import { ShortNumber } from 'mastodon/components/short_number';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';
 
+import DropdownMenuContainer from '../containers/dropdown_menu_container';
 import { me } from '../initial_state';
 
 import { Avatar } from './avatar';
@@ -30,151 +32,162 @@ const messages = defineMessages({
   unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' },
   mute: { id: 'account.mute_short', defaultMessage: 'Mute' },
   block: { id: 'account.block_short', defaultMessage: 'Block' },
+  more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-class Account extends ImmutablePureComponent {
+const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifications, hidden, hideButtons, minimal, defaultAction, children, withBio }) => {
+  const intl = useIntl();
 
-  static propTypes = {
-    size: PropTypes.number,
-    account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onMuteNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    hidden: PropTypes.bool,
-    minimal: PropTypes.bool,
-    defaultAction: PropTypes.string,
-    withBio: PropTypes.bool,
-  };
+  const handleFollow = useCallback(() => {
+    onFollow(account);
+  }, [onFollow, account]);
 
-  static defaultProps = {
-    size: 46,
-  };
+  const handleBlock = useCallback(() => {
+    onBlock(account);
+  }, [onBlock, account]);
 
-  handleFollow = () => {
-    this.props.onFollow(this.props.account);
-  };
+  const handleMute = useCallback(() => {
+    onMute(account);
+  }, [onMute, account]);
 
-  handleBlock = () => {
-    this.props.onBlock(this.props.account);
-  };
+  const handleMuteNotifications = useCallback(() => {
+    onMuteNotifications(account, true);
+  }, [onMuteNotifications, account]);
 
-  handleMute = () => {
-    this.props.onMute(this.props.account);
-  };
+  const handleUnmuteNotifications = useCallback(() => {
+    onMuteNotifications(account, false);
+  }, [onMuteNotifications, account]);
 
-  handleMuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, true);
-  };
-
-  handleUnmuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, false);
-  };
-
-  render () {
-    const { account, intl, hidden, withBio, defaultAction, size, minimal } = this.props;
-
-    if (!account) {
-      return <EmptyAccount size={size} minimal={minimal} />;
-    }
-
-    if (hidden) {
-      return (
-        <>
-          {account.get('display_name')}
-          {account.get('username')}
-        </>
-      );
-    }
-
-    let buttons;
-
-    if (account.get('id') !== me && account.get('relationship', null) !== null) {
-      const following = account.getIn(['relationship', 'following']);
-      const requested = account.getIn(['relationship', 'requested']);
-      const blocking  = account.getIn(['relationship', 'blocking']);
-      const muting  = account.getIn(['relationship', 'muting']);
-
-      if (requested) {
-        buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={this.handleFollow} />;
-      } else if (blocking) {
-        buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
-      } else if (muting) {
-        let hidingNotificationsButton;
-
-        if (account.getIn(['relationship', 'muting_notifications'])) {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.unmute_notifications)} onClick={this.handleUnmuteNotifications} />;
-        } else {
-          hidingNotificationsButton = <Button text={intl.formatMessage(messages.mute_notifications)} onClick={this.handleMuteNotifications} />;
-        }
-
-        buttons = (
-          <>
-            <Button text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />
-            {hidingNotificationsButton}
-          </>
-        );
-      } else if (defaultAction === 'mute') {
-        buttons = <Button title={intl.formatMessage(messages.mute)} onClick={this.handleMute} />;
-      } else if (defaultAction === 'block') {
-        buttons = <Button text={intl.formatMessage(messages.block)} onClick={this.handleBlock} />;
-      } else if (!account.get('suspended') && !account.get('moved') || following) {
-        buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
-      }
-    }
-
-    let muteTimeRemaining;
-
-    if (account.get('mute_expires_at')) {
-      muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
-    }
-
-    let verification;
-
-    const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
-
-    if (firstVerifiedField) {
-      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
-    }
+  if (!account) {
+    return <EmptyAccount size={size} minimal={minimal} />;
+  }
 
+  if (hidden) {
     return (
-      <div className={classNames('account', { 'account--minimal': minimal })}>
-        <div className='account__wrapper'>
-          <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
-            <div className='account__avatar-wrapper'>
-              <Avatar account={account} size={size} />
-            </div>
-
-            <div className='account__contents'>
-              <DisplayName account={account} />
-              {!minimal && (
-                <div className='account__details'>
-                  <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
-                </div>
-              )}
-            </div>
-          </Link>
-
-          {!minimal && (
-            <div className='account__relationship'>
-              {buttons}
-            </div>
-          )}
-        </div>
-
-        {withBio && (account.get('note').length > 0 ? (
-          <div
-            className='account__note translate'
-            dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
-          />
-        ) : (
-          <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
-        ))}
-      </div>
+      <>
+        {account.get('display_name')}
+        {account.get('username')}
+      </>
     );
   }
 
-}
+  let buttons;
 
-export default injectIntl(Account);
+  if (!hideButtons && account.get('id') !== me && account.get('relationship', null) !== null) {
+    const following = account.getIn(['relationship', 'following']);
+    const requested = account.getIn(['relationship', 'requested']);
+    const blocking  = account.getIn(['relationship', 'blocking']);
+    const muting  = account.getIn(['relationship', 'muting']);
+
+    if (requested) {
+      buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={handleFollow} />;
+    } else if (blocking) {
+      buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={handleBlock} />;
+    } else if (muting) {
+      let menu;
+
+      if (account.getIn(['relationship', 'muting_notifications'])) {
+        menu = [{ text: intl.formatMessage(messages.unmute_notifications), action: handleUnmuteNotifications }];
+      } else {
+        menu = [{ text: intl.formatMessage(messages.mute_notifications), action: handleMuteNotifications }];
+      }
+
+      buttons = (
+        <>
+          <DropdownMenuContainer
+            items={menu}
+            icon='ellipsis-h'
+            iconComponent={MoreHorizIcon}
+            direction='right'
+            title={intl.formatMessage(messages.more)}
+          />
+
+          <Button text={intl.formatMessage(messages.unmute)} onClick={handleMute} />
+        </>
+      );
+    } else if (defaultAction === 'mute') {
+      buttons = <Button title={intl.formatMessage(messages.mute)} onClick={handleMute} />;
+    } else if (defaultAction === 'block') {
+      buttons = <Button text={intl.formatMessage(messages.block)} onClick={handleBlock} />;
+    } else if (!account.get('suspended') && !account.get('moved') || following) {
+      buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={handleFollow} />;
+    }
+  }
+
+  let muteTimeRemaining;
+
+  if (account.get('mute_expires_at')) {
+    muteTimeRemaining = <>· <RelativeTimestamp timestamp={account.get('mute_expires_at')} futureDate /></>;
+  }
+
+  let verification;
+
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+
+  if (firstVerifiedField) {
+    verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
+  }
+
+  return (
+    <div className={classNames('account', { 'account--minimal': minimal })}>
+      <div className='account__wrapper'>
+        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+          <div className='account__avatar-wrapper'>
+            <Avatar account={account} size={size} />
+          </div>
+
+          <div className='account__contents'>
+            <DisplayName account={account} />
+            {!minimal && (
+              <div className='account__details'>
+                <ShortNumber value={account.get('followers_count')} renderer={FollowersCounter} /> {verification} {muteTimeRemaining}
+              </div>
+            )}
+          </div>
+        </Link>
+
+        {!minimal && children && (
+          <div>
+            <div>
+              {children}
+            </div>
+            <div className='account__relationship'>
+              {buttons}
+            </div>
+          </div>
+        )}
+        {!minimal && !children && (
+          <div className='account__relationship'>
+            {buttons}
+          </div>
+        )}
+      </div>
+
+      {withBio && (account.get('note').length > 0 ? (
+        <div
+          className='account__note translate'
+          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+        />
+      ) : (
+        <div className='account__note account__note--missing'><FormattedMessage id='account.no_bio' defaultMessage='No description provided.' /></div>
+      ))}
+    </div>
+  );
+};
+
+Account.propTypes = {
+  size: PropTypes.number,
+  account: ImmutablePropTypes.record,
+  onFollow: PropTypes.func,
+  onBlock: PropTypes.func,
+  onMute: PropTypes.func,
+  onMuteNotifications: PropTypes.func,
+  hidden: PropTypes.bool,
+  hideButtons: PropTypes.bool,
+  minimal: PropTypes.bool,
+  defaultAction: PropTypes.string,
+  withBio: PropTypes.bool,
+  children: PropTypes.any,
+};
+
+export default Account;
diff --git a/app/javascript/mastodon/components/admin/Counter.jsx b/app/javascript/mastodon/components/admin/Counter.jsx
index 6ce23c9f05..9fd9ab9cd3 100644
--- a/app/javascript/mastodon/components/admin/Counter.jsx
+++ b/app/javascript/mastodon/components/admin/Counter.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedNumber } from 'react-intl';
+import { FormattedNumber, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
@@ -43,6 +43,7 @@ export default class Counter extends PureComponent {
   state = {
     loading: true,
     data: null,
+    empty: false,
   };
 
   componentDidMount () {
@@ -52,6 +53,7 @@ export default class Counter extends PureComponent {
       this.setState({
         loading: false,
         data: res.data,
+        empty: res.data.length === 0,
       });
     }).catch(err => {
       console.error(err);
@@ -60,7 +62,7 @@ export default class Counter extends PureComponent {
 
   render () {
     const { label, href, target } = this.props;
-    const { loading, data } = this.state;
+    const { loading, data, empty } = this.state;
 
     let content;
 
@@ -71,6 +73,12 @@ export default class Counter extends PureComponent {
           <span className='sparkline__value__change'><Skeleton width={43} /></span>
         </>
       );
+    } else if (empty) {
+      content = (
+        <span className='sparkline__value__change'>
+          <FormattedMessage id='admin.dimenssions.disabled_key' defaultMessage='This information is invalid.' />
+        </span>
+      );
     } else {
       const measure = data[0];
       const percentChange = measure.previous_total && percIncrease(measure.previous_total * 1, measure.total * 1);
@@ -94,7 +102,7 @@ export default class Counter extends PureComponent {
         </div>
 
         <div className='sparkline__graph'>
-          {!loading && (
+          {!loading && !empty && (
             <Sparklines width={259} height={55} data={data[0].data.map(x => x.value * 1)}>
               <SparklinesCurve />
             </Sparklines>
diff --git a/app/javascript/mastodon/components/admin/Dimension.jsx b/app/javascript/mastodon/components/admin/Dimension.jsx
index bfda6c93d7..1ba68fd169 100644
--- a/app/javascript/mastodon/components/admin/Dimension.jsx
+++ b/app/javascript/mastodon/components/admin/Dimension.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedNumber } from 'react-intl';
+import { FormattedNumber, FormattedMessage } from 'react-intl';
 
 import api from 'mastodon/api';
 import { Skeleton } from 'mastodon/components/skeleton';
@@ -21,6 +21,7 @@ export default class Dimension extends PureComponent {
   state = {
     loading: true,
     data: null,
+    empty: false,
   };
 
   componentDidMount () {
@@ -30,6 +31,7 @@ export default class Dimension extends PureComponent {
       this.setState({
         loading: false,
         data: res.data,
+        empty: res.data.length === 0,
       });
     }).catch(err => {
       console.error(err);
@@ -38,7 +40,7 @@ export default class Dimension extends PureComponent {
 
   render () {
     const { label, limit } = this.props;
-    const { loading, data } = this.state;
+    const { loading, data, empty } = this.state;
 
     let content;
 
@@ -60,6 +62,18 @@ export default class Dimension extends PureComponent {
           </tbody>
         </table>
       );
+    } else if (empty) {
+      content = (
+        <table>
+          <tbody>
+            <tr className='dimension__item'>
+              <td className='dimension__item__value' colSpan={2}>
+                <FormattedMessage id='admin.dimenssions.disabled_key' defaultMessage='This information is invalid.' />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      );
     } else {
       const sum = data[0].data.reduce((sum, cur) => sum + (cur.value * 1), 0);
 
diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
index ecce92b309..90f4334a6e 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
@@ -124,7 +124,7 @@ class ReportReasonSelector extends PureComponent {
 
     api().put(`/api/v1/admin/reports/${id}`, {
       category,
-      rule_ids,
+      rule_ids: category === 'violation' ? rule_ids : [],
     }).catch(err => {
       console.error(err);
     });
diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx
index 59d31a3038..c5ac046751 100644
--- a/app/javascript/mastodon/components/attachment_list.jsx
+++ b/app/javascript/mastodon/components/attachment_list.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
+import LinkIcon from '@/material-icons/400-24px/link.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
diff --git a/app/javascript/mastodon/components/autosuggest_emoji.jsx b/app/javascript/mastodon/components/autosuggest_emoji.jsx
index 28f628b4ac..adea1d9f4b 100644
--- a/app/javascript/mastodon/components/autosuggest_emoji.jsx
+++ b/app/javascript/mastodon/components/autosuggest_emoji.jsx
@@ -35,7 +35,7 @@ export default class AutosuggestEmoji extends PureComponent {
           alt={emoji.native || emoji.colons}
         />
 
-        {emoji.colons}
+        <div className='autosuggest-emoji__name'>{emoji.colons}</div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_hashtag.tsx b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
index e83d493c2c..036946b0f1 100644
--- a/app/javascript/mastodon/components/autosuggest_hashtag.tsx
+++ b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
@@ -1,5 +1,3 @@
-import { FormattedMessage } from 'react-intl';
-
 import { ShortNumber } from 'mastodon/components/short_number';
 
 interface Props {
@@ -16,27 +14,18 @@ interface Props {
   };
 }
 
-export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => {
-  const weeklyUses = tag.history && (
-    <ShortNumber
-      value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
-    />
-  );
-
-  return (
-    <div className='autosuggest-hashtag'>
-      <div className='autosuggest-hashtag__name'>
-        #<strong>{tag.name}</strong>
-      </div>
-      {tag.history !== undefined && (
-        <div className='autosuggest-hashtag__uses'>
-          <FormattedMessage
-            id='autosuggest_hashtag.per_week'
-            defaultMessage='{count} per week'
-            values={{ count: weeklyUses }}
-          />
-        </div>
-      )}
+export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => (
+  <div className='autosuggest-hashtag'>
+    <div className='autosuggest-hashtag__name'>
+      #<strong>{tag.name}</strong>
     </div>
-  );
-};
+
+    {tag.history !== undefined && (
+      <div className='autosuggest-hashtag__uses'>
+        <ShortNumber
+          value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
+        />
+      </div>
+    )}
+  </div>
+);
diff --git a/app/javascript/mastodon/components/autosuggest_input.jsx b/app/javascript/mastodon/components/autosuggest_input.jsx
index 06cbb5d75b..f707a18e1d 100644
--- a/app/javascript/mastodon/components/autosuggest_input.jsx
+++ b/app/javascript/mastodon/components/autosuggest_input.jsx
@@ -5,6 +5,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import Overlay from 'react-overlays/Overlay';
+
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
@@ -195,34 +197,37 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-input'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
+        <input
+          type='text'
+          ref={this.setInput}
+          disabled={disabled}
+          placeholder={placeholder}
+          autoFocus={autoFocus}
+          value={value}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={onKeyUp}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+          dir='auto'
+          aria-autocomplete='list'
+          aria-label={placeholder}
+          id={id}
+          className={className}
+          maxLength={maxLength}
+          lang={lang}
+          spellCheck={spellCheck}
+        />
 
-          <input
-            type='text'
-            ref={this.setInput}
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            dir='auto'
-            aria-autocomplete='list'
-            id={id}
-            className={className}
-            maxLength={maxLength}
-            lang={lang}
-            spellCheck={spellCheck}
-          />
-        </label>
-
-        <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-          {suggestions.map(this.renderSuggestion)}
-        </div>
+        <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={this.input} popperConfig={{ strategy: 'fixed' }}>
+          {({ props }) => (
+            <div {...props}>
+              <div className='autosuggest-textarea__suggestions' style={{ width: this.input?.clientWidth }}>
+                {suggestions.map(this.renderSuggestion)}
+              </div>
+            </div>
+          )}
+        </Overlay>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.jsx b/app/javascript/mastodon/components/autosuggest_textarea.jsx
index 4d173af59d..07fbccacc9 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -5,6 +5,7 @@ import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import Overlay from 'react-overlays/Overlay';
 import Textarea from 'react-textarea-autosize';
 
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
@@ -52,7 +53,6 @@ const AutosuggestTextarea = forwardRef(({
   onFocus,
   autoFocus = true,
   lang,
-  children,
 }, textareaRef) => {
 
   const [suggestionsHidden, setSuggestionsHidden] = useState(true);
@@ -183,40 +183,38 @@ const AutosuggestTextarea = forwardRef(({
     );
   };
 
-  return [
-    <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
-      <div className='autosuggest-textarea'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
+  return (
+    <div className='autosuggest-textarea'>
+      <Textarea
+        ref={textareaRef}
+        className='autosuggest-textarea__textarea'
+        disabled={disabled}
+        placeholder={placeholder}
+        autoFocus={autoFocus}
+        value={value}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        onKeyUp={onKeyUp}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+        onPaste={handlePaste}
+        dir='auto'
+        aria-autocomplete='list'
+        aria-label={placeholder}
+        lang={lang}
+      />
 
-          <Textarea
-            ref={textareaRef}
-            className='autosuggest-textarea__textarea'
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={handleChange}
-            onKeyDown={handleKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={handleFocus}
-            onBlur={handleBlur}
-            onPaste={handlePaste}
-            dir='auto'
-            aria-autocomplete='list'
-            lang={lang}
-          />
-        </label>
-      </div>
-      {children}
-    </div>,
-
-    <div className='autosuggest-textarea__suggestions-wrapper' key='suggestions-wrapper'>
-      <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-        {suggestions.map(renderSuggestion)}
-      </div>
-    </div>,
-  ];
+      <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={textareaRef} popperConfig={{ strategy: 'fixed' }}>
+        {({ props }) => (
+          <div {...props}>
+            <div className='autosuggest-textarea__suggestions' style={{ width: textareaRef.current?.clientWidth }}>
+              {suggestions.map(renderSuggestion)}
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
 });
 
 AutosuggestTextarea.propTypes = {
@@ -232,7 +230,6 @@ AutosuggestTextarea.propTypes = {
   onKeyDown: PropTypes.func,
   onPaste: PropTypes.func.isRequired,
   onFocus:PropTypes.func,
-  children: PropTypes.node,
   autoFocus: PropTypes.bool,
   lang: PropTypes.string,
 };
diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index bac8096566..2a335d7f50 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -2,13 +2,13 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import GroupsIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
-import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react';
+import GroupsIcon from '@/material-icons/400-24px/group.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person.svg?react';
+import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
-export const Badge = ({ icon, label, domain }) => (
-  <div className='account-role'>
+export const Badge = ({ icon = <PersonIcon />, label, domain, roleId }) => (
+  <div className='account-role' data-account-role-id={roleId}>
     {icon}
     {label}
     {domain && <span className='account-role__domain'>{domain}</span>}
@@ -19,10 +19,7 @@ Badge.propTypes = {
   icon: PropTypes.node,
   label: PropTypes.node,
   domain: PropTypes.node,
-};
-
-Badge.defaultProps = {
-  icon: <PersonIcon />,
+  roleId: PropTypes.string
 };
 
 export const GroupBadge = () => (
diff --git a/app/javascript/mastodon/components/button.tsx b/app/javascript/mastodon/components/button.tsx
index 0b6a0f267e..c76aaea42f 100644
--- a/app/javascript/mastodon/components/button.tsx
+++ b/app/javascript/mastodon/components/button.tsx
@@ -1,26 +1,26 @@
+import type { PropsWithChildren } from 'react';
 import { useCallback } from 'react';
 
 import classNames from 'classnames';
 
-interface BaseProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+interface BaseProps
+  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
-  text?: JSX.Element;
 }
 
-interface PropsWithChildren extends BaseProps {
-  text?: never;
+interface PropsChildren extends PropsWithChildren<BaseProps> {
+  text?: undefined;
 }
 
 interface PropsWithText extends BaseProps {
-  text: JSX.Element;
-  children: never;
+  text: JSX.Element | string;
+  children?: undefined;
 }
 
-type Props = PropsWithText | PropsWithChildren;
+type Props = PropsWithText | PropsChildren;
 
 export const Button: React.FC<Props> = ({
-  text,
   type = 'button',
   onClick,
   disabled,
@@ -28,6 +28,7 @@ export const Button: React.FC<Props> = ({
   secondary,
   className,
   title,
+  text,
   children,
   ...props
 }) => {
diff --git a/app/javascript/mastodon/components/check_box.tsx b/app/javascript/mastodon/components/check_box.tsx
new file mode 100644
index 0000000000..7da8ef0ac5
--- /dev/null
+++ b/app/javascript/mastodon/components/check_box.tsx
@@ -0,0 +1,39 @@
+import classNames from 'classnames';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+
+import { Icon } from './icon';
+
+interface Props {
+  value: string;
+  checked: boolean;
+  name: string;
+  onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  label: React.ReactNode;
+}
+
+export const CheckBox: React.FC<Props> = ({
+  name,
+  value,
+  checked,
+  onChange,
+  label,
+}) => {
+  return (
+    <label className='check-box'>
+      <input
+        name={name}
+        type='checkbox'
+        value={value}
+        checked={checked}
+        onChange={onChange}
+      />
+
+      <span className={classNames('check-box__input', { checked })}>
+        {checked && <Icon id='check' icon={DoneIcon} />}
+      </span>
+
+      <span>{label}</span>
+    </label>
+  );
+};
diff --git a/app/javascript/mastodon/components/column_back_button.tsx b/app/javascript/mastodon/components/column_back_button.tsx
index f803f86289..af38c1e110 100644
--- a/app/javascript/mastodon/components/column_back_button.tsx
+++ b/app/javascript/mastodon/components/column_back_button.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
 
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 3e53902de6..a7d07ffdb0 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -1,19 +1,19 @@
 import PropTypes from 'prop-types';
 import { PureComponent, useCallback } from 'react';
 
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
+import { FormattedMessage, injectIntl, defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
 import { Icon }  from 'mastodon/components/icon';
-import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
+import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { useAppHistory } from './router';
@@ -23,11 +23,12 @@ const messages = defineMessages({
   hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
   moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
   moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
+  back: { id: 'column_back_button.label', defaultMessage: 'Back' },
 });
 
-const BackButton = ({ pinned, show }) => {
+const BackButton = ({ onlyIcon }) => {
   const history = useAppHistory();
-  const { multiColumn } = useColumnsContext();
+  const intl = useIntl();
 
   const handleBackClick = useCallback(() => {
     if (history.location?.state?.fromMastodon) {
@@ -37,20 +38,16 @@ const BackButton = ({ pinned, show }) => {
     }
   }, [history]);
 
-  const showButton = history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || show);
-
-  if(!showButton) return null;
-
-  return (<button onClick={handleBackClick} className='column-header__back-button'>
-    <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
-    <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-  </button>);
-
+  return (
+    <button onClick={handleBackClick} className={classNames('column-header__back-button', { 'compact': onlyIcon })} aria-label={intl.formatMessage(messages.back)}>
+      <Icon id='chevron-left' icon={ArrowBackIcon} className='column-back-button__icon' />
+      {!onlyIcon && <FormattedMessage id='column_back_button.label' defaultMessage='Back' />}
+    </button>
+  );
 };
 
 BackButton.propTypes = {
-  pinned: PropTypes.bool,
-  show: PropTypes.bool,
+  onlyIcon: PropTypes.bool,
 };
 
 class ColumnHeader extends PureComponent {
@@ -114,7 +111,7 @@ class ColumnHeader extends PureComponent {
   };
 
   render () {
-    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
+    const { title, icon, iconComponent, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues, history } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -145,27 +142,33 @@ class ColumnHeader extends PureComponent {
     }
 
     if (multiColumn && pinned) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
 
       moveButtons = (
-        <div key='move-buttons' className='column-header__setting-arrows'>
+        <div className='column-header__setting-arrows'>
           <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='icon-button column-header__setting-btn' onClick={this.handleMoveLeft}><Icon id='chevron-left' icon={ChevronLeftIcon} /></button>
           <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='icon-button column-header__setting-btn' onClick={this.handleMoveRight}><Icon id='chevron-right' icon={ChevronRightIcon} /></button>
         </div>
       );
     } else if (multiColumn && this.props.onPin) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
+      pinButton = <button className='text-btn column-header__setting-btn' onClick={this.handlePin}><Icon id='plus' icon={AddIcon} /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
-    backButton = <BackButton pinned={pinned} show={showBackButton} />;
+    if (history && !pinned && ((multiColumn && history.location?.state?.fromMastodon) || showBackButton)) {
+      backButton = <BackButton onlyIcon={!!title} />;
+    }
 
     const collapsedContent = [
       extraContent,
     ];
 
     if (multiColumn) {
-      collapsedContent.push(pinButton);
-      collapsedContent.push(moveButtons);
+      collapsedContent.push(
+        <div key='buttons' className='column-header__advanced-buttons'>
+          {pinButton}
+          {moveButtons}
+        </div>
+      );
     }
 
     if (this.context.identity.signedIn && (children || (multiColumn && this.props.onPin))) {
@@ -177,7 +180,7 @@ class ColumnHeader extends PureComponent {
           onClick={this.handleToggleClick}
         >
           <i className='icon-with-badge'>
-            <Icon id='sliders' icon={TuneIcon} />
+            <Icon id='sliders' icon={SettingsIcon} />
             {collapseIssues && <i className='icon-with-badge__issue-badge' />}
           </i>
         </button>
@@ -190,16 +193,19 @@ class ColumnHeader extends PureComponent {
       <div className={wrapperClassName}>
         <h1 className={buttonClassName}>
           {hasTitle && (
-            <button onClick={this.handleTitleClick}>
-              <Icon id={icon} icon={iconComponent} className='column-header__icon' />
-              {title}
-            </button>
+            <>
+              {backButton}
+
+              <button onClick={this.handleTitleClick} className='column-header__title'>
+                {!backButton && <Icon id={icon} icon={iconComponent} className='column-header__icon' />}
+                {title}
+              </button>
+            </>
           )}
 
           {!hasTitle && backButton}
 
           <div className='column-header__buttons'>
-            {hasTitle && backButton}
             {extraButton}
             {collapseButton}
           </div>
diff --git a/app/javascript/mastodon/components/compacted_status.jsx b/app/javascript/mastodon/components/compacted_status.jsx
new file mode 100644
index 0000000000..2195cc64c0
--- /dev/null
+++ b/app/javascript/mastodon/components/compacted_status.jsx
@@ -0,0 +1,494 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+
+import { HotKeys } from 'react-hotkeys';
+
+import AttachmentList from 'mastodon/components/attachment_list';
+import { Icon }  from 'mastodon/components/icon';
+
+import Card from '../features/status/components/card';
+// We use the component (and not the container) since we do not want
+// to use the progress bar to show download progress
+import Bundle from '../features/ui/components/bundle';
+import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { displayMedia } from '../initial_state';
+
+import { Avatar } from './avatar';
+import { DisplayName } from './display_name';
+import { getHashtagBarForStatus } from './hashtag_bar';
+import { RelativeTimestamp } from './relative_timestamp';
+import StatusContent from './status_content';
+
+const domParser = new DOMParser();
+
+export const textForScreenReader = (intl, status, rebloggedByText = false) => {
+  const displayName = status.getIn(['account', 'display_name']);
+
+  const spoilerText = status.getIn(['translation', 'spoiler_text']) || status.get('spoiler_text');
+  const contentHtml = status.getIn(['translation', 'contentHtml']) || status.get('contentHtml');
+  const contentText = domParser.parseFromString(contentHtml, 'text/html').documentElement.textContent;
+
+  const values = [
+    displayName.length === 0 ? status.getIn(['account', 'acct']).split('@')[0] : displayName,
+    spoilerText && status.get('hidden') ? spoilerText : contentText,
+    intl.formatDate(status.get('created_at'), { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
+    status.getIn(['account', 'acct']),
+  ];
+
+  if (rebloggedByText) {
+    values.push(rebloggedByText);
+  }
+
+  return values.join(', ');
+};
+
+export const defaultMediaVisibility = (status) => {
+  if (!status) {
+    return undefined;
+  }
+
+  if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+    status = status.get('reblog');
+  }
+
+  return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
+};
+
+const messages = defineMessages({
+  edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
+});
+
+class CompactedStatus extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    status: ImmutablePropTypes.map,
+    previousId: PropTypes.string,
+    nextInReplyToId: PropTypes.string,
+    rootId: PropTypes.string,
+    onClick: PropTypes.func,
+    onOpenMedia: PropTypes.func,
+    onOpenVideo: PropTypes.func,
+    onHeightChange: PropTypes.func,
+    onToggleHidden: PropTypes.func,
+    onToggleCollapsed: PropTypes.func,
+    onTranslate: PropTypes.func,
+    onInteractionModal: PropTypes.func,
+    muted: PropTypes.bool,
+    hidden: PropTypes.bool,
+    unread: PropTypes.bool,
+    onMoveUp: PropTypes.func,
+    onMoveDown: PropTypes.func,
+    showThread: PropTypes.bool,
+    getScrollPosition: PropTypes.func,
+    updateScrollBottom: PropTypes.func,
+    cacheMediaWidth: PropTypes.func,
+    cachedMediaWidth: PropTypes.number,
+    history: PropTypes.func,
+  };
+
+  // Avoid checking props that are functions (and whose equality will always
+  // evaluate to false. See react-immutable-pure-component for usage.
+  updateOnProps = [
+    'status',
+    'muted',
+    'hidden',
+    'unread',
+  ];
+
+  state = {
+    showMedia: defaultMediaVisibility(this.props.status),
+    statusId: undefined,
+    forceFilter: undefined,
+  };
+
+  static getDerivedStateFromProps(nextProps, prevState) {
+    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
+      return {
+        showMedia: defaultMediaVisibility(nextProps.status),
+        statusId: nextProps.status.get('id'),
+      };
+    } else {
+      return null;
+    }
+  }
+
+  handleToggleMediaVisibility = () => {
+    this.setState({ showMedia: !this.state.showMedia });
+  };
+
+  handleClick = e => {
+    if (e && (e.button !== 0 || e.ctrlKey || e.metaKey)) {
+      return;
+    }
+
+    if (e) {
+      e.preventDefault();
+    }
+
+    this.handleHotkeyOpen();
+  };
+
+  handlePrependAccountClick = e => {
+    this.handleAccountClick(e, false);
+  };
+
+  handleAccountClick = (e, proper = true) => {
+    if (e && (e.button !== 0 || e.ctrlKey || e.metaKey))  {
+      return;
+    }
+
+    if (e) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
+
+    this._openProfile(proper);
+  };
+
+  handleExpandedToggle = () => {
+    this.props.onToggleHidden(this._properStatus());
+  };
+
+  handleCollapsedToggle = isCollapsed => {
+    this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
+  };
+
+  handleTranslate = () => {
+    this.props.onTranslate(this._properStatus());
+  };
+
+  getAttachmentAspectRatio () {
+    const attachments = this._properStatus().get('media_attachments');
+
+    if (attachments.getIn([0, 'type']) === 'video') {
+      return `${attachments.getIn([0, 'meta', 'original', 'width'])} / ${attachments.getIn([0, 'meta', 'original', 'height'])}`;
+    } else if (attachments.getIn([0, 'type']) === 'audio') {
+      return '16 / 9';
+    } else {
+      return (attachments.size === 1 && attachments.getIn([0, 'meta', 'small', 'aspect'])) ? attachments.getIn([0, 'meta', 'small', 'aspect']) : '3 / 2';
+    }
+  }
+
+  renderLoadingMediaGallery = () => {
+    return (
+      <div className='media-gallery' style={{ aspectRatio: this.getAttachmentAspectRatio() }} />
+    );
+  };
+
+  renderLoadingVideoPlayer = () => {
+    return (
+      <div className='video-player' style={{ aspectRatio: this.getAttachmentAspectRatio() }} />
+    );
+  };
+
+  renderLoadingAudioPlayer = () => {
+    return (
+      <div className='audio-player' style={{ aspectRatio: this.getAttachmentAspectRatio() }} />
+    );
+  };
+
+  handleOpenVideo = (options) => {
+    const status = this._properStatus();
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), lang, options);
+  };
+
+  handleOpenMedia = (media, index) => {
+    const status = this._properStatus();
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenMedia(status.get('id'), media, index, lang);
+  };
+
+  handleHotkeyOpenMedia = e => {
+    const { onOpenMedia, onOpenVideo } = this.props;
+    const status = this._properStatus();
+
+    e.preventDefault();
+
+    if (status.get('media_attachments').size > 0) {
+      const lang = status.getIn(['translation', 'language']) || status.get('language');
+      if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+        onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), lang, { startTime: 0 });
+      } else {
+        onOpenMedia(status.get('id'), status.get('media_attachments'), 0, lang);
+      }
+    }
+  };
+
+  handleHotkeyOpen = () => {
+    if (this.props.onClick) {
+      this.props.onClick();
+      return;
+    }
+
+    const { history } = this.props;
+    const status = this._properStatus();
+
+    if (!history) {
+      return;
+    }
+
+    history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
+  };
+
+  handleHotkeyOpenProfile = () => {
+    this._openProfile();
+  };
+
+  _openProfile = (proper = true) => {
+    const { history } = this.props;
+    const status = proper ? this._properStatus() : this.props.status;
+
+    if (!history) {
+      return;
+    }
+
+    history.push(`/@${status.getIn(['account', 'acct'])}`);
+  };
+
+  handleHotkeyMoveUp = e => {
+    this.props.onMoveUp(this.props.status.get('id'), e.target.getAttribute('data-featured'));
+  };
+
+  handleHotkeyMoveDown = e => {
+    this.props.onMoveDown(this.props.status.get('id'), e.target.getAttribute('data-featured'));
+  };
+
+  handleHotkeyToggleHidden = () => {
+    this.props.onToggleHidden(this._properStatus());
+  };
+
+  handleHotkeyToggleSensitive = () => {
+    this.handleToggleMediaVisibility();
+  };
+
+  _properStatus () {
+    const { status } = this.props;
+
+    if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
+      return status.get('reblog');
+    } else {
+      return status;
+    }
+  }
+
+  handleRef = c => {
+    this.node = c;
+  };
+
+  render () {
+    const { intl, hidden, featured, unread, showThread, previousId, nextInReplyToId, rootId } = this.props;
+
+    let { status } = this.props;
+
+    if (status === null) {
+      return null;
+    }
+
+    const handlers = this.props.muted ? {} : {
+      open: this.handleHotkeyOpen,
+      openProfile: this.handleHotkeyOpenProfile,
+      moveUp: this.handleHotkeyMoveUp,
+      moveDown: this.handleHotkeyMoveDown,
+      toggleHidden: this.handleHotkeyToggleHidden,
+      toggleSensitive: this.handleHotkeyToggleSensitive,
+      openMedia: this.handleHotkeyOpenMedia,
+    };
+
+    let media, isCardMediaWithSensitive, prepend, rebloggedByText;
+
+    if (hidden) {
+      return (
+        <HotKeys handlers={handlers}>
+          <div ref={this.handleRef} className='status__wrapper'>
+            <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
+            <span>{status.get('content')}</span>
+          </div>
+        </HotKeys>
+      );
+    }
+
+    const connectUp = previousId && previousId === status.get('in_reply_to_id');
+    const connectToRoot = rootId && rootId === status.get('in_reply_to_id');
+    const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
+
+    if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
+      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+
+      prepend = (
+        <div className='status__prepend'>
+          <div className='status__prepend-icon-wrapper'><Icon id='reply' className='status__prepend-icon' fixedWidth /></div>
+          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+        </div>
+      );
+    }
+
+    if (status.get('quote_muted')) {
+      const minHandlers = {
+        moveUp: this.handleHotkeyMoveUp,
+        moveDown: this.handleHotkeyMoveDown,
+      };
+
+      return (
+        <HotKeys handlers={minHandlers}>
+          {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+          <div className='status__wrapper status__wrapper__compact status__wrapper--filtered' ref={this.handleRef} onClick={this.handleClick}>
+            <FormattedMessage id='status.quote_filtered' defaultMessage='This quote is filtered because of muting, blocking or domain blocking' />
+          </div>
+        </HotKeys>
+      );
+    }
+
+    isCardMediaWithSensitive = false;
+
+    if (status.get('media_attachments').size > 0) {
+      const language = status.getIn(['translation', 'language']) || status.get('language');
+
+      if (this.props.muted) {
+        media = (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        );
+      } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+        const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
+
+        media = (
+          <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
+            {Component => (
+              <Component
+                src={attachment.get('url')}
+                alt={description}
+                lang={language}
+                poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
+                backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+                foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+                accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+                duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+                width={this.props.cachedMediaWidth}
+                height={110}
+                cacheWidth={this.props.cacheMediaWidth}
+                sensitive={status.get('sensitive')}
+                blurhash={attachment.get('blurhash')}
+                visible={this.state.showMedia}
+                onToggleVisibility={this.handleToggleMediaVisibility}
+              />
+            )}
+          </Bundle>
+        );
+      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+        const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
+
+        media = (
+          <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
+            {Component => (
+              <Component
+                preview={attachment.get('preview_url')}
+                frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
+                aspectRatio={`${attachment.getIn(['meta', 'original', 'width'])} / ${attachment.getIn(['meta', 'original', 'height'])}`}
+                blurhash={attachment.get('blurhash')}
+                src={attachment.get('url')}
+                alt={description}
+                lang={language}
+                sensitive={status.get('sensitive')}
+                onOpenVideo={this.handleOpenVideo}
+                visible={this.state.showMedia}
+                onToggleVisibility={this.handleToggleMediaVisibility}
+              />
+            )}
+          </Bundle>
+        );
+      } else {
+        media = (
+          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
+            {Component => (
+              <Component
+                compact
+                media={status.get('media_attachments')}
+                lang={language}
+                sensitive={status.get('sensitive')}
+                height={110}
+                onOpenMedia={this.handleOpenMedia}
+                cacheWidth={this.props.cacheMediaWidth}
+                defaultWidth={this.props.cachedMediaWidth}
+                visible={this.state.showMedia}
+                onToggleVisibility={this.handleToggleMediaVisibility}
+              />
+            )}
+          </Bundle>
+        );
+      }
+    } else if (status.get('card') && !this.props.muted) {
+      media = (
+        <Card
+          onOpenMedia={this.handleOpenMedia}
+          card={status.get('card')}
+          compact
+          sensitive={status.get('sensitive') && !status.get('spoiler_text')}
+        />
+      );
+      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
+    }
+
+    const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
+    const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
+
+    return (
+      <HotKeys handlers={handlers}>
+        <div className={classNames('status__wrapper', 'status__wrapper__compact', `status__wrapper-${status.get('visibility_ex')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread })} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
+          {prepend}
+
+          <div className={classNames('status', `status-${status.get('visibility_ex')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
+            {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
+
+            {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+            <div onClick={this.handleClick} className='status__info'>
+              <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+              </a>
+
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+                <div className='status__avatar status__avatar__compact'>
+                  <Avatar account={status.get('account')} size={24} inline />
+                </div>
+
+                <DisplayName account={status.get('account')} />
+              </a>
+            </div>
+
+            <StatusContent
+              status={status}
+              onClick={this.handleClick}
+              expanded={expanded}
+              onExpandedToggle={this.handleExpandedToggle}
+              onTranslate={this.handleTranslate}
+              collapsible
+              onCollapsedToggle={this.handleCollapsedToggle}
+              {...statusContentProps}
+            />
+
+            {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
+
+            {(!status.get('spoiler_text') || expanded) && hashtagBar}
+          </div>
+        </div>
+      </HotKeys>
+    );
+  }
+
+}
+
+export default injectIntl(CompactedStatus);
diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx
index c5216e8f80..0c3c6c290b 100644
--- a/app/javascript/mastodon/components/copy_icon_button.jsx
+++ b/app/javascript/mastodon/components/copy_icon_button.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 
 import { useDispatch } from 'react-redux';
 
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { showAlert } from 'mastodon/actions/alerts';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx
index d3bc28b9b9..bc40e46f8d 100644
--- a/app/javascript/mastodon/components/dismissable_banner.tsx
+++ b/app/javascript/mastodon/components/dismissable_banner.tsx
@@ -8,7 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { changeSetting } from 'mastodon/actions/settings';
 import { bannerSettings } from 'mastodon/settings';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index 637c286ce4..4cd93bcfad 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
 
 import { IconButton } from './icon_button';
 
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index a8fcfd1097..fd137115cb 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { CircularProgress } from 'mastodon/components/circular_progress';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -165,12 +164,13 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,
     disabled: PropTypes.bool,
     scrollable: PropTypes.bool,
+    active: PropTypes.bool,
     status: ImmutablePropTypes.map,
     isUserTouching: PropTypes.func,
     onOpen: PropTypes.func.isRequired,
@@ -285,6 +285,7 @@ class Dropdown extends PureComponent {
       children,
       renderItem,
       renderHeader,
+      active,
     } = this.props;
 
     const open = this.state.id === openDropdownId;
@@ -298,9 +299,9 @@ class Dropdown extends PureComponent {
     }) : (
       <IconButton
         icon={!open ? icon : 'close'}
-        iconComponent={!open ? iconComponent : CloseIcon}
+        iconComponent={iconComponent}
         title={title}
-        active={open}
+        active={open || active}
         disabled={disabled}
         size={size}
         onClick={this.handleClick}
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 7497ab9922..fbf14ec4bd 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -5,9 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'mastodon/actions/modal';
-import { Icon }  from 'mastodon/components/icon';
 import InlineAccount from 'mastodon/components/inline_account';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 
@@ -67,7 +65,7 @@ class EditedTimestamp extends PureComponent {
     return (
       <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}>
         <button className='dropdown-menu__text-button'>
-          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { hour12: false, month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' icon={ArrowDropDownIcon} />
+          <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: <span className='animated-number'>{intl.formatDate(timestamp, { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}</span> }} />
         </button>
       </DropdownMenu>
     );
diff --git a/app/javascript/mastodon/components/emoji_view.jsx b/app/javascript/mastodon/components/emoji_view.jsx
new file mode 100644
index 0000000000..39e28b2673
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji_view.jsx
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import emojify from '../features/emoji/emoji';
+
+export default class EmojiView extends PureComponent {
+
+  static propTypes = {
+    name: PropTypes.string,
+    url: PropTypes.string,
+    staticUrl: PropTypes.string,
+  };
+
+  render () {
+    const { name, url, staticUrl } = this.props;
+
+    let emojiHtml = null;
+    if (url) {
+      let customEmojis = {};
+      customEmojis[`:${name}:`] = { url, static_url: staticUrl };
+      emojiHtml = emojify(`:${name}:`, customEmojis);
+    } else {
+      emojiHtml = emojify(name);
+    }
+
+    return (
+      <span className='emoji' dangerouslySetInnerHTML={{ __html: emojiHtml }} />
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/hashtag_bar.tsx b/app/javascript/mastodon/components/hashtag_bar.tsx
index 91fa922198..9345249e88 100644
--- a/app/javascript/mastodon/components/hashtag_bar.tsx
+++ b/app/javascript/mastodon/components/hashtag_bar.tsx
@@ -24,7 +24,7 @@ export type StatusLike = Record<{
 
 function normalizeHashtag(hashtag: string) {
   return (
-    hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
+    !!hashtag && hashtag.startsWith('#') ? hashtag.slice(1) : hashtag
   ).normalize('NFKC');
 }
 
@@ -196,9 +196,15 @@ export function getHashtagBarForStatus(status: StatusLike) {
   };
 }
 
+export function getFeaturedHashtagBar(acct: string, tags: string[]) {
+  return <HashtagBar acct={acct} hashtags={tags} defaultExpanded />;
+}
+
 const HashtagBar: React.FC<{
   hashtags: string[];
-}> = ({ hashtags }) => {
+  acct?: string;
+  defaultExpanded?: boolean;
+}> = ({ hashtags, acct, defaultExpanded }) => {
   const [expanded, setExpanded] = useState(false);
   const handleClick = useCallback(() => {
     setExpanded(true);
@@ -208,19 +214,23 @@ const HashtagBar: React.FC<{
     return null;
   }
 
-  const revealedHashtags = expanded
-    ? hashtags
-    : hashtags.slice(0, VISIBLE_HASHTAGS);
+  const revealedHashtags =
+    expanded || defaultExpanded
+      ? hashtags
+      : hashtags.slice(0, VISIBLE_HASHTAGS);
 
   return (
     <div className='hashtag-bar'>
       {revealedHashtags.map((hashtag) => (
-        <Link key={hashtag} to={`/tags/${hashtag}`}>
+        <Link
+          key={hashtag}
+          to={acct ? `/@${acct}/tagged/${hashtag}` : `/tags/${hashtag}`}
+        >
           #<span>{hashtag}</span>
         </Link>
       ))}
 
-      {!expanded && hashtags.length > VISIBLE_HASHTAGS && (
+      {!expanded && !defaultExpanded && hashtags.length > VISIBLE_HASHTAGS && (
         <button className='link-button' onClick={handleClick}>
           <FormattedMessage
             id='hashtags.and_other'
diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx
index 948492d91c..f388380c44 100644
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 
-import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react';
+import CheckBoxOutlineBlankIcon from '@/material-icons/400-24px/check_box_outline_blank.svg?react';
 import { isProduction } from 'mastodon/utils/environment';
 
 interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {
diff --git a/app/javascript/mastodon/components/icon_button.tsx b/app/javascript/mastodon/components/icon_button.tsx
index e38e387712..b7cac35960 100644
--- a/app/javascript/mastodon/components/icon_button.tsx
+++ b/app/javascript/mastodon/components/icon_button.tsx
@@ -27,6 +27,7 @@ interface Props {
   counter?: number;
   href?: string;
   ariaHidden: boolean;
+  data_id?: string;
 }
 interface States {
   activate: boolean;
@@ -105,6 +106,7 @@ export class IconButton extends PureComponent<Props, States> {
       counter,
       href,
       ariaHidden,
+      data_id,
     } = this.props;
 
     const { activate, deactivate } = this.state;
@@ -153,6 +155,7 @@ export class IconButton extends PureComponent<Props, States> {
         style={style}
         tabIndex={tabIndex}
         disabled={disabled}
+        data-id={data_id}
         ref={this.buttonRef}
       >
         {contents}
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 2a233b6a1c..1d4193a359 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/components/logo.tsx b/app/javascript/mastodon/components/logo.tsx
index 928aa29a7c..b7f8bd6695 100644
--- a/app/javascript/mastodon/components/logo.tsx
+++ b/app/javascript/mastodon/components/logo.tsx
@@ -1,4 +1,4 @@
-import logo from 'mastodon/../images/logo.svg';
+import logo from '@/images/logo.svg';
 
 export const WordmarkLogo: React.FC = () => (
   <svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index c387bb8698..d3b5b284b8 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -10,10 +10,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { debounce } from 'lodash';
 
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 
-import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
+import { autoPlayGif, displayMedia, displayMediaExpand, useBlurhash } from '../initial_state';
 
 import { IconButton } from './icon_button';
 
@@ -102,8 +102,24 @@ class Item extends PureComponent {
       height = 50;
     }
 
+    if (size === 5 || size === 6 || size === 9 || size === 10 || size === 11 || size === 12) {
+      height = 33;
+    }
+    if (size === 7 || size === 8 || size === 13 || size === 14 || size === 15 || size === 16) {
+      height = 25;
+    }
+    if ((size === 5 && index === 4) || (size === 7 && index === 6)) {
+      width = 100;
+    }
+    if (size === 9) {
+      width = 33;
+    }
+    if (size === 10 || size === 11 || size === 12 || size === 13 || size === 14 || size === 15 || size === 16) {
+      width = 25;
+    }
+
     if (attachment.get('description')?.length > 0) {
-      badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
+      badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
     }
 
     const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
@@ -221,6 +237,7 @@ class MediaGallery extends PureComponent {
     visible: PropTypes.bool,
     autoplay: PropTypes.bool,
     onToggleVisibility: PropTypes.func,
+    compact: PropTypes.bool,
   };
 
   state = {
@@ -291,7 +308,7 @@ class MediaGallery extends PureComponent {
   }
 
   render () {
-    const { media, lang, intl, sensitive, defaultWidth, autoplay } = this.props;
+    const { media, lang, intl, sensitive, defaultWidth, autoplay, compact } = this.props;
     const { visible } = this.state;
     const width = this.state.width || defaultWidth;
 
@@ -305,13 +322,15 @@ class MediaGallery extends PureComponent {
       style.aspectRatio = '3 / 2';
     }
 
-    const size     = media.take(4).size;
+    const maxSize = displayMediaExpand ? 16 : 4;
+
+    const size     = media.take(maxSize).size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
 
     if (this.isFullSizeEligible()) {
       children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
     } else {
-      children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
+      children = media.take(maxSize).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
     }
 
     if (uncached) {
@@ -336,8 +355,16 @@ class MediaGallery extends PureComponent {
       );
     }
 
+    const rowClass = (size === 5 || size === 6 || size === 9 || size === 10 || size === 11 || size === 12) ? 'media-gallery--row3' :
+      (size === 7 || size === 8 || size === 13 || size === 14 || size === 15 || size === 16) ? 'media-gallery--row4' :
+        'media-gallery--row2';
+    const columnClass = (size === 9) ? 'media-gallery--column3' :
+      (size === 10 || size === 11 || size === 12 || size === 13 || size === 14 || size === 15 || size === 16) ? 'media-gallery--column4' :
+        'media-gallery--column2';
+    const compactClass = compact ? 'media-gallery__compact' : null;
+
     return (
-      <div className='media-gallery' style={style} ref={this.handleRef}>
+      <div className={classNames('media-gallery', rowClass, columnClass, compactClass)} style={style} ref={this.handleRef}>
         <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached, 'spoiler-button--click-thru': uncached })}>
           {spoilerButton}
         </div>
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
index e8cfe6cb32..50f91a9275 100644
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
+import CancelPresentationIcon from '@/material-icons/400-24px/cancel_presentation.svg?react';
 import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index f85c47bb40..c7036d111b 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import escapeTextContentForBrowser from 'escape-html';
 import spring from 'react-motion/lib/spring';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import emojify from 'mastodon/features/emoji/emoji';
 import Motion from 'mastodon/features/ui/util/optional_motion';
diff --git a/app/javascript/mastodon/components/regeneration_indicator.jsx b/app/javascript/mastodon/components/regeneration_indicator.jsx
index 052e25f25f..d42a7d7c72 100644
--- a/app/javascript/mastodon/components/regeneration_indicator.jsx
+++ b/app/javascript/mastodon/components/regeneration_indicator.jsx
@@ -1,6 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
-import illustration from 'mastodon/../images/elephant_ui_working.svg';
+import illustration from '@/images/elephant_ui_working.svg';
 
 const RegenerationIndicator = () => (
   <div className='regeneration-indicator'>
diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index ac3ab0fb4d..ac385e88c6 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -53,7 +53,6 @@ const messages = defineMessages({
 });
 
 const dateFormatOptions = {
-  hour12: false,
   year: 'numeric',
   month: 'short',
   day: '2-digit',
@@ -103,7 +102,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: IntlShape,
+  intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>,
   date: Date,
   now: number,
   year: number,
@@ -192,7 +191,7 @@ const timeRemainingString = (
 interface Props {
   intl: IntlShape;
   timestamp: string;
-  year: number;
+  year?: number;
   futureDate?: boolean;
   short?: boolean;
 }
@@ -204,11 +203,6 @@ class RelativeTimestamp extends Component<Props, States> {
     now: Date.now(),
   };
 
-  static defaultProps = {
-    year: new Date().getFullYear(),
-    short: true,
-  };
-
   _timer: number | undefined;
 
   shouldComponentUpdate(nextProps: Props, nextState: States) {
@@ -258,7 +252,13 @@ class RelativeTimestamp extends Component<Props, States> {
   }
 
   render() {
-    const { timestamp, intl, year, futureDate, short } = this.props;
+    const {
+      timestamp,
+      intl,
+      futureDate,
+      year = new Date().getFullYear(),
+      short = true,
+    } = this.props;
 
     const timeGiven = timestamp.includes('T');
     const date = new Date(timestamp);
diff --git a/app/javascript/mastodon/components/scrollable_list.jsx b/app/javascript/mastodon/components/scrollable_list.jsx
index 29439fdf55..d766366869 100644
--- a/app/javascript/mastodon/components/scrollable_list.jsx
+++ b/app/javascript/mastodon/components/scrollable_list.jsx
@@ -362,7 +362,7 @@ class ScrollableList extends PureComponent {
                 trackScroll={trackScroll}
                 scrollKey={scrollKey}
               >
-                {cloneElement(child, {
+                {cloneElement(child, child.type.name === 'ColumnLink' ? {} : {
                   getScrollPosition: this.getScrollPosition,
                   updateScrollBottom: this.updateScrollBottom,
                   cachedMediaWidth: this.state.cachedMediaWidth,
diff --git a/app/javascript/mastodon/components/searchability_icon.tsx b/app/javascript/mastodon/components/searchability_icon.tsx
new file mode 100644
index 0000000000..143de34caf
--- /dev/null
+++ b/app/javascript/mastodon/components/searchability_icon.tsx
@@ -0,0 +1,80 @@
+import { defineMessages, useIntl } from 'react-intl';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+
+import { Icon } from './icon';
+
+type Searchability =
+  | 'public'
+  | 'public_unlisted'
+  | 'private'
+  | 'direct'
+  | 'limited';
+
+const messages = defineMessages({
+  public_short: { id: 'searchability.public.short', defaultMessage: 'Public' },
+  public_unlisted_short: {
+    id: 'searchability.public_unlisted.short',
+    defaultMessage: 'Local public',
+  },
+  private_short: {
+    id: 'searchability.unlisted.short',
+    defaultMessage: 'Followers',
+  },
+  direct_short: {
+    id: 'searchability.private.short',
+    defaultMessage: 'Reactionners',
+  },
+  limited_short: {
+    id: 'searchability.direct.short',
+    defaultMessage: 'Self only',
+  },
+});
+
+export const SearchabilityIcon: React.FC<{ searchability: Searchability }> = ({
+  searchability,
+}) => {
+  const intl = useIntl();
+
+  const searchabilityIconInfo = {
+    public: {
+      icon: 'globe',
+      iconComponent: PublicIcon,
+      text: intl.formatMessage(messages.public_short),
+    },
+    public_unlisted: {
+      icon: 'cloud',
+      iconComponent: PublicUnlistedIcon,
+      text: intl.formatMessage(messages.public_unlisted_short),
+    },
+    private: {
+      icon: 'lock',
+      iconComponent: LockOpenIcon,
+      text: intl.formatMessage(messages.private_short),
+    },
+    limited: {
+      icon: 'get-pocket',
+      iconComponent: AlternateEmailIcon,
+      text: intl.formatMessage(messages.limited_short),
+    },
+    direct: {
+      icon: 'at',
+      iconComponent: LockIcon,
+      text: intl.formatMessage(messages.direct_short),
+    },
+  };
+
+  const searchabilityIcon = searchabilityIconInfo[searchability];
+
+  return (
+    <Icon
+      id={searchabilityIcon.icon}
+      icon={searchabilityIcon.iconComponent}
+      title={searchabilityIcon.text}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/components/short_number.tsx b/app/javascript/mastodon/components/short_number.tsx
index 74c3c5d75e..1a1895b94a 100644
--- a/app/javascript/mastodon/components/short_number.tsx
+++ b/app/javascript/mastodon/components/short_number.tsx
@@ -11,12 +11,14 @@ type ShortNumberRenderer = (
 
 interface ShortNumberProps {
   value: number;
+  isHide?: boolean;
   renderer?: ShortNumberRenderer;
   children?: ShortNumberRenderer;
 }
 
 export const ShortNumberRenderer: React.FC<ShortNumberProps> = ({
   value,
+  isHide,
   renderer,
   children,
 }) => {
@@ -31,7 +33,11 @@ export const ShortNumberRenderer: React.FC<ShortNumberProps> = ({
 
   const customRenderer = children ?? renderer ?? null;
 
-  const displayNumber = <ShortNumberCounter value={shortNumber} />;
+  const displayNumber = !isHide ? (
+    <ShortNumberCounter value={shortNumber} />
+  ) : (
+    <span>-</span>
+  );
 
   return (
     customRenderer?.(displayNumber, pluralReady(value, division)) ??
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 224c8baded..5bb538208f 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -9,20 +9,27 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import QuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
+import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
+import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
+import AttachmentList from 'mastodon/components/attachment_list';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
 
+import CompactedStatusContainer from '../containers/compacted_status_container';
 import Card from '../features/status/components/card';
 // We use the component (and not the container) since we do not want
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
-import { displayMedia } from '../initial_state';
+import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
+import { displayMedia, enableEmojiReaction, isShowItem, isHideItem } from '../initial_state';
 
 import { Avatar } from './avatar';
 import { AvatarOverlay } from './avatar_overlay';
@@ -31,6 +38,7 @@ import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
+import StatusEmojiReactionsBar from './status_emoji_reactions_bar';
 import { VisibilityIcon } from './visibility_icon';
 
 const domParser = new DOMParser();
@@ -69,25 +77,28 @@ export const defaultMediaVisibility = (status) => {
 };
 
 const messages = defineMessages({
-  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  limited_short: { id: 'privacy.limited.short', defaultMessage: 'Limited' },
   edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
 class Status extends ImmutablePureComponent {
 
+  static contextType = SensitiveMediaContext;
+
   static propTypes = {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.record,
+    contextType: PropTypes.string,
     previousId: PropTypes.string,
     nextInReplyToId: PropTypes.string,
     rootId: PropTypes.string,
     onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
+    onEmojiReact: PropTypes.func,
+    onUnEmojiReact: PropTypes.func,
     onReblog: PropTypes.func,
+    onReblogForceModal: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -118,6 +129,8 @@ class Status extends ImmutablePureComponent {
       inUse: PropTypes.bool,
       available: PropTypes.bool,
     }),
+    withoutEmojiReactions: PropTypes.bool,
+    withoutQuote: PropTypes.bool,
     ...WithOptionalRouterPropTypes,
   };
 
@@ -133,19 +146,21 @@ class Status extends ImmutablePureComponent {
   ];
 
   state = {
-    showMedia: defaultMediaVisibility(this.props.status),
-    statusId: undefined,
+    showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
     forceFilter: undefined,
   };
 
-  static getDerivedStateFromProps(nextProps, prevState) {
-    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
-      return {
-        showMedia: defaultMediaVisibility(nextProps.status),
-        statusId: nextProps.status.get('id'),
-      };
-    } else {
-      return null;
+  componentDidUpdate (prevProps) {
+    // This will potentially cause a wasteful redraw, but in most cases `Status` components are used
+    // with a `key` directly depending on their `id`, preventing re-use of the component across
+    // different IDs.
+    // But just in case this does change, reset the state on status change.
+
+    if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
+      this.setState({
+        showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
+        forceFilter: undefined,
+      });
     }
   }
 
@@ -348,15 +363,17 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId } = this.props;
+    const { intl, hidden, featured, unread, muted, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, withoutQuote } = this.props;
 
     let { status, account, ...other } = this.props;
+    
+    const contextType = (this.props.contextType || '').split(':')[0];
 
     if (status === null) {
       return null;
     }
 
-    const handlers = this.props.muted ? {} : {
+    const handlers = muted ? {} : {
       reply: this.handleHotkeyReply,
       favourite: this.handleHotkeyFavourite,
       boost: this.handleHotkeyBoost,
@@ -370,12 +387,12 @@ class Status extends ImmutablePureComponent {
       openMedia: this.handleHotkeyOpenMedia,
     };
 
-    let media, statusAvatar, prepend, rebloggedByText;
+    let media, isCardMediaWithSensitive, statusAvatar, prepend, rebloggedByText;
 
     if (hidden) {
       return (
         <HotKeys handlers={handlers}>
-          <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={0}>
+          <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !muted })} tabIndex={0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
             <span>{status.get('content')}</span>
           </div>
@@ -388,24 +405,7 @@ class Status extends ImmutablePureComponent {
     const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
     const matchedFilters = status.get('matched_filters');
 
-    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
-      const minHandlers = this.props.muted ? {} : {
-        moveUp: this.handleHotkeyMoveUp,
-        moveDown: this.handleHotkeyMoveDown,
-      };
-
-      return (
-        <HotKeys handlers={minHandlers}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
-            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
-            {' '}
-            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
-              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
-            </button>
-          </div>
-        </HotKeys>
-      );
-    }
+    let visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
 
     if (featured) {
       prepend = (
@@ -420,6 +420,7 @@ class Status extends ImmutablePureComponent {
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend-icon-wrapper'><Icon id='retweet' icon={RepeatIcon} className='status__prepend-icon' /></div>
+          <div className='status__prepend-icon-wrapper'><VisibilityIcon visibility={visibilityName} className='status__prepend-icon' /></div>
           <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
@@ -446,12 +447,78 @@ class Status extends ImmutablePureComponent {
       );
     }
 
+    if (account === undefined || account === null) {
+      statusAvatar = <Avatar account={status.get('account')} size={46} />;
+    } else {
+      statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
+    }
+
+    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
+      const minHandlers = muted ? {} : {
+        moveUp: this.handleHotkeyMoveUp,
+        moveDown: this.handleHotkeyMoveDown,
+      };
+
+      if (status.get('filter_action_ex') === 'half_warn') {
+        return (
+          <HotKeys handlers={minHandlers}>
+            <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
+              {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+              <div onClick={this.handleClick} className='status__info'>
+                <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
+                  <span className='status__visibility-icon'><VisibilityIcon visibility={visibilityName} /></span>
+                  <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+                </a>
+
+                <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+                  <div className='status__avatar'>
+                    {statusAvatar}
+                  </div>
+
+                  <DisplayName account={status.get('account')} />
+                </a>
+              </div>
+
+              <div >
+                <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
+                {' '}
+                <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
+                  <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
+                </button>
+              </div>
+            </div>
+          </HotKeys>
+        );
+      }
+
+      return (
+        <HotKeys handlers={minHandlers}>
+          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
+            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
+            {' '}
+            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
+              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
+            </button>
+          </div>
+        </HotKeys>
+      );
+    }
+
+    isCardMediaWithSensitive = false;
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder aspectRatio={this.getAttachmentAspectRatio()} />;
     } else if (status.get('media_attachments').size > 0) {
       const language = status.getIn(['translation', 'language']) || status.get('language');
 
-      if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+      if (muted) {
+        media = (
+          <AttachmentList
+            compact
+            media={status.get('media_attachments')}
+          />
+        );
+      } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
         const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
@@ -522,39 +589,56 @@ class Status extends ImmutablePureComponent {
           </Bundle>
         );
       }
-    } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
+    } else if (status.get('card') && !muted) {
       media = (
         <Card
           onOpenMedia={this.handleOpenMedia}
           card={status.get('card')}
           compact
-          sensitive={status.get('sensitive')}
+          sensitive={status.get('sensitive') && !status.get('spoiler_text')}
         />
       );
+      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
     }
 
-    if (account === undefined || account === null) {
-      statusAvatar = <Avatar account={status.get('account')} size={46} />;
-    } else {
-      statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
+    visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
+
+    let emojiReactionsBar = null;
+    if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) {
+      const emojiReactions = status.get('emoji_reactions');
+      const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'server_features', 'emoji_reaction']);
+      if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionAvailableServer) {
+        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} myReactionOnly={!isShowItem('emoji_reaction_on_timeline')} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      }
     }
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
+    const withLimited = status.get('visibility_ex') === 'limited' && status.get('limited_scope') ? <span className='status__visibility-icon'><Icon id='get-pocket' icon={LimitedIcon} title={intl.formatMessage(messages.limited_short)} /></span> : null;
+    const withQuote = status.get('quote_id') ? <span className='status__visibility-icon'><Icon id='quote-right' icon={QuoteIcon} title='Quote' /></span> : null;
+    const withReference = (!withQuote && status.get('status_references_count') > 0) ? <span className='status__visibility-icon'><Icon id='link' icon={ReferenceIcon} title='Quiet quote' /></span> : null;
+    const withExpiration = status.get('expires_at') ? <span className='status__visibility-icon'><Icon id='clock-o' icon={TimerIcon} title='Expiration' /></span> : null;
+
+    const quote = !muted && !withoutQuote && status.get('quote_id') && (['public', 'community'].includes(contextType) ? isShowItem('quote_in_public') : isShowItem('quote_in_home')) && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;
+
     return (
       <HotKeys handlers={handlers}>
-        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
+        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility_ex')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !muted })} tabIndex={muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
           {prepend}
 
-          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
+          <div className={classNames('status', `status-${status.get('visibility_ex')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: muted })} data-id={status.get('id')}>
             {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
 
             {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
             <div onClick={this.handleClick} className='status__info'>
               <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+                {withQuote}
+                {withReference}
+                {withExpiration}
+                {withLimited}
+                <span className='status__visibility-icon'><VisibilityIcon visibility={visibilityName} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
               <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
@@ -577,9 +661,13 @@ class Status extends ImmutablePureComponent {
               {...statusContentProps}
             />
 
-            {media}
+            {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
 
-            {expanded && hashtagBar}
+            {(!status.get('spoiler_text') || expanded) && hashtagBar}
+
+            {(!status.get('spoiler_text') || expanded) && quote}
+
+            {emojiReactionsBar}
 
             <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />
           </div>
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index e1e0164642..c2be106293 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -9,31 +9,38 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
-import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
-import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
+import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+
 import DropdownMenuContainer from '../containers/dropdown_menu_container';
-import { me } from '../initial_state';
+import EmojiPickerDropdown from '../features/compose/containers/emoji_picker_dropdown_container';
+import { enableEmojiReaction , bookmarkCategoryNeeded, simpleTimelineMenu, me, isHideItem, boostMenu, boostModal } from '../initial_state';
 
 import { IconButton } from './icon_button';
 
+
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
   edit: { id: 'status.edit', defaultMessage: 'Edit' },
   direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
+  mentions: { id: 'status.mentions', defaultMessage: 'Mentioned users' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   block: { id: 'account.block', defaultMessage: 'Block @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
@@ -41,11 +48,15 @@ const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
   replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+  reblog_with_detail: { id: 'status.reblog_with_detail', defaultMessage: 'Boost with visibility' },
+  cancelReblog: { id: 'status.cancel_reblog', defaultMessage: 'Unboost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
+  emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Emoji reaction' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
+  bookmarkCategory: { id: 'status.bookmark_category', defaultMessage: 'Bookmark category' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
   report: { id: 'status.report', defaultMessage: 'Report @{name}' },
@@ -58,6 +69,8 @@ const messages = defineMessages({
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
+  reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   hide: { id: 'status.hide', defaultMessage: 'Hide post' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
@@ -79,10 +92,12 @@ class StatusActionBar extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
-    relationship: ImmutablePropTypes.map,
+    relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
+    onEmojiReact: PropTypes.func,
     onReblog: PropTypes.func,
+    onReblogForceModal: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -97,8 +112,11 @@ class StatusActionBar extends ImmutablePureComponent {
     onMuteConversation: PropTypes.func,
     onPin: PropTypes.func,
     onBookmark: PropTypes.func,
+    onBookmarkCategoryAdder: PropTypes.func,
     onFilter: PropTypes.func,
     onAddFilter: PropTypes.func,
+    onReference: PropTypes.func,
+    onQuote: PropTypes.func,
     onInteractionModal: PropTypes.func,
     withDismiss: PropTypes.bool,
     withCounters: PropTypes.bool,
@@ -143,6 +161,18 @@ class StatusActionBar extends ImmutablePureComponent {
     }
   };
 
+  handleEmojiPick = (data) => {
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
+      this.props.onEmojiReact(this.props.status, data);
+    } else {
+      this.props.onInteractionModal('favourite', this.props.status);
+    }
+  };
+
+  handleEmojiPickInnerButton = () => {};
+
   handleReblogClick = e => {
     const { signedIn } = this.context.identity;
 
@@ -153,7 +183,23 @@ class StatusActionBar extends ImmutablePureComponent {
     }
   };
 
+  handleReblogForceModalClick = e => {
+    this.props.onReblogForceModal(this.props.status, e);
+  };
+
   handleBookmarkClick = () => {
+    if (bookmarkCategoryNeeded) {
+      this.handleBookmarkCategoryAdderClick();
+    } else {
+      this.props.onBookmark(this.props.status);
+    }
+  };
+
+  handleBookmarkCategoryAdderClick = () => {
+    this.props.onBookmarkCategoryAdder(this.props.status);
+  };
+
+  handleBookmarkClickOriginal = () => {
     this.props.onBookmark(this.props.status);
   };
 
@@ -207,7 +253,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {
@@ -221,6 +267,10 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}`);
   };
 
+  handleOpenMentions = () => {
+    this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}/mentioned_users`);
+  };
+
   handleEmbed = () => {
     this.props.onEmbed(this.props.status);
   };
@@ -242,6 +292,14 @@ class StatusActionBar extends ImmutablePureComponent {
     navigator.clipboard.writeText(url);
   };
 
+  handleReference = () => {
+    this.props.onReference(this.props.status);
+  };
+
+  handleQuote = () => {
+    this.props.onQuote(this.props.status);
+  };
+
   handleHideClick = () => {
     this.props.onFilter();
   };
@@ -250,35 +308,60 @@ class StatusActionBar extends ImmutablePureComponent {
     const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
-    const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
-    const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
+    const publicStatus       = ['public', 'unlisted', 'public_unlisted', 'login'].includes(status.get('visibility_ex'));
+    const anonymousStatus    = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility_ex'));
+    const pinnableStatus     = ['public', 'unlisted', 'public_unlisted', 'login', 'private'].includes(status.get('visibility_ex'));
     const mutingConversation = status.get('muted');
     const account            = status.get('account');
     const writtenByMe        = status.getIn(['account', 'id']) === me;
     const isRemote           = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
+    const allowQuote         = status.getIn(['account', 'other_settings', 'allow_quote']);
 
     let menu = [];
 
-    menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
+    if (!simpleTimelineMenu) {
+      menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
 
-    if (publicStatus && isRemote) {
-      menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
-    }
-
-    menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
-
-    if (publicStatus && 'share' in navigator) {
-      menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
-    }
-
-    if (publicStatus && (signedIn || !isRemote)) {
-      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
+      if (publicStatus && isRemote) {
+        menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
+      }
+  
+      menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
+  
+      if (publicStatus && 'share' in navigator) {
+        menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
+      }
+  
+      if (anonymousStatus && (signedIn || !isRemote)) {
+        menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
+      }
     }
 
     if (signedIn) {
-      menu.push(null);
+      if (writtenByMe && status.get('limited_scope') !== 'reply') {
+        menu.push({ text: intl.formatMessage(messages.mentions), action: this.handleOpenMentions });
+      }
 
-      menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClick });
+      if (!simpleTimelineMenu || writtenByMe) {
+        menu.push(null);
+      }
+
+      if (!boostMenu) {
+        menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancelReblog : messages.reblog), action: this.handleReblogForceModalClick, tag: 'reblog' });
+
+        if (publicStatus) {
+          if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
+            menu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote, tag: 'reblog' });
+          }
+
+          if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
+            menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference, tag: 'reblog' });
+          }
+        }
+      }
+
+      menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClickOriginal });
+      menu.push({ text: intl.formatMessage(messages.bookmarkCategory), action: this.handleBookmarkCategoryAdderClick });
 
       if (writtenByMe && pinnableStatus) {
         menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
@@ -296,9 +379,11 @@ class StatusActionBar extends ImmutablePureComponent {
         menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
         menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, dangerous: true });
       } else {
-        menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
-        menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
-        menu.push(null);
+        if (!simpleTimelineMenu) {
+          menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
+          menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
+          menu.push(null);
+        }
 
         if (relationship && relationship.get('muting')) {
           menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
@@ -346,6 +431,26 @@ class StatusActionBar extends ImmutablePureComponent {
       }
     }
 
+    let reblogMenu = [];
+
+    if (boostMenu) {
+      reblogMenu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancelReblog : messages.reblog), action: this.handleReblogClick });
+
+      if (!status.get('reblogged') && !boostModal) {
+        reblogMenu.push({ text: intl.formatMessage(messages.reblog_with_detail), action: this.handleReblogForceModalClick });
+      }
+  
+      if (publicStatus) {
+        if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
+          reblogMenu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote });
+        }
+  
+        if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
+          reblogMenu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
+        }
+      }
+    }
+
     let replyIcon;
     let replyIconComponent;
     let replyTitle;
@@ -360,13 +465,13 @@ class StatusActionBar extends ImmutablePureComponent {
       replyTitle = intl.formatMessage(messages.replyAll);
     }
 
-    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
+    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility_ex') === 'private';
 
     let reblogTitle, reblogIconComponent;
 
     if (status.get('reblogged')) {
       reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
+      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
     } else if (publicStatus) {
       reblogTitle = intl.formatMessage(messages.reblog);
       reblogIconComponent = RepeatIcon;
@@ -376,20 +481,53 @@ class StatusActionBar extends ImmutablePureComponent {
     } else {
       reblogTitle = intl.formatMessage(messages.cannot_reblog);
       reblogIconComponent = RepeatDisabledIcon;
+      menu = menu.filter((item) => !item?.tag || item.tag !== 'reblog');
+      reblogMenu = [];
     }
 
     const filterButton = this.props.onFilter && (
       <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.hide)} icon='eye' iconComponent={VisibilityIcon} onClick={this.handleHideClick} />
     );
 
+    const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || account.getIn(['server_features', 'emoji_reaction']);
+    const emojiReactionPolicy = account.getIn(['other_settings', 'emoji_reaction_policy']) || 'allow';
+    const following = emojiReactionPolicy !== 'following_only' || (relationship && relationship.get('following'));
+    const followed = emojiReactionPolicy !== 'followers_only' || (relationship && relationship.get('followed_by'));
+    const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by'));
+    const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
+    const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
+    const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
+      <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
+        <IconButton className='status__action-bar__button' icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
+      )} />
+    )) || (enableEmojiReaction && (
+      <div className='status__action-bar__button__blank' />
+    )) || null;
+
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
 
     return (
       <div className='status__action-bar'>
         <IconButton className='status__action-bar__button' title={replyTitle} icon={isReply ? 'reply' : replyIcon} iconComponent={isReply ? ReplyIcon : replyIconComponent} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
-        <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
+        {reblogMenu.length === 0 ? (
+          <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
+        ) : (
+          <DropdownMenuContainer
+            className={classNames('status__action-bar__button', { reblogPrivate })}
+            scrollKey={scrollKey}
+            status={status}
+            items={reblogMenu}
+            icon='retweet'
+            iconComponent={reblogIconComponent}
+            direction='right'
+            title={reblogTitle}
+            active={status.get('reblogged')}
+            disabled={!publicStatus && !reblogPrivate}
+          />
+        )}
         <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
         <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
+        {emojiPickerDropdown}
 
         {filterButton}
 
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 6f28f6d6d5..762208600b 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -9,7 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PollContainer from 'mastodon/containers/poll_container';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
@@ -245,7 +245,12 @@ class StatusContent extends PureComponent {
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
-    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
+    const renderTranslate = this.props.onTranslate &&
+        this.context.identity.signedIn &&
+        (['public', 'unlisted'].includes(status.get('visibility')) || status.getIn(['account', 'other_settings', 'translatable_private'])) &&
+        status.get('search_index').trim().length > 0 &&
+        status.get('language') &&
+        targetLanguages?.includes(contentLocale);
 
     const content = { __html: statusContent ?? getStatusContent(status) };
     const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
diff --git a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
new file mode 100644
index 0000000000..84fb45f4f7
--- /dev/null
+++ b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
@@ -0,0 +1,110 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import { isHideItem } from 'mastodon/initial_state';
+
+import EmojiView from './emoji_view';
+
+class EmojiReactionButton extends PureComponent {
+
+  static propTypes = {
+    name: PropTypes.string,
+    domain: PropTypes.string,
+    url: PropTypes.string,
+    staticUrl: PropTypes.string,
+    count: PropTypes.number.isRequired,
+    me: PropTypes.bool,
+    onEmojiReact: PropTypes.func,
+    onUnEmojiReact: PropTypes.func,
+  };
+
+  onClick = () => {
+    const { name, domain, me } = this.props;
+
+    const nameParameter = domain ? `${name}@${domain}` : name;
+    if (me) {
+      if (this.props.onUnEmojiReact) this.props.onUnEmojiReact(nameParameter);
+    } else {
+      if (this.props.onEmojiReact) this.props.onEmojiReact(nameParameter);
+    }
+  };
+
+  render () {
+    const { name, url, staticUrl, count, me } = this.props;
+
+    const classList = {
+      'emoji-reactions-bar__button': true,
+      'toggled': me,
+    };
+
+    const countView = count !== undefined && <span className='count'>{count}</span>;
+
+    return (
+      <button className={classNames(classList)} type='button' onClick={this.onClick}>
+        <span className='emoji'>
+          <EmojiView name={name} url={url} staticUrl={staticUrl} />
+        </span>
+        {countView}
+      </button>
+    );
+  }
+
+}
+
+class StatusEmojiReactionsBar extends PureComponent {
+
+  static propTypes = {
+    emojiReactions: ImmutablePropTypes.list.isRequired,
+    status: ImmutablePropTypes.map,
+    onEmojiReact: PropTypes.func,
+    onUnEmojiReact: PropTypes.func,
+    myReactionOnly: PropTypes.bool,
+  };
+
+  onEmojiReact = (name) => {
+    if (!this.props.onEmojiReact) return;
+    this.props.onEmojiReact(this.props.status, name);
+  };
+
+  onUnEmojiReact = (name) => {
+    if (!this.props.onUnEmojiReact) return;
+    this.props.onUnEmojiReact(this.props.status, name);
+  };
+
+  render () {
+    const { emojiReactions, myReactionOnly } = this.props;
+
+    const isShowCount = !isHideItem('emoji_reaction_count');
+
+    const emojiButtons = Array.from(emojiReactions)
+      .filter(emoji => emoji.get('count') !== 0)
+      .filter(emoji => !myReactionOnly || emoji.get('me'))
+      .map((emoji, index) => (
+        <EmojiReactionButton
+          key={index}
+          name={emoji.get('name')}
+          count={isShowCount ? (myReactionOnly ? 1 : emoji.get('count')) : undefined}
+          me={emoji.get('me')}
+          url={emoji.get('url')}
+          staticUrl={emoji.get('static_url')}
+          domain={emoji.get('domain')}
+          onEmojiReact={this.onEmojiReact}
+          onUnEmojiReact={this.onUnEmojiReact}
+        />));
+
+    return (
+      <div className='status__emoji-reactions-bar'>
+        {emojiButtons}
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(StatusEmojiReactionsBar);
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index e92dd233e1..3ed20f65eb 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -5,7 +5,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { debounce } from 'lodash';
 
+import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'mastodon/actions/timelines';
 import RegenerationIndicator from 'mastodon/components/regeneration_indicator';
+import { InlineFollowSuggestions } from 'mastodon/features/home_timeline/components/inline_follow_suggestions';
 
 import StatusContainer from '../containers/status_container';
 
@@ -91,25 +93,38 @@ export default class StatusList extends ImmutablePureComponent {
     }
 
     let scrollableContent = (isLoading || statusIds.size > 0) ? (
-      statusIds.map((statusId, index) => statusId === null ? (
-        <LoadGap
-          key={'gap:' + statusIds.get(index + 1)}
-          disabled={isLoading}
-          maxId={index > 0 ? statusIds.get(index - 1) : null}
-          onClick={onLoadMore}
-        />
-      ) : (
-        <StatusContainer
-          key={statusId}
-          id={statusId}
-          onMoveUp={this.handleMoveUp}
-          onMoveDown={this.handleMoveDown}
-          contextType={timelineId}
-          scrollKey={this.props.scrollKey}
-          showThread
-          withCounters={this.props.withCounters}
-        />
-      ))
+      statusIds.map((statusId, index) => {
+        switch(statusId) {
+        case TIMELINE_SUGGESTIONS:
+          return (
+            <InlineFollowSuggestions
+              key='inline-follow-suggestions'
+            />
+          );
+        case TIMELINE_GAP:
+          return (
+            <LoadGap
+              key={'gap:' + statusIds.get(index + 1)}
+              disabled={isLoading}
+              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              onClick={onLoadMore}
+            />
+          );
+        default:
+          return (
+            <StatusContainer
+              key={statusId}
+              id={statusId}
+              onMoveUp={this.handleMoveUp}
+              onMoveDown={this.handleMoveDown}
+              contextType={timelineId}
+              scrollKey={this.props.scrollKey}
+              showThread
+              withCounters={this.props.withCounters}
+            />
+          );
+        }
+      })
     ) : null;
 
     if (scrollableContent && featuredStatusIds) {
diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx
index 4209f68319..626cc500d6 100644
--- a/app/javascript/mastodon/components/verified_badge.tsx
+++ b/app/javascript/mastodon/components/verified_badge.tsx
@@ -1,4 +1,4 @@
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index 1a75261427..9f5e081fab 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -1,28 +1,65 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
+import MutualIcon from '@/material-icons/400-24px/compare_arrows.svg?react';
+import LoginIcon from '@/material-icons/400-24px/key.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
+import PersonalIcon from '@/material-icons/400-24px/sticky_note.svg?react';
+import type { StatusVisibility } from 'mastodon/models/status';
 
 import { Icon } from './icon';
 
-type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+  public_unlisted_short: {
+    id: 'privacy.public_unlisted.short',
+    defaultMessage: 'Local public',
+  },
+  login_short: {
+    id: 'privacy.login.short',
+    defaultMessage: 'Login only',
+  },
+  unlisted_short: {
+    id: 'privacy.unlisted.short',
+    defaultMessage: 'Quiet public',
+  },
   private_short: {
     id: 'privacy.private.short',
-    defaultMessage: 'Followers only',
+    defaultMessage: 'Followers',
+  },
+  limited_short: {
+    id: 'privacy.limited.short',
+    defaultMessage: 'Limited',
+  },
+  mutual_short: {
+    id: 'privacy.mutual.short',
+    defaultMessage: 'Mutual',
+  },
+  circle_short: {
+    id: 'privacy.circle.short',
+    defaultMessage: 'Circle',
+  },
+  reply_short: {
+    id: 'privacy.reply.short',
+    defaultMessage: 'Reply',
+  },
+  personal_short: {
+    id: 'privacy.personal.short',
+    defaultMessage: 'Yourself only',
   },
   direct_short: {
     id: 'privacy.direct.short',
-    defaultMessage: 'Mentioned people only',
+    defaultMessage: 'Specific people',
   },
 });
 
-export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
+export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
   visibility,
 }) => {
   const intl = useIntl();
@@ -33,9 +70,19 @@ export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
       iconComponent: PublicIcon,
       text: intl.formatMessage(messages.public_short),
     },
+    public_unlisted: {
+      icon: 'cloud',
+      iconComponent: PublicUnlistedIcon,
+      text: intl.formatMessage(messages.public_unlisted_short),
+    },
+    login: {
+      icon: 'key',
+      iconComponent: LoginIcon,
+      text: intl.formatMessage(messages.login_short),
+    },
     unlisted: {
       icon: 'unlock',
-      iconComponent: LockOpenIcon,
+      iconComponent: QuietTimeIcon,
       text: intl.formatMessage(messages.unlisted_short),
     },
     private: {
@@ -43,6 +90,31 @@ export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
       iconComponent: LockIcon,
       text: intl.formatMessage(messages.private_short),
     },
+    limited: {
+      icon: 'get-pocket',
+      iconComponent: LimitedIcon,
+      text: intl.formatMessage(messages.limited_short),
+    },
+    mutual: {
+      icon: 'exchange',
+      iconComponent: MutualIcon,
+      text: intl.formatMessage(messages.mutual_short),
+    },
+    circle: {
+      icon: 'user-circle',
+      iconComponent: CircleIcon,
+      text: intl.formatMessage(messages.circle_short),
+    },
+    reply: {
+      icon: 'reply',
+      iconComponent: ReplyIcon,
+      text: intl.formatMessage(messages.reply_short),
+    },
+    personal: {
+      icon: 'sticky-note-o',
+      iconComponent: PersonalIcon,
+      text: intl.formatMessage(messages.personal_short),
+    },
     direct: {
       icon: 'at',
       iconComponent: AlternateEmailIcon,
diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx
index a134452e77..f171fcc2fe 100644
--- a/app/javascript/mastodon/containers/account_container.jsx
+++ b/app/javascript/mastodon/containers/account_container.jsx
@@ -13,7 +13,6 @@ import {
 import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
-import { unfollowModal } from '../initial_state';
 import { makeGetAccount } from '../selectors';
 
 const messages = defineMessages({
@@ -34,18 +33,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
diff --git a/app/javascript/mastodon/containers/compacted_status_container.jsx b/app/javascript/mastodon/containers/compacted_status_container.jsx
new file mode 100644
index 0000000000..8d483ed36f
--- /dev/null
+++ b/app/javascript/mastodon/containers/compacted_status_container.jsx
@@ -0,0 +1,78 @@
+import { injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { openModal } from '../actions/modal';
+import {
+  hideStatus,
+  revealStatus,
+  toggleStatusCollapse,
+  translateStatus,
+  undoStatusTranslation,
+} from '../actions/statuses';
+import CompactedStatus from '../components/compacted_status';
+import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+  const getPictureInPicture = makeGetPictureInPicture();
+
+  const mapStateToProps = (state, props) => ({
+    status: getStatus(state, props),
+    nextInReplyToId: props.nextId ? state.getIn(['statuses', props.nextId, 'in_reply_to_id']) : null,
+    pictureInPicture: getPictureInPicture(state, props),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch) => ({
+
+  onTranslate (status) {
+    if (status.get('translation')) {
+      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
+    } else {
+      dispatch(translateStatus(status.get('id')));
+    }
+  },
+
+  onOpenMedia (statusId, media, index, lang) {
+    dispatch(openModal({
+      modalType: 'MEDIA',
+      modalProps: { statusId, media, index, lang },
+    }));
+  },
+
+  onOpenVideo (statusId, media, lang, options) {
+    dispatch(openModal({
+      modalType: 'VIDEO',
+      modalProps: { statusId, media, lang, options },
+    }));
+  },
+
+  onToggleHidden (status) {
+    if (status.get('hidden')) {
+      dispatch(revealStatus(status.get('id')));
+    } else {
+      dispatch(hideStatus(status.get('id')));
+    }
+  },
+
+  onToggleCollapsed (status, isCollapsed) {
+    dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
+  },
+
+  onInteractionModal (type, status) {
+    dispatch(openModal({
+      modalType: 'INTERACTION',
+      modalProps: {
+        type,
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('uri'),
+      },
+    }));
+  },
+
+});
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(CompactedStatus));
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index f76550678e..171f14d3b2 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -1,14 +1,12 @@
-import { PureComponent } from 'react';
-
 import { Provider } from 'react-redux';
 
-import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from '../actions/store';
-import Compose from '../features/standalone/compose';
-import initialState from '../initial_state';
-import { IntlProvider } from '../locales';
-import { store } from '../store';
-
+import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
+import { hydrateStore } from 'mastodon/actions/store';
+import { Router } from 'mastodon/components/router';
+import Compose from 'mastodon/features/standalone/compose';
+import initialState from 'mastodon/initial_state';
+import { IntlProvider } from 'mastodon/locales';
+import { store } from 'mastodon/store';
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -16,16 +14,14 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class ComposeContainer extends PureComponent {
+const ComposeContainer = () => (
+  <IntlProvider>
+    <Provider store={store}>
+      <Router>
+        <Compose />
+      </Router>
+    </Provider>
+  </IntlProvider>
+);
 
-  render () {
-    return (
-      <IntlProvider>
-        <Provider store={store}>
-          <Compose />
-        </Provider>
-      </IntlProvider>
-    );
-  }
-
-}
+export default ComposeContainer;
diff --git a/app/javascript/mastodon/containers/mastodon.jsx b/app/javascript/mastodon/containers/mastodon.jsx
index 87708da191..9cf21cfa09 100644
--- a/app/javascript/mastodon/containers/mastodon.jsx
+++ b/app/javascript/mastodon/containers/mastodon.jsx
@@ -8,7 +8,9 @@ import { Provider as ReduxProvider } from 'react-redux';
 
 import { ScrollContext } from 'react-router-scroll-4';
 
+import { fetchCircles } from 'mastodon/actions/circles';
 import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
+import { fetchReactionDeck } from 'mastodon/actions/reaction_deck';
 import { hydrateStore } from 'mastodon/actions/store';
 import { connectUserStream } from 'mastodon/actions/streaming';
 import ErrorBoundary from 'mastodon/components/error_boundary';
@@ -26,6 +28,8 @@ const hydrateAction = hydrateStore(initialState);
 store.dispatch(hydrateAction);
 if (initialState.meta.me) {
   store.dispatch(fetchCustomEmojis());
+  store.dispatch(fetchReactionDeck());
+  store.dispatch(fetchCircles());
 }
 
 const createIdentityContext = state => ({
diff --git a/app/javascript/mastodon/containers/media_container.jsx b/app/javascript/mastodon/containers/media_container.jsx
index fba3c5df78..d18602e3b5 100644
--- a/app/javascript/mastodon/containers/media_container.jsx
+++ b/app/javascript/mastodon/containers/media_container.jsx
@@ -80,7 +80,7 @@ export default class MediaContainer extends PureComponent {
     return (
       <IntlProvider>
         <>
-          {[].map.call(components, (component, i) => {
+          {Array.from(components).map((component, i) => {
             const componentName = component.getAttribute('data-component');
             const Component = MEDIA_COMPONENTS[componentName];
             const { media, card, poll, hashtag, ...props } = JSON.parse(component.getAttribute('data-props'));
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 7a7cd9880f..dee58bc164 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -1,4 +1,4 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
@@ -8,14 +8,14 @@ import {
 } from '../actions/accounts';
 import { showAlertForError } from '../actions/alerts';
 import { initBlockModal } from '../actions/blocks';
-import { initBoostModal } from '../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
   directCompose,
+  insertReferenceCompose,
 } from '../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../actions/domain_blocks';
 import {
@@ -24,9 +24,11 @@ import {
 import {
   reblog,
   favourite,
+  emojiReact,
   bookmark,
   unreblog,
   unfavourite,
+  unEmojiReact,
   unbookmark,
   pin,
   unpin,
@@ -77,6 +79,8 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
+  contextType,
+
   onReply (status, router) {
     dispatch((_, getState) => {
       let state = getState();
@@ -107,10 +111,14 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     if ((e && e.shiftKey) || !boostModal) {
       this.onModalReblog(status);
     } else {
-      dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
     }
   },
 
+  onReblogForceModal (status) {
+    dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
@@ -119,6 +127,14 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
+  onEmojiReact (status, emoji) {
+    dispatch(emojiReact(status, emoji));
+  },
+
+  onUnEmojiReact (status, emoji) {
+    dispatch(unEmojiReact(status, emoji));
+  },
+
   onBookmark (status) {
     if (status.get('bookmarked')) {
       dispatch(unbookmark(status));
@@ -127,6 +143,15 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
+  onBookmarkCategoryAdder (status) {
+    dispatch(openModal({
+      modalType: 'BOOKMARK_CATEGORY_ADDER',
+      modalProps: {
+        statusId: status.get('id'),
+      },
+    }));
+  },
+
   onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
@@ -178,6 +203,14 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
+  onReference (status) {
+    dispatch(insertReferenceCompose(0, status.get('url'), 'BT'));
+  },
+
+  onQuote (status) {
+    dispatch(insertReferenceCompose(0, status.get('url'), 'QT'));
+  },
+
   onTranslate (status) {
     if (status.get('translation')) {
       dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
@@ -253,15 +286,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {
@@ -269,7 +295,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   },
 
   deployPictureInPicture (status, type, mediaProps) {
-    dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
+    dispatch(deployPictureInPicture({statusId: status.get('id'), accountId: status.getIn(['account', 'id']), playerType: type, props: mediaProps}));
   },
 
   onInteractionModal (type, status) {
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index bffac6357a..63395d2c91 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -10,8 +10,10 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import DisabledIcon from '@/material-icons/400-24px/close-fill.svg?react';
+import EnabledIcon from '@/material-icons/400-24px/done-fill.svg?react';
+import ExpandMoreIcon from '@/material-icons/400-24px/expand_more.svg?react';
 import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'mastodon/actions/server';
 import Column from 'mastodon/components/column';
 import { Icon  }  from 'mastodon/components/icon';
@@ -24,10 +26,20 @@ const messages = defineMessages({
   title: { id: 'column.about', defaultMessage: 'About' },
   rules: { id: 'about.rules', defaultMessage: 'Server rules' },
   blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
+  fullTextSearch: { id: 'about.full_text_search', defaultMessage: 'Full text search' },
+  localTimeline: { id: 'column.community', defaultMessage: 'Local timeline' },
+  noop: { id: 'about.domain_blocks.noop.title', defaultMessage: 'Soft limited' },
+  noopExplanation: { id: 'about.domain_blocks.noop.explanation', defaultMessage: 'This server is limited partically.' },
   silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
   silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
   suspended: { id: 'about.domain_blocks.suspended.title', defaultMessage: 'Suspended' },
   suspendedExplanation: { id: 'about.domain_blocks.suspended.explanation', defaultMessage: 'No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.' },
+  publicUnlistedVisibility: { id: 'privacy.public_unlisted.short', defaultMessage: 'Local public' },
+  publicVisibility: { id: 'about.public_visibility', defaultMessage: 'Public visibility' },
+  emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Emoji reaction' },
+  enabled: { id: 'about.enabled', defaultMessage: 'Enabled' },
+  disabled: { id: 'about.disabled', defaultMessage: 'Disabled' },
+  capabilities: { id: 'about.kmyblue_capabilities', defaultMessage: 'kmyblue capabilities' },
 });
 
 const severityMessages = {
@@ -40,6 +52,11 @@ const severityMessages = {
     title: messages.suspended,
     explanation: messages.suspendedExplanation,
   },
+
+  noop: {
+    title: messages.noop,
+    explanation: messages.noopExplanation,
+  },
 };
 
 const mapStateToProps = state => ({
@@ -87,6 +104,28 @@ class Section extends PureComponent {
 
 }
 
+class CapabilityIcon extends PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    state: PropTypes.bool,
+  };
+
+  render () {
+    const { intl, state } = this.props;
+
+    if (state) {
+      return (
+        <span className='capability-icon enabled'><Icon id='check' icon={EnabledIcon} title={intl.formatMessage(messages.enabled)} />{intl.formatMessage(messages.enabled)}</span>
+      );
+    } else {
+      return (
+        <span className='capability-icon disabled'><Icon id='times' icon={DisabledIcon} title={intl.formatMessage(messages.disabled)} />{intl.formatMessage(messages.disabled)}</span>
+      );
+    }
+  }
+}
+
 class About extends PureComponent {
 
   static propTypes = {
@@ -117,6 +156,17 @@ class About extends PureComponent {
     const { multiColumn, intl, server, extendedDescription, domainBlocks } = this.props;
     const isLoading = server.get('isLoading');
 
+    const fedibirdCapabilities = server.get('fedibird_capabilities') || [];   // thinking about isLoading is true
+    const isPublicUnlistedVisibility = fedibirdCapabilities.includes('kmyblue_visibility_public_unlisted');
+    const isPublicVisibility = !fedibirdCapabilities.includes('kmyblue_no_public_visibility');
+    const isEmojiReaction = fedibirdCapabilities.includes('emoji_reaction');
+    const isLocalTimeline = !fedibirdCapabilities.includes('timeline_no_local');
+
+    const isFullTextSearch = server.getIn(['configuration', 'search', 'enabled']);
+
+    const email = server.getIn(['contact', 'email']) || '';
+    const emailLink = email.startsWith('https://') ? email : `mailto:${email}`;
+
     return (
       <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.title)}>
         <div className='scrollable about'>
@@ -138,7 +188,7 @@ class About extends PureComponent {
             <div className='about__meta__column'>
               <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
 
-              {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
+              {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={emailLink}>{server.getIn(['contact', 'email'])}</a>}
             </div>
           </div>
 
@@ -170,13 +220,37 @@ class About extends PureComponent {
               <ol className='rules-list'>
                 {server.get('rules').map(rule => (
                   <li key={rule.get('id')}>
-                    <span className='rules-list__text'>{rule.get('text')}</span>
+                    <div className='rules-list__text'>{rule.get('text')}</div>
+                    {rule.get('hint').length > 0 && (<div className='rules-list__hint'>{rule.get('hint')}</div>)}
                   </li>
                 ))}
               </ol>
             ))}
           </Section>
 
+          <Section title={intl.formatMessage(messages.capabilities)}>
+            <p><FormattedMessage id='about.kmyblue_capability' defaultMessage='This server is using kmyblue, a fork of Mastodon. On this server, kmyblues unique features are configured as follows.' /></p>
+            {!isLoading && (
+              <ol className='rules-list'>
+                <li>
+                  <span className='rules-list__text'>{intl.formatMessage(messages.emojiReaction)}: <CapabilityIcon state={isEmojiReaction} intl={intl} /></span>
+                </li>
+                <li>
+                  <span className='rules-list__text'>{intl.formatMessage(messages.publicVisibility)}: <CapabilityIcon state={isPublicVisibility} intl={intl} /></span>
+                </li>
+                <li>
+                  <span className='rules-list__text'>{intl.formatMessage(messages.publicUnlistedVisibility)}: <CapabilityIcon state={isPublicUnlistedVisibility} intl={intl} /></span>
+                </li>
+                <li>
+                  <span className='rules-list__text'>{intl.formatMessage(messages.localTimeline)}: <CapabilityIcon state={isLocalTimeline} intl={intl} /></span>
+                </li>
+                <li>
+                  <span className='rules-list__text'>{intl.formatMessage(messages.fullTextSearch)}: <CapabilityIcon state={isFullTextSearch} intl={intl} /></span>
+                </li>
+              </ol>
+            )}
+          </Section>
+
           <Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
             {domainBlocks.get('isLoading') ? (
               <>
@@ -188,18 +262,20 @@ class About extends PureComponent {
               <>
                 <p><FormattedMessage id='about.domain_blocks.preamble' defaultMessage='Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.' /></p>
 
-                <div className='about__domain-blocks'>
-                  {domainBlocks.get('items').map(block => (
-                    <div className='about__domain-blocks__domain' key={block.get('domain')}>
-                      <div className='about__domain-blocks__domain__header'>
-                        <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
-                      </div>
+                {domainBlocks.get('items').size > 0 && (
+                  <div className='about__domain-blocks'>
+                    {domainBlocks.get('items').map(block => (
+                      <div className='about__domain-blocks__domain' key={block.get('domain')}>
+                        <div className='about__domain-blocks__domain__header'>
+                          <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
+                          <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}</span>
+                        </div>
 
-                      <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
-                    </div>
-                  ))}
-                </div>
+                        <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
+                      </div>
+                    ))}
+                  </div>
+                )}
               </>
             ) : (
               <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
diff --git a/app/javascript/mastodon/features/account/components/domain_pill.jsx b/app/javascript/mastodon/features/account/components/domain_pill.jsx
new file mode 100644
index 0000000000..0dadb947f9
--- /dev/null
+++ b/app/javascript/mastodon/features/account/components/domain_pill.jsx
@@ -0,0 +1,86 @@
+import PropTypes from 'prop-types';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BadgeIcon from '@/material-icons/400-24px/badge.svg?react';
+import GlobeIcon from '@/material-icons/400-24px/globe.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainPill = ({ domain, username, isSelf }) => {
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  const handleExpandClick = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
+
+  return (
+    <>
+      <button className={classNames('account__domain-pill', { active: open })} ref={triggerRef} onClick={handleClick}>{domain}</button>
+
+      <Overlay show={open} rootClose onHide={handleClick} offset={[5, 5]} target={triggerRef}>
+        {({ props }) => (
+          <div {...props} className='account__domain-pill__popout dropdown-animation'>
+            <div className='account__domain-pill__popout__header'>
+              <div className='account__domain-pill__popout__header__icon'><Icon icon={BadgeIcon} /></div>
+              <h3><FormattedMessage id='domain_pill.whats_in_a_handle' defaultMessage="What's in a handle?" /></h3>
+            </div>
+
+            <div className='account__domain-pill__popout__handle'>
+              <div className='account__domain-pill__popout__handle__label'>{isSelf ? <FormattedMessage id='domain_pill.your_handle' defaultMessage='Your handle:' /> : <FormattedMessage id='domain_pill.their_handle' defaultMessage='Their handle:' />}</div>
+              <div className='account__domain-pill__popout__handle__handle'>@{username}@{domain}</div>
+            </div>
+
+            <div className='account__domain-pill__popout__parts'>
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={AlternateEmailIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.username' defaultMessage='Username' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_username' defaultMessage='Your unique identifier on this server. It’s possible to find users with the same username on different servers.' /> : <FormattedMessage id='domain_pill.their_username' defaultMessage='Their unique identifier on their server. It’s possible to find users with the same username on different servers.' />}</p>
+                </div>
+              </div>
+
+              <div>
+                <div className='account__domain-pill__popout__parts__icon'><Icon icon={GlobeIcon} /></div>
+
+                <div>
+                  <h6><FormattedMessage id='domain_pill.server' defaultMessage='Server' /></h6>
+                  <p>{isSelf ? <FormattedMessage id='domain_pill.your_server' defaultMessage='Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.' /> : <FormattedMessage id='domain_pill.their_server' defaultMessage='Their digital home, where all of their posts live.' />}</p>
+                </div>
+              </div>
+            </div>
+
+            <p>{isSelf ? <FormattedMessage id='domain_pill.who_you_are' defaultMessage='Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} /> : <FormattedMessage id='domain_pill.who_they_are' defaultMessage='Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.' values={{ button: x => <button onClick={handleExpandClick} className='link-button'>{x}</button> }} />}</p>
+
+            {expanded && (
+              <>
+                <p><FormattedMessage id='domain_pill.activitypub_like_language' defaultMessage='ActivityPub is like the language Mastodon speaks with other social networks.' /></p>
+                <p><FormattedMessage id='domain_pill.activitypub_lets_connect' defaultMessage='It lets you connect and interact with people not just on Mastodon, but across different social apps too.' /></p>
+              </>
+            )}
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
+
+DomainPill.propTypes = {
+  username: PropTypes.string.isRequired,
+  domain: PropTypes.string.isRequired,
+  isSelf: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
index a8b61f9eaf..d57fd030b2 100644
--- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
@@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class FollowRequestNote extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 6f58ae35f1..1f96a8ec40 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -9,28 +9,32 @@ import { NavLink, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react';
-import NotificationsActiveIcon from 'mastodon/../material-icons/400-24px/notifications_active-fill.svg?react';
-import ShareIcon from 'mastodon/../material-icons/400-24px/share.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import ShareIcon from '@/material-icons/400-24px/share.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
 import { Button } from 'mastodon/components/button';
 import { CopyIconButton } from 'mastodon/components/copy_icon_button';
 import { FollowersCounter, FollowingCounter, StatusesCounter } from 'mastodon/components/counters';
+import { getFeaturedHashtagBar } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ShortNumber } from 'mastodon/components/short_number';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
-import { autoPlayGif, me, domain } from 'mastodon/initial_state';
+import { autoPlayGif, me, domain as localDomain, isShowItem } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import AccountNoteContainer from '../containers/account_note_container';
 import FollowRequestNoteContainer from '../containers/follow_request_note_container';
 
+import { DomainPill } from './domain_pill';
+
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -69,6 +73,9 @@ const messages = defineMessages({
   endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
   unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' },
   add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' },
+  add_or_remove_from_antenna: { id: 'account.add_or_remove_from_antenna', defaultMessage: 'Add or Remove from antennas' },
+  add_or_remove_from_exclude_antenna: { id: 'account.add_or_remove_from_exclude_antenna', defaultMessage: 'Add or Remove from antennas as exclusion' },
+  add_or_remove_from_circle: { id: 'account.add_or_remove_from_circle', defaultMessage: 'Add or Remove from circles' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   languages: { id: 'account.languages', defaultMessage: 'Change subscribed languages' },
@@ -77,7 +84,7 @@ const messages = defineMessages({
 
 const titleFromAccount = account => {
   const displayName = account.get('display_name');
-  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${domain}` : account.get('acct');
+  const acct = account.get('acct') === account.get('username') ? `${account.get('username')}@${localDomain}` : account.get('acct');
   const prefix = displayName.trim().length === 0 ? account.get('username') : displayName;
 
   return `${prefix} (@${acct})`;
@@ -86,9 +93,9 @@ const titleFromAccount = account => {
 const messageForFollowButton = relationship => {
   if(!relationship) return messages.follow;
 
-  if (relationship.get('following') && relationship.get('followed_by')) {
+  if (relationship.get('following') && relationship.get('followed_by') && isShowItem('relationships')) {
     return messages.mutual;
-  } else if (!relationship.get('following') && relationship.get('followed_by')) {
+  } else if (!relationship.get('following') && relationship.get('followed_by') && isShowItem('relationships')) {
     return messages.followBack;
   } else if (relationship.get('following')) {
     return messages.unfollow;
@@ -101,7 +108,6 @@ const dateFormatOptions = {
   month: 'short',
   day: 'numeric',
   year: 'numeric',
-  hour12: false,
   hour: '2-digit',
   minute: '2-digit',
 };
@@ -110,6 +116,7 @@ class Header extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.record,
+    featuredTags: PropTypes.array,
     identity_props: ImmutablePropTypes.list,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
@@ -123,6 +130,9 @@ class Header extends ImmutablePureComponent {
     onUnblockDomain: PropTypes.func.isRequired,
     onEndorseToggle: PropTypes.func.isRequired,
     onAddToList: PropTypes.func.isRequired,
+    onAddToAntenna: PropTypes.func.isRequired,
+    onAddToExcludeAntenna: PropTypes.func.isRequired,
+    onAddToCircle: PropTypes.func.isRequired,
     onEditAccountNote: PropTypes.func.isRequired,
     onChangeLanguages: PropTypes.func.isRequired,
     onInteractionModal: PropTypes.func.isRequired,
@@ -207,6 +217,16 @@ class Header extends ImmutablePureComponent {
     }
   };
 
+  handleFeaturedHashtagClick = e => {
+    const { history, account } = this.props;
+    const value = e.currentTarget.textContent.replace(/^#/, '');
+
+    if (history && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      history.push(`/@${account.get('acct')}/tagged/${value}`);
+    }
+  };
+
   handleMentionClick = e => {
     const { history, onOpenURL } = this.props;
 
@@ -236,7 +256,11 @@ class Header extends ImmutablePureComponent {
       link = links[i];
 
       if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
-        link.addEventListener('click', this.handleHashtagClick, false);
+        if (link.href && link.href.includes('/tagged/')) {
+          link.addEventListener('click', this.handleFeaturedHashtagClick, false);
+        } else {
+          link.addEventListener('click', this.handleHashtagClick, false);
+        }
       } else if (link.classList.contains('mention')) {
         link.addEventListener('click', this.handleMentionClick, false);
       }
@@ -252,7 +276,7 @@ class Header extends ImmutablePureComponent {
   }
 
   render () {
-    const { account, hidden, intl, domain } = this.props;
+    const { account, hidden, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
     if (!account) {
@@ -290,7 +314,7 @@ class Header extends ImmutablePureComponent {
 
     if (me !== account.get('id')) {
       if (signedIn && !account.get('relationship')) { // Wait until the relationship is loaded
-        actionBtn = '';
+        actionBtn = <Button disabled><LoadingIndicator /></Button>;
       } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
@@ -349,8 +373,13 @@ class Header extends ImmutablePureComponent {
 
         menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
         menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
-        menu.push(null);
       }
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_antenna), action: this.props.onAddToAntenna });
+      menu.push({ text: intl.formatMessage(messages.add_or_remove_from_exclude_antenna), action: this.props.onAddToExcludeAntenna });
+      if (account.getIn(['relationship', 'followed_by'])) {
+        menu.push({ text: intl.formatMessage(messages.add_or_remove_from_circle), action: this.props.onAddToCircle });
+      }
+      menu.push(null);
 
       if (account.getIn(['relationship', 'muting'])) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
@@ -393,8 +422,11 @@ class Header extends ImmutablePureComponent {
     const displayNameHtml = { __html: account.get('display_name_html') };
     const fields          = account.get('fields');
     const isLocal         = account.get('acct').indexOf('@') === -1;
-    const acct            = isLocal && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
+    const username        = account.get('acct').split('@')[0];
+    const domain          = isLocal ? localDomain : account.get('acct').split('@')[1];
     const isIndexable     = !account.get('noindex');
+    const featuredTagsArr = this.props.featuredTags?.map((tag) => tag.get('name')).toArray() || [];
+    const featuredTags    = getFeaturedHashtagBar(account.get('acct'), featuredTagsArr);
 
     const badges = [];
 
@@ -405,7 +437,7 @@ class Header extends ImmutablePureComponent {
     }
 
     account.get('roles', []).forEach((role) => {
-      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} />);
+      badges.push(<Badge key={`role-badge-${role.get('id')}`} label={<span>{role.get('name')}</span>} domain={domain} roleId={role.get('id')} />);
     });
 
     return (
@@ -427,15 +459,10 @@ class Header extends ImmutablePureComponent {
             </a>
 
             <div className='account__header__tabs__buttons'>
-              {!hidden && (
-                <>
-                  {actionBtn}
-                  {bellBtn}
-                  {shareBtn}
-                </>
-              )}
-
+              {!hidden && bellBtn}
+              {!hidden && shareBtn}
               <DropdownMenuContainer disabled={menu.length === 0} items={menu} icon='ellipsis-v' iconComponent={MoreHorizIcon} size={24} direction='right' />
+              {!hidden && actionBtn}
             </div>
           </div>
 
@@ -443,7 +470,9 @@ class Header extends ImmutablePureComponent {
             <h1>
               <span dangerouslySetInnerHTML={displayNameHtml} />
               <small>
-                <span>@{acct}</span> {lockedIcon}
+                <span>@{username}<span className='invisible'>@{domain}</span></span>
+                <DomainPill username={username} domain={domain} isSelf={me === account.get('id')} />
+                {lockedIcon}
               </small>
             </h1>
           </div>
@@ -461,6 +490,12 @@ class Header extends ImmutablePureComponent {
 
                 {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />}
 
+                {featuredTagsArr.length > 0 && (
+                  <div className='account__header__featured-tags'>
+                    {featuredTags}
+                  </div>
+                )}
+
                 <div className='account__header__fields'>
                   <dl>
                     <dt><FormattedMessage id='account.joined_short' defaultMessage='Joined' /></dt>
@@ -483,6 +518,7 @@ class Header extends ImmutablePureComponent {
                 <NavLink isActive={this.isStatusesPageActive} activeClassName='active' to={`/@${account.get('acct')}`} title={intl.formatNumber(account.get('statuses_count'))}>
                   <ShortNumber
                     value={account.get('statuses_count')}
+                    isHide={account.getIn(['other_settings', 'hide_statuses_count']) || false}
                     renderer={StatusesCounter}
                   />
                 </NavLink>
@@ -490,6 +526,7 @@ class Header extends ImmutablePureComponent {
                 <NavLink exact activeClassName='active' to={`/@${account.get('acct')}/following`} title={intl.formatNumber(account.get('following_count'))}>
                   <ShortNumber
                     value={account.get('following_count')}
+                    isHide={account.getIn(['other_settings', 'hide_following_count']) || false}
                     renderer={FollowingCounter}
                   />
                 </NavLink>
@@ -497,6 +534,7 @@ class Header extends ImmutablePureComponent {
                 <NavLink exact activeClassName='active' to={`/@${account.get('acct')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
                   <ShortNumber
                     value={account.get('followers_count')}
+                    isHide={account.getIn(['other_settings', 'hide_followers_count']) || false}
                     renderer={FollowersCounter}
                   />
                 </NavLink>
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
index a35092893d..087e775753 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
@@ -5,9 +5,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AudiotrackIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import AudiotrackIcon from '@/material-icons/400-24px/music_note.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.jsx b/app/javascript/mastodon/features/account_timeline/components/header.jsx
index 7de8d3771b..8a99a3991f 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.jsx
+++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx
@@ -18,6 +18,7 @@ class Header extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.record,
+    featuredTags: PropTypes.array,
     onFollow: PropTypes.func.isRequired,
     onBlock: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
@@ -29,6 +30,9 @@ class Header extends ImmutablePureComponent {
     onUnblockDomain: PropTypes.func.isRequired,
     onEndorseToggle: PropTypes.func.isRequired,
     onAddToList: PropTypes.func.isRequired,
+    onAddToAntenna: PropTypes.func.isRequired,
+    onAddToExcludeAntenna: PropTypes.func.isRequired,
+    onAddToCircle: PropTypes.func.isRequired,
     onChangeLanguages: PropTypes.func.isRequired,
     onInteractionModal: PropTypes.func.isRequired,
     onOpenAvatar: PropTypes.func.isRequired,
@@ -72,11 +76,7 @@ class Header extends ImmutablePureComponent {
   };
 
   handleBlockDomain = () => {
-    const domain = this.props.account.get('acct').split('@')[1];
-
-    if (!domain) return;
-
-    this.props.onBlockDomain(domain);
+    this.props.onBlockDomain(this.props.account);
   };
 
   handleUnblockDomain = () => {
@@ -95,6 +95,18 @@ class Header extends ImmutablePureComponent {
     this.props.onAddToList(this.props.account);
   };
 
+  handleAddToAntenna = () => {
+    this.props.onAddToAntenna(this.props.account);
+  };
+
+  handleAddToExcludeAntenna = () => {
+    this.props.onAddToExcludeAntenna(this.props.account);
+  };
+
+  handleAddToCircle = () => {
+    this.props.onAddToCircle(this.props.account);
+  };
+
   handleEditAccountNote = () => {
     this.props.onEditAccountNote(this.props.account);
   };
@@ -112,7 +124,7 @@ class Header extends ImmutablePureComponent {
   };
 
   render () {
-    const { account, hidden, hideTabs } = this.props;
+    const { account, featuredTags, hidden, hideTabs } = this.props;
 
     if (account === null) {
       return null;
@@ -125,6 +137,7 @@ class Header extends ImmutablePureComponent {
 
         <InnerHeader
           account={account}
+          featuredTags={featuredTags}
           onFollow={this.handleFollow}
           onBlock={this.handleBlock}
           onMention={this.handleMention}
@@ -137,6 +150,9 @@ class Header extends ImmutablePureComponent {
           onUnblockDomain={this.handleUnblockDomain}
           onEndorseToggle={this.handleEndorseToggle}
           onAddToList={this.handleAddToList}
+          onAddToAntenna={this.handleAddToAntenna}
+          onAddToExcludeAntenna={this.handleAddToExcludeAntenna}
+          onAddToCircle={this.handleAddToCircle}
           onEditAccountNote={this.handleEditAccountNote}
           onChangeLanguages={this.handleChangeLanguages}
           onInteractionModal={this.handleInteractionModal}
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 84a303c37a..d4ea4041a9 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -17,11 +17,10 @@ import {
   mentionCompose,
   directCompose,
 } from '../../../actions/compose';
-import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
+import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blocks';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
-import { unfollowModal } from '../../../initial_state';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
@@ -38,6 +37,7 @@ const makeMapStateToProps = () => {
     account: getAccount(state, accountId),
     domain: state.getIn(['meta', 'domain']),
     hidden: getAccountHidden(state, accountId),
+    featuredTags: state.getIn(['user_lists', 'featured_tags', accountId, 'items']),
   });
 
   return mapStateToProps;
@@ -47,31 +47,23 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.unfollowConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
-            onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
@@ -140,15 +132,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onBlockDomain (domain) {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => dispatch(blockDomain(domain)),
-      },
-    }));
+  onBlockDomain (account) {
+    dispatch(initDomainBlockModal(account));
   },
 
   onUnblockDomain (domain) {
@@ -164,6 +149,35 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
+  onAddToAntenna (account) {
+    dispatch(openModal({
+      modalType: 'ANTENNA_ADDER',
+      modalProps: {
+        accountId: account.get('id'),
+        isExclude: false,
+      },
+    }));
+  },
+
+  onAddToExcludeAntenna (account) {
+    dispatch(openModal({
+      modalType: 'ANTENNA_ADDER',
+      modalProps: {
+        accountId: account.get('id'),
+        isExclude: true,
+      },
+    }));
+  },
+
+  onAddToCircle (account) {
+    dispatch(openModal({
+      modalType: 'CIRCLE_ADDER',
+      modalProps: {
+        accountId: account.get('id'),
+      },
+    }));
+  },
+
   onChangeLanguages (account) {
     dispatch(openModal({
       modalType: 'SUBSCRIBED_LANGUAGES',
diff --git a/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx b/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx
new file mode 100644
index 0000000000..eaedc64525
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx
@@ -0,0 +1,96 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+import { removeFromAntennaAdder, addToAntennaAdder, removeExcludeFromAntennaAdder, addExcludeToAntennaAdder } from '../../../actions/antennas';
+import { IconButton }  from '../../../components/icon_button';
+
+const messages = defineMessages({
+  remove: { id: 'antennas.account.remove', defaultMessage: 'Remove from antenna' },
+  add: { id: 'antennas.account.add', defaultMessage: 'Add to antenna' },
+});
+
+const MapStateToProps = (state, { antennaId, added }) => ({
+  antenna: state.get('antennas').get(antennaId),
+  added: typeof added === 'undefined' ? state.getIn(['antennaAdder', 'antennas', 'items']).includes(antennaId) : added,
+});
+
+const mapDispatchToProps = (dispatch, { antennaId }) => ({
+  onRemove: () => dispatch(removeFromAntennaAdder(antennaId)),
+  onAdd: () => dispatch(addToAntennaAdder(antennaId)),
+  onExcludeRemove: () => dispatch(removeExcludeFromAntennaAdder(antennaId)),
+  onExcludeAdd: () => dispatch(addExcludeToAntennaAdder(antennaId)),
+});
+
+class Antenna extends ImmutablePureComponent {
+
+  static propTypes = {
+    antenna: ImmutablePropTypes.map.isRequired,
+    isExclude: PropTypes.bool.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    onExcludeRemove: PropTypes.func.isRequired,
+    onExcludeAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  handleRemove = () => {
+    if (this.props.isExclude) {
+      this.props.onExcludeRemove();
+    } else {
+      this.props.onRemove();
+    }
+  };
+
+  handleAdd = () => {
+    if (this.props.isExclude) {
+      this.props.onExcludeAdd();
+    } else {
+      this.props.onAdd();
+    }
+  };
+
+  render () {
+    const { antenna, intl, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' iconComponent={CloseIcon} title={intl.formatMessage(messages.remove)} onClick={this.handleRemove} />;
+    } else {
+      button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={this.handleAdd} />;
+    }
+
+    return (
+      <div className='list'>
+        <div className='list__wrapper'>
+          <div className='list__display-name'>
+            <Icon id='wifi' icon={AntennaIcon} className='column-link__icon' fixedWidth />
+            {antenna.get('title')}
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(Antenna));
diff --git a/app/javascript/mastodon/features/antenna_adder/index.jsx b/app/javascript/mastodon/features/antenna_adder/index.jsx
new file mode 100644
index 0000000000..649b4742e7
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_adder/index.jsx
@@ -0,0 +1,84 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl } from 'react-intl';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { setupAntennaAdder, resetAntennaAdder, setupExcludeAntennaAdder } from '../../actions/antennas';
+import NewAntennaForm from '../antennas/components/new_antenna_form';
+import Account from '../list_adder/components/account';
+
+import Antenna from './components/antenna';
+// hack
+
+const getOrderedAntennas = createSelector([state => state.get('antennas')], antennas => {
+  if (!antennas) {
+    return antennas;
+  }
+
+  return antennas.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  antennaIds: getOrderedAntennas(state).map(antenna=>antenna.get('id')),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onInitialize: accountId => dispatch(setupAntennaAdder(accountId)),
+  onExcludeInitialize: accountId => dispatch(setupExcludeAntennaAdder(accountId)),
+  onReset: () => dispatch(resetAntennaAdder()),
+});
+
+class AntennaAdder extends ImmutablePureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    isExclude: PropTypes.bool.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onExcludeInitialize: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    antennaIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { isExclude, onInitialize, onExcludeInitialize, accountId } = this.props;
+    if (isExclude) {
+      onExcludeInitialize(accountId);
+    } else {
+      onInitialize(accountId);
+    }
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { accountId, antennaIds, isExclude } = this.props;
+
+    return (
+      <div className='modal-root__modal list-adder'>
+        <div className='list-adder__account'>
+          <Account accountId={accountId} />
+        </div>
+
+        <NewAntennaForm />
+
+
+        <div className='list-adder__lists'>
+          {antennaIds.map(antennaId => <Antenna key={antennaId} antennaId={antennaId} isExclude={isExclude} />)}
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaAdder));
diff --git a/app/javascript/mastodon/features/antenna_editor/components/account.jsx b/app/javascript/mastodon/features/antenna_editor/components/account.jsx
new file mode 100644
index 0000000000..512e399618
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_editor/components/account.jsx
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+
+import { removeFromAntennaEditor, addToAntennaEditor, removeExcludeFromAntennaEditor, addExcludeToAntennaEditor } from '../../../actions/antennas';
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import { IconButton } from '../../../components/icon_button';
+import { makeGetAccount } from '../../../selectors';
+
+const messages = defineMessages({
+  remove: { id: 'antennas.account.remove', defaultMessage: 'Remove from antenna' },
+  add: { id: 'antennas.account.add', defaultMessage: 'Add to antenna' },
+});
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId, added }) => ({
+    account: getAccount(state, accountId),
+    added: typeof added === 'undefined' ? state.getIn(['antennaEditor', 'accounts', 'items']).includes(accountId) : added,
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch, { accountId }) => ({
+  onRemove: () => dispatch(removeFromAntennaEditor(accountId)),
+  onAdd: () => dispatch(addToAntennaEditor(accountId)),
+  onExcludeRemove: () => dispatch(removeExcludeFromAntennaEditor(accountId)),
+  onExcludeAdd: () => dispatch(addExcludeToAntennaEditor(accountId)),
+});
+
+class Account extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+    isExclude: PropTypes.bool.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    onExcludeRemove: PropTypes.func.isRequired,
+    onExcludeAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  render () {
+    const { account, intl, isExclude, onRemove, onAdd, onExcludeRemove, onExcludeAdd, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' iconComponent={CloseIcon} title={intl.formatMessage(messages.remove)} onClick={isExclude ? onExcludeRemove : onRemove} />;
+    } else {
+      button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={isExclude ? onExcludeAdd : onAdd} />;
+    }
+
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name'>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/antenna_editor/components/edit_antenna_form.jsx b/app/javascript/mastodon/features/antenna_editor/components/edit_antenna_form.jsx
new file mode 100644
index 0000000000..1a6361c60f
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_editor/components/edit_antenna_form.jsx
@@ -0,0 +1,76 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+
+import { changeAntennaEditorTitle, submitAntennaEditor } from '../../../actions/antennas';
+import { IconButton } from '../../../components/icon_button';
+
+const messages = defineMessages({
+  title: { id: 'antennas.edit.submit', defaultMessage: 'Change title' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['antennaEditor', 'title']),
+  disabled: !state.getIn(['antennaEditor', 'isChanged']) || !state.getIn(['antennaEditor', 'title']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeAntennaEditorTitle(value)),
+  onSubmit: () => dispatch(submitAntennaEditor(false)),
+});
+
+class AntennaForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <input
+          className='setting-text'
+          value={value}
+          onChange={this.handleChange}
+        />
+
+        <IconButton
+          disabled={disabled}
+          icon='check'
+          iconComponent={CheckIcon}
+          title={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaForm));
diff --git a/app/javascript/mastodon/features/antenna_editor/components/search.jsx b/app/javascript/mastodon/features/antenna_editor/components/search.jsx
new file mode 100644
index 0000000000..80b7c1dcda
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_editor/components/search.jsx
@@ -0,0 +1,83 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { connect } from 'react-redux';
+
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+import { fetchAntennaSuggestions, clearAntennaSuggestions, changeAntennaSuggestions } from '../../../actions/antennas';
+
+const messages = defineMessages({
+  search: { id: 'antennas.search', defaultMessage: 'Search among people you follow' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['antennaEditor', 'suggestions', 'value']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onSubmit: value => dispatch(fetchAntennaSuggestions(value)),
+  onClear: () => dispatch(clearAntennaSuggestions()),
+  onChange: value => dispatch(changeAntennaSuggestions(value)),
+});
+
+class Search extends PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    value: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+    onClear: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleKeyUp = e => {
+    if (e.keyCode === 13) {
+      this.props.onSubmit(this.props.value);
+    }
+  };
+
+  handleClear = () => {
+    this.props.onClear();
+  };
+
+  render () {
+    const { value, intl } = this.props;
+    const hasValue = value.length > 0;
+
+    return (
+      <div className='list-editor__search search'>
+        <label>
+          <span style={{ display: 'none' }}>{intl.formatMessage(messages.search)}</span>
+
+          <input
+            className='search__input'
+            type='text'
+            value={value}
+            onChange={this.handleChange}
+            onKeyUp={this.handleKeyUp}
+            placeholder={intl.formatMessage(messages.search)}
+          />
+        </label>
+
+        <div role='button' tabIndex={0} className='search__icon' onClick={this.handleClear}>
+          <Icon id='search' icon={SearchIcon} className={classNames({ active: !hasValue })} />
+          <Icon id='times-circle' icon={CancelIcon} aria-label={intl.formatMessage(messages.search)} className={classNames({ active: hasValue })} />
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Search));
diff --git a/app/javascript/mastodon/features/antenna_editor/index.jsx b/app/javascript/mastodon/features/antenna_editor/index.jsx
new file mode 100644
index 0000000000..95b6b43f88
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_editor/index.jsx
@@ -0,0 +1,84 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import spring from 'react-motion/lib/spring';
+
+import { setupAntennaEditor, setupExcludeAntennaEditor, clearAntennaSuggestions, resetAntennaEditor } from '../../actions/antennas';
+import Motion from '../ui/util/optional_motion';
+
+import Account from './components/account';
+import EditAntennaForm from './components/edit_antenna_form';
+import Search from './components/search';
+
+const mapStateToProps = (state) => ({
+  accountIds: state.getIn(['antennaEditor', 'accounts', 'items']),
+  searchAccountIds: state.getIn(['antennaEditor', 'suggestions', 'items']),
+});
+
+const mapDispatchToProps = (dispatch, { isExclude }) => ({
+  onInitialize: antennaId => dispatch(isExclude ? setupExcludeAntennaEditor(antennaId) : setupAntennaEditor(antennaId)),
+  onClear: () => dispatch(clearAntennaSuggestions()),
+  onReset: () => dispatch(resetAntennaEditor()),
+});
+
+class AntennaEditor extends ImmutablePureComponent {
+
+  static propTypes = {
+    antennaId: PropTypes.string.isRequired,
+    isExclude: PropTypes.bool.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onClear: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list.isRequired,
+    searchAccountIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { onInitialize, antennaId } = this.props;
+    onInitialize(antennaId);
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { accountIds, searchAccountIds, onClear, isExclude } = this.props;
+    const showSearch = searchAccountIds.size > 0;
+
+    return (
+      <div className='modal-root__modal list-editor'>
+        <EditAntennaForm />
+
+        <Search />
+
+        <div className='drawer__pager'>
+          <div className='drawer__inner list-editor__accounts'>
+            {accountIds.map(accountId => <Account key={accountId} accountId={accountId} isExclude={isExclude} added />)}
+          </div>
+
+          {showSearch && <div role='button' tabIndex={-1} className='drawer__backdrop' onClick={onClear} />}
+
+          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
+            {({ x }) => (
+              <div className='drawer__inner backdrop' style={{ transform: x === 0 ? null : `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
+                {searchAccountIds.map(accountId => <Account key={accountId} accountId={accountId} isExclude={isExclude} />)}
+              </div>
+            )}
+          </Motion>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaEditor));
diff --git a/app/javascript/mastodon/features/antenna_setting/components/radio_panel.jsx b/app/javascript/mastodon/features/antenna_setting/components/radio_panel.jsx
new file mode 100644
index 0000000000..9408d13569
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_setting/components/radio_panel.jsx
@@ -0,0 +1,46 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+
+class RadioPanel extends PureComponent {
+
+  static propTypes = {
+    values: ImmutablePropTypes.list.isRequired,
+    value: PropTypes.object.isRequired,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    const value = e.currentTarget.getAttribute('data-value');
+
+    if (value !== this.props.value.get('value')) {
+      this.props.onChange(value);
+    }
+  };
+
+  render () {
+    const { values, value } = this.props;
+
+    return (
+      <div className='setting-radio-panel'>
+        {values.map((val) => (
+          <button className={classNames('setting-radio-panel__item', {'setting-radio-panel__item__active': value.get('value') === val.get('value')})}
+            key={val.get('value')} onClick={this.handleChange} data-value={val.get('value')}>
+            {val.get('label')}
+          </button>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+export default connect()(injectIntl(RadioPanel));
diff --git a/app/javascript/mastodon/features/antenna_setting/components/text_list.jsx b/app/javascript/mastodon/features/antenna_setting/components/text_list.jsx
new file mode 100644
index 0000000000..040e5b74f1
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_setting/components/text_list.jsx
@@ -0,0 +1,104 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+
+class TextListItem extends PureComponent {
+
+  static propTypes = {
+    icon: PropTypes.string.isRequired,
+    iconComponent: PropTypes.func.isRequired,
+    value: PropTypes.string.isRequired,
+    onRemove: PropTypes.func.isRequired,
+  };
+
+  handleRemove = () => {
+    this.props.onRemove(this.props.value);
+  };
+
+  render () {
+    const { icon, iconComponent, value } = this.props;
+
+    return (
+      <div className='setting-text-list-item'>
+        <Icon id={icon} icon={iconComponent} />
+        <span className='label'>{value}</span>
+        <IconButton icon='trash' iconComponent={DeleteIcon} onClick={this.handleRemove} />
+      </div>
+    );
+  }
+
+}
+
+class TextList extends PureComponent {
+
+  static propTypes = {
+    values: ImmutablePropTypes.list.isRequired,
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    icon: PropTypes.string.isRequired,
+    iconComponent: PropTypes.func.isRequired,
+    label: PropTypes.string.isRequired,
+    title: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    onRemove: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleAdd = () => {
+    this.props.onAdd();
+  };
+
+  handleSubmit = (e) => {
+    e.preventDefault();
+    this.handleAdd();
+  };
+
+  render () {
+    const { icon, iconComponent, value, values, disabled, label, title } = this.props;
+
+    return (
+      <div className='setting-text-list'>
+        {values.map((val) => (
+          <TextListItem key={val} value={val} icon={icon} iconComponent={iconComponent} onRemove={this.props.onRemove} />
+        ))}
+
+        <form className='add-text-form' onSubmit={this.handleSubmit}>
+          <label>
+            <span style={{ display: 'none' }}>{label}</span>
+
+            <input
+              className='setting-text'
+              value={value}
+              disabled={disabled}
+              onChange={this.handleChange}
+              placeholder={label}
+            />
+          </label>
+
+          <Button
+            disabled={disabled || !value}
+            text={title}
+            onClick={this.handleAdd}
+          />
+        </form>
+      </div>
+    );
+  }
+
+}
+
+export default connect()(injectIntl(TextList));
diff --git a/app/javascript/mastodon/features/antenna_setting/index.jsx b/app/javascript/mastodon/features/antenna_setting/index.jsx
new file mode 100644
index 0000000000..99aa4e2aba
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_setting/index.jsx
@@ -0,0 +1,587 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+
+
+import { Helmet } from 'react-helmet';
+import { withRouter } from 'react-router-dom';
+
+import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+
+import Select, { NonceProvider } from 'react-select';
+import Toggle from 'react-toggle';
+
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import DomainIcon from '@/material-icons/400-24px/dns.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import HashtagIcon from '@/material-icons/400-24px/tag.svg?react';
+import KeywordIcon from '@/material-icons/400-24px/title.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import {
+  fetchAntenna,
+  deleteAntenna,
+  updateAntenna,
+  addDomainToAntenna,
+  removeDomainFromAntenna,
+  addExcludeDomainToAntenna,
+  removeExcludeDomainFromAntenna,
+  fetchAntennaDomains,
+  fetchAntennaKeywords,
+  removeKeywordFromAntenna,
+  addKeywordToAntenna,
+  removeExcludeKeywordFromAntenna,
+  addExcludeKeywordToAntenna,
+  fetchAntennaTags,
+  removeTagFromAntenna,
+  addTagToAntenna,
+  removeExcludeTagFromAntenna,
+  addExcludeTagToAntenna,
+} from 'mastodon/actions/antennas';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { fetchLists } from 'mastodon/actions/lists';
+import { openModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon }  from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { enableLocalTimeline } from 'mastodon/initial_state';
+import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+
+import RadioPanel from './components/radio_panel';
+import TextList from './components/text_list';
+
+const messages = defineMessages({
+  deleteMessage: { id: 'confirmations.delete_antenna.message', defaultMessage: 'Are you sure you want to permanently delete this antenna?' },
+  deleteConfirm: { id: 'confirmations.delete_antenna.confirm', defaultMessage: 'Delete' },
+  editAccounts: { id: 'antennas.edit_accounts', defaultMessage: 'Edit accounts' },
+  noOptions: { id: 'antennas.select.no_options_message', defaultMessage: 'Empty lists' },
+  placeholder: { id: 'antennas.select.placeholder', defaultMessage: 'Select list' },
+  addDomainLabel: { id: 'antennas.add_domain_placeholder', defaultMessage: 'New domain' },
+  addKeywordLabel: { id: 'antennas.add_keyword_placeholder', defaultMessage: 'New keyword' },
+  addTagLabel: { id: 'antennas.add_tag_placeholder', defaultMessage: 'New tag' },
+  addDomainTitle: { id: 'antennas.add_domain', defaultMessage: 'Add domain' },
+  addKeywordTitle: { id: 'antennas.add_keyword', defaultMessage: 'Add keyword' },
+  addTagTitle: { id: 'antennas.add_tag', defaultMessage: 'Add tag' },
+  accounts: { id: 'antennas.accounts', defaultMessage: '{count} accounts' },
+  domains: { id: 'antennas.domains', defaultMessage: '{count} domains' },
+  tags: { id: 'antennas.tags', defaultMessage: '{count} tags' },
+  keywords: { id: 'antennas.keywords', defaultMessage: '{count} keywords' },
+  setHome: { id: 'antennas.select.set_home', defaultMessage: 'Set home' },
+});
+
+const mapStateToProps = (state, props) => ({
+  antenna: state.getIn(['antennas', props.params.id]),
+  lists: state.get('lists'),
+  domains: state.getIn(['antennas', props.params.id, 'domains']) || ImmutableMap(),
+  keywords: state.getIn(['antennas', props.params.id, 'keywords']) || ImmutableMap(),
+  tags: state.getIn(['antennas', props.params.id, 'tags']) || ImmutableMap(),
+});
+
+class AntennaSetting extends PureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+    antenna: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
+    lists: ImmutablePropTypes.map,
+    domains: ImmutablePropTypes.map,
+    keywords: ImmutablePropTypes.map,
+    tags: ImmutablePropTypes.map,
+    intl: PropTypes.object.isRequired,
+    ...WithRouterPropTypes,
+  };
+
+  state = {
+    domainName: '',
+    excludeDomainName: '',
+    keywordName: '',
+    excludeKeywordName: '',
+    tagName: '',
+    excludeTagName: '',
+    rangeRadioValue: null,
+    contentRadioValue: null,
+  };
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('ANTENNA', { id: this.props.params.id }));
+      this.props.history.push('/');
+    }
+  };
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(fetchAntenna(id));
+    dispatch(fetchAntennaDomains(id));
+    dispatch(fetchAntennaKeywords(id));
+    dispatch(fetchAntennaTags(id));
+    dispatch(fetchLists());
+  }
+
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    const { dispatch } = this.props;
+    const { id } = nextProps.params;
+
+    if (id !== this.props.params.id) {
+      dispatch(fetchAntenna(id));
+      dispatch(fetchAntennaKeywords(id));
+      dispatch(fetchAntennaDomains(id));
+      dispatch(fetchAntennaKeywords(id));
+      dispatch(fetchAntennaTags(id));
+      dispatch(fetchLists());
+    }
+  }
+
+  setRef = c => {
+    this.column = c;
+  };
+
+  handleEditClick = () => {
+    this.props.dispatch(openModal({
+      modalType: 'ANTENNA_EDITOR',
+      modalProps: { antennaId: this.props.params.id, isExclude: false },
+    }));
+  };
+
+  handleExcludeEditClick = () => {
+    this.props.dispatch(openModal({
+      modalType: 'ANTENNA_EDITOR',
+      modalProps: { antennaId: this.props.params.id, isExclude: true },
+    }));
+  };
+
+  handleEditAntennaClick = () => {
+    window.open(`/antennas/${this.props.params.id}/edit`, '_blank');
+  };
+
+  handleDeleteClick = () => {
+    const { dispatch, columnId, intl } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.deleteMessage),
+        confirm: intl.formatMessage(messages.deleteConfirm),
+        onConfirm: () => {
+          dispatch(deleteAntenna(id));
+
+          if (columnId) {
+            dispatch(removeColumn(columnId));
+          } else {
+            this.props.history.push('/antennasw');
+          }
+        },
+      },
+    }));
+  };
+
+  handleTimelineClick = () => {
+    this.props.history.push(`/antennast/${this.props.params.id}`);
+  };
+
+  onStlToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, undefined, target.checked, undefined, undefined, undefined, undefined));
+  };
+
+  onLtlToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, undefined, undefined, target.checked, undefined, undefined, undefined));
+  };
+
+  onMediaOnlyToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, undefined, undefined, undefined, target.checked, undefined, undefined));
+  };
+
+  onIgnoreReblogToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, undefined, undefined, undefined, undefined, target.checked, undefined));
+  };
+
+  onNoInsertFeedsToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, undefined, undefined, undefined, undefined, undefined, target.checked));
+  };
+
+  onSelect = value => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateAntenna(id, undefined, false, value.value, undefined, undefined, undefined, undefined, undefined));
+  };
+
+  onHomeSelect = () => this.onSelect({ value: '0' });
+
+  noOptionsMessage = () => this.props.intl.formatMessage(messages.noOptions);
+
+  onRangeRadioChanged = (value) => this.setState({ rangeRadioValue: value });
+
+  onContentRadioChanged = (value) => this.setState({ contentRadioValue: value });
+
+  onDomainNameChanged = (value) => this.setState({ domainName: value });
+
+  onDomainAdd = () => {
+    this.props.dispatch(addDomainToAntenna(this.props.params.id, this.state.domainName));
+    this.setState({ domainName: '' });
+  };
+
+  onDomainRemove = (value) => this.props.dispatch(removeDomainFromAntenna(this.props.params.id, value));
+
+  onKeywordNameChanged = (value) => this.setState({ keywordName: value });
+
+  onKeywordAdd = () => {
+    this.props.dispatch(addKeywordToAntenna(this.props.params.id, this.state.keywordName));
+    this.setState({ keywordName: '' });
+  };
+
+  onKeywordRemove = (value) => this.props.dispatch(removeKeywordFromAntenna(this.props.params.id, value));
+
+  onTagNameChanged = (value) => this.setState({ tagName: value });
+
+  onTagAdd = () => {
+    this.props.dispatch(addTagToAntenna(this.props.params.id, this.state.tagName));
+    this.setState({ tagName: '' });
+  };
+
+  onTagRemove = (value) => this.props.dispatch(removeTagFromAntenna(this.props.params.id, value));
+
+  onExcludeDomainNameChanged = (value) => this.setState({ excludeDomainName: value });
+
+  onExcludeDomainAdd = () => {
+    this.props.dispatch(addExcludeDomainToAntenna(this.props.params.id, this.state.excludeDomainName));
+    this.setState({ excludeDomainName: '' });
+  };
+
+  onExcludeDomainRemove = (value) => this.props.dispatch(removeExcludeDomainFromAntenna(this.props.params.id, value));
+
+  onExcludeKeywordNameChanged = (value) => this.setState({ excludeKeywordName: value });
+
+  onExcludeKeywordAdd = () => {
+    this.props.dispatch(addExcludeKeywordToAntenna(this.props.params.id, this.state.excludeKeywordName));
+    this.setState({ excludeKeywordName: '' });
+  };
+
+  onExcludeKeywordRemove = (value) => this.props.dispatch(removeExcludeKeywordFromAntenna(this.props.params.id, value));
+
+  onExcludeTagNameChanged = (value) => this.setState({ excludeTagName: value });
+
+  onExcludeTagAdd = () => {
+    this.props.dispatch(addExcludeTagToAntenna(this.props.params.id, this.state.excludeTagName));
+    this.setState({ excludeTagName: '' });
+  };
+
+  onExcludeTagRemove = (value) => this.props.dispatch(removeExcludeTagFromAntenna(this.props.params.id, value));
+
+  render () {
+    const { columnId, multiColumn, antenna, lists, domains, keywords, tags, intl } = this.props;
+    const { id } = this.props.params;
+    const pinned = !!columnId;
+    const title  = antenna ? antenna.get('title') : id;
+    const isStl = antenna ? antenna.get('stl') : undefined;
+    const isLtl = antenna ? antenna.get('ltl') : undefined;
+    const isMediaOnly = antenna ? antenna.get('with_media_only') : undefined;
+    const isIgnoreReblog = antenna ? antenna.get('ignore_reblog') : undefined;
+    const isInsertFeeds = antenna ? antenna.get('insert_feeds') : undefined;
+
+    if (typeof antenna === 'undefined') {
+      return (
+        <Column>
+          <div className='scrollable'>
+            <LoadingIndicator />
+          </div>
+        </Column>
+      );
+    } else if (antenna === false) {
+      return (
+        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
+      );
+    }
+
+    let columnSettings;
+    if (!isStl && !isLtl) {
+      columnSettings = (
+        <>
+          <section className='similar-row'>
+            <div className='setting-toggle'>
+              <Toggle id={`antenna-${id}-mediaonly`} checked={isMediaOnly} onChange={this.onMediaOnlyToggle} />
+              <label htmlFor={`antenna-${id}-mediaonly`} className='setting-toggle__label'>
+                <FormattedMessage id='antennas.media_only' defaultMessage='Media only' />
+              </label>
+            </div>
+          </section>
+
+          <section className='similar-row'>
+            <div className='setting-toggle'>
+              <Toggle id={`antenna-${id}-ignorereblog`} checked={isIgnoreReblog} onChange={this.onIgnoreReblogToggle} />
+              <label htmlFor={`antenna-${id}-ignorereblog`} className='setting-toggle__label'>
+                <FormattedMessage id='antennas.ignore_reblog' defaultMessage='Exclude boosts' />
+              </label>
+            </div>
+          </section>
+        </>
+      );
+    }
+
+    let stlAlert;
+    if (isStl) {
+      stlAlert = (
+        <div className='antenna-setting'>
+          <p><FormattedMessage id='antennas.in_stl_mode' defaultMessage='This antenna is in STL mode.' /></p>
+        </div>
+      );
+    } else if (isLtl) {
+      stlAlert = (
+        <div className='antenna-setting'>
+          <p><FormattedMessage id='antennas.in_ltl_mode' defaultMessage='This antenna is in LTL mode.' /></p>
+        </div>
+      );
+    }
+
+    const rangeRadioValues = ImmutableList([
+      ImmutableMap({ value: 'accounts', label: intl.formatMessage(messages.accounts, { count: antenna.get('accounts_count') }) }),
+      ImmutableMap({ value: 'domains', label: intl.formatMessage(messages.domains, { count: antenna.get('domains_count') }) }),
+    ]);
+    const rangeRadioValue = ImmutableMap({ value: this.state.rangeRadioValue || (antenna.get('domains_count') > 0 ? 'domains' : 'accounts') });
+    const rangeRadioAlert = antenna.get(rangeRadioValue.get('value') === 'accounts' ? 'domains_count' : 'accounts_count') > 0;
+
+    const contentRadioValues = ImmutableList([
+      ImmutableMap({ value: 'keywords', label: intl.formatMessage(messages.keywords, { count: antenna.get('keywords_count') }) }),
+      ImmutableMap({ value: 'tags', label: intl.formatMessage(messages.tags, { count: antenna.get('tags_count') }) }),
+    ]);
+    const contentRadioValue = ImmutableMap({ value: this.state.contentRadioValue || (antenna.get('tags_count') > 0 ? 'tags' : 'keywords') });
+    const contentRadioAlert = antenna.get(contentRadioValue.get('value') === 'tags' ? 'keywords_count' : 'tags_count') > 0;
+
+    const listOptions = lists.toArray().filter((list) => list.length >= 2 && list[1]).map((list) => {
+      return { value: list[1].get('id'), label: list[1].get('title') };
+    });
+
+    const isShowStlToggle = !isLtl && (enableLocalTimeline || isStl);
+    const isShowLtlToggle = !isStl && (enableLocalTimeline || isLtl);
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={title}>
+        <ColumnHeader
+          icon='wifi'
+          iconComponent={AntennaIcon}
+          title={title}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        >
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditAntennaClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='antennas.edit_static' defaultMessage='Edit antenna' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='antennas.delete' defaultMessage='Delete antenna' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleTimelineClick}>
+                <Icon id='wifi' icon={AntennaIcon} /> <FormattedMessage id='antennas.go_timeline' defaultMessage='Go to antenna timeline' />
+              </button>
+            </section>
+
+            {isShowStlToggle && (
+              <section>
+                <div className='setting-toggle'>
+                  <Toggle id={`antenna-${id}-stl`} checked={isStl} onChange={this.onStlToggle} />
+                  <label htmlFor={`antenna-${id}-stl`} className='setting-toggle__label'>
+                    <FormattedMessage id='antennas.stl' defaultMessage='STL mode' />
+                  </label>
+                </div>
+              </section>
+            )}
+
+            {isShowLtlToggle && (
+              <section className={isShowStlToggle && 'similar-row'}>
+                <div className='setting-toggle'>
+                  <Toggle id={`antenna-${id}-ltl`} checked={isLtl} onChange={this.onLtlToggle} />
+                  <label htmlFor={`antenna-${id}-ltl`} className='setting-toggle__label'>
+                    <FormattedMessage id='antennas.ltl' defaultMessage='LTL mode' />
+                  </label>
+                </div>
+              </section>
+            )}
+
+            <section className={(isShowStlToggle || isShowLtlToggle) && 'similar-row'}>
+              <div className='setting-toggle'>
+                <Toggle id={`antenna-${id}-noinsertfeeds`} checked={isInsertFeeds} onChange={this.onNoInsertFeedsToggle} />
+                <label htmlFor={`antenna-${id}-noinsertfeeds`} className='setting-toggle__label'>
+                  <FormattedMessage id='antennas.insert_feeds' defaultMessage='Insert to feeds' />
+                </label>
+              </div>
+            </section>
+
+            {columnSettings}
+          </div>
+        </ColumnHeader>
+
+        {stlAlert}
+        <div className='antenna-setting'>
+          {isInsertFeeds && (
+            <>
+              {antenna.get('list') ? (
+                <p><FormattedMessage id='antennas.related_list' defaultMessage='This antenna is related to {listTitle}.' values={{ listTitle: antenna.getIn(['list', 'title']) }} /></p>
+              ) : (
+                <p><FormattedMessage id='antennas.not_related_list' defaultMessage='This antenna is not related list. Posts will appear in home timeline. Open edit page to set list.' /></p>
+              )}
+
+              <NonceProvider nonce={document.querySelector('meta[name=style-nonce]').content} cacheKey='lists'>
+                <Select
+                  value={{ value: antenna.getIn(['list', 'id']), label: antenna.getIn(['list', 'title']) }}
+                  options={listOptions}
+                  noOptionsMessage={this.noOptionsMessage}
+                  onChange={this.onSelect}
+                  className='column-content-select__container'
+                  classNamePrefix='column-content-select'
+                  name='lists'
+                  placeholder={this.props.intl.formatMessage(messages.placeholder)}
+                  defaultOptions
+                />
+              </NonceProvider>
+
+              <Button secondary text={this.props.intl.formatMessage(messages.setHome)} onClick={this.onHomeSelect} />
+            </>
+          )}
+
+          {!isStl && !isLtl && (
+            <>
+              <h2><FormattedMessage id='antennas.filter' defaultMessage='Filter' /></h2>
+              <RadioPanel values={rangeRadioValues} value={rangeRadioValue} onChange={this.onRangeRadioChanged} />
+
+              {rangeRadioValue.get('value') === 'accounts' && <Button text={intl.formatMessage(messages.editAccounts)} onClick={this.handleEditClick} />}
+
+              {rangeRadioValue.get('value') === 'domains' && (
+                <TextList
+                  onChange={this.onDomainNameChanged}
+                  onAdd={this.onDomainAdd}
+                  onRemove={this.onDomainRemove}
+                  value={this.state.domainName}
+                  values={domains.get('domains') || ImmutableList()}
+                  icon='sitemap'
+                  iconComponent={DomainIcon}
+                  label={intl.formatMessage(messages.addDomainLabel)}
+                  title={intl.formatMessage(messages.addDomainTitle)}
+                />
+              )}
+
+              {rangeRadioAlert && <div className='alert'><FormattedMessage id='antennas.warnings.range_radio' defaultMessage='Simultaneous account and domain designation is not recommended.' /></div>}
+
+              <RadioPanel values={contentRadioValues} value={contentRadioValue} onChange={this.onContentRadioChanged} />
+
+              {contentRadioValue.get('value') === 'tags' && (
+                <TextList
+                  onChange={this.onTagNameChanged}
+                  onAdd={this.onTagAdd}
+                  onRemove={this.onTagRemove}
+                  value={this.state.tagName}
+                  values={tags.get('tags') || ImmutableList()}
+                  icon='hashtag'
+                  iconComponent={HashtagIcon}
+                  label={intl.formatMessage(messages.addTagLabel)}
+                  title={intl.formatMessage(messages.addTagTitle)}
+                />
+              )}
+
+              {contentRadioValue.get('value') === 'keywords' && (
+                <TextList
+                  onChange={this.onKeywordNameChanged}
+                  onAdd={this.onKeywordAdd}
+                  onRemove={this.onKeywordRemove}
+                  value={this.state.keywordName}
+                  values={keywords.get('keywords') || ImmutableList()}
+                  icon='paragraph'
+                  iconComponent={KeywordIcon}
+                  label={intl.formatMessage(messages.addKeywordLabel)}
+                  title={intl.formatMessage(messages.addKeywordTitle)}
+                />
+              )}
+
+              {contentRadioAlert && <div className='alert'><FormattedMessage id='antennas.warnings.content_radio' defaultMessage='Simultaneous keyword and tag designation is not recommended.' /></div>}
+
+              <h2><FormattedMessage id='antennas.filter_not' defaultMessage='Filter Not' /></h2>
+              <h3><FormattedMessage id='antennas.exclude_accounts' defaultMessage='Exclude accounts' /></h3>
+              <Button text={intl.formatMessage(messages.editAccounts)} onClick={this.handleExcludeEditClick} />
+              <h3><FormattedMessage id='antennas.exclude_domains' defaultMessage='Exclude domains' /></h3>
+              <TextList
+                onChange={this.onExcludeDomainNameChanged}
+                onAdd={this.onExcludeDomainAdd}
+                onRemove={this.onExcludeDomainRemove}
+                value={this.state.excludeDomainName}
+                values={domains.get('exclude_domains') || ImmutableList()}
+                icon='sitemap'
+                iconComponent={DomainIcon}
+                label={intl.formatMessage(messages.addDomainLabel)}
+                title={intl.formatMessage(messages.addDomainTitle)}
+              />
+              <h3><FormattedMessage id='antennas.exclude_keywords' defaultMessage='Exclude keywords' /></h3>
+              <TextList
+                onChange={this.onExcludeKeywordNameChanged}
+                onAdd={this.onExcludeKeywordAdd}
+                onRemove={this.onExcludeKeywordRemove}
+                value={this.state.excludeKeywordName}
+                values={keywords.get('exclude_keywords') || ImmutableList()}
+                icon='paragraph'
+                iconComponent={KeywordIcon}
+                label={intl.formatMessage(messages.addKeywordLabel)}
+                title={intl.formatMessage(messages.addKeywordTitle)}
+              />
+              <h3><FormattedMessage id='antennas.exclude_tags' defaultMessage='Exclude tags' /></h3>
+              <TextList
+                onChange={this.onExcludeTagNameChanged}
+                onAdd={this.onExcludeTagAdd}
+                onRemove={this.onExcludeTagRemove}
+                value={this.state.excludeTagName}
+                values={tags.get('exclude_tags') || ImmutableList()}
+                icon='hashtag'
+                iconComponent={HashtagIcon}
+                label={intl.formatMessage(messages.addTagLabel)}
+                title={intl.formatMessage(messages.addTagTitle)}
+              />
+            </>
+          )}
+        </div>
+
+        <Helmet>
+          <title>{title}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default withRouter(connect(mapStateToProps)(injectIntl(AntennaSetting)));
diff --git a/app/javascript/mastodon/features/antenna_timeline/index.jsx b/app/javascript/mastodon/features/antenna_timeline/index.jsx
new file mode 100644
index 0000000000..26b21ff679
--- /dev/null
+++ b/app/javascript/mastodon/features/antenna_timeline/index.jsx
@@ -0,0 +1,206 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+
+
+import { Helmet } from 'react-helmet';
+import { withRouter } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import { fetchAntenna, deleteAntenna } from 'mastodon/actions/antennas';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { openModal } from 'mastodon/actions/modal';
+import { connectAntennaStream } from 'mastodon/actions/streaming';
+import { expandAntennaTimeline } from 'mastodon/actions/timelines';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon }  from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import StatusListContainer from 'mastodon/features/ui/containers/status_list_container';
+import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+
+const messages = defineMessages({
+  deleteMessage: { id: 'confirmations.delete_antenna.message', defaultMessage: 'Are you sure you want to permanently delete this antenna?' },
+  deleteConfirm: { id: 'confirmations.delete_antenna.confirm', defaultMessage: 'Delete' },
+});
+
+const mapStateToProps = (state, props) => ({
+  antenna: state.getIn(['antennas', props.params.id]),
+  hasUnread: state.getIn(['timelines', `antenna:${props.params.id}`, 'unread']) > 0,
+});
+
+class AntennaTimeline extends PureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    columnId: PropTypes.string,
+    hasUnread: PropTypes.bool,
+    multiColumn: PropTypes.bool,
+    antenna: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
+    intl: PropTypes.object.isRequired,
+    ...WithRouterPropTypes,
+  };
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('ANTENNA_TIMELINE', { id: this.props.params.id }));
+      this.props.history.push('/');
+    }
+  };
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  };
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(fetchAntenna(id));
+    dispatch(expandAntennaTimeline(id));
+
+    this.disconnect = dispatch(connectAntennaStream(id));
+  }
+
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    const { dispatch } = this.props;
+    const { id } = nextProps.params;
+
+    if (id !== this.props.params.id) {
+      if (this.disconnect) {
+        this.disconnect();
+        this.disconnect = null;
+      }
+
+      dispatch(fetchAntenna(id));
+      dispatch(expandAntennaTimeline(id));
+
+      this.disconnect = dispatch(connectAntennaStream(id));
+    }
+  }
+
+  componentWillUnmount () {
+    if (this.disconnect) {
+      this.disconnect();
+      this.disconnect = null;
+    }
+  }
+
+  setRef = c => {
+    this.column = c;
+  };
+
+  handleLoadMore = maxId => {
+    const { id } = this.props.params;
+    this.props.dispatch(expandAntennaTimeline(id, { maxId }));
+  };
+
+  handleEditClick = () => {
+    this.props.history.push(`/antennasw/${this.props.params.id}`);
+  };
+
+  handleDeleteClick = () => {
+    const { dispatch, columnId, intl } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.deleteMessage),
+        confirm: intl.formatMessage(messages.deleteConfirm),
+        onConfirm: () => {
+          dispatch(deleteAntenna(id));
+
+          if (columnId) {
+            dispatch(removeColumn(columnId));
+          } else {
+            this.props.history.push('/antennasw');
+          }
+        },
+      },
+    }));
+  };
+
+  render () {
+    const { hasUnread, columnId, multiColumn, antenna } = this.props;
+    const { id } = this.props.params;
+    const pinned = !!columnId;
+    const title  = antenna ? antenna.get('title') : id;
+
+    if (typeof antenna === 'undefined') {
+      return (
+        <Column>
+          <div className='scrollable'>
+            <LoadingIndicator />
+          </div>
+        </Column>
+      );
+    } else if (antenna === false) {
+      return (
+        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
+      );
+    }
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={title}>
+        <ColumnHeader
+          icon='wifi'
+          iconComponent={AntennaIcon}
+          active={hasUnread}
+          title={title}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        >
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='antennas.edit' defaultMessage='Edit antenna' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='antennas.delete' defaultMessage='Delete antenna' />
+              </button>
+            </section>
+          </div>
+        </ColumnHeader>
+
+        <StatusListContainer
+          trackScroll={!pinned}
+          scrollKey={`antenna_timeline-${columnId}`}
+          timelineId={`antenna:${id}`}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={<FormattedMessage id='empty_column.antenna' defaultMessage='There is nothing in this antenna yet. When members of this list post new statuses, they will appear here.' />}
+          bindToDocument={!multiColumn}
+        />
+
+        <Helmet>
+          <title>{title}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default withRouter(connect(mapStateToProps)(injectIntl(AntennaTimeline)));
diff --git a/app/javascript/mastodon/features/antennas/components/new_antenna_form.jsx b/app/javascript/mastodon/features/antennas/components/new_antenna_form.jsx
new file mode 100644
index 0000000000..187eb715f3
--- /dev/null
+++ b/app/javascript/mastodon/features/antennas/components/new_antenna_form.jsx
@@ -0,0 +1,80 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { changeAntennaEditorTitle, submitAntennaEditor } from 'mastodon/actions/antennas';
+import { Button } from 'mastodon/components/button';
+
+const messages = defineMessages({
+  label: { id: 'antennas.new.title_placeholder', defaultMessage: 'New antenna title' },
+  title: { id: 'antennas.new.create', defaultMessage: 'Add antenna' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['antennaEditor', 'title']),
+  disabled: state.getIn(['antennaEditor', 'isSubmitting']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeAntennaEditorTitle(value)),
+  onSubmit: () => dispatch(submitAntennaEditor(true)),
+});
+
+class NewAntennaForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const label = intl.formatMessage(messages.label);
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <label>
+          <span style={{ display: 'none' }}>{label}</span>
+
+          <input
+            className='setting-text'
+            value={value}
+            disabled={disabled}
+            onChange={this.handleChange}
+            placeholder={label}
+          />
+        </label>
+
+        <Button
+          disabled={disabled || !value}
+          text={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewAntennaForm));
diff --git a/app/javascript/mastodon/features/antennas/index.jsx b/app/javascript/mastodon/features/antennas/index.jsx
new file mode 100644
index 0000000000..8c1f17bcc2
--- /dev/null
+++ b/app/javascript/mastodon/features/antennas/index.jsx
@@ -0,0 +1,97 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import { fetchAntennas } from 'mastodon/actions/antennas';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import ColumnLink from 'mastodon/features/ui/components/column_link';
+import ColumnSubheading from 'mastodon/features/ui/components/column_subheading';
+
+import NewAntennaForm from './components/new_antenna_form';
+
+const messages = defineMessages({
+  heading: { id: 'column.antennas', defaultMessage: 'Antennas' },
+  subheading: { id: 'antennas.subheading', defaultMessage: 'Your antennas' },
+  insert_list: { id: 'antennas.insert_list', defaultMessage: 'List' },
+  insert_home: { id: 'antennas.insert_home', defaultMessage: 'Home' },
+});
+
+const getOrderedAntennas = createSelector([state => state.get('antennas')], antennas => {
+  if (!antennas) {
+    return antennas;
+  }
+
+  return antennas.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  antennas: getOrderedAntennas(state),
+});
+
+class Antennas extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    antennas: ImmutablePropTypes.list,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+  };
+
+  UNSAFE_componentWillMount () {
+    this.props.dispatch(fetchAntennas());
+  }
+
+  render () {
+    const { intl, antennas, multiColumn } = this.props;
+
+    if (!antennas) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.antennas' defaultMessage="You don't have any antennas yet. When you create one, it will show up here." />;
+
+    return (
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader title={intl.formatMessage(messages.heading)} icon='wifi' iconComponent={AntennaIcon} multiColumn={multiColumn} />
+
+        <NewAntennaForm />
+
+        <ScrollableList
+          scrollKey='antennas'
+          emptyMessage={emptyMessage}
+          prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
+          bindToDocument={!multiColumn}
+        >
+          {antennas.map(antenna => (
+            <ColumnLink key={antenna.get('id')} to={`/antennast/${antenna.get('id')}`} icon='wifi' iconComponent={AntennaIcon} text={antenna.get('title')}
+              badge={antenna.get('insert_feeds') ? intl.formatMessage(antenna.get('list') ? messages.insert_list : messages.insert_home) : undefined} />
+          ))}
+        </ScrollableList>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(Antennas));
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index 9008e05383..fdc1b0be0f 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -9,12 +9,12 @@ import { is } from 'immutable';
 
 import { throttle, debounce } from 'lodash';
 
-import DownloadIcon from 'mastodon/../material-icons/400-24px/download.svg?react';
-import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
-import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
+import DownloadIcon from '@/material-icons/400-24px/download.svg?react';
+import PauseIcon from '@/material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video';
 
diff --git a/app/javascript/mastodon/features/blocks/index.jsx b/app/javascript/mastodon/features/blocks/index.jsx
index 656784664f..1a631d3d07 100644
--- a/app/javascript/mastodon/features/blocks/index.jsx
+++ b/app/javascript/mastodon/features/blocks/index.jsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
 
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/bookmark_categories/components/new_bookmark_category_form.jsx b/app/javascript/mastodon/features/bookmark_categories/components/new_bookmark_category_form.jsx
new file mode 100644
index 0000000000..35309c121d
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_categories/components/new_bookmark_category_form.jsx
@@ -0,0 +1,80 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { changeBookmarkCategoryEditorTitle, submitBookmarkCategoryEditor } from 'mastodon/actions/bookmark_categories';
+import { Button } from 'mastodon/components/button';
+
+const messages = defineMessages({
+  label: { id: 'bookmark_categories.new.title_placeholder', defaultMessage: 'New category title' },
+  title: { id: 'bookmark_categories.new.create', defaultMessage: 'Add category' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['bookmarkCategoryEditor', 'title']),
+  disabled: state.getIn(['bookmarkCategoryEditor', 'isSubmitting']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeBookmarkCategoryEditorTitle(value)),
+  onSubmit: () => dispatch(submitBookmarkCategoryEditor(true)),
+});
+
+class NewBookmarkCategoryForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const label = intl.formatMessage(messages.label);
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <label>
+          <span style={{ display: 'none' }}>{label}</span>
+
+          <input
+            className='setting-text'
+            value={value}
+            disabled={disabled}
+            onChange={this.handleChange}
+            placeholder={label}
+          />
+        </label>
+
+        <Button
+          disabled={disabled || !value}
+          text={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewBookmarkCategoryForm));
diff --git a/app/javascript/mastodon/features/bookmark_categories/index.jsx b/app/javascript/mastodon/features/bookmark_categories/index.jsx
new file mode 100644
index 0000000000..aeb37db27c
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_categories/index.jsx
@@ -0,0 +1,98 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import { fetchBookmarkCategories } from 'mastodon/actions/bookmark_categories';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import ColumnLink from 'mastodon/features/ui/components/column_link';
+import ColumnSubheading from 'mastodon/features/ui/components/column_subheading';
+
+import NewListForm from './components/new_bookmark_category_form';
+
+const messages = defineMessages({
+  heading: { id: 'column.bookmark_categories', defaultMessage: 'Bookmark categories' },
+  subheading: { id: 'bookmark_categories.subheading', defaultMessage: 'Your categories' },
+  allBookmarks: { id: 'bookmark_categories.all_bookmarks', defaultMessage: 'All bookmarks' },
+});
+
+const getOrderedCategories = createSelector([state => state.get('bookmark_categories')], categories => {
+  if (!categories) {
+    return categories;
+  }
+
+  return categories.toList().filter(item => !!item && typeof item.get('title') !== 'undefined' && item.get('title') !== null).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  categories: getOrderedCategories(state),
+});
+
+class BookmarkCategories extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    categories: ImmutablePropTypes.list,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+  };
+
+  UNSAFE_componentWillMount () {
+    this.props.dispatch(fetchBookmarkCategories());
+  }
+
+  render () {
+    const { intl, categories, multiColumn } = this.props;
+
+    if (!categories) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.bookmark_categories' defaultMessage="You don't have any categories yet. When you create one, it will show up here." />;
+
+    return (
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader title={intl.formatMessage(messages.heading)} icon='bookmark' iconComponent={BookmarksIcon} multiColumn={multiColumn} />
+
+        <NewListForm />
+
+        <ColumnLink to='/bookmarks' icon='bookmark' iconComponent={BookmarkIcon} text={intl.formatMessage(messages.allBookmarks)} />
+        <ScrollableList
+          scrollKey='bookmark_categories'
+          emptyMessage={emptyMessage}
+          prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
+          bindToDocument={!multiColumn}
+        >
+          {categories.map(category =>
+            <ColumnLink key={category.get('id')} to={`/bookmark_categories/${category.get('id')}`} icon='bookmark' iconComponent={BookmarkIcon} text={category.get('title')} />,
+          )}
+        </ScrollableList>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(BookmarkCategories));
diff --git a/app/javascript/mastodon/features/bookmark_category_adder/components/account.jsx b/app/javascript/mastodon/features/bookmark_category_adder/components/account.jsx
new file mode 100644
index 0000000000..31a2e96379
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_category_adder/components/account.jsx
@@ -0,0 +1,43 @@
+import { injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import { makeGetAccount } from '../../../selectors';
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+  });
+
+  return mapStateToProps;
+};
+
+class Account extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+  };
+
+  render () {
+    const { account } = this.props;
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name'>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/bookmark_category_adder/components/bookmark_category.jsx b/app/javascript/mastodon/features/bookmark_category_adder/components/bookmark_category.jsx
new file mode 100644
index 0000000000..5f33a9d0f5
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_category_adder/components/bookmark_category.jsx
@@ -0,0 +1,76 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+import { removeFromBookmarkCategoryAdder, addToBookmarkCategoryAdder } from '../../../actions/bookmark_categories';
+import { IconButton }  from '../../../components/icon_button';
+
+const messages = defineMessages({
+  remove: { id: 'bookmark_categories.status.remove', defaultMessage: 'Remove from bookmark category' },
+  add: { id: 'bookmark_categories.status.add', defaultMessage: 'Add to bookmark category' },
+});
+
+const MapStateToProps = (state, { bookmarkCategoryId, added }) => ({
+  bookmarkCategory: state.get('bookmark_categories').get(bookmarkCategoryId),
+  added: typeof added === 'undefined' ? state.getIn(['bookmarkCategoryAdder', 'bookmarkCategories', 'items']).includes(bookmarkCategoryId) : added,
+});
+
+const mapDispatchToProps = (dispatch, { bookmarkCategoryId }) => ({
+  onRemove: () => dispatch(removeFromBookmarkCategoryAdder(bookmarkCategoryId)),
+  onAdd: () => dispatch(addToBookmarkCategoryAdder(bookmarkCategoryId)),
+});
+
+class BookmarkCategory extends ImmutablePureComponent {
+
+  static propTypes = {
+    bookmarkCategory: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  render () {
+    const { bookmarkCategory, intl, onRemove, onAdd, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' iconComponent={CloseIcon} title={intl.formatMessage(messages.remove)} onClick={onRemove} />;
+    } else {
+      button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={onAdd} />;
+    }
+
+    return (
+      <div className='list'>
+        <div className='list__wrapper'>
+          <div className='list__display-name'>
+            <Icon id='bookmark' icon={BookmarkIcon} className='column-link__icon' fixedWidth />
+            {bookmarkCategory.get('title')}
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(BookmarkCategory));
diff --git a/app/javascript/mastodon/features/bookmark_category_adder/index.jsx b/app/javascript/mastodon/features/bookmark_category_adder/index.jsx
new file mode 100644
index 0000000000..7381e1688d
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_category_adder/index.jsx
@@ -0,0 +1,78 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl } from 'react-intl';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { setupBookmarkCategoryAdder, resetBookmarkCategoryAdder } from '../../actions/bookmark_categories';
+import NewBookmarkCategoryForm from '../bookmark_categories/components/new_bookmark_category_form';
+
+// import Account from './components/account';
+import BookmarkCategory from './components/bookmark_category';
+
+const getOrderedBookmarkCategories = createSelector([state => state.get('bookmark_categories')], bookmarkCategories => {
+  if (!bookmarkCategories) {
+    return bookmarkCategories;
+  }
+
+  return bookmarkCategories.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  bookmarkCategoryIds: getOrderedBookmarkCategories(state).map(bookmarkCategory=>bookmarkCategory.get('id')),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onInitialize: statusId => dispatch(setupBookmarkCategoryAdder(statusId)),
+  onReset: () => dispatch(resetBookmarkCategoryAdder()),
+});
+
+class BookmarkCategoryAdder extends ImmutablePureComponent {
+
+  static propTypes = {
+    statusId: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    bookmarkCategoryIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { onInitialize, statusId } = this.props;
+    onInitialize(statusId);
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { bookmarkCategoryIds } = this.props;
+
+    return (
+      <div className='modal-root__modal list-adder'>
+        {/*
+        <div className='list-adder__account'>
+          <Account accountId={accountId} />
+        </div>
+        */}
+
+        <NewBookmarkCategoryForm />
+
+
+        <div className='list-adder__lists'>
+          {bookmarkCategoryIds.map(BookmarkCategoryId => <BookmarkCategory key={BookmarkCategoryId} bookmarkCategoryId={BookmarkCategoryId} />)}
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BookmarkCategoryAdder));
diff --git a/app/javascript/mastodon/features/bookmark_category_statuses/components/edit_bookmark_category_form.jsx b/app/javascript/mastodon/features/bookmark_category_statuses/components/edit_bookmark_category_form.jsx
new file mode 100644
index 0000000000..de3f3f7384
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_category_statuses/components/edit_bookmark_category_form.jsx
@@ -0,0 +1,76 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+
+import { changeBookmarkCategoryEditorTitle, submitBookmarkCategoryEditor } from '../../../actions/bookmark_categories';
+import { IconButton } from '../../../components/icon_button';
+
+const messages = defineMessages({
+  title: { id: 'bookmark_categories.edit.submit', defaultMessage: 'Change title' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['bookmarkCategoryEditor', 'title']),
+  disabled: !state.getIn(['bookmarkCategoryEditor', 'isChanged']) || !state.getIn(['bookmarkCategoryEditor', 'title']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeBookmarkCategoryEditorTitle(value)),
+  onSubmit: () => dispatch(submitBookmarkCategoryEditor(false)),
+});
+
+class EditBookmarkCategoryForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <input
+          className='setting-text'
+          value={value}
+          onChange={this.handleChange}
+        />
+
+        <IconButton
+          disabled={disabled}
+          icon='check'
+          iconComponent={CheckIcon}
+          title={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(EditBookmarkCategoryForm));
diff --git a/app/javascript/mastodon/features/bookmark_category_statuses/index.jsx b/app/javascript/mastodon/features/bookmark_category_statuses/index.jsx
new file mode 100644
index 0000000000..733a6646c0
--- /dev/null
+++ b/app/javascript/mastodon/features/bookmark_category_statuses/index.jsx
@@ -0,0 +1,195 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+
+import { Helmet } from 'react-helmet';
+import { withRouter } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { debounce } from 'lodash';
+
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import { deleteBookmarkCategory, expandBookmarkCategoryStatuses, fetchBookmarkCategory, fetchBookmarkCategoryStatuses , setupBookmarkCategoryEditor } from 'mastodon/actions/bookmark_categories';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { openModal } from 'mastodon/actions/modal';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon }  from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import StatusList from 'mastodon/components/status_list';
+import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { getBookmarkCategoryStatusList } from 'mastodon/selectors';
+import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+
+import EditBookmarkCategoryForm from './components/edit_bookmark_category_form';
+
+
+const messages = defineMessages({
+  deleteMessage: { id: 'confirmations.delete_bookmark_category.message', defaultMessage: 'Are you sure you want to permanently delete this category?' },
+  deleteConfirm: { id: 'confirmations.delete_bookmark_category.confirm', defaultMessage: 'Delete' },
+  heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
+});
+
+const mapStateToProps = (state, { params }) => ({
+  bookmarkCategory: state.getIn(['bookmark_categories', params.id]),
+  statusIds: getBookmarkCategoryStatusList(state, params.id),
+  isLoading: state.getIn(['bookmark_categories', params.id, 'isLoading'], true),
+  isEditing: state.getIn(['bookmarkCategoryEditor', 'bookmarkCategoryId']) === params.id,
+  hasMore: !!state.getIn(['bookmark_categories', params.id, 'next']),
+});
+
+class BookmarkCategoryStatuses extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    statusIds: ImmutablePropTypes.list.isRequired,
+    bookmarkCategory: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
+    intl: PropTypes.object.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+    isEditing: PropTypes.bool,
+    ...WithRouterPropTypes,
+  };
+
+  UNSAFE_componentWillMount () {
+    this.props.dispatch(fetchBookmarkCategory(this.props.params.id));
+    this.props.dispatch(fetchBookmarkCategoryStatuses(this.props.params.id));
+  }
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('BOOKMARKS_EX', { id: this.props.params.id }));
+      this.props.history.push('/');
+    }
+  };
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  };
+
+  handleEditClick = () => {
+    this.props.dispatch(setupBookmarkCategoryEditor(this.props.params.id));
+  };
+
+  handleDeleteClick = () => {
+    const { dispatch, columnId, intl } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.deleteMessage),
+        confirm: intl.formatMessage(messages.deleteConfirm),
+        onConfirm: () => {
+          dispatch(deleteBookmarkCategory(id));
+
+          if (columnId) {
+            dispatch(removeColumn(columnId));
+          } else {
+            this.props.history.push('/bookmark_categories');
+          }
+        },
+      },
+    }));
+  };
+
+  setRef = c => {
+    this.column = c;
+  };
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandBookmarkCategoryStatuses(this.props.params.id));
+  }, 300, { leading: true });
+
+  render () {
+    const { intl, bookmarkCategory, statusIds, columnId, multiColumn, hasMore, isLoading, isEditing } = this.props;
+    const pinned = !!columnId;
+
+    if (typeof bookmarkCategory === 'undefined') {
+      return (
+        <Column>
+          <div className='scrollable'>
+            <LoadingIndicator />
+          </div>
+        </Column>
+      );
+    } else if (bookmarkCategory === false) {
+      return (
+        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked posts yet. When you bookmark one, it will show up here." />;
+
+    const editor = isEditing && (
+      <EditBookmarkCategoryForm />
+    );
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader
+          icon='bookmark'
+          iconComponent={BookmarkIcon}
+          title={bookmarkCategory.get('title')}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        >
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='bookmark_categories.edit' defaultMessage='Edit category' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='bookmark_categories.delete' defaultMessage='Delete category' />
+              </button>
+
+              {editor}
+            </section>
+          </div>
+        </ColumnHeader>
+
+        <StatusList
+          trackScroll={!pinned}
+          statusIds={statusIds}
+          scrollKey={`bookmark_ex_statuses-${columnId}`}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default withRouter(connect(mapStateToProps)(injectIntl(BookmarkCategoryStatuses)));
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
index 15db945956..93be1c6b2e 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied bookmark_category_statuses, circle_statuses
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -10,12 +12,12 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import StatusList from 'mastodon/components/status_list';
-import Column from 'mastodon/features/ui/components/column';
 import { getStatusList } from 'mastodon/selectors';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/circle_adder/components/account.jsx b/app/javascript/mastodon/features/circle_adder/components/account.jsx
new file mode 100644
index 0000000000..31a2e96379
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_adder/components/account.jsx
@@ -0,0 +1,43 @@
+import { injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import { makeGetAccount } from '../../../selectors';
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+  });
+
+  return mapStateToProps;
+};
+
+class Account extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+  };
+
+  render () {
+    const { account } = this.props;
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name'>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/circle_adder/components/circle.jsx b/app/javascript/mastodon/features/circle_adder/components/circle.jsx
new file mode 100644
index 0000000000..0534f1896b
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_adder/components/circle.jsx
@@ -0,0 +1,75 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+import { removeFromCircleAdder, addToCircleAdder } from '../../../actions/circles';
+import { IconButton }  from '../../../components/icon_button';
+
+const messages = defineMessages({
+  remove: { id: 'circles.account.remove', defaultMessage: 'Remove from circle' },
+  add: { id: 'circles.account.add', defaultMessage: 'Add to circle' },
+});
+
+const MapStateToProps = (state, { circleId, added }) => ({
+  circle: state.get('circles').get(circleId),
+  added: typeof added === 'undefined' ? state.getIn(['circleAdder', 'circles', 'items']).includes(circleId) : added,
+});
+
+const mapDispatchToProps = (dispatch, { circleId }) => ({
+  onRemove: () => dispatch(removeFromCircleAdder(circleId)),
+  onAdd: () => dispatch(addToCircleAdder(circleId)),
+});
+
+class Circle extends ImmutablePureComponent {
+
+  static propTypes = {
+    circle: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  render () {
+    const { circle, intl, onRemove, onAdd, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' iconComponent={CloseIcon} title={intl.formatMessage(messages.remove)} onClick={onRemove} />;
+    } else {
+      button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={onAdd} />;
+    }
+
+    return (
+      <div className='list'>
+        <div className='list__wrapper'>
+          <div className='list__display-name'>
+            <Icon id='user-circle' icon={CircleIcon} className='column-link__icon' fixedWidth />
+            {circle.get('title')}
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(Circle));
diff --git a/app/javascript/mastodon/features/circle_adder/index.jsx b/app/javascript/mastodon/features/circle_adder/index.jsx
new file mode 100644
index 0000000000..ae9c647bdd
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_adder/index.jsx
@@ -0,0 +1,77 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl } from 'react-intl';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { setupCircleAdder, resetCircleAdder } from '../../actions/circles';
+import NewCircleForm from '../circles/components/new_circle_form';
+
+import Account from './components/account';
+import Circle from './components/circle';
+// hack
+
+const getOrderedCircles = createSelector([state => state.get('circles')], circles => {
+  if (!circles) {
+    return circles;
+  }
+
+  return circles.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  circleIds: getOrderedCircles(state).map(circle=>circle.get('id')),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onInitialize: accountId => dispatch(setupCircleAdder(accountId)),
+  onReset: () => dispatch(resetCircleAdder()),
+});
+
+class CircleAdder extends ImmutablePureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    circleIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { onInitialize, accountId } = this.props;
+    onInitialize(accountId);
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { accountId, circleIds } = this.props;
+
+    return (
+      <div className='modal-root__modal list-adder'>
+        <div className='list-adder__account'>
+          <Account accountId={accountId} />
+        </div>
+
+        <NewCircleForm />
+
+
+        <div className='list-adder__lists'>
+          {circleIds.map(CircleId => <Circle key={CircleId} circleId={CircleId} />)}
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CircleAdder));
diff --git a/app/javascript/mastodon/features/circle_editor/components/account.jsx b/app/javascript/mastodon/features/circle_editor/components/account.jsx
new file mode 100644
index 0000000000..1b8a462d1b
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_editor/components/account.jsx
@@ -0,0 +1,83 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+
+import { removeFromCircleEditor, addToCircleEditor } from '../../../actions/circles';
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import { IconButton } from '../../../components/icon_button';
+import { makeGetAccount } from '../../../selectors';
+
+const messages = defineMessages({
+  remove: { id: 'circles.account.remove', defaultMessage: 'Remove from circle' },
+  add: { id: 'circles.account.add', defaultMessage: 'Add to circle' },
+});
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId, added }) => ({
+    account: getAccount(state, accountId),
+    added: typeof added === 'undefined' ? state.getIn(['circleEditor', 'accounts', 'items']).includes(accountId) : added,
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch, { accountId }) => ({
+  onRemove: () => dispatch(removeFromCircleEditor(accountId)),
+  onAdd: () => dispatch(addToCircleEditor(accountId)),
+});
+
+class Account extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  render () {
+    const { account, intl, onRemove, onAdd, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' iconComponent={CloseIcon} title={intl.formatMessage(messages.remove)} onClick={onRemove} />;
+    } else {
+      button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={onAdd} />;
+    }
+
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name'>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/circle_editor/components/edit_circle_form.jsx b/app/javascript/mastodon/features/circle_editor/components/edit_circle_form.jsx
new file mode 100644
index 0000000000..54d71891b8
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_editor/components/edit_circle_form.jsx
@@ -0,0 +1,76 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+
+import { changeCircleEditorTitle, submitCircleEditor } from '../../../actions/circles';
+import { IconButton } from '../../../components/icon_button';
+
+const messages = defineMessages({
+  title: { id: 'circles.edit.submit', defaultMessage: 'Change title' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['circleEditor', 'title']),
+  disabled: !state.getIn(['circleEditor', 'isChanged']) || !state.getIn(['circleEditor', 'title']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeCircleEditorTitle(value)),
+  onSubmit: () => dispatch(submitCircleEditor(false)),
+});
+
+class CircleForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <input
+          className='setting-text'
+          value={value}
+          onChange={this.handleChange}
+        />
+
+        <IconButton
+          disabled={disabled}
+          icon='check'
+          iconComponent={CheckIcon}
+          title={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CircleForm));
diff --git a/app/javascript/mastodon/features/circle_editor/components/search.jsx b/app/javascript/mastodon/features/circle_editor/components/search.jsx
new file mode 100644
index 0000000000..e84ac2cc20
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_editor/components/search.jsx
@@ -0,0 +1,83 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { connect } from 'react-redux';
+
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+import { fetchCircleSuggestions, clearCircleSuggestions, changeCircleSuggestions } from '../../../actions/circles';
+
+const messages = defineMessages({
+  search: { id: 'circles.search', defaultMessage: 'Search among people follow you' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['circleEditor', 'suggestions', 'value']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onSubmit: value => dispatch(fetchCircleSuggestions(value)),
+  onClear: () => dispatch(clearCircleSuggestions()),
+  onChange: value => dispatch(changeCircleSuggestions(value)),
+});
+
+class Search extends PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    value: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+    onClear: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleKeyUp = e => {
+    if (e.keyCode === 13) {
+      this.props.onSubmit(this.props.value);
+    }
+  };
+
+  handleClear = () => {
+    this.props.onClear();
+  };
+
+  render () {
+    const { value, intl } = this.props;
+    const hasValue = value.length > 0;
+
+    return (
+      <div className='list-editor__search search'>
+        <label>
+          <span style={{ display: 'none' }}>{intl.formatMessage(messages.search)}</span>
+
+          <input
+            className='search__input'
+            type='text'
+            value={value}
+            onChange={this.handleChange}
+            onKeyUp={this.handleKeyUp}
+            placeholder={intl.formatMessage(messages.search)}
+          />
+        </label>
+
+        <div role='button' tabIndex={0} className='search__icon' onClick={this.handleClear}>
+          <Icon id='search' icon={SearchIcon} className={classNames({ active: !hasValue })} />
+          <Icon id='times-circle' icon={CancelIcon} aria-label={intl.formatMessage(messages.search)} className={classNames({ active: hasValue })} />
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Search));
diff --git a/app/javascript/mastodon/features/circle_editor/index.jsx b/app/javascript/mastodon/features/circle_editor/index.jsx
new file mode 100644
index 0000000000..6d47b86c3d
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_editor/index.jsx
@@ -0,0 +1,83 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import spring from 'react-motion/lib/spring';
+
+import { setupCircleEditor, clearCircleSuggestions, resetCircleEditor } from '../../actions/circles';
+import Motion from '../ui/util/optional_motion';
+
+import Account from './components/account';
+import EditCircleForm from './components/edit_circle_form';
+import Search from './components/search';
+
+const mapStateToProps = state => ({
+  accountIds: state.getIn(['circleEditor', 'accounts', 'items']),
+  searchAccountIds: state.getIn(['circleEditor', 'suggestions', 'items']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onInitialize: circleId => dispatch(setupCircleEditor(circleId)),
+  onClear: () => dispatch(clearCircleSuggestions()),
+  onReset: () => dispatch(resetCircleEditor()),
+});
+
+class CircleEditor extends ImmutablePureComponent {
+
+  static propTypes = {
+    circleId: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onClear: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list.isRequired,
+    searchAccountIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { onInitialize, circleId } = this.props;
+    onInitialize(circleId);
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { accountIds, searchAccountIds, onClear } = this.props;
+    const showSearch = searchAccountIds.size > 0;
+
+    return (
+      <div className='modal-root__modal list-editor'>
+        <EditCircleForm />
+
+        <Search />
+
+        <div className='drawer__pager'>
+          <div className='drawer__inner list-editor__accounts'>
+            {accountIds.map(accountId => <Account key={accountId} accountId={accountId} added />)}
+          </div>
+
+          {showSearch && <div role='button' tabIndex={-1} className='drawer__backdrop' onClick={onClear} />}
+
+          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
+            {({ x }) => (
+              <div className='drawer__inner backdrop' style={{ transform: x === 0 ? null : `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
+                {searchAccountIds.map(accountId => <Account key={accountId} accountId={accountId} />)}
+              </div>
+            )}
+          </Motion>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(CircleEditor));
diff --git a/app/javascript/mastodon/features/circle_statuses/index.jsx b/app/javascript/mastodon/features/circle_statuses/index.jsx
new file mode 100644
index 0000000000..51cb964343
--- /dev/null
+++ b/app/javascript/mastodon/features/circle_statuses/index.jsx
@@ -0,0 +1,189 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+
+import { Helmet } from 'react-helmet';
+import { withRouter } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { debounce } from 'lodash';
+
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import { deleteCircle, expandCircleStatuses, fetchCircle, fetchCircleStatuses } from 'mastodon/actions/circles';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { openModal } from 'mastodon/actions/modal';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon }  from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import StatusList from 'mastodon/components/status_list';
+import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { getCircleStatusList } from 'mastodon/selectors';
+import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+
+
+const messages = defineMessages({
+  deleteMessage: { id: 'confirmations.delete_circle.message', defaultMessage: 'Are you sure you want to permanently delete this circle?' },
+  deleteConfirm: { id: 'confirmations.delete_circle.confirm', defaultMessage: 'Delete' },
+  heading: { id: 'column.circles', defaultMessage: 'Circles' },
+});
+
+const mapStateToProps = (state, { params }) => ({
+  circle: state.getIn(['circles', params.id]),
+  statusIds: getCircleStatusList(state, params.id),
+  isLoading: state.getIn(['circles', params.id, 'isLoading'], true),
+  isEditing: state.getIn(['circleEditor', 'circleId']) === params.id,
+  hasMore: !!state.getIn(['circles', params.id, 'next']),
+});
+
+class CircleStatuses extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    statusIds: ImmutablePropTypes.list.isRequired,
+    circle: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
+    intl: PropTypes.object.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+    ...WithRouterPropTypes,
+  };
+
+  UNSAFE_componentWillMount () {
+    this.props.dispatch(fetchCircle(this.props.params.id));
+    this.props.dispatch(fetchCircleStatuses(this.props.params.id));
+  }
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('CIRCLE_STATUSES', { id: this.props.params.id }));
+      this.props.history.push('/');
+    }
+  };
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  };
+
+  handleEditClick = () => {
+    this.props.dispatch(openModal({
+      modalType: 'CIRCLE_EDITOR',
+      modalProps: { circleId: this.props.params.id },
+    }));
+  };
+
+  handleDeleteClick = () => {
+    const { dispatch, columnId, intl } = this.props;
+    const { id } = this.props.params;
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.deleteMessage),
+        confirm: intl.formatMessage(messages.deleteConfirm),
+        onConfirm: () => {
+          dispatch(deleteCircle(id));
+
+          if (columnId) {
+            dispatch(removeColumn(columnId));
+          } else {
+            this.props.history.push('/circles');
+          }
+        },
+      },
+    }));
+  };
+
+  setRef = c => {
+    this.column = c;
+  };
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandCircleStatuses(this.props.params.id));
+  }, 300, { leading: true });
+
+  render () {
+    const { intl, circle, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
+    const pinned = !!columnId;
+
+    if (typeof circle === 'undefined') {
+      return (
+        <Column>
+          <div className='scrollable'>
+            <LoadingIndicator />
+          </div>
+        </Column>
+      );
+    } else if (circle === false) {
+      return (
+        <BundleColumnError multiColumn={multiColumn} errorType='routing' />
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.circle_statuses' defaultMessage="You don't have any circle posts yet. When you post one as circle, it will show up here." />;
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader
+          icon='user-circle'
+          iconComponent={CircleIcon}
+          title={circle.get('title')}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        >
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='circles.edit' defaultMessage='Edit circle' />
+              </button>
+
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='circles.delete' defaultMessage='Delete circle' />
+              </button>
+            </section>
+          </div>
+        </ColumnHeader>
+
+        <StatusList
+          trackScroll={!pinned}
+          statusIds={statusIds}
+          scrollKey={`circle_statuses-${columnId}`}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default withRouter(connect(mapStateToProps)(injectIntl(CircleStatuses)));
diff --git a/app/javascript/mastodon/features/circles/components/new_circle_form.jsx b/app/javascript/mastodon/features/circles/components/new_circle_form.jsx
new file mode 100644
index 0000000000..a28d0a1266
--- /dev/null
+++ b/app/javascript/mastodon/features/circles/components/new_circle_form.jsx
@@ -0,0 +1,80 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import { changeCircleEditorTitle, submitCircleEditor } from 'mastodon/actions/circles';
+import { Button } from 'mastodon/components/button';
+
+const messages = defineMessages({
+  label: { id: 'circles.new.title_placeholder', defaultMessage: 'New circle title' },
+  title: { id: 'circles.new.create', defaultMessage: 'Add circle' },
+});
+
+const mapStateToProps = state => ({
+  value: state.getIn(['circleEditor', 'title']),
+  disabled: state.getIn(['circleEditor', 'isSubmitting']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onChange: value => dispatch(changeCircleEditorTitle(value)),
+  onSubmit: () => dispatch(submitCircleEditor(true)),
+});
+
+class NewCircleForm extends PureComponent {
+
+  static propTypes = {
+    value: PropTypes.string.isRequired,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+  };
+
+  handleChange = e => {
+    this.props.onChange(e.target.value);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+    this.props.onSubmit();
+  };
+
+  handleClick = () => {
+    this.props.onSubmit();
+  };
+
+  render () {
+    const { value, disabled, intl } = this.props;
+
+    const label = intl.formatMessage(messages.label);
+    const title = intl.formatMessage(messages.title);
+
+    return (
+      <form className='column-inline-form' onSubmit={this.handleSubmit}>
+        <label>
+          <span style={{ display: 'none' }}>{label}</span>
+
+          <input
+            className='setting-text'
+            value={value}
+            disabled={disabled}
+            onChange={this.handleChange}
+            placeholder={label}
+          />
+        </label>
+
+        <Button
+          disabled={disabled || !value}
+          text={title}
+          onClick={this.handleClick}
+        />
+      </form>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewCircleForm));
diff --git a/app/javascript/mastodon/features/circles/index.jsx b/app/javascript/mastodon/features/circles/index.jsx
new file mode 100644
index 0000000000..8b5a62db5e
--- /dev/null
+++ b/app/javascript/mastodon/features/circles/index.jsx
@@ -0,0 +1,125 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import { fetchCircles, deleteCircle } from 'mastodon/actions/circles';
+import { openModal } from 'mastodon/actions/modal';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import ColumnLink from 'mastodon/features/ui/components/column_link';
+import ColumnSubheading from 'mastodon/features/ui/components/column_subheading';
+
+import NewCircleForm from './components/new_circle_form';
+
+const messages = defineMessages({
+  heading: { id: 'column.circles', defaultMessage: 'Circles' },
+  subheading: { id: 'circles.subheading', defaultMessage: 'Your circles' },
+  deleteMessage: { id: 'confirmations.delete_circle.message', defaultMessage: 'Are you sure you want to permanently delete this circle?' },
+  deleteConfirm: { id: 'confirmations.delete_circle.confirm', defaultMessage: 'Delete' },
+});
+
+const getOrderedCircles = createSelector([state => state.get('circles')], circles => {
+  if (!circles) {
+    return circles;
+  }
+
+  return circles.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  circles: getOrderedCircles(state),
+});
+
+class Circles extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    circles: ImmutablePropTypes.list,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+  };
+
+  UNSAFE_componentWillMount () {
+    this.props.dispatch(fetchCircles());
+  }
+
+  handleEditClick = (e) => {
+    e.preventDefault();
+    this.props.dispatch(openModal({
+      modalType: 'CIRCLE_EDITOR',
+      modalProps: { circleId: e.currentTarget.getAttribute('data-id') },
+    }));
+  };
+
+  handleRemoveClick = (e) => {
+    const { dispatch, intl } = this.props;
+
+    e.preventDefault();
+    const id = e.currentTarget.getAttribute('data-id');
+
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.deleteMessage),
+        confirm: intl.formatMessage(messages.deleteConfirm),
+        onConfirm: () => {
+          dispatch(deleteCircle(id));
+        },
+      },
+    }));
+  };
+
+  render () {
+    const { intl, circles, multiColumn } = this.props;
+
+    if (!circles) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.circles' defaultMessage="You don't have any circles yet. When you create one, it will show up here." />;
+
+    return (
+      <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader title={intl.formatMessage(messages.heading)} icon='user-circle' iconComponent={CirclesIcon} multiColumn={multiColumn} />
+
+        <NewCircleForm />
+
+        <ScrollableList
+          scrollKey='circles'
+          emptyMessage={emptyMessage}
+          prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
+          bindToDocument={!multiColumn}
+        >
+          {circles.map(circle =>
+            <ColumnLink key={circle.get('id')} to={`/circles/${circle.get('id')}`} icon='user-circle' iconComponent={CircleIcon} text={circle.get('title')} />,
+          )}
+        </ScrollableList>
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(Circles));
diff --git a/app/javascript/mastodon/features/closed_registrations_modal/index.jsx b/app/javascript/mastodon/features/closed_registrations_modal/index.jsx
index 89ced8029c..3938c5b1f6 100644
--- a/app/javascript/mastodon/features/closed_registrations_modal/index.jsx
+++ b/app/javascript/mastodon/features/closed_registrations_modal/index.jsx
@@ -4,7 +4,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
 import { fetchServer } from 'mastodon/actions/server';
-import { domain } from 'mastodon/initial_state';
+import { domain, registrationsReachLimit } from 'mastodon/initial_state';
 
 const mapStateToProps = state => ({
   message: state.getIn(['server', 'server', 'registrations', 'message']),
@@ -27,6 +27,16 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
           dangerouslySetInnerHTML={{ __html: this.props.message }}
         />
       );
+    } else if (registrationsReachLimit) {
+      closedRegistrationsMessage = (
+        <p className='prose'>
+          <FormattedMessage
+            id='closed_registrations_modal.description_when_reaching_limit'
+            defaultMessage='New registrations are currently temporarily restricted. Either the maximum number of registrations has been reached for registration. Please contact the administrator for more information or wait until the restriction is lifted.'
+            values={{ domain: <strong>{domain}</strong> }}
+          />
+        </p>
+      );
     } else {
       closedRegistrationsMessage = (
         <p className='prose'>
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
index 69959c1760..73927b612d 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
@@ -20,10 +20,12 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
-        </div>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
+          </div>
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx
index 5bf66c2a34..0aa1f9aa23 100644
--- a/app/javascript/mastodon/features/community_timeline/index.jsx
+++ b/app/javascript/mastodon/features/community_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index bacafaf1e1..78953be9af 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -1,20 +1,22 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch } from 'react-redux';
 
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
-
-import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
+import { logOut } from 'mastodon/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  reaction_deck: { id: 'navigation_bar.reaction_deck', defaultMessage: 'Reaction deck' },
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
+  emoji_reactions: { id: 'navigation_bar.emoji_reactions', defaultMessage: 'Stamps' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   followed_tags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
@@ -23,51 +25,54 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
-class ActionBar extends PureComponent {
+export const ActionBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
+  const handleLogoutClick = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
+    }));
+  }, [dispatch, intl]);
 
-  handleLogout = () => {
-    this.props.onLogout();
-  };
+  let menu = [];
 
-  render () {
-    const { intl } = this.props;
+  menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+  menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+  menu.push({ text: intl.formatMessage(messages.reaction_deck), to: '/reaction_deck' });
+  menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+  menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+  menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
+  menu.push({ text: intl.formatMessage(messages.emoji_reactions), to: '/emoji_reactions' });
+  menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+  menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+  menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+  menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+  menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.logout), action: handleLogoutClick });
 
-    let menu = [];
-
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
-    menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
-    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
-    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
-    menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
-    menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
-    menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
-    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
-    menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.logout), action: this.handleLogout });
-
-    return (
-      <div className='compose__action-bar'>
-        <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='bars' iconComponent={MenuIcon} size={24} direction='right' />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(ActionBar);
+  return (
+    <DropdownMenuContainer
+      items={menu}
+      icon='bars'
+      iconComponent={MoreHorizIcon}
+      size={24}
+      direction='right'
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
index 0a73bc1020..fe684c1483 100644
--- a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
@@ -15,7 +15,7 @@ export default class AutosuggestAccount extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-account' title={account.get('acct')}>
-        <div className='autosuggest-account-icon'><Avatar account={account} size={18} /></div>
+        <Avatar account={account} size={24} />
         <DisplayName account={account} />
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/character_counter.jsx b/app/javascript/mastodon/features/compose/components/character_counter.jsx
index 42452b30f6..f400d1fe2f 100644
--- a/app/javascript/mastodon/features/compose/components/character_counter.jsx
+++ b/app/javascript/mastodon/features/compose/components/character_counter.jsx
@@ -1,26 +1,18 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { length } from 'stringz';
 
-export default class CharacterCounter extends PureComponent {
+export const CharacterCounter = ({ text, max }) => {
+  const diff = max - length(text);
 
-  static propTypes = {
-    text: PropTypes.string.isRequired,
-    max: PropTypes.number.isRequired,
-  };
-
-  checkRemainingText (diff) {
-    if (diff < 0) {
-      return <span className='character-counter character-counter--over'>{diff}</span>;
-    }
-
-    return <span className='character-counter'>{diff}</span>;
+  if (diff < 0) {
+    return <span className='character-counter character-counter--over'>{diff}</span>;
   }
 
-  render () {
-    const diff = this.props.max - length(this.props.text);
-    return this.checkRemainingText(diff);
-  }
+  return <span className='character-counter'>{diff}</span>;
+};
 
-}
+CharacterCounter.propTypes = {
+  text: PropTypes.string.isRequired,
+  max: PropTypes.number.isRequired,
+};
diff --git a/app/javascript/mastodon/features/compose/components/circle_dropdown.jsx b/app/javascript/mastodon/features/compose/components/circle_dropdown.jsx
new file mode 100644
index 0000000000..5bc6a8329b
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/circle_dropdown.jsx
@@ -0,0 +1,273 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+const messages = defineMessages({
+  add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class CircleDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    value: PropTypes.string,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items, value } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+class CircleDropdown extends PureComponent {
+
+  static propTypes = {
+    isUserTouching: PropTypes.func,
+    onModalOpen: PropTypes.func,
+    onModalClose: PropTypes.func,
+    onChange: PropTypes.func.isRequired,
+    noDirect: PropTypes.bool,
+    container: PropTypes.func,
+    disabled: PropTypes.bool,
+    circles: ImmutablePropTypes.map,
+    circleId: PropTypes.string,
+    unavailable: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options && this.options.map(option => ({ ...option, active: option.value === this.props.circleId })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { container, disabled, intl, unavailable, circles, circleId } = this.props;
+    const { open, placement } = this.state;
+
+    if (unavailable) {
+      return null;
+    }
+
+    const listOptions = circles.toArray().filter((circle) => circle && circle.length > 1).map((circle) => {
+      return circle[1] ? { value: circle[1].get('id'), text: circle[1].get('title') } : null;
+    }).filter((opt) => opt !== null);
+    const listOption = listOptions.find((opt) => opt.value === circleId) ?? { value: '0', text: 'Unselected' };
+    this.options = listOptions;
+
+    return (
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.add_expiration)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          disabled={disabled}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id='clock-o' icon={CircleIcon} />
+          <span className='dropdown-button__label'>{listOption.text}</span>
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <CircleDropdownMenu
+                  items={listOptions}
+                  value={circleId}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(CircleDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index a099707dfb..43dcb3d2c1 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,35 +10,41 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import { Icon }  from 'mastodon/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
+
 import AutosuggestInput from '../../../components/autosuggest_input';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { Button } from '../../../components/button';
+import CircleDropdownContainer from '../containers/circle_dropdown_container';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
+import ExpirationDropdownContainer from '../containers/expiration_dropdown_container';
+import FeaturedTagsDropdownContainer from '../containers/featured_tags_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
+import MarkdownButtonContainer from '../containers/markdown_button_container';
 import PollButtonContainer from '../containers/poll_button_container';
-import PollFormContainer from '../containers/poll_form_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-import ReplyIndicatorContainer from '../containers/reply_indicator_container';
+import SearchabilityDropdownContainer from '../containers/searchability_dropdown_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
-import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
-import CharacterCounter from './character_counter';
+import { CharacterCounter } from './character_counter';
+import { EditIndicator } from './edit_indicator';
+import { NavigationBar } from './navigation_bar';
+import { PollForm } from "./poll_form";
+import { ReplyIndicator } from './reply_indicator';
+import { UploadForm } from './upload_form';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
-  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
-  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning (optional)' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Update' },
+  reply: { id: 'compose_form.reply', defaultMessage: 'Reply' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -48,6 +54,7 @@ class ComposeForm extends ImmutablePureComponent {
     suggestions: ImmutablePropTypes.list,
     spoiler: PropTypes.bool,
     privacy: PropTypes.string,
+    searchability: PropTypes.string,
     spoilerText: PropTypes.string,
     focusDate: PropTypes.instanceOf(Date),
     caretPosition: PropTypes.number,
@@ -64,11 +71,16 @@ class ComposeForm extends ImmutablePureComponent {
     onChangeSpoilerText: PropTypes.func.isRequired,
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
+    onPickExpiration: PropTypes.func.isRequired,
+    onPickFeaturedTag: PropTypes.func.isRequired,
     autoFocus: PropTypes.bool,
+    withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
+    circleId: PropTypes.string,
+    maxChars: PropTypes.number,
     ...WithOptionalRouterPropTypes
   };
 
@@ -100,11 +112,11 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   canSubmit = () => {
-    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
+    const { isSubmitting, isChangingUpload, isUploading, anyMedia, maxChars, privacy, circleId, isEditing } = this.props;
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia) || (privacy === 'circle' && !isEditing && !circleId) || privacy === 'banned');
   };
 
   handleSubmit = (e) => {
@@ -222,94 +234,113 @@ class ComposeForm extends ImmutablePureComponent {
     this.props.onPickEmoji(position, data, needsSpace);
   };
 
+  handleExpirationPick = (data) => {
+    const position     = this.textareaRef.current.selectionStart;
+
+    this.props.onPickExpiration(position, data);
+  };
+
+  handleFeaturedTagPick = (data) => {
+    const position     = this.textareaRef.current.selectionStart;
+
+    this.props.onPickExpiration(position, data);
+  };
+
   render () {
-    const { intl, onPaste, autoFocus } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
-    let publishText = '';
-
-    if (this.props.isEditing) {
-      publishText = intl.formatMessage(messages.saveChanges);
-    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
-      publishText = <><Icon id='lock' icon={LockIcon} /> {intl.formatMessage(messages.publish)}</>;
-    } else {
-      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
-    }
-
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
+        <ReplyIndicator />
+        {!withoutNavigation && <NavigationBar />}
         <WarningContainer />
 
-        <ReplyIndicatorContainer />
+        <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
+          <div className='compose-form__scrollable'>
+            <EditIndicator />
 
-        <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef} aria-hidden={!this.props.spoiler}>
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.spoiler_placeholder)}
-            value={this.props.spoilerText}
-            onChange={this.handleChangeSpoilerText}
-            onKeyDown={this.handleKeyDown}
-            disabled={!this.props.spoiler}
-            ref={this.setSpoilerText}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSpoilerSuggestionSelected}
-            searchTokens={[':']}
-            id='cw-spoiler-input'
-            className='spoiler-input__input'
-            lang={this.props.lang}
-            spellCheck
-          />
-        </div>
+            {this.props.spoiler && (
+              <div className='spoiler-input'>
+                <div className='spoiler-input__border' />
 
-        <div className={classNames('compose-form__highlightable', { active: highlighted })}>
-          <AutosuggestTextarea
-            ref={this.textareaRef}
-            placeholder={intl.formatMessage(messages.placeholder)}
-            disabled={disabled}
-            value={this.props.text}
-            onChange={this.handleChange}
-            suggestions={this.props.suggestions}
-            onFocus={this.handleFocus}
-            onKeyDown={this.handleKeyDown}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            onPaste={onPaste}
-            autoFocus={autoFocus}
-            lang={this.props.lang}
-          >
-            <div className='compose-form__modifiers'>
-              <UploadFormContainer />
-              <PollFormContainer />
-            </div>
-          </AutosuggestTextarea>
-          <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <AutosuggestInput
+                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
+                  value={this.props.spoilerText}
+                  disabled={disabled}
+                  onChange={this.handleChangeSpoilerText}
+                  onKeyDown={this.handleKeyDown}
+                  ref={this.setSpoilerText}
+                  suggestions={this.props.suggestions}
+                  onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+                  onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+                  onSuggestionSelected={this.onSpoilerSuggestionSelected}
+                  searchTokens={[':']}
+                  id='cw-spoiler-input'
+                  className='spoiler-input__input'
+                  lang={this.props.lang}
+                  spellCheck
+                />
 
-          <div className='compose-form__buttons-wrapper'>
-            <div className='compose-form__buttons'>
-              <UploadButtonContainer />
-              <PollButtonContainer />
+                <div className='spoiler-input__border' />
+              </div>
+            )}
+
+            <AutosuggestTextarea
+              ref={this.textareaRef}
+              placeholder={intl.formatMessage(messages.placeholder)}
+              disabled={disabled}
+              value={this.props.text}
+              onChange={this.handleChange}
+              suggestions={this.props.suggestions}
+              onFocus={this.handleFocus}
+              onKeyDown={this.handleKeyDown}
+              onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+              onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+              onSuggestionSelected={this.onSuggestionSelected}
+              onPaste={onPaste}
+              autoFocus={autoFocus}
+              lang={this.props.lang}
+            />
+          </div>
+
+          <UploadForm />
+          <PollForm />
+
+          <div className='compose-form__footer'>
+            <div className='compose-form__dropdowns'>
               <PrivacyDropdownContainer disabled={this.props.isEditing} />
-              <SpoilerButtonContainer />
               <LanguageDropdown />
             </div>
-
-            <div className='character-counter__wrapper'>
-              <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+            <div className='compose-form__dropdowns compose-form__dropdowns__second'>
+              <CircleDropdownContainer />
+            </div>
+            <div className='compose-form__dropdowns compose-form__dropdowns__second'>
+              <SearchabilityDropdownContainer disabled={this.props.isEditing} />
+              <ExpirationDropdownContainer onPickExpiration={this.handleExpirationPick} />
+              <FeaturedTagsDropdownContainer onPickTag={this.handleFeaturedTagPick} />
             </div>
-          </div>
-        </div>
 
-        <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'>
-            <Button
-              type='submit'
-              text={publishText}
-              disabled={!this.canSubmit()}
-              block
-            />
+            <div className='compose-form__actions'>
+              <div className='compose-form__buttons'>
+                <UploadButtonContainer />
+                <PollButtonContainer />
+                <SpoilerButtonContainer />
+                <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <MarkdownButtonContainer />
+                <CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} />
+              </div>
+
+
+              <div className='compose-form__submit'>
+                <Button
+                  type='submit'
+                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
+                  disabled={!this.canSubmit()}
+                />
+              </div>
+            </div>
           </div>
         </div>
       </form>
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
new file mode 100644
index 0000000000..cc37d2d7d8
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -0,0 +1,62 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+export const EditIndicator = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const id = useSelector(state => state.getIn(['compose', 'id']));
+  const status = useSelector(state => state.getIn(['statuses', id]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
+
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
+
+  if (!status) {
+    return null;
+  }
+
+  const content = { __html: status.get('contentHtml') };
+
+  return (
+    <div className='edit-indicator'>
+      <div className='edit-indicator__header'>
+        <div className='edit-indicator__display-name'>
+          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          ·
+          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+        </div>
+
+        <div className='edit-indicator__cancel'>
+          <IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={handleCancelClick} inverted />
+        </div>
+      </div>
+
+      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+
+      {(status.get('poll') || status.get('media_attachments').size > 0) && (
+        <div className='edit-indicator__attachments'>
+          {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+          {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 494b8d8624..43795d030f 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,6 +10,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
+import MoodIcon from '@/material-icons/400-20px/mood.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 import { assetHost } from 'mastodon/utils/config';
 
 import { buildCustomEmojis, categoriesFromEmojis } from '../../emoji/emoji';
@@ -162,6 +164,7 @@ class EmojiPickerMenuImpl extends PureComponent {
     intl: PropTypes.object.isRequired,
     skinTone: PropTypes.number.isRequired,
     onSkinTone: PropTypes.func.isRequired,
+    pickerButtonRef: PropTypes.func.isRequired
   };
 
   static defaultProps = {
@@ -176,7 +179,7 @@ class EmojiPickerMenuImpl extends PureComponent {
   };
 
   handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
+    if (this.node && !this.node.contains(e.target) && !this.props.pickerButtonRef.contains(e.target)) {
       this.props.onClose();
     }
   };
@@ -231,6 +234,7 @@ class EmojiPickerMenuImpl extends PureComponent {
       emoji.native = emoji.colons;
     }
     if (!(event.ctrlKey || event.metaKey)) {
+
       this.props.onClose();
     }
     this.props.onPick(emoji);
@@ -321,12 +325,12 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
-    button: PropTypes.node,
   };
 
   state = {
     active: false,
     loading: false,
+    placement: 'bottom',
   };
 
   setRef = (c) => {
@@ -378,24 +382,29 @@ class EmojiPickerDropdown extends PureComponent {
     return this.target;
   };
 
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, button } = this.props;
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
-    const { active, loading } = this.state;
+    const { active, loading, placement } = this.state;
 
     return (
-      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown}>
-        <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
-          {button || <img
-            className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f642.svg`}
-          />}
-        </div>
+      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
+        <IconButton
+          title={title}
+          aria-expanded={active}
+          active={active}
+          iconComponent={MoodIcon}
+          onClick={this.onToggle}
+          inverted
+        />
 
-        <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
+        <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement })=> (
-            <div {...props} style={{ ...props.style, width: 299 }}>
+            <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>
                 <EmojiPickerMenu
                   custom_emojis={this.props.custom_emojis}
@@ -405,6 +414,7 @@ class EmojiPickerDropdown extends PureComponent {
                   onSkinTone={onSkinTone}
                   skinTone={skinTone}
                   frequentlyUsedEmojis={frequentlyUsedEmojis}
+                  pickerButtonRef={this.target}
                 />
               </div>
             </div>
diff --git a/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx b/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
new file mode 100644
index 0000000000..dc0a268bb8
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
@@ -0,0 +1,276 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+
+const messages = defineMessages({
+  add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' },
+  expiration_5_minutes: { id: 'status.expiration.5_minutes', defaultMessage: 'Remove 5 minutes later' },
+  expiration_30_minutes: { id: 'status.expiration.30_minutes', defaultMessage: 'Remove 30 minutes later' },
+  expiration_1_hour: { id: 'status.expiration.1_hour', defaultMessage: 'Remove 1 hour later' },
+  expiration_3_hours: { id: 'status.expiration.3_hours', defaultMessage: 'Remove 3 hours later' },
+  expiration_12_hours: { id: 'status.expiration.12_hours', defaultMessage: 'Remove 12 hours later' },
+  expiration_1_day: { id: 'status.expiration.1_day', defaultMessage: 'Remove 1 day later' },
+  expiration_7_days: { id: 'status.expiration.7_days', defaultMessage: 'Remove 7 days later' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class ExpirationDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option')} aria-selected={false} ref={null}>
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+class ExpirationDropdown extends PureComponent {
+
+  static propTypes = {
+    isUserTouching: PropTypes.func,
+    onModalOpen: PropTypes.func,
+    onModalClose: PropTypes.func,
+    onChange: PropTypes.func.isRequired,
+    noDirect: PropTypes.bool,
+    container: PropTypes.func,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options.map(option => ({ ...option, active: false })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  componentWillMount () {
+    const { intl } = this.props;
+
+    this.options = [
+      { value: '#exp5m', text: intl.formatMessage(messages.expiration_5_minutes) },
+      { value: '#exp30m', text: intl.formatMessage(messages.expiration_30_minutes) },
+      { value: '#exp1h', text: intl.formatMessage(messages.expiration_1_hour) },
+      { value: '#exp3h', text: intl.formatMessage(messages.expiration_3_hours) },
+      { value: '#exp12h', text: intl.formatMessage(messages.expiration_12_hours) },
+      { value: '#exp1d', text: intl.formatMessage(messages.expiration_1_day) },
+      { value: '#exp7d', text: intl.formatMessage(messages.expiration_7_days) },
+    ];
+  }
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { container, disabled, intl } = this.props;
+    const { open, placement } = this.state;
+
+    return (
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.add_expiration)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          disabled={disabled}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id='clock-o' icon={TimerIcon} />
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <ExpirationDropdownMenu
+                  items={this.options}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(ExpirationDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/featured_tags_dropdown.jsx b/app/javascript/mastodon/features/compose/components/featured_tags_dropdown.jsx
new file mode 100644
index 0000000000..c8bf2b677b
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/featured_tags_dropdown.jsx
@@ -0,0 +1,266 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+import { featuredTags } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  add_tag: { id: 'status.featured_tags.add', defaultMessage: 'Add your featured tag' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class FeaturedTagsDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option')} aria-selected={false} ref={null}>
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+class FeaturedTagsDropdown extends PureComponent {
+
+  static propTypes = {
+    isUserTouching: PropTypes.func,
+    onModalOpen: PropTypes.func,
+    onModalClose: PropTypes.func,
+    onChange: PropTypes.func.isRequired,
+    noDirect: PropTypes.bool,
+    container: PropTypes.func,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options.map(option => ({ ...option, active: false })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  componentWillMount () {
+    this.options = featuredTags.map((tag) => {
+      return { value: `#${tag}`, text: `#${tag}` };
+    });
+  }
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { container, disabled, intl } = this.props;
+    const { open, placement } = this.state;
+
+    if (!this.options || this.options.length === 0) {
+      return null;
+    }
+
+    return (
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.add_tag)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          disabled={disabled}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id='clock-o' icon={TagIcon} />
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <FeaturedTagsDropdownMenu
+                  items={this.options}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(FeaturedTagsDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 13d1c2e1a7..c3bd908a4e 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -9,10 +9,11 @@ import { supportsPassiveEvents } from 'detect-passive-events';
 import fuzzysort from 'fuzzysort';
 import Overlay from 'react-overlays/Overlay';
 
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TranslateIcon from '@/material-icons/400-24px/translate.svg?react';
+import { Icon } from 'mastodon/components/icon';
 import { languages as preloadedLanguages } from 'mastodon/initial_state';
-import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
-
-import TextIconButton from './text_icon_button';
 
 const messages = defineMessages({
   changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@@ -140,6 +141,7 @@ class LanguageDropdownMenu extends PureComponent {
     case 'Escape':
       onClose();
       break;
+    case ' ':
     case 'Enter':
       this.handleClick(e);
       break;
@@ -231,7 +233,7 @@ class LanguageDropdownMenu extends PureComponent {
       <div ref={this.setRef}>
         <div className='emoji-mart-search'>
           <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} />
-          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}><Icon icon={!isSearching ? SearchIcon : CancelIcon} /></button>
         </div>
 
         <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
@@ -297,20 +299,24 @@ class LanguageDropdown extends PureComponent {
   render () {
     const { value, intl, frequentlyUsedLanguages } = this.props;
     const { open, placement } = this.state;
+    const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
 
     return (
-      <div className={classNames('privacy-dropdown', placement, { active: open })}>
-        <div className='privacy-dropdown__value' ref={this.setTargetRef} >
-          <TextIconButton
-            className='privacy-dropdown__value-icon'
-            label={value && value.toUpperCase()}
-            title={intl.formatMessage(messages.changeLanguage)}
-            active={open}
-            onClick={this.handleToggle}
-          />
-        </div>
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.changeLanguage)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon icon={TranslateIcon} />
+          <span className='dropdown-button__label'>{current[2] ?? value}</span>
+        </button>
 
-        <Overlay show={open} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation language-dropdown__dropdown ${placement}`} >
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
index 2f0bb79f89..ec5578eef3 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
@@ -1,50 +1,36 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import Account from 'mastodon/components/account';
+import { IconButton } from 'mastodon/components/icon_button';
+import { me } from 'mastodon/initial_state';
 
-import { Avatar } from '../../../components/avatar';
+import { ActionBar } from './action_bar';
 
-import ActionBar from './action_bar';
 
-export default class NavigationBar extends ImmutablePureComponent {
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    onClose: PropTypes.func,
-  };
+export const NavigationBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', me]));
+  const isReplying = useSelector(state => !!state.getIn(['compose', 'in_reply_to']));
 
-  render () {
-    const username = this.props.account.get('acct');
-    return (
-      <div className='navigation-bar'>
-        <Link to={`/@${username}`}>
-          <span style={{ display: 'none' }}>{username}</span>
-          <Avatar account={this.props.account} size={46} />
-        </Link>
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
 
-        <div className='navigation-bar__profile'>
-          <span>
-            <Link to={`/@${username}`}>
-              <strong className='navigation-bar__profile-account'>@{username}</strong>
-            </Link>
-          </span>
-
-          <span>
-            <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          </span>
-        </div>
-
-        <div className='navigation-bar__actions'>
-          <ActionBar account={this.props.account} onLogout={this.props.onLogout} />
-        </div>
-      </div>
-    );
-  }
-
-}
+  return (
+    <div className='navigation-bar'>
+      <Account account={account} minimal />
+      {isReplying ? <IconButton title={intl.formatMessage(messages.cancel)} iconComponent={CloseIcon} onClick={handleCancelClick} /> : <ActionBar />}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index e6ecba1a07..cbaa25cb3c 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,11 +3,10 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
-
 const messages = defineMessages({
   add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
   remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
@@ -22,7 +21,6 @@ class PollButton extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -33,17 +31,13 @@ class PollButton extends PureComponent {
   };
 
   render () {
-    const { intl, active, unavailable, disabled } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, active, disabled } = this.props;
 
     return (
       <div className='compose-form__poll-button'>
         <IconButton
           icon='tasks'
-          iconComponent={InsertChartIcon}
+          iconComponent={BarChart4BarsIcon}
           title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
           disabled={disabled}
           onClick={this.handleClick}
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 1815e22e6f..d2adc58cc0 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -1,189 +1,161 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import {
+  changePollSettings,
+  changePollOption,
+  clearComposeSuggestions,
+  fetchComposeSuggestions,
+  selectComposeSuggestion,
+} from 'mastodon/actions/compose';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
-import { Icon }  from 'mastodon/components/icon';
-import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
-  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
-  poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
+  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
+  duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
+  type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
   switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+  multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
 });
 
-class OptionIntl extends PureComponent {
+const Select = ({ label, options, value, onChange }) => {
+  return (
+    <label className='compose-form__poll__select'>
+      <span className='compose-form__poll__select__label'>{label}</span>
 
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    lang: PropTypes.string,
-    index: PropTypes.number.isRequired,
-    isPollMultiple: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onRemove: PropTypes.func.isRequired,
-    onToggleMultiple: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
+      <select className='compose-form__poll__select__value' value={value} onChange={onChange}>
+        {options.map((option, i) => (
+          <option key={i} value={option.value}>{option.label}</option>
+        ))}
+      </select>
+    </label>
+  );
+};
 
-  handleOptionTitleChange = e => {
-    this.props.onChange(this.props.index, e.target.value);
-  };
+Select.propTypes = {
+  label: PropTypes.node,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.node,
+    value: PropTypes.any,
+  })),
+};
 
-  handleOptionRemove = () => {
-    this.props.onRemove(this.props.index);
-  };
+const Option = ({ multipleChoice, index, title, autoFocus }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
+  const lang = useSelector(state => state.getIn(['compose', 'language']));
+  const maxOptions = useSelector(state => state.getIn(['server', 'server', 'configuration', 'polls', 'max_options']));
 
+  const handleChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollOption(index, value, maxOptions));
+  }, [dispatch, index, maxOptions]);
 
-  handleToggleMultiple = e => {
-    this.props.onToggleMultiple();
-    e.preventDefault();
-    e.stopPropagation();
-  };
+  const handleSuggestionsFetchRequested = useCallback(token => {
+    dispatch(fetchComposeSuggestions(token));
+  }, [dispatch]);
 
-  handleCheckboxKeypress = e => {
-    if (e.key === 'Enter' || e.key === ' ') {
-      this.handleToggleMultiple(e);
-    }
-  };
+  const handleSuggestionsClearRequested = useCallback(() => {
+    dispatch(clearComposeSuggestions());
+  }, [dispatch]);
 
-  onSuggestionsClearRequested = () => {
-    this.props.onClearSuggestions();
-  };
+  const handleSuggestionSelected = useCallback((tokenStart, token, value) => {
+    dispatch(selectComposeSuggestion(tokenStart, token, value, ['poll', 'options', index]));
+  }, [dispatch, index]);
 
-  onSuggestionsFetchRequested = (token) => {
-    this.props.onFetchSuggestions(token);
-  };
+  return (
+    <label className={classNames('poll__option editable', { empty: index > 1 && title.length === 0 })}>
+      <span className={classNames('poll__input', { checkbox: multipleChoice })} />
 
-  onSuggestionSelected = (tokenStart, token, value) => {
-    this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
-  };
+      <AutosuggestInput
+        placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
+        maxLength={50}
+        value={title}
+        lang={lang}
+        spellCheck
+        onChange={handleChange}
+        suggestions={suggestions}
+        onSuggestionsFetchRequested={handleSuggestionsFetchRequested}
+        onSuggestionsClearRequested={handleSuggestionsClearRequested}
+        onSuggestionSelected={handleSuggestionSelected}
+        searchTokens={[':']}
+        autoFocus={autoFocus}
+      />
+    </label>
+  );
+};
 
-  render () {
-    const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;
+Option.propTypes = {
+  title: PropTypes.string.isRequired,
+  index: PropTypes.number.isRequired,
+  multipleChoice: PropTypes.bool,
+  autoFocus: PropTypes.bool,
+};
 
-    return (
-      <li>
-        <label className='poll__option editable'>
-          <span
-            className={classNames('poll__input', { checkbox: isPollMultiple })}
-            onClick={this.handleToggleMultiple}
-            onKeyPress={this.handleCheckboxKeypress}
-            role='button'
-            tabIndex={0}
-            title={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-            aria-label={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-          />
+export const PollForm = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const poll = useSelector(state => state.getIn(['compose', 'poll']));
+  const options = poll?.get('options');
+  const expiresIn = poll?.get('expires_in');
+  const isMultiple = poll?.get('multiple');
 
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={50}
-            value={title}
-            lang={lang}
-            spellCheck
-            onChange={this.handleOptionTitleChange}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            searchTokens={[':']}
-            autoFocus={autoFocus}
-          />
-        </label>
+  const handleDurationChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(value, isMultiple));
+  }, [dispatch, isMultiple]);
 
-        <div className='poll__cancel'>
-          <IconButton disabled={index <= 1} title={intl.formatMessage(messages.remove_option)} icon='times' iconComponent={CloseIcon} onClick={this.handleOptionRemove} />
-        </div>
-      </li>
-    );
+  const handleTypeChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(expiresIn, value === 'true'));
+  }, [dispatch, expiresIn]);
+
+  if (poll === null) {
+    return null;
   }
 
-}
+  return (
+    <div className='compose-form__poll'>
+      {options.map((title, i) => (
+        <Option
+          title={title}
+          key={i}
+          index={i}
+          multipleChoice={isMultiple}
+          autoFocus={i === 0}
+        />
+      ))}
 
-const Option = injectIntl(OptionIntl);
+      <div className='compose-form__poll__footer'>
+        <Select label={intl.formatMessage(messages.duration)} options={[
+          { value: 300, label: intl.formatMessage(messages.minutes, { number: 5 })},
+          { value: 1800, label: intl.formatMessage(messages.minutes, { number: 30 })},
+          { value: 3600, label: intl.formatMessage(messages.hours, { number: 1 })},
+          { value: 21600, label: intl.formatMessage(messages.hours, { number: 6 })},
+          { value: 43200, label: intl.formatMessage(messages.hours, { number: 12 })},
+          { value: 86400, label: intl.formatMessage(messages.days, { number: 1 })},
+          { value: 259200, label: intl.formatMessage(messages.days, { number: 3 })},
+          { value: 604800, label: intl.formatMessage(messages.days, { number: 7 })},
+        ]} value={expiresIn} onChange={handleDurationChange} />
 
-class PollForm extends ImmutablePureComponent {
+        <div className='compose-form__poll__footer__sep' />
 
-  static propTypes = {
-    options: ImmutablePropTypes.list,
-    lang: PropTypes.string,
-    expiresIn: PropTypes.number,
-    isMultiple: PropTypes.bool,
-    onChangeOption: PropTypes.func.isRequired,
-    onAddOption: PropTypes.func.isRequired,
-    onRemoveOption: PropTypes.func.isRequired,
-    onChangeSettings: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleAddOption = () => {
-    this.props.onAddOption('');
-  };
-
-  handleSelectDuration = e => {
-    this.props.onChangeSettings(e.target.value, this.props.isMultiple);
-  };
-
-  handleToggleMultiple = () => {
-    this.props.onChangeSettings(this.props.expiresIn, !this.props.isMultiple);
-  };
-
-  render () {
-    const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
-
-    if (!options) {
-      return null;
-    }
-
-    const autoFocusIndex = options.indexOf('');
-
-    return (
-      <div className='compose-form__poll-wrapper'>
-        <ul>
-          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
-        </ul>
-
-        <div className='poll__footer'>
-          <button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
-
-          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-          <select value={expiresIn} onChange={this.handleSelectDuration}>
-            <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-            <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-            <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-            <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-            <option value={43200}>{intl.formatMessage(messages.hours, { number: 12 })}</option>
-            <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-            <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-            <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-          </select>
-        </div>
+        <Select label={intl.formatMessage(messages.type)} options={[
+          { value: false, label: intl.formatMessage(messages.singleChoice) },
+          { value: true, label: intl.formatMessage(messages.multipleChoice) },
+        ]} value={isMultiple} onChange={handleTypeChange} />
       </div>
-    );
-  }
-
-}
-
-export default injectIntl(PollForm);
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 67298c8c43..5bfa2fd4ce 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -5,144 +5,50 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-
-import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
+import MutualIcon from '@/material-icons/400-24px/compare_arrows.svg?react';
+import LoginIcon from '@/material-icons/400-24px/key.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
 import { Icon }  from 'mastodon/components/icon';
+import { enabledVisibilites } from 'mastodon/initial_state';
 
-import { IconButton } from '../../../components/icon_button';
+import { PrivacyDropdownMenu } from './privacy_dropdown_menu';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
-  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+  public_unlisted_short: { id: 'privacy.public_unlisted.short', defaultMessage: 'Local public' },
+  public_unlisted_long: { id: 'privacy.public_unlisted.long', defaultMessage: 'Visible for all without GTL' },
+  login_short: { id: 'privacy.login.short', defaultMessage: 'Login only' },
+  login_long: { id: 'privacy.login.long', defaultMessage: 'Login user only' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
+  limited_short: { id: 'privacy.limited.short', defaultMessage: 'Limited' },
+  mutual_short: { id: 'privacy.mutual.short', defaultMessage: 'Mutual' },
+  mutual_long: { id: 'privacy.mutual.long', defaultMessage: 'Mutual follows only' },
+  circle_short: { id: 'privacy.circle.short', defaultMessage: 'Circle' },
+  circle_long: { id: 'privacy.circle.long', defaultMessage: 'Circle members only' },
+  reply_short: { id: 'privacy.reply.short', defaultMessage: 'Reply' },
+  reply_long: { id: 'privacy.reply.long', defaultMessage: 'Reply to limited post' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Everyone mentioned in the post' },
+  banned_short: { id: 'privacy.banned.short', defaultMessage: 'No posting' },
+  banned_long: { id: 'privacy.banned.long', defaultMessage: 'All public range submissions are disabled. User settings need to be modified.' },
+  change_privacy: { id: 'privacy.change', defaultMessage: 'Change post privacy' },
+  unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
-const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
-
-class PrivacyDropdownMenu extends PureComponent {
-
-  static propTypes = {
-    style: PropTypes.object,
-    items: PropTypes.array.isRequired,
-    value: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChange: PropTypes.func.isRequired,
-  };
-
-  handleDocumentClick = e => {
-    if (this.node && !this.node.contains(e.target)) {
-      this.props.onClose();
-      e.stopPropagation();
-    }
-  };
-
-  handleKeyDown = e => {
-    const { items } = this.props;
-    const value = e.currentTarget.getAttribute('data-index');
-    const index = items.findIndex(item => {
-      return (item.value === value);
-    });
-    let element = null;
-
-    switch(e.key) {
-    case 'Escape':
-      this.props.onClose();
-      break;
-    case 'Enter':
-      this.handleClick(e);
-      break;
-    case 'ArrowDown':
-      element = this.node.childNodes[index + 1] || this.node.firstChild;
-      break;
-    case 'ArrowUp':
-      element = this.node.childNodes[index - 1] || this.node.lastChild;
-      break;
-    case 'Tab':
-      if (e.shiftKey) {
-        element = this.node.childNodes[index - 1] || this.node.lastChild;
-      } else {
-        element = this.node.childNodes[index + 1] || this.node.firstChild;
-      }
-      break;
-    case 'Home':
-      element = this.node.firstChild;
-      break;
-    case 'End':
-      element = this.node.lastChild;
-      break;
-    }
-
-    if (element) {
-      element.focus();
-      this.props.onChange(element.getAttribute('data-index'));
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  };
-
-  handleClick = e => {
-    const value = e.currentTarget.getAttribute('data-index');
-
-    e.preventDefault();
-
-    this.props.onClose();
-    this.props.onChange(value);
-  };
-
-  componentDidMount () {
-    document.addEventListener('click', this.handleDocumentClick, { capture: true });
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
-  }
-
-  componentWillUnmount () {
-    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
-    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
-  }
-
-  setRef = c => {
-    this.node = c;
-  };
-
-  setFocusRef = c => {
-    this.focusedItem = c;
-  };
-
-  render () {
-    const { style, items, value } = this.props;
-
-    return (
-      <div style={{ ...style }} role='listbox' ref={this.setRef}>
-        {items.map(item => (
-          <div role='option' tabIndex={0} key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
-            <div className='privacy-dropdown__option__icon'>
-              <Icon id={item.icon} icon={item.iconComponent} />
-            </div>
-
-            <div className='privacy-dropdown__option__content'>
-              <strong>{item.text}</strong>
-              {item.meta}
-            </div>
-          </div>
-        ))}
-      </div>
-    );
-  }
-
-}
-
 class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
@@ -152,6 +58,8 @@ class PrivacyDropdown extends PureComponent {
     value: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,
     noDirect: PropTypes.bool,
+    noLimited: PropTypes.bool,
+    replyToLimited: PropTypes.bool,
     container: PropTypes.func,
     disabled: PropTypes.bool,
     intl: PropTypes.object.isRequired,
@@ -226,16 +134,40 @@ class PrivacyDropdown extends PureComponent {
   UNSAFE_componentWillMount () {
     const { intl: { formatMessage } } = this.props;
 
-    this.options = [
-      { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
-      { icon: 'unlock', iconComponent: LockOpenIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
-      { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
+    this.dynamicOptions = [
+      { icon: 'reply', iconComponent: ReplyIcon, value: 'reply', text: formatMessage(messages.reply_short), meta: formatMessage(messages.reply_long), extra: formatMessage(messages.limited_short), extraIcomComponent: LimitedIcon },
+      { icon: 'ban', iconComponent: BlockIcon, value: 'banned', text: formatMessage(messages.banned_short), meta: formatMessage(messages.banned_long) },
     ];
 
-    if (!this.props.noDirect) {
-      this.options.push(
-        { icon: 'at', iconComponent: AlternateEmailIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
-      );
+    this.originalOptions = [
+      { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
+      { icon: 'cloud', iconComponent: PublicUnlistedIcon, value: 'public_unlisted', text: formatMessage(messages.public_unlisted_short), meta: formatMessage(messages.public_unlisted_long) },
+      { icon: 'key', iconComponent: LoginIcon, value: 'login', text: formatMessage(messages.login_short), meta: formatMessage(messages.login_long) },
+      { icon: 'unlock', iconComponent: QuietTimeIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long), extra: formatMessage(messages.unlisted_extra) },
+      { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
+      { icon: 'exchange', iconComponent: MutualIcon, value: 'mutual', text: formatMessage(messages.mutual_short), meta: formatMessage(messages.mutual_long), extra: formatMessage(messages.limited_short), extraIcomComponent: LimitedIcon },
+      { icon: 'user-circle', iconComponent: CircleIcon, value: 'circle', text: formatMessage(messages.circle_short), meta: formatMessage(messages.circle_long), extra: formatMessage(messages.limited_short), extraIcomComponent: LimitedIcon },
+      { icon: 'at', iconComponent: AlternateEmailIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+      ...this.dynamicOptions,
+    ];
+
+    this.options = [...this.originalOptions];
+
+    if (this.props.noDirect) {
+      this.options = this.options.filter((opt) => opt.value !== 'direct');
+    }
+
+    if (this.props.noLimited) {
+      this.options = this.options.filter((opt) => !['mutual', 'circle'].includes(opt.value));
+    }
+
+    if (enabledVisibilites) {
+      this.options = this.options.filter((opt) => enabledVisibilites.includes(opt.value));
+    }
+
+    if (this.options.length === 0) {
+      this.options.push(this.dynamicOptions.find((opt) => opt.value === 'banned'));
+      this.props.onChange('banned');
     }
   }
 
@@ -252,30 +184,38 @@ class PrivacyDropdown extends PureComponent {
   };
 
   render () {
-    const { value, container, disabled, intl } = this.props;
+    const { value, container, disabled, intl, replyToLimited } = this.props;
     const { open, placement } = this.state;
 
-    const valueOption = this.options.find(item => item.value === value);
+    if (replyToLimited) {
+      if (!this.options.some((op) => op.value === 'reply')) {
+        this.options.unshift(this.dynamicOptions.find((opt) => opt.value === 'reply'));
+      }
+    } else {
+      if (this.options.some((op) => op.value === 'reply')) {
+        this.options = this.options.filter((op) => op.value !== 'reply');
+      }
+    }
+
+    const valueOption = (disabled ? this.originalOptions : this.options).find(item => item.value === value) || this.options[0];
 
     return (
       <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
-        <IconButton
-          className='privacy-dropdown__value-icon'
-          icon={valueOption.icon}
-          iconComponent={valueOption.iconComponent}
+        <button
+          type='button'
           title={intl.formatMessage(messages.change_privacy)}
-          size={18}
-          expanded={open}
-          active={open}
-          inverted
+          aria-expanded={open}
           onClick={this.handleToggle}
           onMouseDown={this.handleMouseDown}
           onKeyDown={this.handleButtonKeyDown}
-          style={{ height: null, lineHeight: '27px' }}
           disabled={disabled}
-        />
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id={valueOption.icon} icon={valueOption.iconComponent} />
+          <span className='dropdown-button__label'>{valueOption.text}</span>
+        </button>
 
-        <Overlay show={open} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
new file mode 100644
index 0000000000..6cc676dc69
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown_menu.jsx
@@ -0,0 +1,128 @@
+import PropTypes from 'prop-types';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+export const PrivacyDropdownMenu = ({ style, items, value, onClose, onChange }) => {
+  const nodeRef = useRef(null);
+  const focusedItemRef = useRef(null);
+  const [currentValue, setCurrentValue] = useState(value);
+
+  const handleDocumentClick = useCallback((e) => {
+    if (nodeRef.current && !nodeRef.current.contains(e.target)) {
+      onClose();
+      e.stopPropagation();
+    }
+  }, [nodeRef, onClose]);
+
+  const handleClick = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    onClose();
+    onChange(value);
+  }, [onClose, onChange]);
+
+  const handleKeyDown = useCallback((e) => {
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => (item.value === value));
+
+    let element = null;
+
+    switch (e.key) {
+    case 'Escape':
+      onClose();
+      break;
+    case ' ':
+    case 'Enter':
+      handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      break;
+    case 'ArrowUp':
+      element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = nodeRef.current.childNodes[index + 1] || nodeRef.current.firstChild;
+      } else {
+        element = nodeRef.current.childNodes[index - 1] || nodeRef.current.lastChild;
+      }
+      break;
+    case 'Home':
+      element = nodeRef.current.firstChild;
+      break;
+    case 'End':
+      element = nodeRef.current.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      setCurrentValue(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  }, [nodeRef, items, onClose, handleClick, setCurrentValue]);
+
+  useEffect(() => {
+    document.addEventListener('click', handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+    focusedItemRef.current?.focus({ preventScroll: true });
+
+    return () => {
+      document.removeEventListener('click', handleDocumentClick, { capture: true });
+      document.removeEventListener('touchend', handleDocumentClick, listenerOptions);
+    };
+  }, [handleDocumentClick]);
+
+  return (
+    <ul style={{ ...style }} role='listbox' ref={nodeRef}>
+      {items.map(item => (
+        <li
+          role='option'
+          tabIndex={0}
+          key={item.value}
+          data-index={item.value}
+          onKeyDown={handleKeyDown}
+          onClick={handleClick}
+          className={classNames('privacy-dropdown__option', { active: item.value === currentValue })}
+          aria-selected={item.value === currentValue}
+          ref={item.value === currentValue ? focusedItemRef : null}
+        >
+          <div className='privacy-dropdown__option__icon'>
+            <Icon id={item.icon} icon={item.iconComponent} />
+          </div>
+
+          <div className='privacy-dropdown__option__content'>
+            <strong>{item.text}</strong>
+            {item.meta}
+          </div>
+
+          {item.extra && (
+            <div className='privacy-dropdown__option__additional' title={item.extra}>
+              <Icon id='info-circle' icon={item.extraIcomComponent ?? InfoIcon} />
+            </div>
+          )}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+PrivacyDropdownMenu.propTypes = {
+  style: PropTypes.object,
+  items: PropTypes.array.isRequired,
+  value: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+};
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index f16a37347c..b7959e211d 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -1,74 +1,48 @@
-import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
 
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
+export const ReplyIndicator = () => {
+  const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
+  const status = useSelector(state => state.getIn(['statuses', inReplyToId]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
 
-const messages = defineMessages({
-  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
-});
+  if (!status) {
+    return null;
+  }
 
-class ReplyIndicator extends ImmutablePureComponent {
+  const content = { __html: status.get('contentHtml') };
 
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithOptionalRouterPropTypes,
-  };
+  return (
+    <div className='reply-indicator'>
+      <div className='reply-indicator__line' />
 
-  handleClick = () => {
-    this.props.onCancel();
-  };
+      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+        <Avatar account={account} size={46} />
+      </Link>
 
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  render () {
-    const { status, intl } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    const content = { __html: status.get('contentHtml') };
-
-    return (
-      <div className='reply-indicator'>
-        <div className='reply-indicator__header'>
-          <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted /></div>
-
-          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
-            <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} />
-          </a>
-        </div>
+      <div className='reply-indicator__main'>
+        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+          <DisplayName account={account} />
+        </Link>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
 
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
+        {(status.get('poll') || status.get('media_attachments').size > 0) && (
+          <div className='reply-indicator__attachments'>
+            {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+            {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+          </div>
         )}
       </div>
-    );
-  }
-
-}
-
-export default withOptionalRouter(injectIntl(ReplyIndicator));
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 844958bab6..7c5c39f037 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -8,9 +8,9 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { domain, searchEnabled } from 'mastodon/initial_state';
 import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
@@ -62,14 +62,17 @@ class Search extends PureComponent {
   };
 
   defaultOptions = [
-    { label: <><mark>has:</mark> <FormattedList type='disjunction' value={['media', 'poll', 'embed']} /></>, action: e => { e.preventDefault(); this._insertText('has:'); } },
-    { label: <><mark>is:</mark> <FormattedList type='disjunction' value={['reply', 'sensitive']} /></>, action: e => { e.preventDefault(); this._insertText('is:'); } },
-    { label: <><mark>language:</mark> <FormattedMessage id='search_popout.language_code' defaultMessage='ISO language code' /></>, action: e => { e.preventDefault(); this._insertText('language:'); } },
-    { label: <><mark>from:</mark> <FormattedMessage id='search_popout.user' defaultMessage='user' /></>, action: e => { e.preventDefault(); this._insertText('from:'); } },
-    { label: <><mark>before:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('before:'); } },
-    { label: <><mark>during:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('during:'); } },
-    { label: <><mark>after:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('after:'); } },
-    { label: <><mark>in:</mark> <FormattedList type='disjunction' value={['all', 'library', 'public']} /></>, action: e => { e.preventDefault(); this._insertText('in:'); } }
+    { key: 'prompt-has', label: <><mark>has:</mark> <FormattedList type='disjunction' value={['media', 'poll', 'embed']} /></>, action: e => { e.preventDefault(); this._insertText('has:'); } },
+    { key: 'prompt-is', label: <><mark>is:</mark> <FormattedList type='disjunction' value={['reply', 'sensitive']} /></>, action: e => { e.preventDefault(); this._insertText('is:'); } },
+    { key: 'prompt-my', label: <><mark>my:</mark> <FormattedList type='disjunction' value={['favourited', 'bookmarked', 'boosted']} /></>, action: e => { e.preventDefault(); this._insertText('my:'); } },
+    { key: 'prompt-language', label: <><mark>language:</mark> <FormattedMessage id='search_popout.language_code' defaultMessage='ISO language code' /></>, action: e => { e.preventDefault(); this._insertText('language:'); } },
+    { key: 'prompt-from', label: <><mark>from:</mark> <FormattedMessage id='search_popout.user' defaultMessage='user' /></>, action: e => { e.preventDefault(); this._insertText('from:'); } },
+    { key: 'prompt-domain', label: <><mark>domain:</mark> <FormattedMessage id='search_popout.domain' defaultMessage='domain' /></>, action: e => { e.preventDefault(); this._insertText('domain:'); } },
+    { key: 'prompt-before', label: <><mark>before:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('before:'); } },
+    { key: 'prompt-during', label: <><mark>during:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('during:'); } },
+    { key: 'prompt-after', label: <><mark>after:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('after:'); } },
+    { key: 'prompt-in', label: <><mark>in:</mark> <FormattedList type='disjunction' value={['all', 'library', 'public']} /></>, action: e => { e.preventDefault(); this._insertText('in:'); } },
+    { key: 'prompt-order', label: <><mark>order:</mark> <FormattedList type='disjunction' value={['desc', 'asc']} /></>, action: e => { e.preventDefault(); this._insertText('order:'); } },
   ];
 
   setRef = c => {
@@ -262,6 +265,8 @@ class Search extends PureComponent {
     const { recent } = this.props;
 
     return recent.toArray().map(search => ({
+      key: `${search.get('type')}/${search.get('q')}`,
+
       label: labelForRecentSearch(search),
 
       action: () => this.handleRecentSearchClick(search),
@@ -346,8 +351,8 @@ class Search extends PureComponent {
               <h4><FormattedMessage id='search_popout.recent' defaultMessage='Recent searches' /></h4>
 
               <div className='search__popout__menu'>
-                {recent.size > 0 ? this._getOptions().map(({ label, action, forget }, i) => (
-                  <button key={label} onMouseDown={action} className={classNames('search__popout__menu__item search__popout__menu__item--flex', { selected: selectedOption === i })}>
+                {recent.size > 0 ? this._getOptions().map(({ label, key, action, forget }, i) => (
+                  <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item search__popout__menu__item--flex', { selected: selectedOption === i })}>
                     <span>{label}</span>
                     <button className='icon-button' onMouseDown={forget}><Icon id='times' icon={CloseIcon} /></button>
                   </button>
diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 8a63a01c89..6a482c8ec2 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -1,17 +1,16 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
+import { expandSearch } from 'mastodon/actions/search';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { SearchSection } from 'mastodon/features/explore/components/search_section';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
 import AccountContainer from '../../../containers/account_container';
@@ -27,67 +26,68 @@ const withoutLastResult = list => {
   }
 };
 
-class SearchResults extends ImmutablePureComponent {
+export const SearchResults = () => {
+  const results = useAppSelector((state) => state.getIn(['search', 'results']));
+  const isLoading = useAppSelector((state) => state.getIn(['search', 'isLoading']));
 
-  static propTypes = {
-    results: ImmutablePropTypes.map.isRequired,
-    expandSearch: PropTypes.func.isRequired,
-    searchTerm: PropTypes.string,
-  };
+  const dispatch = useAppDispatch();
 
-  handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
+  const handleLoadMoreAccounts = useCallback(() => {
+    dispatch(expandSearch('accounts'));
+  }, [dispatch]);
 
-  handleLoadMoreStatuses = () => this.props.expandSearch('statuses');
+  const handleLoadMoreStatuses = useCallback(() => {
+    dispatch(expandSearch('statuses'));
+  }, [dispatch]);
 
-  handleLoadMoreHashtags = () => this.props.expandSearch('hashtags');
+  const handleLoadMoreHashtags = useCallback(() => {
+    dispatch(expandSearch('hashtags'));
+  }, [dispatch]);
 
-  render () {
-    const { results } = this.props;
+  let accounts, statuses, hashtags;
 
-    let accounts, statuses, hashtags;
-
-    if (results.get('accounts') && results.get('accounts').size > 0) {
-      accounts = (
-        <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
-          {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
-          {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreAccounts} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('hashtags') && results.get('hashtags').size > 0) {
-      hashtags = (
-        <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
-          {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
-          {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreHashtags} />}
-        </SearchSection>
-      );
-    }
-
-    if (results.get('statuses') && results.get('statuses').size > 0) {
-      statuses = (
-        <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
-          {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
-          {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={this.handleLoadMoreStatuses} />}
-        </SearchSection>
-      );
-    }
-
-
-    return (
-      <div className='search-results'>
-        <div className='search-results__header'>
-          <Icon id='search' icon={SearchIcon} />
-          <FormattedMessage id='explore.search_results' defaultMessage='Search results' />
-        </div>
-
-        {accounts}
-        {hashtags}
-        {statuses}
-      </div>
+  if (results.get('accounts') && results.get('accounts').size > 0) {
+    accounts = (
+      <SearchSection title={<><Icon id='users' icon={PeopleIcon} /><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></>}>
+        {withoutLastResult(results.get('accounts')).map(accountId => <AccountContainer key={accountId} id={accountId} />)}
+        {(results.get('accounts').size > INITIAL_PAGE_LIMIT && results.get('accounts').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreAccounts} />}
+      </SearchSection>
     );
   }
 
-}
+  if (results.get('hashtags') && results.get('hashtags').size > 0) {
+    hashtags = (
+      <SearchSection title={<><Icon id='hashtag' icon={TagIcon} /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></>}>
+        {withoutLastResult(results.get('hashtags')).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+        {(results.get('hashtags').size > INITIAL_PAGE_LIMIT && results.get('hashtags').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreHashtags} />}
+      </SearchSection>
+    );
+  }
 
-export default SearchResults;
+  if (results.get('statuses') && results.get('statuses').size > 0) {
+    statuses = (
+      <SearchSection title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>}>
+        {withoutLastResult(results.get('statuses')).map(statusId => <StatusContainer key={statusId} id={statusId} />)}
+        {(results.get('statuses').size > INITIAL_PAGE_LIMIT && results.get('statuses').size % INITIAL_PAGE_LIMIT === 1) && <LoadMore visible onClick={handleLoadMoreStatuses} />}
+      </SearchSection>
+    );
+  }
+
+  return (
+    <div className='search-results'>
+      {!accounts && !hashtags && !statuses && (
+        isLoading ? (
+          <LoadingIndicator />
+        ) : (
+          <div className='empty-column-indicator'>
+            <FormattedMessage id='search_results.nothing_found' defaultMessage='Could not find anything for these search terms' />
+          </div>
+        )
+      )}
+      {accounts}
+      {hashtags}
+      {statuses}
+    </div>
+  );
+
+};
diff --git a/app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx b/app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx
new file mode 100644
index 0000000000..c298792a89
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx
@@ -0,0 +1,298 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { injectIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { supportsPassiveEvents } from 'detect-passive-events';
+import Overlay from 'react-overlays/Overlay';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+import { enabledVisibilites } from 'mastodon/initial_state';
+
+
+const messages = defineMessages({
+  public_short: { id: 'searchability.public.short', defaultMessage: 'Public' },
+  public_long: { id: 'searchability.public.long', defaultMessage: 'Anyone can find' },
+  public_unlisted_short: { id: 'searchability.public_unlisted.short', defaultMessage: 'Local public' },
+  public_unlisted_long: { id: 'searchability.public_unlisted.long', defaultMessage: 'Local users and followers can find' },
+  private_short: { id: 'searchability.unlisted.short', defaultMessage: 'Followers' },
+  private_long: { id: 'searchability.unlisted.long', defaultMessage: 'Your followers can find' },
+  direct_short: { id: 'searchability.private.short', defaultMessage: 'Reactionners' },
+  direct_long: { id: 'searchability.private.long', defaultMessage: 'Reacter of this post can find' },
+  limited_short: { id: 'searchability.direct.short', defaultMessage: 'Self only' },
+  limited_long: { id: 'searchability.direct.long', defaultMessage: 'Nobody can find, but you can' },
+  change_searchability: { id: 'searchability.change', defaultMessage: 'Set status searchability' },
+});
+
+const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
+
+class SearchabilityDropdownMenu extends PureComponent {
+
+  static propTypes = {
+    style: PropTypes.object,
+    items: PropTypes.array.isRequired,
+    value: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  handleDocumentClick = e => {
+    if (this.node && !this.node.contains(e.target)) {
+      this.props.onClose();
+      e.stopPropagation();
+    }
+  };
+
+  handleKeyDown = e => {
+    const { items } = this.props;
+    const value = e.currentTarget.getAttribute('data-index');
+    const index = items.findIndex(item => {
+      return (item.value === value);
+    });
+    let element = null;
+
+    switch(e.key) {
+    case 'Escape':
+      this.props.onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.node.childNodes[index + 1] || this.node.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.node.childNodes[index - 1] || this.node.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
+        element = this.node.childNodes[index - 1] || this.node.lastChild;
+      } else {
+        element = this.node.childNodes[index + 1] || this.node.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.node.firstChild;
+      break;
+    case 'End':
+      element = this.node.lastChild;
+      break;
+    }
+
+    if (element) {
+      element.focus();
+      this.props.onChange(element.getAttribute('data-index'));
+      e.preventDefault();
+      e.stopPropagation();
+    }
+  };
+
+  handleClick = e => {
+    const value = e.currentTarget.getAttribute('data-index');
+
+    e.preventDefault();
+
+    this.props.onClose();
+    this.props.onChange(value);
+  };
+
+  componentDidMount () {
+    document.addEventListener('click', this.handleDocumentClick, { capture: true });
+    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    if (this.focusedItem) this.focusedItem.focus({ preventScroll: true });
+  }
+
+  componentWillUnmount () {
+    document.removeEventListener('click', this.handleDocumentClick, { capture: true });
+    document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
+  }
+
+  setRef = c => {
+    this.node = c;
+  };
+
+  setFocusRef = c => {
+    this.focusedItem = c;
+  };
+
+  render () {
+    const { style, items, value } = this.props;
+
+    return (
+      <div style={{ ...style }} role='listbox' ref={this.setRef}>
+        {items.map(item => (
+          <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
+            <div className='privacy-dropdown__option__icon'>
+              <Icon id={item.icon} icon={item.iconComponent} fixedWidth />
+            </div>
+
+            <div className='privacy-dropdown__option__content'>
+              <strong>{item.text}</strong>
+              {item.meta}
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  }
+
+}
+
+class SearchabilityDropdown extends PureComponent {
+
+  static propTypes = {
+    isUserTouching: PropTypes.func,
+    onModalOpen: PropTypes.func,
+    onModalClose: PropTypes.func,
+    value: PropTypes.string.isRequired,
+    onChange: PropTypes.func.isRequired,
+    noDirect: PropTypes.bool,
+    container: PropTypes.func,
+    disabled: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: false,
+    placement: 'bottom',
+  };
+
+  handleToggle = () => {
+    if (this.props.isUserTouching && this.props.isUserTouching()) {
+      if (this.state.open) {
+        this.props.onModalClose();
+      } else {
+        this.props.onModalOpen({
+          actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
+          onClick: this.handleModalActionClick,
+        });
+      }
+    } else {
+      if (this.state.open && this.activeElement) {
+        this.activeElement.focus({ preventScroll: true });
+      }
+      this.setState({ open: !this.state.open });
+    }
+  };
+
+  handleModalActionClick = (e) => {
+    e.preventDefault();
+
+    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
+
+    this.props.onModalClose();
+    this.props.onChange(value);
+  };
+
+  handleKeyDown = e => {
+    switch(e.key) {
+    case 'Escape':
+      this.handleClose();
+      break;
+    }
+  };
+
+  handleMouseDown = () => {
+    if (!this.state.open) {
+      this.activeElement = document.activeElement;
+    }
+  };
+
+  handleButtonKeyDown = (e) => {
+    switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleMouseDown();
+      break;
+    }
+  };
+
+  handleClose = () => {
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
+    }
+    this.setState({ open: false });
+  };
+
+  handleChange = value => {
+    this.props.onChange(value);
+  };
+
+  UNSAFE_componentWillMount () {
+    const { intl: { formatMessage } } = this.props;
+
+    this.options = [
+      { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
+      { icon: 'cloud', iconComponent: PublicUnlistedIcon, value: 'public_unlisted', text: formatMessage(messages.public_unlisted_short), meta: formatMessage(messages.public_unlisted_long) },
+      { icon: 'unlock', iconComponent: LockOpenIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
+      { icon: 'lock', iconComponent: LockIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
+      { icon: 'at', iconComponent: AlternateEmailIcon, value: 'limited', text: formatMessage(messages.limited_short), meta: formatMessage(messages.limited_long) },
+    ];
+
+    if (!enabledVisibilites.includes('public_unlisted')) {
+      this.options = this.options.filter((opt) => opt.value !== 'public_unlisted');
+    }
+  }
+
+  setTargetRef = c => {
+    this.target = c;
+  };
+
+  findTarget = () => {
+    return this.target;
+  };
+
+  handleOverlayEnter = (state) => {
+    this.setState({ placement: state.placement });
+  };
+
+  render () {
+    const { value, container, disabled, intl } = this.props;
+    const { open, placement } = this.state;
+
+    const valueOption = this.options.find(item => item.value === value);
+
+    return (
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.change_searchability)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          disabled={disabled}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id={valueOption.icon} icon={valueOption.iconComponent} />
+          <span className='dropdown-button__label'>{valueOption.text}</span>
+        </button>
+
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+          {({ props, placement }) => (
+            <div {...props}>
+              <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
+                <SearchabilityDropdownMenu
+                  items={this.options}
+                  value={value}
+                  onClose={this.handleClose}
+                  onChange={this.handleChange}
+                />
+              </div>
+            </div>
+          )}
+        </Overlay>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(SearchabilityDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index cb31145e8d..7f6ef6cfd8 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -1,69 +1,81 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import classNames from 'classnames';
+
+import { useDispatch, useSelector } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
+import CloseIcon from '@/material-icons/400-20px/close.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { undoUploadCompose, initMediaEditModal } from 'mastodon/actions/compose';
+import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
+import Motion from 'mastodon/features/ui/util/optional_motion';
 
-import Motion from '../../ui/util/optional_motion';
+export const Upload = ({ id, onDragStart, onDragEnter, onDragEnd }) => {
+  const dispatch = useDispatch();
+  const media = useSelector(state => state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id));
+  const sensitive = useSelector(state => state.getIn(['compose', 'spoiler']));
 
-export default class Upload extends ImmutablePureComponent {
+  const handleUndoClick = useCallback(() => {
+    dispatch(undoUploadCompose(id));
+  }, [dispatch, id]);
 
-  static propTypes = {
-    media: ImmutablePropTypes.map.isRequired,
-    onUndo: PropTypes.func.isRequired,
-    onOpenFocalPoint: PropTypes.func.isRequired,
-  };
+  const handleFocalPointClick = useCallback(() => {
+    dispatch(initMediaEditModal(id));
+  }, [dispatch, id]);
 
-  handleUndoClick = e => {
-    e.stopPropagation();
-    this.props.onUndo(this.props.media.get('id'));
-  };
+  const handleDragStart = useCallback(() => {
+    onDragStart(id);
+  }, [onDragStart, id]);
 
-  handleFocalPointClick = e => {
-    e.stopPropagation();
-    this.props.onOpenFocalPoint(this.props.media.get('id'));
-  };
+  const handleDragEnter = useCallback(() => {
+    onDragEnter(id);
+  }, [onDragEnter, id]);
 
-  render () {
-    const { media } = this.props;
-
-    if (!media) {
-      return null;
-    }
-
-    const focusX = media.getIn(['meta', 'focus', 'x']);
-    const focusY = media.getIn(['meta', 'focus', 'y']);
-    const x = ((focusX /  2) + .5) * 100;
-    const y = ((focusY / -2) + .5) * 100;
-
-    return (
-      <div className='compose-form__upload'>
-        <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
-          {({ scale }) => (
-            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
-              <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button' onClick={this.handleUndoClick}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
-              </div>
-
-              {(media.get('description') || '').length === 0 && (
-                <div className='compose-form__upload__warning'>
-                  <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='info-circle' icon={InfoIcon} /> <FormattedMessage id='upload_form.description_missing' defaultMessage='No description added' /></button>
-                </div>
-              )}
-            </div>
-          )}
-        </Motion>
-      </div>
-    );
+  if (!media) {
+    return null;
   }
 
-}
+  const focusX = media.getIn(['meta', 'focus', 'x']);
+  const focusY = media.getIn(['meta', 'focus', 'y']);
+  const x = ((focusX /  2) + .5) * 100;
+  const y = ((focusY / -2) + .5) * 100;
+  const missingDescription = (media.get('description') || '').length === 0;
+
+  return (
+    <div className='compose-form__upload' draggable onDragStart={handleDragStart} onDragEnter={handleDragEnter} onDragEnd={onDragEnd}>
+      <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
+        {({ scale }) => (
+          <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+            {sensitive && <Blurhash
+              hash={media.get('blurhash')}
+              className='compose-form__upload__preview'
+            />}
+
+            <div className='compose-form__upload__actions'>
+              <button type='button' className='icon-button compose-form__upload__delete' onClick={handleUndoClick}><Icon icon={CloseIcon} /></button>
+              <button type='button' className='icon-button' onClick={handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+            </div>
+
+            <div className='compose-form__upload__warning'>
+              <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+            </div>
+          </div>
+        )}
+      </Motion>
+    </div>
+  );
+};
+
+Upload.propTypes = {
+  id: PropTypes.string,
+  onDragEnter: PropTypes.func,
+  onDragStart: PropTypes.func,
+  onDragEnd: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 090af86b27..20fb20f092 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,9 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
-
-import { IconButton } from '../../../components/icon_button';
+import PhotoLibraryIcon from '@/material-icons/400-20px/photo_library.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
@@ -31,7 +30,6 @@ class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     onSelectFile: PropTypes.func.isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
@@ -54,23 +52,20 @@ class UploadButton extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
 
     const message = intl.formatMessage(messages.upload);
 
     return (
       <div className='compose-form__upload-button'>
-        <IconButton icon='paperclip' iconComponent={AddPhotoAlternateIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <IconButton icon='paperclip' iconComponent={PhotoLibraryIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
         <label>
           <span style={{ display: 'none' }}>{message}</span>
           <input
             key={resetFileKey}
             ref={this.setRef}
             type='file'
+            name='file-upload-input'
             multiple
             accept={acceptContentTypes.toArray().join(',')}
             onChange={this.handleChange}
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.jsx b/app/javascript/mastodon/features/compose/components/upload_form.jsx
index cf2e53ad90..adf5591382 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_form.jsx
@@ -1,32 +1,53 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useRef, useCallback } from 'react';
 
-import SensitiveButtonContainer from '../containers/sensitive_button_container';
-import UploadContainer from '../containers/upload_container';
-import UploadProgressContainer from '../containers/upload_progress_container';
+import { useSelector, useDispatch } from 'react-redux';
 
-export default class UploadForm extends ImmutablePureComponent {
+import { changeMediaOrder } from 'mastodon/actions/compose';
 
-  static propTypes = {
-    mediaIds: ImmutablePropTypes.list.isRequired,
-  };
+import { Upload } from './upload';
+import { UploadProgress } from './upload_progress';
 
-  render () {
-    const { mediaIds } = this.props;
+export const UploadForm = () => {
+  const dispatch = useDispatch();
+  const mediaIds = useSelector(state => state.getIn(['compose', 'media_attachments']).map(item => item.get('id')));
+  const active = useSelector(state => state.getIn(['compose', 'is_uploading']));
+  const progress = useSelector(state => state.getIn(['compose', 'progress']));
+  const isProcessing = useSelector(state => state.getIn(['compose', 'is_processing']));
 
-    return (
-      <div className='compose-form__upload-wrapper'>
-        <UploadProgressContainer />
+  const dragItem = useRef();
+  const dragOverItem = useRef();
 
-        <div className='compose-form__uploads-wrapper'>
+  const handleDragStart = useCallback(id => {
+    dragItem.current = id;
+  }, [dragItem]);
+
+  const handleDragEnter = useCallback(id => {
+    dragOverItem.current = id;
+  }, [dragOverItem]);
+
+  const handleDragEnd = useCallback(() => {
+    dispatch(changeMediaOrder(dragItem.current, dragOverItem.current));
+    dragItem.current = null;
+    dragOverItem.current = null;
+  }, [dispatch, dragItem, dragOverItem]);
+
+  return (
+    <>
+      <UploadProgress active={active} progress={progress} isProcessing={isProcessing} />
+
+      {mediaIds.size > 0 && (
+        <div className='compose-form__uploads'>
           {mediaIds.map(id => (
-            <UploadContainer id={id} key={id} />
+            <Upload
+              key={id}
+              id={id}
+              onDragStart={handleDragStart}
+              onDragEnter={handleDragEnter}
+              onDragEnd={handleDragEnd}
+            />
           ))}
         </div>
-
-        {!mediaIds.isEmpty() && <SensitiveButtonContainer />}
-      </div>
-    );
-  }
-
-}
+      )}
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index 8ed09b36ba..fd0c8f4530 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -1,57 +1,48 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
 import spring from 'react-motion/lib/spring';
 
-import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
+import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
 
-export default class UploadProgress extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    progress: PropTypes.number,
-    isProcessing: PropTypes.bool,
-  };
-
-  render () {
-    const { active, progress, isProcessing } = this.props;
-
-    if (!active) {
-      return null;
-    }
-
-    let message;
-
-    if (isProcessing) {
-      message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
-    } else {
-      message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
-    }
-
-    return (
-      <div className='upload-progress'>
-        <div className='upload-progress__icon'>
-          <Icon id='upload' icon={UploadFileIcon} />
-        </div>
-
-        <div className='upload-progress__message'>
-          {message}
-
-          <div className='upload-progress__backdrop'>
-            <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
-              {({ width }) =>
-                <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
-              }
-            </Motion>
-          </div>
-        </div>
-      </div>
-    );
+export const UploadProgress = ({ active, progress, isProcessing }) => {
+  if (!active) {
+    return null;
   }
 
-}
+  let message;
+
+  if (isProcessing) {
+    message = <FormattedMessage id='upload_progress.processing' defaultMessage='Processing…' />;
+  } else {
+    message = <FormattedMessage id='upload_progress.label' defaultMessage='Uploading…' />;
+  }
+
+  return (
+    <div className='upload-progress'>
+      <Icon id='upload' icon={UploadFileIcon} />
+
+      <div className='upload-progress__message'>
+        {message}
+
+        <div className='upload-progress__backdrop'>
+          <Motion defaultStyle={{ width: 0 }} style={{ width: spring(progress) }}>
+            {({ width }) =>
+              <div className='upload-progress__tracker' style={{ width: `${width}%` }} />
+            }
+          </Motion>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+UploadProgress.propTypes = {
+  active: PropTypes.bool,
+  progress: PropTypes.number,
+  isProcessing: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js
new file mode 100644
index 0000000000..9fd911af56
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js
@@ -0,0 +1,33 @@
+import { connect } from 'react-redux';
+
+import { changeCircle } from '../../../actions/compose';
+import { openModal, closeModal } from '../../../actions/modal';
+import { isUserTouching } from '../../../is_mobile';
+import CircleDropdown from '../components/circle_dropdown';
+
+const mapStateToProps = state => ({
+  unavailable: state.getIn(['compose', 'privacy']) !== 'circle' || !!state.getIn(['compose', 'id']),
+  value: state.getIn(['compose', 'searchability']),
+  circles: state.get('circles'),
+  circleId: state.getIn(['compose', 'circle_id']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onChange (circleId) {
+    dispatch(changeCircle(circleId));
+  },
+
+  isUserTouching,
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(CircleDropdown);
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index ba20698bac..ae2759a93d 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -8,6 +8,8 @@ import {
   selectComposeSuggestion,
   changeComposeSpoilerText,
   insertEmojiCompose,
+  insertExpirationCompose,
+  insertFeaturedTagCompose,
   uploadCompose,
 } from '../../../actions/compose';
 import ComposeForm from '../components/compose_form';
@@ -17,6 +19,7 @@ const mapStateToProps = state => ({
   suggestions: state.getIn(['compose', 'suggestions']),
   spoiler: state.getIn(['compose', 'spoiler']),
   spoilerText: state.getIn(['compose', 'spoiler_text']),
+  markdown: state.getIn(['compose', 'markdown']),
   privacy: state.getIn(['compose', 'privacy']),
   focusDate: state.getIn(['compose', 'focusDate']),
   caretPosition: state.getIn(['compose', 'caretPosition']),
@@ -28,6 +31,8 @@ const mapStateToProps = state => ({
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),
+  circleId: state.getIn(['compose', 'circle_id']),
+  maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -64,6 +69,14 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertEmojiCompose(position, data, needsSpace));
   },
 
+  onPickExpiration (position, data) {
+    dispatch(insertExpirationCompose(position, data));
+  },
+
+  onPickFeaturedTag (position, data) {
+    dispatch(insertFeaturedTagCompose(position, data));
+  },
+
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 8cf906b20a..786d63cea9 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -1,12 +1,17 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { Map as ImmutableMap } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
 
+import { isHideItem } from 'mastodon/initial_state';
+
 import { useEmoji } from '../../../actions/emojis';
 import { changeSetting } from '../../../actions/settings';
+import { unicodeMapping } from '../../emoji/emoji_unicode_mapping_light';
 import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
 
+
+
 const perLine = 8;
 const lines   = 2;
 
@@ -29,21 +34,45 @@ const DEFAULTS = [
   'ok_hand',
 ];
 
-const getFrequentlyUsedEmojis = createSelector([
-  state => state.getIn(['settings', 'frequentlyUsedEmojis'], ImmutableMap()),
-], emojiCounters => {
-  let emojis = emojiCounters
-    .keySeq()
-    .sort((a, b) => emojiCounters.get(a) - emojiCounters.get(b))
-    .reverse()
-    .slice(0, perLine * lines)
-    .toArray();
+const RECENT_SIZE = DEFAULTS.length;
 
-  if (emojis.length < DEFAULTS.length) {
-    let uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji));
-    emojis = emojis.concat(uniqueDefaults.slice(0, DEFAULTS.length - emojis.length));
+const getFrequentlyUsedEmojis = createSelector([
+  state => { return {
+    emojiCounters: state.getIn(['settings', 'frequentlyUsedEmojis'], ImmutableMap()),
+    reactionDeck: state.get('reaction_deck', ImmutableList()),
+  }; },
+], data => {
+  const { emojiCounters, reactionDeck } = data;
+
+  let deckEmojis = reactionDeck
+    .toArray()
+    .map((e) => e.get('name'))
+    .filter((e) => e)
+    .map((e) => unicodeMapping[e] ? unicodeMapping[e].shortCode : e);
+  deckEmojis = [...new Set(deckEmojis)];
+
+  let emojis;
+  if (!isHideItem('recent_emojis')) {
+    emojis = emojiCounters
+      .keySeq()
+      .filter((ee) => deckEmojis.indexOf(ee) < 0)
+      .sort((a, b) => emojiCounters.get(a) - emojiCounters.get(b))
+      .reverse()
+      .slice(0, perLine * lines)
+      .toArray();
+
+    if (emojis.length < RECENT_SIZE) {
+      let uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji));
+      emojis = emojis.concat(uniqueDefaults.slice(0, RECENT_SIZE - emojis.length));
+    }
+  } else {
+    emojis = [];
   }
 
+  emojis = deckEmojis.concat(emojis);
+
+  if (emojis.length <= 0) emojis = ['+1'];
+
   return emojis;
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/expiration_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/expiration_dropdown_container.js
new file mode 100644
index 0000000000..afe5991ee8
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/expiration_dropdown_container.js
@@ -0,0 +1,30 @@
+import { connect } from 'react-redux';
+
+import { openModal, closeModal } from '../../../actions/modal';
+import { isUserTouching } from '../../../is_mobile';
+import ExpirationDropdown from '../components/expiration_dropdown';
+
+const mapStateToProps = () => ({
+});
+
+const mapDispatchToProps = (dispatch, { onPickExpiration }) => ({
+
+  onChange (value) {
+    if (onPickExpiration) {
+      onPickExpiration(value);
+    }
+  },
+
+  isUserTouching,
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ExpirationDropdown);
diff --git a/app/javascript/mastodon/features/compose/containers/featured_tags_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/featured_tags_dropdown_container.js
new file mode 100644
index 0000000000..c43e0a4e70
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/featured_tags_dropdown_container.js
@@ -0,0 +1,30 @@
+import { connect } from 'react-redux';
+
+import { openModal, closeModal } from '../../../actions/modal';
+import { isUserTouching } from '../../../is_mobile';
+import FeaturedTagsDropdown from '../components/featured_tags_dropdown';
+
+const mapStateToProps = () => ({
+});
+
+const mapDispatchToProps = (dispatch, { onPickTag }) => ({
+
+  onChange (value) {
+    if (onPickTag) {
+      onPickTag(value);
+    }
+  },
+
+  isUserTouching,
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(FeaturedTagsDropdown);
diff --git a/app/javascript/mastodon/features/compose/containers/markdown_button_container.js b/app/javascript/mastodon/features/compose/containers/markdown_button_container.js
new file mode 100644
index 0000000000..9819012e0d
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/markdown_button_container.js
@@ -0,0 +1,32 @@
+import { injectIntl, defineMessages } from 'react-intl';
+
+import { connect } from 'react-redux';
+
+import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
+
+import { changeComposeMarkdown } from '../../../actions/compose';
+
+const messages = defineMessages({
+  marked: { id: 'compose_form.markdown.marked', defaultMessage: 'Markdown is enabled' },
+  unmarked: { id: 'compose_form.markdown.unmarked', defaultMessage: 'Markdown is disabled' },
+});
+
+const mapStateToProps = (state, { intl }) => ({
+  iconComponent: MarkdownIcon,
+  title: intl.formatMessage(state.getIn(['compose', 'markdown']) ? messages.marked : messages.unmarked),
+  active: state.getIn(['compose', 'markdown']),
+  ariaControls: 'cw-markdown-input',
+  size: 18,
+  inverted: true,
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onClick () {
+    dispatch(changeComposeMarkdown());
+  },
+
+});
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
deleted file mode 100644
index 70b4026d14..0000000000
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect }   from 'react-redux';
-
-import { openModal } from 'mastodon/actions/modal';
-import { logOut } from 'mastodon/utils/log_out';
-
-import { me } from '../../../initial_state';
-import NavigationBar from '../components/navigation_bar';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['accounts', me]),
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar));
diff --git a/app/javascript/mastodon/features/compose/containers/poll_button_container.js b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
index b7785ecbb4..8c8828868c 100644
--- a/app/javascript/mastodon/features/compose/containers/poll_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
@@ -4,7 +4,7 @@ import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
 const mapStateToProps = state => ({
-  unavailable: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+  disabled: false,
   active: state.getIn(['compose', 'poll']) !== null,
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/poll_form_container.js b/app/javascript/mastodon/features/compose/containers/poll_form_container.js
deleted file mode 100644
index 177ffcea6a..0000000000
--- a/app/javascript/mastodon/features/compose/containers/poll_form_container.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  addPollOption,
-  removePollOption,
-  changePollOption,
-  changePollSettings,
-  clearComposeSuggestions,
-  fetchComposeSuggestions,
-  selectComposeSuggestion,
-} from '../../../actions/compose';
-import PollForm from '../components/poll_form';
-
-const mapStateToProps = state => ({
-  suggestions: state.getIn(['compose', 'suggestions']),
-  options: state.getIn(['compose', 'poll', 'options']),
-  lang: state.getIn(['compose', 'language']),
-  expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
-  isMultiple: state.getIn(['compose', 'poll', 'multiple']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onAddOption(title) {
-    dispatch(addPollOption(title));
-  },
-
-  onRemoveOption(index) {
-    dispatch(removePollOption(index));
-  },
-
-  onChangeOption(index, title) {
-    dispatch(changePollOption(index, title));
-  },
-
-  onChangeSettings(expiresIn, isMultiple) {
-    dispatch(changePollSettings(expiresIn, isMultiple));
-  },
-
-  onClearSuggestions () {
-    dispatch(clearComposeSuggestions());
-  },
-
-  onFetchSuggestions (token) {
-    dispatch(fetchComposeSuggestions(token));
-  },
-
-  onSuggestionSelected (position, token, accountId, path) {
-    dispatch(selectComposeSuggestion(position, token, accountId, path));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
diff --git a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
index 6d26abf4f6..bffbc059c8 100644
--- a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
@@ -7,6 +7,7 @@ import PrivacyDropdown from '../components/privacy_dropdown';
 
 const mapStateToProps = state => ({
   value: state.getIn(['compose', 'privacy']),
+  replyToLimited: state.getIn(['compose', 'reply_to_limited']),
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -16,11 +17,11 @@ const mapDispatchToProps = dispatch => ({
   },
 
   isUserTouching,
-  onModalOpen: props => dispatch(openModal({
+  onModalOpen: props => dispatch(openModal({  // kmyblue: Do not remove
     modalType: 'ACTIONS',
     modalProps: props,
   })),
-  onModalClose: () => dispatch(closeModal({
+  onModalClose: () => dispatch(closeModal({  // kmyblue: Do not remove
     modalType: undefined,
     ignoreFocus: false,
   })),
diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
deleted file mode 100644
index 1147e448af..0000000000
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelReplyCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import ReplyIndicator from '../components/reply_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => {
-    let statusId = state.getIn(['compose', 'id'], null);
-    let editing  = true;
-
-    if (statusId === null) {
-      statusId = state.getIn(['compose', 'in_reply_to']);
-      editing  = false;
-    }
-
-    return {
-      status: getStatus(state, { id: statusId }),
-      editing,
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelReplyCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/javascript/mastodon/features/compose/containers/search_container.js b/app/javascript/mastodon/features/compose/containers/search_container.js
index 758b6b07db..616b91369c 100644
--- a/app/javascript/mastodon/features/compose/containers/search_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_container.js
@@ -1,3 +1,4 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { connect } from 'react-redux';
 
 import {
@@ -12,10 +13,15 @@ import {
 
 import Search from '../components/search';
 
+const getRecentSearches = createSelector(
+  state => state.getIn(['search', 'recent']),
+  recent => recent.reverse(),
+);
+
 const mapStateToProps = state => ({
   value: state.getIn(['search', 'value']),
   submitted: state.getIn(['search', 'submitted']),
-  recent: state.getIn(['search', 'recent']).reverse(),
+  recent: getRecentSearches(state),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js
deleted file mode 100644
index 54c2af3177..0000000000
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandSearch } from 'mastodon/actions/search';
-import { fetchSuggestions, dismissSuggestion } from 'mastodon/actions/suggestions';
-
-import SearchResults from '../components/search_results';
-
-const mapStateToProps = state => ({
-  results: state.getIn(['search', 'results']),
-  suggestions: state.getIn(['suggestions', 'items']),
-  searchTerm: state.getIn(['search', 'searchTerm']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  fetchSuggestions: () => dispatch(fetchSuggestions()),
-  expandSearch: type => dispatch(expandSearch(type)),
-  dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/mastodon/features/compose/containers/searchability_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/searchability_dropdown_container.js
new file mode 100644
index 0000000000..09c666cea0
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/containers/searchability_dropdown_container.js
@@ -0,0 +1,30 @@
+import { connect } from 'react-redux';
+
+import { changeComposeSearchability } from '../../../actions/compose';
+import { openModal, closeModal } from '../../../actions/modal';
+import { isUserTouching } from '../../../is_mobile';
+import SearchabilityDropdown from '../components/searchability_dropdown';
+
+const mapStateToProps = state => ({
+  value: state.getIn(['compose', 'searchability']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onChange (value) {
+    dispatch(changeComposeSearchability(value));
+  },
+
+  isUserTouching,
+  onModalOpen: props => dispatch(openModal({
+    modalType: 'ACTIONS',
+    modalProps: props,
+  })),
+  onModalClose: () => dispatch(closeModal({
+    modalType: undefined,
+    ignoreFocus: false,
+  })),
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(SearchabilityDropdown);
diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
deleted file mode 100644
index 18283ee98d..0000000000
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { changeComposeSensitivity } from 'mastodon/actions/compose';
-
-const messages = defineMessages({
-  marked: {
-    id: 'compose_form.sensitive.marked',
-    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
-  },
-  unmarked: {
-    id: 'compose_form.sensitive.unmarked',
-    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
-  },
-});
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'sensitive']),
-  disabled: state.getIn(['compose', 'spoiler']),
-  mediaCount: state.getIn(['compose', 'media_attachments']).size,
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onClick () {
-    dispatch(changeComposeSensitivity());
-  },
-
-});
-
-class SensitiveButton extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    disabled: PropTypes.bool,
-    mediaCount: PropTypes.number,
-    onClick: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { active, disabled, mediaCount, onClick, intl } = this.props;
-
-    return (
-      <div className='compose-form__sensitive-button'>
-        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
-          <input
-            name='mark-sensitive'
-            type='checkbox'
-            checked={active}
-            onChange={onClick}
-            disabled={disabled}
-          />
-
-          <FormattedMessage
-            id='compose_form.sensitive.hide'
-            defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
-            values={{ count: mediaCount }}
-          />
-        </label>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SensitiveButton));
diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
index b3d7a71335..9acc43437b 100644
--- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
@@ -2,8 +2,10 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import WarningIcon from '@/material-icons/400-20px/warning.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
+
 import { changeComposeSpoilerness } from '../../../actions/compose';
-import TextIconButton from '../components/text_icon_button';
 
 const messages = defineMessages({
   marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
@@ -11,10 +13,12 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = (state, { intl }) => ({
-  label: 'CW',
+  iconComponent: WarningIcon,
   title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
   active: state.getIn(['compose', 'spoiler']),
   ariaControls: 'cw-spoiler-input',
+  size: 18,
+  inverted: true,
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -25,4 +29,4 @@ const mapDispatchToProps = dispatch => ({
 
 });
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 42195da617..8901a0e54c 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -3,15 +3,23 @@ import { connect } from 'react-redux';
 import { uploadCompose } from '../../../actions/compose';
 import UploadButton from '../components/upload_button';
 
-const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  unavailable: state.getIn(['compose', 'poll']) !== null,
-  resetFileKey: state.getIn(['compose', 'resetFileKey']),
-});
+const mapStateToProps = state => {
+  const isUploading = state.getIn(['compose', 'is_uploading']);
+  const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
+  const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
+  const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
+  const isOverLimit = attachmentsSize > 3;
+  const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
+
+  return {
+    disabled: isUploading || isOverLimit || hasVideoOrAudio,
+    resetFileKey: state.getIn(['compose', 'resetFileKey']),
+  };
+};
 
 const mapDispatchToProps = dispatch => ({
 
-  onSelectFile (files) {
+  onSelectFile(files) {
     dispatch(uploadCompose(files));
   },
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js
deleted file mode 100644
index 77bb90db87..0000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_container.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { connect } from 'react-redux';
-
-import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose';
-import Upload from '../components/upload';
-
-const mapStateToProps = (state, { id }) => ({
-  media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onUndo: id => {
-    dispatch(undoUploadCompose(id));
-  },
-
-  onOpenFocalPoint: id => {
-    dispatch(initMediaEditModal(id));
-  },
-
-  onSubmit (router) {
-    dispatch(submitCompose(router));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Upload);
diff --git a/app/javascript/mastodon/features/compose/containers/upload_form_container.js b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
deleted file mode 100644
index 336525cf53..0000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_form_container.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadForm from '../components/upload_form';
-
-const mapStateToProps = state => ({
-  mediaIds: state.getIn(['compose', 'media_attachments']).map(item => item.get('id')),
-});
-
-export default connect(mapStateToProps)(UploadForm);
diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
deleted file mode 100644
index ffff321c3f..0000000000
--- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { connect } from 'react-redux';
-
-import UploadProgress from '../components/upload_progress';
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'is_uploading']),
-  progress: state.getIn(['compose', 'progress']),
-  isProcessing: state.getIn(['compose', 'is_processing']),
-});
-
-export default connect(mapStateToProps)(UploadProgress);
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.jsx b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
index 7a212342c7..bc74d1209b 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.jsx
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
@@ -6,16 +6,20 @@ import { connect } from 'react-redux';
 
 import { me } from 'mastodon/initial_state';
 import { HASHTAG_PATTERN_REGEX } from 'mastodon/utils/hashtags';
+import { MENTION_PATTERN_REGEX } from 'mastodon/utils/mentions';
 
 import Warning from '../components/warning';
 
 const mapStateToProps = state => ({
   needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
-  hashtagWarning: state.getIn(['compose', 'privacy']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
+  hashtagWarning: !['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
   directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
+  searchabilityWarning: state.getIn(['compose', 'searchability']) === 'limited',
+  mentionWarning: ['mutual', 'circle', 'limited'].includes(state.getIn(['compose', 'privacy'])) && MENTION_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
+  limitedPostWarning: ['mutual', 'circle'].includes(state.getIn(['compose', 'privacy'])) && !state.getIn(['compose', 'limited_scope']),
 });
 
-const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning }) => {
+const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning, searchabilityWarning, mentionWarning, limitedPostWarning }) => {
   if (needsLockWarning) {
     return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href='/settings/profile'><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
   }
@@ -34,6 +38,18 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
     return <Warning message={message} />;
   }
 
+  if (searchabilityWarning) {
+    return <Warning message={<FormattedMessage id='compose_form.searchability_warning' defaultMessage='Self only searchability is not available other mastodon servers. Others can search your post.' />} />;
+  }
+
+  if (mentionWarning) {
+    return <Warning message={<FormattedMessage id='compose_form.mention_warning' defaultMessage='When you add a mention to a limited post, the person you are mentioning can also see this post.' />} />;
+  }
+
+  if (limitedPostWarning) {
+    return <Warning message={<FormattedMessage id='compose_form.limited_post_warning' defaultMessage='Limited posts are NOT reached Misskey, normal Mastodon or so on.' />} />;
+  }
+
   return null;
 };
 
@@ -41,6 +57,9 @@ WarningWrapper.propTypes = {
   needsLockWarning: PropTypes.bool,
   hashtagWarning: PropTypes.bool,
   directMessageWarning: PropTypes.bool,
+  searchabilityWarning: PropTypes.bool,
+  mentionWarning: PropTypes.bool,
+  limitedPostWarning: PropTypes.bool,
 };
 
 export default connect(mapStateToProps)(WarningWrapper);
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index a19ae71e8e..83c741fd19 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -11,13 +11,13 @@ import { connect } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import LogoutIcon from 'mastodon/../material-icons/400-24px/logout.svg?react';
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import Column from 'mastodon/components/column';
 import { Icon }  from 'mastodon/components/icon';
@@ -29,10 +29,9 @@ import { mascot } from '../../initial_state';
 import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
+import { SearchResults } from './components/search_results';
 import ComposeFormContainer from './containers/compose_form_container';
-import NavigationContainer from './containers/navigation_container';
 import SearchContainer from './containers/search_container';
-import SearchResultsContainer from './containers/search_results_container';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -129,8 +128,6 @@ class Compose extends PureComponent {
 
           <div className='drawer__pager'>
             <div className='drawer__inner' onFocus={this.onFocus}>
-              <NavigationContainer onClose={this.onBlur} />
-
               <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
               <div className='drawer__inner__mastodon'>
@@ -141,7 +138,7 @@ class Compose extends PureComponent {
             <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
               {({ x }) => (
                 <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
-                  <SearchResultsContainer />
+                  <SearchResults />
                 </div>
               )}
             </Motion>
@@ -152,7 +149,6 @@ class Compose extends PureComponent {
 
     return (
       <Column onFocus={this.onFocus}>
-        <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer />
 
         <Helmet>
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 9ae95dabe9..3af89f9974 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -1,17 +1,24 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 
+import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
+
 
 import { HotKeys } from 'react-hotkeys';
 
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { replyCompose } from 'mastodon/actions/compose';
+import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
+import { openModal } from 'mastodon/actions/modal';
+import { muteStatus, unmuteStatus, revealStatus, hideStatus } from 'mastodon/actions/statuses';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -19,7 +26,7 @@ import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import StatusContent from 'mastodon/components/status_content';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import { autoPlayGif } from 'mastodon/initial_state';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+import { makeGetStatus } from 'mastodon/selectors';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -29,25 +36,31 @@ const messages = defineMessages({
   delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
-class Conversation extends ImmutablePureComponent {
+const getAccounts = createSelector(
+  (state) => state.get('accounts'),
+  (_, accountIds) => accountIds,
+  (accounts, accountIds) =>
+    accountIds.map(id => accounts.get(id))
+);
 
-  static propTypes = {
-    conversationId: PropTypes.string.isRequired,
-    accounts: ImmutablePropTypes.list.isRequired,
-    lastStatus: ImmutablePropTypes.map,
-    unread:PropTypes.bool.isRequired,
-    scrollKey: PropTypes.string,
-    onMoveUp: PropTypes.func,
-    onMoveDown: PropTypes.func,
-    markRead: PropTypes.func.isRequired,
-    delete: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
+const getStatus = makeGetStatus();
 
-  handleMouseEnter = ({ currentTarget }) => {
+export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown }) => {
+  const id = conversation.get('id');
+  const unread = conversation.get('unread');
+  const lastStatusId = conversation.get('last_status');
+  const accountIds = conversation.get('accounts');
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const history = useHistory();
+  const lastStatus = useSelector(state => getStatus(state, { id: lastStatusId }));
+  const accounts = useSelector(state => getAccounts(state, accountIds));
+
+  const handleMouseEnter = useCallback(({ currentTarget }) => {
     if (autoPlayGif) {
       return;
     }
@@ -58,9 +71,9 @@ class Conversation extends ImmutablePureComponent {
       let emoji = emojis[i];
       emoji.src = emoji.getAttribute('data-original');
     }
-  };
+  }, []);
 
-  handleMouseLeave = ({ currentTarget }) => {
+  const handleMouseLeave = useCallback(({ currentTarget }) => {
     if (autoPlayGif) {
       return;
     }
@@ -71,136 +84,161 @@ class Conversation extends ImmutablePureComponent {
       let emoji = emojis[i];
       emoji.src = emoji.getAttribute('data-static');
     }
-  };
-
-  handleClick = () => {
-    if (!this.props.history) {
-      return;
-    }
-
-    const { lastStatus, unread, markRead } = this.props;
+  }, []);
 
+  const handleClick = useCallback(() => {
     if (unread) {
-      markRead();
+      dispatch(markConversationRead(id));
     }
 
-    this.props.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
-  };
+    history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
+  }, [dispatch, history, unread, id, lastStatus]);
 
-  handleMarkAsRead = () => {
-    this.props.markRead();
-  };
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markConversationRead(id));
+  }, [dispatch, id]);
 
-  handleReply = () => {
-    this.props.reply(this.props.lastStatus, this.props.history);
-  };
+  const handleReply = useCallback(() => {
+    dispatch((_, getState) => {
+      let state = getState();
 
-  handleDelete = () => {
-    this.props.delete();
-  };
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: intl.formatMessage(messages.replyMessage),
+            confirm: intl.formatMessage(messages.replyConfirm),
+            onConfirm: () => dispatch(replyCompose(lastStatus, history)),
+          },
+        }));
+      } else {
+        dispatch(replyCompose(lastStatus, history));
+      }
+    });
+  }, [dispatch, lastStatus, history, intl]);
 
-  handleHotkeyMoveUp = () => {
-    this.props.onMoveUp(this.props.conversationId);
-  };
+  const handleDelete = useCallback(() => {
+    dispatch(deleteConversation(id));
+  }, [dispatch, id]);
 
-  handleHotkeyMoveDown = () => {
-    this.props.onMoveDown(this.props.conversationId);
-  };
+  const handleHotkeyMoveUp = useCallback(() => {
+    onMoveUp(id);
+  }, [id, onMoveUp]);
 
-  handleConversationMute = () => {
-    this.props.onMute(this.props.lastStatus);
-  };
+  const handleHotkeyMoveDown = useCallback(() => {
+    onMoveDown(id);
+  }, [id, onMoveDown]);
 
-  handleShowMore = () => {
-    this.props.onToggleHidden(this.props.lastStatus);
-  };
-
-  render () {
-    const { accounts, lastStatus, unread, scrollKey, intl } = this.props;
-
-    if (lastStatus === null) {
-      return null;
+  const handleConversationMute = useCallback(() => {
+    if (lastStatus.get('muted')) {
+      dispatch(unmuteStatus(lastStatus.get('id')));
+    } else {
+      dispatch(muteStatus(lastStatus.get('id')));
     }
+  }, [dispatch, lastStatus]);
 
-    const menu = [
-      { text: intl.formatMessage(messages.open), action: this.handleClick },
-      null,
-    ];
-
-    menu.push({ text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMute });
-
-    if (unread) {
-      menu.push({ text: intl.formatMessage(messages.markAsRead), action: this.handleMarkAsRead });
-      menu.push(null);
+  const handleShowMore = useCallback(() => {
+    if (lastStatus.get('hidden')) {
+      dispatch(revealStatus(lastStatus.get('id')));
+    } else {
+      dispatch(hideStatus(lastStatus.get('id')));
     }
+  }, [dispatch, lastStatus]);
 
-    menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
+  if (!lastStatus) {
+    return null;
+  }
 
-    const names = accounts.map(a => <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Link>).reduce((prev, cur) => [prev, ', ', cur]);
+  const menu = [
+    { text: intl.formatMessage(messages.open), action: handleClick },
+    null,
+    { text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: handleConversationMute },
+  ];
 
-    const handlers = {
-      reply: this.handleReply,
-      open: this.handleClick,
-      moveUp: this.handleHotkeyMoveUp,
-      moveDown: this.handleHotkeyMoveDown,
-      toggleHidden: this.handleShowMore,
-    };
+  if (unread) {
+    menu.push({ text: intl.formatMessage(messages.markAsRead), action: handleMarkAsRead });
+    menu.push(null);
+  }
 
-    return (
-      <HotKeys handlers={handlers}>
-        <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
-          <div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
-            <AvatarComposite accounts={accounts} size={48} />
-          </div>
+  menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
-          <div className='conversation__content'>
-            <div className='conversation__content__info'>
-              <div className='conversation__content__relative-time'>
-                {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
-              </div>
+  const names = accounts.map(a => (
+    <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}>
+      <bdi>
+        <strong
+          className='display-name__html'
+          dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
+        />
+      </bdi>
+    </Link>
+  )).reduce((prev, cur) => [prev, ', ', cur]);
 
-              <div className='conversation__content__names' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-                <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
-              </div>
+  const handlers = {
+    reply: handleReply,
+    open: handleClick,
+    moveUp: handleHotkeyMoveUp,
+    moveDown: handleHotkeyMoveDown,
+    toggleHidden: handleShowMore,
+  };
+
+  return (
+    <HotKeys handlers={handlers}>
+      <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
+        <div className='conversation__avatar' onClick={handleClick} role='presentation'>
+          <AvatarComposite accounts={accounts} size={48} />
+        </div>
+
+        <div className='conversation__content'>
+          <div className='conversation__content__info'>
+            <div className='conversation__content__relative-time'>
+              {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
             </div>
 
-            <StatusContent
-              status={lastStatus}
-              onClick={this.handleClick}
-              expanded={!lastStatus.get('hidden')}
-              onExpandedToggle={this.handleShowMore}
-              collapsible
+            <div className='conversation__content__names' onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+              <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
+            </div>
+          </div>
+
+          <StatusContent
+            status={lastStatus}
+            onClick={handleClick}
+            expanded={!lastStatus.get('hidden')}
+            onExpandedToggle={handleShowMore}
+            collapsible
+          />
+
+          {lastStatus.get('media_attachments').size > 0 && (
+            <AttachmentList
+              compact
+              media={lastStatus.get('media_attachments')}
             />
+          )}
 
-            {lastStatus.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={lastStatus.get('media_attachments')}
+          <div className='status__action-bar'>
+            <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' iconComponent={ReplyIcon} onClick={handleReply} />
+
+            <div className='status__action-bar-dropdown'>
+              <DropdownMenuContainer
+                scrollKey={scrollKey}
+                status={lastStatus}
+                items={menu}
+                icon='ellipsis-h'
+                iconComponent={MoreHorizIcon}
+                size={18}
+                direction='right'
+                title={intl.formatMessage(messages.more)}
               />
-            )}
-
-            <div className='status__action-bar'>
-              <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' iconComponent={ReplyIcon} onClick={this.handleReply} />
-
-              <div className='status__action-bar-dropdown'>
-                <DropdownMenuContainer
-                  scrollKey={scrollKey}
-                  status={lastStatus}
-                  items={menu}
-                  icon='ellipsis-h'
-                  iconComponent={MoreHorizIcon}
-                  size={18}
-                  direction='right'
-                  title={intl.formatMessage(messages.more)}
-                />
-              </div>
             </div>
           </div>
         </div>
-      </HotKeys>
-    );
-  }
+      </div>
+    </HotKeys>
+  );
+};
 
-}
-
-export default withRouter(injectIntl(Conversation));
+Conversation.propTypes = {
+  conversation: ImmutablePropTypes.map.isRequired,
+  scrollKey: PropTypes.string,
+  onMoveUp: PropTypes.func,
+  onMoveDown: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
index 8c12ea9e5f..c9fc098a52 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
@@ -1,77 +1,72 @@
 import PropTypes from 'prop-types';
+import { useRef, useMemo, useCallback } from 'react';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector, useDispatch } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import ScrollableList from '../../../components/scrollable_list';
-import ConversationContainer from '../containers/conversation_container';
+import { expandConversations } from 'mastodon/actions/conversations';
+import ScrollableList from 'mastodon/components/scrollable_list';
 
-export default class ConversationsList extends ImmutablePureComponent {
+import { Conversation } from './conversation';
 
-  static propTypes = {
-    conversations: ImmutablePropTypes.list.isRequired,
-    scrollKey: PropTypes.string.isRequired,
-    hasMore: PropTypes.bool,
-    isLoading: PropTypes.bool,
-    onLoadMore: PropTypes.func,
-  };
+const focusChild = (node, index, alignTop) => {
+  const element = node.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
 
-  getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id);
-
-  handleMoveUp = id => {
-    const elementIndex = this.getCurrentIndex(id) - 1;
-    this._selectChild(elementIndex, true);
-  };
-
-  handleMoveDown = id => {
-    const elementIndex = this.getCurrentIndex(id) + 1;
-    this._selectChild(elementIndex, false);
-  };
-
-  _selectChild (index, align_top) {
-    const container = this.node.node;
-    const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
-    if (element) {
-      if (align_top && container.scrollTop > element.offsetTop) {
-        element.scrollIntoView(true);
-      } else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
-        element.scrollIntoView(false);
-      }
-      element.focus();
+  if (element) {
+    if (alignTop && node.scrollTop > element.offsetTop) {
+      element.scrollIntoView(true);
+    } else if (!alignTop && node.scrollTop + node.clientHeight < element.offsetTop + element.offsetHeight) {
+      element.scrollIntoView(false);
     }
+
+    element.focus();
   }
+};
 
-  setRef = c => {
-    this.node = c;
-  };
+export const ConversationsList = ({ scrollKey, ...other }) => {
+  const listRef = useRef();
+  const conversations = useSelector(state => state.getIn(['conversations', 'items']));
+  const isLoading = useSelector(state => state.getIn(['conversations', 'isLoading'], true));
+  const hasMore = useSelector(state => state.getIn(['conversations', 'hasMore'], false));
+  const dispatch = useDispatch();
+  const lastStatusId = conversations.last()?.get('last_status');
 
-  handleLoadOlder = debounce(() => {
-    const last = this.props.conversations.last();
+  const handleMoveUp = useCallback(id => {
+    const elementIndex = conversations.findIndex(x => x.get('id') === id) - 1;
+    focusChild(listRef.current.node, elementIndex, true);
+  }, [listRef, conversations]);
 
-    if (last && last.get('last_status')) {
-      this.props.onLoadMore(last.get('last_status'));
+  const handleMoveDown = useCallback(id => {
+    const elementIndex = conversations.findIndex(x => x.get('id') === id) + 1;
+    focusChild(listRef.current.node, elementIndex, false);
+  }, [listRef, conversations]);
+
+  const debouncedLoadMore = useMemo(() => debounce(id => {
+    dispatch(expandConversations({ maxId: id }));
+  }, 300, { leading: true }), [dispatch]);
+
+  const handleLoadMore = useCallback(() => {
+    if (lastStatusId) {
+      debouncedLoadMore(lastStatusId);
     }
-  }, 300, { leading: true });
+  }, [debouncedLoadMore, lastStatusId]);
 
-  render () {
-    const { conversations, isLoading, onLoadMore, ...other } = this.props;
+  return (
+    <ScrollableList {...other} scrollKey={scrollKey} isLoading={isLoading} showLoading={isLoading && conversations.isEmpty()} hasMore={hasMore} onLoadMore={handleLoadMore} ref={listRef}>
+      {conversations.map(item => (
+        <Conversation
+          key={item.get('id')}
+          conversation={item}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          scrollKey={scrollKey}
+        />
+      ))}
+    </ScrollableList>
+  );
+};
 
-    return (
-      <ScrollableList {...other} isLoading={isLoading} showLoading={isLoading && conversations.isEmpty()} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}>
-        {conversations.map(item => (
-          <ConversationContainer
-            key={item.get('id')}
-            conversationId={item.get('id')}
-            onMoveUp={this.handleMoveUp}
-            onMoveDown={this.handleMoveDown}
-            scrollKey={this.props.scrollKey}
-          />
-        ))}
-      </ScrollableList>
-    );
-  }
-
-}
+ConversationsList.propTypes = {
+  scrollKey: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
deleted file mode 100644
index 456fc7d7cc..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { replyCompose } from 'mastodon/actions/compose';
-import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
-import { openModal } from 'mastodon/actions/modal';
-import { muteStatus, unmuteStatus, hideStatus, revealStatus } from 'mastodon/actions/statuses';
-import { makeGetStatus } from 'mastodon/selectors';
-
-import Conversation from '../components/conversation';
-
-const messages = defineMessages({
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-});
-
-const mapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  return (state, { conversationId }) => {
-    const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
-    const lastStatusId = conversation.get('last_status', null);
-
-    return {
-      accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
-      unread: conversation.get('unread'),
-      lastStatus: lastStatusId && getStatus(state, { id: lastStatusId }),
-    };
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
-
-  markRead () {
-    dispatch(markConversationRead(conversationId));
-  },
-
-  reply (status, router) {
-    dispatch((_, getState) => {
-      let state = getState();
-
-      if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)),
-          },
-        }));
-      } else {
-        dispatch(replyCompose(status, router));
-      }
-    });
-  },
-
-  delete () {
-    dispatch(deleteConversation(conversationId));
-  },
-
-  onMute (status) {
-    if (status.get('muted')) {
-      dispatch(unmuteStatus(status.get('id')));
-    } else {
-      dispatch(muteStatus(status.get('id')));
-    }
-  },
-
-  onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
-  },
-
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Conversation));
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
deleted file mode 100644
index 1dcd3ec1bd..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandConversations } from '../../../actions/conversations';
-import ConversationsList from '../components/conversations_list';
-
-const mapStateToProps = state => ({
-  conversations: state.getIn(['conversations', 'items']),
-  isLoading: state.getIn(['conversations', 'isLoading'], true),
-  hasMore: state.getIn(['conversations', 'hasMore'], false),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onLoadMore: maxId => dispatch(expandConversations({ maxId })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ConversationsList);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index effc9f29db..7aee83ec10 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -1,116 +1,92 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useRef, useCallback, useEffect } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
-import { connect } from 'react-redux';
+import { useDispatch } from 'react-redux';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
 import { connectDirectStream } from 'mastodon/actions/streaming';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 
-import ConversationsListContainer from './containers/conversations_list_container';
+import { ConversationsList } from './components/conversations_list';
 
 const messages = defineMessages({
   title: { id: 'column.direct', defaultMessage: 'Private mentions' },
 });
 
-class DirectTimeline extends PureComponent {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    columnId: PropTypes.string,
-    intl: PropTypes.object.isRequired,
-    hasUnread: PropTypes.bool,
-    multiColumn: PropTypes.bool,
-  };
-
-  handlePin = () => {
-    const { columnId, dispatch } = this.props;
+const DirectTimeline = ({ columnId, multiColumn }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const pinned = !!columnId;
 
+  const handlePin = useCallback(() => {
     if (columnId) {
       dispatch(removeColumn(columnId));
     } else {
       dispatch(addColumn('DIRECT', {}));
     }
-  };
+  }, [dispatch, columnId]);
 
-  handleMove = (dir) => {
-    const { columnId, dispatch } = this.props;
+  const handleMove = useCallback((dir) => {
     dispatch(moveColumn(columnId, dir));
-  };
+  }, [dispatch, columnId]);
 
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current.scrollTop();
+  }, [columnRef]);
 
+  useEffect(() => {
     dispatch(mountConversations());
     dispatch(expandConversations());
-    this.disconnect = dispatch(connectDirectStream());
-  }
 
-  componentWillUnmount () {
-    this.props.dispatch(unmountConversations());
+    const disconnect = dispatch(connectDirectStream());
 
-    if (this.disconnect) {
-      this.disconnect();
-      this.disconnect = null;
-    }
-  }
+    return () => {
+      dispatch(unmountConversations());
+      disconnect();
+    };
+  }, [dispatch]);
 
-  setRef = c => {
-    this.column = c;
-  };
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
+      <ColumnHeader
+        icon='at'
+        iconComponent={AlternateEmailIcon}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+      />
 
-  handleLoadMore = maxId => {
-    this.props.dispatch(expandConversations({ maxId }));
-  };
+      <ConversationsList
+        trackScroll={!pinned}
+        scrollKey={`direct_timeline-${columnId}`}
+        emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
+        bindToDocument={!multiColumn}
+        prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
+        alwaysPrepend
+      />
 
-  render () {
-    const { intl, hasUnread, columnId, multiColumn } = this.props;
-    const pinned = !!columnId;
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
 
-    return (
-      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
-        <ColumnHeader
-          icon='at'
-          iconComponent={AlternateEmailIcon}
-          active={hasUnread}
-          title={intl.formatMessage(messages.title)}
-          onPin={this.handlePin}
-          onMove={this.handleMove}
-          onClick={this.handleHeaderClick}
-          pinned={pinned}
-          multiColumn={multiColumn}
-        />
+DirectTimeline.propTypes = {
+  columnId: PropTypes.string,
+  multiColumn: PropTypes.bool,
+};
 
-        <ConversationsListContainer
-          trackScroll={!pinned}
-          scrollKey={`direct_timeline-${columnId}`}
-          timelineId='direct'
-          bindToDocument={!multiColumn}
-          onLoadMore={this.handleLoadMore}
-          prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
-          alwaysPrepend
-          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
-        />
-
-        <Helmet>
-          <title>{intl.formatMessage(messages.title)}</title>
-          <meta name='robots' content='noindex' />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default connect()(injectIntl(DirectTimeline));
+export default DirectTimeline;
diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx
index ff1f8a653b..0db53607e9 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.jsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.jsx
@@ -20,7 +20,7 @@ import { Avatar } from 'mastodon/components/avatar';
 import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
 import { ShortNumber } from 'mastodon/components/short_number';
-import { autoPlayGif, me, unfollowModal } from 'mastodon/initial_state';
+import { autoPlayGif, me } from 'mastodon/initial_state';
 import { makeGetAccount } from 'mastodon/selectors';
 
 const messages = defineMessages({
@@ -48,38 +48,30 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
-        dispatch(
-          openModal({
-            modalType: 'CONFIRM',
-            modalProps: {
-              message: (
-                <FormattedMessage
-                  id='confirmations.unfollow.message'
-                  defaultMessage='Are you sure you want to unfollow {name}?'
-                  values={{ name: <strong>@{account.get('acct')}</strong> }}
-                />
-              ),
-              confirm: intl.formatMessage(messages.unfollowConfirm),
-              onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-            } }),
-        );
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
-    } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
-        dispatch(openModal({
+      dispatch(
+        openModal({
           modalType: 'CONFIRM',
           modalProps: {
-            message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
-            confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+            message: (
+              <FormattedMessage
+                id='confirmations.unfollow.message'
+                defaultMessage='Are you sure you want to unfollow {name}?'
+                values={{ name: <strong>@{account.get('acct')}</strong> }}
+              />
+            ),
+            confirm: intl.formatMessage(messages.unfollowConfirm),
             onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
-          },
-        }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
+          } }),
+      );
+    } else if (account.getIn(['relationship', 'requested'])) {
+      dispatch(openModal({
+        modalType: 'CONFIRM',
+        modalProps: {
+          message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        },
+      }));
     } else {
       dispatch(followAccount(account.get('id')));
     }
@@ -202,14 +194,14 @@ class AccountCard extends ImmutablePureComponent {
         <div className='account-card__actions'>
           <div className='account-card__counters'>
             <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('statuses_count')} />
+              <ShortNumber value={account.get('statuses_count')} isHide={account.getIn(['other_settings', 'hide_statuses_count']) || false} />
               <small>
                 <FormattedMessage id='account.posts' defaultMessage='Posts' />
               </small>
             </div>
 
             <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('followers_count')} />{' '}
+              <ShortNumber value={account.get('followers_count')} isHide={account.getIn(['other_settings', 'hide_followers_count']) || false} />{' '}
               <small>
                 <FormattedMessage
                   id='account.followers'
@@ -219,7 +211,7 @@ class AccountCard extends ImmutablePureComponent {
             </div>
 
             <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('following_count')} />{' '}
+              <ShortNumber value={account.get('following_count')} isHide={account.getIn(['other_settings', 'hide_following_count']) || false} />{' '}
               <small>
                 <FormattedMessage
                   id='account.following'
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
index 32d79f23fc..0d3408146e 100644
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ b/app/javascript/mastodon/features/directory/index.jsx
@@ -9,7 +9,7 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/domain_blocks/index.jsx b/app/javascript/mastodon/features/domain_blocks/index.jsx
index 5c9b70f02b..964eada9c1 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.jsx
+++ b/app/javascript/mastodon/features/domain_blocks/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index 7b917ac43b..9d6ff5226a 100644
--- a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
+++ b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
@@ -22,23 +22,23 @@ describe('emoji', () => {
 
     it('does unicode', () => {
       expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
-        '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg">');
+        '<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg"></picture>');
       expect(emojify('👨‍👩‍👧‍👧')).toEqual(
-        '<img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg">');
-      expect(emojify('👩‍👩‍👦')).toEqual('<img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg">');
+        '<picture><img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg"></picture>');
+      expect(emojify('👩‍👩‍👦')).toEqual('<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg"></picture>');
       expect(emojify('\u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
     });
 
     it('does multiple unicode', () => {
       expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
       expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture><picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
       expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
-        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
+        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
       expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
-        'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> bar');
+        'foo <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> bar');
     });
 
     it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
     });
 
     it('does multiple emoji properly (issue 5188)', () => {
-      expect(emojify('👌🌈💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
-      expect(emojify('👌 🌈 💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"> <img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"> <img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
+      expect(emojify('👌🌈💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture><picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
+      expect(emojify('👌 🌈 💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture> <picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture> <picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
     });
 
     it('does an emoji that has no shortcode', () => {
-      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg">');
+      expect(emojify('👁‍🗨')).toEqual('<picture><img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg"></picture>');
     });
 
     it('does an emoji whose filename is irregular', () => {
-      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg">');
+      expect(emojify('↙️')).toEqual('<picture><img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg"></picture>');
     });
 
     it('avoid emojifying on invisible text', () => {
@@ -67,11 +67,11 @@ describe('emoji', () => {
 
     it('avoid emojifying on invisible text with nested tags', () => {
       expect(emojify('<span class="invisible">😄<span class="foo">bar</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
       expect(emojify('<span class="invisible">😄<span class="invisible">😕</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
       expect(emojify('<span class="invisible">😄<br>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<br>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
+        .toEqual('<span class="invisible">😄<br>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
     });
 
     it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -79,19 +79,19 @@ describe('emoji', () => {
         .toEqual('✴︎');
     });
 
-    it('does an simple emoji properly', () => {
+    it('does a simple emoji properly', () => {
       expect(emojify('♀♂'))
-        .toEqual('<img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg">');
+        .toEqual('<picture><img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"></picture><picture><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg"></picture>');
     });
 
     it('does an emoji containing ZWJ properly', () => {
       expect(emojify('💂‍♀️💂‍♂️'))
-        .toEqual('<img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg">');
+        .toEqual('<picture><img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"></picture><picture><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg"></picture>');
     });
 
     it('keeps ordering as expected (issue fixed by PR 20677)', () => {
       expect(emojify('<p>💕 <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>'))
-        .toEqual('<p><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
+        .toEqual('<p><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
     });
   });
 });
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index 5918a65ed7..1f469aced7 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -17,8 +17,13 @@ const emojiFilenames = (emojis) => {
 const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂‍♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂‍♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲', '🪮', '🐦‍⬛']);
 const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️', '🪽', '🪿']);
 
-const emojiFilename = (filename) => {
-  const borderedEmoji = (document.body && document.body.classList.contains('theme-mastodon-light')) ? lightEmoji : darkEmoji;
+/**
+ * @param {string} filename
+ * @param {"light" | "dark" } colorScheme
+ * @returns {string}
+ */
+const emojiFilename = (filename, colorScheme) => {
+  const borderedEmoji = colorScheme === "light" ? lightEmoji : darkEmoji;
   return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
 };
 
@@ -92,12 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
       const { filename, shortCode } = unicodeMapping[unicode_emoji];
       const title = shortCode ? `:${shortCode}:` : '';
 
-      replacement = document.createElement('img');
-      replacement.setAttribute('draggable', 'false');
-      replacement.setAttribute('class', 'emojione');
-      replacement.setAttribute('alt', unicode_emoji);
-      replacement.setAttribute('title', title);
-      replacement.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename)}.svg`);
+      replacement = document.createElement('picture');
+
+      const isSystemTheme = !!document.body?.classList.contains('theme-system');
+
+      if(isSystemTheme) {
+        let source = document.createElement('source');
+        source.setAttribute('media', '(prefers-color-scheme: dark)');
+        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, "dark")}.svg`);
+        replacement.appendChild(source);
+      }
+
+      let img = document.createElement('img');
+      img.setAttribute('draggable', 'false');
+      img.setAttribute('class', 'emojione');
+      img.setAttribute('alt', unicode_emoji);
+      img.setAttribute('title', title);
+
+      let theme = "light";
+
+      if(!isSystemTheme && !document.body?.classList.contains('theme-mastodon-light'))
+        theme = "dark";
+
+      img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
+      replacement.appendChild(img);
     }
 
     // Add the processed-up-to-now string and the emoji replacement
@@ -146,6 +169,8 @@ export const buildCustomEmojis = (customEmojis) => {
     const shortcode = emoji.get('shortcode');
     const url       = autoPlayGif ? emoji.get('url') : emoji.get('static_url');
     const name      = shortcode.replace(':', '');
+    const aliases   = emoji.get('aliases');
+    const keywords  = aliases ? [name, ...aliases] : [name];
 
     emojis.push({
       id: name,
@@ -153,7 +178,7 @@ export const buildCustomEmojis = (customEmojis) => {
       short_names: [name],
       text: '',
       emoticons: [],
-      keywords: [name],
+      keywords,
       imageUrl: url,
       custom: true,
       customCategory: emoji.get('category'),
diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js
index a4863566da..6c2a5963d6 100644
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -16,8 +16,8 @@ let data = require('emoji-mart/data/all.json');
 const { uncompress: emojiMartUncompress } = require('emoji-mart/dist/utils/data');
 
 const emojiMap = require('./emoji_map.json');
-const { unicodeToFilename } = require('./unicode_to_filename');
-const { unicodeToUnifiedName } = require('./unicode_to_unified_name');
+const { unicodeToFilename } = require('./unicode_to_filename_s');
+const { unicodeToUnifiedName } = require('./unicode_to_unified_name_s');
 
 if(data.compressed) {
   data = emojiMartUncompress(data);
@@ -36,7 +36,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
@@ -88,7 +88,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
   let emoji = emojiIndex.emojis[key];
 
   // Emojis with skin tone modifiers are stored like this
-  if (Object.prototype.hasOwnProperty.call(emoji, '1')) {
+  if (Object.hasOwn(emoji, '1')) {
     emoji = emoji['1'];
   }
 
diff --git a/app/javascript/mastodon/features/emoji/emoji_utils.js b/app/javascript/mastodon/features/emoji/emoji_utils.js
index 83bcc9d82f..2aa82c197a 100644
--- a/app/javascript/mastodon/features/emoji/emoji_utils.js
+++ b/app/javascript/mastodon/features/emoji/emoji_utils.js
@@ -12,7 +12,7 @@ const buildSearch = (data) => {
     }
 
     (Array.isArray(strings) ? strings : [strings]).forEach((string) => {
-      (split ? string.split(/[-|_|\s]+/) : [string]).forEach((s) => {
+      (split ? string.split(/[-|_|\s]+/) : [string]).filter((s) => s).forEach((s) => {
         s = s.toLowerCase();
 
         if (search.indexOf(s) === -1) {
@@ -135,19 +135,19 @@ function getData(emoji, skin, set) {
       }
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
+    if (Object.hasOwn(data.short_names, emoji)) {
       emoji = data.short_names[emoji];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
+    if (Object.hasOwn(data.emojis, emoji)) {
       emojiData = data.emojis[emoji];
     }
   } else if (emoji.id) {
-    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
+    if (Object.hasOwn(data.short_names, emoji.id)) {
       emoji.id = data.short_names[emoji.id];
     }
 
-    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
+    if (Object.hasOwn(data.emojis, emoji.id)) {
       emojiData = data.emojis[emoji.id];
       skin = skin || emoji.skin;
     }
@@ -216,7 +216,7 @@ function deepMerge(a, b) {
     let originalValue = a[key],
       value = originalValue;
 
-    if (Object.prototype.hasOwnProperty.call(b, key)) {
+    if (Object.hasOwn(b, key)) {
       value = b[key];
     }
 
diff --git a/app/javascript/mastodon/features/emoji/unicode_to_filename.ts b/app/javascript/mastodon/features/emoji/unicode_to_filename.ts
new file mode 100644
index 0000000000..49b2939c3d
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/unicode_to_filename.ts
@@ -0,0 +1,26 @@
+export const unicodeToFilename = (str: string) => {
+  let result = '';
+  let charCode = 0;
+  let p = 0;
+  let i = 0;
+  while (i < str.length) {
+    charCode = str.charCodeAt(i++);
+    if (p) {
+      if (result.length > 0) {
+        result += '-';
+      }
+      result += (0x10000 + ((p - 0xd800) << 10) + (charCode - 0xdc00)).toString(
+        16,
+      );
+      p = 0;
+    } else if (0xd800 <= charCode && charCode <= 0xdbff) {
+      p = charCode;
+    } else {
+      if (result.length > 0) {
+        result += '-';
+      }
+      result += charCode.toString(16);
+    }
+  }
+  return result;
+};
diff --git a/app/javascript/mastodon/features/emoji/unicode_to_filename.js b/app/javascript/mastodon/features/emoji/unicode_to_filename_s.js
similarity index 100%
rename from app/javascript/mastodon/features/emoji/unicode_to_filename.js
rename to app/javascript/mastodon/features/emoji/unicode_to_filename_s.js
diff --git a/app/javascript/mastodon/features/emoji/unicode_to_unified_name.ts b/app/javascript/mastodon/features/emoji/unicode_to_unified_name.ts
new file mode 100644
index 0000000000..4fc366eb38
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/unicode_to_unified_name.ts
@@ -0,0 +1,21 @@
+function padLeft(str: string, num: number) {
+  while (str.length < num) {
+    str = '0' + str;
+  }
+
+  return str;
+}
+
+export const unicodeToUnifiedName = (str: string) => {
+  let output = '';
+
+  for (let i = 0; i < str.length; i += 2) {
+    if (i > 0) {
+      output += '-';
+    }
+
+    output += padLeft((str.codePointAt(i) ?? 0).toString(16).toUpperCase(), 4);
+  }
+
+  return output;
+};
diff --git a/app/javascript/mastodon/features/emoji/unicode_to_unified_name.js b/app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js
similarity index 100%
rename from app/javascript/mastodon/features/emoji/unicode_to_unified_name.js
rename to app/javascript/mastodon/features/emoji/unicode_to_unified_name_s.js
diff --git a/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
new file mode 100644
index 0000000000..54f19cb7d0
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
@@ -0,0 +1,114 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { debounce } from 'lodash';
+
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
+import { fetchEmojiReactedStatuses, expandEmojiReactedStatuses } from 'mastodon/actions/emoji_reactions';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import StatusList from 'mastodon/components/status_list';
+
+const messages = defineMessages({
+  heading: { id: 'column.emoji_reactions', defaultMessage: 'Stamps' },
+});
+
+const mapStateToProps = state => ({
+  statusIds: state.getIn(['status_lists', 'emoji_reactions', 'items']),
+  isLoading: state.getIn(['status_lists', 'emoji_reactions', 'isLoading'], true),
+  hasMore: !!state.getIn(['status_lists', 'emoji_reactions', 'next']),
+});
+
+class EmojiReactions extends ImmutablePureComponent {
+
+  static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    statusIds: ImmutablePropTypes.list.isRequired,
+    intl: PropTypes.object.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+  };
+
+  componentWillMount () {
+    this.props.dispatch(fetchEmojiReactedStatuses());
+  }
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('EMOJI_REACTIONS', {}));
+    }
+  };
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  };
+
+  setRef = c => {
+    this.column = c;
+  };
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandEmojiReactedStatuses());
+  }, 300, { leading: true });
+
+  render () {
+    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
+    const pinned = !!columnId;
+
+    const emptyMessage = <FormattedMessage id='empty_column.emoji_reacted_statuses' defaultMessage="You don't have any emoji reacted posts yet. When you emoji react one, it will show up here." />;
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
+        <ColumnHeader
+          icon='smile-o'
+          iconComponent={EmojiReactionIcon}
+          title={intl.formatMessage(messages.heading)}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+          showBackButton
+        />
+
+        <StatusList
+          trackScroll={!pinned}
+          statusIds={statusIds}
+          scrollKey={`emoji_reacted_statuses-${columnId}`}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        />
+
+        <Helmet>
+          <title>{intl.formatMessage(messages.heading)}</title>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(EmojiReactions));
diff --git a/app/javascript/mastodon/features/emoji_reactions/index.jsx b/app/javascript/mastodon/features/emoji_reactions/index.jsx
new file mode 100644
index 0000000000..a863fc5b47
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji_reactions/index.jsx
@@ -0,0 +1,121 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { debounce } from 'lodash';
+
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
+import { fetchEmojiReactions, expandEmojiReactions } from 'mastodon/actions/interactions';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon } from 'mastodon/components/icon';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import AccountContainer from 'mastodon/containers/account_container';
+import Column from 'mastodon/features/ui/components/column';
+
+
+
+import EmojiView from '../../components/emoji_view';
+import { LoadingIndicator } from '../../components/loading_indicator';
+
+const messages = defineMessages({
+  refresh: { id: 'refresh', defaultMessage: 'Refresh' },
+});
+
+const mapStateToProps = (state, props) => {
+  return {
+    accountIds: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId, 'items']),
+    hasMore: !!state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId, 'next']),
+    isLoading: state.getIn(['user_lists', 'emoji_reactioned_by', props.params.statusId, 'isLoading'], true),
+  };
+};
+
+class EmojiReactions extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+    multiColumn: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  componentWillMount () {
+    if (!this.props.accountIds) {
+      this.props.dispatch(fetchEmojiReactions(this.props.params.statusId));
+    }
+  }
+
+  handleRefresh = () => {
+    this.props.dispatch(fetchEmojiReactions(this.props.params.statusId));
+  };
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandEmojiReactions(this.props.params.statusId));
+  }, 300, { leading: true });
+
+  render () {
+    const { intl, accountIds, hasMore, isLoading, multiColumn } = this.props;
+
+    if (!accountIds) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    let groups = {};
+    for (const emoji_reaction of accountIds) {
+      const key = emoji_reaction.account_id;
+      const value = emoji_reaction;
+      if (!groups[key]) groups[key] = [value];
+      else groups[key].push(value);
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.emoji_reactions' defaultMessage='No one has reacted with emoji this post yet. When someone does, they will show up here.' />;
+
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <ColumnHeader
+          showBackButton
+          multiColumn={multiColumn}
+          extraButton={(
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' icon={RefreshIcon} /></button>
+          )}
+        />
+
+        <ScrollableList
+          scrollKey='emoji_reactions'
+          onLoadMore={this.handleLoadMore}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        >
+          {Object.keys(groups).map((key) =>(
+            <AccountContainer key={key} id={key} withNote={false} hideButtons>
+              <div style={{ 'maxWidth': '100px' }}>
+                {groups[key].map((value, index2) => <EmojiView key={index2} name={value.name} url={value.url} staticUrl={value.static_url} />)}
+              </div>
+            </AccountContainer>
+          ))}
+        </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(EmojiReactions));
diff --git a/app/javascript/mastodon/features/explore/components/card.jsx b/app/javascript/mastodon/features/explore/components/card.jsx
new file mode 100644
index 0000000000..316203060a
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/components/card.jsx
@@ -0,0 +1,88 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { domain } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+});
+
+export const Card = ({ id, source }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  let label;
+
+  switch (source) {
+  case 'friends_of_friends':
+    label = <FormattedMessage id='follow_suggestions.friends_of_friends_longer' defaultMessage='Popular among people you follow' />;
+    break;
+  case 'similar_to_recently_followed':
+    label = <FormattedMessage id='follow_suggestions.similar_to_recently_followed_longer' defaultMessage='Similar to profiles you recently followed' />;
+    break;
+  case 'featured':
+    label = <FormattedMessage id='follow_suggestions.featured_longer' defaultMessage='Hand-picked by the {domain} team' values={{ domain }} />;
+    break;
+  case 'most_followed':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  case 'most_interactions':
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion_longer' defaultMessage='Popular on {domain}' values={{ domain }} />;
+    break;
+  }
+
+  return (
+    <div className='explore__suggestions__card'>
+      <div className='explore__suggestions__card__source'>
+        {label}
+      </div>
+
+      <div className='explore__suggestions__card__body'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={48} /></Link>
+
+        <div className='explore__suggestions__card__body__main'>
+          <div className='explore__suggestions__card__body__main__name-button'>
+            <Link className='explore__suggestions__card__body__main__name-button__name' to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+            <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  source: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index 96a39f6b35..d77aec7013 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -8,8 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import Search from 'mastodon/features/compose/containers/search_container';
@@ -58,8 +58,8 @@ class Explore extends PureComponent {
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
-          icon={isSearching ? 'search' : 'hashtag'}
-          iconComponent={isSearching ? SearchIcon : TagIcon}
+          icon={isSearching ? 'search' : 'explore'}
+          iconComponent={isSearching ? SearchIcon : ExploreIcon}
           title={intl.formatMessage(isSearching ? messages.searchResults : messages.title)}
           onClick={this.handleHeaderClick}
           multiColumn={multiColumn}
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 891bddf737..2ee6e8c7f1 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -9,9 +9,9 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { submitSearch, expandSearch } from 'mastodon/actions/search';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
 import { Icon } from 'mastodon/components/icon';
@@ -52,7 +52,7 @@ const renderHashtags = hashtags => hidePeek(hashtags).map(hashtag => (
 ));
 
 const renderStatuses = statuses => hidePeek(statuses).map(id => (
-  <Status key={id} id={id} />
+  <Status key={id} id={id} contextType='explore' />
 ));
 
 class Results extends PureComponent {
@@ -181,7 +181,7 @@ class Results extends PureComponent {
 
           {statuses.size > 0 && (
             <SearchSection key='statuses' title={<><Icon id='quote-right' icon={FindInPageIcon} /><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></>} onClickMore={this.handleLoadMoreStatuses}>
-              {statuses.take(INITIAL_DISPLAY).map(id => <Status key={id} id={id} />)}
+              {statuses.take(INITIAL_DISPLAY).map(id => <Status key={id} id={id} contextType='explore' />)}
             </SearchSection>
           )}
         </>
diff --git a/app/javascript/mastodon/features/explore/statuses.jsx b/app/javascript/mastodon/features/explore/statuses.jsx
index 414b47fcdd..0054cda753 100644
--- a/app/javascript/mastodon/features/explore/statuses.jsx
+++ b/app/javascript/mastodon/features/explore/statuses.jsx
@@ -61,6 +61,7 @@ class Statuses extends PureComponent {
         prepend={<DismissableBanner id='explore/statuses'><FormattedMessage id='dismissable_banner.explore_statuses' defaultMessage='These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.' /></DismissableBanner>}
         alwaysPrepend
         timelineId='explore'
+        contextType='explore'
         statusIds={statusIds}
         scrollKey='explore-statuses'
         hasMore={hasMore}
diff --git a/app/javascript/mastodon/features/explore/suggestions.jsx b/app/javascript/mastodon/features/explore/suggestions.jsx
index ba33c4d081..101ec0d195 100644
--- a/app/javascript/mastodon/features/explore/suggestions.jsx
+++ b/app/javascript/mastodon/features/explore/suggestions.jsx
@@ -10,9 +10,10 @@ import { connect } from 'react-redux';
 
 import { fetchSuggestions } from 'mastodon/actions/suggestions';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import AccountCard from 'mastodon/features/directory/components/account_card';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+import { Card } from './components/card';
+
 const mapStateToProps = state => ({
   suggestions: state.getIn(['suggestions', 'items']),
   isLoading: state.getIn(['suggestions', 'isLoading']),
@@ -54,7 +55,11 @@ class Suggestions extends PureComponent {
     return (
       <div className='explore__suggestions scrollable' data-nosnippet>
         {isLoading ? <LoadingIndicator /> : suggestions.map(suggestion => (
-          <AccountCard key={suggestion.get('account')} id={suggestion.get('account')} />
+          <Card
+            key={suggestion.get('account')}
+            id={suggestion.get('account')}
+            source={suggestion.getIn(['sources', 0])}
+          />
         ))}
       </div>
     );
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.jsx b/app/javascript/mastodon/features/favourited_statuses/index.jsx
index 29fc6925d6..f7d6d14178 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.jsx
+++ b/app/javascript/mastodon/features/favourited_statuses/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied emoji_reacted_statuses, status_references
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -10,12 +12,12 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
+import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import StatusList from 'mastodon/components/status_list';
-import Column from 'mastodon/features/ui/components/column';
 import { getStatusList } from 'mastodon/selectors';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/favourites/index.jsx b/app/javascript/mastodon/features/favourites/index.jsx
index ffab6f02c9..9eeb2a3f92 100644
--- a/app/javascript/mastodon/features/favourites/index.jsx
+++ b/app/javascript/mastodon/features/favourites/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied emoji_reactions, mentioned_users
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -10,7 +12,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/filters/select_filter.jsx b/app/javascript/mastodon/features/filters/select_filter.jsx
index 9bf0c3c8e5..5b2eb64952 100644
--- a/app/javascript/mastodon/features/filters/select_filter.jsx
+++ b/app/javascript/mastodon/features/filters/select_filter.jsx
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 
 import fuzzysort from 'fuzzysort';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { toServerSideType } from 'mastodon/utils/filters';
 import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 22c11a182f..85f7405ceb 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -6,13 +6,13 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { addColumn } from 'mastodon/actions/columns';
 import { changeSetting } from 'mastodon/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
 import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-import initialState, { domain } from 'mastodon/initial_state';
+import initialState, { domain, enableLocalTimeline } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import Column from '../../components/column';
@@ -42,15 +42,17 @@ const ColumnSettings = () => {
   );
 
   return (
-    <div>
-      <div className='column-settings__row'>
-        <SettingToggle
-          settings={settings}
-          settingPath={['onlyMedia']}
-          onChange={onChange}
-          label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
-        />
-      </div>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            settings={settings}
+            settingPath={['onlyMedia']}
+            onChange={onChange}
+            label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />}
+          />
+        </div>
+      </section>
     </div>
   );
 };
@@ -171,19 +173,21 @@ const Firehose = ({ feedType, multiColumn }) => {
         <ColumnSettings />
       </ColumnHeader>
 
-      <div className='account__section-headline'>
-        <NavLink exact to='/public/local'>
-          <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
-        </NavLink>
+      {enableLocalTimeline && (
+        <div className='account__section-headline'>
+          <NavLink exact to='/public/local'>
+            <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
+          </NavLink>
+          
+          <NavLink exact to='/public/remote'>
+            <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
+          </NavLink>
 
-        <NavLink exact to='/public/remote'>
-          <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
-        </NavLink>
-
-        <NavLink exact to='/public'>
-          <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
-        </NavLink>
-      </div>
+          <NavLink exact to='/public'>
+            <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
+          </NavLink>
+        </div>
+      )}
 
       <StatusListContainer
         prepend={prependBanner}
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
index 1f40e05992..dd308c87cb 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx
index 683c7b4070..a8f40a31d0 100644
--- a/app/javascript/mastodon/features/follow_requests/index.jsx
+++ b/app/javascript/mastodon/features/follow_requests/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
@@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent {
     );
 
     return (
-      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
+      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)}>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}
diff --git a/app/javascript/mastodon/features/followed_tags/index.jsx b/app/javascript/mastodon/features/followed_tags/index.jsx
index de3d7670ec..21248e6de9 100644
--- a/app/javascript/mastodon/features/followed_tags/index.jsx
+++ b/app/javascript/mastodon/features/followed_tags/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Hashtag } from 'mastodon/components/hashtag';
diff --git a/app/javascript/mastodon/features/followers/index.jsx b/app/javascript/mastodon/features/followers/index.jsx
index 4885f9ca99..1e98a61657 100644
--- a/app/javascript/mastodon/features/followers/index.jsx
+++ b/app/javascript/mastodon/features/followers/index.jsx
@@ -10,6 +10,7 @@ import { debounce } from 'lodash';
 
 import { TimelineHint } from 'mastodon/components/timeline_hint';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { isHideItem, me } from 'mastodon/initial_state';
 import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors';
 
@@ -130,7 +131,8 @@ class Followers extends ImmutablePureComponent {
 
     let emptyMessage;
 
-    const forceEmptyState = blockedBy || suspended || hidden;
+    const isHideRelationships = isHideItem('relationships') && accountId === me;
+    const forceEmptyState = blockedBy || suspended || hidden || isHideRelationships;
 
     if (suspended) {
       emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
@@ -142,6 +144,8 @@ class Followers extends ImmutablePureComponent {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
     } else if (remote && accountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
+    } else if (isHideRelationships) {
+      emptyMessage = <FormattedMessage id='account.followers.hidden_from_me' defaultMessage='This information is hidden by your setting.' />;
     } else {
       emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
     }
diff --git a/app/javascript/mastodon/features/following/index.jsx b/app/javascript/mastodon/features/following/index.jsx
index fb4a4d5c3a..3e890e8d87 100644
--- a/app/javascript/mastodon/features/following/index.jsx
+++ b/app/javascript/mastodon/features/following/index.jsx
@@ -10,6 +10,7 @@ import { debounce } from 'lodash';
 
 import { TimelineHint } from 'mastodon/components/timeline_hint';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import { isHideItem, me } from 'mastodon/initial_state';
 import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors';
 
@@ -131,6 +132,7 @@ class Following extends ImmutablePureComponent {
     let emptyMessage;
 
     const forceEmptyState = blockedBy || suspended || hidden;
+    const normalizedAccountIds = isHideItem('relationships') ? accountIds.filter((id) => id !== me) : accountIds;
 
     if (suspended) {
       emptyMessage = <FormattedMessage id='empty_column.account_suspended' defaultMessage='Account suspended' />;
@@ -138,9 +140,9 @@ class Following extends ImmutablePureComponent {
       emptyMessage = <LimitedAccountHint accountId={accountId} />;
     } else if (blockedBy) {
       emptyMessage = <FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />;
-    } else if (hideCollections && accountIds.isEmpty()) {
+    } else if (hideCollections && normalizedAccountIds.isEmpty()) {
       emptyMessage = <FormattedMessage id='empty_column.account_hides_collections' defaultMessage='This user has chosen to not make this information available' />;
-    } else if (remote && accountIds.isEmpty()) {
+    } else if (remote && normalizedAccountIds.isEmpty()) {
       emptyMessage = <RemoteHint url={remoteUrl} />;
     } else {
       emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
@@ -163,7 +165,7 @@ class Following extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         >
-          {forceEmptyState ? [] : accountIds.map(id =>
+          {forceEmptyState ? [] : normalizedAccountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,
           )}
         </ScrollableList>
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index 6b752df1bd..3c0b53b9e7 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -13,10 +13,10 @@ import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import ReactSwipeableViews from 'react-swipeable-views';
 
-import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import elephantUIPlane from '@/images/elephant_ui_plane.svg';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -343,7 +343,7 @@ class Announcement extends ImmutablePureComponent {
       <div className='announcements__item'>
         <strong className='announcements__item__range'>
           <FormattedMessage id='announcement.announcement' defaultMessage='Announcement' />
-          {hasTimeRange && <span> · <FormattedDate value={startsAt} hour12={false} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} hour12={false} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
+          {hasTimeRange && <span> · <FormattedDate value={startsAt} year={(skipYear || startsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month='short' day='2-digit' hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /> - <FormattedDate value={endsAt} year={(skipYear || endsAt.getFullYear() === now.getFullYear()) ? undefined : 'numeric'} month={skipEndDate ? undefined : 'short'} day={skipEndDate ? undefined : '2-digit'} hour={skipTime ? undefined : '2-digit'} minute={skipTime ? undefined : '2-digit'} /></span>}
         </strong>
 
         <Content announcement={announcement} />
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 68ea201387..ac037eb404 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -9,24 +9,26 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 
-import { me, showTrends } from '../../initial_state';
-import NavigationContainer from '../compose/containers/navigation_container';
+import { dtlTag, enableDtlMenu, me, showTrends } from '../../initial_state';
+import { NavigationBar } from '../compose/components/navigation_bar';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
 
@@ -38,6 +40,7 @@ const messages = defineMessages({
   public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
   community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  deep_timeline: { id: 'navigation_bar.deep_timeline', defaultMessage: 'Deep timeline' },
   explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
@@ -49,6 +52,8 @@ const messages = defineMessages({
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+  antennas: { id: 'navigation_bar.antennas', defaultMessage: 'Antennas' },
+  circles: { id: 'navigation_bar.circles', defaultMessage: 'Circles' },
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
   personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
   security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
@@ -82,7 +87,7 @@ class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
-    myAccount: ImmutablePropTypes.map,
+    myAccount: ImmutablePropTypes.record,
     multiColumn: PropTypes.bool,
     fetchFollowRequests: PropTypes.func.isRequired,
     unreadFollowRequests: PropTypes.number,
@@ -112,12 +117,21 @@ class GettingStarted extends ImmutablePureComponent {
 
     if (showTrends) {
       navItems.push(
-        <ColumnLink key='explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
+        <ColumnLink key='explore' icon='explore' iconComponent={ExploreIcon} text={intl.formatMessage(messages.explore)} to='/explore' />,
       );
     }
 
     navItems.push(
       <ColumnLink key='community_timeline' icon='users' iconComponent={PeopleIcon} text={intl.formatMessage(messages.community_timeline)} to='/public/local' />,
+    );
+
+    if (signedIn && enableDtlMenu && dtlTag) {
+      navItems.push(
+        <ColumnLink key='deep_timeline' icon='users' iconComponent={PeopleIcon} text={intl.formatMessage(messages.deep_timeline)} to={`/tags/${dtlTag}`} />,
+      );
+    }
+
+    navItems.push(
       <ColumnLink key='public_timeline' icon='globe' iconComponent={PublicIcon} text={intl.formatMessage(messages.public_timeline)} to='/public' />,
     );
 
@@ -126,9 +140,11 @@ class GettingStarted extends ImmutablePureComponent {
         <ColumnSubheading key='header-personal' text={intl.formatMessage(messages.personal)} />,
         <ColumnLink key='home' icon='home' iconComponent={HomeIcon} text={intl.formatMessage(messages.home_timeline)} to='/home' />,
         <ColumnLink key='direct' icon='at' iconComponent={AlternateEmailIcon} text={intl.formatMessage(messages.direct)} to='/conversations' />,
-        <ColumnLink key='bookmark' icon='bookmarks' iconComponent={BookmarksIcon} text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
+        <ColumnLink key='bookmark' icon='bookmarks' iconComponent={BookmarksIcon} text={intl.formatMessage(messages.bookmarks)} to='/bookmark_categories' />,
         <ColumnLink key='favourites' icon='star' iconComponent={StarIcon} text={intl.formatMessage(messages.favourites)} to='/favourites' />,
         <ColumnLink key='lists' icon='list-ul' iconComponent={ListAltIcon} text={intl.formatMessage(messages.lists)} to='/lists' />,
+        <ColumnLink key='antennas' icon='wifi' iconComponent={AntennaIcon} text={intl.formatMessage(messages.antennas)} to='/antennasw' />,
+        <ColumnLink key='circles' icon='user-circle' iconComponent={CirclesIcon} text={intl.formatMessage(messages.circles)} to='/circles' />,
       );
 
       if (myAccount.get('locked') || unreadFollowRequests > 0) {
@@ -143,7 +159,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     return (
       <Column>
-        {(signedIn && !multiColumn) ? <NavigationContainer /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
+        {(signedIn && !multiColumn) ? <NavigationBar /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
 
         <div className='getting-started scrollable scrollable--flex'>
           <div className='getting-started__wrapper'>
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
index c60de4c518..3412e5d1bd 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
@@ -107,28 +107,28 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <div className='setting-toggle'>
-            <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
 
-            <span className='setting-toggle__label'>
-              <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
-            </span>
+            <div className='setting-toggle'>
+              <Toggle id='hashtag.column_settings.tag_toggle' onChange={this.onToggle} checked={this.state.open} />
+
+              <span className='setting-toggle__label'>
+                <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
+              </span>
+            </div>
           </div>
-        </div>
 
-        {this.state.open && (
-          <div className='column-settings__hashtags'>
-            {this.modeSelect('any')}
-            {this.modeSelect('all')}
-            {this.modeSelect('none')}
-          </div>
-        )}
-
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} />
-        </div>
+          {this.state.open && (
+            <div className='column-settings__hashtags'>
+              {this.modeSelect('any')}
+              {this.modeSelect('all')}
+              {this.modeSelect('none')}
+            </div>
+          )}
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index 35ed4dc609..f431a7e9b7 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { isEqual } from 'lodash';
 
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { connectHashtagStream } from 'mastodon/actions/streaming';
 import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
index ca09d46c7e..3f0525fe57 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.tsx
@@ -24,43 +24,36 @@ export const ColumnSettings: React.FC = () => {
   );
 
   return (
-    <div>
-      <span className='column-settings__section'>
-        <FormattedMessage
-          id='home.column_settings.basic'
-          defaultMessage='Basic'
-        />
-      </span>
+    <div className='column-settings'>
+      <section>
+        <div className='column-settings__row'>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reblog']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_reblogs'
+                defaultMessage='Show boosts'
+              />
+            }
+          />
 
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reblog']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_reblogs'
-              defaultMessage='Show boosts'
-            />
-          }
-        />
-      </div>
-
-      <div className='column-settings__row'>
-        <SettingToggle
-          prefix='home_timeline'
-          settings={settings}
-          settingPath={['shows', 'reply']}
-          onChange={onChange}
-          label={
-            <FormattedMessage
-              id='home.column_settings.show_replies'
-              defaultMessage='Show replies'
-            />
-          }
-        />
-      </div>
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reply']}
+            onChange={onChange}
+            label={
+              <FormattedMessage
+                id='home.column_settings.show_replies'
+                defaultMessage='Show replies'
+              />
+            }
+          />
+        </div>
+      </section>
     </div>
   );
 };
diff --git a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
deleted file mode 100644
index 9eeec00e34..0000000000
--- a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import background from 'mastodon/../images/friends-cropped.png';
-import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-
-export const ExplorePrompt = () => (
-  <DismissableBanner id='home.explore_prompt'>
-    <img
-      src={background}
-      alt=''
-      className='dismissable-banner__background-image'
-    />
-
-    <h1>
-      <FormattedMessage
-        id='home.explore_prompt.title'
-        defaultMessage='This is your home base within Mastodon.'
-      />
-    </h1>
-    <p>
-      <FormattedMessage
-        id='home.explore_prompt.body'
-        defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:"
-      />
-    </p>
-
-    <div className='dismissable-banner__message__wrapper'>
-      <div className='dismissable-banner__message__actions'>
-        <Link to='/explore' className='button'>
-          <FormattedMessage
-            id='home.actions.go_to_explore'
-            defaultMessage="See what's trending"
-          />
-        </Link>
-        <Link to='/explore/suggestions' className='button button-tertiary'>
-          <FormattedMessage
-            id='home.actions.go_to_suggestions'
-            defaultMessage='Find people to follow'
-          />
-        </Link>
-      </div>
-    </div>
-  </DismissableBanner>
-);
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
new file mode 100644
index 0000000000..c39b43bade
--- /dev/null
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx
@@ -0,0 +1,218 @@
+import PropTypes from 'prop-types';
+import { useEffect, useCallback, useRef, useState } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch, useSelector } from 'react-redux';
+
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import { followAccount, unfollowAccount } from 'mastodon/actions/accounts';
+import { changeSetting } from 'mastodon/actions/settings';
+import { fetchSuggestions, dismissSuggestion } from 'mastodon/actions/suggestions';
+import { Avatar } from 'mastodon/components/avatar';
+import { Button } from 'mastodon/components/button';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+import { VerifiedBadge } from 'mastodon/components/verified_badge';
+import { domain } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
+  next: { id: 'lightbox.next', defaultMessage: 'Next' },
+  dismiss: { id: 'follow_suggestions.dismiss', defaultMessage: "Don't show again" },
+  friendsOfFriendsHint: { id: 'follow_suggestions.hints.friends_of_friends', defaultMessage: 'This profile is popular among the people you follow.' },
+  similarToRecentlyFollowedHint: { id: 'follow_suggestions.hints.similar_to_recently_followed', defaultMessage: 'This profile is similar to the profiles you have most recently followed.' },
+  featuredHint: { id: 'follow_suggestions.hints.featured', defaultMessage: 'This profile has been hand-picked by the {domain} team.' },
+  mostFollowedHint: { id: 'follow_suggestions.hints.most_followed', defaultMessage: 'This profile is one of the most followed on {domain}.'},
+  mostInteractionsHint: { id: 'follow_suggestions.hints.most_interactions', defaultMessage: 'This profile has been recently getting a lot of attention on {domain}.' },
+});
+
+const Source = ({ id }) => {
+  const intl = useIntl();
+
+  let label, hint;
+
+  switch (id) {
+  case 'friends_of_friends':
+    hint = intl.formatMessage(messages.friendsOfFriendsHint);
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
+  case 'similar_to_recently_followed':
+    hint = intl.formatMessage(messages.similarToRecentlyFollowedHint);
+    label = <FormattedMessage id='follow_suggestions.personalized_suggestion' defaultMessage='Personalized suggestion' />;
+    break;
+  case 'featured':
+    hint = intl.formatMessage(messages.featuredHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.curated_suggestion' defaultMessage='Staff pick' />;
+    break;
+  case 'most_followed':
+    hint = intl.formatMessage(messages.mostFollowedHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
+  case 'most_interactions':
+    hint = intl.formatMessage(messages.mostInteractionsHint, { domain });
+    label = <FormattedMessage id='follow_suggestions.popular_suggestion' defaultMessage='Popular suggestion' />;
+    break;
+  }
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card__text-stack__source' title={hint}>
+      <Icon icon={InfoIcon} />
+      {label}
+    </div>
+  );
+};
+
+Source.propTypes = {
+  id: PropTypes.oneOf(['friends_of_friends', 'similar_to_recently_followed', 'featured', 'most_followed', 'most_interactions']),
+};
+
+const Card = ({ id, sources }) => {
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', id]));
+  const relationship = useSelector(state => state.getIn(['relationships', id]));
+  const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
+  const dispatch = useDispatch();
+  const following = relationship?.get('following') ?? relationship?.get('requested');
+
+  const handleFollow = useCallback(() => {
+    if (following) {
+      dispatch(unfollowAccount(id));
+    } else {
+      dispatch(followAccount(id));
+    }
+  }, [id, following, dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissSuggestion(id));
+  }, [id, dispatch]);
+
+  return (
+    <div className='inline-follow-suggestions__body__scrollable__card'>
+      <IconButton iconComponent={CloseIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+
+      <div className='inline-follow-suggestions__body__scrollable__card__avatar'>
+        <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={72} /></Link>
+      </div>
+
+      <div className='inline-follow-suggestions__body__scrollable__card__text-stack'>
+        <Link to={`/@${account.get('acct')}`}><DisplayName account={account} /></Link>
+        {firstVerifiedField ? <VerifiedBadge link={firstVerifiedField.get('value')} /> : <Source id={sources.get(0)} />}
+      </div>
+
+      <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} secondary={following} onClick={handleFollow} />
+    </div>
+  );
+};
+
+Card.propTypes = {
+  id: PropTypes.string.isRequired,
+  sources: ImmutablePropTypes.list,
+};
+
+const DISMISSIBLE_ID = 'home/follow-suggestions';
+
+export const InlineFollowSuggestions = ({ hidden }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['suggestions', 'items']));
+  const isLoading = useSelector(state => state.getIn(['suggestions', 'isLoading']));
+  const dismissed = useSelector(state => state.getIn(['settings', 'dismissed_banners', DISMISSIBLE_ID]));
+  const bodyRef = useRef();
+  const [canScrollLeft, setCanScrollLeft] = useState(false);
+  const [canScrollRight, setCanScrollRight] = useState(true);
+
+  useEffect(() => {
+    dispatch(fetchSuggestions());
+  }, [dispatch]);
+
+  useEffect(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
+
+  const handleLeftNav = useCallback(() => {
+    bodyRef.current.scrollLeft -= 200;
+  }, [bodyRef]);
+
+  const handleRightNav = useCallback(() => {
+    bodyRef.current.scrollLeft += 200;
+  }, [bodyRef]);
+
+  const handleScroll = useCallback(() => {
+    if (!bodyRef.current) {
+      return;
+    }
+
+    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+  }, [setCanScrollRight, setCanScrollLeft, bodyRef]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(changeSetting(['dismissed_banners', DISMISSIBLE_ID], true));
+  }, [dispatch]);
+
+  if (dismissed || (!isLoading && suggestions.isEmpty())) {
+    return null;
+  }
+
+  if (hidden) {
+    return (
+      <div className='inline-follow-suggestions' />
+    );
+  }
+
+  return (
+    <div className='inline-follow-suggestions'>
+      <div className='inline-follow-suggestions__header'>
+        <h3><FormattedMessage id='follow_suggestions.who_to_follow' defaultMessage='Who to follow' /></h3>
+
+        <div className='inline-follow-suggestions__header__actions'>
+          <button className='link-button' onClick={handleDismiss}><FormattedMessage id='follow_suggestions.dismiss' defaultMessage="Don't show again" /></button>
+          <Link to='/explore/suggestions' className='link-button'><FormattedMessage id='follow_suggestions.view_all' defaultMessage='View all' /></Link>
+        </div>
+      </div>
+
+      <div className='inline-follow-suggestions__body'>
+        <div className='inline-follow-suggestions__body__scrollable' ref={bodyRef} onScroll={handleScroll}>
+          {suggestions.map(suggestion => (
+            <Card
+              key={suggestion.get('account')}
+              id={suggestion.get('account')}
+              sources={suggestion.get('sources')}
+            />
+          ))}
+        </div>
+
+        {canScrollLeft && (
+          <button className='inline-follow-suggestions__body__scroll-button left' onClick={handleLeftNav} aria-label={intl.formatMessage(messages.previous)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronLeftIcon} /></div>
+          </button>
+        )}
+
+        {canScrollRight && (
+          <button className='inline-follow-suggestions__body__scroll-button right' onClick={handleRightNav} aria-label={intl.formatMessage(messages.next)}>
+            <div className='inline-follow-suggestions__body__scroll-button__icon'><Icon icon={ChevronRightIcon} /></div>
+          </button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+InlineFollowSuggestions.propTypes = {
+  hidden: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 1f93278c06..6e7dc2b6c8 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -6,17 +6,15 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
-import { createSelector } from '@reduxjs/toolkit';
-import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
 import AnnouncementsContainer from 'mastodon/features/getting_started/containers/announcements_container';
-import { me, criticalUpdatesPending } from 'mastodon/initial_state';
+import { criticalUpdatesPending } from 'mastodon/initial_state';
 
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { expandHomeTimeline } from '../../actions/timelines';
@@ -26,7 +24,6 @@ import StatusListContainer from '../ui/containers/status_list_container';
 
 import { ColumnSettings } from './components/column_settings';
 import { CriticalUpdateBanner } from './components/critical_update_banner';
-import { ExplorePrompt } from './components/explore_prompt';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -34,51 +31,12 @@ const messages = defineMessages({
   hide_announcements: { id: 'home.hide_announcements', defaultMessage: 'Hide announcements' },
 });
 
-const getHomeFeedSpeed = createSelector([
-  state => state.getIn(['timelines', 'home', 'items'], ImmutableList()),
-  state => state.getIn(['timelines', 'home', 'pendingItems'], ImmutableList()),
-  state => state.get('statuses'),
-], (statusIds, pendingStatusIds, statusMap) => {
-  const recentStatusIds = pendingStatusIds.concat(statusIds);
-  const statuses = recentStatusIds.filter(id => id !== null).map(id => statusMap.get(id)).filter(status => status?.get('account') !== me).take(20);
-
-  if (statuses.isEmpty()) {
-    return {
-      gap: 0,
-      newest: new Date(0),
-    };
-  }
-
-  const datetimes = statuses.map(status => status.get('created_at', 0));
-  const oldest = new Date(datetimes.min());
-  const newest = new Date(datetimes.max());
-  const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds
-
-  return {
-    gap: averageGap,
-    newest,
-  };
-});
-
-const homeTooSlow = createSelector([
-  state => state.getIn(['timelines', 'home', 'isLoading']),
-  state => state.getIn(['timelines', 'home', 'isPartial']),
-  getHomeFeedSpeed,
-], (isLoading, isPartial, speed) =>
-  !isLoading && !isPartial // Only if the home feed has finished loading
-  && (
-    (speed.gap > (30 * 60) // If the average gap between posts is more than 30 minutes
-    || (Date.now() - speed.newest) > (1000 * 3600)) // If the most recent post is from over an hour ago
-  )
-);
-
 const mapStateToProps = state => ({
   hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
   isPartial: state.getIn(['timelines', 'home', 'isPartial']),
   hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
   unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
   showAnnouncements: state.getIn(['announcements', 'show']),
-  tooSlow: homeTooSlow(state),
 });
 
 class HomeTimeline extends PureComponent {
@@ -97,7 +55,6 @@ class HomeTimeline extends PureComponent {
     hasAnnouncements: PropTypes.bool,
     unreadAnnouncements: PropTypes.number,
     showAnnouncements: PropTypes.bool,
-    tooSlow: PropTypes.bool,
   };
 
   handlePin = () => {
@@ -167,7 +124,7 @@ class HomeTimeline extends PureComponent {
   };
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn, tooSlow, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
+    const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
     const pinned = !!columnId;
     const { signedIn } = this.context.identity;
     const banners = [];
@@ -192,10 +149,6 @@ class HomeTimeline extends PureComponent {
       banners.push(<CriticalUpdateBanner key='critical-update-banner' />);
     }
 
-    if (tooSlow) {
-      banners.push(<ExplorePrompt key='explore-prompt' />);
-    }
-
     return (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 1d503b7343..57a82ef7c1 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -9,10 +9,11 @@ import { connect } from 'react-redux';
 
 import { throttle, escapeRegExp } from 'lodash';
 
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import api from 'mastodon/api';
 import { Button } from 'mastodon/components/button';
@@ -372,6 +373,11 @@ class InteractionModal extends React.PureComponent {
       title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favorite {name}'s post" values={{ name }} />;
       actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.' />;
       break;
+    case 'emoji_reaction':
+      icon = <Icon id='smile-o' icon={EmojiReactionIcon} />;
+      title = <FormattedMessage id='interaction_modal.title.emoji_reaction' defaultMessage="Emoji react {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.emoji_reaection' defaultMessage='With an account on Mastodon, you can emoji react this post to let the author know you appreciate it and save it for later.' />;
+      break;
     case 'follow':
       icon = <Icon id='user-plus' icon={PersonAddIcon} />;
       title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 6d1df6dd0d..f12eeffe6f 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 
@@ -107,7 +107,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td>
               </tr>
               <tr>
-                <td><kbd>s</kbd></td>
+                <td><kbd>s</kbd>, <kbd>/</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td>
               </tr>
               <tr>
@@ -142,6 +142,10 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><kbd>g</kbd>+<kbd>f</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.favourites' defaultMessage='to open favorites list' /></td>
               </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>e</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.emoji_reactions' defaultMessage='to open stamps list' /></td>
+              </tr>
               <tr>
                 <td><kbd>g</kbd>+<kbd>p</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></td>
diff --git a/app/javascript/mastodon/features/list_adder/components/account.jsx b/app/javascript/mastodon/features/list_adder/components/account.jsx
index 94a90726e3..0ecd367a35 100644
--- a/app/javascript/mastodon/features/list_adder/components/account.jsx
+++ b/app/javascript/mastodon/features/list_adder/components/account.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_adder/account, circle_adder/account
+
 import { injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
diff --git a/app/javascript/mastodon/features/list_adder/components/list.jsx b/app/javascript/mastodon/features/list_adder/components/list.jsx
index 54ac940da4..1cb0d50d17 100644
--- a/app/javascript/mastodon/features/list_adder/components/list.jsx
+++ b/app/javascript/mastodon/features/list_adder/components/list.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_adder/antenna, circle_adder/circle, bookmark_category_adder/bookmark_category
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl } from 'react-intl';
@@ -6,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
@@ -17,6 +20,7 @@ import { IconButton }  from '../../../components/icon_button';
 const messages = defineMessages({
   remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },
   add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
+  exclusive: { id: 'lists.exclusive', defaultMessage: 'Hide list or antenna account posts from home' },
 });
 
 const MapStateToProps = (state, { listId, added }) => ({
@@ -54,11 +58,14 @@ class List extends ImmutablePureComponent {
       button = <IconButton icon='plus' iconComponent={AddIcon} title={intl.formatMessage(messages.add)} onClick={onAdd} />;
     }
 
+    const exclusiveIcon = list.get('exclusive') && <Icon id='eye-slash' icon={VisibilityOffIcon} title={intl.formatMessage(messages.exclusive)} className='column-link__icon' fixedWidth />;
+
     return (
       <div className='list'>
         <div className='list__wrapper'>
           <div className='list__display-name'>
             <Icon id='list-ul' icon={ListAltIcon} className='column-link__icon' />
+            {exclusiveIcon}
             {list.get('title')}
           </div>
 
diff --git a/app/javascript/mastodon/features/list_adder/index.jsx b/app/javascript/mastodon/features/list_adder/index.jsx
index 4e7bd46bdf..0349579b9f 100644
--- a/app/javascript/mastodon/features/list_adder/index.jsx
+++ b/app/javascript/mastodon/features/list_adder/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_adder, circle_adder, bookmark_category_adder
+
 import PropTypes from 'prop-types';
 
 import { injectIntl } from 'react-intl';
diff --git a/app/javascript/mastodon/features/list_editor/components/account.jsx b/app/javascript/mastodon/features/list_editor/components/account.jsx
index f406f24fa7..fc67614e10 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/account.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_editor/account, circle_editor/account
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl } from 'react-intl';
@@ -6,8 +8,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
 import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
 import { Avatar } from '../../../components/avatar';
diff --git a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
index ad29d08a93..e0efadd2cd 100644
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_editor/edit_antenna_form, circle_editor/edit_circle_form, bookmark_category_editor/edit_bookmark_category_form
+
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
@@ -5,7 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 
 import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/list_editor/components/search.jsx b/app/javascript/mastodon/features/list_editor/components/search.jsx
index 4c4138c751..8ca89c401c 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/search.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_editor/search, circle_editor/search
+
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
@@ -7,8 +9,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
diff --git a/app/javascript/mastodon/features/list_editor/index.jsx b/app/javascript/mastodon/features/list_editor/index.jsx
index 85e90169e8..a16fe88a2b 100644
--- a/app/javascript/mastodon/features/list_editor/index.jsx
+++ b/app/javascript/mastodon/features/list_editor/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_editor, circle_editor, bookmark_category_statuses
+
 import PropTypes from 'prop-types';
 
 import { injectIntl } from 'react-intl';
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index aa87adf52a..a97e934713 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_timeline
+
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
@@ -11,9 +13,9 @@ import { connect } from 'react-redux';
 
 import Toggle from 'react-toggle';
 
-import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
 import { openModal } from 'mastodon/actions/modal';
@@ -146,16 +148,27 @@ class ListTimeline extends PureComponent {
     }));
   };
 
+  handleEditAntennaClick = (e) => {
+    const id = e.currentTarget.getAttribute('data-id');
+    this.props.history.push(`/antennasw/${id}/edit`);
+  };
+
   handleRepliesPolicyChange = ({ target }) => {
     const { dispatch } = this.props;
     const { id } = this.props.params;
-    dispatch(updateList(id, undefined, false, undefined, target.value));
+    dispatch(updateList(id, undefined, false, undefined, target.value, undefined));
   };
 
   onExclusiveToggle = ({ target }) => {
     const { dispatch } = this.props;
     const { id } = this.props.params;
-    dispatch(updateList(id, undefined, false, target.checked, undefined));
+    dispatch(updateList(id, undefined, false, target.checked, undefined, undefined));
+  };
+
+  onNotifyToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateList(id, undefined, false, undefined, undefined, target.checked));
   };
 
   render () {
@@ -165,6 +178,8 @@ class ListTimeline extends PureComponent {
     const title  = list ? list.get('title') : id;
     const replies_policy = list ? list.get('replies_policy') : undefined;
     const isExclusive = list ? list.get('exclusive') : undefined;
+    const isNotify = list ? list.get('notify') : undefined;
+    const antennas = list ? (list.get('antennas')?.toArray() || []) : [];
 
     if (typeof list === 'undefined') {
       return (
@@ -193,35 +208,63 @@ class ListTimeline extends PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
         >
-          <div className='column-settings__row column-header__links'>
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
-              <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
-            </button>
+          <div className='column-settings'>
+            <section className='column-header__links'>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleEditClick}>
+                <Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='lists.edit' defaultMessage='Edit list' />
+              </button>
 
-            <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
-              <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
-            </button>
-          </div>
+              <button type='button' className='text-btn column-header__setting-btn' tabIndex={0} onClick={this.handleDeleteClick}>
+                <Icon id='trash' icon={DeleteIcon} /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
+              </button>
+            </section>
 
-          <div className='setting-toggle'>
-            <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
-            <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
-              <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
-            </label>
-          </div>
-
-          { replies_policy !== undefined && (
-            <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
-              <span id={`list-${id}-replies-policy`} className='column-settings__section'>
-                <FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' />
-              </span>
-              <div className='column-settings__row'>
-                { ['none', 'list', 'followed'].map(policy => (
-                  <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
-                ))}
+            <section>
+              <div className='setting-toggle'>
+                <Toggle id={`list-${id}-exclusive`} checked={isExclusive} onChange={this.onExclusiveToggle} />
+                <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
+                  <FormattedMessage id='lists.exclusive' defaultMessage='Hide list or antenna account posts from home' />
+                </label>
               </div>
-            </div>
-          )}
+            </section>
+
+            <section className='similar-row'>
+              <div className='setting-toggle'>
+                <Toggle id={`list-${id}-notify`} checked={isNotify} onChange={this.onNotifyToggle} />
+                <label htmlFor={`list-${id}-notify`} className='setting-toggle__label'>
+                  <FormattedMessage id='lists.notify' defaultMessage='Notify these posts' />
+                </label>
+              </div>
+            </section>
+
+            {replies_policy !== undefined && (
+              <section aria-labelledby={`list-${id}-replies-policy`}>
+                <h3 id={`list-${id}-replies-policy`}><FormattedMessage id='lists.replies_policy.title' defaultMessage='Show replies to:' /></h3>
+
+                <div className='column-settings__row'>
+                  { ['none', 'list', 'followed'].map(policy => (
+                    <RadioButton name='order' key={policy} value={policy} label={intl.formatMessage(messages[policy])} checked={replies_policy === policy} onChange={this.handleRepliesPolicyChange} />
+                  ))}
+                </div>
+              </section>
+            )}
+
+            { antennas.length > 0 && (
+              <section aria-labelledby={`list-${id}-antenna`}>
+                <h3><FormattedMessage id='lists.antennas' defaultMessage='Related antennas:' /></h3>
+
+                <ul className='column-settings__row'>
+                  { antennas.map(antenna => (
+                    <li key={antenna.get('id')} className='column-settings__row__antenna'>
+                      <button type='button' className='text-btn column-header__setting-btn' data-id={antenna.get('id')} onClick={this.handleEditAntennaClick}>
+                        <Icon id='pencil' icon={EditIcon} /> {antenna.get('title')}{antenna.get('stl') && ' [STL]'}
+                      </button>
+                    </li>
+                  ))}
+                </ul>
+              </section>
+            )}
+          </div>
         </ColumnHeader>
 
         <StatusListContainer
diff --git a/app/javascript/mastodon/features/lists/components/new_list_form.jsx b/app/javascript/mastodon/features/lists/components/new_list_form.jsx
index 0fed9d70a2..4a76fe7b6d 100644
--- a/app/javascript/mastodon/features/lists/components/new_list_form.jsx
+++ b/app/javascript/mastodon/features/lists/components/new_list_form.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antennas/new_antenna_form, circles/new_circle_form, bookmark_categories/new_bookmark_category_form
+
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index b20bbc6b78..7c918eab97 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antennas, circles, bookmark_categories
+
 import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@@ -9,7 +11,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
@@ -23,6 +25,7 @@ import NewListForm from './components/new_list_form';
 const messages = defineMessages({
   heading: { id: 'column.lists', defaultMessage: 'Lists' },
   subheading: { id: 'lists.subheading', defaultMessage: 'Your lists' },
+  with_antenna: { id: 'lists.with_antenna', defaultMessage: 'Antenna' },
 });
 
 const getOrderedLists = createSelector([state => state.get('lists')], lists => {
@@ -77,7 +80,8 @@ class Lists extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {lists.map(list =>
-            <ColumnLink key={list.get('id')} to={`/lists/${list.get('id')}`} icon='list-ul' iconComponent={ListAltIcon} text={list.get('title')} />,
+            (<ColumnLink key={list.get('id')} to={`/lists/${list.get('id')}`} icon='list-ul' iconComponent={ListAltIcon} text={list.get('title')}
+              badge={(list.get('antennas') && list.get('antennas').size > 0) ? intl.formatMessage(messages.with_antenna) : undefined} />),
           )}
         </ScrollableList>
 
diff --git a/app/javascript/mastodon/features/mentioned_users/index.jsx b/app/javascript/mastodon/features/mentioned_users/index.jsx
new file mode 100644
index 0000000000..f32e38820e
--- /dev/null
+++ b/app/javascript/mastodon/features/mentioned_users/index.jsx
@@ -0,0 +1,90 @@
+import PropTypes from 'prop-types';
+
+import { injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { debounce } from 'lodash';
+
+import { fetchMentionedUsers, expandMentionedUsers } from 'mastodon/actions/interactions';
+import ColumnHeader from 'mastodon/components/column_header';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import AccountContainer from 'mastodon/containers/account_container';
+import Column from 'mastodon/features/ui/components/column';
+
+const mapStateToProps = (state, props) => ({
+  accountIds: state.getIn(['user_lists', 'mentioned_users', props.params.statusId, 'items']),
+  hasMore: !!state.getIn(['user_lists', 'mentioned_users', props.params.statusId, 'next']),
+  isLoading: state.getIn(['user_lists', 'mentioned_users', props.params.statusId, 'isLoading'], true),
+});
+
+class MentionedUsers extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+    multiColumn: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  UNSAFE_componentWillMount () {
+    if (!this.props.accountIds) {
+      this.props.dispatch(fetchMentionedUsers(this.props.params.statusId));
+    }
+  }
+
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandMentionedUsers(this.props.params.statusId));
+  }, 300, { leading: true });
+
+  render () {
+    const { accountIds, hasMore, isLoading, multiColumn } = this.props;
+
+    if (!accountIds) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.mentioned_users' defaultMessage='No one has been mentioned by this post.' />;
+
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <ColumnHeader
+          showBackButton
+          multiColumn={multiColumn}
+        />
+
+        <ScrollableList
+          scrollKey='mentioned_users'
+          onLoadMore={this.handleLoadMore}
+          hasMore={hasMore}
+          isLoading={isLoading}
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} withNote={false} />,
+          )}
+        </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(MentionedUsers));
diff --git a/app/javascript/mastodon/features/mutes/index.jsx b/app/javascript/mastodon/features/mutes/index.jsx
index 316eaba220..3b50244ea4 100644
--- a/app/javascript/mastodon/features/mutes/index.jsx
+++ b/app/javascript/mastodon/features/mutes/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 
 import { fetchMutes, expandMutes } from '../../actions/mutes';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
new file mode 100644
index 0000000000..5a7bb2307b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/checkbox_with_label.jsx
@@ -0,0 +1,31 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import Toggle from 'react-toggle';
+
+export const CheckboxWithLabel = ({ checked, disabled, children, onChange }) => {
+  const handleChange = useCallback(({ target }) => {
+    onChange(target.checked);
+  }, [onChange]);
+
+  return (
+    <label className='app-form__toggle'>
+      <div className='app-form__toggle__label'>
+        {children}
+      </div>
+
+      <div className='app-form__toggle__toggle'>
+        <div>
+          <Toggle checked={checked} onChange={handleChange} disabled={disabled} />
+        </div>
+      </div>
+    </label>
+  );
+};
+
+CheckboxWithLabel.propTypes = {
+  checked: PropTypes.bool,
+  disabled: PropTypes.bool,
+  children: PropTypes.children,
+  onChange: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
index ac7860efd4..73eaecba59 100644
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
+import DeleteForeverIcon from '@/material-icons/400-24px/delete_forever.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class ClearColumnButton extends PureComponent {
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 09154f257a..58ee58fe02 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -5,8 +5,10 @@ import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import { enableEmojiReaction } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
+import { CheckboxWithLabel } from './checkbox_with_label';
 import ClearColumnButton from './clear_column_button';
 import GrantPermissionButton from './grant_permission_button';
 import SettingToggle from './setting_toggle';
@@ -26,18 +28,40 @@ export default class ColumnSettings extends PureComponent {
     alertsEnabled: PropTypes.bool,
     browserSupport: PropTypes.bool,
     browserPermission: PropTypes.string,
+    notificationPolicy: ImmutablePropTypes.map,
+    onChangePolicy: PropTypes.func.isRequired,
   };
 
   onPushChange = (path, checked) => {
-    this.props.onChange(['push', ...path], checked);
+    const { pushSettings } = this.props;
+    const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
+
+    if (showPushSettings) {
+      this.props.onChange(['push', ...path], checked);
+    }
+  };
+
+  handleFilterNotFollowing = checked => {
+    this.props.onChangePolicy('filter_not_following', checked);
+  };
+
+  handleFilterNotFollowers = checked => {
+    this.props.onChangePolicy('filter_not_followers', checked);
+  };
+
+  handleFilterNewAccounts = checked => {
+    this.props.onChangePolicy('filter_new_accounts', checked);
+  };
+
+  handleFilterPrivateMentions = checked => {
+    this.props.onChangePolicy('filter_private_mentions', checked);
   };
 
   render () {
-    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
+    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = this.props;
 
-    const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
-    const filterBarShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show_bar' defaultMessage='Show filter bar' />;
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
+    const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
@@ -46,48 +70,71 @@ export default class ColumnSettings extends PureComponent {
     const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
 
     return (
-      <div>
+      <div className='column-settings'>
         {alertsEnabled && browserSupport && browserPermission === 'denied' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
-            <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
-          </div>
+          <span className='warning-hint'><FormattedMessage id='notifications.permission_denied' defaultMessage='Desktop notifications are unavailable due to previously denied browser permissions request' /></span>
         )}
 
+        <section>
+          <ClearColumnButton onClick={onClear} />
+        </section>
+
         {alertsEnabled && browserSupport && browserPermission === 'default' && (
-          <div className='column-settings__row column-settings__row--with-margin'>
+          <section>
             <span className='warning-hint'>
               <FormattedMessage id='notifications.permission_required' defaultMessage='Desktop notifications are unavailable because the required permission has not been granted.' /> <GrantPermissionButton onClick={onRequestNotificationPermission} />
             </span>
-          </div>
+          </section>
         )}
 
-        <div className='column-settings__row'>
-          <ClearColumnButton onClick={onClear} />
-        </div>
+        <section>
+          <h3><FormattedMessage id='notifications.policy.title' defaultMessage='Filter out notifications from…' /></h3>
 
-        <div role='group' aria-labelledby='notifications-unread-markers'>
-          <span id='notifications-unread-markers' className='column-settings__section'>
+          <div className='column-settings__row'>
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_following')} onChange={this.handleFilterNotFollowing}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_following_title' defaultMessage="People you don't follow" /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_following_hint' defaultMessage='Until you manually approve them' /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_not_followers')} onChange={this.handleFilterNotFollowers}>
+              <strong><FormattedMessage id='notifications.policy.filter_not_followers_title' defaultMessage='People not following you' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_not_followers_hint' defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}' values={{ days: 3 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_new_accounts')} onChange={this.handleFilterNewAccounts}>
+              <strong><FormattedMessage id='notifications.policy.filter_new_accounts_title' defaultMessage='New accounts' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_new_accounts.hint' defaultMessage='Created within the past {days, plural, one {one day} other {# days}}' values={{ days: 30 }} /></span>
+            </CheckboxWithLabel>
+
+            <CheckboxWithLabel checked={notificationPolicy.get('filter_private_mentions')} onChange={this.handleFilterPrivateMentions}>
+              <strong><FormattedMessage id='notifications.policy.filter_private_mentions_title' defaultMessage='Unsolicited private mentions' /></strong>
+              <span className='hint'><FormattedMessage id='notifications.policy.filter_private_mentions_hint' defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender" /></span>
+            </CheckboxWithLabel>
+          </div>
+        </section>
+
+        <section role='group' aria-labelledby='notifications-unread-markers'>
+          <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
-          </span>
+          </h3>
 
           <div className='column-settings__row'>
             <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['showUnread']} onChange={onChange} label={unreadMarkersShowStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-filter-bar'>
-          <span id='notifications-filter-bar' className='column-settings__section'>
+        <section role='group' aria-labelledby='notifications-filter-bar'>
+          <h3 id='notifications-filter-bar'>
             <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
-          </span>
+          </h3>
 
           <div className='column-settings__row'>
-            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterBarShowStr} />
-            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
+            <SettingToggle id='advanced-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow'>
-          <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
+        <section role='group' aria-labelledby='notifications-follow'>
+          <h3 id='notifications-follow'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
@@ -95,10 +142,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-follow-request'>
-          <span id='notifications-follow-request' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></span>
+        <section role='group' aria-labelledby='notifications-follow-request'>
+          <h3 id='notifications-follow-request'><FormattedMessage id='notifications.column_settings.follow_request' defaultMessage='New follow requests:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow_request']} onChange={onChange} label={alertStr} />
@@ -106,10 +153,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow_request']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow_request']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-favourite'>
-          <span id='notifications-favourite' className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></span>
+        <section role='group' aria-labelledby='notifications-favourite'>
+          <h3 id='notifications-favourite'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
@@ -117,10 +164,23 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-mention'>
-          <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
+        {enableEmojiReaction && (
+          <section role='group' aria-labelledby='notifications-emoji_reaction'>
+            <h3 id='notifications-emoji_reaction'><FormattedMessage id='notifications.column_settings.emoji_reaction' defaultMessage='Stamps:' /></h3>
+
+            <div className='column-settings__row'>
+              <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'emoji_reaction']} onChange={onChange} label={alertStr} />
+              {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'emoji_reaction']} onChange={this.onPushChange} label={pushStr} />}
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'emoji_reaction']} onChange={onChange} label={showStr} />
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'emoji_reaction']} onChange={onChange} label={soundStr} />
+            </div>
+          </section>
+        )}
+
+        <section role='group' aria-labelledby='notifications-mention'>
+          <h3 id='notifications-mention'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
@@ -128,10 +188,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'mention']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-reblog'>
-          <span id='notifications-reblog' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
+        <section role='group' aria-labelledby='notifications-reblog'>
+          <h3 id='notifications-reblog'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
@@ -139,10 +199,23 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-poll'>
-          <span id='notifications-poll' className='column-settings__section'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></span>
+        <section>
+          <div role='group' aria-labelledby='notifications-status_reference'>
+            <h3 id='notifications-status_reference'><FormattedMessage id='notifications.column_settings.status_reference' defaultMessage='Quotes:' /></h3>
+
+            <div className='column-settings__row'>
+              <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status_reference']} onChange={onChange} label={alertStr} />
+              {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'status_reference']} onChange={this.onPushChange} label={pushStr} />}
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'status_reference']} onChange={onChange} label={showStr} />
+              <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'status_reference']} onChange={onChange} label={soundStr} />
+            </div>
+          </div>
+        </section>
+
+        <section role='group' aria-labelledby='notifications-poll'>
+          <h3 id='notifications-poll'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
@@ -150,10 +223,10 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'poll']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'poll']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-status'>
-          <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></span>
+        <section role='group' aria-labelledby='notifications-status'>
+          <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.status' defaultMessage='New posts:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status']} onChange={onChange} label={alertStr} />
@@ -161,10 +234,21 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'status']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'status']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
-        <div role='group' aria-labelledby='notifications-update'>
-          <span id='notifications-update' className='column-settings__section'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></span>
+        <section role='group' aria-labelledby='notifications-list_status'>
+          <h3 id='notifications-list_status'><FormattedMessage id='notifications.column_settings.list_status' defaultMessage='New posts of list:' /></h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'list_status']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'list_status']} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'list_status']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'list_status']} onChange={onChange} label={soundStr} />
+          </div>
+        </section>
+
+        <section role='group' aria-labelledby='notifications-update'>
+          <h3 id='notifications-update'><FormattedMessage id='notifications.column_settings.update' defaultMessage='Edits:' /></h3>
 
           <div className='column-settings__row'>
             <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'update']} onChange={onChange} label={alertStr} />
@@ -172,11 +256,11 @@ export default class ColumnSettings extends PureComponent {
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'update']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'update']} onChange={onChange} label={soundStr} />
           </div>
-        </div>
+        </section>
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) && (
-          <div role='group' aria-labelledby='notifications-admin-sign-up'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-sign-up'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.sign_up' defaultMessage='New sign-ups:' /></h3>
 
             <div className='column-settings__row'>
               <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.sign_up']} onChange={onChange} label={alertStr} />
@@ -184,12 +268,12 @@ export default class ColumnSettings extends PureComponent {
               <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.sign_up']} onChange={onChange} label={showStr} />
               <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.sign_up']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
 
         {((this.context.identity.permissions & PERMISSION_MANAGE_REPORTS) === PERMISSION_MANAGE_REPORTS) && (
-          <div role='group' aria-labelledby='notifications-admin-report'>
-            <span id='notifications-status' className='column-settings__section'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></span>
+          <section role='group' aria-labelledby='notifications-admin-report'>
+            <h3 id='notifications-status'><FormattedMessage id='notifications.column_settings.admin.report' defaultMessage='New reports:' /></h3>
 
             <div className='column-settings__row'>
               <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'admin.report']} onChange={onChange} label={alertStr} />
@@ -197,7 +281,7 @@ export default class ColumnSettings extends PureComponent {
               <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'admin.report']} onChange={onChange} label={showStr} />
               <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'admin.report']} onChange={onChange} label={soundStr} />
             </div>
-          </div>
+          </section>
         )}
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
index f5651a7d44..f5e8762db9 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
@@ -3,18 +3,23 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { Icon }  from 'mastodon/components/icon';
+import { enableEmojiReaction } from 'mastodon/initial_state';
 
 const tooltips = defineMessages({
   mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
   favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' },
+  emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Stamps' },
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  status_references: { id: 'notifications.filter.status_references', defaultMessage: 'Status references' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
   statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
@@ -81,6 +86,15 @@ class FilterBar extends PureComponent {
         >
           <Icon id='star' icon={StarIcon} />
         </button>
+        {enableEmojiReaction && (
+          <button
+            className={selectedFilter === 'emoji_reaction' ? 'active' : ''}
+            onClick={this.onClick('emoji_reaction')}
+            title={intl.formatMessage(tooltips.emojiReactions)}
+          >
+            <Icon id='smile-o' icon={EmojiReactionIcon} fixedWidth />
+          </button>
+        )}
         <button
           className={selectedFilter === 'reblog' ? 'active' : ''}
           onClick={this.onClick('reblog')}
@@ -88,6 +102,13 @@ class FilterBar extends PureComponent {
         >
           <Icon id='retweet' icon={RepeatIcon} />
         </button>
+        <button
+          className={selectedFilter === 'status_reference' ? 'active' : ''}
+          onClick={this.onClick('status_reference')}
+          title={intl.formatMessage(tooltips.status_references)}
+        >
+          <Icon id='link' icon={ReferenceIcon} fixedWidth />
+        </button>
         <button
           className={selectedFilter === 'poll' ? 'active' : ''}
           onClick={this.onClick('poll')}
diff --git a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
new file mode 100644
index 0000000000..56da7ba626
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.jsx
@@ -0,0 +1,49 @@
+import { useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import { fetchNotificationPolicy } from 'mastodon/actions/notifications';
+import { Icon } from 'mastodon/components/icon';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+export const FilteredNotificationsBanner = () => {
+  const dispatch = useDispatch();
+  const policy = useSelector(state => state.get('notificationPolicy'));
+
+  useEffect(() => {
+    dispatch(fetchNotificationPolicy());
+
+    const interval = setInterval(() => {
+      dispatch(fetchNotificationPolicy());
+    }, 120000);
+
+    return () => {
+      clearInterval(interval);
+    };
+  }, [dispatch]);
+
+  if (policy === null || policy.getIn(['summary', 'pending_notifications_count']) === 0) {
+    return null;
+  }
+
+  return (
+    <Link className='filtered-notifications-banner' to='/notifications/requests'>
+      <Icon icon={InventoryIcon} />
+
+      <div className='filtered-notifications-banner__text'>
+        <strong><FormattedMessage id='filtered_notifications_banner.title' defaultMessage='Filtered notifications' /></strong>
+        <span><FormattedMessage id='filtered_notifications_banner.pending_requests' defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know' values={{ count: policy.getIn(['summary', 'pending_requests_count']) }} /></span>
+      </div>
+
+      <div className='filtered-notifications-banner__badge'>
+        <div className='filtered-notifications-banner__badge__badge'>{toCappedNumber(policy.getIn(['summary', 'pending_notifications_count']))}</div>
+        <FormattedMessage id='filtered_notifications_banner.mentions' defaultMessage='{count, plural, one {mention} other {mentions}}' values={{ count: policy.getIn(['summary', 'pending_notifications_count']) }} />
+      </div>
+    </Link>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.jsx b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
index c6a039adb5..4024455cbd 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
new file mode 100644
index 0000000000..2129f0d8ae
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -0,0 +1,83 @@
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
+import { Icon } from 'mastodon/components/icon';
+
+// This needs to be kept in sync with app/models/account_warning.rb
+const messages = defineMessages({
+  none: {
+    id: 'notification.moderation_warning.action_none',
+    defaultMessage: 'Your account has received a moderation warning.',
+  },
+  disable: {
+    id: 'notification.moderation_warning.action_disable',
+    defaultMessage: 'Your account has been disabled.',
+  },
+  force_cw: {
+    id: 'notification.moderation_warning.action_force_cw',
+    defaultMessage: 'Some of your posts have been added content-warning text.',
+  },
+  mark_statuses_as_sensitive: {
+    id: 'notification.moderation_warning.action_mark_statuses_as_sensitive',
+    defaultMessage: 'Some of your posts have been marked as sensitive.',
+  },
+  delete_statuses: {
+    id: 'notification.moderation_warning.action_delete_statuses',
+    defaultMessage: 'Some of your posts have been removed.',
+  },
+  sensitive: {
+    id: 'notification.moderation_warning.action_sensitive',
+    defaultMessage: 'Your posts will be marked as sensitive from now on.',
+  },
+  silence: {
+    id: 'notification.moderation_warning.action_silence',
+    defaultMessage: 'Your account has been limited.',
+  },
+  suspend: {
+    id: 'notification.moderation_warning.action_suspend',
+    defaultMessage: 'Your account has been suspended.',
+  },
+});
+
+interface Props {
+  action:
+    | 'none'
+    | 'disable'
+    | 'force_cw'
+    | 'mark_statuses_as_sensitive'
+    | 'delete_statuses'
+    | 'sensitive'
+    | 'silence'
+    | 'suspend';
+  id: string;
+  hidden: boolean;
+}
+
+export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a
+      href={`/disputes/strikes/${id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className='notification__moderation-warning'
+    >
+      <Icon id='warning' icon={GavelIcon} />
+
+      <div className='notification__moderation-warning__content'>
+        <p>{intl.formatMessage(messages[action])}</p>
+        <span className='link-button'>
+          <FormattedMessage
+            id='notification.moderation-warning.learn_more'
+            defaultMessage='Learn more'
+          />
+        </span>
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 35b31fcd47..f697a7f211 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -10,14 +10,17 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
-import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import EmojiView from 'mastodon/components/emoji_view';
 import { Icon }  from 'mastodon/components/icon';
 import AccountContainer from 'mastodon/containers/account_container';
 import StatusContainer from 'mastodon/containers/status_container';
@@ -26,18 +29,25 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import FollowRequestContainer from '../containers/follow_request_container';
 
+import { ModerationWarning } from './moderation_warning';
+import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
   favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your status' },
+  emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your status with emoji' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
   poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
+  listStatus: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' },
+  statusReference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+  relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
+  moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'You have received a moderation warning' },
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -211,6 +221,41 @@ class Notification extends ImmutablePureComponent {
             updateScrollBottom={this.props.updateScrollBottom}
             cachedMediaWidth={this.props.cachedMediaWidth}
             cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderEmojiReaction (notification, link) {
+    const { intl, unread } = this.props;
+    const emoji_reaction = notification.get('emoji_reaction');
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-emoji_reaction focusable', { unread })} tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.emojiReaction, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__emoji_reaction-icon-wrapper'>
+              <EmojiView name={emoji_reaction.get('name')} url={emoji_reaction.get('url')} staticUrl={emoji_reaction.get('static_url')} className='star-icon' fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your status with emoji' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusContainer
+            id={notification.get('status')}
+            account={notification.get('account')}
+            muted
+            withDismiss
+            hidden={!!this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
           />
         </div>
       </HotKeys>
@@ -241,6 +286,41 @@ class Notification extends ImmutablePureComponent {
             updateScrollBottom={this.props.updateScrollBottom}
             cachedMediaWidth={this.props.cachedMediaWidth}
             cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderStatusReference (notification, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-status_reference focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.statusReference, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <div className='notification__favourite-icon-wrapper'>
+              <Icon id='link' icon={ReferenceIcon} fixedWidth />
+            </div>
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.status_reference' defaultMessage='{name} quoted your post' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusContainer
+            id={notification.get('status')}
+            withDismiss
+            hidden={this.props.hidden}
+            onMoveDown={this.handleMoveDown}
+            onMoveUp={this.handleMoveUp}
+            contextType='notifications'
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+            unread={this.props.unread}
           />
         </div>
       </HotKeys>
@@ -267,7 +347,6 @@ class Notification extends ImmutablePureComponent {
 
           <StatusContainer
             id={notification.get('status')}
-            account={notification.get('account')}
             contextType='notifications'
             muted
             withDismiss
@@ -276,6 +355,42 @@ class Notification extends ImmutablePureComponent {
             updateScrollBottom={this.props.updateScrollBottom}
             cachedMediaWidth={this.props.cachedMediaWidth}
             cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderListStatus (notification, listLink, link) {
+    const { intl, unread, status } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-list_status focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.listStatus, { name: notification.getIn(['account', 'acct']), listName: notification.getIn(['list', 'title']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='list-ul' icon={ListAltIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.list_status' defaultMessage='{name} post is added to {listName}' values={{ listName: listLink, name: link }} />
+            </span>
+          </div>
+
+          <StatusContainer
+            id={notification.get('status')}
+            contextType='notifications'
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
           />
         </div>
       </HotKeys>
@@ -311,6 +426,7 @@ class Notification extends ImmutablePureComponent {
             updateScrollBottom={this.props.updateScrollBottom}
             cachedMediaWidth={this.props.cachedMediaWidth}
             cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
           />
         </div>
       </HotKeys>
@@ -352,6 +468,51 @@ class Notification extends ImmutablePureComponent {
             updateScrollBottom={this.props.updateScrollBottom}
             cachedMediaWidth={this.props.cachedMediaWidth}
             cacheMediaWidth={this.props.cacheMediaWidth}
+            withoutEmojiReactions
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+  
+  renderRelationshipsSevered (notification) {
+    const { intl, unread, hidden } = this.props;
+    const event = notification.get('event');
+
+    if (!event) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.relationshipsSevered, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
+          <RelationshipsSeveranceEvent
+            type={event.get('type')}
+            target={event.get('target_name')}
+            followersCount={event.get('followers_count')}
+            followingCount={event.get('following_count')}
+            hidden={hidden}
+          />
+        </div>
+      </HotKeys>
+    );
+  }
+
+  renderModerationWarning (notification) {
+    const { intl, unread, hidden } = this.props;
+    const warning = notification.get('moderation_warning');
+
+    if (!warning) {
+      return null;
+    }
+
+    return (
+      <HotKeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
+          <ModerationWarning
+            action={warning.get('action')}
+            id={warning.get('id')}
+            hidden={hidden}
           />
         </div>
       </HotKeys>
@@ -421,14 +582,26 @@ class Notification extends ImmutablePureComponent {
       return this.renderMention(notification);
     case 'favourite':
       return this.renderFavourite(notification, link);
+    case 'emoji_reaction':
+      return this.renderEmojiReaction(notification, link);
     case 'reblog':
       return this.renderReblog(notification, link);
+    case 'status_reference':
+      return this.renderStatusReference(notification, link);
     case 'status':
       return this.renderStatus(notification, link);
+    case 'list_status':
+      const list = notification.get('list');
+      const listLink = <bdi><Link className='notification__display-name' href={`/lists/${list.get('id')}`} title={list.get('title')} to={`/lists/${list.get('id')}`}>{list.get('title')}</Link></bdi>;
+      return this.renderListStatus(notification, listLink, link);
     case 'update':
       return this.renderUpdate(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
+    case 'severed_relationships':
+      return this.renderRelationshipsSevered(notification);
+    case 'moderation_warning':
+      return this.renderModerationWarning(notification);
     case 'admin.sign_up':
       return this.renderAdminSignUp(notification, account, link);
     case 'admin.report':
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
new file mode 100644
index 0000000000..3a77ef4e2e
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -0,0 +1,65 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import { Avatar } from 'mastodon/components/avatar';
+import { IconButton } from 'mastodon/components/icon_button';
+import { makeGetAccount } from 'mastodon/selectors';
+import { toCappedNumber } from 'mastodon/utils/numbers';
+
+const getAccount = makeGetAccount();
+
+const messages = defineMessages({
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+export const NotificationRequest = ({ id, accountId, notificationsCount }) => {
+  const dispatch = useDispatch();
+  const account = useSelector(state => getAccount(state, accountId));
+  const intl = useIntl();
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  return (
+    <div className='notification-request'>
+      <Link to={`/notifications/requests/${id}`} className='notification-request__link'>
+        <Avatar account={account} size={36} />
+
+        <div className='notification-request__name'>
+          <div className='notification-request__name__display-name'>
+            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
+            <span className='filtered-notifications-banner__badge'>{toCappedNumber(notificationsCount)}</span>
+          </div>
+
+          <span>@{account?.get('acct')}</span>
+        </div>
+      </Link>
+
+      <div className='notification-request__actions'>
+        <IconButton iconComponent={DeleteIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+        <IconButton iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+      </div>
+    </div>
+  );
+};
+
+NotificationRequest.propTypes = {
+  id: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  notificationsCount: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
index a577abd864..276bcbebad 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
+import SettingsIcon from '@/material-icons/400-20px/settings.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
 import { Button } from 'mastodon/components/button';
@@ -42,7 +42,7 @@ class NotificationsPermissionBanner extends PureComponent {
         </div>
 
         <h2><FormattedMessage id='notifications_permission_banner.title' defaultMessage='Never miss a thing' /></h2>
-        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={TuneIcon} /> }} /></p>
+        <p><FormattedMessage id='notifications_permission_banner.how_to_control' defaultMessage="To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled." values={{ icon: <Icon id='sliders' icon={SettingsIcon} /> }} /></p>
         <Button onClick={this.handleClick}><FormattedMessage id='notifications_permission_banner.enable' defaultMessage='Enable desktop notifications' /></Button>
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
new file mode 100644
index 0000000000..738159fc5a
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -0,0 +1,45 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
+import { Icon }  from 'mastodon/components/icon';
+import { domain } from 'mastodon/initial_state';
+
+// This needs to be kept in sync with app/models/relationships_severance_event.rb
+const messages = defineMessages({
+  account_suspension: { id: 'notification.relationships_severance_event.account_suspension', defaultMessage: 'An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.' },
+  domain_block: { id: 'notification.relationships_severance_event.domain_block', defaultMessage: 'An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
+  user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
+});
+
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
+  const intl = useIntl();
+
+  if (hidden) {
+    return null;
+  }
+
+  return (
+    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
+      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+
+      <div className='notification__relationships-severance-event__content'>
+        <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
+        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
+      </div>
+    </a>
+  );
+};
+
+RelationshipsSeveranceEvent.propTypes = {
+  type: PropTypes.oneOf([
+    'account_suspension',
+    'domain_block',
+    'user_domain_block',
+  ]).isRequired,
+  target: PropTypes.string.isRequired,
+  followersCount: PropTypes.number.isRequired,
+  followingCount: PropTypes.number.isRequired,
+  hidden: PropTypes.bool,
+};
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 1e62ed9a5a..de266160f8 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, clearNotifications, requestBrowserPermission, updateNotificationsPolicy } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -21,6 +21,7 @@ const mapStateToProps = state => ({
   alertsEnabled: state.getIn(['settings', 'notifications', 'alerts']).includes(true),
   browserSupport: state.getIn(['notifications', 'browserSupport']),
   browserPermission: state.getIn(['notifications', 'browserPermission']),
+  notificationPolicy: state.get('notificationPolicy'),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
@@ -73,6 +74,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(requestBrowserPermission());
   },
 
+  onChangePolicy (param, checked) {
+    dispatch(updateNotificationsPolicy({
+      [param]: checked,
+    }));
+  },
+
 });
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 4458fd7bc3..9cb00b5595 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -1,13 +1,14 @@
 import { connect } from 'react-redux';
 
-import { initBoostModal } from '../../../actions/boosts';
 import { mentionCompose } from '../../../actions/compose';
 import {
   reblog,
   favourite,
   unreblog,
   unfavourite,
+  emojiReact,
 } from '../../../actions/interactions';
+import { openModal } from '../../../actions/modal';
 import {
   hideStatus,
   revealStatus,
@@ -49,11 +50,19 @@ const mapDispatchToProps = dispatch => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
 
+  onReblogForceModal (status) {
+    if (status.get('reblogged')) {
+      dispatch(unreblog(status));
+    } else {
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
+    }
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
@@ -62,6 +71,10 @@ const mapDispatchToProps = dispatch => ({
     }
   },
 
+  onEmojiReact (status, emoji) {
+    dispatch(emojiReact(status, emoji));
+  },
+
   onToggleHidden (status) {
     if (status.get('hidden')) {
       dispatch(revealStatus(status.get('id')));
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 0751f1620c..e062957ff8 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -12,8 +12,8 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import { compareId } from 'mastodon/compare_id';
 import { Icon }  from 'mastodon/components/icon';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
@@ -33,6 +33,7 @@ import ColumnHeader from '../../components/column_header';
 import { LoadGap } from '../../components/load_gap';
 import ScrollableList from '../../components/scrollable_list';
 
+import { FilteredNotificationsBanner } from './components/filtered_notifications_banner';
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
@@ -65,7 +66,6 @@ const getNotifications = createSelector([
 });
 
 const mapStateToProps = state => ({
-  showFilterBar: state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
   notifications: getNotifications(state),
   isLoading: state.getIn(['notifications', 'isLoading'], 0) > 0,
   isUnread: state.getIn(['notifications', 'unread']) > 0 || state.getIn(['notifications', 'pendingItems']).size > 0,
@@ -85,7 +85,6 @@ class Notifications extends PureComponent {
   static propTypes = {
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
-    showFilterBar: PropTypes.bool.isRequired,
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     isLoading: PropTypes.bool,
@@ -188,14 +187,14 @@ class Notifications extends PureComponent {
   };
 
   render () {
-    const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, showFilterBar, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
+    const { intl, notifications, isLoading, isUnread, columnId, multiColumn, hasMore, numPending, lastReadId, canMarkAsRead, needsNotificationPermission } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here." />;
     const { signedIn } = this.context.identity;
 
     let scrollableContent = null;
 
-    const filterBarContainer = (signedIn && showFilterBar)
+    const filterBarContainer = signedIn
       ? (<FilterBarContainer />)
       : null;
 
@@ -285,6 +284,9 @@ class Notifications extends PureComponent {
         </ColumnHeader>
 
         {filterBarContainer}
+
+        <FilteredNotificationsBanner />
+
         {scrollContainer}
 
         <Helmet>
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
new file mode 100644
index 0000000000..09bef3beab
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -0,0 +1,147 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import DoneIcon from '@/material-icons/400-24px/done.svg?react';
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import { IconButton } from 'mastodon/components/icon_button';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import { SensitiveMediaContextProvider } from 'mastodon/features/ui/util/sensitive_media_context';
+
+import NotificationContainer from './containers/notification_container';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.notifications_from', defaultMessage: 'Notifications from {name}' },
+  accept: { id: 'notification_requests.accept', defaultMessage: 'Accept' },
+  dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
+});
+
+const selectChild = (ref, index, alignTop) => {
+  const container = ref.current.node;
+  const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
+
+  if (element) {
+    if (alignTop && container.scrollTop > element.offsetTop) {
+      element.scrollIntoView(true);
+    } else if (!alignTop && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
+      element.scrollIntoView(false);
+    }
+
+    element.focus();
+  }
+};
+
+export const NotificationRequest = ({ multiColumn, params: { id } }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const notificationRequest = useSelector(state => state.getIn(['notificationRequests', 'current', 'item', 'id']) === id ? state.getIn(['notificationRequests', 'current', 'item']) : null);
+  const accountId = notificationRequest?.get('account');
+  const account = useSelector(state => state.getIn(['accounts', accountId]));
+  const notifications = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'items']));
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'isLoading']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'current', 'notifications', 'next']));
+  const removed = useSelector(state => state.getIn(['notificationRequests', 'current', 'removed']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationsForRequest());
+  }, [dispatch]);
+
+  const handleDismiss = useCallback(() => {
+    dispatch(dismissNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleAccept = useCallback(() => {
+    dispatch(acceptNotificationRequest(id));
+  }, [dispatch, id]);
+
+  const handleMoveUp = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) - 1;
+    selectChild(columnRef, elementIndex, true);
+  }, [columnRef, notifications]);
+
+  const handleMoveDown = useCallback(id => {
+    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) + 1;
+    selectChild(columnRef, elementIndex, false);
+  }, [columnRef, notifications]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequest(id));
+  }, [dispatch, id]);
+
+  useEffect(() => {
+    if (accountId) {
+      dispatch(fetchNotificationsForRequest(accountId));
+    }
+  }, [dispatch, accountId]);
+
+  const columnTitle = intl.formatMessage(messages.title, { name: account?.get('display_name') || account?.get('username') });
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={columnTitle}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={InventoryIcon}
+        title={columnTitle}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+        extraButton={!removed && (
+          <>
+            <IconButton className='column-header__button' iconComponent={VolumeOffIcon} onClick={handleDismiss} title={intl.formatMessage(messages.dismiss)} />
+            <IconButton className='column-header__button' iconComponent={DoneIcon} onClick={handleAccept} title={intl.formatMessage(messages.accept)} />
+          </>
+        )}
+      />
+
+      <SensitiveMediaContextProvider hideMediaByDefault>
+        <ScrollableList
+          scrollKey={`notification_requests/${id}`}
+          trackScroll={!multiColumn}
+          bindToDocument={!multiColumn}
+          isLoading={isLoading}
+          showLoading={isLoading && notifications.size === 0}
+          hasMore={hasMore}
+          onLoadMore={handleLoadMore}
+        >
+          {notifications.map(item => (
+            item && <NotificationContainer
+              key={item.get('id')}
+              notification={item}
+              accountId={item.get('account')}
+              onMoveUp={handleMoveUp}
+              onMoveDown={handleMoveDown}
+            />
+          ))}
+        </ScrollableList>
+      </SensitiveMediaContextProvider>
+
+      <Helmet>
+        <title>{columnTitle}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequest.propTypes = {
+  multiColumn: PropTypes.bool,
+  params: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+  }),
+};
+
+export default NotificationRequest;
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
new file mode 100644
index 0000000000..2d10c6a06c
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -0,0 +1,85 @@
+import PropTypes from 'prop-types';
+import { useRef, useCallback, useEffect } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { useSelector, useDispatch } from 'react-redux';
+
+import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
+import { fetchNotificationRequests, expandNotificationRequests } from 'mastodon/actions/notifications';
+import Column from 'mastodon/components/column';
+import ColumnHeader from 'mastodon/components/column_header';
+import ScrollableList from 'mastodon/components/scrollable_list';
+
+import { NotificationRequest } from './components/notification_request';
+
+const messages = defineMessages({
+  title: { id: 'notification_requests.title', defaultMessage: 'Filtered notifications' },
+});
+
+export const NotificationRequests = ({ multiColumn }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'isLoading']));
+  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
+  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, [columnRef]);
+
+  const handleLoadMore = useCallback(() => {
+    dispatch(expandNotificationRequests());
+  }, [dispatch]);
+
+  useEffect(() => {
+    dispatch(fetchNotificationRequests());
+  }, [dispatch]);
+
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
+      <ColumnHeader
+        icon='archive'
+        iconComponent={InventoryIcon}
+        title={intl.formatMessage(messages.title)}
+        onClick={handleHeaderClick}
+        multiColumn={multiColumn}
+        showBackButton
+      />
+
+      <ScrollableList
+        scrollKey='notification_requests'
+        trackScroll={!multiColumn}
+        bindToDocument={!multiColumn}
+        isLoading={isLoading}
+        showLoading={isLoading && notificationRequests.size === 0}
+        hasMore={hasMore}
+        onLoadMore={handleLoadMore}
+        emptyMessage={<FormattedMessage id='empty_column.notification_requests' defaultMessage='All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.' />}
+      >
+        {notificationRequests.map(request => (
+          <NotificationRequest
+            key={request.get('id')}
+            id={request.get('id')}
+            accountId={request.get('account')}
+            notificationsCount={request.get('notifications_count')}
+          />
+        ))}
+      </ScrollableList>
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+NotificationRequests.propTypes = {
+  multiColumn: PropTypes.bool,
+};
+
+export default NotificationRequests;
diff --git a/app/javascript/mastodon/features/onboarding/components/step.jsx b/app/javascript/mastodon/features/onboarding/components/step.jsx
index 46c9b1645d..a2a1653b8a 100644
--- a/app/javascript/mastodon/features/onboarding/components/step.jsx
+++ b/app/javascript/mastodon/features/onboarding/components/step.jsx
@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 
 import { Link } from 'react-router-dom';
 
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 9271468da0..125584b418 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -8,16 +8,17 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 
-import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
-import AccountCircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
-import EditNoteIcon from 'mastodon/../material-icons/400-24px/edit_note.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import illustration from '@/images/elephant_ui_conversation.svg';
+import AccountCircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
+import EditNoteIcon from '@/material-icons/400-24px/edit_note.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import { focusCompose } from 'mastodon/actions/compose';
 import { Icon }  from 'mastodon/components/icon';
+import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
 import Column from 'mastodon/features/ui/components/column';
-import { me } from 'mastodon/initial_state';
+import { enableLocalTimeline, me } from 'mastodon/initial_state';
 import { useAppSelector } from 'mastodon/store';
 import { assetHost } from 'mastodon/utils/config';
 
@@ -42,42 +43,51 @@ const Onboarding = () => {
 
   return (
     <Column>
-      <Switch>
-        <Route path='/start' exact>
-          <div className='scrollable privacy-policy'>
-            <div className='column-title'>
-              <img src={illustration} alt='' className='onboarding__illustration' />
-              <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
-              <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
+      {account ? (
+        <Switch>
+          <Route path='/start' exact>
+            <div className='scrollable privacy-policy'>
+              <div className='column-title'>
+                <img src={illustration} alt='' className='onboarding__illustration' />
+                <h3><FormattedMessage id='onboarding.start.title' defaultMessage="You've made it!" /></h3>
+                <p><FormattedMessage id='onboarding.start.lead' defaultMessage="Your new Mastodon account is ready to go. Here's how you can make the most of it:" /></p>
+              </div>
+
+              <div className='onboarding__steps'>
+                <Step to='/start/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
+                <Step to='/start/follows' completed={(account.get('following_count') * 1) >= 1} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
+                <Step onClick={handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
+                <Step to='/start/share' icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
+              </div>
+
+              <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
+
+              <div className='onboarding__links'>
+                <Link to='/explore' className='onboarding__link'>
+                  <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
+                  <Icon icon={ArrowRightAltIcon} />
+                </Link>
+
+                {enableLocalTimeline && (
+                  <Link to='/public/local/fixed' className='onboarding__link'>
+                    <FormattedMessage id='onboarding.actions.go_to_local_timeline' defaultMessage='See posts from local' />
+                    <Icon icon={ArrowRightAltIcon} />
+                  </Link>
+                )}
+
+                <Link to='/home' className='onboarding__link'>
+                  <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
+                  <Icon icon={ArrowRightAltIcon} />
+                </Link>
+              </div>
             </div>
+          </Route>
 
-            <div className='onboarding__steps'>
-              <Step to='/start/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' iconComponent={AccountCircleIcon} label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
-              <Step to='/start/follows' completed={(account.get('following_count') * 1) >= 1} icon='user-plus' iconComponent={PersonAddIcon} label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
-              <Step onClick={handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' iconComponent={EditNoteIcon} label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' values={{ emoji: <img className='emojione' alt='🐘' src={`${assetHost}/emoji/1f418.svg`} /> }} />} />
-              <Step to='/start/share' icon='copy' iconComponent={ContentCopyIcon} label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
-            </div>
-
-            <p className='onboarding__lead'><FormattedMessage id='onboarding.start.skip' defaultMessage="Don't need help getting started?" /></p>
-
-            <div className='onboarding__links'>
-              <Link to='/explore' className='onboarding__link'>
-                <FormattedMessage id='onboarding.actions.go_to_explore' defaultMessage='Take me to trending' />
-                <Icon icon={ArrowRightAltIcon} />
-              </Link>
-
-              <Link to='/home' className='onboarding__link'>
-                <FormattedMessage id='onboarding.actions.go_to_home' defaultMessage='Take me to my home feed' />
-                <Icon icon={ArrowRightAltIcon} />
-              </Link>
-            </div>
-          </div>
-        </Route>
-
-        <Route path='/start/profile' component={Profile} />
-        <Route path='/start/follows' component={Follows} />
-        <Route path='/start/share' component={Share} />
-      </Switch>
+          <Route path='/start/profile' component={Profile} />
+          <Route path='/start/follows' component={Follows} />
+          <Route path='/start/share' component={Share} />
+        </Switch>
+      ) : <NotSignedInIndicator />}
 
       <Helmet>
         <meta name='robots' content='noindex' />
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
index 5217b42ad5..14250ae39b 100644
--- a/app/javascript/mastodon/features/onboarding/profile.jsx
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -10,8 +10,8 @@ import { useDispatch } from 'react-redux';
 
 import Toggle from 'react-toggle';
 
-import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
+import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import { updateAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index cde63d0b34..32a86ab6cc 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -9,8 +9,8 @@ import { Link } from 'react-router-dom';
 
 import SwipeableViews from 'react-swipeable-views';
 
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { Icon }  from 'mastodon/components/icon';
 import { me, domain } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index d60cd5e1ef..6b7a739b0b 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -9,12 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import { initBoostModal } from 'mastodon/actions/boosts';
+import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
@@ -140,7 +139,7 @@ class Footer extends ImmutablePureComponent {
       } else if ((e && e.shiftKey) || !boostModal) {
         this._performReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this._performReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this._performReblog } }));
       }
     } else {
       dispatch(openModal({
@@ -155,12 +154,12 @@ class Footer extends ImmutablePureComponent {
   };
 
   handleOpenClick = e => {
+    const { status, onClose, history } = this.props;
+
     if (e.button !== 0 || !history) {
       return;
     }
 
-    const { status, onClose } = this.props;
-
     if (onClose) {
       onClose();
     }
@@ -171,8 +170,8 @@ class Footer extends ImmutablePureComponent {
   render () {
     const { status, intl, withOpenButton } = this.props;
 
-    const publicStatus  = ['public', 'unlisted'].includes(status.get('visibility'));
-    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
+    const publicStatus  = ['public', 'unlisted', 'public_unlisted', 'login'].includes(status.get('visibility_ex'));
+    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility_ex') === 'private';
 
     let replyIcon, replyIconComponent, replyTitle;
 
@@ -210,4 +209,4 @@ class Footer extends ImmutablePureComponent {
 
 }
 
-export default  withRouter(connect(makeMapStateToProps)(injectIntl(Footer)));
+export default  connect(makeMapStateToProps)(withRouter(injectIntl(Footer)));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
deleted file mode 100644
index 12a5566d39..0000000000
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import { Avatar } from 'mastodon/components/avatar';
-import { DisplayName } from 'mastodon/components/display_name';
-import { IconButton } from 'mastodon/components/icon_button';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-const mapStateToProps = (state, { accountId }) => ({
-  account: state.getIn(['accounts', accountId]),
-});
-
-class Header extends ImmutablePureComponent {
-
-  static propTypes = {
-    accountId: PropTypes.string.isRequired,
-    statusId: PropTypes.string.isRequired,
-    account: ImmutablePropTypes.record.isRequired,
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { account, statusId, onClose, intl } = this.props;
-
-    return (
-      <div className='picture-in-picture__header'>
-        <Link to={`/@${account.get('acct')}/${statusId}`} className='picture-in-picture__header__account'>
-          <Avatar account={account} size={36} />
-          <DisplayName account={account} />
-        </Link>
-
-        <IconButton icon='times' iconComponent={CloseIcon} onClick={onClose} title={intl.formatMessage(messages.close)} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.tsx b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
new file mode 100644
index 0000000000..0f897dc441
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.tsx
@@ -0,0 +1,46 @@
+import { defineMessages, useIntl } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { IconButton } from 'mastodon/components/icon_button';
+import { useAppSelector } from 'mastodon/store';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+});
+
+interface Props {
+  accountId: string;
+  statusId: string;
+  onClose: () => void;
+}
+
+export const Header: React.FC<Props> = ({ accountId, statusId, onClose }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  const intl = useIntl();
+
+  if (!account) return null;
+
+  return (
+    <div className='picture-in-picture__header'>
+      <Link
+        to={`/@${account.get('acct')}/${statusId}`}
+        className='picture-in-picture__header__account'
+      >
+        <Avatar account={account} size={36} />
+        <DisplayName account={account} />
+      </Link>
+
+      <IconButton
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onClose}
+        title={intl.formatMessage(messages.close)}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.jsx b/app/javascript/mastodon/features/picture_in_picture/index.jsx
deleted file mode 100644
index f087cd1b1d..0000000000
--- a/app/javascript/mastodon/features/picture_in_picture/index.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-
-import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
-import Audio from 'mastodon/features/audio';
-import Video from 'mastodon/features/video';
-
-import Footer from './components/footer';
-import Header from './components/header';
-
-const mapStateToProps = state => ({
-  ...state.get('picture_in_picture'),
-});
-
-class PictureInPicture extends Component {
-
-  static propTypes = {
-    statusId: PropTypes.string,
-    accountId: PropTypes.string,
-    type: PropTypes.string,
-    src: PropTypes.string,
-    muted: PropTypes.bool,
-    volume: PropTypes.number,
-    currentTime: PropTypes.number,
-    poster: PropTypes.string,
-    backgroundColor: PropTypes.string,
-    foregroundColor: PropTypes.string,
-    accentColor: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-  };
-
-  handleClose = () => {
-    const { dispatch } = this.props;
-    dispatch(removePictureInPicture());
-  };
-
-  render () {
-    const { type, src, currentTime, accountId, statusId } = this.props;
-
-    if (!currentTime) {
-      return null;
-    }
-
-    let player;
-
-    if (type === 'video') {
-      player = (
-        <Video
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          autoPlay
-          inline
-          alwaysVisible
-        />
-      );
-    } else if (type === 'audio') {
-      player = (
-        <Audio
-          src={src}
-          currentTime={this.props.currentTime}
-          volume={this.props.volume}
-          muted={this.props.muted}
-          poster={this.props.poster}
-          backgroundColor={this.props.backgroundColor}
-          foregroundColor={this.props.foregroundColor}
-          accentColor={this.props.accentColor}
-          autoPlay
-        />
-      );
-    }
-
-    return (
-      <div className='picture-in-picture'>
-        <Header accountId={accountId} statusId={statusId} onClose={this.handleClose} />
-
-        {player}
-
-        <Footer statusId={statusId} />
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(PictureInPicture);
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.tsx b/app/javascript/mastodon/features/picture_in_picture/index.tsx
new file mode 100644
index 0000000000..51b72f9725
--- /dev/null
+++ b/app/javascript/mastodon/features/picture_in_picture/index.tsx
@@ -0,0 +1,79 @@
+import { useCallback } from 'react';
+
+import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
+import Audio from 'mastodon/features/audio';
+import Video from 'mastodon/features/video';
+import { useAppDispatch, useAppSelector } from 'mastodon/store/typed_functions';
+
+import Footer from './components/footer';
+import { Header } from './components/header';
+
+export const PictureInPicture: React.FC = () => {
+  const dispatch = useAppDispatch();
+
+  const handleClose = useCallback(() => {
+    dispatch(removePictureInPicture());
+  }, [dispatch]);
+
+  const pipState = useAppSelector((s) => s.picture_in_picture);
+
+  if (pipState.type === null) {
+    return null;
+  }
+
+  const {
+    type,
+    src,
+    currentTime,
+    accountId,
+    statusId,
+    volume,
+    muted,
+    poster,
+    backgroundColor,
+    foregroundColor,
+    accentColor,
+  } = pipState;
+
+  let player;
+
+  switch (type) {
+    case 'video':
+      player = (
+        <Video
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          autoPlay
+          inline
+          alwaysVisible
+        />
+      );
+      break;
+    case 'audio':
+      player = (
+        <Audio
+          src={src}
+          currentTime={currentTime}
+          volume={volume}
+          muted={muted}
+          poster={poster}
+          backgroundColor={backgroundColor}
+          foregroundColor={foregroundColor}
+          accentColor={accentColor}
+          autoPlay
+        />
+      );
+  }
+
+  return (
+    <div className='picture-in-picture'>
+      <Header accountId={accountId} statusId={statusId} onClose={handleClose} />
+
+      {player}
+
+      <Footer statusId={statusId} />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.jsx b/app/javascript/mastodon/features/pinned_statuses/index.jsx
index 3d6dc753e3..921e9a6072 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.jsx
+++ b/app/javascript/mastodon/features/pinned_statuses/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import { getStatusList } from 'mastodon/selectors';
 
 import { fetchPinnedStatuses } from '../../actions/pin_statuses';
diff --git a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
index 1ceec1ba66..c865f1bb02 100644
--- a/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/public_timeline/components/column_settings.jsx
@@ -20,11 +20,13 @@ class ColumnSettings extends PureComponent {
     const { settings, onChange } = this.props;
 
     return (
-      <div>
-        <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
-          <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
-        </div>
+      <div className='column-settings'>
+        <section>
+          <div className='column-settings__row'>
+            <SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media only' />} />
+            <SettingToggle settings={settings} settingPath={['other', 'onlyRemote']} onChange={onChange} label={<FormattedMessage id='community.column_settings.remote_only' defaultMessage='Remote only' />} />
+          </div>
+        </section>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 302a2956ed..3601dfeae8 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx b/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
new file mode 100644
index 0000000000..5aa1144708
--- /dev/null
+++ b/app/javascript/mastodon/features/reaction_deck/components/reaction_emoji.jsx
@@ -0,0 +1,84 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import { Button } from 'mastodon/components/button';
+import EmojiPickerDropdownContainer from 'mastodon/features/compose/containers/emoji_picker_dropdown_container';
+import emojify from 'mastodon/features/emoji/emoji';
+import { autoPlayGif } from 'mastodon/initial_state';
+
+const messages = defineMessages({
+  remove: { id: 'reaction_deck.remove', defaultMessage: 'Remove' },
+});
+
+class ReactionEmoji extends ImmutablePureComponent {
+
+  static propTypes = {
+    index: PropTypes.number,
+    emoji: PropTypes.string,
+    emojiMap: ImmutablePropTypes.map.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onRemove: PropTypes.func.isRequired,
+  };
+
+  static defaultProps = {
+    emoji: '',
+  };
+
+  handleChange = (emoji) => {
+    this.props.onChange(this.props.index, emoji);
+  };
+
+  handleRemove = () => {
+    this.props.onRemove(this.props.index);
+  };
+
+  render () {
+    const { intl, emojiMap, emoji } = this.props;
+
+    let content = null;
+
+    if (emojiMap.get(emoji)) {
+      const filename  = autoPlayGif ? emojiMap.getIn([emoji, 'url']) : emojiMap.getIn([emoji, 'static_url']);
+      const shortCode = `:${emoji}:`;
+
+      content = (
+        <img
+          draggable='false'
+          className='emojione custom-emoji'
+          alt={shortCode}
+          title={shortCode}
+          src={filename}
+        />
+      );
+    } else {
+      const html = { __html: emojify(emoji) };
+      content = (
+        <span dangerouslySetInnerHTML={html} />
+      );
+    }
+
+    return (
+      <div className='reaction_deck__emoji'>
+        <div className='reaction_deck__emoji__wrapper'>
+          <div className='reaction_deck__emoji__wrapper__content'>
+            <EmojiPickerDropdownContainer onPickEmoji={this.handleChange} />
+            <div>
+              {content}
+            </div>
+          </div>
+          <div className='reaction_deck__emoji__wrapper__options'>
+            <Button secondary text={intl.formatMessage(messages.remove)} onClick={this.handleRemove} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default connect()(injectIntl(ReactionEmoji));
diff --git a/app/javascript/mastodon/features/reaction_deck/index.jsx b/app/javascript/mastodon/features/reaction_deck/index.jsx
new file mode 100644
index 0000000000..9fa21041de
--- /dev/null
+++ b/app/javascript/mastodon/features/reaction_deck/index.jsx
@@ -0,0 +1,174 @@
+import PropTypes from 'prop-types';
+import { useEffect, useState } from "react";
+
+import { defineMessages, injectIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+import { Map as ImmutableMap } from 'immutable';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+
+import { DragDropContext, Droppable, Draggable } from '@hello-pangea/dnd';
+
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import { updateReactionDeck } from 'mastodon/actions/reaction_deck';
+import { Button } from 'mastodon/components/button';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon } from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import Column from 'mastodon/features/ui/components/column';
+
+
+import ReactionEmoji from './components/reaction_emoji';
+
+
+// https://medium.com/@wbern/getting-react-18s-strict-mode-to-work-with-react-beautiful-dnd-47bc909348e4
+/* eslint react/prop-types: 0 */
+const StrictModeDroppable = ({ children, ...props }) => {
+  const [enabled, setEnabled] = useState(false);
+  useEffect(() => {
+    const animation = requestAnimationFrame(() => setEnabled(true));
+    return () => {
+      cancelAnimationFrame(animation);
+      setEnabled(false);
+    };
+  }, []);
+  if (!enabled) {
+    return null;
+  }
+  return <Droppable {...props}>{children}</Droppable>;
+};
+/* eslint react/prop-types: 0 */
+
+const customEmojiMap = createSelector([state => state.get('custom_emojis')], items => items.reduce((map, emoji) => map.set(emoji.get('shortcode'), emoji), ImmutableMap()));
+
+const messages = defineMessages({
+  reaction_deck_add: { id: 'reaction_deck.add', defaultMessage: 'Add' },
+  heading: { id: 'column.reaction_deck', defaultMessage: 'Reaction deck' },
+});
+
+const mapStateToProps = (state, props) => ({
+  accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
+  deck: state.get('reaction_deck'),
+  emojiMap: customEmojiMap(state),
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  onChange: (emojis) => dispatch(updateReactionDeck(emojis)),
+});
+
+class ReactionDeck extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    deck: ImmutablePropTypes.list,
+    emojiMap: ImmutablePropTypes.map,
+    multiColumn: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+    onChange: PropTypes.func.isRequired,
+  };
+
+  deckToArray = () => {
+    const { deck } = this.props;
+
+    return deck.map((item) => item.get('name')).toArray();
+  };
+
+  handleReorder = (result) => {
+    const newDeck = this.deckToArray();
+    const deleted = newDeck.splice(result.source.index, 1);
+    newDeck.splice(result.destination.index, 0, deleted[0]);
+    this.props.onChange(newDeck);
+  };
+
+  handleChange = (index, emoji) => {
+    const newDeck = this.deckToArray();
+    newDeck[index] = emoji.native || emoji.id.replace(':', '');
+    this.props.onChange(newDeck);
+  };
+
+  handleRemove = (index) => {
+    const newDeck = this.deckToArray();
+    newDeck.splice(index, 1);
+    this.props.onChange(newDeck);
+  };
+
+  handleAdd = () => {
+    const newDeck = this.deckToArray();
+    newDeck.push('👍');
+    this.props.onChange(newDeck);
+  };
+
+  render () {
+    const { intl, deck, emojiMap, multiColumn } = this.props;
+
+    if (!deck) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <ColumnHeader
+          icon='smile-o'
+          iconComponent={EmojiReactionIcon}
+          title={intl.formatMessage(messages.heading)}
+          multiColumn={multiColumn}
+          showBackButton
+        />
+
+        <ScrollableList
+          scrollKey='reaction_deck'
+          bindToDocument={!multiColumn}
+        >
+          <DragDropContext onDragEnd={this.handleReorder}>
+            <StrictModeDroppable droppableId='deckitems'>
+              {(provided) => (
+                <div className='deckitems reaction_deck_container' {...provided.droppableProps} ref={provided.innerRef}>
+                  {deck.map((emoji, index) => (
+                    <Draggable key={index} draggableId={'' + index} index={index}>
+                      {(provided2) => (
+                        <div className='reaction_deck_container__row' ref={provided2.innerRef} {...provided2.draggableProps}>
+                          <span {...provided2.dragHandleProps}>
+                            <Icon id='bars' icon={MenuIcon} className='handle'  />
+                          </span>
+                          <ReactionEmoji emojiMap={emojiMap}
+                            emoji={emoji.get('name')}
+                            index={index}
+                            onChange={this.handleChange}
+                            onRemove={this.handleRemove}
+                            className='reaction_emoji'
+                          />
+                        </div>
+                      )}
+                    </Draggable>
+                  ))}
+                  {provided.placeholder}
+
+                  <Button text={intl.formatMessage(messages.reaction_deck_add)} onClick={this.handleAdd} />
+                </div>
+              )}
+            </StrictModeDroppable>
+          </DragDropContext>
+        </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ReactionDeck));
diff --git a/app/javascript/mastodon/features/reblogs/index.jsx b/app/javascript/mastodon/features/reblogs/index.jsx
index 0d5183fb88..3d1fc94cb7 100644
--- a/app/javascript/mastodon/features/reblogs/index.jsx
+++ b/app/javascript/mastodon/features/reblogs/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchReblogs, expandReblogs } from '../../actions/interactions';
diff --git a/app/javascript/mastodon/features/report/components/option.jsx b/app/javascript/mastodon/features/report/components/option.jsx
index d6949f0c51..7aa0dd1379 100644
--- a/app/javascript/mastodon/features/report/components/option.jsx
+++ b/app/javascript/mastodon/features/report/components/option.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import classNames from 'classnames';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
+import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class Option extends PureComponent {
diff --git a/app/javascript/mastodon/features/report/components/status_check_box.jsx b/app/javascript/mastodon/features/report/components/status_check_box.jsx
index 481ee3e5ed..68e4a5f5ca 100644
--- a/app/javascript/mastodon/features/report/components/status_check_box.jsx
+++ b/app/javascript/mastodon/features/report/components/status_check_box.jsx
@@ -42,7 +42,7 @@ class StatusCheckBox extends PureComponent {
           </div>
 
           <div>
-            <DisplayName account={status.get('account')} /> · <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span> <RelativeTimestamp timestamp={status.get('created_at')} />
+            <DisplayName account={status.get('account')} /> · <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('limited_scope') || status.get('visibility_ex')} /></span> <RelativeTimestamp timestamp={status.get('created_at')} />
           </div>
         </div>
 
diff --git a/app/javascript/mastodon/features/standalone/compose/index.jsx b/app/javascript/mastodon/features/standalone/compose/index.jsx
index c36e843f5a..241d9aadfd 100644
--- a/app/javascript/mastodon/features/standalone/compose/index.jsx
+++ b/app/javascript/mastodon/features/standalone/compose/index.jsx
@@ -1,21 +1,15 @@
-import { PureComponent } from 'react';
+import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
+import LoadingBarContainer from 'mastodon/features/ui/containers/loading_bar_container';
+import ModalContainer from 'mastodon/features/ui/containers/modal_container';
+import NotificationsContainer from 'mastodon/features/ui/containers/notifications_container';
 
-import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from '../../ui/containers/notifications_container';
+const Compose = () => (
+  <>
+    <ComposeFormContainer autoFocus withoutNavigation />
+    <NotificationsContainer />
+    <ModalContainer />
+    <LoadingBarContainer className='loading-bar' />
+  </>
+);
 
-export default class Compose extends PureComponent {
-
-  render () {
-    return (
-      <div>
-        <ComposeFormContainer autoFocus />
-        <NotificationsContainer />
-        <ModalContainer />
-        <LoadingBarContainer className='loading-bar' />
-      </div>
-    );
-  }
-
-}
+export default Compose;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index b760824558..15078e7f75 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -9,22 +9,27 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
-import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
+import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
+import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+
 import { IconButton } from '../../../components/icon_button';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
-import { me } from '../../../initial_state';
+import { enableEmojiReaction , bookmarkCategoryNeeded, me, isHideItem, boostMenu, boostModal } from '../../../initial_state';
+import EmojiPickerDropdown from '../../compose/containers/emoji_picker_dropdown_container';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -32,13 +37,17 @@ const messages = defineMessages({
   edit: { id: 'status.edit', defaultMessage: 'Edit' },
   direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
+  mentions: { id: 'status.mentions', defaultMessage: 'Mentioned users' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+  reblog_with_detail: { id: 'status.reblog_with_detail', defaultMessage: 'Boost with visibility' },
+  cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
+  bookmark_category: { id: 'status.bookmark_category', defaultMessage: 'Bookmark category' },
   more: { id: 'status.more', defaultMessage: 'More' },
   mute: { id: 'status.mute', defaultMessage: 'Mute @{name}' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
@@ -53,11 +62,14 @@ const messages = defineMessages({
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
+  reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
+  quote: { id: 'status.quote', defaultMessage: 'Quote' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
+  pickEmoji: { id: 'status.emoji_reaction.pick', defaultMessage: 'Pick emoji' },
 });
 
 const mapStateToProps = (state, { status }) => ({
@@ -72,11 +84,16 @@ class ActionBar extends PureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
-    relationship: ImmutablePropTypes.map,
+    relationship: ImmutablePropTypes.record,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
+    onReblogForceModal: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
+    onEmojiReact: PropTypes.func.isRequired,
+    onReference: PropTypes.func.isRequired,
+    onQuote: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
+    onBookmarkCategoryAdder: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
     onEdit: PropTypes.func.isRequired,
     onDirect: PropTypes.func.isRequired,
@@ -95,6 +112,10 @@ class ActionBar extends PureComponent {
     ...WithRouterPropTypes,
   };
 
+  handleOpenMentions = () => {
+    this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}/mentioned_users`);
+  };
+
   handleReplyClick = () => {
     this.props.onReply(this.props.status);
   };
@@ -103,12 +124,24 @@ class ActionBar extends PureComponent {
     this.props.onReblog(this.props.status, e);
   };
 
+  handleReblogForceModalClick = (e) => {
+    this.props.onReblogForceModal(this.props.status, e);
+  };
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   };
 
   handleBookmarkClick = (e) => {
-    this.props.onBookmark(this.props.status, e);
+    if (bookmarkCategoryNeeded) {
+      this.props.onBookmarkCategoryAdder(this.props.status);
+    } else {
+      this.props.onBookmark(this.props.status, e);
+    }
+  };
+
+  handleBookmarkCategoryAdderClick = () => {
+    this.props.onBookmarkCategoryAdder(this.props.status);
   };
 
   handleDeleteClick = () => {
@@ -157,7 +190,7 @@ class ActionBar extends PureComponent {
     const { status, onBlockDomain } = this.props;
     const account = status.get('account');
 
-    onBlockDomain(account.get('acct').split('@')[1]);
+    onBlockDomain(account);
   };
 
   handleUnblockDomain = () => {
@@ -194,16 +227,32 @@ class ActionBar extends PureComponent {
     navigator.clipboard.writeText(url);
   };
 
+  handleReference = () => {
+    this.props.onReference(this.props.status);
+  };
+
+  handleQuote = () => {
+    this.props.onQuote(this.props.status);
+  };
+
+  handleEmojiPick = (data) => {
+    this.props.onEmojiReact(this.props.status, data);
+  };
+
+  handleEmojiPickInnerButton = () => {};
+
   render () {
     const { status, relationship, intl } = this.props;
     const { signedIn, permissions } = this.context.identity;
 
-    const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
-    const pinnableStatus     = ['public', 'unlisted', 'private'].includes(status.get('visibility'));
+    const publicStatus       = ['public', 'unlisted', 'public_unlisted', 'login'].includes(status.get('visibility_ex'));
+    const anonymousStatus    = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility_ex'));
+    const pinnableStatus     = ['public', 'unlisted', 'public_unlisted', 'login', 'private'].includes(status.get('visibility_ex'));
     const mutingConversation = status.get('muted');
     const account            = status.get('account');
     const writtenByMe        = status.getIn(['account', 'id']) === me;
     const isRemote           = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
+    const allowQuote         = status.getIn(['account', 'other_settings', 'allow_quote']);
 
     let menu = [];
 
@@ -217,19 +266,39 @@ class ActionBar extends PureComponent {
       menu.push({ text: intl.formatMessage(messages.share), action: this.handleShare });
     }
 
-    if (publicStatus && (signedIn || !isRemote)) {
+    if (anonymousStatus && (signedIn || !isRemote)) {
       menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
     }
 
     if (signedIn) {
       menu.push(null);
 
+      if (!boostMenu) {
+        menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog : messages.reblog), action: this.handleReblogForceModalClick, tag: 'reblog' });
+
+        if (publicStatus) {
+          if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
+            menu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote, tag: 'reblog' });
+          }
+  
+          if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
+            menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference, tag: 'reblog' });
+          }
+        }
+      }
+
+      menu.push({ text: intl.formatMessage(messages.bookmark_category), action: this.handleBookmarkCategoryAdderClick });
+
       if (writtenByMe) {
         if (pinnableStatus) {
           menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
           menu.push(null);
         }
 
+        if (status.get('limited_scope') !== 'reply') {
+          menu.push({ text: intl.formatMessage(messages.mentions), action: this.handleOpenMentions });
+        }
+        
         menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
         menu.push(null);
         menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
@@ -279,6 +348,26 @@ class ActionBar extends PureComponent {
       }
     }
 
+    let reblogMenu = [];
+
+    if (boostMenu) {
+      reblogMenu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog : messages.reblog), action: this.handleReblogClick });
+
+      if (!status.get('reblogged') && !boostModal) {
+        reblogMenu.push({ text: intl.formatMessage(messages.reblog_with_detail), action: this.handleReblogForceModalClick });
+      }
+  
+      if (publicStatus) {
+        if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
+          reblogMenu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote });
+        }
+  
+        if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
+          reblogMenu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
+        }
+      }
+    }
+
     let replyIcon;
     let replyIconComponent;
 
@@ -290,13 +379,13 @@ class ActionBar extends PureComponent {
       replyIconComponent = ReplyAllIcon;
     }
 
-    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
+    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility_ex') === 'private';
 
     let reblogTitle, reblogIconComponent;
 
     if (status.get('reblogged')) {
       reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
+      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
     } else if (publicStatus) {
       reblogTitle = intl.formatMessage(messages.reblog);
       reblogIconComponent = RepeatIcon;
@@ -306,14 +395,50 @@ class ActionBar extends PureComponent {
     } else {
       reblogTitle = intl.formatMessage(messages.cannot_reblog);
       reblogIconComponent = RepeatDisabledIcon;
+      menu = menu.filter((item) => !item?.tag || item.tag !== 'reblog');
+      reblogMenu = [];
     }
 
+    const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || account.getIn(['server_features', 'emoji_reaction']);
+    const emojiReactionPolicy = account.getIn(['other_settings', 'emoji_reaction_policy']) || 'allow';
+    const following = emojiReactionPolicy !== 'following_only' || (relationship && relationship.get('following'));
+    const followed = emojiReactionPolicy !== 'followers_only' || (relationship && relationship.get('followed_by'));
+    const mutual = emojiReactionPolicy !== 'mutuals_only' || (relationship && relationship.get('following') && relationship.get('followed_by'));
+    const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
+    const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
+    const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
+      <div className='detailed-status__button'>
+        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
+          <IconButton title={intl.formatMessage(messages.pickEmoji)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
+        )} />
+      </div>
+    )) || (enableEmojiReaction && (
+      <div className='detailed-status__button__blank' />
+    )) || null;
+
     return (
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} iconComponent={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? ReplyIcon : replyIconComponent}  onClick={this.handleReplyClick} /></div>
-        <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} /></div>
+        {reblogMenu.length === 0 ? (
+          <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} /></div>
+        ) : (
+          <div className='detailed-status__button'>
+            <DropdownMenuContainer
+              className={classNames({ reblogPrivate })}
+              icon='retweet'
+              iconComponent={reblogIconComponent}
+              status={status}
+              items={reblogMenu}
+              direction='left'
+              title={reblogTitle}
+              active={status.get('reblogged')}
+              disabled={!publicStatus && !reblogPrivate}
+            />
+          </div>
+        )}
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} /></div>
         <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} /></div>
+        {emojiPickerDropdown}
 
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenuContainer icon='ellipsis-h' iconComponent={MoreHorizIcon} status={status} items={menu} direction='left' title={intl.formatMessage(messages.more)} />
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index c211dc64c8..f47861f663 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -10,9 +10,9 @@ import classNames from 'classnames';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react';
-import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
+import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
+import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -92,6 +92,10 @@ export default class Card extends PureComponent {
     this.setState({ embedded: true });
   };
 
+  handleExternalLinkClick = (e) => {
+    e.stopPropagation();
+  };
+
   setRef = c => {
     this.node = c;
   };
@@ -201,7 +205,7 @@ export default class Card extends PureComponent {
               <div className='status-card__actions' onClick={this.handleEmbedClick} role='none'>
                 <div>
                   <button type='button' onClick={this.handleEmbedClick}><Icon id='play' icon={PlayArrowIcon} /></button>
-                  <a href={card.get('url')} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
+                  <a href={card.get('url')} onClick={this.handleExternalLinkClick} target='_blank' rel='noopener noreferrer'><Icon id='external-link' icon={OpenInNewIcon} /></a>
                 </div>
               </div>
             ) : spoilerButton}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 2ebafe7b48..e6f69be06a 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -8,21 +8,22 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
+import { SearchabilityIcon } from 'mastodon/components/searchability_icon';
 import { VisibilityIcon } from 'mastodon/components/visibility_icon';
+import { enableEmojiReaction, isHideItem } from 'mastodon/initial_state';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
 import MediaGallery from '../../../components/media_gallery';
 import StatusContent from '../../../components/status_content';
+import StatusEmojiReactionsBar from '../../../components/status_emoji_reactions_bar';
 import Audio from '../../audio';
 import scheduleIdleTask from '../../ui/util/schedule_idle_task';
 import Video from '../../video';
@@ -47,6 +48,8 @@ class DetailedStatus extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     onToggleMediaVisibility: PropTypes.func,
+    onEmojiReact: PropTypes.func,
+    onUnEmojiReact: PropTypes.func,
     ...WithRouterPropTypes,
   };
 
@@ -141,12 +144,12 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     let media           = '';
+    let isCardMediaWithSensitive = false;
     let applicationLink = '';
     let reblogLink = '';
-    const reblogIcon = 'retweet';
-    const reblogIconComponent = RepeatIcon;
     let favouriteLink = '';
-    let edited = '';
+    let emojiReactionsLink = '';
+    let statusReferencesLink = '';
 
     if (this.props.measureHeight) {
       outerStyle.height = `${this.state.height}px`;
@@ -213,70 +216,108 @@ class DetailedStatus extends ImmutablePureComponent {
           />
         );
       }
-    } else if (status.get('spoiler_text').length === 0) {
-      media = <Card sensitive={status.get('sensitive')} onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
+    } else if (status.get('card')) {
+      media = <Card sensitive={status.get('sensitive') && !status.get('spoiler_text')} onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
+      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
+    }
+
+    let emojiReactionsBar = null;
+    const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'server_features', 'emoji_reaction']);
+    if (status.get('emoji_reactions')) {
+      const emojiReactions = status.get('emoji_reactions');
+      if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionAvailableServer) {
+        emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
+      }
     }
 
     if (status.get('application')) {
-      applicationLink = <> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
+      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
     }
 
-    const visibilityLink = <> · <VisibilityIcon visibility={status.get('visibility')} /></>;
+    const visibilityLink = <>·<VisibilityIcon visibility={status.get('limited_scope') || status.get('visibility_ex')} /></>;
+    const searchabilityLink = <>·<SearchabilityIcon searchability={status.get('searchability')} /></>;
 
-    if (['private', 'direct'].includes(status.get('visibility'))) {
+    if (['private', 'direct'].includes(status.get('visibility_ex'))) {
       reblogLink = '';
     } else if (this.props.history) {
       reblogLink = (
-        <>
-          {' · '}
-          <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </Link>
-        </>
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </Link>
       );
     } else {
       reblogLink = (
-        <>
-          {' · '}
-          <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-            <Icon id={reblogIcon} icon={reblogIconComponent} />
-            <span className='detailed-status__reblogs'>
-              <AnimatedNumber value={status.get('reblogs_count')} />
-            </span>
-          </a>
-        </>
+        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__reblogs'>
+            <AnimatedNumber value={status.get('reblogs_count')} />
+          </span>
+          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
+        </a>
       );
     }
 
     if (this.props.history) {
       favouriteLink = (
         <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </Link>
       );
     } else {
       favouriteLink = (
         <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <Icon id='star' icon={StarIcon} />
           <span className='detailed-status__favorites'>
             <AnimatedNumber value={status.get('favourites_count')} />
           </span>
+          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
         </a>
       );
     }
 
-    if (status.get('edited_at')) {
-      edited = (
-        <>
-          {' · '}
-          <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
-        </>
+    if (!enableEmojiReaction || !emojiReactionAvailableServer) {
+      emojiReactionsLink = null;
+    } else if (this.props.history) {
+      emojiReactionsLink = (
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'>
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('emoji_reactions_count')} />
+          </span>
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {emoji} other {emojis}}' values={{ count: status.get('emoji_reactions_count') }} />
+        </Link>
+      );
+    } else {
+      emojiReactionsLink = (
+        <a href={`/interact/${status.get('id')}?type=emoji_reactions`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('emoji_reactions_count')} />
+          </span>
+          <FormattedMessage id='status.emoji_reactions' defaultMessage='{count, plural, one {emoji} other {emojis}}' values={{ count: status.get('emoji_reactions_count') }} />
+        </a>
+      );
+    }
+
+    if (this.props.history) {
+      statusReferencesLink = (
+        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/references`} className='detailed-status__link'>
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('status_referred_by_count')} />
+          </span>
+          <FormattedMessage id='status.quotes' defaultMessage='{count, plural, one {quote} other {quotes}}' values={{ count: status.get('status_referred_by_count') }} />
+        </Link>
+      );
+    } else {
+      statusReferencesLink = (
+        <a href={`/interact/${status.get('id')}?type=references`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <span className='detailed-status__favorites'>
+            <AnimatedNumber value={status.get('status_referred_by_count')} />
+          </span>
+          <FormattedMessage id='status.quotes' defaultMessage='{count, plural, one {quote} other {quotes}}' values={{ count: status.get('status_referred_by_count') }} />
+        </a>
       );
     }
 
@@ -286,7 +327,7 @@ class DetailedStatus extends ImmutablePureComponent {
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
-          {status.get('visibility') === 'direct' && (
+          {status.get('visibility_ex') === 'direct' && (
             <div className='status__prepend'>
               <div className='status__prepend-icon-wrapper'><Icon id='at' icon={AlternateEmailIcon} className='status__prepend-icon' /></div>
               <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
@@ -305,14 +346,35 @@ class DetailedStatus extends ImmutablePureComponent {
             {...statusContentProps}
           />
 
-          {media}
+          {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
 
-          {expanded && hashtagBar}
+          {(!status.get('spoiler_text') || expanded) && hashtagBar}
+
+          {emojiReactionsBar}
 
           <div className='detailed-status__meta'>
-            <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
-              <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-            </a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
+            <div className='detailed-status__meta__line'>
+              <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
+                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+              </a>
+
+              {visibilityLink}
+              {searchabilityLink}
+
+              {applicationLink}
+            </div>
+
+            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
+
+            <div className='detailed-status__meta__line'>
+              {reblogLink}
+              {reblogLink && <>·</>}
+              {favouriteLink}
+              ·
+              {emojiReactionsLink}
+              ·
+              {statusReferencesLink}
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 3e1f8d4d29..69919e55c4 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 
 import { showAlertForError } from '../../../actions/alerts';
 import { initBlockModal } from '../../../actions/blocks';
-import { initBoostModal } from '../../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
@@ -17,6 +16,8 @@ import {
   unfavourite,
   pin,
   unpin,
+  emojiReact,
+  unEmojiReact,
 } from '../../../actions/interactions';
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
@@ -85,11 +86,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       if (e.shiftKey || !boostModal) {
         this.onModalReblog(status);
       } else {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
+        dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
       }
     }
   },
 
+  onReblogForceModal (status) {
+    if (status.get('reblogged')) {
+      dispatch(unreblog(status));
+    } else {
+      dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.onModalReblog } }));
+    }
+  },
+
   onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
@@ -98,6 +107,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onEmojiReact (status, emoji) {
+    dispatch(emojiReact(status, emoji));
+  },
+
+  onUnEmojiReact (status, emoji) {
+    dispatch(unEmojiReact(status, emoji));
+  },
+
   onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index c8ccddddbe..4f69a2f8bf 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
@@ -14,8 +14,8 @@ import { connect } from 'react-redux';
 
 import { HotKeys } from 'react-hotkeys';
 
-import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import ScrollContainer from 'mastodon/containers/scroll_container';
@@ -27,19 +27,21 @@ import {
   unmuteAccount,
 } from '../../actions/accounts';
 import { initBlockModal } from '../../actions/blocks';
-import { initBoostModal } from '../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
   directCompose,
+  insertReferenceCompose,
 } from '../../actions/compose';
 import {
-  blockDomain,
+  initDomainBlockModal,
   unblockDomain,
 } from '../../actions/domain_blocks';
 import {
   favourite,
   unfavourite,
+  emojiReact,
+  unEmojiReact,
   bookmark,
   unbookmark,
   reblog,
@@ -64,7 +66,7 @@ import {
 import ColumnHeader from '../../components/column_header';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import StatusContainer from '../../containers/status_container';
-import { boostModal, deleteModal } from '../../initial_state';
+import { bookmarkCategoryNeeded, boostModal, deleteModal } from '../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
 import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
@@ -91,6 +93,12 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
 
+  const getReferenceIds = createSelector([
+    (state, { id }) => state.getIn(['contexts', 'references', id]) || Immutable.List(),
+  ], (references) => {
+    return references;
+  });
+
   const getAncestorsIds = createSelector([
     (_, { id }) => id,
     state => state.getIn(['contexts', 'inReplyTos']),
@@ -150,10 +158,12 @@ const makeMapStateToProps = () => {
 
     let ancestorsIds   = Immutable.List();
     let descendantsIds = Immutable.List();
+    let referenceIds   = Immutable.List();
 
     if (status) {
       ancestorsIds   = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
       descendantsIds = getDescendantsIds(state, { id: status.get('id') });
+      referenceIds   = getReferenceIds(state, { id: status.get('id') });
     }
 
     return {
@@ -161,6 +171,7 @@ const makeMapStateToProps = () => {
       status,
       ancestorsIds,
       descendantsIds,
+      referenceIds,
       askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
       domain: state.getIn(['meta', 'domain']),
       pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }),
@@ -202,6 +213,7 @@ class Status extends ImmutablePureComponent {
     isLoading: PropTypes.bool,
     ancestorsIds: ImmutablePropTypes.list.isRequired,
     descendantsIds: ImmutablePropTypes.list.isRequired,
+    referenceIds: ImmutablePropTypes.list.isRequired,
     intl: PropTypes.object.isRequired,
     askReplyConfirmation: PropTypes.bool,
     multiColumn: PropTypes.bool,
@@ -265,6 +277,29 @@ class Status extends ImmutablePureComponent {
     }
   };
 
+  handleEmojiReact = (status, emoji) => {
+    const { dispatch } = this.props;
+    const { signedIn } = this.context.identity;
+
+    if (signedIn) {
+      dispatch(emojiReact(status, emoji));
+    } else {
+      dispatch(openModal({
+        modalType: 'INTERACTION',
+        modalProps: {
+          type: 'favourite',
+          accountId: status.getIn(['account', 'id']),
+          url: status.get('uri'),
+        },
+      }));
+    }
+  };
+
+  handleUnEmojiReact = (status, emoji) => {
+    const { dispatch } = this.props;
+    dispatch(unEmojiReact(status, emoji));
+  };
+
   handlePin = (status) => {
     if (status.get('pinned')) {
       this.props.dispatch(unpin(status));
@@ -306,7 +341,7 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(reblog(status, privacy));
   };
 
-  handleReblogClick = (status, e) => {
+  handleReblogClick = (status, e, force = false) => {
     const { dispatch } = this.props;
     const { signedIn } = this.context.identity;
 
@@ -314,10 +349,10 @@ class Status extends ImmutablePureComponent {
       if (status.get('reblogged')) {
         dispatch(unreblog(status));
       } else {
-        if ((e && e.shiftKey) || !boostModal) {
+        if (!force && ((e && e.shiftKey) || !boostModal)) {
           this.handleModalReblog(status);
         } else {
-          dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));
+          dispatch(openModal({ modalType: 'BOOST', modalProps: { status, onReblog: this.handleModalReblog } }));
         }
       }
     } else {
@@ -332,7 +367,24 @@ class Status extends ImmutablePureComponent {
     }
   };
 
+  handleReblogForceModalClick = (status, e) => {
+    this.handleReblogClick(status, e, true);
+  };
+
+  handleReference = (status) => {
+    this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'BT'));
+  };
+
+  handleQuote = (status) => {
+    this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'QT'));
+  };
+
   handleBookmarkClick = (status) => {
+    if (bookmarkCategoryNeeded) {
+      this.handleBookmarkCategoryAdderClick(status);
+      return;
+    }
+    
     if (status.get('bookmarked')) {
       this.props.dispatch(unbookmark(status));
     } else {
@@ -340,6 +392,15 @@ class Status extends ImmutablePureComponent {
     }
   };
 
+  handleBookmarkCategoryAdderClick = (status) => {
+    this.props.dispatch(openModal({
+      modalType: 'BOOKMARK_CATEGORY_ADDER',
+      modalProps: {
+        statusId: status.get('id'),
+      },
+    }));
+  };
+
   handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
@@ -418,8 +479,8 @@ class Status extends ImmutablePureComponent {
   };
 
   handleToggleAll = () => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
-    const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS());
+    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
+    const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS(), referenceIds.toJS());
 
     if (status.get('hidden')) {
       this.props.dispatch(revealStatus(statusIds));
@@ -463,15 +524,8 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(unblockAccount(account.get('id')));
   };
 
-  handleBlockDomainClick = domain => {
-    this.props.dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
-        confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
-        onConfirm: () => this.props.dispatch(blockDomain(domain)),
-      },
-    }));
+  handleBlockDomainClick = account => {
+    this.props.dispatch(initDomainBlockModal(account));
   };
 
   handleUnblockDomainClick = domain => {
@@ -518,35 +572,45 @@ class Status extends ImmutablePureComponent {
   };
 
   handleMoveUp = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
+    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
 
     if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size - 1, true);
+      this._selectChild(ancestorsIds.size + referenceIds.size - 1, true);
     } else {
       let index = ancestorsIds.indexOf(id);
 
       if (index === -1) {
         index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.size + index, true);
+        if (index === -1) {
+          index = referenceIds.indexOf(id);
+          this._selectChild(index - 1, true);
+        } else {
+          this._selectChild(ancestorsIds.size + referenceIds.size + index, true);
+        }
       } else {
-        this._selectChild(index - 1, true);
+        this._selectChild(referenceIds.size + index - 1, true);
       }
     }
   };
 
   handleMoveDown = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
+    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
 
     if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size + 1, false);
+      this._selectChild(ancestorsIds.size + referenceIds.size + 1, false);
     } else {
       let index = ancestorsIds.indexOf(id);
 
       if (index === -1) {
         index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.size + index + 2, false);
+        if (index === -1) {
+          index = referenceIds.indexOf(id);
+          this._selectChild(index + 1, false);
+        } else {
+          this._selectChild(ancestorsIds.size + referenceIds.size + index + 2, false);
+        }
       } else {
-        this._selectChild(index + 1, false);
+        this._selectChild(referenceIds.size + index + 1, false);
       }
     }
   };
@@ -611,9 +675,9 @@ class Status extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { status, ancestorsIds } = this.props;
+    const { status, ancestorsIds, referenceIds } = this.props;
 
-    if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) {
+    if (status && (ancestorsIds.size + referenceIds.size > prevProps.ancestorsIds.size + prevProps.referenceIds.size || prevProps.status?.get('id') !== status.get('id'))) {
       this._scrollStatusIntoView();
     }
   }
@@ -642,8 +706,8 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    let ancestors, descendants;
-    const { isLoading, status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
+    let ancestors, descendants, references;
+    const { isLoading, status, ancestorsIds, descendantsIds, referenceIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
     if (isLoading) {
@@ -660,6 +724,10 @@ class Status extends ImmutablePureComponent {
       );
     }
 
+    if (referenceIds && referenceIds.size > 0) {
+      references = <>{this.renderChildren(referenceIds, true)}</>;
+    }
+
     if (ancestorsIds && ancestorsIds.size > 0) {
       ancestors = <>{this.renderChildren(ancestorsIds, true)}</>;
     }
@@ -696,6 +764,7 @@ class Status extends ImmutablePureComponent {
 
         <ScrollContainer scrollKey='thread' shouldUpdateScroll={this.shouldUpdateScroll}>
           <div className={classNames('scrollable', { fullscreen })} ref={this.setContainerRef}>
+            {references}
             {ancestors}
 
             <HotKeys handlers={handlers}>
@@ -711,6 +780,8 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  onEmojiReact={this.handleEmojiReact}
+                  onUnEmojiReact={this.handleUnEmojiReact}
                 />
 
                 <ActionBar
@@ -718,8 +789,13 @@ class Status extends ImmutablePureComponent {
                   status={status}
                   onReply={this.handleReplyClick}
                   onFavourite={this.handleFavouriteClick}
+                  onEmojiReact={this.handleEmojiReact}
                   onReblog={this.handleReblogClick}
+                  onReblogForceModal={this.handleReblogForceModalClick}
+                  onReference={this.handleReference}
+                  onQuote={this.handleQuote}
                   onBookmark={this.handleBookmarkClick}
+                  onBookmarkCategoryAdder={this.handleBookmarkCategoryAdderClick}
                   onDelete={this.handleDeleteClick}
                   onEdit={this.handleEditClick}
                   onDirect={this.handleDirectClick}
diff --git a/app/javascript/mastodon/features/status_references/index.jsx b/app/javascript/mastodon/features/status_references/index.jsx
new file mode 100644
index 0000000000..e2cc86f426
--- /dev/null
+++ b/app/javascript/mastodon/features/status_references/index.jsx
@@ -0,0 +1,97 @@
+import PropTypes from 'prop-types';
+
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
+import { fetchStatusReferences } from 'mastodon/actions/interactions';
+import ColumnHeader from 'mastodon/components/column_header';
+import { Icon }  from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import ScrollableList from 'mastodon/components/scrollable_list';
+import StatusContainer from 'mastodon/containers/status_container';
+import Column from 'mastodon/features/ui/components/column';
+
+
+const messages = defineMessages({
+  refresh: { id: 'refresh', defaultMessage: 'Refresh' },
+});
+
+const mapStateToProps = (state, props) => ({
+  accountIds: state.getIn(['user_lists', 'referred_by', props.params.statusId]),
+});
+
+class StatusReferences extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list,
+    multiColumn: PropTypes.bool,
+    intl: PropTypes.object.isRequired,
+  };
+
+  UNSAFE_componentWillMount () {
+    if (!this.props.accountIds) {
+      this.props.dispatch(fetchStatusReferences(this.props.params.statusId));
+    }
+  }
+
+  UNSAFE_componentWillReceiveProps (nextProps) {
+    if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
+      this.props.dispatch(fetchStatusReferences(nextProps.params.statusId));
+    }
+  }
+
+  handleRefresh = () => {
+    this.props.dispatch(fetchStatusReferences(this.props.params.statusId));
+  };
+
+  render () {
+    const { intl, accountIds, multiColumn } = this.props;
+
+    if (!accountIds) {
+      return (
+        <Column>
+          <LoadingIndicator />
+        </Column>
+      );
+    }
+
+    const emptyMessage = <FormattedMessage id='empty_column.status_references' defaultMessage='No one has referred this post yet. When someone does, they will show up here.' />;
+
+    return (
+      <Column bindToDocument={!multiColumn}>
+        <ColumnHeader
+          showBackButton
+          multiColumn={multiColumn}
+          extraButton={(
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' icon={RefreshIcon} /></button>
+          )}
+        />
+
+        <ScrollableList
+          scrollKey='references'
+          emptyMessage={emptyMessage}
+          bindToDocument={!multiColumn}
+        >
+          {accountIds.map(id =>
+            <StatusContainer key={id} id={id} withNote={false} withoutQuote />,
+          )}
+        </ScrollableList>
+
+        <Helmet>
+          <meta name='robots' content='noindex' />
+        </Helmet>
+      </Column>
+    );
+  }
+
+}
+
+export default connect(mapStateToProps)(injectIntl(StatusReferences));
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
index 8c1a8f486c..0531346f91 100644
--- a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { followAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index cfac692324..fc9233a9cc 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -1,100 +1,116 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import { blockAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { initReport } from '../../../actions/reports';
-import { Button } from '../../../components/button';
-import { makeGetAccount } from '../../../selectors';
+import { useDispatch } from 'react-redux';
 
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
 
-  const mapStateToProps = state => ({
-    account: getAccount(state, state.getIn(['blocks', 'new', 'account_id'])),
-  });
+export const BlockModal = ({ accountId, acct }) => {
+  const dispatch = useDispatch();
+  const [expanded, setExpanded] = useState(false);
 
-  return mapStateToProps;
-};
+  const domain = acct.split('@')[1];
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
 
-    onBlockAndReport(account) {
-      dispatch(blockAccount(account.get('id')));
-      dispatch(initReport(account));
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
 
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
-  };
-};
+  const handleToggleLearnMore = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
 
-class BlockModal extends PureComponent {
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={BlockIcon} />
+          </div>
 
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onBlockAndReport: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account);
-  };
-
-  handleSecondary = () => {
-    this.props.onClose();
-    this.props.onBlockAndReport(this.props.account);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  render () {
-    const { account } = this.props;
-
-    return (
-      <div className='modal-root__modal block-modal'>
-        <div className='block-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.block.message'
-              defaultMessage='Are you sure you want to block {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
+          <div>
+            <h1><FormattedMessage id='block_modal.title' defaultMessage='Block user?' /></h1>
+            <div>@{acct}</div>
+          </div>
         </div>
 
-        <div className='block-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='block-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_will_know' defaultMessage="They can see that they're blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_see_posts' defaultMessage="They can't see your posts and you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='block_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mentions them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='block_modal.they_cant_mention' defaultMessage="They can't mention or follow you." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        {domain && (
+          <div className='safety-action-modal__bottom__collapsible'>
+            <div className='safety-action-modal__caveats'>
+              <FormattedMessage
+                id='block_modal.remote_users_caveat'
+                defaultMessage='We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.'
+                values={{ domain: <strong>{domain}</strong> }}
+              />
+            </div>
+          </div>
+        )}
+
+        <div className='safety-action-modal__actions'>
+          {domain && (
+            <button onClick={handleToggleLearnMore} className='link-button'>
+              {expanded ? <FormattedMessage id='block_modal.show_less' defaultMessage='Show less' /> : <FormattedMessage id='block_modal.show_more' defaultMessage='Show more' />}
+            </button>
+          )}
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleSecondary} className='confirmation-modal__secondary-button'>
-            <FormattedMessage id='confirmations.block.block_and_report' defaultMessage='Block & Report' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+BlockModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
+export default BlockModal;
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
deleted file mode 100644
index 7e9d8c9819..0000000000
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import { changeBoostPrivacy } from 'mastodon/actions/boosts';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { Icon }  from 'mastodon/components/icon';
-import { VisibilityIcon } from 'mastodon/components/visibility_icon';
-import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { Button } from '../../../components/button';
-import { DisplayName } from '../../../components/display_name';
-import { RelativeTimestamp } from '../../../components/relative_timestamp';
-import StatusContent from '../../../components/status_content';
-
-const messages = defineMessages({
-  cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-});
-
-const mapStateToProps = state => {
-  return {
-    privacy: state.getIn(['boosts', 'new', 'privacy']),
-  };
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    onChangeBoostPrivacy(value) {
-      dispatch(changeBoostPrivacy(value));
-    },
-  };
-};
-
-class BoostModal extends ImmutablePureComponent {
-  static propTypes = {
-    status: ImmutablePropTypes.map.isRequired,
-    onReblog: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onChangeBoostPrivacy: PropTypes.func.isRequired,
-    privacy: PropTypes.string.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
-
-  handleReblog = () => {
-    this.props.onReblog(this.props.status, this.props.privacy);
-    this.props.onClose();
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.onClose();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  _findContainer = () => {
-    return document.getElementsByClassName('modal-root__container')[0];
-  };
-
-  render () {
-    const { status, privacy, intl } = this.props;
-    const buttonText = status.get('reblogged') ? messages.cancel_reblog : messages.reblog;
-
-    return (
-      <div className='modal-root__modal boost-modal'>
-        <div className='boost-modal__container'>
-          <div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
-            <div className='status__info'>
-              <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
-                <RelativeTimestamp timestamp={status.get('created_at')} />
-              </a>
-
-              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name'>
-                <div className='status__avatar'>
-                  <Avatar account={status.get('account')} size={48} />
-                </div>
-
-                <DisplayName account={status.get('account')} />
-              </a>
-            </div>
-
-            <StatusContent status={status} />
-
-            {status.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={status.get('media_attachments')}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className='boost-modal__action-bar'>
-          <div><FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='retweet' icon={RepeatIcon} /></span> }} /></div>
-          {status.get('visibility') !== 'private' && !status.get('reblogged') && (
-            <PrivacyDropdown
-              noDirect
-              value={privacy}
-              container={this._findContainer}
-              onChange={this.props.onChangeBoostPrivacy}
-            />
-          )}
-          <Button text={intl.formatMessage(buttonText)} onClick={this.handleReblog} autoFocus />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal)));
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.tsx b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
new file mode 100644
index 0000000000..75a66b1eb4
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.tsx
@@ -0,0 +1,164 @@
+import type { MouseEventHandler } from 'react';
+import { useCallback, useState } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+import { useHistory } from 'react-router';
+
+import type Immutable from 'immutable';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import AttachmentList from 'mastodon/components/attachment_list';
+import { Icon } from 'mastodon/components/icon';
+import { VisibilityIcon } from 'mastodon/components/visibility_icon';
+import PrivacyDropdown from 'mastodon/features/compose/components/privacy_dropdown';
+import type { Account } from 'mastodon/models/account';
+import type { Status, StatusVisibility } from 'mastodon/models/status';
+import { useAppSelector } from 'mastodon/store';
+
+import { Avatar } from '../../../components/avatar';
+import { Button } from '../../../components/button';
+import { DisplayName } from '../../../components/display_name';
+import { RelativeTimestamp } from '../../../components/relative_timestamp';
+import StatusContent from '../../../components/status_content';
+
+const messages = defineMessages({
+  cancel_reblog: {
+    id: 'status.cancel_reblog_private',
+    defaultMessage: 'Unboost',
+  },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+});
+
+export const BoostModal: React.FC<{
+  status: Status;
+  onClose: () => void;
+  onReblog: (status: Status, privacy: StatusVisibility) => void;
+}> = ({ status, onReblog, onClose }) => {
+  const intl = useIntl();
+  const history = useHistory();
+
+  const default_privacy = useAppSelector(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    (state) => state.compose.get('default_privacy') as StatusVisibility,
+  );
+
+  const account = status.get('account') as Account;
+  const statusVisibility = (status.get('limited_scope') ||
+    status.get('visibility_ex')) as StatusVisibility;
+
+  const [privacy, setPrivacy] = useState<StatusVisibility>(
+    statusVisibility === 'private' ? 'private' : default_privacy,
+  );
+
+  const onPrivacyChange = useCallback((value: StatusVisibility) => {
+    setPrivacy(value);
+  }, []);
+
+  const handleReblog = useCallback(() => {
+    onReblog(status, privacy);
+    onClose();
+  }, [onClose, onReblog, status, privacy]);
+
+  const handleAccountClick = useCallback<MouseEventHandler>(
+    (e) => {
+      if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+        e.preventDefault();
+        onClose();
+        history.push(`/@${account.acct}`);
+      }
+    },
+    [history, onClose, account],
+  );
+
+  const buttonText = status.get('reblogged')
+    ? messages.cancel_reblog
+    : messages.reblog;
+
+  const findContainer = useCallback(
+    () => document.getElementsByClassName('modal-root__container')[0],
+    [],
+  );
+
+  return (
+    <div className='modal-root__modal boost-modal'>
+      <div className='boost-modal__container'>
+        <div
+          className={classNames(
+            'status',
+            `status-${statusVisibility}`,
+            'light',
+          )}
+        >
+          <div className='status__info'>
+            <a
+              href={`/@${account.acct}/${status.get('id') as string}`}
+              className='status__relative-time'
+              target='_blank'
+              rel='noopener noreferrer'
+            >
+              <span className='status__visibility-icon'>
+                <VisibilityIcon visibility={statusVisibility} />
+              </span>
+              <RelativeTimestamp
+                timestamp={status.get('created_at') as string}
+              />
+            </a>
+
+            <a
+              onClick={handleAccountClick}
+              href={`/@${account.acct}`}
+              className='status__display-name'
+            >
+              <div className='status__avatar'>
+                <Avatar account={account} size={48} />
+              </div>
+
+              <DisplayName account={account} />
+            </a>
+          </div>
+
+          {/* @ts-expect-error Expected until StatusContent is typed */}
+          <StatusContent status={status} />
+
+          {(status.get('media_attachments') as Immutable.List<unknown>).size >
+            0 && (
+            <AttachmentList compact media={status.get('media_attachments')} />
+          )}
+        </div>
+      </div>
+
+      <div className='boost-modal__action-bar'>
+        <div>
+          <FormattedMessage
+            id='boost_modal.combo'
+            defaultMessage='You can press {combo} to skip this next time'
+            values={{
+              combo: (
+                <span>
+                  Shift + <Icon id='retweet' icon={RepeatIcon} />
+                </span>
+              ),
+            }}
+          />
+        </div>
+        {statusVisibility !== 'private' && !status.get('reblogged') && (
+          <PrivacyDropdown
+            noDirect
+            noLimited
+            value={privacy}
+            container={findContainer}
+            onChange={onPrivacyChange}
+          />
+        )}
+        <Button
+          text={intl.formatMessage(buttonText)}
+          onClick={handleReblog}
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
+        />
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
index dd2a10608d..d1c9e36883 100644
--- a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
+++ b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/column_link.jsx b/app/javascript/mastodon/features/ui/components/column_link.jsx
index e58fde48b5..14aff87fbe 100644
--- a/app/javascript/mastodon/features/ui/components/column_link.jsx
+++ b/app/javascript/mastodon/features/ui/components/column_link.jsx
@@ -1,29 +1,34 @@
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { NavLink } from 'react-router-dom';
+import { useRouteMatch, NavLink } from 'react-router-dom';
 
 import { Icon }  from 'mastodon/components/icon';
 
-const ColumnLink = ({ icon, iconComponent, text, to, href, method, badge, transparent, ...other }) => {
+const ColumnLink = ({ icon, activeIcon, iconComponent, activeIconComponent, text, to, href, method, badge, transparent, children, ...other }) => {
+  const match = useRouteMatch(to);
   const className = classNames('column-link', { 'column-link--transparent': transparent });
   const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
   const iconElement = (typeof icon === 'string' || iconComponent) ? <Icon id={icon} icon={iconComponent} className='column-link__icon' /> : icon;
+  const activeIconElement = activeIcon ?? (activeIconComponent ? <Icon id={icon} icon={activeIconComponent} className='column-link__icon' /> : iconElement);
+  const active = match?.isExact;
+  const childElement = typeof children !== 'undefined' ? <p>{children}</p> : null;
 
   if (href) {
     return (
       <a href={href} className={className} data-method={method} title={text} {...other}>
-        {iconElement}
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
       </a>
     );
   } else {
     return (
-      <NavLink to={to} className={className} title={text} {...other}>
-        {iconElement}
+      <NavLink to={to} className={className} title={text} exact {...other}>
+        {active ? activeIconElement : iconElement}
         <span>{text}</span>
         {badgeElement}
+        {childElement}
       </NavLink>
     );
   }
@@ -32,12 +37,15 @@ const ColumnLink = ({ icon, iconComponent, text, to, href, method, badge, transp
 ColumnLink.propTypes = {
   icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   iconComponent: PropTypes.func,
+  activeIcon: PropTypes.node,
+  activeIconComponent: PropTypes.func,
   text: PropTypes.string.isRequired,
   to: PropTypes.string,
   href: PropTypes.string,
   method: PropTypes.string,
   badge: PropTypes.node,
   transparent: PropTypes.bool,
+  children: PropTypes.any,
 };
 
 export default ColumnLink;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.jsx b/app/javascript/mastodon/features/ui/components/columns_area.jsx
index 19c2f40ac6..2e6c4a63ed 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.jsx
+++ b/app/javascript/mastodon/features/ui/components/columns_area.jsx
@@ -17,9 +17,14 @@ import {
   HashtagTimeline,
   DirectTimeline,
   FavouritedStatuses,
+  EmojiReactedStatuses,
   BookmarkedStatuses,
   ListTimeline,
   Directory,
+  BookmarkCategoryStatuses,
+  AntennaSetting,
+  AntennaTimeline,
+  CircleStatuses,
 } from '../util/async-components';
 import { useColumnsContext } from '../util/columns_context';
 
@@ -39,7 +44,12 @@ const componentMap = {
   'HASHTAG': HashtagTimeline,
   'DIRECT': DirectTimeline,
   'FAVOURITES': FavouritedStatuses,
+  'EMOJI_REACTIONS': EmojiReactedStatuses,
   'BOOKMARKS': BookmarkedStatuses,
+  'BOOKMARKS_EX': BookmarkCategoryStatuses,
+  'CIRCLE_STATUSES': CircleStatuses,
+  'ANTENNA': AntennaSetting,
+  'ANTENNA_TIMELINE': AntennaTimeline,
   'LIST': ListTimeline,
   'DIRECTORY': Directory,
 };
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 1080c303c5..4227c74131 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 
 import escapeTextContentForBrowser from 'escape-html';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { closeModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
 import InlineAccount from 'mastodon/components/inline_account';
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.jsx b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
index 713ecb472b..e6ac79bdd9 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
 import ServerBanner from 'mastodon/components/server_banner';
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
-import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import SearchContainer from 'mastodon/features/compose/containers/search_container';
 
 import LinkFooter from './link_footer';
@@ -56,10 +55,7 @@ class ComposePanel extends PureComponent {
         )}
 
         {signedIn && (
-          <>
-            <NavigationContainer onClose={this.onBlur} />
-            <ComposeFormContainer singleColumn />
-          </>
+          <ComposeFormContainer singleColumn />
         )}
 
         <LinkFooter />
diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
new file mode 100644
index 0000000000..e69db63489
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
@@ -0,0 +1,106 @@
+import PropTypes from 'prop-types';
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useDispatch } from 'react-redux';
+
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import DomainDisabledIcon from '@/material-icons/400-24px/domain_disabled.svg?react';
+import HistoryIcon from '@/material-icons/400-24px/history.svg?react';
+import PersonRemoveIcon from '@/material-icons/400-24px/person_remove.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { blockAccount } from 'mastodon/actions/accounts';
+import { blockDomain } from 'mastodon/actions/domain_blocks';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+
+export const DomainBlockModal = ({ domain, accountId, acct }) => {
+  const dispatch = useDispatch();
+
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockDomain(domain));
+  }, [dispatch, domain]);
+
+  const handleSecondaryClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(blockAccount(accountId));
+  }, [dispatch, accountId]);
+
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
+
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={DomainDisabledIcon} />
+          </div>
+
+          <div>
+            <h1><FormattedMessage id='domain_block_modal.title' defaultMessage='Block domain?' /></h1>
+            <div>{domain}</div>
+          </div>
+        </div>
+
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_wont_know' defaultMessage="They won't know they've been blocked." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_wont_see_posts' defaultMessage="You won't see posts or notifications from users on this server." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={PersonRemoveIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.you_will_lose_followers' defaultMessage='All your followers from this server will be removed.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_cant_follow' defaultMessage='Nobody from this server can follow you.' /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={HistoryIcon} /></div>
+            <div><FormattedMessage id='domain_block_modal.they_can_interact_with_old_posts' defaultMessage='People from this server can interact with your old posts.' /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className='safety-action-modal__bottom'>
+        <div className='safety-action-modal__actions'>
+          <Button onClick={handleSecondaryClick} secondary>
+            <FormattedMessage id='domain_block_modal.block_account_instead' defaultMessage='Block @{name} instead' values={{ name: acct.split('@')[0] }} />
+          </Button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
+            <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
+          </button>
+
+          <Button onClick={handleClick}>
+            <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+DomainBlockModal.propTypes = {
+  domain: PropTypes.string.isRequired,
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
+
+export default DomainBlockModal;
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.jsx b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
index 595e9771b5..a4e5fc9dfb 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
@@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import api from 'mastodon/api';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.jsx b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
index 25cda00bea..477575bd7b 100644
--- a/app/javascript/mastodon/features/ui/components/filter_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
 import { fetchStatus } from 'mastodon/actions/statuses';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index a3bb22bd99..7adfc208e7 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -16,13 +16,13 @@ import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Button } from 'mastodon/components/button';
 import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
 import Audio from 'mastodon/features/audio';
-import CharacterCounter from 'mastodon/features/compose/components/character_counter';
-import UploadProgress from 'mastodon/features/compose/components/upload_progress';
+import { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
+import { UploadProgress } from 'mastodon/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
 import { me } from 'mastodon/initial_state';
 import { assetHost } from 'mastodon/utils/config';
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
deleted file mode 100644
index 6df753b069..0000000000
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import { Component } from 'react';
-
-import { injectIntl, defineMessages } from 'react-intl';
-
-import { List as ImmutableList } from 'immutable';
-import { connect } from 'react-redux';
-
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import { fetchFollowRequests } from 'mastodon/actions/accounts';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-import ColumnLink from 'mastodon/features/ui/components/column_link';
-
-const messages = defineMessages({
-  text: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-});
-
-const mapStateToProps = state => ({
-  count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
-});
-
-class FollowRequestsColumnLink extends Component {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    count: PropTypes.number.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
-
-    dispatch(fetchFollowRequests());
-  }
-
-  render () {
-    const { count, intl } = this.props;
-
-    if (count === 0) {
-      return null;
-    }
-
-    return (
-      <ColumnLink
-        transparent
-        to='/follow_requests'
-        icon={<IconWithBadge className='column-link__icon' id='user-plus' icon={PersonAddIcon} count={count} />}
-        text={intl.formatMessage(messages.text)}
-      />
-    );
-  }
-
-}
-
-export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index b4f388ba84..d256615b52 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -7,7 +7,8 @@ import { Link, withRouter } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { fetchServer } from 'mastodon/actions/server';
 import { Avatar } from 'mastodon/components/avatar';
@@ -25,6 +26,7 @@ const Account = connect(state => ({
 
 const messages = defineMessages({
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
+  reload: { id: 'navigation_bar.refresh', defaultMessage: 'Refresh' },
 });
 
 const mapStateToProps = (state) => ({
@@ -59,6 +61,11 @@ class Header extends PureComponent {
     dispatchServer();
   }
 
+  handleReload (e) {
+    e.preventDefault();
+    window.location.reload();
+  }
+
   render () {
     const { signedIn } = this.context.identity;
     const { location, openClosedRegistrationsModal, signupUrl, intl } = this.props;
@@ -68,6 +75,7 @@ class Header extends PureComponent {
     if (signedIn) {
       content = (
         <>
+          {<button onClick={this.handleReload} className='button button-secondary' aria-label={intl.formatMessage(messages.reload)}><Icon id='refresh' icon={RefreshIcon} /></button>}
           {location.pathname !== '/search' && <Link to='/search' className='button button-secondary' aria-label={intl.formatMessage(messages.search)}><Icon id='search' icon={SearchIcon} /></Link>}
           {location.pathname !== '/publish' && <Link to='/publish' className='button button-secondary'><FormattedMessage id='compose_form.publish_form' defaultMessage='New post' /></Link>}
           <Account />
diff --git a/app/javascript/mastodon/features/ui/components/image_modal.jsx b/app/javascript/mastodon/features/ui/components/image_modal.jsx
index 5a700dc1f7..f08ce15342 100644
--- a/app/javascript/mastodon/features/ui/components/image_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/image_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 import ImageLoader from './image_loader';
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index 634f13e611..b3435b7c93 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -1,11 +1,12 @@
-import PropTypes from 'prop-types';
+import { useEffect } from 'react';
 
 import { createSelector } from '@reduxjs/toolkit';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import { fetchAntennas } from 'mastodon/actions/antennas';
 import { fetchLists } from 'mastodon/actions/lists';
 
 import ColumnLink from './column_link';
@@ -15,43 +16,42 @@ const getOrderedLists = createSelector([state => state.get('lists')], lists => {
     return lists;
   }
 
-  return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(4);
+  return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(8);
 });
 
-const mapStateToProps = state => ({
-  lists: getOrderedLists(state),
+const getOrderedAntennas = createSelector([state => state.get('antennas')], antennas => {
+  if (!antennas) {
+    return antennas;
+  }
+
+  return antennas.toList().filter(item => !!item && !item.get('insert_feeds')).sort((a, b) => a.get('title').localeCompare(b.get('title'))).take(8);
 });
 
-class ListPanel extends ImmutablePureComponent {
+export const ListPanel = () => {
+  const dispatch = useDispatch();
+  const lists = useSelector(state => getOrderedLists(state));
+  const antennas = useSelector(state => getOrderedAntennas(state));
 
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    lists: ImmutablePropTypes.list,
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  useEffect(() => {
     dispatch(fetchLists());
+    dispatch(fetchAntennas());
+  }, [dispatch]);
+
+  const size = (lists ? lists.size : 0) + (antennas ? antennas.size : 0);
+  if (size === 0) {
+    return null;
   }
 
-  render () {
-    const { lists } = this.props;
+  return (
+    <div className='list-panel'>
+      <hr />
 
-    if (!lists || lists.isEmpty()) {
-      return null;
-    }
-
-    return (
-      <div className='list-panel'>
-        <hr />
-
-        {lists.map(list => (
-          <ColumnLink icon='list-ul' iconComponent={ListAltIcon} key={list.get('id')} strict text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
-        ))}
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps)(ListPanel);
+      {lists && lists.map(list => (
+        <ColumnLink icon='list-ul' key={list.get('id')} iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={list.get('title')} to={`/lists/${list.get('id')}`} transparent />
+      ))}
+      {antennas && antennas.map(antenna => (
+        <ColumnLink icon='wifi' key={antenna.get('id')} iconComponent={AntennaIcon} activeIconComponent={AntennaIcon} text={antenna.get('title')} to={`/antennast/${antenna.get('id')}`} transparent />
+      ))}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index b5b5d88693..0f6e8a727b 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -9,9 +9,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import ReactSwipeableViews from 'react-swipeable-views';
 
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { getAverageFromBlurhash } from 'mastodon/blurhash';
 import { GIFV } from 'mastodon/components/gifv';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 46f0dc706f..1f9bcfe417 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -7,10 +7,16 @@ import Base from 'mastodon/components/modal_root';
 import {
   MuteModal,
   BlockModal,
+  DomainBlockModal,
   ReportModal,
   EmbedModal,
   ListEditor,
   ListAdder,
+  AntennaEditor,
+  AntennaAdder,
+  CircleEditor,
+  CircleAdder,
+  BookmarkCategoryAdder,
   CompareHistoryModal,
   FilterModal,
   InteractionModal,
@@ -23,7 +29,7 @@ import BundleContainer from '../containers/bundle_container';
 
 import ActionsModal from './actions_modal';
 import AudioModal from './audio_modal';
-import BoostModal from './boost_modal';
+import { BoostModal } from './boost_modal';
 import BundleModalError from './bundle_modal_error';
 import ConfirmationModal from './confirmation_modal';
 import FocalPointModal from './focal_point_modal';
@@ -41,12 +47,18 @@ export const MODAL_COMPONENTS = {
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
+  'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,
   'LIST_EDITOR': ListEditor,
+  'ANTENNA_EDITOR': AntennaEditor,
+  'CIRCLE_EDITOR': CircleEditor,
   'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
   'LIST_ADDER': ListAdder,
+  'ANTENNA_ADDER': AntennaAdder,
+  'CIRCLE_ADDER': CircleAdder,
+  'BOOKMARK_CATEGORY_ADDER': BookmarkCategoryAdder,
   'COMPARE_HISTORY': CompareHistoryModal,
   'FILTER': FilterModal,
   'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal,
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 2d95cabef8..df466cfac6 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -1,139 +1,154 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback, useState } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
-import { connect } from 'react-redux';
+import classNames from 'classnames';
 
-import Toggle from 'react-toggle';
+import { useDispatch } from 'react-redux';
 
-import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from '../../../components/button';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
+import { muteAccount } from 'mastodon/actions/accounts';
+import { closeModal } from 'mastodon/actions/modal';
+import { Button } from 'mastodon/components/button';
+import { CheckBox } from 'mastodon/components/check_box';
+import { Icon } from 'mastodon/components/icon';
+import { RadioButton } from 'mastodon/components/radio_button';
 
 const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Indefinite' },
+  indefinite: { id: 'mute_modal.indefinite', defaultMessage: 'Until I unmute them' },
+  hideFromNotifications: { id: 'mute_modal.hide_from_notifications', defaultMessage: 'Hide from notifications' },
 });
 
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['mutes', 'new', 'account']),
-    notifications: state.getIn(['mutes', 'new', 'notifications']),
-    muteDuration: state.getIn(['mutes', 'new', 'duration']),
-  };
+const RadioButtonLabel = ({ name, value, currentValue, onChange, label }) => (
+  <RadioButton
+    name={name}
+    value={value}
+    checked={value === currentValue}
+    onChange={onChange}
+    label={label}
+  />
+);
+
+RadioButtonLabel.propTypes = {
+  name: PropTypes.string,
+  value: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  currentValue: PropTypes.oneOf([PropTypes.string, PropTypes.number, PropTypes.bool]),
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node,
 };
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications, muteDuration) {
-      dispatch(muteAccount(account.get('id'), notifications, muteDuration));
-    },
+export const MuteModal = ({ accountId, acct }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const [notifications, setNotifications] = useState(true);
+  const [muteDuration, setMuteDuration] = useState('0');
+  const [expanded, setExpanded] = useState(false);
 
-    onClose() {
-      dispatch(closeModal({
-        modalType: undefined,
-        ignoreFocus: false,
-      }));
-    },
+  const handleClick = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+    dispatch(muteAccount(accountId, notifications, muteDuration));
+  }, [dispatch, accountId, notifications, muteDuration]);
 
-    onToggleNotifications() {
-      dispatch(toggleHideNotifications());
-    },
+  const handleCancel = useCallback(() => {
+    dispatch(closeModal({ modalType: undefined, ignoreFocus: false }));
+  }, [dispatch]);
 
-    onChangeMuteDuration(e) {
-      dispatch(changeMuteDuration(e.target.value));
-    },
-  };
-};
+  const handleToggleNotifications = useCallback(({ target }) => {
+    setNotifications(target.checked);
+  }, [setNotifications]);
 
-class MuteModal extends PureComponent {
+  const handleChangeMuteDuration = useCallback(({ target }) => {
+    setMuteDuration(target.value);
+  }, [setMuteDuration]);
 
-  static propTypes = {
-    account: PropTypes.object.isRequired,
-    notifications: PropTypes.bool.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onConfirm: PropTypes.func.isRequired,
-    onToggleNotifications: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    muteDuration: PropTypes.number.isRequired,
-    onChangeMuteDuration: PropTypes.func.isRequired,
-  };
+  const handleToggleSettings = useCallback(() => {
+    setExpanded(!expanded);
+  }, [expanded, setExpanded]);
 
-  handleClick = () => {
-    this.props.onClose();
-    this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
-  };
-
-  handleCancel = () => {
-    this.props.onClose();
-  };
-
-  toggleNotifications = () => {
-    this.props.onToggleNotifications();
-  };
-
-  changeMuteDuration = (e) => {
-    this.props.onChangeMuteDuration(e);
-  };
-
-  render () {
-    const { account, notifications, muteDuration, intl } = this.props;
-
-    return (
-      <div className='modal-root__modal mute-modal'>
-        <div className='mute-modal__container'>
-          <p>
-            <FormattedMessage
-              id='confirmations.mute.message'
-              defaultMessage='Are you sure you want to mute {name}?'
-              values={{ name: <strong>@{account.get('acct')}</strong> }}
-            />
-          </p>
-          <p className='mute-modal__explanation'>
-            <FormattedMessage
-              id='confirmations.mute.explanation'
-              defaultMessage='This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.'
-            />
-          </p>
-          <div className='setting-toggle'>
-            <Toggle id='mute-modal__hide-notifications-checkbox' checked={notifications} onChange={this.toggleNotifications} />
-            <label className='setting-toggle__label' htmlFor='mute-modal__hide-notifications-checkbox'>
-              <FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
-            </label>
+  return (
+    <div className='modal-root__modal safety-action-modal'>
+      <div className='safety-action-modal__top'>
+        <div className='safety-action-modal__header'>
+          <div className='safety-action-modal__header__icon'>
+            <Icon icon={VolumeOffIcon} />
           </div>
-          <div>
-            <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
 
-            {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-            <select value={muteDuration} onChange={this.changeMuteDuration}>
-              <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
-              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-              <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-              <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-              <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-              <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-            </select>
+          <div>
+            <h1><FormattedMessage id='mute_modal.title' defaultMessage='Mute user?' /></h1>
+            <div>@{acct}</div>
           </div>
         </div>
 
-        <div className='mute-modal__action-bar'>
-          <Button onClick={this.handleCancel} className='mute-modal__cancel-button'>
+        <div className='safety-action-modal__bullet-points'>
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={CampaignIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_wont_know' defaultMessage="They won't know they've been muted." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={VisibilityOffIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_posts' defaultMessage="They can still see your posts, but you won't see theirs." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={AlternateEmailIcon} /></div>
+            <div><FormattedMessage id='mute_modal.you_wont_see_mentions' defaultMessage="You won't see posts that mention them." /></div>
+          </div>
+
+          <div>
+            <div className='safety-action-modal__bullet-points__icon'><Icon icon={ReplyIcon} /></div>
+            <div><FormattedMessage id='mute_modal.they_can_mention_and_follow' defaultMessage="They can mention and follow you, but you won't see them." /></div>
+          </div>
+        </div>
+      </div>
+
+      <div className={classNames('safety-action-modal__bottom', { active: expanded })}>
+        <div className='safety-action-modal__bottom__collapsible'>
+          <div className='safety-action-modal__field-group'>
+            <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+          </div>
+
+          <div className='safety-action-modal__field-group'>
+            <CheckBox label={intl.formatMessage(messages.hideFromNotifications)} checked={notifications} onChange={handleToggleNotifications} />
+          </div>
+        </div>
+
+        <div className='safety-action-modal__actions'>
+          <button onClick={handleToggleSettings} className='link-button'>
+            {expanded ? <FormattedMessage id='mute_modal.hide_options' defaultMessage='Hide options' /> : <FormattedMessage id='mute_modal.show_options' defaultMessage='Show options' />}
+          </button>
+
+          <div className='spacer' />
+
+          <button onClick={handleCancel} className='link-button'>
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
-          </Button>
-          <Button onClick={this.handleClick} autoFocus>
+          </button>
+
+          <Button onClick={handleClick}>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>
       </div>
-    );
-  }
+    </div>
+  );
+};
 
-}
+MuteModal.propTypes = {
+  accountId: PropTypes.string.isRequired,
+  acct: PropTypes.string.isRequired,
+};
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
+export default MuteModal;
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 72da652b3d..10464fbeef 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -1,49 +1,107 @@
 import PropTypes from 'prop-types';
-import { Component } from 'react';
+import { Component, useEffect } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, useIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import { useSelector, useDispatch } from 'react-redux';
+
+import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks.svg?react';
+import ExploreActiveIcon from '@/material-icons/400-24px/explore-fill.svg?react';
+import ExploreIcon from '@/material-icons/400-24px/explore.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeActiveIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home.svg?react';
+import ListAltActiveIcon from '@/material-icons/400-24px/list_alt-fill.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import PersonAddActiveIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings.svg?react';
+import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
+import { fetchFollowRequests } from 'mastodon/actions/accounts';
+import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
-import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
+import { enableDtlMenu, timelinePreview, trendsEnabled, dtlTag, enableLocalTimeline, isHideItem } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
-import FollowRequestsColumnLink from './follow_requests_column_link';
-import ListPanel from './list_panel';
-import NotificationsCounterIcon from './notifications_counter_icon';
+import { ListPanel } from './list_panel';
 import SignInBanner from './sign_in_banner';
 
 const messages = defineMessages({
   home: { id: 'tabs_bar.home', defaultMessage: 'Home' },
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
   explore: { id: 'explore.title', defaultMessage: 'Explore' },
+  local: { id: 'column.local', defaultMessage: 'Local' },
+  deepLocal: { id: 'column.deep_local', defaultMessage: 'Deep' },
   firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+  antennas: { id: 'navigation_bar.antennas', defaultMessage: 'Antennas' },
+  circles: { id: 'navigation_bar.circles', defaultMessage: 'Circles' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
   about: { id: 'navigation_bar.about', defaultMessage: 'About' },
   search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
   advancedInterface: { id: 'navigation_bar.advanced_interface', defaultMessage: 'Open in advanced web interface' },
   openedInClassicInterface: { id: 'navigation_bar.opened_in_classic_interface', defaultMessage: 'Posts, accounts, and other specific pages are opened by default in the classic web interface.' },
+  followRequests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
 });
 
+const NotificationsLink = () => {
+  const count = useSelector(state => state.getIn(['notifications', 'unread']));
+  const intl = useIntl();
+
+  return (
+    <ColumnLink
+      transparent
+      to='/notifications'
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.notifications)}
+    />
+  );
+};
+
+const FollowRequestsLink = () => {
+  const count = useSelector(state => state.getIn(['user_lists', 'follow_requests', 'items'])?.size ?? 0);
+  const intl = useIntl();
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchFollowRequests());
+  }, [dispatch]);
+
+  if (count === 0) {
+    return null;
+  }
+
+  return (
+    <ColumnLink
+      transparent
+      to='/follow_requests'
+      icon={<IconWithBadge id='user-plus' icon={PersonAddIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='user-plus' icon={PersonAddActiveIcon} count={count} className='column-link__icon' />}
+      text={intl.formatMessage(messages.followRequests)}
+    />
+  );
+};
+
 class NavigationPanel extends Component {
 
   static contextTypes = {
@@ -55,13 +113,23 @@ class NavigationPanel extends Component {
   };
 
   isFirehoseActive = (match, location) => {
-    return match || location.pathname.startsWith('/public');
+    return (match || location.pathname.startsWith('/public')) && !location.pathname.endsWith('/fixed');
+  };
+
+  isAntennasActive = (match, location) => {
+    return (match || location.pathname.startsWith('/antennast'));
   };
 
   render () {
     const { intl } = this.props;
     const { signedIn, disabledAccountId } = this.context.identity;
 
+    const explorer = (trendsEnabled ? (
+      <ColumnLink transparent to='/explore' icon='explore' iconComponent={ExploreIcon} activeIconComponent={ExploreActiveIcon} text={intl.formatMessage(messages.explore)} />
+    ) : (
+      <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
+    ));
+    
     let banner = undefined;
 
     if(transientSingleColumn)
@@ -77,7 +145,6 @@ class NavigationPanel extends Component {
       <div className='navigation-panel'>
         <div className='navigation-panel__logo'>
           <Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
-          {!banner && <hr />}
         </div>
 
         {banner &&
@@ -88,20 +155,56 @@ class NavigationPanel extends Component {
 
         {signedIn && (
           <>
-            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} text={intl.formatMessage(messages.home)} />
-            <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
-            <FollowRequestsColumnLink />
+            <ColumnLink transparent to='/home' icon='home' iconComponent={HomeIcon} activeIconComponent={HomeActiveIcon} text={intl.formatMessage(messages.home)} />
+            <NotificationsLink />
           </>
         )}
 
-        {trendsEnabled ? (
-          <ColumnLink transparent to='/explore' icon='hashtag' iconComponent={TagIcon} text={intl.formatMessage(messages.explore)} />
-        ) : (
-          <ColumnLink transparent to='/search' icon='search' iconComponent={SearchIcon} text={intl.formatMessage(messages.search)} />
+        {signedIn && enableLocalTimeline && (
+          <ColumnLink transparent to='/public/local/fixed' icon='users' iconComponent={PeopleIcon} text={intl.formatMessage(messages.local)} />
         )}
 
-        {(signedIn || timelinePreview) && (
-          <ColumnLink transparent to='/public/local' isActive={this.isFirehoseActive} icon='globe' iconComponent={PublicIcon} text={intl.formatMessage(messages.firehose)} />
+        {signedIn && enableDtlMenu && dtlTag && (
+          <ColumnLink transparent to={`/tags/${dtlTag}`} icon='users' iconComponent={PeopleIcon} text={intl.formatMessage(messages.deepLocal)} />
+        )}
+
+        {!signedIn && explorer}
+
+        {signedIn && (
+          <ColumnLink transparent to='/public' isActive={this.isFirehoseActive} icon='globe' iconComponent={PublicIcon} text={intl.formatMessage(messages.firehose)} />
+        )}
+
+        {(!signedIn && timelinePreview) && (
+          <ColumnLink transparent to={enableLocalTimeline ? '/public/local' : '/public'} isActive={this.isFirehoseActive} icon='globe' iconComponent={PublicIcon} text={intl.formatMessage(messages.firehose)} />
+        )}
+
+        {signedIn && (
+          <>
+            <ListPanel />
+            <hr />
+          </>
+        )}
+
+        {signedIn && (
+          <>
+            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} activeIconComponent={ListAltActiveIcon} text={intl.formatMessage(messages.lists)} />
+            <ColumnLink transparent to='/antennasw' icon='wifi' iconComponent={AntennaIcon} text={intl.formatMessage(messages.antennas)} isActive={this.isAntennasActive} />
+            <ColumnLink transparent to='/circles' icon='user-circle' iconComponent={CirclesIcon} text={intl.formatMessage(messages.circles)} />
+            <FollowRequestsLink />
+            <ColumnLink transparent to='/conversations' icon='at' iconComponent={AlternateEmailIcon} text={intl.formatMessage(messages.direct)} />
+          </>
+        )}
+
+        {signedIn && explorer}
+
+        {signedIn && (
+          <>
+            <ColumnLink transparent to='/bookmark_categories' icon='bookmarks' iconComponent={BookmarksIcon} activeIconComponent={BookmarksActiveIcon} text={intl.formatMessage(messages.bookmarks)} />
+            { !isHideItem('favourite_menu') && <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} activeIconComponent={StarActiveIcon} text={intl.formatMessage(messages.favourites)} /> }
+            <hr />
+
+            <ColumnLink transparent href='/settings/preferences' icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} />
+          </>
         )}
 
         {!signedIn && (
@@ -111,21 +214,6 @@ class NavigationPanel extends Component {
           </div>
         )}
 
-        {signedIn && (
-          <>
-            <ColumnLink transparent to='/conversations' icon='at' iconComponent={AlternateEmailIcon} text={intl.formatMessage(messages.direct)} />
-            <ColumnLink transparent to='/bookmarks' icon='bookmarks' iconComponent={BookmarksIcon} text={intl.formatMessage(messages.bookmarks)} />
-            <ColumnLink transparent to='/favourites' icon='star' iconComponent={StarIcon} text={intl.formatMessage(messages.favourites)} />
-            <ColumnLink transparent to='/lists' icon='list-ul' iconComponent={ListAltIcon} text={intl.formatMessage(messages.lists)} />
-
-            <ListPanel />
-
-            <hr />
-
-            <ColumnLink transparent href='/settings/preferences' icon='cog' iconComponent={SettingsIcon} text={intl.formatMessage(messages.preferences)} />
-          </>
-        )}
-
         <div className='navigation-panel__legal'>
           <hr />
           <ColumnLink transparent to='/about' icon='ellipsis-h' iconComponent={MoreHorizIcon} text={intl.formatMessage(messages.about)} />
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
deleted file mode 100644
index 34e868acc8..0000000000
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
-import { IconWithBadge } from 'mastodon/components/icon_with_badge';
-
-
-const mapStateToProps = state => ({
-  count: state.getIn(['notifications', 'unread']),
-  id: 'bell',
-  icon: NotificationsIcon,
-});
-
-export default connect(mapStateToProps)(IconWithBadge);
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index aae0e96ac4..6584364609 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -7,7 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { submitReport } from 'mastodon/actions/reports';
 import { fetchServer } from 'mastodon/actions/server';
 import { expandAccountTimeline } from 'mastodon/actions/timelines';
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
index e3fa7c3b8a..272a3cff00 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
@@ -3,8 +3,8 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
-import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
+import FullscreenExitIcon from '@/material-icons/400-24px/fullscreen_exit.svg?react';
+import RectangleIcon from '@/material-icons/400-24px/rectangle.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 3e7ae2add0..5ffa4353f1 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -14,7 +14,7 @@ const makeGetStatusIds = (pending = false) => createSelector([
   (state)           => state.get('statuses'),
 ], (columnSettings, statusIds, statuses) => {
   return statusIds.filter(id => {
-    if (id === null) return true;
+    if (id === null || id === 'inline-follow-suggestions') return true;
 
     const statusForId = statuses.get(id);
     let showStatus    = true;
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d3fee272f0..1d12f885e9 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -14,7 +14,7 @@ import { HotKeys } from 'react-hotkeys';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
-import PictureInPicture from 'mastodon/features/picture_in_picture';
+import { PictureInPicture } from 'mastodon/features/picture_in_picture';
 import { layoutFromWindow } from 'mastodon/is_mobile';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -45,12 +45,21 @@ import {
   Following,
   Reblogs,
   Favourites,
+  EmojiReactions,
+  StatusReferences,
+  MentionedUsers,
   DirectTimeline,
   HashtagTimeline,
+  AntennaTimeline,
   Notifications,
+  NotificationRequests,
+  NotificationRequest,
   FollowRequests,
   FavouritedStatuses,
+  EmojiReactedStatuses,
   BookmarkedStatuses,
+  BookmarkCategories,
+  BookmarkCategoryStatuses,
   FollowedTags,
   ListTimeline,
   Blocks,
@@ -58,11 +67,17 @@ import {
   Mutes,
   PinnedStatuses,
   Lists,
+  Antennas,
+  Circles,
+  CircleStatuses,
+  AntennaSetting,
   Directory,
   Explore,
+  ReactionDeck,
   Onboarding,
   About,
   PrivacyPolicy,
+  CommunityTimeline,
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
@@ -80,7 +95,6 @@ const mapStateToProps = state => ({
   hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
   canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
-  dropdownMenuIsOpen: state.dropdownMenu.openId !== null,
   firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
   username: state.getIn(['accounts', me, 'username']),
 });
@@ -88,7 +102,7 @@ const mapStateToProps = state => ({
 const keyMap = {
   help: '?',
   new: 'n',
-  search: 's',
+  search: ['s', '/'],
   forceNew: 'option+n',
   toggleComposeSpoilers: 'option+x',
   focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
@@ -108,6 +122,7 @@ const keyMap = {
   goToDirect: 'g d',
   goToStart: 'g s',
   goToFavourites: 'g f',
+  goToEmojiReactions: 'g e',
   goToPinned: 'g p',
   goToProfile: 'g u',
   goToBlocked: 'g b',
@@ -201,14 +216,24 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/public' exact component={Firehose} componentParams={{ feedType: 'public' }} content={children} />
             <WrappedRoute path='/public/local' exact component={Firehose} componentParams={{ feedType: 'community' }} content={children} />
             <WrappedRoute path='/public/remote' exact component={Firehose} componentParams={{ feedType: 'public:remote' }} content={children} />
+            <WrappedRoute path='/public/local/fixed' exact component={CommunityTimeline} content={children} />
             <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} />
+            <WrappedRoute path='/antennasw/:id' component={AntennaSetting} content={children} />
+            <WrappedRoute path='/antennast/:id' component={AntennaTimeline} content={children} />
+            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
+            <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
+            <WrappedRoute path='/emoji_reactions' component={EmojiReactedStatuses} content={children} />
 
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
+            <WrappedRoute path='/bookmark_categories/:id' component={BookmarkCategoryStatuses} content={children} />
+            <WrappedRoute path='/bookmark_categories' component={BookmarkCategories} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
+            
+            <WrappedRoute path='/reaction_deck' component={ReactionDeck} content={children} />
 
             <WrappedRoute path='/start' component={Onboarding} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
@@ -224,6 +249,9 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/@:acct/:statusId' exact component={Status} content={children} />
             <WrappedRoute path='/@:acct/:statusId/reblogs' component={Reblogs} content={children} />
             <WrappedRoute path='/@:acct/:statusId/favourites' component={Favourites} content={children} />
+            <WrappedRoute path='/@:acct/:statusId/emoji_reactions' component={EmojiReactions} content={children} />
+            <WrappedRoute path='/@:acct/:statusId/references' component={StatusReferences} content={children} />
+            <WrappedRoute path='/@:acct/:statusId/mentioned_users' component={MentionedUsers} content={children} />
 
             {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
             <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
@@ -231,6 +259,8 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
             <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
             <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />
+            <WrappedRoute path='/statuses/:statusId/emoji_reactions' component={EmojiReactions} content={children} />
+            <WrappedRoute path='/statuses/:statusId/references' component={StatusReferences} content={children} />
 
             <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
             <WrappedRoute path='/blocks' component={Blocks} content={children} />
@@ -238,6 +268,9 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/followed_tags' component={FollowedTags} content={children} />
             <WrappedRoute path='/mutes' component={Mutes} content={children} />
             <WrappedRoute path='/lists' component={Lists} content={children} />
+            <WrappedRoute path='/antennasw' component={Antennas} content={children} />
+            <WrappedRoute path='/circles/:id' component={CircleStatuses} content={children} />
+            <WrappedRoute path='/circles' component={Circles} content={children} />
 
             <Route component={BundleColumnError} />
           </WrappedSwitch>
@@ -262,7 +295,6 @@ class UI extends PureComponent {
     hasMediaAttachments: PropTypes.bool,
     canUploadMore: PropTypes.bool,
     intl: PropTypes.object.isRequired,
-    dropdownMenuIsOpen: PropTypes.bool,
     layout: PropTypes.string.isRequired,
     firstLaunch: PropTypes.bool,
     username: PropTypes.string,
@@ -438,7 +470,7 @@ class UI extends PureComponent {
   handleHotkeyNew = e => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+    const element = this.node.querySelector('.compose-form__scrollable .autosuggest-textarea__textarea');
 
     if (element) {
       element.focus();
@@ -533,6 +565,10 @@ class UI extends PureComponent {
     this.props.history.push('/favourites');
   };
 
+  handleHotkeyGoToEmojiReactions = () => {
+    this.props.history.push('/emoji_reactions');
+  };
+
   handleHotkeyGoToPinned = () => {
     this.props.history.push('/pinned');
   };
@@ -555,7 +591,7 @@ class UI extends PureComponent {
 
   render () {
     const { draggingOver } = this.state;
-    const { children, isComposing, location, dropdownMenuIsOpen, layout } = this.props;
+    const { children, isComposing, location, layout } = this.props;
 
     const handlers = {
       help: this.handleHotkeyToggleHelp,
@@ -572,6 +608,7 @@ class UI extends PureComponent {
       goToDirect: this.handleHotkeyGoToDirect,
       goToStart: this.handleHotkeyGoToStart,
       goToFavourites: this.handleHotkeyGoToFavourites,
+      goToEmojiReactions: this.handleHotkeyGoToEmojiReactions,
       goToPinned: this.handleHotkeyGoToPinned,
       goToProfile: this.handleHotkeyGoToProfile,
       goToBlocked: this.handleHotkeyGoToBlocked,
@@ -581,7 +618,7 @@ class UI extends PureComponent {
 
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
-        <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
+        <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef}>
           <Header />
 
           <SwitchingColumnsArea location={location} singleColumn={layout === 'mobile' || layout === 'single-column'}>
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 7b968204be..11c3afb315 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -34,6 +34,10 @@ export function DirectTimeline() {
   return import(/* webpackChunkName: "features/direct_timeline" */'../../direct_timeline');
 }
 
+export function AntennaTimeline () {
+  return import(/* webpackChunkName: "features/antenna_timeline" */'../../antenna_timeline');
+}
+
 export function ListTimeline () {
   return import(/* webpackChunkName: "features/list_timeline" */'../../list_timeline');
 }
@@ -42,6 +46,18 @@ export function Lists () {
   return import(/* webpackChunkName: "features/lists" */'../../lists');
 }
 
+export function Antennas () {
+  return import(/* webpackChunkName: "features/antennas" */'../../antennas');
+}
+
+export function Circles () {
+  return import(/* webpackChunkName: "features/circles" */'../../circles');
+}
+
+export function CircleStatuses () {
+  return import(/* webpackChunkName: "features/circle_statuses" */'../../circle_statuses');
+}
+
 export function Status () {
   return import(/* webpackChunkName: "features/status" */'../../status');
 }
@@ -82,6 +98,18 @@ export function Favourites () {
   return import(/* webpackChunkName: "features/favourites" */'../../favourites');
 }
 
+export function EmojiReactions () {
+  return import(/* webpackChunkName: "features/emoji_reactions" */'../../emoji_reactions');
+}
+
+export function StatusReferences () {
+  return import(/* webpackChunkName: "features/status_references" */'../../status_references');
+}
+
+export function MentionedUsers () {
+  return import(/* webpackChunkName: "features/mentioned_users" */'../../mentioned_users');
+}
+
 export function FollowRequests () {
   return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests');
 }
@@ -90,6 +118,10 @@ export function FavouritedStatuses () {
   return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses');
 }
 
+export function EmojiReactedStatuses () {
+  return import(/* webpackChunkName: "features/emoji_reacted_statuses" */'../../emoji_reacted_statuses');
+}
+
 export function FollowedTags () {
   return import(/* webpackChunkName: "features/followed_tags" */'../../followed_tags');
 }
@@ -98,6 +130,18 @@ export function BookmarkedStatuses () {
   return import(/* webpackChunkName: "features/bookmarked_statuses" */'../../bookmarked_statuses');
 }
 
+export function BookmarkCategories () {
+  return import(/* webpackChunkName: "features/bookmark_categories" */'../../bookmark_categories');
+}
+
+export function BookmarkCategoryStatuses () {
+  return import(/* webpackChunkName: "features/bookmark_category_statuses" */'../../bookmark_category_statuses');
+}
+
+export function BookmarkCategoryAdder () {
+  return import(/* webpackChunkName: "features/bookmark_category_adder" */'../../bookmark_category_adder');
+}
+
 export function Blocks () {
   return import(/* webpackChunkName: "features/blocks" */'../../blocks');
 }
@@ -118,6 +162,10 @@ export function BlockModal () {
   return import(/* webpackChunkName: "modals/block_modal" */'../components/block_modal');
 }
 
+export function DomainBlockModal () {
+  return import(/* webpackChunkName: "modals/domain_block_modal" */'../components/domain_block_modal');
+}
+
 export function ReportModal () {
   return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
 }
@@ -142,6 +190,26 @@ export function ListAdder () {
   return import(/*webpackChunkName: "features/list_adder" */'../../list_adder');
 }
 
+export function AntennaAdder () {
+  return import(/*webpackChunkName: "features/antenna_adder" */'../../antenna_adder');
+}
+
+export function AntennaEditor () {
+  return import(/*webpackChunkName: "features/antenna_editor" */'../../antenna_editor');
+}
+
+export function CircleAdder () {
+  return import(/*webpackChunkName: "features/circle_adder" */'../../circle_adder');
+}
+
+export function CircleEditor () {
+  return import(/*webpackChunkName: "features/circle_editor" */'../../circle_editor');
+}
+
+export function AntennaSetting () {
+  return import(/*webpackChunkName: "features/antenna_setting" */'../../antenna_setting');
+}
+
 export function Tesseract () {
   return import(/*webpackChunkName: "tesseract" */'tesseract.js');
 }
@@ -158,6 +226,10 @@ export function Onboarding () {
   return import(/* webpackChunkName: "features/onboarding" */'../../onboarding');
 }
 
+export function ReactionDeck () {
+  return import(/* webpackChunkName: "features/reaction_deck" */'../../reaction_deck');
+}
+
 export function CompareHistoryModal () {
   return import(/*webpackChunkName: "modals/compare_history_modal" */'../components/compare_history_modal');
 }
@@ -189,3 +261,11 @@ export function About () {
 export function PrivacyPolicy () {
   return import(/*webpackChunkName: "features/privacy_policy" */'../../privacy_policy');
 }
+
+export function NotificationRequests () {
+  return import(/*webpackChunkName: "features/notifications/requests" */'../../notifications/requests');
+}
+
+export function NotificationRequest () {
+  return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request');
+}
diff --git a/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
new file mode 100644
index 0000000000..408154c31b
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/sensitive_media_context.tsx
@@ -0,0 +1,28 @@
+import { createContext, useContext, useMemo } from 'react';
+
+export const SensitiveMediaContext = createContext<{
+  hideMediaByDefault: boolean;
+}>({
+  hideMediaByDefault: false,
+});
+
+export function useSensitiveMediaContext() {
+  return useContext(SensitiveMediaContext);
+}
+
+type ContextValue = React.ContextType<typeof SensitiveMediaContext>;
+
+export const SensitiveMediaContextProvider: React.FC<
+  React.PropsWithChildren<{ hideMediaByDefault: boolean }>
+> = ({ hideMediaByDefault, children }) => {
+  const contextValue = useMemo<ContextValue>(
+    () => ({ hideMediaByDefault }),
+    [hideMediaByDefault],
+  );
+
+  return (
+    <SensitiveMediaContext.Provider value={contextValue}>
+      {children}
+    </SensitiveMediaContext.Provider>
+  );
+};
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index efcbbc174e..89a8ba560a 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -9,14 +9,14 @@ import { is } from 'immutable';
 
 import { throttle } from 'lodash';
 
-import FullscreenIcon from 'mastodon/../material-icons/400-24px/fullscreen.svg?react';
-import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
-import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
-import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
-import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
+import FullscreenIcon from '@/material-icons/400-24px/fullscreen.svg?react';
+import FullscreenExitIcon from '@/material-icons/400-24px/fullscreen_exit.svg?react';
+import PauseIcon from '@/material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import RectangleIcon from '@/material-icons/400-24px/rectangle.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { playerSettings } from 'mastodon/settings';
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 596c9ca49f..ecf3032aed 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -1,6 +1,21 @@
 // @ts-check
 
 
+/**
+ * @typedef { 'blocking_quote'
+ *   | 'emoji_reaction_on_timeline'
+ *   | 'emoji_reaction_unavailable_server'
+ *   | 'emoji_reaction_count'
+ *   | 'favourite_menu'
+ *   | 'quote_in_home'
+ *   | 'quote_in_public'
+ *   | 'quote_unavailable_server'
+ *   | 'recent_emojis'
+ *   | 'relationships'
+ *   | 'status_reference_unavailable_server'
+ * } HideItemsDefinition
+ */
+
 /**
  * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
  */
@@ -12,13 +27,22 @@
  * @property {boolean} auto_play_gif
  * @property {boolean} activity_api_enabled
  * @property {string} admin
+ * @property {boolean} bookmark_category_needed
  * @property {boolean=} boost_modal
  * @property {boolean=} delete_modal
  * @property {boolean=} disable_swiping
  * @property {string=} disabled_account_id
+ * @property {string[]} enabled_visibilities
  * @property {string} display_media
+ * @property {boolean} display_media_expand
  * @property {string} domain
+ * @property {string} dtl_tag
+ * @property {boolean} enable_emoji_reaction
+ * @property {boolean} enable_local_timeline
+ * @property {boolean} enable_dtl_menu
  * @property {boolean=} expand_spoilers
+ * @property {string[]} featured_tags
+ * @property {HideItemsDefinition[]} hide_items
  * @property {boolean} limited_federation_mode
  * @property {string} locale
  * @property {string | null} mascot
@@ -27,10 +51,13 @@
  * @property {string=} owner
  * @property {boolean} profile_directory
  * @property {boolean} registrations_open
+ * @property {boolean} registrations_reach_limit
  * @property {boolean} reduce_motion
  * @property {string} repository
  * @property {boolean} search_enabled
  * @property {boolean} trends_enabled
+ * @property {boolean} simple_timeline_menu
+ * @property {boolean} boost_menu
  * @property {boolean} single_user_mode
  * @property {string} source_url
  * @property {string} streaming_api_base_url
@@ -38,7 +65,6 @@
  * @property {string} title
  * @property {boolean} show_trends
  * @property {boolean} trends_as_landing_page
- * @property {boolean} unfollow_modal
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
@@ -72,15 +98,37 @@ export const hasMultiColumnPath = initialPath === '/'
  */
 const getMeta = (prop) => initialState?.meta && initialState.meta[prop];
 
+const hideItems = getMeta('hide_items');
+
+/**
+ * @param {HideItemsDefinition} key
+ * @returns {boolean}
+ */
+export const isHideItem = (key) => (hideItems && hideItems.includes(key)) || false;
+
+/**
+ * @param {HideItemsDefinition} key
+ * @returns {boolean}
+ */
+export const isShowItem = (key) => !isHideItem(key);
+
 export const activityApiEnabled = getMeta('activity_api_enabled');
 export const autoPlayGif = getMeta('auto_play_gif');
+export const bookmarkCategoryNeeded = getMeta('bookmark_category_needed');
 export const boostModal = getMeta('boost_modal');
 export const deleteModal = getMeta('delete_modal');
 export const disableSwiping = getMeta('disable_swiping');
 export const disabledAccountId = getMeta('disabled_account_id');
+export const enabledVisibilites = getMeta('enabled_visibilities');
 export const displayMedia = getMeta('display_media');
+export const displayMediaExpand = getMeta('display_media_expand');
 export const domain = getMeta('domain');
+export const dtlTag = getMeta('dtl_tag');
+export const enableEmojiReaction = getMeta('enable_emoji_reaction');
+export const enableLocalTimeline = getMeta('enable_local_timeline');
+export const enableDtlMenu = getMeta('enable_dtl_menu');
 export const expandSpoilers = getMeta('expand_spoilers');
+export const featuredTags = getMeta('featured_tags') || [];
 export const forceSingleColumn = !getMeta('advanced_layout');
 export const limitedFederationMode = getMeta('limited_federation_mode');
 export const mascot = getMeta('mascot');
@@ -90,16 +138,18 @@ export const owner = getMeta('owner');
 export const profile_directory = getMeta('profile_directory');
 export const reduceMotion = getMeta('reduce_motion');
 export const registrationsOpen = getMeta('registrations_open');
+export const registrationsReachLimit = getMeta('registrations_reach_limit');
 export const repository = getMeta('repository');
 export const searchEnabled = getMeta('search_enabled');
 export const trendsEnabled = getMeta('trends_enabled');
 export const showTrends = getMeta('show_trends');
+export const simpleTimelineMenu = getMeta('simple_timeline_menu');
+export const boostMenu = getMeta('boost_menu');
 export const singleUserMode = getMeta('single_user_mode');
 export const source_url = getMeta('source_url');
 export const timelinePreview = getMeta('timeline_preview');
 export const title = getMeta('title');
 export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 6c37cdf5ca..e4f7f12b0e 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -3,6 +3,7 @@
   "about.contact": "Kontak:",
   "about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
   "about.domain_blocks.silenced.title": "Beperk",
   "about.domain_blocks.suspended.title": "Opgeskort",
   "about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
@@ -32,6 +33,7 @@
   "account.follows.empty": "Die gebruiker volg nog niemand.",
   "account.go_to_profile": "Gaan na profiel",
   "account.hide_reblogs": "Versteek plasings wat deur @{name} aangestuur is",
+  "account.in_memoriam": "Ter nagedagtenis.",
   "account.joined_short": "Aangesluit",
   "account.link_verified_on": "Eienaarskap van hierdie skakel is nagegaan op {date}",
   "account.locked_info": "Die rekening se privaatheidstatus is gesluit. Die eienaar hersien handmatig wie hom/haar kan volg.",
@@ -65,12 +67,12 @@
   "alert.unexpected.message": "Iets het skeefgeloop.",
   "alert.unexpected.title": "Oeps!",
   "announcement.announcement": "Aankondiging",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
   "bundle_column_error.error.title": "Ag nee!",
   "bundle_column_error.network.title": "Netwerkfout",
   "bundle_column_error.retry": "Probeer weer",
   "bundle_column_error.return": "Keer terug na die tuisblad",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sluit",
   "bundle_modal_error.message": "Die laai van die komponent het iewers skeefgeloop.",
   "bundle_modal_error.retry": "Probeer weer",
@@ -110,23 +112,14 @@
   "compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
   "compose_form.lock_disclaimer.lock": "gesluit",
   "compose_form.placeholder": "Wat wil jy deel?",
-  "compose_form.poll.add_option": "Voeg ’n keuse by",
   "compose_form.poll.duration": "Duur van peiling",
-  "compose_form.poll.option_placeholder": "Keuse {number}",
-  "compose_form.poll.remove_option": "Verwyder hierdie keuse",
   "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
   "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
-  "compose_form.publish": "Publiseer",
   "compose_form.publish_form": "Publiseer",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Stoor veranderinge",
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
-  "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
   "confirmation_modal.cancel": "Kanselleer",
-  "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
-  "confirmations.block.message": "Is jy seker jy wil {name} blokkeer?",
   "confirmations.cancel_follow_request.confirm": "Herroep versoek",
   "confirmations.cancel_follow_request.message": "Is jy seker jy wil jou versoek om {name} te volg, terugtrek?",
   "confirmations.delete.confirm": "Wis uit",
@@ -134,7 +127,6 @@
   "confirmations.delete_list.confirm": "Wis uit",
   "confirmations.delete_list.message": "Is jy seker jy wil hierdie lys permanent verwyder?",
   "confirmations.discard_edit_media.confirm": "Gooi weg",
-  "confirmations.domain_block.confirm": "Blokkeer die hele domein",
   "confirmations.logout.confirm": "Teken Uit",
   "confirmations.logout.message": "Is jy seker jy wil uitteken?",
   "confirmations.reply.confirm": "Antwoord",
@@ -156,6 +148,8 @@
   "emoji_button.food": "Eet- en drinkgoed",
   "emoji_button.nature": "Natuur",
   "emoji_button.not_found": "Geen passende emoji gevind nie",
+  "emoji_button.objects": "Voorwerpe",
+  "emoji_button.people": "Mense",
   "emoji_button.search": "Soek...",
   "emoji_button.search_results": "Soekresultate",
   "empty_column.account_timeline": "Geen plasings hier nie!",
@@ -168,7 +162,12 @@
   "empty_column.lists": "Jy het nog geen lyste nie. Wanneer jy een skep, sal dit hier vertoon.",
   "empty_column.notifications": "Jy het nog geen kennisgewings nie. Interaksie van ander mense met jou, sal hier vertoon.",
   "explore.search_results": "Soekresultate",
+  "explore.suggested_follows": "Mense",
+  "explore.trending_links": "Nuus",
+  "filter_modal.added.settings_link": "instellings bladsy",
   "filter_modal.select_filter.search": "Soek of skep",
+  "firehose.local": "Hierdie bediener",
+  "firehose.remote": "Ander bedieners",
   "footer.about": "Oor",
   "footer.directory": "Profielgids",
   "footer.get_app": "Kry die app",
@@ -177,14 +176,21 @@
   "footer.privacy_policy": "Privaatheidsbeleid",
   "footer.source_code": "Wys bronkode",
   "getting_started.heading": "Kom aan die gang",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "of {additional}",
+  "hashtag.column_header.tag_mode.none": "sonder {additional}",
   "hashtag.column_settings.select.placeholder": "Voer hutsetikette in…",
   "hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
   "hashtag.follow": "Volg hutsetiket",
   "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
   "interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
   "interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
+  "interaction_modal.title.follow": "Volg {name}",
   "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
   "interaction_modal.title.reply": "Reageer op {name} se plasing",
+  "intervals.full.days": "{number, plural, one {# dag} other {# dae}}",
+  "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
+  "intervals.full.minutes": "{number, plural, one {# minuut} other {# minute}}",
   "keyboard_shortcuts.back": "Navigeer terug",
   "keyboard_shortcuts.blocked": "Vertoon lys van geblokkeerde gebruikers",
   "keyboard_shortcuts.boost": "Stuur aan",
@@ -216,8 +222,11 @@
   "keyboard_shortcuts.toot": "Begin ’n nuwe plasing",
   "keyboard_shortcuts.unfocus": "Fokus uit van teksveld/soekveld",
   "keyboard_shortcuts.up": "Beweeg opwaarts in die lys",
+  "lightbox.next": "Volgende",
+  "lightbox.previous": "Vorige",
   "limited_account_hint.action": "Vertoon profiel in elk geval",
   "limited_account_hint.title": "Hierdie profiel is deur moderators van {domain} versteek.",
+  "link_preview.author": "Deur {name}",
   "lists.account.add": "Voeg by lys",
   "lists.account.remove": "Verwyder vanaf lys",
   "lists.delete": "Verwyder lys",
@@ -233,7 +242,6 @@
   "navigation_bar.community_timeline": "Plaaslike tydlyn",
   "navigation_bar.compose": "Skep nuwe plasing",
   "navigation_bar.domain_blocks": "Geblokkeerde domeine",
-  "navigation_bar.edit_profile": "Redigeer profiel",
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
   "navigation_bar.personal": "Persoonlik",
@@ -245,6 +253,7 @@
   "notification.reblog": "{name} het jou plasing aangestuur",
   "notifications.column_settings.push": "Stootkennisgewings",
   "notifications.column_settings.reblog": "Aangestuurde plasings:",
+  "notifications.column_settings.sound": "Speel klank",
   "notifications.column_settings.status": "Nuwe plasings:",
   "notifications.column_settings.unread_notifications.highlight": "Lig ongelese kennisgewings uit",
   "notifications.filter.boosts": "Aangestuurde plasings",
@@ -266,14 +275,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Verander privaatheid van plasing",
-  "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
-  "privacy.direct.short": "Slegs genoemde persone",
-  "privacy.private.long": "Slegs sigbaar vir volgelinge",
-  "privacy.private.short": "Slegs volgelinge",
-  "privacy.public.long": "Sigbaar vir almal",
   "privacy.public.short": "Publiek",
-  "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
-  "privacy.unlisted.short": "Ongelys",
   "privacy_policy.last_updated": "Laaste bywerking op {date}",
   "privacy_policy.title": "Privaatheidsbeleid",
   "regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
@@ -315,5 +317,8 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_progress.label": "Uploading…"
+  "upload_progress.label": "Uploading…",
+  "video.fullscreen": "Volskerm",
+  "video.mute": "Klank afskakel",
+  "video.unmute": "Klank aanskakel"
 }
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 23899b1007..3f1fd376ff 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Amagar audio",
-  "autosuggest_hashtag.per_week": "{count} per semana",
   "boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
   "bundle_column_error.copy_stacktrace": "Copiar informe d'error",
   "bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
@@ -126,26 +125,14 @@
   "compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
   "compose_form.lock_disclaimer.lock": "blocau",
   "compose_form.placeholder": "En qué yes pensando?",
-  "compose_form.poll.add_option": "Anyadir una opción",
   "compose_form.poll.duration": "Duración d'a enqüesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
   "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Alzar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
-  "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Yes seguro que quiers blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitut",
   "confirmations.cancel_follow_request.message": "Yes seguro que deseyas retirar la tuya solicitut pa seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -154,13 +141,10 @@
   "confirmations.delete_list.message": "Seguro que quiers borrar esta lista permanentment?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tiens cambios sin alzar en a descripción u vista previa d'o fichero audiovisual, descartar-los de totz modos?",
-  "confirmations.domain_block.confirm": "Amagar dominio entero",
   "confirmations.domain_block.message": "Yes seguro que quiers blocar lo dominio {domain} entero? En cheneral ye prou, y preferible, fer uns quantos bloqueyos y silenciaus concretos. Los tuyos seguidros d'ixe dominio serán eliminaus.",
   "confirmations.logout.confirm": "Zarrar sesión",
   "confirmations.logout.message": "Yes seguro de querer zarrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto amagará las publicacions d'ells y en as qualas los has mencionau, pero les permitirá veyer los tuyos mensaches y seguir-te.",
-  "confirmations.mute.message": "Yes seguro que quiers silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá lo mensache que yes escribindo. Yes seguro que deseyas continar?",
@@ -264,7 +248,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Deixar de seguir etiqueta",
-  "home.column_settings.basic": "Basico",
   "home.column_settings.show_reblogs": "Amostrar retutz",
   "home.column_settings.show_replies": "Amostrar respuestas",
   "home.hide_announcements": "Amagar anuncios",
@@ -335,9 +318,6 @@
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
   "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Amagar notificacions d'este usuario?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuarios blocaus",
   "navigation_bar.bookmarks": "Marcadors",
@@ -345,7 +325,6 @@
   "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.filters": "Parolas silenciadas",
   "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
@@ -375,9 +354,6 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos rechistros:",
   "notifications.column_settings.alert": "Notificacions d'escritorio",
-  "notifications.column_settings.filter_bar.advanced": "Amostrar totas las categorías",
-  "notifications.column_settings.filter_bar.category": "Barra de filtrau rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitutz de seguimiento:",
   "notifications.column_settings.mention": "Mencions:",
@@ -429,14 +405,7 @@
   "poll_button.add_poll": "Anyadir una enqüesta",
   "poll_button.remove_poll": "Eliminar enqüesta",
   "privacy.change": "Achustar privacidat",
-  "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
-  "privacy.direct.short": "Nomás contas mencionadas",
-  "privacy.private.long": "Nomás amostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible pa totz",
   "privacy.public.short": "Publico",
-  "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
-  "privacy.unlisted.short": "No listau",
   "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
   "privacy_policy.title": "Politica de Privacidat",
   "refresh": "Actualizar",
@@ -523,7 +492,6 @@
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.edit": "Editar",
-  "status.edited": "Editau {date}",
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
@@ -590,10 +558,8 @@
   "upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
   "upload_form.audio_description": "Describir pa personas con problemas auditivos",
   "upload_form.description": "Describir pa los usuarios con dificultat visual",
-  "upload_form.description_missing": "Garra descripción anyadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
   "upload_modal.analyzing_picture": "Analisando imachen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c0d07cc648..68e32dd2aa 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -5,7 +5,7 @@
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
   "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
   "about.domain_blocks.silenced.explanation": "عموماً، لن ترى ملفات التعريف والمحتوى من هذا الخادم، إلا إذا كنت تبحث عنه بشكل صريح أو تختار أن تتابعه.",
-  "about.domain_blocks.silenced.title": "تم كتمه",
+  "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
   "about.domain_blocks.suspended.title": "مُعلّق",
   "about.not_available": "لم يتم توفير هذه المعلومات على هذا الخادم.",
@@ -21,6 +21,7 @@
   "account.blocked": "محظور",
   "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
+  "account.copy": "نسخ الرابط إلى الحساب",
   "account.direct": "إشارة خاصة لـ @{name}",
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocked": "اسم النِّطاق محظور",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "لا توجد رسائل",
   "account.featured_tags.title": "وسوم {name} المميَّزة",
   "account.follow": "متابعة",
+  "account.follow_back": "رد المتابعة",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
   "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "كتم الإشعارات",
   "account.mute_short": "اكتم",
   "account.muted": "مَكتوم",
+  "account.mutual": "متبادل",
   "account.no_bio": "لم يتم تقديم وصف.",
   "account.open_original_page": "افتح الصفحة الأصلية",
   "account.posts": "منشورات",
@@ -86,7 +89,14 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
-  "autosuggest_hashtag.per_week": "{count} في الأسبوع",
+  "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.",
+  "block_modal.show_less": "أظهر الأقل",
+  "block_modal.show_more": "أظهر المزيد",
+  "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.",
+  "block_modal.they_cant_see_posts": "لن يستطيع رؤية منشوراتك ولن ترى منشوراته.",
+  "block_modal.they_will_know": "يمكنه أن يرى أنه قد تم حظره.",
+  "block_modal.title": "أتريد حظر المستخدم؟",
+  "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -143,26 +153,22 @@
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
-  "compose_form.poll.add_option": "إضافة خيار",
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
+  "compose_form.poll.multiple": "متعدد الخيارات",
   "compose_form.poll.option_placeholder": "الخيار {number}",
-  "compose_form.poll.remove_option": "إزالة هذا الخيار",
+  "compose_form.poll.single": "اختر واحدا",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
+  "compose_form.poll.type": "الأسلوب",
   "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "احفظ التعديلات",
-  "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
+  "compose_form.reply": "ردّ",
+  "compose_form.save_changes": "تحديث",
   "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
-  "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
+  "compose_form.spoiler_placeholder": "تحذير المحتوى (اختياري)",
   "confirmation_modal.cancel": "إلغاء",
-  "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
-  "confirmations.block.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَظرَ {name}؟",
   "confirmations.cancel_follow_request.confirm": "إلغاء الطلب",
   "confirmations.cancel_follow_request.message": "متأكد من أنك تريد إلغاء طلب متابعتك لـ {name}؟",
   "confirmations.delete.confirm": "حذف",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "هل أنتَ مُتأكدٌ أنكَ تُريدُ حَذفَ هذِهِ القائمة بشكلٍ دائم؟",
   "confirmations.discard_edit_media.confirm": "تجاهل",
   "confirmations.discard_edit_media.message": "لديك تغييرات غير محفوظة لوصف الوسائط أو معاينتها، أتريد تجاهلها على أي حال؟",
-  "confirmations.domain_block.confirm": "حظر اِسم النِّطاق بشكلٍ كامل",
+  "confirmations.domain_block.confirm": "حظر الخادم",
   "confirmations.domain_block.message": "متأكد من أنك تود حظر اسم النطاق {domain} بالكامل ؟ في غالب الأحيان يُستَحسَن كتم أو حظر بعض الحسابات بدلا من حظر نطاق بالكامل.\nلن تتمكن مِن رؤية محتوى هذا النطاق لا على خيوطك العمومية و لا في إشعاراتك. سوف يتم كذلك إزالة كافة متابعيك المنتمين إلى هذا النطاق.",
   "confirmations.edit.confirm": "تعديل",
   "confirmations.edit.message": "التعديل في الحين سوف يُعيد كتابة الرسالة التي أنت بصدد تحريرها. متأكد من أنك تريد المواصلة؟",
   "confirmations.logout.confirm": "خروج",
   "confirmations.logout.message": "متأكد من أنك تريد الخروج؟",
   "confirmations.mute.confirm": "أكتم",
-  "confirmations.mute.explanation": "هذا سيخفي المنشورات عنهم وتلك المشار فيها إليهم، لكنه سيسمح لهم برؤية منشوراتك ومتابعتك.",
-  "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.reply.confirm": "رد",
@@ -190,6 +194,7 @@
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
   "conversation.with": "مع {names}",
+  "copy_icon_button.copied": "نُسِخ إلى الحافظة",
   "copypaste.copied": "تم نسخه",
   "copypaste.copy_to_clipboard": "نسخ إلى الحافظة",
   "directory.federated": "مِن الفديفرس المعروف",
@@ -204,6 +209,23 @@
   "dismissable_banner.explore_statuses": "هذه هي المنشورات الرائجة على الشبكات الاجتماعيّة اليوم. تظهر المنشورات المعاد نشرها والحائزة على مفضّلات أكثر في مرتبة عليا.",
   "dismissable_banner.explore_tags": "هذه هي الوسوم تكتسب جذب الاهتمام حاليًا على الويب الاجتماعي. الوسوم التي يستخدمها مختلف الناس تحتل مرتبة عليا.",
   "dismissable_banner.public_timeline": "هذه هي أحدث المنشورات العامة من الناس على الشبكة الاجتماعية التي يتبعها الناس على {domain}.",
+  "domain_block_modal.block": "حظر الخادم",
+  "domain_block_modal.block_account_instead": "أحجب @{name} بدلاً من ذلك",
+  "domain_block_modal.they_can_interact_with_old_posts": "يمكن للأشخاص من هذا الخادم التفاعل مع منشوراتك القديمة.",
+  "domain_block_modal.they_cant_follow": "لا أحد من هذا الخادم يمكنه متابعتك.",
+  "domain_block_modal.they_wont_know": "لن يَعرف أنه قد تم حظره.",
+  "domain_block_modal.title": "أتريد حظر النطاق؟",
+  "domain_block_modal.you_will_lose_followers": "سيتم إزالة جميع متابعيك من هذا الخادم.",
+  "domain_block_modal.you_wont_see_posts": "لن ترى منشورات أو إشعارات من المستخدمين على هذا الخادم.",
+  "domain_pill.activitypub_lets_connect": "يتيح لك التواصل والتفاعل مع الناس ليس فقط على ماستدون، ولكن عبر تطبيقات اجتماعية مختلفة أيضا.",
+  "domain_pill.activitypub_like_language": "إنّ ActivityPub مثل لغة ماستدون التي يتحدث بها مع شبكات اجتماعية أخرى.",
+  "domain_pill.server": "الخادِم",
+  "domain_pill.their_handle": "مُعرفه:",
+  "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
+  "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
+  "domain_pill.username": "اسم المستخدم",
+  "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
+  "domain_pill.your_handle": "عنوانك الكامل:",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
@@ -221,6 +243,7 @@
   "emoji_button.search_results": "نتائج البحث",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
+  "empty_column.account_hides_collections": "اختار هذا المستخدم عدم إتاحة هذه المعلومات للعامة",
   "empty_column.account_suspended": "حساب معلق",
   "empty_column.account_timeline": "لا توجد منشورات هنا!",
   "empty_column.account_unavailable": "الملف التعريفي غير متوفر",
@@ -269,12 +292,26 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
+  "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
   "firehose.remote": "خوادم أخرى",
   "follow_request.authorize": "ترخيص",
   "follow_request.reject": "رفض",
   "follow_requests.unlocked_explanation": "حتى وإن كان حسابك غير مقفل، يعتقد فريق {domain} أنك قد ترغب في مراجعة طلبات المتابعة من هذه الحسابات يدوياً.",
+  "follow_suggestions.curated_suggestion": "اختيار الموظفين",
+  "follow_suggestions.dismiss": "لا تُظهرها مجدّدًا",
+  "follow_suggestions.hints.featured": "تم اختيار هذا الملف الشخصي يدوياً من قبل فريق {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "هذا الملف الشخصي مشهور بين الأشخاص الذين تتابعهم.",
+  "follow_suggestions.hints.most_followed": "هذا الملف الشخصي هو واحد من الأكثر متابعة على {domain}.",
+  "follow_suggestions.hints.most_interactions": "هذا الملف الشخصي قد حصل مؤخرا على الكثير من الاهتمام على {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "هذا الملف الشخصي مشابه للملفات الشخصية التي تابعتها مؤخرا.",
+  "follow_suggestions.personalized_suggestion": "توصية مخصصة",
+  "follow_suggestions.popular_suggestion": "توصية رائجة",
+  "follow_suggestions.popular_suggestion_longer": "رائج على {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "مشابهة لمواصفات الملفات الشخصية التي تابعتَها حديثًا",
+  "follow_suggestions.view_all": "عرض الكل",
+  "follow_suggestions.who_to_follow": "حسابات للمُتابَعة",
   "followed_tags": "الوسوم المتابَعة",
   "footer.about": "عن",
   "footer.directory": "دليل الصفحات التعريفية",
@@ -301,13 +338,8 @@
   "hashtag.follow": "اتبع الوسم",
   "hashtag.unfollow": "ألغِ متابعة الوسم",
   "hashtags.and_other": "…و {count, plural, zero {} one {# واحد آخر} two {# اثنان آخران} few {# آخرون} many {# آخَرًا}other {# آخرون}}",
-  "home.actions.go_to_explore": "اطّلع على ما هو رائج حاليا",
-  "home.actions.go_to_suggestions": "ابحث عن أشخاص لِمُتابعتهم",
-  "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
-  "home.explore_prompt.body": "سوف يحتوي خيط أخبارك الرئيسي على مزيج من المنشورات مِنها التي تحتوي على وسوم اخترتَ متابعتها، وأشخاص اخترتَ متابعتهم والمنشورات التي أعادوا نشرها. ومع ذلك، إن لا زال خيط أخبارك يبدو هادئا جدا، ماذا لو:",
-  "home.explore_prompt.title": "هذه هي صفحتك الرئيسة في ماستدون.",
   "home.hide_announcements": "إخفاء الإعلانات",
   "home.pending_critical_update.body": "يرجى تحديث خادم ماستدون في أقرب وقت ممكن!",
   "home.pending_critical_update.link": "اطّلع على التحديثات",
@@ -330,8 +362,8 @@
   "interaction_modal.title.reply": "الرد على منشور {name}",
   "intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
   "intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
-  "intervals.full.minutes": "{number, plural, one {# دقيقة} other {# دقائق}}",
-  "keyboard_shortcuts.back": "للعودة",
+  "intervals.full.minutes": "{number, plural, one {دقيقة واحدة}two {دقيقتان} other {# دقائق}}",
+  "keyboard_shortcuts.back": "للرجوع",
   "keyboard_shortcuts.blocked": "لفتح قائمة المستخدمين المحظورين",
   "keyboard_shortcuts.boost": "لإعادة النشر",
   "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
@@ -388,11 +420,18 @@
   "lists.search": "إبحث في قائمة الحسابات التي تُتابِعها",
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
+  "loading_indicator.label": "جاري التحميل…",
   "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
-  "mute_modal.duration": "المدة",
-  "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
-  "mute_modal.indefinite": "إلى أجل غير مسمى",
+  "mute_modal.hide_from_notifications": "إخفاء من قائمة الإشعارات",
+  "mute_modal.hide_options": "إخفاء الخيارات",
+  "mute_modal.indefinite": "إلى أن أفسخ كتمها",
+  "mute_modal.show_options": "إظهار الخيارات",
+  "mute_modal.they_can_mention_and_follow": "سيكون بإمكانه الإشارة إليك ومتابعتك، لكنك لن تره.",
+  "mute_modal.they_wont_know": "لن يَعرف أنه قد تم كتمه.",
+  "mute_modal.title": "أتريد كتم المُستخدم؟",
+  "mute_modal.you_wont_see_mentions": "سوف لن تر المنشورات التي يُشار إليه.",
+  "mute_modal.you_wont_see_posts": "سيكون بإمكانه رؤية منشوراتك، لكنك لن ترى منشوراته.",
   "navigation_bar.about": "عن",
   "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
   "navigation_bar.blocks": "الحسابات المحجوبة",
@@ -402,7 +441,6 @@
   "navigation_bar.direct": "الإشارات الخاصة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
   "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
@@ -426,20 +464,34 @@
   "notification.follow": "يتابعك {name}",
   "notification.follow_request": "لقد طلب {name} متابعتك",
   "notification.mention": "{name} ذكرك",
+  "notification.moderation-warning.learn_more": "اعرف المزيد",
+  "notification.moderation_warning.action_disable": "تم تعطيل حسابك.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "بعض من منشوراتك تم تصنيفها على أنها حساسة.",
+  "notification.moderation_warning.action_none": "لقد تلقى حسابك تحذيرا بالإشراف.",
+  "notification.moderation_warning.action_sensitive": "سيتم وضع علامة على منشوراتك على أنها حساسة من الآن فصاعدا.",
+  "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
   "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
   "notification.reblog": "قام {name} بمشاركة منشورك",
+  "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
+  "notification.relationships_severance_event.account_suspension": "قام مشرف من {from} بتعليق {target}، مما يعني أنك لم يعد بإمكانك تلقي التحديثات منهم أو التفاعل معهم.",
+  "notification.relationships_severance_event.domain_block": "قام مشرف من {from} بحظر {target}، بما في ذلك {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
+  "notification.relationships_severance_event.learn_more": "اعرف المزيد",
+  "notification.relationships_severance_event.user_domain_block": "لقد قمت بحظر {target}، مما أدى إلى إزالة {followersCount} من متابعينك و {followingCount, plural, one {# حساب} other {# حسابات}} تتابعها.",
   "notification.status": "{name} نشر للتو",
   "notification.update": "عدّلَ {name} منشورًا",
+  "notification_requests.accept": "موافقة",
+  "notification_requests.dismiss": "تخطي",
+  "notification_requests.notifications_from": "إشعارات من {name}",
+  "notification_requests.title": "الإشعارات المصفاة",
   "notifications.clear": "مسح الإشعارات",
   "notifications.clear_confirmation": "متأكد من أنك تود مسح جميع الإشعارات الخاصة بك و المتلقاة إلى حد الآن ؟",
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
   "notifications.column_settings.favourite": "المفضلة:",
-  "notifications.column_settings.filter_bar.advanced": "اعرض كافة الفئات",
-  "notifications.column_settings.filter_bar.category": "شريط الفلترة السريعة",
-  "notifications.column_settings.filter_bar.show_bar": "إظهار شريط التصفية",
+  "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
+  "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",
   "notifications.column_settings.follow": "متابعُون جُدُد:",
   "notifications.column_settings.follow_request": "الطلبات الجديد لِمتابَعتك:",
   "notifications.column_settings.mention": "الإشارات:",
@@ -465,6 +517,15 @@
   "notifications.permission_denied": "تنبيهات سطح المكتب غير متوفرة بسبب رفض أذونات المتصفح مسبقاً",
   "notifications.permission_denied_alert": "لا يمكن تفعيل إشعارات سطح المكتب، لأن إذن المتصفح قد تم رفضه سابقاً",
   "notifications.permission_required": "إشعارات سطح المكتب غير متوفرة لأنه لم يتم منح الإذن المطلوب.",
+  "notifications.policy.filter_new_accounts.hint": "تم إنشاؤها منذ {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
+  "notifications.policy.filter_new_accounts_title": "حسابات جديدة",
+  "notifications.policy.filter_not_followers_hint": "بما في ذلك الأشخاص الذين يتابعونك أقل من {days, plural, zero {}one {يوم واحد} two {يومان} few {# أيام} many {# أيام} other {# أيام}}",
+  "notifications.policy.filter_not_followers_title": "أشخاص لا يتابعونك",
+  "notifications.policy.filter_not_following_hint": "حتى توافق عليهم يدويا",
+  "notifications.policy.filter_not_following_title": "أشخاص لا تتابعهم",
+  "notifications.policy.filter_private_mentions_hint": "تمت تصفيته إلا إذا أن يكون ردًا على ذكرك أو إذا كنت تتابع الحساب",
+  "notifications.policy.filter_private_mentions_title": "إشارات خاصة غير مرغوب فيها",
+  "notifications.policy.title": "تصفية الإشعارات من…",
   "notifications_permission_banner.enable": "تفعيل إشعارات سطح المكتب",
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
@@ -476,6 +537,17 @@
   "onboarding.follows.empty": "نأسف، لا يمكن عرض نتائج في الوقت الحالي. جرب البحث أو انتقل لصفحة الاستكشاف لإيجاد أشخاص للمتابعة، أو حاول مرة أخرى.",
   "onboarding.follows.lead": "مقتطفات خيطك الرئيس هي الطريقة الأساسية لتجربة ماستدون. كلما زاد عدد الأشخاص الذين تتبعهم، كلما زاد خيط أخبارك نشاطا وإثارة للاهتمام. بداية، إليك بعض الاقتراحات:",
   "onboarding.follows.title": "أضفِ طابعا شخصيا على موجزات خيطك الرئيس",
+  "onboarding.profile.discoverable": "اجعل ملفي الشخصي قابلاً للاكتشاف",
+  "onboarding.profile.discoverable_hint": "عندما تختار تفعيل إمكانية الاكتشاف على ماستدون، قد تظهر منشوراتك في نتائج البحث والمواضيع الرائجة، وقد يتم اقتراح ملفك الشخصي لأشخاص ذوي اهتمامات مماثلة معك.",
+  "onboarding.profile.display_name": "الاسم العلني",
+  "onboarding.profile.display_name_hint": "اسمك الكامل أو اسمك المرح…",
+  "onboarding.profile.lead": "يمكنك دائمًا إكمال ذلك لاحقًا في الإعدادات، حيث يتوفر المزيد من خيارات التخصيص.",
+  "onboarding.profile.note": "نبذة عنك",
+  "onboarding.profile.note_hint": "يمكنك @ذِكر أشخاص آخرين أو استعمال #الوسوم…",
+  "onboarding.profile.save_and_continue": "حفظ و إستمرار",
+  "onboarding.profile.title": "إعداد الملف الشخصي",
+  "onboarding.profile.upload_avatar": "تحميل صورة الملف الشخصي",
+  "onboarding.profile.upload_header": "تحميل رأسية الملف الشخصي",
   "onboarding.share.lead": "اسمح للأشخاص بمعرفة إمكانية الوصول إليك على ماستدون!",
   "onboarding.share.message": "أنا {username} في #Mastodon! تعال لمتابعتي على {url}",
   "onboarding.share.next_steps": "الخطوات المحتملة التالية:",
@@ -509,16 +581,18 @@
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
-  "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
-  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
-  "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "مرئي للكل",
+  "privacy.direct.long": "كل من ذُكر في المنشور",
+  "privacy.direct.short": "أشخاص محددون",
+  "privacy.private.long": "متابعيك فقط",
+  "privacy.private.short": "للمتابِعين",
+  "privacy.public.long": "أي شخص على أو خارج ماستدون",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
-  "privacy.unlisted.short": "غير مدرج",
+  "privacy.unlisted.additional": "هذا يتصرف بالضبط مثل النشر للعامة، باستثناء أن المنشور لن يظهر في الموجزات الحية أو في الوسوم أو في الإستكشاف، أو في نتائج بحث ماستدون، حتى وإن قمت بتفعيله على مستوى الحساب.",
+  "privacy.unlisted.long": "خوارزميات أقل",
+  "privacy.unlisted.short": "للعامة دون صخب",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
+  "recommended": "موصى به",
   "refresh": "أنعِش",
   "regeneration_indicator.label": "جارٍ التحميل…",
   "regeneration_indicator.sublabel": "جارٍ تجهيز موجزات خيطك الرئيس!",
@@ -533,7 +607,9 @@
   "relative_time.minutes": "{number}د",
   "relative_time.seconds": "{number}ثا",
   "relative_time.today": "اليوم",
+  "reply_indicator.attachments": "{count, plural, zero {}one {# مرفق} two {# المرفقات} few {# مرفقات} many {# مرفقات} other {# مرفقًا}}",
   "reply_indicator.cancel": "إلغاء",
+  "reply_indicator.poll": "استطلاع رأي",
   "report.block": "حظر",
   "report.block_explanation": "لن ترى منشوراته ولن يمكنه متابعتك أو رؤية منشوراتك، سيكون بديهيا له أنه مكتوم.",
   "report.categories.legal": "إشعارات قانونية",
@@ -589,6 +665,7 @@
   "search.quick_action.status_search": "المنشورات المطابقة لـ {x}",
   "search.search_or_paste": "ابحث أو أدخل رابطا تشعبيا URL",
   "search_popout.full_text_search_disabled_message": "غير متوفر على {domain}.",
+  "search_popout.full_text_search_logged_out_message": "متاح فقط عند تسجيل الدخول.",
   "search_popout.language_code": "رمز لغة ISO",
   "search_popout.options": "خيارات البحث",
   "search_popout.quick_actions": "الإجراءات السريعة",
@@ -625,10 +702,11 @@
   "status.direct": "إشارة خاصة لـ @{name}",
   "status.direct_indicator": "إشارة خاصة",
   "status.edit": "تعديل",
-  "status.edited": "عُدّل في {date}",
+  "status.edited": "آخر تعديل يوم {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
   "status.embed": "إدماج",
   "status.favourite": "فضّل",
+  "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذه الرسالة",
   "status.filtered": "مُصفّى",
   "status.hide": "إخفاء المنشور",
@@ -649,6 +727,7 @@
   "status.reblog": "إعادة النشر",
   "status.reblog_private": "إعادة النشر إلى الجمهور الأصلي",
   "status.reblogged_by": "شارَكَه {name}",
+  "status.reblogs": "{count, plural, one {تعزيز واحد} two {تعزيزتان} few {# تعزيزات} many {# تعزيزات} other {# تعزيزات}}",
   "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة وإعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
@@ -696,10 +775,8 @@
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
   "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
   "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "لم يُضف وصف",
   "upload_form.edit": "تعديل",
   "upload_form.thumbnail": "غيّر الصورة المصغرة",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
   "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
   "upload_modal.apply": "طبّق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index c4238edcd4..b5015c75d8 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -13,14 +13,12 @@
   "about.rules": "Normes del sirvidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
-  "account.badges.bot": "Automatizáu",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
   "account.block_short": "Bloquiar",
   "account.blocked": "Perfil bloquiáu",
   "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
-  "account.cancel_follow_request": "Atayar siguimientu",
   "account.copy": "Copiar I'enllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
@@ -28,13 +26,11 @@
   "account.edit_profile": "Editar el perfil",
   "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
-  "account.featured_tags.last_status_at": "Últimu estáu en {date}",
-  "account.featured_tags.last_status_never": "Sin estaos",
+  "account.featured_tags.last_status_never": "Nun hai nengún artículu",
   "account.featured_tags.title": "Etiquetes destacaes de: {name}",
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
-  "account.followers_counter": "{count, plural, one {{counter} Siguíu} other {{counter} Siguíos}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural,one {Sigue a {counter}} other {Sigue a {counter}}}",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
@@ -42,7 +38,6 @@
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
-  "account.languages": "Camudar llingües suscrites",
   "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
   "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
@@ -71,7 +66,6 @@
   "alert.unexpected.title": "¡Meca!",
   "announcement.announcement": "Anunciu",
   "attachments_list.unprocessed": "(ensin procesar)",
-  "autosuggest_hashtag.per_week": "{count} per selmana",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
@@ -108,30 +102,23 @@
   "community.column_settings.remote_only": "Namás lo remoto",
   "compose.language.change": "Camudar la llingua",
   "compose.language.search": "Buscar llingües…",
+  "compose.published.body": "Espublizóse l'artículu.",
   "compose_form.direct_message_warning_learn_more": "Saber más",
   "compose_form.encryption_warning": "Los artículos de Mastodon nun tán cifraos de puntu a puntu. Nun compartas nengún tipu d'información sensible per Mastodon.",
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
-  "compose_form.poll.add_option": "Amestar una opción",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
-  "compose_form.publish": "Espublizar",
+  "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar los cambeos",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Encaboxar",
-  "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
-  "confirmations.block.message": "¿De xuru que quies bloquiar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirala",
   "confirmations.cancel_follow_request.message": "¿De xuru que quies retirar la solicitú pa siguir a {name}?",
   "confirmations.delete.confirm": "Desaniciar",
   "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
   "confirmations.delete_list.confirm": "Desaniciar",
   "confirmations.discard_edit_media.confirm": "Escartar",
-  "confirmations.domain_block.confirm": "Bloquiar tol dominiu",
   "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
   "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
@@ -150,6 +137,7 @@
   "dismissable_banner.community_timeline": "Esta seición contién los artículos públicos más actuales de los perfiles agospiaos nel dominiu {domain}.",
   "dismissable_banner.dismiss": "Escartar",
   "dismissable_banner.explore_tags": "Esta seición contién les etiquetes del fediversu que tán ganando popularidá güei. Les etiquetes más usaes polos perfiles apaecen no cimero.",
+  "dismissable_banner.public_timeline": "Esta seición contién los artículos más nuevos de les persones na web social que les persones de {domain} siguen.",
   "embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.",
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
@@ -159,6 +147,7 @@
   "emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
   "emoji_button.objects": "Oxetos",
   "emoji_button.people": "Persones",
+  "emoji_button.recent": "D'usu frecuente",
   "emoji_button.search": "Buscar…",
   "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
@@ -207,6 +196,11 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Refugar",
   "follow_requests.unlocked_explanation": "Magar que la to cuenta nun seya privada, el personal del dominiu «{domain}» pensó qu'a lo meyor quies revisar manualmente les solicitúes de siguimientu d'estes cuentes.",
+  "follow_suggestions.dismiss": "Nun volver amosar",
+  "follow_suggestions.personalized_suggestion": "Suxerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Suxerencia popular",
+  "follow_suggestions.view_all": "Ver too",
+  "follow_suggestions.who_to_follow": "A quién siguir",
   "footer.about": "Tocante a",
   "footer.directory": "Direutoriu de perfiles",
   "footer.get_app": "Consiguir l'aplicación",
@@ -221,11 +215,9 @@
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "ensin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
-  "home.column_settings.basic": "Configuración básica",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -263,7 +255,6 @@
   "keyboard_shortcuts.reply": "Responder a un artículu",
   "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
   "keyboard_shortcuts.search": "Enfocar la barra de busca",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "Abrir la columna «Entamar»",
   "keyboard_shortcuts.toggle_sensitivity": "Amosar/anubrir el conteníu multimedia",
   "keyboard_shortcuts.toot": "Comenzar un artículu nuevu",
@@ -283,15 +274,12 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Quies anubrir los avisos d'esti perfil?",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Llinia de tiempu llocal",
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.edit_profile": "Editar el perfil",
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -299,6 +287,7 @@
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Zarrar la sesión",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
+  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes ya otres páxines específiques ábrense por defeutu na interfaz web clásica.",
   "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
@@ -316,9 +305,6 @@
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
-  "notifications.column_settings.filter_bar.category": "Barra de peñera rápida",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar la barra de peñera",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
@@ -334,7 +320,7 @@
   "notifications.group": "{count} avisos",
   "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
-  "onboarding.actions.go_to_explore": "See what's trending",
+  "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
   "onboarding.start.lead": "Xá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu ya non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
   "onboarding.start.skip": "¿Nun precises ayuda pa comenzar?",
   "onboarding.steps.follow_people.body": "Mastodon trata namás de siguir a cuentes interesantes.",
@@ -350,12 +336,7 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
-  "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
-  "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
-  "privacy.private.short": "Namás pa siguidores",
-  "privacy.public.long": "Tol mundu pue ver l'artículu",
   "privacy.public.short": "Artículu públicu",
-  "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
@@ -372,6 +353,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
@@ -415,12 +397,16 @@
   "search.quick_action.go_to_hashtag": "Dir a la etiqueta {x}",
   "search.quick_action.status_search": "Artículos que concasen con {x}",
   "search.search_or_paste": "Busca o apiega una URL",
+  "search_popout.language_code": "códigu de llingua ISO",
   "search_popout.quick_actions": "Aiciones rápides",
   "search_popout.recent": "Busques de recién",
+  "search_popout.specific_date": "data específica",
+  "search_popout.user": "perfil",
   "search_results.accounts": "Perfiles",
   "search_results.all": "Too",
   "search_results.hashtags": "Etiquetes",
   "search_results.nothing_found": "Nun se pudo atopar nada con esos términos de busca",
+  "search_results.see_all": "Ver too",
   "search_results.statuses": "Artículos",
   "search_results.title": "Busca de: {q}",
   "server_banner.introduction": "{domain} ye parte de la rede social descentralizada que tien la teunoloxía de {mastodon}.",
@@ -438,7 +424,6 @@
   "status.delete": "Desaniciar",
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
-  "status.edited": "Editóse'l {date}",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
@@ -463,6 +448,7 @@
   "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al filu",
+  "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.show_filter_reason": "Amosar de toes toes",
   "status.show_less": "Amosar menos",
@@ -491,9 +477,7 @@
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
   "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
-  "upload_form.description_missing": "Nun s'amestó la descripción",
   "upload_form.edit": "Editar",
-  "upload_form.undo": "Desaniciar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
   "upload_modal.applying": "Aplicando…",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 773af40343..2b7673312f 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
-  "autosuggest_hashtag.per_week": "{count} за тыдзень",
+  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
+  "block_modal.show_less": "Паказаць меньш",
+  "block_modal.show_more": "Паказаць больш",
+  "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
+  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць вашых допісаў, а вы — карыстальніка.",
+  "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
+  "block_modal.title": "Заблакіраваць карыстальніка?",
+  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
   "compose_form.placeholder": "Што здарылася?",
-  "compose_form.poll.add_option": "Дадаць варыянт",
   "compose_form.poll.duration": "Працягласць апытання",
+  "compose_form.poll.multiple": "Множны выбар",
   "compose_form.poll.option_placeholder": "Варыянт {number}",
-  "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
+  "compose_form.poll.single": "Адзін варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
-  "compose_form.publish": "Апублікаваць",
-  "compose_form.publish_form": "Апублікаваць",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Захаваць змены",
-  "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
+  "compose_form.poll.type": "Стыль",
+  "compose_form.publish": "Даслаць",
+  "compose_form.publish_form": "Новы допіс",
+  "compose_form.reply": "Адказаць",
+  "compose_form.save_changes": "Абнавіць",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
-  "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
+  "compose_form.spoiler_placeholder": "Папярэджанне аб змесціве (неабавязкова)",
   "confirmation_modal.cancel": "Скасаваць",
-  "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
-  "confirmations.block.message": "Вы ўпэўненыя што хочаце заблакіраваць {name}?",
   "confirmations.cancel_follow_request.confirm": "Скасаваць запыт",
   "confirmations.cancel_follow_request.message": "Сапраўды хочаце скасаваць свой запыт на падпіску на {name}?",
   "confirmations.delete.confirm": "Выдаліць",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.domain_block.confirm": "Заблакіраваць дамен цалкам",
+  "confirmations.domain_block.confirm": "Заблакіраваць сервер",
   "confirmations.domain_block.message": "Вы абсалютна дакладна ўпэўнены, што хочаце заблакіраваць {domain} зусім? У большасці выпадкаў, дастаткова некалькіх мэтавых блакіровак ці ігнараванняў. Вы перастанеце бачыць змесціва з гэтага дамену ва ўсіх стужках і апавяшчэннях. Вашы падпіскі з гэтага дамену будуць выдаленыя.",
   "confirmations.edit.confirm": "Рэдагаваць",
   "confirmations.edit.message": "Калі вы зменіце зараз, гэта ператрэ паведамленне, якое вы пішаце. Вы ўпэўнены, што хочаце працягнуць?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
   "confirmations.mute.confirm": "Ігнараваць",
-  "confirmations.mute.explanation": "Гэта схавае допісы ад гэтага карыстальніка і пра яго, але ўсё яшчэ дазволіць яму чытаць вашыя допісы і быць падпісаным на вас.",
-  "confirmations.mute.message": "Вы ўпэўненыя, што хочаце ігнараваць {name}?",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
   "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
   "confirmations.reply.confirm": "Адказаць",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Допісы з гэтага і іншых сервераў дэцэнтралізаванай сеткі, якія набіраюць папулярнасць прама зараз.",
   "dismissable_banner.explore_tags": "Гэтыя хэштэгі зараз набіраюць папулярнасць сярод людзей на гэтым і іншых серверах дэцэнтралізаванай сеткі",
   "dismissable_banner.public_timeline": "Гэта апошнія публічныя допісы людзей з усей сеткі, за якімі сочаць карыстальнікі {domain}.",
+  "domain_block_modal.block": "Заблакіраваць сервер",
+  "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
+  "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
+  "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
+  "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
+  "domain_block_modal.title": "Заблакіраваць дамен?",
+  "domain_block_modal.you_will_lose_followers": "Усе падпісчыкі з гэтага сервера будуць выдаленыя.",
+  "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
+  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
+  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
+  "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
+  "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
+  "domain_pill.username": "Імя карыстальніка",
+  "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
+  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
+  "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
+  "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
   "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
   "embed.preview": "Вось як гэта будзе выглядаць:",
   "emoji_button.activity": "Актыўнасць",
@@ -244,6 +266,7 @@
   "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
   "empty_column.lists": "Як толькі вы створыце новы спіс ён будзе захоўвацца тут, але пакуль што тут пуста.",
   "empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
+  "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі вы будзеце атрымліваць новыя апавяшчэння, яны будуць з'яўляцца тут у адпаведнасці з вашымі наладамі.",
   "empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
   "empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
   "error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
@@ -274,12 +297,26 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
+  "filtered_notifications_banner.mentions": "{count, plural, one {згадванне} few {згадванні} many {згадванняў} other {згадвання}}",
+  "filtered_notifications_banner.pending_requests": "Апавяшчэнні ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+  "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
   "firehose.remote": "Іншыя серверы",
   "follow_request.authorize": "Аўтарызацыя",
   "follow_request.reject": "Адхіліць",
   "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
+  "follow_suggestions.curated_suggestion": "Выбар адміністрацыі",
+  "follow_suggestions.dismiss": "Не паказваць зноў",
+  "follow_suggestions.hints.featured": "Гэты профіль быў выбраны ўручную камандай {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх вы падпісаліся.",
+  "follow_suggestions.hints.most_followed": "Гэты профіль - адзін з профіляў з самай вялікай колькасцю падпісак на {domain}.",
+  "follow_suggestions.hints.most_interactions": "У апошні час гэты профіль прыцягвае шмат увагі на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія вы нядаўна падпісаліся.",
+  "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
+  "follow_suggestions.popular_suggestion": "Папулярная прапанова",
+  "follow_suggestions.view_all": "Праглядзець усё",
+  "follow_suggestions.who_to_follow": "На каго падпісацца",
   "followed_tags": "Падпіскі",
   "footer.about": "Пра нас",
   "footer.directory": "Дырэкторыя профіляў",
@@ -306,13 +343,8 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
-  "home.actions.go_to_explore": "Паглядзіце, што ў трэндзе",
-  "home.actions.go_to_suggestions": "Знайсці людзей, каб падпісацца",
-  "home.column_settings.basic": "Асноўныя",
   "home.column_settings.show_reblogs": "Паказаць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
-  "home.explore_prompt.body": "Ваша галоўная стужка змяшчае сумесь допісаў з хэштэгамі, за якімі вы вырашылі сачыць, допісаў ад людзей, за якімі вы вырашылі сачыць, і допісаў, якія яны пашыраюць. Зараз усё выглядае даволі ціха, так што як наконт:",
-  "home.explore_prompt.title": "Гэта ваша апорная кропка ў Mastodon.",
   "home.hide_announcements": "Схаваць аб'явы",
   "home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
   "home.pending_critical_update.link": "Прагледзець абнаўленні",
@@ -396,9 +428,15 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
-  "mute_modal.duration": "Працягласць",
-  "mute_modal.hide_notifications": "Схаваць апавяшчэнні ад гэтага карыстальніка?",
-  "mute_modal.indefinite": "Бестэрмінова",
+  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
+  "mute_modal.hide_options": "Схаваць опцыі",
+  "mute_modal.indefinite": "Пакуль я не прыбяру ігнараванне",
+  "mute_modal.show_options": "Паказаць опцыі",
+  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць вас і падпісацца на вас, але вы гэтага не ўбачыце.",
+  "mute_modal.they_wont_know": "Карыстальнік не будзе ведаць пра ігнараванне.",
+  "mute_modal.title": "Ігнараваць карыстальніка?",
+  "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
+  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакаваныя карыстальнікі",
@@ -408,7 +446,6 @@
   "navigation_bar.direct": "Асабістыя згадванні",
   "navigation_bar.discover": "Даведайцесь",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.edit_profile": "Рэдагаваць профіль",
   "navigation_bar.explore": "Агляд",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
@@ -435,17 +472,21 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.relationships_severance_event.learn_more": "Даведацца больш",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
+  "notification_requests.accept": "Прыняць",
+  "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
+  "notification_requests.title": "Адфільтраваныя апавяшчэнні",
   "notifications.clear": "Ачысціць апавяшчэнні",
   "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
   "notifications.column_settings.favourite": "Упадабанае:",
-  "notifications.column_settings.filter_bar.advanced": "Паказваць усе катэгорыі",
+  "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
-  "notifications.column_settings.filter_bar.show_bar": "Паказваць панэль фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
   "notifications.column_settings.mention": "Згадванні:",
@@ -471,6 +512,15 @@
   "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
   "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
   "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
+  "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
+  "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
+  "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
+  "notifications.policy.filter_not_followers_title": "Людзі, якія не падпісаны на вас",
+  "notifications.policy.filter_not_following_hint": "Пакуль вы не пацвердзіце іх уручную",
+  "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
+  "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
+  "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+  "notifications.policy.title": "Адфільтроўваць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
@@ -526,14 +576,15 @@
   "poll_button.add_poll": "Дадаць апытанне",
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
-  "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
-  "privacy.direct.short": "Толькі згаданыя людзі",
-  "privacy.private.long": "Паказаць толькі падпісчыкам",
-  "privacy.private.short": "Толькі для падпісчыкаў",
-  "privacy.public.long": "Бачны для ўсіх",
+  "privacy.direct.long": "Усе згаданыя ў допісе",
+  "privacy.direct.short": "Канкрэтныя людзі",
+  "privacy.private.long": "Толькі вашыя падпісчыкі",
+  "privacy.private.short": "Падпісчыкі",
+  "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
   "privacy.public.short": "Публічны",
-  "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
-  "privacy.unlisted.short": "Не ў стужках",
+  "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што пост не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі вы ўключылі бачнасць у пошуку ў наладах.",
+  "privacy.unlisted.long": "Менш фанфар ад алгарытмаў",
+  "privacy.unlisted.short": "Ціхі публічны",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
@@ -551,7 +602,9 @@
   "relative_time.minutes": "{number} хв",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сёння",
+  "reply_indicator.attachments": "{count, plural, one {# далучэнне} few {# далучэнні} many {# далучэнняў} other {# далучэння}}",
   "reply_indicator.cancel": "Скасаваць",
+  "reply_indicator.poll": "Апытанне",
   "report.block": "Заблакіраваць",
   "report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за вамі і бачыць вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
   "report.categories.legal": "Права",
@@ -644,10 +697,11 @@
   "status.direct": "Згадаць асабіста @{name}",
   "status.direct_indicator": "Асабістае згадванне",
   "status.edit": "Рэдагаваць",
-  "status.edited": "Адрэдагавана {date}",
+  "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
   "status.embed": "Убудаваць",
   "status.favourite": "Упадабанае",
+  "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
   "status.filtered": "Адфільтравана",
   "status.hide": "Схаваць допіс",
@@ -668,6 +722,7 @@
   "status.reblog": "Пашырыць",
   "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
   "status.reblogged_by": "{name} пашырыў(-ла)",
+  "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
   "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
   "status.redraft": "Выдаліць і паправіць",
   "status.remove_bookmark": "Выдаліць закладку",
@@ -683,7 +738,7 @@
   "status.show_more": "Паказаць болей",
   "status.show_more_all": "Разгарнуць усё",
   "status.show_original": "Паказаць арыгінал",
-  "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {укладанне} other {{attachmentCount} укладанні}}",
+  "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",
   "status.translate": "Перакласці",
   "status.translated_from_with": "Перакладзена з {lang} з дапамогай {provider}",
   "status.uncached_media_warning": "Перадпрагляд недаступны",
@@ -715,10 +770,8 @@
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
   "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
   "upload_form.description": "Апісаць для людзей са слабым зрокам",
-  "upload_form.description_missing": "Апісанне адсутнічае",
   "upload_form.edit": "Рэдагаваць",
   "upload_form.thumbnail": "Змяніць мініяцюру",
-  "upload_form.undo": "Выдаліць",
   "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
   "upload_modal.analyzing_picture": "Аналіз выявы…",
   "upload_modal.apply": "Ужыць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7ee3c868ae..95d60b71eb 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -3,12 +3,12 @@
   "about.contact": "За контакти:",
   "about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка на Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Няма налична причина",
-  "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивърс. Има изключения, направени конкретно за този сървър.",
+  "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивселената. Има изключения, направени конкретно за този сървър.",
   "about.domain_blocks.silenced.explanation": "Обикновено няма да виждате профили и съдържание, освен ако изрично не го потърсите или се включете в него, следвайки го.",
   "about.domain_blocks.silenced.title": "Ограничено",
   "about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
   "about.domain_blocks.suspended.title": "Спряно",
-  "about.not_available": "Тази информация не е била направена налична на този сървър.",
+  "about.not_available": "Тази информация не е публична на този сървър.",
   "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
   "about.rules": "Правила на сървъра",
   "account.account_note_header": "Бележка",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
-  "autosuggest_hashtag.per_week": "{count} на седмица",
+  "block_modal.remote_users_caveat": "Ще поискаме сървърът {domain} да почита решението ви. Съгласието обаче не се гарантира откак някои сървъри могат да боравят с блоковете по различен начин. Обществените публикации още може да се виждат от невлезли в системата потребители.",
+  "block_modal.show_less": "Повече на показ",
+  "block_modal.show_more": "По-малко на показ",
+  "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
+  "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.",
+  "block_modal.they_will_know": "Те могат да видят, че са блокирани.",
+  "block_modal.title": "Блокирате ли потребителя?",
+  "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -111,7 +118,7 @@
   "column.about": "Относно",
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
-  "column.community": "Локална часова ос",
+  "column.community": "Локален инфопоток",
   "column.direct": "Частни споменавания",
   "column.directory": "Разглеждане на профили",
   "column.domain_blocks": "Блокирани домейни",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Вашият акаунт не е в положение {locked}. Всеки може да ви последва, за да разглежда публикациите ви само за последователи.",
   "compose_form.lock_disclaimer.lock": "заключено",
   "compose_form.placeholder": "Какво мислите?",
-  "compose_form.poll.add_option": "Добавяне на избор",
   "compose_form.poll.duration": "Времетраене на анкетата",
+  "compose_form.poll.multiple": "Множествен избор",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на този избор",
+  "compose_form.poll.single": "Подберете нещо",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
-  "compose_form.publish": "Публикуване",
+  "compose_form.poll.type": "Стил",
+  "compose_form.publish": "Публикация",
   "compose_form.publish_form": "Публикуване",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Запазване на промените",
-  "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
-  "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
+  "compose_form.reply": "Отговор",
+  "compose_form.save_changes": "Обновяване",
   "compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание",
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
-  "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
+  "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
-  "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
-  "confirmations.block.message": "Наистина ли искате да блокирате {name}?",
   "confirmations.cancel_follow_request.confirm": "Оттегляне на заявката",
   "confirmations.cancel_follow_request.message": "Наистина ли искате да оттеглите заявката си за последване на {name}?",
   "confirmations.delete.confirm": "Изтриване",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
-  "confirmations.domain_block.confirm": "Блокиране на целия домейн",
+  "confirmations.domain_block.confirm": "Блокиране на сървър",
   "confirmations.domain_block.message": "Наистина ли искате да блокирате целия {domain}? В повечето случаи няколко блокирания или заглушавания са достатъчно и за предпочитане. Няма да виждате съдържание от домейна из публични часови оси или известията си. Вашите последователи от този домейн ще се премахнат.",
   "confirmations.edit.confirm": "Редактиране",
   "confirmations.edit.message": "Редактирането сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.logout.confirm": "Излизане",
   "confirmations.logout.message": "Наистина ли искате да излезете?",
   "confirmations.mute.confirm": "Заглушаване",
-  "confirmations.mute.explanation": "Това ще скрие публикациите от тях и публикации, които ги споменават, но все още ще им позволява да виждат публикациите ви и да ви следват.",
-  "confirmations.mute.message": "Наистина ли искате да заглушите {name}?",
   "confirmations.redraft.confirm": "Изтриване и преработване",
   "confirmations.redraft.message": "Наистина ли искате да изтриете тази публикация и да я направите чернова? Означаванията като любими и подсилванията ще се изгубят, а и отговорите към първоначалната публикация ще осиротеят.",
   "confirmations.reply.confirm": "Отговор",
@@ -204,10 +205,31 @@
   "disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
   "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
   "dismissable_banner.dismiss": "Отхвърляне",
-  "dismissable_banner.explore_links": "Тези новини се разказват от хората в този и други сървъри на децентрализираната мрежа точно сега.",
+  "dismissable_banner.explore_links": "Това са най-споделяните новини в социалната мрежа днес. По-нови истории, споделени от повече хора се показват по-напред.",
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
+  "domain_block_modal.block": "Блокиране на сървър",
+  "domain_block_modal.block_account_instead": "Вместо това блокиране на @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Хората от този сървър могат да взаимодействат с ваши стари публикации.",
+  "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
+  "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
+  "domain_block_modal.title": "Блокирате ли домейн?",
+  "domain_block_modal.you_will_lose_followers": "Всичките ви последователи от този сървър ще се премахнат.",
+  "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
+  "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
+  "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
+  "domain_pill.server": "Сървър",
+  "domain_pill.their_handle": "Тяхната ръчка:",
+  "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
+  "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+  "domain_pill.username": "Потребителско име",
+  "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+  "domain_pill.who_they_are": "Откак ръчките казват кой кой е и къде е, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.who_you_are": "Тъй като вашата ръчка казва кои сте и къде сте, то може да взаимодействате с хора през социаното уебпространство на <button>захранваните платформи от ActivityPub</button>.",
+  "domain_pill.your_handle": "Вашата ръчка:",
+  "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
+  "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
   "emoji_button.activity": "Дейност",
@@ -225,16 +247,16 @@
   "emoji_button.search_results": "Резултати от търсене",
   "emoji_button.symbols": "Символи",
   "emoji_button.travel": "Пътуване и места",
-  "empty_column.account_hides_collections": "Този потребител е избрал да не прави това сведение достъпно",
+  "empty_column.account_hides_collections": "Този потребител е избрал да не дава тази информация",
   "empty_column.account_suspended": "Спрян акаунт",
   "empty_column.account_timeline": "Тук няма публикации!",
   "empty_column.account_unavailable": "Профилът не е наличен",
   "empty_column.blocks": "Още не сте блокирали никакви потребители.",
   "empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
-  "empty_column.community": "Местната часова ос е празна. Напишете нещо обществено, за да завъртите нещата!",
+  "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
   "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
   "empty_column.domain_blocks": "Още няма блокирани домейни.",
-  "empty_column.explore_statuses": "Няма нищо налагащо се в момента. Проверете пак по-късно!",
+  "empty_column.explore_statuses": "Няма тенденции в момента. Проверете пак по-късно!",
   "empty_column.favourited_statuses": "Още нямате никакви любими публикации. Правейки любима, то тя ще се покаже тук.",
   "empty_column.favourites": "Още никого не е слагал публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
   "empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.",
@@ -244,6 +266,7 @@
   "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
   "empty_column.mutes": "Още не сте заглушавали потребители.",
+  "empty_column.notification_requests": "Всичко е чисто! Тук няма нищо. Получавайки нови известия, те ще се появят тук според настройките ви.",
   "empty_column.notifications": "Все още нямате известия. Взаимодействайте с другите, за да започнете разговора.",
   "empty_column.public": "Тук няма нищо! Публикувайте нещо или последвайте потребители от други сървъри, за да го напълните",
   "error.unexpected_crash.explanation": "Поради грешка в нашия код или проблем със съвместимостта на браузъра, тази страница не може да се покаже правилно.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
+  "filtered_notifications_banner.mentions": "{count, plural, one {споменаване} other {споменавания}}",
+  "filtered_notifications_banner.pending_requests": "Известията от {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
+  "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
   "firehose.local": "Този сървър",
   "firehose.remote": "Други сървъри",
   "follow_request.authorize": "Упълномощаване",
   "follow_request.reject": "Отхвърляне",
   "follow_requests.unlocked_explanation": "Въпреки че акаунтът ви не е заключен, служителите на {domain} помислиха, че може да искате да преглеждате ръчно заявките за последване на тези профили.",
+  "follow_suggestions.curated_suggestion": "Избор на персонал",
+  "follow_suggestions.dismiss": "Без ново показване",
+  "follow_suggestions.featured_longer": "Ръчно избрано от отбора на {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Популярно измежду хората, които следвате",
+  "follow_suggestions.hints.featured": "Този профил е ръчно подбран от отбора на {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Този профил е популярен измежду хората, които следвате.",
+  "follow_suggestions.hints.most_followed": "Този профил е един от най-следваните при {domain}.",
+  "follow_suggestions.hints.most_interactions": "Този профил наскоро получи много внимание при {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Този профил е подобен на профилите, които сте последвали наскоро.",
+  "follow_suggestions.personalized_suggestion": "Персонализирано предложение",
+  "follow_suggestions.popular_suggestion": "Популярно предложение",
+  "follow_suggestions.popular_suggestion_longer": "Популярно из {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Подобни на профилите, които наскоро сте последвали",
+  "follow_suggestions.view_all": "Преглед на всички",
+  "follow_suggestions.who_to_follow": "Кого да се следва",
   "followed_tags": "Последвани хаштагове",
   "footer.about": "Относно",
   "footer.directory": "Директория на профилите",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Следване на хаштаг",
   "hashtag.unfollow": "Спиране на следване на хаштаг",
   "hashtags.and_other": "…и {count, plural, other {# още}}",
-  "home.actions.go_to_explore": "Вижте какво изгрява",
-  "home.actions.go_to_suggestions": "Намиране на хора за следване",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
-  "home.explore_prompt.body": "Вашият начален инфоканал ще е смес на публикации от хаштаговете, които сте избрали да следвате, избраните хора да следвате, а и публикациите, които са подсилили. Ако изглежда твърде тихо в момента, то може да искате да:",
-  "home.explore_prompt.title": "Това е началната ви база с Mastodon.",
   "home.hide_announcements": "Скриване на оповестяванията",
   "home.pending_critical_update.body": "Обновете сървъра си в Mastodon възможно най-скоро!",
   "home.pending_critical_update.link": "Преглед на обновяванията",
@@ -349,10 +385,10 @@
   "keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
   "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
   "keyboard_shortcuts.heading": "Клавишни съчетания",
-  "keyboard_shortcuts.home": "Отваряне на началната часова ос",
+  "keyboard_shortcuts.home": "Отваряне на личния инфопоток",
   "keyboard_shortcuts.hotkey": "Бърз клавиш",
   "keyboard_shortcuts.legend": "Показване на тази легенда",
-  "keyboard_shortcuts.local": "Отваряне на местна часова ос",
+  "keyboard_shortcuts.local": "Отваряне на локалния инфопоток",
   "keyboard_shortcuts.mention": "Споменаване на автора",
   "keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
   "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
@@ -396,20 +432,25 @@
   "loading_indicator.label": "Зареждане…",
   "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
-  "mute_modal.duration": "Времетраене",
-  "mute_modal.hide_notifications": "Скриване на известия от този потребител?",
-  "mute_modal.indefinite": "Неопределено",
+  "mute_modal.hide_from_notifications": "Скриване от известията",
+  "mute_modal.hide_options": "Скриване на възможностите",
+  "mute_modal.indefinite": "Докато премахна заглушаването им",
+  "mute_modal.show_options": "Показване на възможностите",
+  "mute_modal.they_can_mention_and_follow": "Могат да ви споменават и последват, но няма да ги виждате.",
+  "mute_modal.they_wont_know": "Няма да узнаят, че са били заглушени.",
+  "mute_modal.title": "Заглушавате ли потребител?",
+  "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
+  "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална часова ос",
+  "navigation_bar.community_timeline": "Локален инфопоток",
   "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.edit_profile": "Редактиране на профила",
-  "navigation_bar.explore": "Изследване",
+  "navigation_bar.explore": "Разглеждане",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
   "navigation_bar.follow_requests": "Заявки за последване",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} ви последва",
   "notification.follow_request": "{name} поиска да ви последва",
   "notification.mention": "{name} ви спомена",
+  "notification.moderation-warning.learn_more": "Научете повече",
+  "notification.moderation_warning": "Получихте предупреждение за модериране",
+  "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
+  "notification.moderation_warning.action_disable": "Вашият акаунт е изключен.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Някои от публикациите ви са означени като деликатни.",
+  "notification.moderation_warning.action_none": "Акаунтът ви получи предупреждение за модериране.",
+  "notification.moderation_warning.action_sensitive": "Публикациите ви ще се означават като деликатни от сега нататък.",
+  "notification.moderation_warning.action_silence": "Вашият акаунт е ограничен.",
+  "notification.moderation_warning.action_suspend": "Вашият акаунт е спрян.",
   "notification.own_poll": "Анкетата ви приключи",
   "notification.poll": "Анкета, в която гласувахте, приключи",
   "notification.reblog": "{name} подсили ваша публикация",
+  "notification.relationships_severance_event": "Изгуби се връзката с {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор от {from} спря {target}, което значи че повече не може да получавате новости от тях или да взаимодействате с тях.",
+  "notification.relationships_severance_event.domain_block": "Администратор от {from} блокира {target}, вкючващо {followersCount} от последователите ви и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
+  "notification.relationships_severance_event.learn_more": "Научете повече",
+  "notification.relationships_severance_event.user_domain_block": "Блокирахте {target}, премахвайки {followersCount} от последователите си и {followingCount, plural, one {# акаунт, който} other {# акаунта, които}} следвате.",
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
+  "notification_requests.accept": "Приемам",
+  "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.notifications_from": "Известия от {name}",
+  "notification_requests.title": "Филтрирани известия",
   "notifications.clear": "Изчистване на известията",
   "notifications.clear_confirmation": "Наистина ли искате да изчистите завинаги всичките си известия?",
   "notifications.column_settings.admin.report": "Нови доклади:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Любими:",
   "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
   "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
-  "notifications.column_settings.filter_bar.show_bar": "Показване на лентата с филтри",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.follow_request": "Нови заявки за последване:",
   "notifications.column_settings.mention": "Споменавания:",
@@ -471,15 +529,24 @@
   "notifications.permission_denied": "Известията на работния плот не са налични поради предварително отказана заявка за разрешение в браузъра",
   "notifications.permission_denied_alert": "Известията на работния плот не могат да се включат, тъй като разрешението на браузъра е отказвано преди",
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
+  "notifications.policy.filter_new_accounts.hint": "Сътворено през {days, plural, one {последния ден} other {последните # дена}}",
+  "notifications.policy.filter_new_accounts_title": "Нови акаунти",
+  "notifications.policy.filter_not_followers_hint": "Включително хора, които са ви последвали по-малко от {days, plural, one {ден} other {# дни}}",
+  "notifications.policy.filter_not_followers_title": "Хора, които не ви следват",
+  "notifications.policy.filter_not_following_hint": "Докато не ги одобрите ръчно",
+  "notifications.policy.filter_not_following_title": "Хора, които не следвате",
+  "notifications.policy.filter_private_mentions_hint": "Филтрирано, освен ако е отговор към ваше собствено споменаване или ако следвате подателя",
+  "notifications.policy.filter_private_mentions_title": "Непоискани частни споменавания",
+  "notifications.policy.title": "Да се филтрират известия от…",
   "notifications_permission_banner.enable": "Включване на известията на работния плот",
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
-  "notifications_permission_banner.title": "Никога не пропускате нещо",
+  "notifications_permission_banner.title": "Никога не пропускайте нищо",
   "onboarding.action.back": "Върнете ме обратно",
   "onboarding.actions.back": "Върнете ме обратно",
-  "onboarding.actions.go_to_explore": "Вижте какво изгрява",
-  "onboarding.actions.go_to_home": "Към началния ви инфоканал",
+  "onboarding.actions.go_to_explore": "Виж тенденции",
+  "onboarding.actions.go_to_home": "Към началния ми инфоканал",
   "onboarding.compose.template": "Здравейте, #Mastodon!",
-  "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате да употребявате търсене или да прегледате страницата за изследване, за да намерите страница за последване, или да опитате пак по-късно.",
+  "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
   "onboarding.follows.title": "Популярно в Mastodon",
   "onboarding.profile.discoverable": "Правене на моя профил откриваем",
@@ -501,7 +568,7 @@
   "onboarding.start.skip": "Желаете ли да прескочите?",
   "onboarding.start.title": "Успяхте!",
   "onboarding.steps.follow_people.body": "Може да бъдете куратор на инфоканала си. Хайде да го запълним с интересни хора.",
-  "onboarding.steps.follow_people.title": "Последвайте {count, plural, one {един човек} other {# души}}",
+  "onboarding.steps.follow_people.title": "Персонализиране на началния ви инфоканал",
   "onboarding.steps.publish_status.body": "Поздравете целия свят.",
   "onboarding.steps.publish_status.title": "Направете първата си публикация",
   "onboarding.steps.setup_profile.body": "Други са по-вероятно да взаимодействат с вас с попълнения профил.",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
-  "privacy.direct.long": "Видимо само за споменатите потребители",
-  "privacy.direct.short": "Само споменатите хора",
-  "privacy.private.long": "Видимо само за последователите",
-  "privacy.private.short": "Само последователи",
-  "privacy.public.long": "Видимо за всички",
+  "privacy.direct.long": "Споменатите в публикацията",
+  "privacy.direct.short": "Определени хора",
+  "privacy.private.long": "Само последователите ви",
+  "privacy.private.short": "Последователи",
+  "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
-  "privacy.unlisted.short": "Несписъчно",
+  "privacy.unlisted.additional": "Това действие е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, разглеждането или търсенето в Mastodon, дори ако сте избрали да се публично видими на ниво акаунт.",
+  "privacy.unlisted.long": "По-малко алгоритмични фанфари",
+  "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
   "recommended": "Препоръчано",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}м.",
   "relative_time.seconds": "{number}с.",
   "relative_time.today": "днес",
+  "reply_indicator.attachments": "{count, plural, one {# прикаване} other {# прикачвания}}",
   "reply_indicator.cancel": "Отказ",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокиране",
   "report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
   "report.categories.legal": "Правни въпроси",
@@ -605,7 +675,7 @@
   "search.quick_action.go_to_hashtag": "Към хаштаг {x}",
   "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
-  "search.search_or_paste": "Търсене или поставяне на URL адрес",
+  "search.search_or_paste": "Търсене/поставяне на URL",
   "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
   "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
@@ -644,10 +714,11 @@
   "status.direct": "Частно споменаване на @{name}",
   "status.direct_indicator": "Частно споменаване",
   "status.edit": "Редактиране",
-  "status.edited": "Редактирано на {date}",
+  "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
   "status.embed": "Вграждане",
   "status.favourite": "Любимо",
+  "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
   "status.filtered": "Филтрирано",
   "status.hide": "Скриване на публ.",
@@ -668,6 +739,7 @@
   "status.reblog": "Подсилване",
   "status.reblog_private": "Подсилване с оригиналната видимост",
   "status.reblogged_by": "{name} подсили",
+  "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
   "status.redraft": "Изтриване и преначертаване",
   "status.remove_bookmark": "Премахване на отметката",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
-  "upload_form.description_missing": "Няма добавен опис",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
-  "upload_form.undo": "Изтриване",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
   "upload_modal.analyzing_picture": "Снимков анализ…",
   "upload_modal.apply": "Прилагане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index fe3d2a627c..797b93e243 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "ঘোষণা",
   "attachments_list.unprocessed": "(প্রক্রিয়া করা যায়নি)",
   "audio.hide": "অডিও লুকান",
-  "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
   "boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
   "bundle_column_error.copy_stacktrace": "এরর রিপোর্ট কপি করুন",
   "bundle_column_error.error.body": "অনুরোধ করা পৃষ্ঠাটি রেন্ডার করা যায়নি। এটি আমাদের কোডে একটি বাগ বা ব্রাউজার সামঞ্জস্যের সমস্যার কারণে হতে পারে।",
@@ -142,26 +141,14 @@
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
   "compose_form.placeholder": "আপনি কি ভাবছেন ?",
-  "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
   "compose_form.poll.duration": "ভোটগ্রহনের সময়",
-  "compose_form.poll.option_placeholder": "বিকল্প {number}",
-  "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
   "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
   "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
-  "compose_form.publish": "প্রকাশ করুন",
   "compose_form.publish_form": "প্রকাশ করুন",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "পরিবর্তনগুলো প্রকাশ করুন",
-  "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
-  "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
-  "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
-  "compose_form.spoiler_placeholder": "আপনার লেখা দেখার সাবধানবাণী লিখুন",
   "confirmation_modal.cancel": "বাতিল করুন",
-  "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
-  "confirmations.block.message": "আপনি কি নিশ্চিত {name} কে ব্লক করতে চান?",
   "confirmations.cancel_follow_request.confirm": "অনুরোধ বাতিল করুন",
   "confirmations.cancel_follow_request.message": "আপনি কি নিশ্চিত যে আপনি {name} কে অনুসরণ করার অনুরোধ প্রত্যাহার করতে চান?",
   "confirmations.delete.confirm": "মুছে ফেলুন",
@@ -170,15 +157,12 @@
   "confirmations.delete_list.message": "আপনি কি নিশ্চিত যে আপনি এই তালিকাটি স্থায়িভাবে মুছে ফেলতে চান ?",
   "confirmations.discard_edit_media.confirm": "বাতিল করো",
   "confirmations.discard_edit_media.message": "মিডিয়া Description বা Preview তে আপনার আপনার অসংরক্ষিত পরিবর্তন আছে, সেগুলো বাতিল করবেন?",
-  "confirmations.domain_block.confirm": "এই ডোমেন থেকে সব লুকান",
   "confirmations.domain_block.message": "আপনি কি সত্যিই সত্যই নিশ্চিত যে আপনি পুরো {domain}'টি ব্লক করতে চান? বেশিরভাগ ক্ষেত্রে কয়েকটি লক্ষ্যযুক্ত ব্লক বা নীরবতা যথেষ্ট এবং পছন্দসই। আপনি কোনও পাবলিক টাইমলাইন বা আপনার বিজ্ঞপ্তিগুলিতে সেই ডোমেন থেকে সামগ্রী দেখতে পাবেন না। সেই ডোমেন থেকে আপনার অনুসরণকারীদের সরানো হবে।",
   "confirmations.edit.confirm": "সম্পাদন",
   "confirmations.edit.message": "এখন সম্পাদনা করলে আপনি যে মেসেজ লিখছেন তা overwrite করবে, চালিয়ে যেতে চান?",
   "confirmations.logout.confirm": "প্রস্থান",
   "confirmations.logout.message": "আপনি লগ আউট করতে চান?",
   "confirmations.mute.confirm": "সরিয়ে ফেলুন",
-  "confirmations.mute.explanation": "এটি তাদের কাছ থেকে পোস্ট এবং তাদেরকে মেনশন করা পোস্টগুলি হাইড করবে, তবুও তাদেরকে এটি আপনার পোস্ট গুলো দেখতে দিবে ও তারা আপনাকে অনুসরন করতে পারবে।.",
-  "confirmations.mute.message": "আপনি কি নিশ্চিত {name} সরিয়ে ফেলতে চান ?",
   "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
   "confirmations.reply.confirm": "মতামত",
   "confirmations.reply.message": "এখন মতামত লিখতে গেলে আপনার এখন যেটা লিখছেন সেটা মুছে যাবে। আপনি নি নিশ্চিত এটা করতে চান ?",
@@ -259,7 +243,6 @@
   "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
   "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
   "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
-  "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
   "home.hide_announcements": "ঘোষণা লুকান",
@@ -314,9 +297,6 @@
   "lists.subheading": "আপনার তালিকা",
   "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
-  "mute_modal.duration": "সময়কাল",
-  "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
-  "mute_modal.indefinite": "অনির্দিষ্ট",
   "navigation_bar.about": "পরিচিতি",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
@@ -324,7 +304,6 @@
   "navigation_bar.compose": "নতুন টুট লিখুন",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
   "navigation_bar.explore": "পরিব্রাজন",
   "navigation_bar.favourites": "পছন্দসমূহ",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
@@ -350,8 +329,6 @@
   "notifications.clear_confirmation": "আপনি কি নির্চিত প্রজ্ঞাপনগুলো মুছে ফেলতে চান ?",
   "notifications.column_settings.alert": "কম্পিউটারে প্রজ্ঞাপনগুলি",
   "notifications.column_settings.favourite": "পছন্দসমূহ:",
-  "notifications.column_settings.filter_bar.advanced": "সব শ্রেণীগুলো দেখানো",
-  "notifications.column_settings.filter_bar.category": "সংক্ষিপ্ত ছাঁকনি অংশ",
   "notifications.column_settings.follow": "নতুন অনুসরণকারীরা:",
   "notifications.column_settings.follow_request": "অনুসরণের অনুরোধগুলি:",
   "notifications.column_settings.mention": "প্রজ্ঞাপনগুলো:",
@@ -395,12 +372,7 @@
   "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
-  "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.short": "প্রকাশ্য নয়",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",
   "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
@@ -506,7 +478,6 @@
   "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
   "upload_form.edit": "সম্পাদন",
   "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
-  "upload_form.undo": "মুছে ফেলতে",
   "upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
   "upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
   "upload_modal.apply": "প্রয়োগ করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ad6e55c5e1..9ec26c8c12 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -29,7 +29,7 @@
   "account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
-  "account.featured_tags.last_status_never": "Toud ebet",
+  "account.featured_tags.last_status_never": "Embannadur ebet",
   "account.featured_tags.title": "Hashtagoù pennañ {name}",
   "account.follow": "Heuliañ",
   "account.follow_back": "Heuliañ d'ho tro",
@@ -62,7 +62,7 @@
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toud} two {{counter} Doud} other {{counter} a Doudoù}}",
+  "account.statuses_counter": "{count, plural, one {{counter} C'hannad} two {{counter} Gannad} other {{counter} a Gannadoù}}",
   "account.unblock": "Diverzañ @{name}",
   "account.unblock_domain": "Diverzañ an domani {domain}",
   "account.unblock_short": "Distankañ",
@@ -87,7 +87,8 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
-  "autosuggest_hashtag.per_week": "{count} bep sizhun",
+  "block_modal.show_less": "Diskouez nebeutoc'h",
+  "block_modal.show_more": "Diskouez muioc'h",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -114,14 +115,15 @@
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
+  "column.firehose": "Redoù war-eeun",
   "column.follow_requests": "Rekedoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
   "column.mutes": "Implijer·ion·ezed kuzhet",
   "column.notifications": "Kemennoù",
-  "column.pins": "Toudoù spilhennet",
+  "column.pins": "Embannadurioù spilhennet",
   "column.public": "Red-amzer kevredet",
-  "column_back_button.label": "Distro",
+  "column_back_button.label": "Distreiñ",
   "column_header.hide_settings": "Kuzhat an arventennoù",
   "column_header.moveLeft_settings": "Dilec'hiañ ar bannad a-gleiz",
   "column_header.moveRight_settings": "Dilec'hiañ ar bannad a-zehou",
@@ -143,26 +145,21 @@
   "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
-  "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
   "compose_form.poll.duration": "Pad ar sontadeg",
-  "compose_form.poll.option_placeholder": "Dibab {number}",
-  "compose_form.poll.remove_option": "Lemel an dibab-mañ",
+  "compose_form.poll.multiple": "Meur a choaz",
+  "compose_form.poll.option_placeholder": "Choaz {number}",
+  "compose_form.poll.single": "Dibabit unan",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
+  "compose_form.poll.type": "Neuz",
   "compose_form.publish": "Embann",
   "compose_form.publish_form": "Embann",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
-  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
-  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
-  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
+  "compose_form.reply": "Respont",
+  "compose_form.save_changes": "Hizivadur",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
   "confirmation_modal.cancel": "Nullañ",
-  "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
-  "confirmations.block.message": "Ha sur oc'h e fell deoc'h stankañ {name} ?",
   "confirmations.cancel_follow_request.confirm": "Nullañ ar reked",
   "confirmations.cancel_follow_request.message": "Ha sur oc'h e fell deoc'h nullañ ho reked evit heuliañ {name} ?",
   "confirmations.delete.confirm": "Dilemel",
@@ -171,14 +168,11 @@
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
-  "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
   "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
   "confirmations.edit.confirm": "Kemmañ",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
-  "confirmations.mute.explanation": "Kement-se a guzho an toudoù skrivet gantañ·i hag ar re a veneg anezhañ·i, met ne viro ket outañ·i a welet ho toudoù nag a heuliañ ac'hanoc'h.",
-  "confirmations.mute.message": "Ha sur oc'h e fell deoc'h kuzhaat {name} ?",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
   "confirmations.reply.confirm": "Respont",
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
@@ -201,13 +195,15 @@
   "dismissable_banner.dismiss": "Diverkañ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.server": "Dafariad",
+  "domain_pill.username": "Anv-implijer",
   "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
   "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
   "emoji_button.clear": "Diverkañ",
-  "emoji_button.custom": "Kempennet",
+  "emoji_button.custom": "Personelaet",
   "emoji_button.flags": "Bannieloù",
-  "emoji_button.food": "Boued hag Evaj",
+  "emoji_button.food": "Boued & Evajoù",
   "emoji_button.label": "Enlakaat un emoji",
   "emoji_button.nature": "Natur",
   "emoji_button.not_found": "Emoji ebet !! (╯°□°）╯︵ ┻━┻",
@@ -217,12 +213,12 @@
   "emoji_button.search": "O klask...",
   "emoji_button.search_results": "Disoc'hoù an enklask",
   "emoji_button.symbols": "Arouezioù",
-  "emoji_button.travel": "Lec'hioù ha Beajoù",
+  "emoji_button.travel": "Beajiñ & Lec'hioù",
   "empty_column.account_suspended": "Kont ehanet",
   "empty_column.account_timeline": "Toud ebet amañ !",
   "empty_column.account_unavailable": "Profil dihegerz",
   "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
-  "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
+  "empty_column.bookmarked_statuses": "N'ho peus embannadur ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
   "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
@@ -260,12 +256,16 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
+  "filtered_notifications_banner.mentions": "{count, plural, one {meneg} two {veneg} few {meneg} other {a venegoù}}",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
   "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "follow_suggestions.friends_of_friends_longer": "Diouzh ar c'hiz e-touez an dud heuliet ganeoc'h",
+  "follow_suggestions.popular_suggestion_longer": "Diouzh ar c'hiz war {domain}",
+  "follow_suggestions.view_all": "Gwelet pep tra",
   "followed_tags": "Hashtagoù o heuliañ",
   "footer.about": "Diwar-benn",
   "footer.directory": "Kavlec'h ar profiloù",
@@ -273,7 +273,7 @@
   "footer.invite": "Pediñ tud",
   "footer.keyboard_shortcuts": "Berradennoù klavier",
   "footer.privacy_policy": "Reolennoù prevezded",
-  "footer.source_code": "Gwelet kod mammenn",
+  "footer.source_code": "Gwelet ar c'hod mammenn",
   "footer.status": "Statud",
   "generic.saved": "Enrollet",
   "getting_started.heading": "Loc'hañ",
@@ -291,12 +291,8 @@
   "hashtag.follow": "Heuliañ ar ger-klik",
   "hashtag.unfollow": "Paouez heuliañ an hashtag",
   "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
-  "home.actions.go_to_explore": "Gwelet petra zo diouzh ar c'hiz",
-  "home.actions.go_to_suggestions": "Kavout tud da heuliañ",
-  "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
-  "home.explore_prompt.title": "Homañ eo ho pajenn degemer e-barzh Mastodon.",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
   "home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
   "home.pending_critical_update.link": "Gwelet an hizivadennoù",
@@ -304,7 +300,7 @@
   "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
   "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
   "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
-  "interaction_modal.no_account_yet": "N'eo ket war vMastodon?",
+  "interaction_modal.no_account_yet": "N'emañ ket war vMastodon?",
   "interaction_modal.on_another_server": "War ur servijer all",
   "interaction_modal.on_this_server": "War ar servijer-mañ",
   "interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
@@ -372,9 +368,6 @@
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ…",
   "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
-  "mute_modal.duration": "Padelezh",
-  "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
-  "mute_modal.indefinite": "Amstrizh",
   "navigation_bar.about": "Diwar-benn",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
@@ -383,7 +376,6 @@
   "navigation_bar.direct": "Menegoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.edit_profile": "Kemmañ ar profil",
   "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
@@ -405,6 +397,7 @@
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
   "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
   "notification.mention": "Gant {name} oc'h bet meneget",
+  "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
   "notification.poll": "Ur sontadeg ho deus mouezhet warnañ a zo echuet",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
@@ -416,9 +409,6 @@
   "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
   "notifications.column_settings.favourite": "Muiañ-karet:",
-  "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
-  "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
-  "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
   "notifications.column_settings.follow": "Heulierien nevez:",
   "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
   "notifications.column_settings.mention": "Menegoù:",
@@ -444,13 +434,14 @@
   "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
   "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
   "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+  "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
   "onboarding.action.back": "Distreiñ",
   "onboarding.actions.back": "Distreiñ",
   "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_home": "Mont d'ho red degemer",
   "onboarding.compose.template": "Salud #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
@@ -473,7 +464,7 @@
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.share_profile.title": "Rannit ho kont Mastodon",
   "password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",
   "picture_in_picture.restore": "Adlakaat",
   "poll.closed": "Serret",
@@ -486,15 +477,10 @@
   "poll.votes": "{votes, plural,one {#votadenn} other {# votadenn}}",
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
-  "privacy.change": "Cheñch prevezded an toud",
-  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "Tud meneget hepken",
-  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Tud koumanantet hepken",
-  "privacy.public.long": "Gwelus d'an holl",
+  "privacy.change": "Cheñch prevezded an embannadur",
+  "privacy.direct.short": "Tud resis",
+  "privacy.private.short": "Heulierien",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
-  "privacy.unlisted.short": "Anlistennet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
   "recommended": "Erbedet",
@@ -513,6 +499,7 @@
   "relative_time.seconds": "{number}eil",
   "relative_time.today": "hiziv",
   "reply_indicator.cancel": "Nullañ",
+  "reply_indicator.poll": "Sontadeg",
   "report.block": "Stankañ",
   "report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
   "report.categories.legal": "Lezennel",
@@ -597,7 +584,7 @@
   "status.direct": "Menegiñ @{name} ent-prevez",
   "status.direct_indicator": "Meneg prevez",
   "status.edit": "Kemmañ",
-  "status.edited": "Aozet {date}",
+  "status.edited": "Kemmet da ziwezhañ d'an {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
@@ -667,10 +654,8 @@
   "upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
   "upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
   "upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
-  "upload_form.description_missing": "Deskrivadur diank",
   "upload_form.edit": "Kemmañ",
   "upload_form.thumbnail": "Kemmañ ar velvenn",
-  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
   "upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
   "upload_modal.apply": "Arloañ",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 9b6b49c3d6..d06054ee58 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -11,7 +11,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -66,8 +65,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 290b364a52..ea67d217da 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
+  "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
+  "block_modal.show_less": "Mostra'n menys",
+  "block_modal.show_more": "Mostra'n més",
+  "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
+  "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
+  "block_modal.they_will_know": "Poden veure que els heu blocat.",
+  "block_modal.title": "Bloquem l'usuari?",
+  "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
   "compose_form.placeholder": "Què tens al cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
+  "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Elimina aquesta opció",
-  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
+  "compose_form.poll.single": "Trieu-ne una",
+  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
-  "compose_form.publish": "Tut",
+  "compose_form.poll.type": "Estil",
+  "compose_form.publish": "Publica",
   "compose_form.publish_form": "Nou tut",
-  "compose_form.publish_loud": "Tut!",
-  "compose_form.save_changes": "Desa els canvis",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
+  "compose_form.reply": "Respon",
+  "compose_form.save_changes": "Actualitza",
   "compose_form.spoiler.marked": "Elimina l'avís de contingut",
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
-  "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
+  "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
-  "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Segur que vols blocar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar la sol·licitud",
   "confirmations.cancel_follow_request.message": "Segur que vols retirar la sol·licitud de seguiment de {name}?",
   "confirmations.delete.confirm": "Elimina",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
-  "confirmations.domain_block.confirm": "Bloca el domini sencer",
+  "confirmations.domain_block.confirm": "Bloca el servidor",
   "confirmations.domain_block.message": "Segur que vols blocar {domain} del tot? En la majoria dels casos, només amb blocar o silenciar uns pocs comptes n'hi ha prou i és millor. No veuràs el contingut d’aquest domini en cap de les línies de temps ni en les notificacions. S'eliminaran els teus seguidors d’aquest domini.",
   "confirmations.edit.confirm": "Edita",
   "confirmations.edit.message": "Editant ara sobreescriuràs el missatge que estàs editant. Segur que vols continuar?",
   "confirmations.logout.confirm": "Tanca la sessió",
   "confirmations.logout.message": "Segur que vols tancar la sessió?",
   "confirmations.mute.confirm": "Silencia",
-  "confirmations.mute.explanation": "Això amagarà els tuts d'ells i els d'els que els mencionin, però encara els permetrà veure els teus tuts i seguir-te.",
-  "confirmations.mute.message": "Segur que vols silenciar {name}?",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
   "confirmations.reply.confirm": "Respon",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Aquests son els tuts de la xarxa descentralitzada que guanyen atenció ara mateix. Els tuts més nous amb més impulsos i favorits tenen millor rànquing.",
   "dismissable_banner.explore_tags": "Aquestes etiquetes estan guanyant ara mateix l'atenció dels usuaris d'aquest i altres servidors de la xarxa descentralitzada.",
   "dismissable_banner.public_timeline": "Aquests son els tuts públics més recents de les persones a la web social que les persones de {domain} segueixen.",
+  "domain_block_modal.block": "Bloca el servidor",
+  "domain_block_modal.block_account_instead": "En lloc d'això, bloca @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Els usuaris d'aquest servidor poden interactuar amb les vostres publicacions antigues.",
+  "domain_block_modal.they_cant_follow": "Ningú d'aquest servidor us pot seguir.",
+  "domain_block_modal.they_wont_know": "No sabran que són blocats.",
+  "domain_block_modal.title": "Bloquem el domini?",
+  "domain_block_modal.you_will_lose_followers": "S'eliminaran tots els vostres seguidors d'aquest servidor.",
+  "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
+  "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
+  "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "El seu identificador:",
+  "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
+  "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
+  "domain_pill.username": "Nom d'usuari",
+  "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
+  "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button>.",
+  "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button> poden interactuar amb vosaltres.",
+  "domain_pill.your_handle": "El vostre identificador:",
+  "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
+  "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
   "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
   "embed.preview": "Aquest aspecte tindrà:",
   "emoji_button.activity": "Activitat",
@@ -244,6 +266,7 @@
   "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres facin nous tuts, apareixeran aquí.",
   "empty_column.lists": "Encara no tens cap llista. Quan en facis una, apareixerà aquí.",
   "empty_column.mutes": "Encara no has silenciat cap usuari.",
+  "empty_column.notification_requests": "Tot net, ja no hi ha res aquí! Quan rebeu notificacions noves, segons la vostra configuració, apareixeran aquí.",
   "empty_column.notifications": "Encara no tens notificacions. Quan altre gent interactuï amb tu, les veuràs aquí.",
   "empty_column.public": "Aquí no hi ha res! Escriu públicament alguna cosa o segueix manualment usuaris d'altres servidors per omplir-ho",
   "error.unexpected_crash.explanation": "A causa d'un error en el nostre codi o d'un problema de compatibilitat amb el navegador, aquesta pàgina no s'ha pogut mostrar correctament.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menció} other {mencions}}",
+  "filtered_notifications_banner.pending_requests": "Notificacions {count, plural, =0 {de ningú} one {d'una persona} other {de # persones}} que potser coneixes",
+  "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
   "firehose.local": "Aquest servidor",
   "firehose.remote": "Altres servidors",
   "follow_request.authorize": "Autoritza",
   "follow_request.reject": "Rebutja",
   "follow_requests.unlocked_explanation": "Tot i que el teu compte no està blocat, el personal de {domain} ha pensat que és possible que vulguis revisar manualment les sol·licituds de seguiment d’aquests comptes.",
+  "follow_suggestions.curated_suggestion": "Tria de l'equip",
+  "follow_suggestions.dismiss": "No ho tornis a mostrar",
+  "follow_suggestions.featured_longer": "Triat personalment per l'equip de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre la gent que segueixes",
+  "follow_suggestions.hints.featured": "L'equip de {domain} ha seleccionat aquest perfil.",
+  "follow_suggestions.hints.friends_of_friends": "Aquest perfil és popular entre la gent que seguiu.",
+  "follow_suggestions.hints.most_followed": "Aquest perfil és un dels més seguits a {domain}.",
+  "follow_suggestions.hints.most_interactions": "Aquest perfil ha estat rebent un munt d'atenció recentment a {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Aquest perfil és similar a d'altres que heu seguit recentment.",
+  "follow_suggestions.personalized_suggestion": "Suggeriment personalitzat",
+  "follow_suggestions.popular_suggestion": "Suggeriment popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular a {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semblant a perfils que seguiu de fa poc",
+  "follow_suggestions.view_all": "Mostra-ho tot",
+  "follow_suggestions.who_to_follow": "A qui seguir",
   "followed_tags": "Etiquetes seguides",
   "footer.about": "Quant a",
   "footer.directory": "Directori de perfils",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
-  "home.actions.go_to_explore": "Mira què és tendència",
-  "home.actions.go_to_suggestions": "Troba persones a seguir",
-  "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
-  "home.explore_prompt.body": "La teva línia de temps Inici tindrà una barreja dels tuts de les etiquetes que has triat seguir, de les persones que has triat seguir i dels tuts que s'impulsen. Ara mateix es veu força tranquil·la, què et sembla si:",
-  "home.explore_prompt.title": "Aquesta és la teva base inicial a Mastodon.",
   "home.hide_announcements": "Amaga els anuncis",
   "home.pending_critical_update.body": "Si us plau actualitza el teu servidor Mastodon tant aviat com sigui possible!",
   "home.pending_critical_update.link": "Veure actualitzacions",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Es carrega…",
   "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
   "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Amagar les notificacions d'aquest usuari?",
-  "mute_modal.indefinite": "Indefinit",
+  "mute_modal.hide_from_notifications": "Amaga de les notificacions",
+  "mute_modal.hide_options": "Amaga les opcions",
+  "mute_modal.indefinite": "Fins que els deixi de silenciar",
+  "mute_modal.show_options": "Mostra les opcions",
+  "mute_modal.they_can_mention_and_follow": "Us poden esmentar i seguir, però no els veureu.",
+  "mute_modal.they_wont_know": "No sabran que són silenciats.",
+  "mute_modal.title": "Silenciem l'usuari?",
+  "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
+  "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Mencions privades",
   "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.edit_profile": "Edita el perfil",
   "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Paraules silenciades",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.mention": "{name} t'ha esmentat",
+  "notification.moderation-warning.learn_more": "Per a saber-ne més",
+  "notification.moderation_warning": "Heu rebut un avís de moderació",
+  "notification.moderation_warning.action_delete_statuses": "S'han eliminat algunes de les vostres publicacions.",
+  "notification.moderation_warning.action_disable": "S'ha desactivat el vostre compte.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "S'ha marcat com a sensibles algunes de les vostres publicacions.",
+  "notification.moderation_warning.action_none": "El vostre compte ha rebut un avís de moderació.",
+  "notification.moderation_warning.action_sensitive": "A partir d'ara les vostres publicacions es marcaran com sensibles.",
+  "notification.moderation_warning.action_silence": "S'ha limitat el vostre compte.",
+  "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
   "notification.reblog": "{name} t'ha impulsat",
+  "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
+  "notification.relationships_severance_event.learn_more": "Per a saber-ne més",
+  "notification.relationships_severance_event.user_domain_block": "Heu blocat {target}, eliminant {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat un tut",
+  "notification_requests.accept": "Accepta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notificacions de {name}",
+  "notification_requests.title": "Notificacions filtrades",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
   "notifications.column_settings.admin.report": "Nous informes:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
   "notifications.column_settings.mention": "Mencions:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
+  "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
+  "notifications.policy.filter_new_accounts_title": "Comptes nous",
+  "notifications.policy.filter_not_followers_hint": "Incloent les persones que us segueixen fa menys {days, plural, one {d'un dia} other {de # dies}}",
+  "notifications.policy.filter_not_followers_title": "Persones que no us segueixen",
+  "notifications.policy.filter_not_following_hint": "Fins que no ho aproveu de forma manual",
+  "notifications.policy.filter_not_following_title": "Persones que no seguiu",
+  "notifications.policy.filter_private_mentions_hint": "Filtrat si no és que és en resposta a una menció vostra o si seguiu el remitent",
+  "notifications.policy.filter_private_mentions_title": "Mencions privades no sol·licitades",
+  "notifications.policy.title": "Filtra les notificacions de…",
   "notifications_permission_banner.enable": "Activa les notificacions d’escriptori",
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
@@ -521,19 +588,20 @@
   "poll.total_people": "{count, plural, one {# persona} other {# persones}}",
   "poll.total_votes": "{count, plural, one {# vot} other {# vots}}",
   "poll.vote": "Vota",
-  "poll.voted": "Vas votar per aquesta resposta",
+  "poll.voted": "Vau votar aquesta resposta",
   "poll.votes": "{votes, plural, one {# vot} other {# vots}}",
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
-  "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només gent mencionada",
-  "privacy.private.long": "Visible només per als seguidors",
-  "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per a tothom",
+  "privacy.direct.long": "Tothom mencionat a la publicació",
+  "privacy.direct.short": "Persones concretes",
+  "privacy.private.long": "Només els vostres seguidors",
+  "privacy.private.short": "Seguidors",
+  "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
-  "privacy.unlisted.short": "No llistada",
+  "privacy.unlisted.additional": "Es comporta igual que públic, excepte que la publicació no apareixerà als canals en directe o etiquetes, l'explora o a la cerca de Mastodon, fins i tot si ho heu activat a nivell de compte.",
+  "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
+  "privacy.unlisted.short": "Públic silenciós",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "avui",
+  "reply_indicator.attachments": "{count, plural, one {# adjunt} other {# adjunts}}",
   "reply_indicator.cancel": "Cancel·la",
+  "reply_indicator.poll": "Enquesta",
   "report.block": "Bloca",
   "report.block_explanation": "No veuràs els seus tuts. Ells no podran veure els teus tuts ni et podran seguir. Podran saber que estan blocats.",
   "report.categories.legal": "Legal",
@@ -607,7 +677,7 @@
   "search.quick_action.status_search": "Tuts coincidint amb {x}",
   "search.search_or_paste": "Cerca o escriu l'URL",
   "search_popout.full_text_search_disabled_message": "No disponible a {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Només disponible en iniciar la sessió.",
+  "search_popout.full_text_search_logged_out_message": "Només disponible amb la sessió iniciada.",
   "search_popout.language_code": "Codi de llengua ISO",
   "search_popout.options": "Opcions de cerca",
   "search_popout.quick_actions": "Accions ràpides",
@@ -644,10 +714,11 @@
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
   "status.edit": "Edita",
-  "status.edited": "Editat {date}",
+  "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
   "status.embed": "Incrusta",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
   "status.filtered": "Filtrada",
   "status.hide": "Amaga el tut",
@@ -668,6 +739,7 @@
   "status.reblog": "Impulsa",
   "status.reblog_private": "Impulsa amb la visibilitat original",
   "status.reblogged_by": "impulsat per {name}",
+  "status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",
@@ -715,10 +787,8 @@
   "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
   "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
   "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
-  "upload_form.description_missing": "No s'hi ha afegit cap descripció",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Canvia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
   "upload_modal.analyzing_picture": "S'analitza la imatge…",
   "upload_modal.apply": "Aplica",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index f1cafd1ac4..c3c365b3a1 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -17,9 +17,11 @@
   "account.badges.group": "گرووپ",
   "account.block": "بلۆکی @{name}",
   "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
+  "account.block_short": "بلۆک",
   "account.blocked": "بلۆککرا",
   "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
   "account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
+  "account.copy": "ڕوونووسی بەستەر بۆ توت",
   "account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "account.disable_notifications": "ئاگانامە مەنێرە بۆم کاتێک @{name} پۆست دەکرێت",
   "account.domain_blocked": "دۆمەین قەپاتکرا",
@@ -30,6 +32,7 @@
   "account.featured_tags.last_status_never": "هیچ پۆستێک نییە",
   "account.featured_tags.title": "هاشتاگە تایبەتەکانی {name}",
   "account.follow": "بەدواداچوون",
+  "account.follow_back": "فۆڵۆو بکەنەوە",
   "account.followers": "شوێنکەوتووان",
   "account.followers.empty": "کەسێک شوێن ئەم بەکارهێنەرە نەکەوتووە",
   "account.followers_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
@@ -38,6 +41,7 @@
   "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
   "account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
   "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
+  "account.in_memoriam": "لە یادەوەریدا.",
   "account.joined_short": "بەشداری کردووە",
   "account.languages": "گۆڕینی زمانە بەشداربووەکان",
   "account.link_verified_on": "خاوەنداریەتی ئەم لینکە لە {date} چێک کراوە",
@@ -46,7 +50,11 @@
   "account.mention": "ئاماژە @{name}",
   "account.moved_to": "{name} ئاماژەی بەوە کردووە کە ئەکاونتە نوێیەکەیان ئێستا:",
   "account.mute": "بێدەنگکردن @{name}",
+  "account.mute_notifications_short": "پاڵ بە ئاگادارکردنەوەکانەوە بنێ",
+  "account.mute_short": "بێدەنگ",
   "account.muted": "بێ دەنگ",
+  "account.mutual": "دوولایەنە",
+  "account.no_bio": "هیچ وەسفێک نەخراوەتەڕوو.",
   "account.open_original_page": "لاپەڕەی ئەسڵی بکەرەوە",
   "account.posts": "نووسراوەکان",
   "account.posts_with_replies": "توتس و وەڵامەکان",
@@ -62,6 +70,7 @@
   "account.unendorse": "تایبەتمەندی لەسەر پرۆفایلەکە نیە",
   "account.unfollow": "بەدوادانەچو",
   "account.unmute": "بێدەنگکردنی @{name}",
+  "account.unmute_notifications_short": "ئاگادارکردنەوەکان بێدەنگ بکەرەوە",
   "account.unmute_short": "بێدەنگی مەکە",
   "account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
   "admin.dashboard.daily_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی ڕۆژ دوای ناو تۆمارکردن",
@@ -69,6 +78,10 @@
   "admin.dashboard.retention.average": "ڕێژە",
   "admin.dashboard.retention.cohort": "چوونەژوورەوەی مانگانە",
   "admin.dashboard.retention.cohort_size": "ئەندامی نوێ",
+  "admin.impact_report.instance_accounts": "پڕۆفایلی هەژمارەکان ئەمە دەسڕێتەوە",
+  "admin.impact_report.instance_followers": "فۆڵۆوەرەکان بەکارهێنەران لەدەست دەدەن",
+  "admin.impact_report.instance_follows": "فۆڵۆوەرەکان ئەمبەکارهێنەرە لەدەست دەدەن",
+  "admin.impact_report.title": "پوختەی کاریگەرییەکان",
   "alert.rate_limited.message": "تکایە هەوڵبدەرەوە دوای {retry_time, time, medium}.",
   "alert.rate_limited.title": "ڕێژەی سنووردار",
   "alert.unexpected.message": "هەڵەیەکی چاوەڕوان نەکراو ڕوویدا.",
@@ -76,7 +89,6 @@
   "announcement.announcement": "بانگەواز",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "شاردنەوەی دەنگ",
-  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
   "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
   "bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
   "bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
@@ -102,6 +114,8 @@
   "column.direct": "ئاماژەی تایبەت",
   "column.directory": "گەڕان لە پرۆفایلەکان",
   "column.domain_blocks": "دۆمەینە داخراوەکان",
+  "column.favourites": "دڵخوازەکان",
+  "column.firehose": "فیدی ڕاستەوخۆ",
   "column.follow_requests": "بەدواداچوی داواکاریەکان بکە",
   "column.home": "سەرەتا",
   "column.lists": "پێرست",
@@ -122,32 +136,31 @@
   "community.column_settings.remote_only": "تەنها بۆ دوور",
   "compose.language.change": "گۆڕینی زمان",
   "compose.language.search": "گەڕان بە زمانەکان...",
+  "compose.published.body": "پۆست بڵاوکراوەتەوە.",
+  "compose.published.open": "بیکەوە",
+  "compose.saved.body": "پۆستەکە سەیڤ کراوە.",
   "compose_form.direct_message_warning_learn_more": "زیاتر فێربه",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "ئەم بڵاوکراوەیە لە ژێر هیچ هاشتاگێکدا دا نانرێت وەک ئەوەیە، کە گشتی نەبێت. تەنها بڵاوکراوە گشتیەکان دەتوانرێ بە هاشتاگ گەڕانی بۆ بکرێت.",
   "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
   "compose_form.placeholder": "چی لە مێشکتدایە?",
-  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
   "compose_form.poll.duration": "ماوەی ڕاپرسی",
-  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
-  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
+  "compose_form.poll.multiple": "فرە هەڵبژاردە",
+  "compose_form.poll.option_placeholder": "بژاردەی {number}",
+  "compose_form.poll.single": "یەکێك هەلبژێرە",
   "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
   "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
-  "compose_form.publish": "بڵاوی بکەوە",
+  "compose_form.poll.type": "ستایڵ",
+  "compose_form.publish": "پۆست",
   "compose_form.publish_form": "بڵاوی بکەوە",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
-  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
-  "compose_form.sensitive.marked": "وادەی کۆتایی",
-  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
+  "compose_form.reply": "وەڵام",
+  "compose_form.save_changes": "نوێکردنەوە",
   "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
-  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
+  "compose_form.spoiler_placeholder": "ئاگادارکردنەوەی ناوەڕۆک (ئیختیاری)",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
-  "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
-  "confirmations.block.message": "ئایا دڵنیایت لەوەی دەتەوێت {name} بلۆک بکەیت?",
   "confirmations.cancel_follow_request.confirm": "داواکاری کشانەوە",
   "confirmations.cancel_follow_request.message": "ئایا دڵنیای کە دەتەوێت داواکارییەکەت بۆ شوێنکەوتنی {ناو} بکشێنیتەوە؟",
   "confirmations.delete.confirm": "سڕینەوە",
@@ -156,16 +169,14 @@
   "confirmations.delete_list.message": "ئایا دڵنیایت لەوەی دەتەوێت بە هەمیشەیی ئەم لیستە بسڕیتەوە?",
   "confirmations.discard_edit_media.confirm": "ڕەتکردنەوە",
   "confirmations.discard_edit_media.message": "گۆڕانکاریت لە وەسف یان پێشبینی میدیادا هەڵنەگیراوە، بەهەر حاڵ فڕێیان بدە؟",
-  "confirmations.domain_block.confirm": "بلۆککردنی هەموو دۆمەینەکە",
   "confirmations.domain_block.message": "ئایا بەڕاستی، بەڕاستی تۆ دەتەوێت هەموو {domain} بلۆک بکەیت؟ لە زۆربەی حاڵەتەکاندا چەند بلۆکێکی ئامانجدار یان بێدەنگەکان پێویست و پەسەندن. تۆ ناوەڕۆک ێک نابینیت لە دۆمەینەکە لە هیچ هێڵی کاتی گشتی یان ئاگانامەکانت. شوێنکەوتوانی تۆ لەو دۆمەینەوە لادەبرێن.",
   "confirmations.edit.confirm": "دەستکاری",
   "confirmations.edit.message": "دەستکاری کردنی ئێستا: دەبێتە هۆی نووسینەوەی ئەو پەیامەی، کە ئێستا داتدەڕشت. ئایا دڵنیای، کە دەتەوێت بەردەوام بیت؟",
   "confirmations.logout.confirm": "چوونە دەرەوە",
   "confirmations.logout.message": "ئایا دڵنیایت لەوەی دەتەوێت بچیتە دەرەوە?",
   "confirmations.mute.confirm": "بێدەنگ",
-  "confirmations.mute.explanation": "ئەمەش دەبێتە هۆی شاردنەوەی پۆستەکان یان ئەو بابەتانەی کە ئاماژەیان پێ دەکات ، بەڵام هێشتا ڕێگەیان پێ دەدات کە پۆستەکانتان ببینن و شوێنتان بکەون.",
-  "confirmations.mute.message": "ئایا دڵنیایت لەوەی دەتەوێت بیلێیت {name}?",
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
+  "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.reply.confirm": "وەڵام",
   "confirmations.reply.message": "وەڵامدانەوە ئێستا ئەو نامەیە ی کە تۆ ئێستا دایڕشتووە، دەنووسێتەوە. ئایا دڵنیایت کە دەتەوێت بەردەوام بیت?",
   "confirmations.unfollow.confirm": "بەدوادانەچو",
@@ -174,7 +185,9 @@
   "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
   "conversation.open": "نیشاندان گفتوگۆ",
   "conversation.with": "لەگەڵ{names}",
+  "copy_icon_button.copied": "کۆپی کراوە بۆ کلیپبۆرد",
   "copypaste.copied": "کۆپی کراوە",
+  "copypaste.copy_to_clipboard": "کۆپی کراوە بۆ کلیپبۆرد",
   "directory.federated": "لە ڕاژەکانی ناسراو",
   "directory.local": "تەنها لە {domain}",
   "directory.new_arrivals": "تازە گەیشتنەکان",
@@ -184,6 +197,7 @@
   "dismissable_banner.community_timeline": "ئەمانە دوایین پۆستی گشتی ئەو کەسانەن کە ئەکاونتەکانیان لەلایەن {domain}ەوە هۆست کراوە.",
   "dismissable_banner.dismiss": "بەلاوە نان",
   "dismissable_banner.explore_links": "ئەم هەواڵانە لە ئێستادا لەلایەن کەسانێکەوە لەسەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزی باس دەکرێن.",
+  "dismissable_banner.explore_statuses": "ئەمانە پۆستەکانن لە سەرانسەری وێبی کۆمەڵایەتی کە ئەمڕۆ کێشکردنیان بەدەستهێناوە. پۆستە نوێیەکان کە بووست و فەڤریتی زیاتریان هەیە ڕیزبەندی بەرزتریان هەیە.",
   "dismissable_banner.explore_tags": "ئەم هاشتاگانە لە ئێستادا لە نێو خەڵکی سەر ئەم سێرڤەرە و سێرڤەرەکانی تری تۆڕی لامەرکەزیدا جێگەی خۆیان دەگرن.",
   "embed.instructions": "ئەم توتە بنچین بکە لەسەر وێب سایتەکەت بە کۆپیکردنی کۆدەکەی خوارەوە.",
   "embed.preview": "ئەمە ئەو شتەیە کە لە شێوەی خۆی دەچێت:",
@@ -227,6 +241,7 @@
   "errors.unexpected_crash.copy_stacktrace": "کۆپیکردنی ستێکتراسی بۆ کلیپ بۆرد",
   "errors.unexpected_crash.report_issue": "کێشەی گوزارشت",
   "explore.search_results": "ئەنجامەکانی گەڕان",
+  "explore.suggested_follows": "خەڵک",
   "explore.title": "گەڕان",
   "explore.trending_links": "هەواڵەکان",
   "explore.trending_statuses": "بڵاوکراوەکان",
@@ -247,9 +262,16 @@
   "filter_modal.select_filter.subtitle": "بەکارهێنانی پۆلێنی بەردەست یان دروستکردنی پۆلێنێکی نوێ",
   "filter_modal.select_filter.title": "ئەم بڵاوکراوەیە بپاڵێوە",
   "filter_modal.title.status": "بڵاوکراوەیەک بپاڵێوە",
+  "firehose.all": "هەموو",
+  "firehose.local": "لەسەر ئەم ڕاژەیە",
+  "firehose.remote": "ڕاژەکانی دی",
   "follow_request.authorize": "ده‌سه‌ڵاتپێدراو",
   "follow_request.reject": "ڕەتکردنەوە",
   "follow_requests.unlocked_explanation": "هەرچەندە هەژمارەکەت داخراو نییە، ستافی {domain} وا بیریان کردەوە کە لەوانەیە بتانەوێت پێداچوونەوە بە داواکاریەکانی ئەم هەژمارەدا بکەن بە دەستی.",
+  "follow_suggestions.curated_suggestion": "ستاف هەڵبژاردنی",
+  "follow_suggestions.dismiss": "دوبارە پشانی مەدە",
+  "follow_suggestions.view_all": "بینینی هەموو",
+  "follow_suggestions.who_to_follow": "دواکەوتنی کێ",
   "followed_tags": "هاشتاگە شوێنکەوتووەکان",
   "footer.about": "دەربارە",
   "footer.directory": "ڕابەری پەڕەی ناساندن",
@@ -270,9 +292,9 @@
   "hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
   "hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
   "hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.follow": "شوێنکەوتنی هاشتاگ",
   "hashtag.unfollow": "شوێن نەکەوتنی هاشتاگ",
-  "home.column_settings.basic": "بنەڕەتی",
   "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
   "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
   "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
@@ -343,9 +365,6 @@
   "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
   "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
   "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
-  "mute_modal.duration": "ماوە",
-  "mute_modal.hide_notifications": "شاردنەوەی ئاگانامەکان لەم بەکارهێنەرە؟ ",
-  "mute_modal.indefinite": "نادیار",
   "navigation_bar.about": "دەربارە",
   "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "navigation_bar.bookmarks": "نیشانکراوەکان",
@@ -354,7 +373,6 @@
   "navigation_bar.direct": "ئاماژەی تایبەت",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
   "navigation_bar.explore": "گەڕان",
   "navigation_bar.filters": "وشە کپەکان",
   "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
@@ -385,9 +403,6 @@
   "notifications.column_settings.admin.report": "ڕاپۆرتە نوێیەکان:",
   "notifications.column_settings.admin.sign_up": "چوونەژوورەوەی نوێ:",
   "notifications.column_settings.alert": "ئاگانامەکانی پیشانگەرر ڕومێزی",
-  "notifications.column_settings.filter_bar.advanced": "هەموو پۆلەکان پیشان بدە",
-  "notifications.column_settings.filter_bar.category": "شریتی پاڵێوەری خێرا",
-  "notifications.column_settings.filter_bar.show_bar": "نیشاندانی شریتی پاڵافتن",
   "notifications.column_settings.follow": "شوێنکەوتوانی نوێ:",
   "notifications.column_settings.follow_request": "شوینکەوتنی داواکاری نوێ:",
   "notifications.column_settings.mention": "ئاماژەکان:",
@@ -439,14 +454,7 @@
   "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
   "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
   "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
-  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "تەنها کەسانی باس کراو",
-  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنیا شوێنکەوتووان",
-  "privacy.public.long": "بۆ هەمووان دیارە",
   "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
-  "privacy.unlisted.short": "لە لیست نەکراو",
   "privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
   "privacy_policy.title": "سیاسەتی تایبەتێتی",
   "refresh": "نوێکردنەوە",
@@ -543,7 +551,6 @@
   "status.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
   "status.direct_indicator": "ئاماژەی تایبەت",
   "status.edit": "دەستکاری",
-  "status.edited": "بەشداری {date}",
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
@@ -610,10 +617,8 @@
   "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
   "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
   "upload_form.description": "پەیامەکەت بۆ نابیناکان",
-  "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
   "upload_form.edit": "دەستکاری",
   "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "بیسڕەوە",
   "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
   "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
   "upload_modal.apply": "بیسەپێنە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9f90c3d211..be4cce2692 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -45,7 +45,6 @@
   "alert.unexpected.title": "Uups!",
   "announcement.announcement": "Annunziu",
   "attachments_list.unprocessed": "(micca trattata)",
-  "autosuggest_hashtag.per_week": "{count} per settimana",
   "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
   "bundle_column_error.retry": "Pruvà torna",
   "bundle_modal_error.close": "Chjudà",
@@ -80,36 +79,23 @@
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
   "compose_form.placeholder": "À chè pensate?",
-  "compose_form.poll.add_option": "Aghjunghje scelta",
   "compose_form.poll.duration": "Durata di u scandagliu",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Toglie sta scelta",
   "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
   "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
-  "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
   "confirmation_modal.cancel": "Annullà",
-  "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
-  "confirmations.block.message": "Site sicuru·a che vulete bluccà @{name}?",
   "confirmations.delete.confirm": "Toglie",
   "confirmations.delete.message": "Site sicuru·a che vulete sguassà stu statutu?",
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuru·a che vulete toglie sta lista?",
   "confirmations.discard_edit_media.confirm": "Scartà",
-  "confirmations.domain_block.confirm": "Piattà tuttu u duminiu",
   "confirmations.domain_block.message": "Site veramente sicuru·a che vulete piattà tuttu à {domain}? Saria forse abbastanza di bluccà ò piattà alcuni conti da quallà. Ùn viderete più nunda da quallà indè e linee pubbliche o e nutificazione. I vostri abbunati da stu duminiu saranu tolti.",
   "confirmations.logout.confirm": "Scunnettassi",
   "confirmations.logout.message": "Site sicuru·a che vulete scunnettà vi?",
   "confirmations.mute.confirm": "Piattà",
-  "confirmations.mute.explanation": "Quessu hà da piattà i statuti da sta persona è i posti chì a mintuvanu, ma ellu·a puderà sempre vede i vostri statuti è siguità vi.",
-  "confirmations.mute.message": "Site sicuru·a che vulete piattà @{name}?",
   "confirmations.redraft.confirm": "Sguassà è riscrive",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Risponde avà sguasserà u missaghju chì scrivite. Site sicuru·a chì vulete cuntinuà?",
@@ -176,7 +162,6 @@
   "hashtag.column_settings.tag_mode.any": "Unu di quessi",
   "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
   "hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
-  "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
   "home.hide_announcements": "Piattà annunzii",
@@ -236,16 +221,12 @@
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
   "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
-  "mute_modal.indefinite": "Indifinita",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
   "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
-  "navigation_bar.edit_profile": "Mudificà u prufile",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
@@ -268,8 +249,6 @@
   "notifications.clear": "Purgà e nutificazione",
   "notifications.clear_confirmation": "Site sicuru·a che vulete toglie tutte ste nutificazione?",
   "notifications.column_settings.alert": "Nutificazione nant'à l'urdinatore",
-  "notifications.column_settings.filter_bar.advanced": "Affissà tutte e categurie",
-  "notifications.column_settings.filter_bar.category": "Barra di ricerca pronta",
   "notifications.column_settings.follow": "Abbunati novi:",
   "notifications.column_settings.follow_request": "Nove dumande d'abbunamentu:",
   "notifications.column_settings.mention": "Minzione:",
@@ -318,12 +297,7 @@
   "poll_button.add_poll": "Aghjunghje",
   "poll_button.remove_poll": "Toglie u scandagliu",
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
-  "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.short": "Micca listatu",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",
   "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
@@ -409,7 +383,6 @@
   "upload_form.description": "Discrizzione per i malvistosi",
   "upload_form.edit": "Mudificà",
   "upload_form.thumbnail": "Cambià vignetta",
-  "upload_form.undo": "Sguassà",
   "upload_form.video_description": "Discrizzione per i ciochi o cechi",
   "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
   "upload_modal.apply": "Affettà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e18cabcec1..f2a1f023a3 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Žádné příspěvky",
   "account.featured_tags.title": "Hlavní hashtagy uživatele {name}",
   "account.follow": "Sledovat",
+  "account.follow_back": "Také sledovat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledující} few {{counter} Sledující} many {{counter} Sledujících} other {{counter} Sledujících}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Ztlumit upozornění",
   "account.mute_short": "Ztlumit",
   "account.muted": "Skrytý",
+  "account.mutual": "Vzájemné",
   "account.no_bio": "Nebyl poskytnut žádný popis.",
   "account.open_original_page": "Otevřít původní stránku",
   "account.posts": "Příspěvky",
@@ -87,7 +89,14 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "autosuggest_hashtag.per_week": "{count} za týden",
+  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
+  "block_modal.show_less": "Zobrazit méně",
+  "block_modal.show_more": "Zobrazit více",
+  "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
+  "block_modal.they_cant_see_posts": "Nemůže vidět vaše příspěvky a vy neuvidíte jeho.",
+  "block_modal.they_will_know": "Může vidět, že je zablokovaný.",
+  "block_modal.title": "Zablokovat uživatele?",
+  "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -144,26 +153,22 @@
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
   "compose_form.lock_disclaimer.lock": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
-  "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Doba trvání ankety",
+  "compose_form.poll.multiple": "Výběr z více možností",
   "compose_form.poll.option_placeholder": "Volba {number}",
-  "compose_form.poll.remove_option": "Odebrat tuto volbu",
+  "compose_form.poll.single": "Vyber jednu",
   "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
   "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
-  "compose_form.publish": "Zveřejnit",
+  "compose_form.poll.type": "Styl",
+  "compose_form.publish": "Odeslat",
   "compose_form.publish_form": "Zveřejnit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Uložit změny",
-  "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
+  "compose_form.reply": "Odpovědět",
+  "compose_form.save_changes": "Aktualizovat",
   "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
-  "compose_form.spoiler_placeholder": "Sem napište vaše varování",
+  "compose_form.spoiler_placeholder": "Upozornění na obsah (nepovinné)",
   "confirmation_modal.cancel": "Zrušit",
-  "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
-  "confirmations.block.message": "Opravdu chcete blokovat {name}?",
   "confirmations.cancel_follow_request.confirm": "Zrušit žádost",
   "confirmations.cancel_follow_request.message": "Opravdu chcete zrušit svou žádost o sledování {name}?",
   "confirmations.delete.confirm": "Smazat",
@@ -172,15 +177,13 @@
   "confirmations.delete_list.message": "Opravdu chcete tento seznam navždy smazat?",
   "confirmations.discard_edit_media.confirm": "Zahodit",
   "confirmations.discard_edit_media.message": "Máte neuložené změny popisku médií nebo náhledu, chcete je přesto zahodit?",
-  "confirmations.domain_block.confirm": "Blokovat celou doménu",
+  "confirmations.domain_block.confirm": "Blokovat server",
   "confirmations.domain_block.message": "Opravdu chcete blokovat celou doménu {domain}? Ve většině případů stačí blokovat nebo skrýt pár konkrétních uživatelů, což také doporučujeme. Z této domény neuvidíte obsah v žádné veřejné časové ose ani v oznámeních. Vaši sledující z této domény budou odstraněni.",
   "confirmations.edit.confirm": "Upravit",
   "confirmations.edit.message": "Editovat teď znamená přepsání zprávy, kterou právě tvoříte. Opravdu chcete pokračovat?",
   "confirmations.logout.confirm": "Odhlásit se",
   "confirmations.logout.message": "Opravdu se chcete odhlásit?",
   "confirmations.mute.confirm": "Skrýt",
-  "confirmations.mute.explanation": "Tohle skryje uživatelovy příspěvky a příspěvky, které ho zmiňují, ale uživatel stále uvidí vaše příspěvky a může vás sledovat.",
-  "confirmations.mute.message": "Opravdu chcete skrýt uživatele {name}?",
   "confirmations.redraft.confirm": "Smazat a přepsat",
   "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
   "confirmations.reply.confirm": "Odpovědět",
@@ -206,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Toto jsou příspěvky ze sociálních sítí, které dnes získávají na popularitě. Novější příspěvky s větším počtem boostů a oblíbení jsou hodnoceny výše.",
   "dismissable_banner.explore_tags": "Tyto hashtagy právě teď získávají na popularitě mezi lidmi na tomto a dalších serverech decentralizované sítě.",
   "dismissable_banner.public_timeline": "Toto jsou nejnovější veřejné příspěvky od lidí na sociální síti, které sledují lidé na {domain}.",
+  "domain_block_modal.block": "Blokovat server",
+  "domain_block_modal.block_account_instead": "Raději blokovat @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Lidé z tohoto serveru mohou interagovat s vašimi starými příspěvky.",
+  "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
+  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován.",
+  "domain_block_modal.title": "Blokovat doménu?",
+  "domain_block_modal.you_will_lose_followers": "Všichni vaši sledující z tohoto serveru budou odstraněni.",
+  "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
+  "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i s dalšími sociálními aplikacemi.",
+  "domain_pill.activitypub_like_language": "ActivityPub je jako jazyk, kterým Mastodon mluví s jinými sociálními sítěmi.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Handle:",
+  "domain_pill.their_server": "Digitální domov, kde žijí všechny příspěvky.",
+  "domain_pill.their_username": "Jedinečný identikátor na serveru. Je možné najít uživatele se stejným uživatelským jménem na různých serverech.",
+  "domain_pill.username": "Uživatelské jméno",
+  "domain_pill.whats_in_a_handle": "Co obsahuje handle?",
+  "domain_pill.who_they_are": "Protože handle říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou lidé komunikovat napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.your_handle": "Tvůj handle:",
+  "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
+  "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
   "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
   "embed.preview": "Takhle to bude vypadat:",
   "emoji_button.activity": "Aktivita",
@@ -238,10 +262,11 @@
   "empty_column.follow_requests": "Zatím nemáte žádné žádosti o sledování. Až nějakou obdržíte, zobrazí se zde.",
   "empty_column.followed_tags": "Zatím jste nesledovali žádné hashtagy. Až to uděláte, objeví se zde.",
   "empty_column.hashtag": "Pod tímto hashtagem zde zatím nic není.",
-  "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí. {suggestions}",
+  "empty_column.home": "Vaše domovská časová osa je prázdná! Naplňte ji sledováním dalších lidí.",
   "empty_column.list": "V tomto seznamu zatím nic není. Až nějaký člen z tohoto seznamu zveřejní nový příspěvek, objeví se zde.",
   "empty_column.lists": "Zatím nemáte žádné seznamy. Až nějaký vytvoříte, zobrazí se zde.",
   "empty_column.mutes": "Zatím jste neskryli žádného uživatele.",
+  "empty_column.notification_requests": "Vyčištěno! Nic tu není. Jakmile obdržíš nové notifikace, objeví se zde podle tvého nastavení.",
   "empty_column.notifications": "Zatím nemáte žádná oznámení. Až s vámi někdo bude interagovat, uvidíte to zde.",
   "empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte ručně sledovat uživatele z jiných serverů, aby tu něco přibylo",
   "error.unexpected_crash.explanation": "Kvůli chybě v našem kódu nebo problému s kompatibilitou prohlížeče nemohla být tato stránka správně zobrazena.",
@@ -272,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
   "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
   "filter_modal.title.status": "Filtrovat příspěvek",
+  "filtered_notifications_banner.mentions": "{count, plural, one {zmínka} few {zmínky} many {zmínek} other {zmínek}}",
+  "filtered_notifications_banner.pending_requests": "Oznámení od {count, plural, =0 {nikoho} one {jednoho člověka, kterého znáte} few {# lidí, které znáte} many {# lidí, které znáte} other {# lidí, které znáte}}",
+  "filtered_notifications_banner.title": "Filtrovaná oznámení",
   "firehose.all": "Vše",
   "firehose.local": "Tento server",
   "firehose.remote": "Ostatní servery",
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Zamítnout",
-  "follow_requests.unlocked_explanation": "Přestože váš účet není zamčený, administrátor {domain} usoudil, že byste mohli chtít tyto žádosti o sledování zkontrolovat ručně.",
+  "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, personál {domain} usoudil, že byste mohli chtít tyto požadavky na sledování zkontrolovat ručně.",
+  "follow_suggestions.curated_suggestion": "Výběr personálů",
+  "follow_suggestions.dismiss": "Znovu nezobrazovat",
+  "follow_suggestions.featured_longer": "Ručně vybráno týmem {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populární mezi lidmi, které sledujete",
+  "follow_suggestions.hints.featured": "Tento profil byl ručně vybrán týmem {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Tento profil je populární mezi lidmi, které sledujete.",
+  "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejvíce sledovaných na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Tento profil nedávno dostalo velkou pozornost na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilům, které jste nedávno sledovali.",
+  "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
+  "follow_suggestions.popular_suggestion": "Populární návrh",
+  "follow_suggestions.popular_suggestion_longer": "Populární na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilům, které jste nedávno sledovali",
+  "follow_suggestions.view_all": "Zobrazit vše",
+  "follow_suggestions.who_to_follow": "Koho sledovat",
   "followed_tags": "Sledované hashtagy",
   "footer.about": "O aplikaci",
   "footer.directory": "Adresář profilů",
@@ -298,15 +341,14 @@
   "hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádný z těchto",
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} few {{counter} účastníci} other {{counter} účastníků}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
+  "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
-  "home.actions.go_to_explore": "Podívejte se, co frčí",
-  "home.actions.go_to_suggestions": "Najít lidi ke sledování",
-  "home.column_settings.basic": "Základní",
+  "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
-  "home.explore_prompt.body": "Váš domovský kanál bude obsahovat směs příspěvků z hashtagů, které jste se rozhodli sledovat, lidí, které jste se rozhodli sledovat, a příspěvků, které boostují. Pokud vám to připadá příliš klidné, možná budete chtít:",
-  "home.explore_prompt.title": "Toto je vaše domovská základna uvnitř Mastodonu.",
   "home.hide_announcements": "Skrýt oznámení",
   "home.pending_critical_update.body": "Aktualizujte, prosím, svůj Mastodon server co nejdříve!",
   "home.pending_critical_update.link": "Zobrazit aktualizace",
@@ -387,11 +429,18 @@
   "lists.search": "Hledejte mezi lidmi, které sledujete",
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
+  "loading_indicator.label": "Načítání…",
   "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
-  "mute_modal.duration": "Trvání",
-  "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
-  "mute_modal.indefinite": "Neomezeně",
+  "mute_modal.hide_from_notifications": "Skrýt z notifikací",
+  "mute_modal.hide_options": "Skrýt možnosti",
+  "mute_modal.indefinite": "Dokud je neodkryju",
+  "mute_modal.show_options": "Zobrazit možnosti",
+  "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
+  "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
+  "mute_modal.title": "Ztlumit uživatele?",
+  "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
+  "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
   "navigation_bar.about": "O aplikaci",
   "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
@@ -401,7 +450,6 @@
   "navigation_bar.direct": "Soukromé zmínky",
   "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.edit_profile": "Upravit profil",
   "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
@@ -425,11 +473,29 @@
   "notification.follow": "Uživatel {name} vás začal sledovat",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
   "notification.mention": "Uživatel {name} vás zmínil",
+  "notification.moderation-warning.learn_more": "Zjistit více",
+  "notification.moderation_warning": "Obdrželi jste moderační varování",
+  "notification.moderation_warning.action_delete_statuses": "Některé z vašich příspěvků byly odstraněny.",
+  "notification.moderation_warning.action_disable": "Váš účet je zablokován.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Některé z vašich příspěvků byly označeny jako citlivé.",
+  "notification.moderation_warning.action_none": "Váš účet obdržel moderační varování.",
+  "notification.moderation_warning.action_sensitive": "Vaše příspěvky budou od nynějška označeny jako citlivé.",
+  "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
+  "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
+  "notification.relationships_severance_event": "Kontakt ztracen s {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
+  "notification.relationships_severance_event.domain_block": "Administrátor z {from} pozastavil {target}, včetně {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
+  "notification.relationships_severance_event.learn_more": "Zjistit více",
+  "notification.relationships_severance_event.user_domain_block": "Zablokovali jste {target}, čímž jste odebrali {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
   "notification.status": "Uživatel {name} právě přidal příspěvek",
   "notification.update": "Uživatel {name} upravil příspěvek",
+  "notification_requests.accept": "Přijmout",
+  "notification_requests.dismiss": "Zamítnout",
+  "notification_requests.notifications_from": "Oznámení od {name}",
+  "notification_requests.title": "Vyfiltrovaná oznámení",
   "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
   "notifications.column_settings.admin.report": "Nová hlášení:",
@@ -438,7 +504,6 @@
   "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
-  "notifications.column_settings.filter_bar.show_bar": "Zobrazit panel filtrů",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
   "notifications.column_settings.mention": "Zmínky:",
@@ -464,6 +529,15 @@
   "notifications.permission_denied": "Oznámení na ploše nejsou k dispozici, protože byla zamítnuta žádost o oprávnění je zobrazovat",
   "notifications.permission_denied_alert": "Oznámení na ploše není možné zapnout, protože oprávnění bylo v minulosti zamítnuto",
   "notifications.permission_required": "Oznámení na ploše nejsou k dispozici, protože nebylo uděleno potřebné oprávnění.",
+  "notifications.policy.filter_new_accounts.hint": "Vytvořeno během {days, plural, one {včerejška} few {posledních # dnů} many {posledních # dní} other {posledních # dní}}",
+  "notifications.policy.filter_new_accounts_title": "Nové účty",
+  "notifications.policy.filter_not_followers_hint": "Včetně lidí, kteří vás sledovali méně než {days, plural, one {jeden den} few {# dny} many {# dní} other {# dní}}",
+  "notifications.policy.filter_not_followers_title": "Lidé, kteří vás nesledují",
+  "notifications.policy.filter_not_following_hint": "Dokud je ručně neschválíte",
+  "notifications.policy.filter_not_following_title": "Lidé, které nesledujete",
+  "notifications.policy.filter_private_mentions_hint": "Vyfiltrováno, pokud to není odpověď na vaši zmínku nebo pokud sledujete odesílatele",
+  "notifications.policy.filter_private_mentions_title": "Nevyžádané soukromé zmínky",
+  "notifications.policy.title": "Vyfiltrovat oznámení od…",
   "notifications_permission_banner.enable": "Povolit oznámení na ploše",
   "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
@@ -473,8 +547,19 @@
   "onboarding.actions.go_to_home": "Přejít na svůj domovský feed",
   "onboarding.compose.template": "Ahoj #Mastodon!",
   "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit vyhledat nebo procházet stránku s průzkumem a najít lidi, kteří budou sledovat, nebo to zkuste znovu později.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Populární na Mastodonu",
+  "onboarding.follows.lead": "Domovský kanál je hlavní metodou zažívání Mastodonu. Čím více lidí sledujete, tím aktivnější a zajímavější bude. Pro začnutí, zde máte několik návrhů:",
+  "onboarding.follows.title": "Přispůsobit vlastní domovský kanál",
+  "onboarding.profile.discoverable": "Udělat svůj profil vyhledatelným",
+  "onboarding.profile.discoverable_hint": "Když se rozhodnete být vyhledatelný na Mastodonu, vaše příspěvky se mohou objevit ve výsledcích vyhledávání a v populárních, a váš profil může být navrhován lidem s podobnými zájmy.",
+  "onboarding.profile.display_name": "Zobrazované jméno",
+  "onboarding.profile.display_name_hint": "Vaše celé jméno nebo přezdívka…",
+  "onboarding.profile.lead": "Toto můžete vždy dokončit později v nastavení, kde je k dispozici ještě více možností přizpůsobení.",
+  "onboarding.profile.note": "O vás",
+  "onboarding.profile.note_hint": "Můžete @zmínit jiné osoby nebo #hashtagy…",
+  "onboarding.profile.save_and_continue": "Uložit a pokračovat",
+  "onboarding.profile.title": "Nastavení profilu",
+  "onboarding.profile.upload_avatar": "Nahrát profilový obrázek",
+  "onboarding.profile.upload_header": "Nahrát hlavičku profilu",
   "onboarding.share.lead": "Dejte lidem vědět, jak vás mohou najít na Mastodonu!",
   "onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
   "onboarding.share.next_steps": "Možné další kroky:",
@@ -482,13 +567,13 @@
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Dokázali jste to!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Řekněte světu Ahoj.",
+  "onboarding.steps.follow_people.body": "Mastodon je o sledování zajimavých lidí.",
+  "onboarding.steps.follow_people.title": "Přispůsobit vlastní domovský kanál",
+  "onboarding.steps.publish_status.body": "Řekněte světu ahoj s pomocí textem, fotografiemi, videami nebo anketami {emoji}",
   "onboarding.steps.publish_status.title": "Vytvořte svůj první příspěvek",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Přizpůsobit svůj profil",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+  "onboarding.steps.share_profile.body": "Dejte blízkým lidem vědět, jak vás mohou najít na Mastodonu",
   "onboarding.steps.share_profile.title": "Sdílejte svůj profil",
   "onboarding.tips.2fa": "<strong>Víte, že?</strong> Svůj účet můžete zabezpečit nastavením dvoufaktorového ověřování v nastavení účtu. Funguje s jakoukoli TOTP aplikací podle vašeho výběru, telefonní číslo není nutné!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Víte, že?</strong> Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
@@ -508,16 +593,18 @@
   "poll_button.add_poll": "Přidat anketu",
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze zmínění lidé",
-  "privacy.private.long": "Viditelný pouze pro sledující",
-  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelný pro všechny",
+  "privacy.direct.long": "Všichni zmínění v příspěvku",
+  "privacy.direct.short": "Vybraní lidé",
+  "privacy.private.long": "Jen vaši sledující",
+  "privacy.private.short": "Sledující",
+  "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",
   "privacy.public.short": "Veřejné",
-  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
-  "privacy.unlisted.short": "Neveřejný",
+  "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
+  "privacy.unlisted.long": "Méně algoritmických fanfár",
+  "privacy.unlisted.short": "Ztišené veřejné",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
+  "recommended": "Doporučeno",
   "refresh": "Obnovit",
   "regeneration_indicator.label": "Načítání…",
   "regeneration_indicator.sublabel": "Váš domovský kanál se připravuje!",
@@ -532,7 +619,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "dnes",
+  "reply_indicator.attachments": "{count, plural, one {{counter} příloha} few {{counter} přílohy} other {{counter} přilohů}}",
   "reply_indicator.cancel": "Zrušit",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokovat",
   "report.block_explanation": "Neuvidíte příspěvky tohoto uživatele. On neuvidí vaše příspěvky, ani vás nebude moci sledovat. Pozná, že je blokován.",
   "report.categories.legal": "Právní ustanovení",
@@ -588,6 +677,7 @@
   "search.quick_action.status_search": "Příspěvky odpovídající {x}",
   "search.search_or_paste": "Hledat nebo vložit URL",
   "search_popout.full_text_search_disabled_message": "Nedostupné na {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dostupné pouze po přihlášení.",
   "search_popout.language_code": "Kód jazyka podle ISO",
   "search_popout.options": "Možnosti hledání",
   "search_popout.quick_actions": "Rychlé akce",
@@ -624,10 +714,11 @@
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
   "status.edit": "Upravit",
-  "status.edited": "Upraveno {date}",
+  "status.edited": "Naposledy upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
+  "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
   "status.filtered": "Filtrováno",
   "status.hide": "Skrýt příspěvek",
@@ -648,6 +739,7 @@
   "status.reblog": "Boostnout",
   "status.reblog_private": "Boostnout s původní viditelností",
   "status.reblogged_by": "Uživatel {name} boostnul",
+  "status.reblogs": "{count, plural, one {boost} few {boosty} many {boostů} other {boostů}}",
   "status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
   "status.redraft": "Smazat a přepsat",
   "status.remove_bookmark": "Odstranit ze záložek",
@@ -695,10 +787,8 @@
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "upload_form.audio_description": "Popis pro sluchově postižené",
   "upload_form.description": "Popis pro zrakově postižené",
-  "upload_form.description_missing": "Nebyl přidán popis",
   "upload_form.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
-  "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
   "upload_modal.analyzing_picture": "Analyzuji obrázek…",
   "upload_modal.apply": "Použít",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 04b39904e4..2c59769959 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
-  "autosuggest_hashtag.per_week": "{count} yr wythnos",
+  "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystro mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
+  "block_modal.show_less": "Dangos llai",
+  "block_modal.show_more": "Dangos mwy",
+  "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
+  "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
+  "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
+  "block_modal.title": "Rhwystro defnyddiwr?",
+  "block_modal.you_wont_see_mentions": "Ni welwch bostiadau sy'n sôn amdanynt.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
-  "compose_form.poll.add_option": "Ychwanegu dewis",
   "compose_form.poll.duration": "Cyfnod pleidlais",
+  "compose_form.poll.multiple": "Dewis lluosog",
   "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Tynnu'r dewis",
+  "compose_form.poll.single": "Ddewis un",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
-  "compose_form.publish": "Cyhoeddi",
+  "compose_form.poll.type": "Arddull",
+  "compose_form.publish": "Postiad",
   "compose_form.publish_form": "Cyhoeddi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Cadw newidiadau",
-  "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
-  "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
-  "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
+  "compose_form.reply": "Ateb",
+  "compose_form.save_changes": "Diweddariad",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
-  "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
+  "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Diddymu",
-  "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
   "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
   "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
-  "confirmations.domain_block.confirm": "Blocio parth cyfan",
+  "confirmations.domain_block.confirm": "Rhwystro gweinydd",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
   "confirmations.edit.message": "Bydd golygu nawr yn trosysgrifennu'r neges rydych yn ei ysgrifennu ar hyn o bryd. Ydych chi'n siŵr eich bod eisiau gwneud hyn?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.mute.confirm": "Tewi",
-  "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi'n siŵr eich bod am ddileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
   "confirmations.reply.confirm": "Ateb",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Mae'r rhain yn bostiadau o bob rhan o'r we gymdeithasol sydd ar gynnydd heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynu'n cael eu graddio'n uwch.",
   "dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y we gymdeithasol y mae pobl ar {domain} yn eu dilyn.",
+  "domain_block_modal.block": "Rhwystro gweinydd",
+  "domain_block_modal.block_account_instead": "Rhwystro @{name} yn lle hynny",
+  "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
+  "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
+  "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu rhwystro.",
+  "domain_block_modal.title": "Rhwystro parth?",
+  "domain_block_modal.you_will_lose_followers": "Bydd eich holl ddilynwyr o'r gweinydd hwn yn cael eu tynnu.",
+  "domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
+  "domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
+  "domain_pill.activitypub_like_language": "Mae ActivityPub fel yr iaith y mae Mastodon yn ei siarad â rhwydweithiau cymdeithasol eraill.",
+  "domain_pill.server": "Gweinydd",
+  "domain_pill.their_handle": "Eu handlen:",
+  "domain_pill.their_server": "Eu cartref digidol, lle mae eu holl negeseuon yn byw.",
+  "domain_pill.their_username": "Eu dynodwr unigryw ar eu gweinydd. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
+  "domain_pill.username": "Enw Defnyddiwr",
+  "domain_pill.whats_in_a_handle": "Beth sydd mewn handlen?",
+  "domain_pill.who_they_are": "Gan fod handlen yn dweud pwy yw rhywun a ble maen nhw, gallwch chi ryngweithio â phobl ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button> .",
+  "domain_pill.who_you_are": "Oherwydd bod eich handlen yn dweud pwy ydych chi a ble rydych chi, gall pobl ryngweithio â chi ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button> .",
+  "domain_pill.your_handle": "Eich handlen:",
+  "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
+  "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
   "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
   "embed.preview": "Dyma sut olwg fydd arno:",
   "emoji_button.activity": "Gweithgarwch",
@@ -244,6 +266,7 @@
   "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
   "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
   "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
+  "empty_column.notification_requests": "Dim i boeni amdano! Does dim byd yma. Pan fyddwch yn derbyn hysbysiadau newydd, byddan nhw'n ymddangos yma yn ôl eich gosodiadau.",
   "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
   "empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
   "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
+  "filtered_notifications_banner.mentions": "{count, plural, one {crybwylliad} other {crybwylliad}}",
+  "filtered_notifications_banner.pending_requests": "Hysbysiadau gan {count, plural, =0 {neb} one {un person} other {# person}} efallai y gwyddoch amdanyn nhw",
+  "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
   "firehose.remote": "Gweinyddion eraill",
   "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
   "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "follow_suggestions.curated_suggestion": "Dewis staff",
+  "follow_suggestions.dismiss": "Peidio â dangos hwn eto",
+  "follow_suggestions.featured_longer": "Wedi'i ddewis â llaw gan dîm {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn",
+  "follow_suggestions.hints.featured": "Mae'r proffil hwn wedi'i ddewis yn arbennig gan dîm {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Mae'r proffil hwn yn boblogaidd ymhlith y bobl rydych chi'n eu dilyn.",
+  "follow_suggestions.hints.most_followed": "Mae'r proffil hwn yn un o'r rhai sy'n cael ei ddilyn fwyaf ar {domain}.",
+  "follow_suggestions.hints.most_interactions": "Mae'r proffil hwn wedi bod yn cael llawer o sylw yn ddiweddar ar {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Mae'r proffil hwn yn debyg i'r proffiliau rydych chi wedi'u dilyn yn fwyaf diweddar.",
+  "follow_suggestions.personalized_suggestion": "Awgrym personol",
+  "follow_suggestions.popular_suggestion": "Awgrym poblogaidd",
+  "follow_suggestions.popular_suggestion_longer": "Yn boblogaidd ar {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Yn debyg i broffiliau y gwnaethoch chi eu dilyn yn ddiweddar",
+  "follow_suggestions.view_all": "Gweld y cyfan",
+  "follow_suggestions.who_to_follow": "Pwy i ddilyn",
   "followed_tags": "Hashnodau rydych yn eu dilyn",
   "footer.about": "Ynghylch",
   "footer.directory": "Cyfeiriadur proffiliau",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "hashtags.and_other": "…a {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "Gweld beth yw'r tuedd",
-  "home.actions.go_to_suggestions": "Ffeindio pobl i'w dilyn",
-  "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos atebion",
-  "home.explore_prompt.body": "Bydd eich llif cartref yn cynnwys cymysgedd o bostiadau o'r hashnodau rydych chi wedi dewis eu dilyn, y bobl rydych chi wedi dewis eu dilyn, a'r postiadau maen nhw'n rhoi hwb iddyn nhw. Os yw hynny'n teimlo'n rhy dawel, efallai y byddwch eisiau:",
-  "home.explore_prompt.title": "Dyma'ch cartref o fewn Mastodon.",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.pending_critical_update.body": "Diweddarwch eich gweinydd Mastodon cyn gynted â phosibl!",
   "home.pending_critical_update.link": "Gweld y diweddariadau",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Yn llwytho…",
   "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
-  "mute_modal.duration": "Hyd",
-  "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
-  "mute_modal.indefinite": "Parhaus",
+  "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
+  "mute_modal.hide_options": "Cuddio'r dewis",
+  "mute_modal.indefinite": "Nes i mi eu dad-dewi",
+  "mute_modal.show_options": "Dangos y dewis",
+  "mute_modal.they_can_mention_and_follow": "Gallan nhw eich crybwyll a'ch dilyn, ond fyddwch chi ddim yn eu gweld.",
+  "mute_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu tawelu.",
+  "mute_modal.title": "Tewi defnyddiwr?",
+  "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
+  "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Crybwylliadau preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
-  "navigation_bar.edit_profile": "Golygu proffil",
   "navigation_bar.explore": "Darganfod",
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
@@ -432,11 +473,29 @@
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.mention": "Crybwyllodd {name} amdanoch chi",
+  "notification.moderation-warning.learn_more": "Dysgu mwy",
+  "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
+  "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
+  "notification.moderation_warning.action_disable": "Mae eich cyfrif wedi'i analluogi.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Mae rhai o'ch postiadau wedi'u marcio'n sensitif.",
+  "notification.moderation_warning.action_none": "Mae eich cyfrif wedi derbyn rhybudd cymedroli.",
+  "notification.moderation_warning.action_sensitive": "Bydd eich postiadau'n cael eu marcio'n sensitif o hyn ymlaen.",
+  "notification.moderation_warning.action_silence": "Mae eich cyfrif wedi'i gyfyngu.",
+  "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i hatal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
+  "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
+  "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
+  "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi rhwystro {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
+  "notification.relationships_severance_event.learn_more": "Dysgu mwy",
+  "notification.relationships_severance_event.user_domain_block": "Rydych wedi rhwystro {target}, gan ddileu {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {#cyfrifon}} arall rydych yn ei ddilyn.",
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
+  "notification_requests.accept": "Derbyn",
+  "notification_requests.dismiss": "Cau",
+  "notification_requests.notifications_from": "Hysbysiadau gan {name}",
+  "notification_requests.title": "Hysbysiadau wedi'u hidlo",
   "notifications.clear": "Clirio hysbysiadau",
   "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
   "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
-  "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
   "notifications.column_settings.mention": "Crybwylliadau:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
   "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
+  "notifications.policy.filter_new_accounts.hint": "Crëwyd o fewn {days, lluosog, un {yr un diwrnod} arall {y # diwrnod}} diwethaf",
+  "notifications.policy.filter_new_accounts_title": "Cyfrifon newydd",
+  "notifications.policy.filter_not_followers_hint": "Gan gynnwys pobl sydd wedi bod yn eich dilyn am llai  {days, plural, un {nag un diwrnod} arall {na # diwrnod}}",
+  "notifications.policy.filter_not_followers_title": "Pobl sydd ddim yn eich dilyn",
+  "notifications.policy.filter_not_following_hint": "Hyd nes i chi eu cymeradwyo â llaw",
+  "notifications.policy.filter_not_following_title": "Pobl nad ydych yn eu dilyn",
+  "notifications.policy.filter_private_mentions_hint": "Wedi'i hidlo oni bai ei fod mewn ymateb i'ch crybwylliad eich hun neu os ydych yn dilyn yr anfonwr",
+  "notifications.policy.filter_private_mentions_title": "Crybwylliadau preifat digymell",
+  "notifications.policy.title": "Hidlo hysbysiadau gan…",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
-  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
-  "privacy.private.short": "Dilynwyr yn unig",
-  "privacy.public.long": "Gweladwy i bawb",
+  "privacy.direct.long": "Pawb sydd â son amdanyn nhw yn y postiad",
+  "privacy.direct.short": "Pobl benodol",
+  "privacy.private.long": "Eich dilynwyr yn unig",
+  "privacy.private.short": "Dilynwyr",
+  "privacy.public.long": "Unrhyw ar ac oddi ar Mastodon",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
-  "privacy.unlisted.short": "Heb ei restru",
+  "privacy.unlisted.additional": "Mae hwn yn ymddwyn yn union fel y cyhoeddus, ac eithrio na fydd y postiad yn ymddangos mewn ffrydiau byw neu hashnodau, archwilio, neu chwiliad Mastodon, hyd yn oed os ydych wedi eich cynnwys ar draws y cyfrif.",
+  "privacy.unlisted.long": "Llai o ddathliadau algorithmig",
+  "privacy.unlisted.short": "Tewi'r cyhoeddus",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
   "reply_indicator.cancel": "Canslo",
+  "reply_indicator.poll": "Arolwg",
   "report.block": "Blocio",
   "report.block_explanation": "Ni welwch chi eu postiadau. Ni allan nhw weld eich postiadau na'ch dilyn. Byddan nhw'n gallu gweld eu bod nhw wedi'u rhwystro.",
   "report.categories.legal": "Cyfreithiol",
@@ -644,10 +714,11 @@
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
   "status.edit": "Golygu",
-  "status.edited": "Golygwyd {date}",
+  "status.edited": "Golygwyd ddiwethaf {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
   "status.favourite": "Hoffi",
+  "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
   "status.filtered": "Wedi'i hidlo",
   "status.hide": "Cuddio'r postiad",
@@ -668,6 +739,7 @@
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
+  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
-  "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
   "upload_form.edit": "Golygu",
   "upload_form.thumbnail": "Newid llun bach",
-  "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
   "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
   "upload_modal.apply": "Gosod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 3bc830ad27..a23d537331 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} pr. uge",
+  "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis flere",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+  "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
+  "block_modal.title": "Blokér bruger?",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
-  "compose_form.poll.add_option": "Tilføj valgmulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
+  "compose_form.poll.multiple": "Multivalg",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
-  "compose_form.poll.remove_option": "Fjern denne valgmulighed",
+  "compose_form.poll.single": "Vælg én",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
-  "compose_form.publish": "Publicér",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Indsend",
   "compose_form.publish_form": "Publicér",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gem ændringer",
-  "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Opdatér",
   "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
-  "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
-  "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
-  "confirmations.block.message": "Er du sikker på, at du vil blokere {name}?",
   "confirmations.cancel_follow_request.confirm": "Annullér anmodning",
   "confirmations.cancel_follow_request.message": "Er du sikker på, at anmodningen om at følge {name} skal annulleres?",
   "confirmations.delete.confirm": "Slet",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Er du sikker på, at du vil slette denne liste permanent?",
   "confirmations.discard_edit_media.confirm": "Kassér",
   "confirmations.discard_edit_media.message": "Der er ugemte ændringer i mediebeskrivelsen eller forhåndsvisningen, kassér dem alligevel?",
-  "confirmations.domain_block.confirm": "Blokér hele domænet",
+  "confirmations.domain_block.confirm": "Blokér server",
   "confirmations.domain_block.message": "Er du fuldstændig sikker på, at du vil blokere hele {domain}-domænet? Oftest vil nogle få målrettede blokeringer eller skjulninger være tilstrækkelige og at foretrække. Du vil ikke se indhold fra dette domæne i nogle offentlige tidslinjer eller i dine notifikationer, og dine følgere herfra fjernes ligeledes.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Redigeres nu, overskrive den besked, der forfattes pt. Fortsæt alligevel?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.mute.confirm": "Skjul (mute)",
-  "confirmations.mute.explanation": "Dette skjuler indlæg fra (og om) dem, men lader dem fortsat se dine indlæg og følge dig.",
-  "confirmations.mute.message": "Er du sikker på, at du vil skjule {name}?",
   "confirmations.redraft.confirm": "Slet og omformulér",
   "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
   "confirmations.reply.confirm": "Svar",
@@ -208,6 +209,25 @@
   "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
   "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
   "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
+  "domain_block_modal.block": "Blokér server",
+  "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
+  "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
+  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.title": "Blokér domæne?",
+  "domain_block_modal.you_will_lose_followers": "Alle følgerne fra denne server fjernes.",
+  "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
+  "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Vedkommendes handle:",
+  "domain_pill.username": "Brugernavn",
+  "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
+  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.your_handle": "Dit handle:",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+  "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
@@ -244,6 +264,7 @@
   "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
   "empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
   "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
   "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
   "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
@@ -274,12 +295,30 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omtale} other {omtaler}}",
+  "filtered_notifications_banner.pending_requests": "Notifikationer fra {count, plural, =0 {ingen} one {én person} other {# personer}} du måske kender",
+  "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
   "firehose.local": "Denne server",
   "firehose.remote": "Andre servere",
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "follow_requests.unlocked_explanation": "Selvom din konto ikke er låst, synes {domain}-personalet, du måske bør gennemgå disse anmodninger manuelt.",
+  "follow_suggestions.curated_suggestion": "Personaleudvalgt",
+  "follow_suggestions.dismiss": "Vis ikke igen",
+  "follow_suggestions.featured_longer": "Håndplukket af {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populært blandt personer, som følges",
+  "follow_suggestions.hints.featured": "Denne profil er håndplukket af {domain}-teamet.",
+  "follow_suggestions.hints.friends_of_friends": "Denne profil er populær blandt de personer, som følges.",
+  "follow_suggestions.hints.most_followed": "Denne profil er en af de mest fulgte på {domain}.",
+  "follow_suggestions.hints.most_interactions": "Denne profil har for nylig fået stor opmærksomhed på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denne profil svarer til de profiler, som senest er blevet fulgt.",
+  "follow_suggestions.personalized_suggestion": "Personligt forslag",
+  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.popular_suggestion_longer": "Populært på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
+  "follow_suggestions.view_all": "Vis alle",
+  "follow_suggestions.who_to_follow": "Hvem, som skal følges",
   "followed_tags": "Hashtag, som følges",
   "footer.about": "Om",
   "footer.directory": "Profiloversigt",
@@ -306,13 +345,8 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
-  "home.actions.go_to_explore": "Se, hvad som trender",
-  "home.actions.go_to_suggestions": "Find nogle personer at følge",
-  "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Dit hjemmefeed vil have en blanding af indlæg fra de hashtags, du har valgt at følge, de personer, du har valgt at følge, og de indlæg, de booster. Hvis her virker for stille, kan du prøve:",
-  "home.explore_prompt.title": "Dette er din hjemmebase i Mastodon.",
   "home.hide_announcements": "Skjul bekendtgørelser",
   "home.pending_critical_update.body": "Opdater din Mastodon-server snarest muligt!",
   "home.pending_critical_update.link": "Se opdateringer",
@@ -396,9 +430,15 @@
   "loading_indicator.label": "Indlæser…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
-  "mute_modal.duration": "Varighed",
-  "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
-  "mute_modal.indefinite": "Tidsubegrænset",
+  "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
+  "mute_modal.hide_options": "Skjul valgmuligheder",
+  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.show_options": "Vis valgmuligheder",
+  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+  "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+  "mute_modal.title": "Tavsgør bruger?",
+  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+  "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -408,7 +448,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.edit_profile": "Redigér profil",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord (mutede)",
@@ -432,11 +471,29 @@
   "notification.follow": "{name} begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
   "notification.mention": "{name} nævnte dig",
+  "notification.moderation-warning.learn_more": "Læs mere",
+  "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+  "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
+  "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+  "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+  "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
+  "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du stemte, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
+  "notification.relationships_severance_event": "Mistede forbindelser med {name}",
+  "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
+  "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
+  "notification.relationships_severance_event.learn_more": "Læs mere",
+  "notification.relationships_severance_event.user_domain_block": "{target} er blevet blokeret, og {followersCount} tilhængere samt {followingCount, plural, one {# konto, der} other {# konti, som}} følges, er hermed fjernet.",
   "notification.status": "{name} har netop postet",
   "notification.update": "{name} redigerede et indlæg",
+  "notification_requests.accept": "Acceptér",
+  "notification_requests.dismiss": "Afvis",
+  "notification_requests.notifications_from": "Notifikationer fra {name}",
+  "notification_requests.title": "Filtrerede notifikationer",
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
@@ -444,8 +501,7 @@
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfilterbjælke",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterbjælke",
+  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
   "notifications.column_settings.mention": "Omtaler:",
@@ -471,6 +527,15 @@
   "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
   "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
+  "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
+  "notifications.policy.filter_new_accounts_title": "Ny konti",
+  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
+  "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+  "notifications.policy.filter_not_following_hint": "Indtil de manuelt godkendes",
+  "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+  "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
+  "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
+  "notifications.policy.title": "Bortfiltrér notifikationer fra…",
   "notifications_permission_banner.enable": "Aktivér computernotifikationer",
   "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
@@ -526,14 +591,15 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun omtalte personer",
-  "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.short": "Bestemte personer",
+  "privacy.private.long": "Kun dine følgere",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
-  "privacy.unlisted.short": "Diskret",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Tavsgøre offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
@@ -551,7 +617,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
   "reply_indicator.cancel": "Afbryd",
+  "reply_indicator.poll": "Afstemning",
   "report.block": "Blokér",
   "report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
   "report.categories.legal": "Juridisk",
@@ -644,10 +712,11 @@
   "status.direct": "Privat omtale @{name}",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Redigér",
-  "status.edited": "Redigeret {date}",
+  "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
   "status.embed": "Indlejr",
   "status.favourite": "Favorit",
+  "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
   "status.filtered": "Filtreret",
   "status.hide": "Skjul indlæg",
@@ -668,6 +737,7 @@
   "status.reblog": "Fremhæv",
   "status.reblog_private": "Boost med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
+  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
@@ -715,10 +785,8 @@
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_form.audio_description": "Beskrivelse til hørehæmmede",
   "upload_form.description": "Beskrivelse til svagtseende",
-  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
   "upload_form.edit": "Redigér",
   "upload_form.thumbnail": "Skift miniature",
-  "upload_form.undo": "Slet",
   "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
   "upload_modal.analyzing_picture": "Analyserer billede…",
   "upload_modal.apply": "Anvend",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 462352750c..5776641079 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -85,11 +85,18 @@
   "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
   "alert.rate_limited.title": "Anfragelimit überschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
-  "alert.unexpected.title": "Ups!",
+  "alert.unexpected.title": "Oha!",
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
-  "autosuggest_hashtag.per_week": "{count} pro Woche",
+  "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
+  "block_modal.show_less": "Weniger anzeigen",
+  "block_modal.show_more": "Mehr anzeigen",
+  "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
+  "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
+  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+  "block_modal.title": "Profil blockieren?",
+  "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
-  "compose_form.poll.add_option": "Auswahl",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.option_placeholder": "{number}. Auswahl",
-  "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+  "compose_form.poll.multiple": "Mul­ti­ple-Choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
-  "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+  "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
+  "compose_form.poll.type": "Art",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Änderungen speichern",
-  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+  "compose_form.reply": "Antworten",
+  "compose_form.save_changes": "Aktualisieren",
   "compose_form.spoiler.marked": "Inhaltswarnung entfernen",
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
-  "compose_form.spoiler_placeholder": "Inhaltswarnung",
+  "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
-  "confirmations.block.message": "Möchtest du {name} wirklich blockieren?",
   "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
   "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
   "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
-  "confirmations.domain_block.confirm": "Domain blockieren",
+  "confirmations.domain_block.confirm": "Server blockieren",
   "confirmations.domain_block.message": "Möchtest du die gesamte Domain {domain} wirklich blockieren? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.edit.confirm": "Bearbeiten",
   "confirmations.edit.message": "Das Bearbeiten überschreibt die Nachricht, die du gerade verfasst. Möchtest du wirklich fortfahren?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
-  "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
-  "confirmations.mute.message": "Möchtest du {name} wirklich stummschalten?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.reply.confirm": "Antworten",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Diese Beiträge stammen aus dem gesamten sozialen Netzwerk und gewinnen derzeit an Reichweite. Neuere Beiträge, die häufiger geteilt und favorisiert wurden, werden höher eingestuft.",
   "dismissable_banner.explore_tags": "Das sind Hashtags, die derzeit an Reichweite gewinnen. Hashtags, die von vielen verschiedenen Profilen verwendet werden, werden höher eingestuft.",
   "dismissable_banner.public_timeline": "Das sind die neuesten öffentlichen Beiträge von Profilen im sozialen Netzwerk, denen Leute auf {domain} folgen.",
+  "domain_block_modal.block": "Server blockieren",
+  "domain_block_modal.block_account_instead": "Stattdessen @{name} blockieren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Profile von diesem Server werden mit deinen älteren Beiträgen interagieren können.",
+  "domain_block_modal.they_cant_follow": "Niemand von diesem Server wird dir folgen können.",
+  "domain_block_modal.they_wont_know": "Es wird nicht erkennbar sein, dass diese Domain blockiert wurde.",
+  "domain_block_modal.title": "Domain blockieren?",
+  "domain_block_modal.you_will_lose_followers": "Alle Follower von diesem Server werden entfernt.",
+  "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
+  "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
+  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deren Adresse:",
+  "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "domain_pill.username": "Profilname",
+  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.your_handle": "Deine Adresse:",
+  "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
@@ -244,6 +266,7 @@
   "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
   "empty_column.lists": "Du hast noch keine Listen. Sobald du eine anlegst, wird sie hier erscheinen.",
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
+  "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
   "empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
   "error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filtered_notifications_banner.mentions": "{count, plural, one {Erwähnung} other {Erwähnungen}}",
+  "filtered_notifications_banner.pending_requests": "Benachrichtigungen von {count, plural, =0 {keinem Profil, das du möglicherweise kennst} one {einem Profil, das du möglicherweise kennst} other {# Profilen, die du möglicherweise kennst}}",
+  "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
   "firehose.remote": "Andere Server",
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
+  "follow_suggestions.curated_suggestion": "Vom Server-Team empfohlen",
+  "follow_suggestions.dismiss": "Nicht mehr anzeigen",
+  "follow_suggestions.featured_longer": "Vom {domain}-Team ausgewählt",
+  "follow_suggestions.friends_of_friends_longer": "Beliebt bei Leuten, denen du folgst",
+  "follow_suggestions.hints.featured": "Dieses Profil wurde vom {domain}-Team ausgewählt.",
+  "follow_suggestions.hints.friends_of_friends": "Dieses Profil ist bei deinen Followern beliebt.",
+  "follow_suggestions.hints.most_followed": "Dieses Profil ist eines der am meisten gefolgten auf {domain}.",
+  "follow_suggestions.hints.most_interactions": "Dieses Profil erhielt auf {domain} in letzter Zeit viel Aufmerksamkeit.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Dieses Profil ähnelt den Profilen, denen du in letzter Zeit gefolgt hast.",
+  "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
+  "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
+  "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
+  "follow_suggestions.view_all": "Alle anzeigen",
+  "follow_suggestions.who_to_follow": "Empfohlene Profile",
   "followed_tags": "Gefolgte Hashtags",
   "footer.about": "Über",
   "footer.directory": "Profilverzeichnis",
@@ -290,7 +331,7 @@
   "footer.source_code": "Quellcode anzeigen",
   "footer.status": "Status",
   "generic.saved": "Gespeichert",
-  "getting_started.heading": "Auf geht’s!",
+  "getting_started.heading": "Auf gehts!",
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
-  "home.actions.go_to_explore": "Trends ansehen",
-  "home.actions.go_to_suggestions": "Profile zum Folgen finden",
-  "home.column_settings.basic": "Allgemein",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
-  "home.explore_prompt.body": "Deine Startseite wird eine Mischung aus Beiträgen mit Hashtags und den Profilen, denen du folgst sowie den Beiträgen, die sie teilen, enthalten. Sollte es sich zu still anfühlen:",
-  "home.explore_prompt.title": "Das ist dein Zuhause bei Mastodon.",
   "home.hide_announcements": "Ankündigungen ausblenden",
   "home.pending_critical_update.body": "Bitte aktualisiere deinen Mastodon-Server so schnell wie möglich!",
   "home.pending_critical_update.link": "Updates ansehen",
@@ -364,7 +400,7 @@
   "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
   "keyboard_shortcuts.search": "Suchleiste fokussieren",
   "keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen/ausblenden",
-  "keyboard_shortcuts.start": "„Auf geht’s!“ öffnen",
+  "keyboard_shortcuts.start": "„Auf gehts!“ öffnen",
   "keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/ausblenden",
   "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/ausblenden",
   "keyboard_shortcuts.toot": "Neuen Beitrag erstellen",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Wird geladen …",
   "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
-  "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils ausblenden?",
-  "mute_modal.indefinite": "Unbegrenzt",
+  "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
+  "mute_modal.hide_options": "Einstellungen ausblenden",
+  "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+  "mute_modal.show_options": "Einstellungen anzeigen",
+  "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
+  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+  "mute_modal.title": "Profil stummschalten?",
+  "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Private Erwähnungen",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} folgt dir",
   "notification.follow_request": "{name} möchte dir folgen",
   "notification.mention": "{name} erwähnte dich",
+  "notification.moderation-warning.learn_more": "Mehr erfahren",
+  "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
+  "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
+  "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
+  "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
+  "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
+  "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
+  "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
+  "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
+  "notification.relationships_severance_event.learn_more": "Mehr erfahren",
+  "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
   "notification.status": "{name} hat gerade etwas gepostet",
   "notification.update": "{name} bearbeitete einen Beitrag",
+  "notification_requests.accept": "Akzeptieren",
+  "notification_requests.dismiss": "Ablehnen",
+  "notification_requests.notifications_from": "Benachrichtigungen von {name}",
+  "notification_requests.title": "Gefilterte Benachrichtigungen",
   "notifications.clear": "Benachrichtigungen löschen",
   "notifications.clear_confirmation": "Möchtest du wirklich alle Benachrichtigungen für immer löschen?",
   "notifications.column_settings.admin.report": "Neue Meldungen:",
@@ -444,8 +503,7 @@
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
-  "notifications.column_settings.filter_bar.category": "Filterleiste:",
-  "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
+  "notifications.column_settings.filter_bar.category": "Filterleiste",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Desktop-Benachrichtigungen können aufgrund einer zuvor verweigerten Berechtigung nicht aktiviert werden",
   "notifications.permission_denied_alert": "Desktop-Benachrichtigungen können nicht aktiviert werden, da die Browser-Berechtigung zuvor verweigert wurde",
   "notifications.permission_required": "Desktop-Benachrichtigungen sind nicht verfügbar, da die erforderliche Berechtigung nicht erteilt wurde.",
+  "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
+  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+  "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
+  "notifications.policy.filter_not_following_hint": "Solange du sie nicht manuell akzeptierst",
+  "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
+  "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.title": "Benachrichtigungen herausfiltern von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
   "notifications_permission_banner.title": "Nichts verpassen",
@@ -482,11 +549,11 @@
   "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
   "onboarding.follows.lead": "Deine Startseite ist der primäre Anlaufpunkt, um Mastodon zu erleben. Je mehr Profilen du folgst, umso aktiver und interessanter wird sie. Damit du direkt loslegen kannst, gibt es hier ein paar Vorschläge:",
   "onboarding.follows.title": "Personalisiere deine Startseite",
-  "onboarding.profile.discoverable": "Mein Profil auffindbar machen",
+  "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
   "onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
   "onboarding.profile.display_name": "Anzeigename",
   "onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
-  "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
+  "onboarding.profile.lead": "Du kannst dein Profil später in den Einstellungen vervollständigen. Dort stehen weitere Anpassungsmöglichkeiten zur Verfügung.",
   "onboarding.profile.note": "Über mich",
   "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
   "onboarding.profile.save_and_continue": "Speichern und fortfahren",
@@ -502,16 +569,16 @@
   "onboarding.start.title": "Du hast es geschafft!",
   "onboarding.steps.follow_people.body": "Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.",
   "onboarding.steps.follow_people.title": "Personalisiere deine Startseite",
-  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen {emoji}",
+  "onboarding.steps.publish_status.body": "Begrüße die Welt mit Text, Fotos, Videos oder Umfragen. {emoji}",
   "onboarding.steps.publish_status.title": "Erstelle deinen ersten Beitrag",
   "onboarding.steps.setup_profile.body": "Mit einem vollständigen Profil interagieren andere eher mit dir.",
   "onboarding.steps.setup_profile.title": "Personalisiere dein Profil",
-  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können",
+  "onboarding.steps.share_profile.body": "Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.",
   "onboarding.steps.share_profile.title": "Teile dein Mastodon-Profil",
   "onboarding.tips.2fa": "<strong>Wusstest du schon?</strong> Du kannst die Sicherheit deines Kontos erhöhen, indem du die Zwei-Faktor-Authentisierung in deinen Kontoeinstellungen aktivierst. Dafür ist keine Telefonnummer notwendig und es funktioniert jede beliebige TOTP-App!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Wusstest du schon?</strong> Da Mastodon dezentralisiert ist, werden einige Profile, denen du begegnest, auf anderen Servern als deinem bereitgestellt. Und trotzdem kannst du uneingeschränkt mit ihnen interagieren! Der Servername befindet sich in der zweiten Hälfte ihres Profilnamens!",
   "onboarding.tips.migration": "<strong>Wusstest du schon?</strong> Wenn du das Gefühl hast, dass {domain} in Zukunft nicht die richtige Serverwahl für dich ist, kannst du auf einen anderen Mastodon-Server umziehen, ohne deine Follower zu verlieren. Du kannst sogar deinen eigenen Server betreiben!",
-  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Keine Gebühren oder Dokumente erforderlich!",
+  "onboarding.tips.verification": "<strong>Wusstest du schon?</strong> Du kannst dein Konto verifizieren, indem du auf deiner Website auf dein Mastodon-Profil verlinkst und den Link deiner Website zu deinem Profil hinzufügst. Völlig kostenlos und ohne Dokumente einsenden zu müssen!",
   "password_confirmation.exceeds_maxlength": "Passwortbestätigung überschreitet die maximal erlaubte Zeichenanzahl",
   "password_confirmation.mismatching": "Passwortbestätigung stimmt nicht überein",
   "picture_in_picture.restore": "Zurücksetzen",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
-  "privacy.direct.long": "Nur für die erwähnten Profile sichtbar",
-  "privacy.direct.short": "Nur erwähnte Profile",
-  "privacy.private.long": "Nur für deine Follower sichtbar",
-  "privacy.private.short": "Nur Follower",
-  "privacy.public.long": "Für alle sichtbar",
+  "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
+  "privacy.direct.short": "Bestimmte Profile",
+  "privacy.private.long": "Nur deine Follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Alle in und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
-  "privacy.unlisted.short": "Nicht gelistet",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} Min.",
   "relative_time.seconds": "{number} Sek.",
   "relative_time.today": "heute",
+  "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
+  "reply_indicator.poll": "Umfrage",
   "report.block": "Blockieren",
   "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
   "report.categories.legal": "Rechtlich",
@@ -644,10 +714,11 @@
   "status.direct": "@{name} privat erwähnen",
   "status.direct_indicator": "Private Erwähnung",
   "status.edit": "Beitrag bearbeiten",
-  "status.edited": "Bearbeitet {date}",
+  "status.edited": "Zuletzt am {date} bearbeitet",
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
   "status.embed": "Beitrag per iFrame einbetten",
   "status.favourite": "Favorisieren",
+  "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
   "status.filtered": "Gefiltert",
   "status.hide": "Beitrag ausblenden",
@@ -668,6 +739,7 @@
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
   "status.reblogged_by": "{name} teilte",
+  "status.reblogs": "{count, plural, one {Mal geteilt} other {Mal geteilt}}",
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
   "upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
   "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
-  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",
   "upload_form.thumbnail": "Vorschaubild ändern",
-  "upload_form.undo": "Löschen",
   "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
   "upload_modal.analyzing_picture": "Bild wird analysiert …",
   "upload_modal.apply": "Übernehmen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 53e55fa950..937bb5d027 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "Ανακοίνωση",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
-  "autosuggest_hashtag.per_week": "{count} ανά εβδομάδα",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
   "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -111,6 +110,7 @@
   "column.direct": "Ιδιωτικές αναφορές",
   "column.directory": "Περιήγηση στα προφίλ",
   "column.domain_blocks": "Αποκλεισμένοι τομείς",
+  "column.favourites": "Αγαπημένα",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
@@ -131,32 +131,30 @@
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
   "compose.language.change": "Αλλαγή γλώσσας",
   "compose.language.search": "Αναζήτηση γλωσσών...",
+  "compose.published.body": "Η ανάρτηση δημοσιεύτηκε.",
+  "compose.published.open": "Άνοιγμα",
+  "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
   "compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
   "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σου προς τους ακολούθους σου.",
   "compose_form.lock_disclaimer.lock": "κλειδωμένο",
   "compose_form.placeholder": "Τι σκέφτεσαι;",
-  "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
+  "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
-  "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
-  "compose_form.publish": "Δημοσίευση",
+  "compose_form.poll.type": "Στυλ",
+  "compose_form.publish": "Ανάρτηση",
   "compose_form.publish_form": "Δημοσίευση",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Αποθήκευση αλλαγών",
-  "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημειωθεί ως ευαίσθητα}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημειωθεί ως ευαίσθητα}}",
+  "compose_form.reply": "Απάντηση",
+  "compose_form.save_changes": "Ενημέρωση",
   "compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου",
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
-  "compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
+  "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
-  "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
-  "confirmations.block.message": "Σίγουρα θες να αποκλείσεις {name};",
   "confirmations.cancel_follow_request.confirm": "Απόσυρση αιτήματος",
   "confirmations.cancel_follow_request.message": "Είσαι σίγουρος/η ότι θέλεις να αποσύρεις το αίτημά σου να ακολουθείς τον/την {name};",
   "confirmations.delete.confirm": "Διαγραφή",
@@ -165,15 +163,12 @@
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
-  "confirmations.domain_block.confirm": "Αποκλεισμός ολόκληρου του τομέα",
   "confirmations.domain_block.message": "Σίγουρα θες να αποκλείσεις ολόκληρο τον {domain}; Συνήθως μερικοί συγκεκρίμένοι αποκλεισμοί ή σιγάσεις επαρκούν και προτιμούνται. Δεν θα βλέπεις περιεχόμενο από αυτό τον τομέα σε καμία δημόσια ροή ή στις ειδοποιήσεις σου. Όσους ακόλουθους έχεις αυτό αυτό τον τομέα θα αφαιρεθούν.",
   "confirmations.edit.confirm": "Επεξεργασία",
   "confirmations.edit.message": "Αν το επεξεργαστείς τώρα θα αντικατασταθεί το μήνυμα που συνθέτεις. Είσαι σίγουρος ότι θέλεις να συνεχίσεις;",
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
   "confirmations.mute.confirm": "Αποσιώπηση",
-  "confirmations.mute.explanation": "Αυτό θα κρύψει τις δημοσιεύσεις τους και τις δημοσιεύσεις που τους αναφέρουν, αλλά θα συνεχίσουν να μπορούν να βλέπουν τις δημοσιεύσεις σου και να σε ακολουθούν.",
-  "confirmations.mute.message": "Σίγουρα θες να αποσιωπήσεις {name};",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
   "confirmations.reply.confirm": "Απάντησε",
@@ -184,6 +179,7 @@
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
+  "copy_icon_button.copied": "Αντιγράφηκε στο πρόχειρο",
   "copypaste.copied": "Αντιγράφηκε",
   "copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
   "directory.federated": "Από το γνωστό fediverse",
@@ -288,12 +284,8 @@
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
-  "home.actions.go_to_suggestions": "Βρείτε άτομα για να ακολουθήσετε",
-  "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:\nΗ τροφοδοσία της αρχικής σελίδας σας είναι ένα μίγμα από αναρτήσεις με τις ετικέτες και τα άτομα που επιλέξατε να ακολουθείτε, και τις αναρτήσεις που προωθούν. Εάν αυτό σας φαίνεται πολύ ήσυχο, μπορεί να θέλετε:",
-  "home.explore_prompt.title": "Αυτό είναι το σπίτι σας στο Mastodon.",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
   "home.pending_critical_update.link": "Δείτε ενημερώσεις",
   "home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
@@ -369,9 +361,6 @@
   "loading_indicator.label": "Φόρτωση…",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
-  "mute_modal.duration": "Διάρκεια",
-  "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
-  "mute_modal.indefinite": "Επ᾽ αόριστον",
   "navigation_bar.about": "Σχετικά με",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
@@ -380,7 +369,6 @@
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -414,9 +402,6 @@
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
   "notifications.column_settings.favourite": "Αγαπημένα:",
-  "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
-  "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
-  "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
   "notifications.column_settings.mention": "Επισημάνσεις:",
@@ -450,6 +435,12 @@
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.profile.note": "Βιογραφικό",
+  "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+  "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
+  "onboarding.profile.title": "Ρύθμιση προφίλ",
+  "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
+  "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -458,6 +449,7 @@
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Κάντε την πρώτη σας δημοσίευση",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -467,6 +459,7 @@
   "picture_in_picture.restore": "Βάλε το πίσω",
   "poll.closed": "Κλειστή",
   "poll.refresh": "Ανανέωση",
+  "poll.reveal": "Δείτε τα αποτελέσματα",
   "poll.total_people": "{count, plural, one {# άτομο} other {# άτομα}}",
   "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll.vote": "Ψήφισε",
@@ -475,16 +468,14 @@
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
-  "privacy.direct.long": "Δημοσίευση μόνο σε όσους επισημαίνονται",
-  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
-  "privacy.private.long": "Ορατό μόνο για τους ακολούθους",
-  "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Ορατό σε όλους",
+  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+  "privacy.direct.short": "Συγκεκριμένα άτομα",
+  "privacy.private.long": "Μόνο οι ακόλουθοί σας",
+  "privacy.private.short": "Ακόλουθοι",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Ορατό για όλους, εκτός αυτών που δεν συμμετέχουν σε δυνατότητες ανακάλυψης",
-  "privacy.unlisted.short": "Μη καταχωρημένα",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
+  "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",
   "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -500,8 +491,10 @@
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
   "reply_indicator.cancel": "Άκυρο",
+  "reply_indicator.poll": "Δημοσκόπηση",
   "report.block": "Αποκλεισμός",
   "report.block_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Δεν θα μπορεί να δει τις αναρτήσεις σου ή να σε ακολουθήσει. Θα μπορεί να δει ότι έχει αποκλειστεί.",
+  "report.categories.legal": "Νομικό περιεχόμενο",
   "report.categories.other": "Άλλες",
   "report.categories.spam": "Ανεπιθύμητα",
   "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
@@ -519,6 +512,8 @@
   "report.placeholder": "Επιπλέον σχόλια",
   "report.reasons.dislike": "Δεν μου αρέσει",
   "report.reasons.dislike_description": "Δεν είναι κάτι που θα ήθελες να δεις",
+  "report.reasons.legal": "Είναι παράνομο",
+  "report.reasons.legal_description": "Πιστεύετε ότι παραβιάζει το νόμο της χώρας σας ή της χώρας του διακομιστή",
   "report.reasons.other": "Είναι κάτι άλλο",
   "report.reasons.other_description": "Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες",
   "report.reasons.spam": "Είναι σπαμ",
@@ -552,10 +547,12 @@
   "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
   "search_popout.quick_actions": "Γρήγορες ενέργειες",
   "search_popout.recent": "Πρόσφατες αναζητήσεις",
+  "search_popout.user": "χρήστης",
   "search_results.accounts": "Προφίλ",
   "search_results.all": "Όλα",
   "search_results.hashtags": "Ετικέτες",
   "search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
+  "search_results.see_all": "Δες τα όλα",
   "search_results.statuses": "Αναρτήσεις",
   "search_results.title": "Αναζήτηση για {q}",
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
@@ -566,6 +563,8 @@
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.sign_in": "Σύνδεση",
+  "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -579,9 +578,9 @@
   "status.direct": "Ιδιωτική επισήμανση @{name}",
   "status.direct_indicator": "Ιδιωτική επισήμανση",
   "status.edit": "Επεξεργασία",
-  "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
+  "status.favourite": "Αγαπημένα",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.filtered": "Φιλτραρισμένα",
   "status.hide": "Απόκρυψη ανάρτησης",
@@ -646,10 +645,8 @@
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
   "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
-  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
   "upload_form.edit": "Επεξεργασία",
   "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
-  "upload_form.undo": "Διαγραφή",
   "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
   "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
   "upload_modal.apply": "Εφαρμογή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 37e5efa5ba..e70348e0b2 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "No posts",
   "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
+  "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
+  "account.mutual": "Mutual",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",
@@ -87,7 +89,14 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -144,26 +153,22 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.multiple": "Multiple choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.reply": "Reply",
+  "compose_form.save_changes": "Update",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -172,15 +177,13 @@
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
@@ -206,6 +209,27 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favourites are ranked higher.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralised network right now.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -242,6 +266,7 @@
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
@@ -272,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
   "firehose.remote": "Other servers",
   "follow_request.authorize": "Authorise",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Staff pick",
+  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
+  "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+  "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
+  "follow_suggestions.personalized_suggestion": "Personalised suggestion",
+  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
+  "follow_suggestions.view_all": "View all",
+  "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "footer.about": "About",
   "footer.directory": "Profiles directory",
@@ -303,14 +346,9 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
-  "hashtags.and_other": "…and {count, plural, one {}other {# more}}",
-  "home.actions.go_to_explore": "See what's trending",
-  "home.actions.go_to_suggestions": "Find people to follow",
-  "home.column_settings.basic": "Basic",
+  "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
-  "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide announcements",
   "home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
   "home.pending_critical_update.link": "See updates",
@@ -394,9 +432,15 @@
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -406,7 +450,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -430,11 +473,29 @@
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.mention": "{name} mentioned you",
+  "notification.moderation-warning.learn_more": "Learn more",
+  "notification.moderation_warning": "You have received a moderation warning",
+  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.relationships_severance_event": "Lost connections with {name}",
+  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Learn more",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
@@ -443,7 +504,6 @@
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
   "notifications.column_settings.mention": "Mentions:",
@@ -469,6 +529,15 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "New accounts",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "People not following you",
+  "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+  "notifications.policy.filter_not_following_title": "People you don't follow",
+  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Filter out notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
@@ -524,14 +593,15 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.direct.long": "Everyone mentioned in the post",
+  "privacy.direct.short": "Specific people",
+  "privacy.private.long": "Only your followers",
+  "privacy.private.short": "Followers",
+  "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -549,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
@@ -642,10 +714,11 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
+  "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",
@@ -666,6 +739,7 @@
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
@@ -713,10 +787,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analysing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index be7209d04a..83d26e0dcb 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1,17 +1,28 @@
 {
   "about.blocks": "Moderated servers",
   "about.contact": "Contact:",
+  "about.disabled": "Disabled",
   "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Reason not available",
+  "about.domain_blocks.noop.explanation": "This server is limited partically.",
+  "about.domain_blocks.noop.title": "Soft limited",
   "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
   "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
   "about.domain_blocks.silenced.title": "Limited",
   "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
   "about.domain_blocks.suspended.title": "Suspended",
+  "about.enabled": "Enabled",
+  "about.full_text_search": "Full text search",
+  "about.kmyblue_capabilities": "kmyblue capabilities",
+  "about.kmyblue_capability": "This server is using kmyblue, a fork of Mastodon. On this server, kmyblues unique features are configured as follows.",
   "about.not_available": "This information has not been made available on this server.",
   "about.powered_by": "Decentralized social media powered by {mastodon}",
+  "about.public_visibility": "Public visibility",
   "about.rules": "Server rules",
   "account.account_note_header": "Note",
+  "account.add_or_remove_from_antenna": "Add or Remove from antennas",
+  "account.add_or_remove_from_circle": "Add or Remove from circles",
+  "account.add_or_remove_from_exclude_antenna": "Add or Remove from antennas as exclusion",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Automated",
   "account.badges.group": "Group",
@@ -35,6 +46,7 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
+  "account.followers.hidden_from_me": "This information is hidden by your setting.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
@@ -78,6 +90,7 @@
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
+  "admin.dimenssions.disabled_key": "This information is invalid.",
   "admin.impact_report.instance_accounts": "Accounts profiles this would delete",
   "admin.impact_report.instance_followers": "Followers our users would lose",
   "admin.impact_report.instance_follows": "Followers their users would lose",
@@ -87,9 +100,69 @@
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Announcement",
+  "antennas.account.add": "Add to antenna",
+  "antennas.account.remove": "Remove from antenna",
+  "antennas.accounts": "{count} accounts",
+  "antennas.add_domain": "Add domain",
+  "antennas.add_domain_placeholder": "New domain",
+  "antennas.add_keyword": "Add keyword",
+  "antennas.add_keyword_placeholder": "New keyword",
+  "antennas.add_tag": "Add tag",
+  "antennas.add_tag_placeholder": "New tag",
+  "antennas.delete": "Delete antenna",
+  "antennas.domains": "{count} domains",
+  "antennas.edit": "Edit antenna",
+  "antennas.edit.submit": "Change title",
+  "antennas.edit_accounts": "Edit accounts",
+  "antennas.edit_static": "Edit antenna",
+  "antennas.exclude_accounts": "Exclude accounts",
+  "antennas.exclude_domains": "Exclude domains",
+  "antennas.exclude_keywords": "Exclude keywords",
+  "antennas.exclude_tags": "Exclude tags",
+  "antennas.filter": "Filter",
+  "antennas.filter_not": "Filter Not",
+  "antennas.go_timeline": "Go to antenna timeline",
+  "antennas.ignore_reblog": "Exclude boosts",
+  "antennas.in_ltl_mode": "This antenna is in LTL mode.",
+  "antennas.in_stl_mode": "This antenna is in STL mode.",
+  "antennas.insert_feeds": "Insert to feeds",
+  "antennas.insert_home": "Home",
+  "antennas.insert_list": "List",
+  "antennas.keywords": "{count} keywords",
+  "antennas.ltl": "LTL mode",
+  "antennas.media_only": "Media only",
+  "antennas.new.create": "Add antenna",
+  "antennas.new.title_placeholder": "New antenna title",
+  "antennas.not_related_list": "This antenna is not related list. Posts will appear in home timeline. Open edit page to set list.",
+  "antennas.related_list": "This antenna is related to {listTitle}.",
+  "antennas.search": "Search among people you follow",
+  "antennas.select.no_options_message": "Empty lists",
+  "antennas.select.placeholder": "Select list",
+  "antennas.select.set_home": "Set home",
+  "antennas.stl": "STL mode",
+  "antennas.subheading": "Your antennas",
+  "antennas.tags": "{count} tags",
+  "antennas.warnings.content_radio": "Simultaneous keyword and tag designation is not recommended.",
+  "antennas.warnings.range_radio": "Simultaneous account and domain designation is not recommended.",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
+  "block_modal.show_less": "Show less",
+  "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "They can't mention or follow you.",
+  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
+  "block_modal.they_will_know": "They can see that they're blocked.",
+  "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "bookmark_categories.all_bookmarks": "All bookmarks",
+  "bookmark_categories.delete": "Delete category",
+  "bookmark_categories.edit": "Edit category",
+  "bookmark_categories.edit.submit": "Change title",
+  "bookmark_categories.new.create": "Add category",
+  "bookmark_categories.new.title_placeholder": "New category title",
+  "bookmark_categories.status.add": "Add to bookmark category",
+  "bookmark_categories.status.remove": "Remove from bookmark category",
+  "bookmark_categories.subheading": "Your categories",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -103,27 +176,44 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "circles.account.add": "Add to circle",
+  "circles.account.remove": "Remove from circle",
+  "circles.delete": "Delete circle",
+  "circles.edit": "Edit circle",
+  "circles.edit.submit": "Change title",
+  "circles.new.create": "Add circle",
+  "circles.new.title_placeholder": "New circle title",
+  "circles.search": "Search among people follow you",
+  "circles.subheading": "Your circles",
   "closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
   "closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
+  "closed_registrations_modal.description_when_reaching_limit": "New registrations are currently temporarily restricted. Either the maximum number of registrations has been reached for registration. Please contact the administrator for more information or wait until the restriction is lifted.",
   "closed_registrations_modal.find_another_server": "Find another server",
   "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
   "closed_registrations_modal.title": "Signing up on Mastodon",
   "column.about": "About",
+  "column.antennas": "Antennas",
   "column.blocks": "Blocked users",
+  "column.bookmark_categories": "Bookmark categories",
   "column.bookmarks": "Bookmarks",
+  "column.circles": "Circles",
   "column.community": "Local timeline",
+  "column.deep_local": "Deep",
   "column.direct": "Private mentions",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
+  "column.emoji_reactions": "Stamps",
   "column.favourites": "Favorites",
   "column.firehose": "Live feeds",
   "column.follow_requests": "Follow requests",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.local": "Local",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.pins": "Pinned posts",
   "column.public": "Federated timeline",
+  "column.reaction_deck": "Reaction deck",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.moveLeft_settings": "Move column to the left",
@@ -143,46 +233,51 @@
   "compose_form.direct_message_warning_learn_more": "Learn more",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.",
+  "compose_form.limited_post_warning": "Limited posts are NOT reached Misskey, normal Mastodon or so on.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Markdown is available",
+  "compose_form.markdown.unmarked": "Markdown is NOT available",
+  "compose_form.mention_warning": "When you add a mention to a limited post, the person you are mentioning can also see this post.",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.multiple": "Multiple choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.reply": "Reply",
+  "compose_form.save_changes": "Update",
+  "compose_form.searchability_warning": "Self only searchability is not available other mastodon servers. Others can search your post.",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
   "confirmations.cancel_follow_request.confirm": "Withdraw request",
   "confirmations.cancel_follow_request.message": "Are you sure you want to withdraw your request to follow {name}?",
   "confirmations.delete.confirm": "Delete",
   "confirmations.delete.message": "Are you sure you want to delete this post?",
+  "confirmations.delete_antenna.confirm": "Delete",
+  "confirmations.delete_antenna.message": "Are you sure you want to permanently delete this antenna?",
+  "confirmations.delete_bookmark_category.confirm": "Delete",
+  "confirmations.delete_bookmark_category.message": "Are you sure you want to permanently delete this category?",
+  "confirmations.delete_circle.confirm": "Delete",
+  "confirmations.delete_circle.message": "Are you sure you want to permanently delete this circle?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
-  "confirmations.domain_block.confirm": "Block entire domain",
+  "confirmations.domain_block.confirm": "Block server",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
   "confirmations.edit.confirm": "Edit",
   "confirmations.edit.message": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.reply.confirm": "Reply",
@@ -208,6 +303,27 @@
   "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favorites are ranked higher.",
   "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.",
   "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.",
+  "domain_block_modal.block": "Block server",
+  "domain_block_modal.block_account_instead": "Block @{name} instead",
+  "domain_block_modal.they_can_interact_with_old_posts": "People from this server can interact with your old posts.",
+  "domain_block_modal.they_cant_follow": "Nobody from this server can follow you.",
+  "domain_block_modal.they_wont_know": "They won't know they've been blocked.",
+  "domain_block_modal.title": "Block domain?",
+  "domain_block_modal.you_will_lose_followers": "All your followers from this server will be removed.",
+  "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
+  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people not just on Mastodon, but across different social apps too.",
+  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Their handle:",
+  "domain_pill.their_server": "Their digital home, where all of their posts live.",
+  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
+  "domain_pill.username": "Username",
+  "domain_pill.whats_in_a_handle": "What's in a handle?",
+  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Your handle:",
+  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -229,11 +345,18 @@
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.antenna": "There is nothing in this antenna yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.antennas": "You don't have any antennas yet. When you create one, it will show up here.",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmark_categories": "You don't have any categories yet. When you create one, it will show up here.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.circle_statuses": "You don't have any circle posts yet. When you post one as circle, it will show up here.",
+  "empty_column.circles": "You don't have any circles yet. When you create one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.emoji_reacted_statuses": "You don't have any emoji reacted posts yet. When you emoji react one, it will show up here.",
+  "empty_column.emoji_reactions": "No one has reacted with emoji this post yet. When someone does, they will show up here.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favorite posts yet. When you favorite one, it will show up here.",
   "empty_column.favourites": "No one has favorited this post yet. When someone does, they will show up here.",
@@ -243,9 +366,12 @@
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up.",
   "empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mentioned_users": "No one has been mentioned by this post.",
   "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
   "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "empty_column.status_references": "No one has quotes this post yet. When someone does, they will show up here.",
   "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
   "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
   "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
@@ -274,12 +400,30 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",
   "firehose.remote": "Other servers",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "follow_suggestions.curated_suggestion": "Staff pick",
+  "follow_suggestions.dismiss": "Don't show again",
+  "follow_suggestions.featured_longer": "Hand-picked by the {domain} team",
+  "follow_suggestions.friends_of_friends_longer": "Popular among people you follow",
+  "follow_suggestions.hints.featured": "This profile has been hand-picked by the {domain} team.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": "This profile is one of the most followed on {domain}.",
+  "follow_suggestions.hints.most_interactions": "This profile has been recently getting a lot of attention on {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "This profile is similar to the profiles you have most recently followed.",
+  "follow_suggestions.personalized_suggestion": "Personalized suggestion",
+  "follow_suggestions.popular_suggestion": "Popular suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Popular on {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar to profiles you recently followed",
+  "follow_suggestions.view_all": "View all",
+  "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "footer.about": "About",
   "footer.directory": "Profiles directory",
@@ -306,18 +450,14 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "See what's trending",
-  "home.actions.go_to_suggestions": "Find people to follow",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
-  "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:",
-  "home.explore_prompt.title": "This is your home base within Mastodon.",
   "home.hide_announcements": "Hide announcements",
   "home.pending_critical_update.body": "Please update your Mastodon server as soon as possible!",
   "home.pending_critical_update.link": "See updates",
   "home.pending_critical_update.title": "Critical security update available!",
   "home.show_announcements": "Show announcements",
+  "interaction_modal.description.emoji_reaection": "With an account on Mastodon, you can emoji react this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@@ -329,6 +469,7 @@
   "interaction_modal.on_this_server": "On this server",
   "interaction_modal.sign_in": "You are not logged in to this server. Where is your account hosted?",
   "interaction_modal.sign_in_hint": "Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)",
+  "interaction_modal.title.emoji_reaction": "Emoji react {name}'s post",
   "interaction_modal.title.favourite": "Favorite {name}'s post",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Boost {name}'s post",
@@ -344,6 +485,7 @@
   "keyboard_shortcuts.description": "Description",
   "keyboard_shortcuts.direct": "to open private mentions column",
   "keyboard_shortcuts.down": "Move down in the list",
+  "keyboard_shortcuts.emoji_reactions": "to open stamps list",
   "keyboard_shortcuts.enter": "Open post",
   "keyboard_shortcuts.favourite": "Favorite post",
   "keyboard_shortcuts.favourites": "Open favorites list",
@@ -380,35 +522,47 @@
   "link_preview.author": "By {name}",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
+  "lists.antennas": "Related antennas",
   "lists.delete": "Delete list",
   "lists.edit": "Edit list",
   "lists.edit.submit": "Change title",
-  "lists.exclusive": "Hide these posts from home",
+  "lists.exclusive": "Hide list or antenna account posts from home",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
+  "lists.notify": "Notify these posts",
   "lists.replies_policy.followed": "Any followed user",
   "lists.replies_policy.list": "Members of the list",
   "lists.replies_policy.none": "No one",
   "lists.replies_policy.title": "Show replies to:",
   "lists.search": "Search among people you follow",
   "lists.subheading": "Your lists",
+  "lists.with_antenna": "Antenna",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "mute_modal.indefinite": "Indefinite",
+  "mute_modal.hide_from_notifications": "Hide from notifications",
+  "mute_modal.hide_options": "Hide options",
+  "mute_modal.indefinite": "Until I unmute them",
+  "mute_modal.show_options": "Show options",
+  "mute_modal.they_can_mention_and_follow": "They can mention and follow you, but you won't see them.",
+  "mute_modal.they_wont_know": "They won't know they've been muted.",
+  "mute_modal.title": "Mute user?",
+  "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
+  "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
+  "navigation_bar.antennas": "Antenna",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.circles": "Circles",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
+  "navigation_bar.deep_timeline": "Deep timeline",
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.emoji_reactions": "Stamps",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Muted words",
@@ -423,31 +577,56 @@
   "navigation_bar.pins": "Pinned posts",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.reaction_deck": "Reaction deck",
+  "navigation_bar.refresh": "Refresh",
   "navigation_bar.search": "Search",
   "navigation_bar.security": "Security",
   "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.",
   "notification.admin.report": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
+  "notification.emoji_reaction": "{name} reacted your post with emoji",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
+  "notification.list_status": "{name} post is added to {listName}",
   "notification.mention": "{name} mentioned you",
+  "notification.moderation-warning.learn_more": "Learn more",
+  "notification.moderation_warning": "You have received a moderation warning",
+  "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
+  "notification.moderation_warning.action_disable": "Your account has been disabled.",
+  "notification.moderation_warning.action_force_cw": "Some of your posts have been added content-warning text.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Some of your posts have been marked as sensitive.",
+  "notification.moderation_warning.action_none": "Your account has received a moderation warning.",
+  "notification.moderation_warning.action_sensitive": "Your posts will be marked as sensitive from now on.",
+  "notification.moderation_warning.action_silence": "Your account has been limited.",
+  "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} boosted your post",
+  "notification.relationships_severance_event": "Lost connections with {name}",
+  "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Learn more",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} just posted",
+  "notification.status_reference": "{name} quoted your post",
   "notification.update": "{name} edited a post",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.emoji_reaction": "Stamps:",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.list_status": "New posts of list:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
   "notifications.column_settings.push": "Push notifications",
@@ -455,15 +634,18 @@
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
   "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.status_reference": "Quotes:",
   "notifications.column_settings.unread_notifications.category": "Unread notifications",
   "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
   "notifications.column_settings.update": "Edits:",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Boosts",
+  "notifications.filter.emoji_reactions": "Stamps",
   "notifications.filter.favourites": "Favorites",
   "notifications.filter.follows": "Follows",
   "notifications.filter.mentions": "Mentions",
   "notifications.filter.polls": "Poll results",
+  "notifications.filter.status_references": "Quotes",
   "notifications.filter.statuses": "Updates from people you follow",
   "notifications.grant_permission": "Grant permission.",
   "notifications.group": "{count} notifications",
@@ -471,6 +653,15 @@
   "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "New accounts",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "People not following you",
+  "notifications.policy.filter_not_following_hint": "Until you manually approve them",
+  "notifications.policy.filter_not_following_title": "People you don't follow",
+  "notifications.policy.filter_private_mentions_hint": "Filtered unless it's in reply to your own mention or if you follow the sender",
+  "notifications.policy.filter_private_mentions_title": "Unsolicited private mentions",
+  "notifications.policy.title": "Filter out notifications from…",
   "notifications_permission_banner.enable": "Enable desktop notifications",
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
@@ -478,6 +669,7 @@
   "onboarding.actions.back": "Take me back",
   "onboarding.actions.go_to_explore": "Take me to trending",
   "onboarding.actions.go_to_home": "Take me to my home feed",
+  "onboarding.actions.go_to_local_timeline": "See posts from local",
   "onboarding.compose.template": "Hello #Mastodon!",
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
   "onboarding.follows.lead": "Your home feed is the primary way to experience Mastodon. The more people you follow, the more active and interesting it will be. To get you started, here are some suggestions:",
@@ -525,17 +717,34 @@
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
+  "privacy.banned.long": "All public range submissions are disabled. User settings need to be modified.",
+  "privacy.banned.short": "No posting",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers only",
-  "privacy.public.long": "Visible for all",
+  "privacy.circle.long": "Circle members only",
+  "privacy.circle.short": "Circle",
+  "privacy.direct.long": "Everyone mentioned in the post",
+  "privacy.direct.short": "Specific people",
+  "privacy.limited.short": "Limited",
+  "privacy.login.long": "Visible for login users only",
+  "privacy.login.short": "Login only",
+  "privacy.mutual.long": "Mutual followers only",
+  "privacy.mutual.short": "Mutual",
+  "privacy.personal.short": "Yourself only",
+  "privacy.private.long": "Only your followers",
+  "privacy.private.short": "Followers",
+  "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.public_unlisted.long": "Visible for all without GTL",
+  "privacy.public_unlisted.short": "Local public",
+  "privacy.reply.long": "Reply to limited post",
+  "privacy.reply.short": "Reply",
+  "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
+  "reaction_deck.add": "Add",
+  "reaction_deck.remove": "Remove",
   "recommended": "Recommended",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
@@ -551,7 +760,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
@@ -606,6 +817,7 @@
   "search.quick_action.open_url": "Open URL in Mastodon",
   "search.quick_action.status_search": "Posts matching {x}",
   "search.search_or_paste": "Search or paste URL",
+  "search_popout.domain": "domain",
   "search_popout.full_text_search_disabled_message": "Not available on {domain}.",
   "search_popout.full_text_search_logged_out_message": "Only available when logged in.",
   "search_popout.language_code": "ISO language code",
@@ -621,6 +833,17 @@
   "search_results.see_all": "See all",
   "search_results.statuses": "Posts",
   "search_results.title": "Search for {q}",
+  "searchability.change": "Change post searchability",
+  "searchability.direct.long": "Nobody can find, but you can",
+  "searchability.direct.short": "Self only",
+  "searchability.private.long": "Reacter of this post can find",
+  "searchability.private.short": "Reactionners",
+  "searchability.public.long": "Anyone can find",
+  "searchability.public.short": "Everyone",
+  "searchability.public_unlisted.long": "Local users and followers can find",
+  "searchability.public_unlisted.short": "Local and followers",
+  "searchability.unlisted.long": "Your followers and reactionners can find",
+  "searchability.unlisted.short": "Followers and reactionners",
   "server_banner.about_active_users": "People using this server during the last 30 days (Monthly Active Users)",
   "server_banner.active_users": "active users",
   "server_banner.administered_by": "Administered by:",
@@ -636,6 +859,8 @@
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
+  "status.bookmark_category": "Bookmark category",
+  "status.cancel_reblog": "Unboost",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.copy": "Copy link to post",
@@ -644,10 +869,23 @@
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
   "status.edit": "Edit",
-  "status.edited": "Edited {date}",
+  "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
+  "status.emoji_reaction": "Emoji reaction",
+  "status.emoji_reaction.pick": "Pick emoji reaction",
+  "status.emoji_reactions": "{count, plural, one {emoji} other {emojis}}",
+  "status.expiration.12_hours": "Remove 12 hours later",
+  "status.expiration.1_day": "Remove 1 day later",
+  "status.expiration.1_hour": "Remove 1 hour later",
+  "status.expiration.30_minutes": "Remove 30 minutes later",
+  "status.expiration.3_hours": "Remove 3 hours later",
+  "status.expiration.5_minutes": "Remove 5 minutes later",
+  "status.expiration.7_days": "Remove 7 days later",
+  "status.expiration.add": "Set status expired time",
   "status.favourite": "Favorite",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
+  "status.featured_tags.add": "Add your featured tag",
   "status.filter": "Filter this post",
   "status.filtered": "Filtered",
   "status.hide": "Hide post",
@@ -658,18 +896,25 @@
   "status.media.show": "Click to show",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
+  "status.mentions": "Mentioned accounts",
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
+  "status.quote": "Quote",
+  "status.quote_filtered": "This quote is filtered because of muting, blocking or domain blocking",
+  "status.quotes": "{count, plural, one {quote} other {quotes}}",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
+  "status.reblog_with_detail": "Boost with visibility",
   "status.reblogged_by": "{name} boosted",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
+  "status.reference": "Quiet quote",
   "status.remove_bookmark": "Remove bookmark",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
@@ -715,10 +960,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 643329ba99..6e7885f485 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
-  "autosuggest_hashtag.per_week": "po {count} por semajno",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -116,7 +115,7 @@
   "column.directory": "Foliumi la profilojn",
   "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
-  "column.firehose": "Vivantaj fluoj",
+  "column.firehose": "Rektaj fluoj",
   "column.follow_requests": "Petoj de sekvado",
   "column.home": "Hejmo",
   "column.lists": "Listoj",
@@ -146,26 +145,14 @@
   "compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn afiŝojn nur al la sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
-  "compose_form.poll.add_option": "Aldoni elekteblon",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
-  "compose_form.poll.option_placeholder": "Elekteblo {number}",
-  "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
-  "compose_form.publish": "Afiŝi",
   "compose_form.publish_form": "Afiŝi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Konservi ŝanĝojn",
-  "compose_form.sensitive.hide": "{count, plural, one {Marki la plurmedio kiel tikla} other {Marki la plurmedioj kiel tiklaj}}",
-  "compose_form.sensitive.marked": "{count, plural, one {La plurmedio estas markita kiel tikla} other {La plurmedioj estas markitaj kiel tiklaj}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {La plurmedio ne estas markita kiel tikla} other {La plurmedioj ne estas markitaj kiel tiklaj}}",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
-  "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
   "confirmation_modal.cancel": "Nuligi",
-  "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
-  "confirmations.block.message": "Ĉu vi certas, ke vi volas bloki {name}?",
   "confirmations.cancel_follow_request.confirm": "Eksigi peton",
   "confirmations.cancel_follow_request.message": "Ĉu vi certas ke vi volas eksigi vian peton por sekvi {name}?",
   "confirmations.delete.confirm": "Forigi",
@@ -174,15 +161,12 @@
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
-  "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.logout.confirm": "Adiaŭi",
   "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
   "confirmations.mute.confirm": "Silentigi",
-  "confirmations.mute.explanation": "Tio kaŝos la mesaĝojn de la uzanto kaj la mesaĝojn kiuj mencias rin, sed ri ankoraŭ rajtos vidi viajn mesaĝojn kaj sekvi vin.",
-  "confirmations.mute.message": "Ĉu vi certas, ke vi volas silentigi {name}?",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
   "confirmations.reply.confirm": "Respondi",
@@ -306,13 +290,8 @@
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
-  "home.actions.go_to_explore": "Vidi kio populariĝas",
-  "home.actions.go_to_suggestions": "Trovi homojn por sekvi",
-  "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
-  "home.explore_prompt.body": "Via hejmafiŝaro havos miksitajn afiŝojn de kradvortoj kiujn vi elektis sekvi, personoj kiujn vi elektis sekvi, kaj afiŝoj kiujn ili suprenigis.",
-  "home.explore_prompt.title": "Ĉi tio estas via hejma paĝo en Mastodon.",
   "home.hide_announcements": "Kaŝi la anoncojn",
   "home.pending_critical_update.body": "Ĝisdatigu vian servilon de Mastodon kiel eble plej baldau!",
   "home.pending_critical_update.link": "Vidi ĝisdatigojn",
@@ -396,9 +375,6 @@
   "loading_indicator.label": "Ŝargado…",
   "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
-  "mute_modal.duration": "Daŭro",
-  "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
-  "mute_modal.indefinite": "Nedifinita",
   "navigation_bar.about": "Pri",
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
   "navigation_bar.blocks": "Blokitaj uzantoj",
@@ -408,7 +384,6 @@
   "navigation_bar.direct": "Privataj mencioj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
@@ -443,9 +418,6 @@
   "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
   "notifications.column_settings.alert": "Sciigoj de la retumilo",
   "notifications.column_settings.favourite": "Stelumoj:",
-  "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
-  "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
-  "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
   "notifications.column_settings.mention": "Mencioj:",
@@ -526,14 +498,7 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
-  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Nur menciitaj personoj",
-  "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur abonantoj",
-  "privacy.public.long": "Videbla por ĉiuj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
-  "privacy.unlisted.short": "Nelistigita",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
@@ -644,7 +609,6 @@
   "status.direct": "Private mencii @{name}",
   "status.direct_indicator": "Privata mencio",
   "status.edit": "Redakti",
-  "status.edited": "Redaktita {date}",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
@@ -715,10 +679,8 @@
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
   "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
   "upload_form.description": "Priskribi por personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
-  "upload_form.description_missing": "Neniu priskribo aldonita",
   "upload_form.edit": "Redakti",
   "upload_form.thumbnail": "Ŝanĝi etigita bildo",
-  "upload_form.undo": "Forigi",
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
   "upload_modal.analyzing_picture": "Bilda analizado…",
   "upload_modal.apply": "Apliki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7c2e4f0d49..2d42b3e949 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿Qué onda?",
-  "compose_form.poll.add_option": "Agregá una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
+  "compose_form.poll.multiple": "Múltiples opciones",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elegí una",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Enviar",
   "compose_form.publish_form": "Nuevo mensaje",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro que querés bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro que querés retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "¿Estás seguro que querés eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tenés cambios sin guardar en la descripción de medios o en la vista previa, ¿querés descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Estás completamente seguro que querés bloquear el {domain} entero? En la mayoría de los casos, unos cuantos bloqueos y silenciados puntuales son suficientes y preferibles. No vas a ver contenido de ese dominio en ninguna de tus líneas temporales o en tus notificaciones. Tus seguidores de ese dominio serán quitados.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar ahora sobreescribirá el mensaje que estás redactando actualmente. ¿Estás seguro que querés seguir?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro que querés cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Se ocultarán los mensajes de esta cuenta y los mensajes de otras cuentas que mencionen a ésta, pero todavía esta cuenta podrá ver tus mensajes o seguirte.",
-  "confirmations.mute.message": "¿Estás seguro que querés silenciar a {name}?",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
   "confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estos son los mensajes que están ganando popularidad en la web social, hoy mismo. Los mensajes más recientes con más adhesiones y marcados como favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son etiquetas que están ganando popularidad en la web social, hoy mismo. Las etiquetas que son usadas por diferentes cuentas obtienen más exposición.",
   "dismissable_banner.public_timeline": "Estos son los mensajes públicos más recientes de cuentas en la web social que las personas en {domain} siguen.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las cuentas de este servidor pueden interactuar con tus mensajes antiguos.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
   "embed.preview": "Así es cómo se verá:",
   "emoji_button.activity": "Actividad",
@@ -219,7 +241,7 @@
   "emoji_button.nature": "Naturaleza",
   "emoji_button.not_found": "No se encontraron emojis coincidentes",
   "emoji_button.objects": "Objetos",
-  "emoji_button.people": "Gente",
+  "emoji_button.people": "Cuentas",
   "emoji_button.recent": "Usados frecuentemente",
   "emoji_button.search": "Buscar...",
   "emoji_button.search_results": "Resultados de búsqueda",
@@ -244,6 +266,7 @@
   "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
   "empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada acá. Cuando recibás nuevas notificaciones, aparecerán acá, acorde a tu configuración.",
   "empty_column.notifications": "Todavía no tenés ninguna notificación. Cuando otras cuentas interactúen con vos, vas a ver la notificación acá.",
   "empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador web, esta página no se pudo mostrar correctamente.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "firehose.all": "Todas",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
+  "firehose.all": "Todos",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el equipo de {domain} pensó que podrías querer revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Selección del equipo",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Seleccionada a mano por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las cuentas que seguís",
+  "follow_suggestions.hints.featured": "Este perfil fue seleccionado a mano por el equipo de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las cuentas que seguís.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los que comenzaste a seguir.",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a perfiles que comenzaste a seguir recientemente",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
   "footer.about": "Información",
   "footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver qué está en tendencia",
-  "home.actions.go_to_suggestions": "Encontrar cuentas para seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu línea temporal principal tendrá una mezcla de mensajes de etiquetas que hayás decidido seguir, cuentas que hayás seguido y mensajes a los que éstas adhieran. Si está muy tranquilo por acá, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu inicio en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "Por favor, ¡actualizá tu servidor de Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar en las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que fueron silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} solicitó seguirte",
   "notification.mention": "{name} te mencionó",
+  "notification.moderation-warning.learn_more": "Aprendé más",
+  "notification.moderation_warning": "Recibiste una advertencia de moderación",
+  "notification.moderation_warning.action_delete_statuses": "Se eliminaron algunos de tus mensajes.",
+  "notification.moderation_warning.action_disable": "Se deshabilitó tu cuenta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se marcaron como sensibles a algunos de tus mensajes.",
+  "notification.moderation_warning.action_none": "Tu cuenta recibió una advertencia de moderación.",
+  "notification.moderation_warning.action_sensitive": "A partir de ahora, tus mensajes serán marcados como sensibles.",
+  "notification.moderation_warning.action_silence": "Tu cuenta fue limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} bloqueó a {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
+  "notification.relationships_severance_event.learn_more": "Aprendé más",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueaste a {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
   "notification.status": "{name} acaba de enviar un mensaje",
   "notification.update": "{name} editó un mensaje",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Estás seguro que querés limpiar todas tus notificaciones permanentemente?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles, debido a una solicitud de permiso del navegador web previamente denegada",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado antes",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se concedió el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creada hace {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_new_accounts_title": "Nuevas cuentas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo cuentas que te han estado siguiendo menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Cuentas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las aprobés manualmente",
+  "notifications.policy.filter_not_following_title": "Cuentas que no seguís",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas, a menos que sea en respuesta a tu propia mención o si seguís al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
-  "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Visible sólo para los seguidores",
-  "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje",
+  "privacy.direct.short": "Cuentas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje \"Público\", excepto que el mensaje no aparecerá en los líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal \"Explorá\", ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
+  "privacy.unlisted.long": "Menos fanfarrias algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural,one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No verás sus mensajes. No podrán ver tus mensajes ni seguirte. Se van a dar cuentra de que están bloqueados.",
   "report.categories.legal": "Legales",
@@ -644,15 +714,16 @@
   "status.direct": "Mención privada a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
+  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar mensaje",
-  "status.history.created": "Creado por {name} el {date}",
-  "status.history.edited": "Editado por {name} el {date}",
+  "status.history.created": "Creado por {name}, {date}",
+  "status.history.edited": "Editado por {name}, {date}",
   "status.load_more": "Cargar más",
   "status.media.open": "Clic para abrir",
   "status.media.show": "Clic para mostrar",
@@ -668,6 +739,7 @@
   "status.reblog": "Adherir",
   "status.reblog_private": "Adherir a la audiencia original",
   "status.reblogged_by": "{name} adhirió",
+  "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",
@@ -715,10 +787,8 @@
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
   "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
-  "upload_form.description_missing": "No se agregó descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fab5f6ec96..1a99d1d4b4 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.single": "Seleccione uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicación",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar multimedia como sensible",
-  "compose_form.sensitive.marked": "Material marcado como sensible",
-  "compose_form.sensitive.unmarked": "Material no marcado como sensible",
+  "compose_form.reply": "Respuesta",
+  "compose_form.save_changes": "Actualización",
   "compose_form.spoiler.marked": "Texto oculto tras la advertencia",
   "compose_form.spoiler.unmarked": "Texto no oculto",
-  "compose_form.spoiler_placeholder": "Advertencia de contenido",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
-  "confirmations.domain_block.confirm": "Ocultar dominio entero",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
   "confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están en tendencia en la red ahora. Las publicaciones recientes con más impulsos y favoritos se muestran más arriba.",
   "dismissable_banner.explore_tags": "Se trata de hashtags que están ganando adeptos en las redes sociales hoy en día. Los hashtags que son utilizados por más personas diferentes se clasifican mejor.",
   "dismissable_banner.public_timeline": "Estos son los toots públicos más recientes de personas en la web social a las que sigue la gente en {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Todos tus seguidores de este servidor serán eliminados.",
+  "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade este toot a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -244,6 +266,7 @@
   "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
   "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
+  "follow_suggestions.hints.featured": "Este perfil ha sido seleccionado a mano por el equipo de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "Recomendamos seguir",
   "followed_tags": "Hashtags seguidos",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver tendencias",
-  "home.actions.go_to_suggestions": "Encuentra gente a la que seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de los hashtags que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "¡Por favor actualiza tu servidor Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{name} te ha mencionado",
+  "notification.moderation-warning.learn_more": "Saber más",
+  "notification.moderation_warning": "Has recibido una advertencia de moderación",
+  "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
+  "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+  "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+  "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+  "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Más información",
+  "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtrada, a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo personas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.long": "Todos los mencionados en la publicación",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Sólo tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en los hashtags, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.long": "Menos fanfares algorítmicos",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
@@ -644,10 +714,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar toot",
@@ -668,6 +739,7 @@
   "status.reblog": "Retootear",
   "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Subida de archivos no permitida con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.description_missing": "Sin descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 0d6149f5f5..1782a3a1fe 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar más",
+  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
+  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "¿Estás seguro de que quieres bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitud",
   "confirmations.cancel_follow_request.message": "¿Estás seguro de que deseas retirar tu solicitud para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -174,21 +177,19 @@
   "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo audiovisual, ¿descartarlos de todos modos?",
-  "confirmations.domain_block.confirm": "Bloquear dominio entero",
-  "confirmations.domain_block.message": "¿Seguro de que quieres bloquear al dominio {domain} entero? En general unos cuantos bloqueos y silenciados concretos es suficiente y preferible.",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
+  "confirmations.domain_block.message": "¿Seguro que quieres bloquear todo el dominio {domain}? En general, unos cuantos bloqueos y silenciados concretos es suficiente y preferible. No verás contenido del dominio en ninguna cronología pública ni en tus notificaciones. Se eliminarán tus seguidores procedentes de ese dominio.",
   "confirmations.edit.confirm": "Editar",
-  "confirmations.edit.message": "Editar ahora reemplazará el mensaje que está escribiendo. ¿Está seguro que quiere proceder?",
+  "confirmations.edit.message": "Editar ahora reemplazará el mensaje que estás escribiendo. ¿Seguro que quieres proceder?",
   "confirmations.logout.confirm": "Cerrar sesión",
-  "confirmations.logout.message": "¿Estás seguro de querer cerrar la sesión?",
+  "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Esto esconderá las publicaciones de ellos y en las que los has mencionado, pero les permitirá ver tus mensajes y seguirte.",
-  "confirmations.mute.message": "¿Estás seguro de que quieres silenciar a {name}?",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Seguro que deseas continuar?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
+  "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -197,7 +198,7 @@
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
-  "directory.local": "Sólo de {domain}",
+  "directory.local": "Solo de {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
   "disabled_account_banner.account_settings": "Ajustes de la cuenta",
@@ -208,16 +209,37 @@
   "dismissable_banner.explore_statuses": "Estas son las publicaciones que están ganando popularidad en la web social hoy. Las publicaciones recientes con más impulsos y favoritos obtienen más exposición.",
   "dismissable_banner.explore_tags": "Estas son las etiquetas que están ganando popularidad hoy en la red. Etiquetas que se usan por personas diferentes se puntúan más alto.",
   "dismissable_banner.public_timeline": "Estas son las publicaciones más recientes de personas en el Fediverso que siguen las personas de {domain}.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} en su lugar",
+  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
+  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
+  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
+  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Se eliminarán todos tus seguidores de este servidor.",
+  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
+  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
+  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "domain_pill.username": "Nombre de usuario",
+  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
+  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu alias:",
+  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
+  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
   "emoji_button.clear": "Limpiar",
   "emoji_button.custom": "Personalizado",
-  "emoji_button.flags": "Marcas",
+  "emoji_button.flags": "Banderas",
   "emoji_button.food": "Comida y bebida",
   "emoji_button.label": "Insertar emoji",
   "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "No hay emojis!! ¯\\_(ツ)_/¯",
+  "emoji_button.not_found": "No se encontró ningún emoji coincidente",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Personas",
   "emoji_button.recent": "Usados frecuentemente",
@@ -233,18 +255,19 @@
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes menciones privadas. Cuando envíes o recibas una, aparecerán aquí.",
-  "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
-  "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
+  "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
+  "empty_column.explore_statuses": "No hay nada en tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Todavía no tienes publicaciones favoritas. Cuando marques una publicación como favorita, se mostrarán aquí.",
   "empty_column.favourites": "Todavía nadie marcó esta publicación como favorita. Cuando alguien lo haga, se mostrarán aquí.",
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
   "empty_column.followed_tags": "No has seguido ninguna etiqueta todavía. Cuando lo hagas, se mostrarán aquí.",
   "empty_column.hashtag": "No hay nada en este hashtag aún.",
   "empty_column.home": "¡Tu línea temporal está vacía! Sigue a más personas para rellenarla.",
-  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
-  "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
+  "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos estados, estos aparecerán aquí.",
+  "empty_column.lists": "No tienes ninguna lista. Cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
-  "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
+  "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
+  "empty_column.notifications": "Aún no tienes ninguna notificación. Cuando otras personas interactúen contigo, aparecerán aquí.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
   "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
@@ -260,7 +283,7 @@
   "explore.trending_tags": "Etiquetas",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
-  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, necesitará cambiar la fecha de caducidad para que se aplique.",
+  "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
   "filter_modal.added.expired_title": "¡Filtro caducado!",
   "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {menciones}}",
+  "filtered_notifications_banner.pending_requests": "Notificaciones de {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
+  "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Otros servidores",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
+  "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
+  "follow_suggestions.dismiss": "No mostrar de nuevo",
+  "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
+  "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
+  "follow_suggestions.hints.most_followed": "Este perfil es uno de los más seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil ha estado recibiendo recientemente mucha atención en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil es similar a los perfiles que has seguido recientemente.",
+  "follow_suggestions.personalized_suggestion": "Sugerencia personalizada",
+  "follow_suggestions.popular_suggestion": "Sugerencia popular",
+  "follow_suggestions.popular_suggestion_longer": "Populares en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similares a los perfiles que has seguido recientemente",
+  "follow_suggestions.view_all": "Ver todo",
+  "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
   "footer.about": "Acerca de",
   "footer.directory": "Directorio de perfiles",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
-  "home.actions.go_to_explore": "Ver tendencias",
-  "home.actions.go_to_suggestions": "Encuentra personas a las que seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.explore_prompt.body": "Tu cronología de inicio tendrá una mezcla de publicaciones de las etiquetas que has escogido seguir, las personas que has decidido seguir y las publicaciones que impulsen. Si crees que está demasiado tranquila, quizás quieras:",
-  "home.explore_prompt.title": "Este es tu punto de partida en Mastodon.",
   "home.hide_announcements": "Ocultar anuncios",
   "home.pending_critical_update.body": "Por favor, ¡actualiza tu servidor Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Cargando…",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "¿Ocultar notificaciones de este usuario?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
+  "mute_modal.hide_options": "Ocultar opciones",
+  "mute_modal.indefinite": "Hasta que deje de silenciarlos",
+  "mute_modal.show_options": "Mostrar opciones",
+  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
+  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
+  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.mention": "{name} te ha mencionado",
+  "notification.moderation-warning.learn_more": "Saber más",
+  "notification.moderation_warning": "Has recibido una advertencia de moderación",
+  "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
+  "notification.moderation_warning.action_disable": "Tu cuenta ha sido desactivada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Se han marcado como sensibles algunas de tus publicaciones.",
+  "notification.moderation_warning.action_none": "Tu cuenta ha recibido un aviso de moderación.",
+  "notification.moderation_warning.action_sensitive": "De ahora en adelante, todas tus publicaciones se marcarán como sensibles.",
+  "notification.moderation_warning.action_silence": "Tu cuenta ha sido limitada.",
+  "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
+  "notification.relationships_severance_event": "Conexiones perdidas con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
+  "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Más información",
+  "notification.relationships_severance_event.user_domain_block": "Has bloqueado {target}, eliminando {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
   "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} editó una publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificaciones de {name}",
+  "notification_requests.title": "Notificaciones filtradas",
   "notifications.clear": "Limpiar notificaciones",
   "notifications.clear_confirmation": "¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.admin.report": "Nuevos informes:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
   "notifications.column_settings.mention": "Menciones:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas durante {days, plural, one {el último día} other {los últimos # días}}",
+  "notifications.policy.filter_new_accounts_title": "Cuentas nuevas",
+  "notifications.policy.filter_not_followers_hint": "Incluyendo personas que te han estado siguiendo desde hace menos de {days, plural, one {un día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Personas que no te siguen",
+  "notifications.policy.filter_not_following_hint": "Hasta que las apruebes manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que no sigues",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a menos que sea en respuesta a tu propia mención, o si sigues al remitente",
+  "notifications.policy.filter_private_mentions_title": "Menciones privadas no solicitadas",
+  "notifications.policy.title": "Filtrar notificaciones de…",
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Visible solo para usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
-  "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.direct.long": "Visible únicamente por los mencionados en la publicación",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Visible únicamente por tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Visible por todo el mundo, dentro y fuera de Mastodon",
+  "privacy.public.short": "Pública",
+  "privacy.unlisted.additional": "Se comporta exactamente igual que la visibilidad pública, excepto que la publicación no aparecerá en las cronologías públicas o en las etiquetas, la sección de Explorar o la búsqueda de Mastodon, incluso si has habilitado la opción de búsqueda en tu perfil.",
+  "privacy.unlisted.long": "Sin algoritmos de descubrimiento",
+  "privacy.unlisted.short": "Pública silenciosa",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No verás sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
@@ -585,7 +655,7 @@
   "report.statuses.subtitle": "Selecciona todos los que correspondan",
   "report.statuses.title": "¿Hay alguna publicación que respalde este informe?",
   "report.submit": "Enviar",
-  "report.target": "Reportando",
+  "report.target": "Reportando {target}",
   "report.thanks.take_action": "Aquí están tus opciones para controlar lo que ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mientras revisamos esto, puedes tomar medidas contra @{name}:",
   "report.thanks.title": "¿No quieres esto?",
@@ -644,10 +714,11 @@
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicación",
@@ -668,6 +739,7 @@
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar a la audiencia original",
   "status.reblogged_by": "Impulsado por {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +787,8 @@
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para personas con discapacidad visual",
-  "upload_form.description_missing": "No se ha añadido ninguna descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 26657d402e..b2759d66c6 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -21,7 +21,7 @@
   "account.blocked": "Blokeeritud",
   "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
   "account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
-  "account.copy": "Kopeeri link profiili",
+  "account.copy": "Kopeeri profiili link",
   "account.direct": "Maini privaatselt @{name}",
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
   "account.domain_blocked": "Domeen peidetud",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
-  "autosuggest_hashtag.per_week": "{count} nädalas",
+  "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
+  "block_modal.show_less": "Kuva vähem",
+  "block_modal.show_more": "Kuva rohkem",
+  "block_modal.they_cant_mention": "Ta ei saa mainida sind ega jälgida.",
+  "block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.",
+  "block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.",
+  "block_modal.title": "Blokeeri kasutaja?",
+  "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
   "compose_form.placeholder": "Millest mõtled?",
-  "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
+  "compose_form.poll.multiple": "Valikvastustega",
   "compose_form.poll.option_placeholder": "Valik {number}",
-  "compose_form.poll.remove_option": "Eemalda see valik",
+  "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+  "compose_form.poll.type": "Stiil",
   "compose_form.publish": "Postita",
   "compose_form.publish_form": "Postita",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvesta muudatused",
-  "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+  "compose_form.reply": "Vasta",
+  "compose_form.save_changes": "Uuenda",
   "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
-  "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
+  "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
-  "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
-  "confirmations.block.message": "Oled kindel, et soovid blokeerida {name}?",
   "confirmations.cancel_follow_request.confirm": "Tühista taotlus",
   "confirmations.cancel_follow_request.message": "Oled kindel, et soovid kasutaja {name} jälgimistaotluse tagasi võtta?",
   "confirmations.delete.confirm": "Kustuta",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Oled kindel, et soovid selle loetelu pöördumatult kustutada?",
   "confirmations.discard_edit_media.confirm": "Hülga",
   "confirmations.discard_edit_media.message": "Sul on salvestamata muudatusi meediakirjelduses või eelvaates, kas hülgad need?",
-  "confirmations.domain_block.confirm": "Peida terve domeen",
+  "confirmations.domain_block.confirm": "Blokeeri server",
   "confirmations.domain_block.message": "Oled ikka päris-päris kindel, et soovid blokeerida terve {domain}? Enamikel juhtudel piisab mõnest sihitud blokist või vaigistusest, mis on eelistatavam. Sa ei näe selle domeeni sisu ühelgi avalikul ajajoonel või enda teadetes. Su jälgijad sellest domeenist eemaldatakse.",
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.mute.confirm": "Vaigista",
-  "confirmations.mute.explanation": "See peidab tema postitused ning postitused, milles teda mainitakse, kuid lubab tal ikkagi sinu postitusi näha ning sind jälgida.",
-  "confirmations.mute.message": "Oled kindel, et soovid {name} vaigistada?",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.reply.confirm": "Vasta",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Need postitused üle sotsiaalse võrgu koguvad praegu tähelepanu. Uued postitused, millel on rohkem jagamisi ja lemmikuks märkimisi, on kõrgemal kohal.",
   "dismissable_banner.explore_tags": "Need sildid siit ja teistes serveritest detsentraliseeritud võrgus koguvad tähelepanu just praegu selles serveris.",
   "dismissable_banner.public_timeline": "Need on kõige uuemad avalikud postitused inimestelt sotsiaalvõrgustikus, mida {domain} inimesed jälgivad.",
+  "domain_block_modal.block": "Blokeeri server",
+  "domain_block_modal.block_account_instead": "Selle asemel blokeeri @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad interakteeruda sinu vanade postitustega.",
+  "domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
+  "domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
+  "domain_block_modal.title": "Blokeerida domeen?",
+  "domain_block_modal.you_will_lose_followers": "Kõik sinu sellest serverist pärit jälgijad eemaldatakse.",
+  "domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
+  "domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
+  "domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Tema tunnus:",
+  "domain_pill.their_server": "Tema digitaalne kodu, kus kõik tema postitused on.",
+  "domain_pill.their_username": "Tema unikaalne tunnus tema serveris. On võimalik, et mingites teistes serverites on sama kasutajanimega kasutajaid.",
+  "domain_pill.username": "Kasutajanimi",
+  "domain_pill.whats_in_a_handle": "Mis on tunnuses?",
+  "domain_pill.who_they_are": "Kuna tunnus ütleb, kes keegi on ja kus, saad suhelda inimestega üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
+  "domain_pill.who_you_are": "Kuna tunnus ütleb, kes sa oled ja kus, saavad inimesed sinuga suhelda üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
+  "domain_pill.your_handle": "Sinu tunnus:",
+  "domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
+  "domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
   "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
@@ -244,6 +266,7 @@
   "empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
   "empty_column.lists": "Pole veel ühtegi nimekirja. Kui lood mõne, näed neid siin.",
   "empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
+  "empty_column.notification_requests": "Kõik tühi! Siin pole mitte midagi. Kui saad uusi teavitusi, ilmuvad need siin vastavalt sinu seadistustele.",
   "empty_column.notifications": "Ei ole veel teateid. Kui keegi suhtleb sinuga, näed seda siin.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikku või jälgi ise kasutajaid täitmaks seda ruumi",
   "error.unexpected_crash.explanation": "Meie poolse probleemi või veebilehitseja ühilduvusprobleemi tõttu ei suutnud me seda lehekülge korrektselt näidata.",
@@ -274,12 +297,25 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
+  "filtered_notifications_banner.pending_requests": "Teateid {count, plural, =0 {mitte üheltki} one {ühelt} other {#}} inimeselt, keda võid teada",
+  "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
   "firehose.local": "See server",
   "firehose.remote": "Teised serverid",
   "follow_request.authorize": "Autoriseeri",
   "follow_request.reject": "Hülga",
   "follow_requests.unlocked_explanation": "Kuigi su konto pole lukustatud, soovitab {domain} personal siiski nende kontode jälgimistaotlused käsitsi üle vaadata.",
+  "follow_suggestions.curated_suggestion": "Teiste valitud",
+  "follow_suggestions.dismiss": "Ära enam näita",
+  "follow_suggestions.hints.featured": "Selle kasutajaprofiili on soovitanud {domain} kasutajad.",
+  "follow_suggestions.hints.friends_of_friends": "See kasutajaprofiil on jälgitavate seas populaarne.",
+  "follow_suggestions.hints.most_followed": "See on {domain} enim jälgitud kasutajaprofiil.",
+  "follow_suggestions.hints.most_interactions": "See on {domain} viimasel ajal enim tähelepanu saanud kasutajaprofiil.",
+  "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
+  "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
+  "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
+  "follow_suggestions.view_all": "Vaata kõiki",
+  "follow_suggestions.who_to_follow": "Keda jälgida",
   "followed_tags": "Jälgitavad märksõnad",
   "footer.about": "Teave",
   "footer.directory": "Profiilikataloog",
@@ -306,13 +342,8 @@
   "hashtag.follow": "Jälgi silti",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
-  "home.actions.go_to_explore": "Vaata, mis on populaarne",
-  "home.actions.go_to_suggestions": "Leia inimesi, keda jälgida",
-  "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
-  "home.explore_prompt.body": "Sinu koduvoos on koos jälgimiseks valitud siltidega postitused, sinu jälgitavate inimeste postitused ja postitused, mida nad jagavad. Kui see tundub liiga vaikne, võid sa soovida:",
-  "home.explore_prompt.title": "See on sinu kodubaas Mastodonis.",
   "home.hide_announcements": "Peida teadaanded",
   "home.pending_critical_update.body": "Palun uuenda oma Mastodoni server nii ruttu kui võimalik!",
   "home.pending_critical_update.link": "Vaata uuendusi",
@@ -396,9 +427,15 @@
   "loading_indicator.label": "Laadimine…",
   "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
-  "mute_modal.duration": "Kestus",
-  "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
-  "mute_modal.indefinite": "Lõpmatu",
+  "mute_modal.hide_from_notifications": "Peida teavituste hulgast",
+  "mute_modal.hide_options": "Peida valikud",
+  "mute_modal.indefinite": "Kuni eemaldan neilt vaigistuse",
+  "mute_modal.show_options": "Kuva valikud",
+  "mute_modal.they_can_mention_and_follow": "Ta saab sind mainida ja sind jälgida, kuid sa ei näe teda.",
+  "mute_modal.they_wont_know": "Ta ei tea, et ta on vaigistatud.",
+  "mute_modal.title": "Vaigistada kasutaja?",
+  "mute_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis teda mainivad.",
+  "mute_modal.you_wont_see_posts": "Ta näeb jätkuvalt sinu postitusi, kuid sa ei näe tema omi.",
   "navigation_bar.about": "Teave",
   "navigation_bar.advanced_interface": "Ava kohandatud veebiliides",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
@@ -408,7 +445,6 @@
   "navigation_bar.direct": "Privaatsed mainimised",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.edit_profile": "Muuda profiili",
   "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
@@ -435,17 +471,25 @@
   "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Küsitlus, milles osalesid, on lõppenud",
   "notification.reblog": "{name} jagas edasi postitust",
+  "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
+  "notification.relationships_severance_event.account_suspension": "{from} admin on kustutanud {target}, mis tähendab, et sa ei saa enam neilt uuendusi või suhelda nendega.",
+  "notification.relationships_severance_event.domain_block": "{from} admin on blokeerinud {target}, sealhulgas {followersCount} sinu jälgijat ja {followingCount, plural, one  {# konto} other {# kontot}}, mida jälgid.",
+  "notification.relationships_severance_event.learn_more": "Saa rohkem teada",
+  "notification.relationships_severance_event.user_domain_block": "Blokeerisid {target}, eemaldades oma jälgijate hulgast {followersCount} ja jälgitavate hulgast {followingCount, plural, one {# konto} other {# kontot}}.",
   "notification.status": "{name} just postitas",
   "notification.update": "{name} muutis postitust",
+  "notification_requests.accept": "Nõus",
+  "notification_requests.dismiss": "Hülga",
+  "notification_requests.notifications_from": "Teavitus kasutajalt {name}",
+  "notification_requests.title": "Filtreeritud teavitused",
   "notifications.clear": "Puhasta teated",
   "notifications.clear_confirmation": "Oled kindel, et soovid püsivalt kõik oma teated eemaldada?",
   "notifications.column_settings.admin.report": "Uued teavitused:",
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
   "notifications.column_settings.favourite": "Lemmikud:",
-  "notifications.column_settings.filter_bar.advanced": "Kuva kõik kategooriad",
+  "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
-  "notifications.column_settings.filter_bar.show_bar": "Näita filtririba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
   "notifications.column_settings.mention": "Mainimised:",
@@ -471,6 +515,15 @@
   "notifications.permission_denied": "Töölauamärguanded pole saadaval, kuna eelnevalt keelduti lehitsejale teavituste luba andmast",
   "notifications.permission_denied_alert": "Töölaua märguandeid ei saa lubada, kuna brauseri luba on varem keeldutud",
   "notifications.permission_required": "Töölaua märguanded ei ole saadaval, kuna vajalik luba pole antud.",
+  "notifications.policy.filter_new_accounts.hint": "Loodud viimase {days, plural, one {ühe päeva} other {# päeva}} jooksul",
+  "notifications.policy.filter_new_accounts_title": "Uued kontod",
+  "notifications.policy.filter_not_followers_hint": "Kaasates kasutajad, kes on sind jälginud vähem kui {days, plural, one {ühe päeva} other {# päeva}}",
+  "notifications.policy.filter_not_followers_title": "Sind mittejälgivad kasutajad",
+  "notifications.policy.filter_not_following_hint": "Kuni sa nad käsitsi kinnitad",
+  "notifications.policy.filter_not_following_title": "Inimesed, keda sa ei jälgi",
+  "notifications.policy.filter_private_mentions_hint": "Filtreeritud, kui see pole vastus sinupoolt mainimisele või kui jälgid saatjat",
+  "notifications.policy.filter_private_mentions_title": "Soovimatud privaatsed mainimised",
+  "notifications.policy.title": "Filtreeri välja teavitused kohast…",
   "notifications_permission_banner.enable": "Luba töölaua märguanded",
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
@@ -481,7 +534,7 @@
   "onboarding.compose.template": "Tere, #Mastodon!",
   "onboarding.follows.empty": "Kahjuks ei saa hetkel tulemusi näidata. Proovi kasutada otsingut või lehitse uurimise lehte, et leida inimesi, keda jälgida, või proovi hiljem uuesti.",
   "onboarding.follows.lead": "Haldad ise oma koduvoogu. Mida rohkemaid inimesi jälgid, seda aktiivsem ja huvitavam see on. Need profiilid võiksid olla head alustamiskohad — saad nende jälgimise alati lõpetada!",
-  "onboarding.follows.title": "Populaarne Mastodonis",
+  "onboarding.follows.title": "Isikupärasta oma koduvoogu",
   "onboarding.profile.discoverable": "Muuda mu profiil avastatavaks",
   "onboarding.profile.discoverable_hint": "Kui nõustud enda avastamisega Mastodonis, võivad sinu postitused ilmuda otsingutulemustes ja trendides ning sinu profiili võidakse soovitada sinuga sarnaste huvidega inimestele.",
   "onboarding.profile.display_name": "Näidatav nimi",
@@ -501,11 +554,11 @@
   "onboarding.start.skip": "Soovid kohe edasi hüpata?",
   "onboarding.start.title": "Said valmis!",
   "onboarding.steps.follow_people.body": "Haldad oma koduvoogu. Täida see huvitavate inimestega.",
-  "onboarding.steps.follow_people.title": "Jälgi {count, plural, one {üht inimest} other {# inimest}}",
+  "onboarding.steps.follow_people.title": "Isikupärasta oma koduvoogu",
   "onboarding.steps.publish_status.body": "Ütle maailmale tere.",
   "onboarding.steps.publish_status.title": "Tee oma esimene postitus",
   "onboarding.steps.setup_profile.body": "Täidetud profiili korral suhtlevad teised sinuga tõenäolisemalt.",
-  "onboarding.steps.setup_profile.title": "Kohanda oma profiili",
+  "onboarding.steps.setup_profile.title": "Isikupärasta oma profiili",
   "onboarding.steps.share_profile.body": "Anna sõpradele teada, kuidas sind Mastodonist leida!",
   "onboarding.steps.share_profile.title": "Jaga oma profiili",
   "onboarding.tips.2fa": "<strong>Kas sa teadsid?</strong> Saad oma kontot muuta turvalisemaks valides konto seadetes kaheastmelise autoriseerimise. See töötab mistahes sinu valitud TOTP-äpiga, telefoninumbrit pole vaja!",
@@ -526,14 +579,15 @@
   "poll_button.add_poll": "Lisa küsitlus",
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda postituse nähtavust",
-  "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Mainitud inimesed ainult",
-  "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Jälgijad ainult",
-  "privacy.public.long": "Kõigile nähtav",
+  "privacy.direct.long": "Kõik postituses mainitud",
+  "privacy.direct.short": "Määratud kasutajad",
+  "privacy.private.long": "Ainult jälgijad",
+  "privacy.private.short": "Jälgijad",
+  "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Kõigile nähtav, aga ei ilmu avastamise vaadetes",
-  "privacy.unlisted.short": "Määramata",
+  "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega märksõnades, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
+  "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+  "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
@@ -551,7 +605,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
+  "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
   "reply_indicator.cancel": "Tühista",
+  "reply_indicator.poll": "Küsitlus",
   "report.block": "Blokeeri",
   "report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
   "report.categories.legal": "Juriidiline",
@@ -644,10 +700,11 @@
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
   "status.edit": "Muuda",
-  "status.edited": "{date} muudetud",
+  "status.edited": "Viimati muudetud {date}",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
   "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
+  "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
   "status.filtered": "Filtreeritud",
   "status.hide": "Peida postitus",
@@ -668,6 +725,7 @@
   "status.reblog": "Jaga",
   "status.reblog_private": "Jaga algse nähtavusega",
   "status.reblogged_by": "{name} jagas",
+  "status.reblogs": "{count, plural, one {jagamine} other {jagamist}}",
   "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
@@ -715,10 +773,8 @@
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
-  "upload_form.description_missing": "Kirjeldus puudub",
   "upload_form.edit": "Muuda",
   "upload_form.thumbnail": "Muuda pisipilti",
-  "upload_form.undo": "Kustuta",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
   "upload_modal.analyzing_picture": "Analüüsime pilti…",
   "upload_modal.apply": "Rakenda",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c75f697e4c..9fae074878 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -25,7 +25,7 @@
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
   "account.domain_blocked": "Ezkutatutako domeinua",
-  "account.edit_profile": "Aldatu profila",
+  "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
-  "autosuggest_hashtag.per_week": "{count} asteko",
+  "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
+  "block_modal.show_less": "Erakutsi gutxiago",
+  "block_modal.show_more": "Erakutsi gehiago",
+  "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
+  "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
+  "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
+  "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
+  "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -133,7 +140,7 @@
   "column_header.unpin": "Desfinkatu",
   "column_subheading.settings": "Ezarpenak",
   "community.column_settings.local_only": "Lokala soilik",
-  "community.column_settings.media_only": "Multimedia besterik ez",
+  "community.column_settings.media_only": "Edukiak soilik",
   "community.column_settings.remote_only": "Urrunekoa soilik",
   "compose.language.change": "Aldatu hizkuntza",
   "compose.language.search": "Bilatu hizkuntzak...",
@@ -141,31 +148,27 @@
   "compose.published.open": "Ireki",
   "compose.saved.body": "Argitalpena gorde da.",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
-  "compose_form.encryption_warning": "Mastodoneko bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
+  "compose_form.encryption_warning": "Mastodon-go bidalketak ez daude muturretik muturrera enkriptatuta. Ez partekatu informazio sentikorrik Mastodonen.",
   "compose_form.hashtag_warning": "Tut hau ez da inolako traolatan zerrendatuko, ez baita publikoa. Tut publikoak soilik traolen bitartez bila daitezke.",
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
   "compose_form.placeholder": "Zer duzu buruan?",
-  "compose_form.poll.add_option": "Gehitu aukera bat",
   "compose_form.poll.duration": "Inkestaren iraupena",
+  "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
-  "compose_form.poll.remove_option": "Kendu aukera hau",
+  "compose_form.poll.single": "Hautatu bat",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
+  "compose_form.poll.type": "Estiloa",
   "compose_form.publish": "Argitaratu",
   "compose_form.publish_form": "Argitaratu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gorde aldaketak",
-  "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
-  "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
-  "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
+  "compose_form.reply": "Erantzun",
+  "compose_form.save_changes": "Eguneratu",
   "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du",
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
-  "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen",
+  "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
-  "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
-  "confirmations.block.message": "Ziur {name} blokeatu nahi duzula?",
   "confirmations.cancel_follow_request.confirm": "Baztertu eskaera",
   "confirmations.cancel_follow_request.message": "Ziur {name} jarraitzeko eskaera bertan behera utzi nahi duzula?",
   "confirmations.delete.confirm": "Ezabatu",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
   "confirmations.discard_edit_media.confirm": "Baztertu",
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
-  "confirmations.domain_block.confirm": "Ezkutatu domeinu osoa",
+  "confirmations.domain_block.confirm": "Blokeatu zerbitzaria",
   "confirmations.domain_block.message": "Ziur, erabat ziur, {domain} domeinu osoa blokeatu nahi duzula? Gehienetan gutxi batzuk blokeatu edo mututzearekin nahikoa da. Ez duzu domeinu horretako edukirik ikusiko denbora lerroetan edo jakinarazpenetan. Domeinu horretako zure jarraitzaileak kenduko dira ere.",
   "confirmations.edit.confirm": "Editatu",
   "confirmations.edit.message": "Orain editatzen baduzu, une honetan idazten ari zaren mezua gainidatziko da. Ziur jarraitu nahi duzula?",
   "confirmations.logout.confirm": "Amaitu saioa",
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.mute.confirm": "Mututu",
-  "confirmations.mute.explanation": "Honek horko bidalketak eta aipamena egiten dietenak ezkutatuko ditu, baina beraiek zure bidalketak ikusi ahal izango dituzte eta zuri jarraitu.",
-  "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
   "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
   "confirmations.reply.confirm": "Erantzun",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hauek dira gaur egun lekua hartzen ari diren sare sozial osoaren argitalpenak. Bultzada eta gogoko gehien dituzten argitalpen berrienek sailkapen altuagoa dute.",
   "dismissable_banner.explore_tags": "Traola hauek daude bogan orain zerbitzari honetan eta sare deszentralizatuko besteetan.",
   "dismissable_banner.public_timeline": "Hauek dira {domain}-(e)ko jendeak web sozialean jarraitzen dituen jendearen azkeneko argitalpen publikoak.",
+  "domain_block_modal.block": "Blokeatu zerbitzaria",
+  "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
+  "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
+  "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
+  "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
+  "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+  "domain_block_modal.you_will_lose_followers": "Zerbitzari honetako jarraitzaile guztiak kenduko dira.",
+  "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
+  "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
+  "domain_pill.server": "Zerbitzaria",
+  "domain_pill.their_handle": "Bere helbidea:",
+  "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
+  "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
+  "domain_pill.username": "Erabiltzaile-izena",
+  "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
+  "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, <button>ActivityPub darabilten plataformen</button> sare sozialeko jendearekin jar zaitezke harremanetan.",
+  "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea <button>ActivityPub darabilten plataformen</button> sare sozialen bitartez jar daiteke zurekin harremanetan.",
+  "domain_pill.your_handle": "Zure helbidea:",
+  "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
+  "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
   "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
   "embed.preview": "Hau da izango duen itxura:",
   "emoji_button.activity": "Jarduera",
@@ -244,6 +266,7 @@
   "empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
   "empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
   "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
+  "empty_column.notification_requests": "Garbi-garbi! Ezertxo ere ez hemen. Jakinarazpenak jasotzen dituzunean, hemen agertuko dira zure ezarpenen arabera.",
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileei hau betetzen joateko",
   "error.unexpected_crash.explanation": "Gure kodean arazoren bat dela eta, edo nabigatzailearekin bateragarritasun arazoren bat dela eta, orri hau ezin izan da ongi bistaratu.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
+  "filtered_notifications_banner.mentions": "{count, plural, one {aipamen} other {aipamen}}",
+  "filtered_notifications_banner.pending_requests": "Ezagutu {count, plural, =0 {dezakezun inoren} one {dezakezun pertsona baten} other {ditzakezun # pertsonen}} jakinarazpenak",
+  "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
   "firehose.local": "Zerbitzari hau",
   "firehose.remote": "Beste zerbitzariak",
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
   "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskaerak agian eskuz begiratu nahiko dituzula.",
+  "follow_suggestions.curated_suggestion": "Domeinuaren iradokizuna",
+  "follow_suggestions.dismiss": "Ez erakutsi berriro",
+  "follow_suggestions.featured_longer": "{domain} domeinuko taldeak hautaturikoak",
+  "follow_suggestions.friends_of_friends_longer": "Jarraitzen duzun jendearen artean ezagunak direnak",
+  "follow_suggestions.hints.featured": "Profil hau {domain} domeinuko taldeak eskuz aukeratu du.",
+  "follow_suggestions.hints.friends_of_friends": "Profil hau ezaguna da jarraitzen duzun jendearen artean.",
+  "follow_suggestions.hints.most_followed": "Profil hau {domain} domeinuan gehien jarraitzen den profiletako bat da.",
+  "follow_suggestions.hints.most_interactions": "Profil hau arreta handia jasotzen ari da berriki {domain} domeinuan.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Profil hau duela gutxi jarraitu dituzun profil askoren antzekoa da.",
+  "follow_suggestions.personalized_suggestion": "Iradokizun pertsonalizatua",
+  "follow_suggestions.popular_suggestion": "Iradokizun ezaguna",
+  "follow_suggestions.popular_suggestion_longer": "{domain} domeinuan ezagunak direnak",
+  "follow_suggestions.similar_to_recently_followed_longer": "Berriki jarraitu dituzun profilen antzekoa",
+  "follow_suggestions.view_all": "Ikusi denak",
+  "follow_suggestions.who_to_follow": "Zein jarraitu",
   "followed_tags": "Jarraitutako traolak",
   "footer.about": "Honi buruz",
   "footer.directory": "Profil-direktorioa",
@@ -306,15 +347,10 @@
   "hashtag.follow": "Jarraitu traolari",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
-  "home.actions.go_to_explore": "Ikusi zer dagoen pil-pilean",
-  "home.actions.go_to_suggestions": "Aurkitu jendea jarraitzeko",
-  "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
-  "home.explore_prompt.body": "Zure hasierako jarioak jarraitzeko aukeratu dituzun traolen, jarraitzeko aukeratu duzun jendearen eta beraiek bultzatutako argitalpenen nahasketa bat edukiko du. Nahiko isila dirudi oraintxe, beraz, zergatik ez:",
-  "home.explore_prompt.title": "Hau zure hasiera da Mastodonen.",
   "home.hide_announcements": "Ezkutatu iragarpenak",
-  "home.pending_critical_update.body": "Eguneratu zure Mastodoneko zerbitzaria leheinbailehen!",
+  "home.pending_critical_update.body": "Eguneratu zure Mastodon-go zerbitzaria leheinbailehen!",
   "home.pending_critical_update.link": "Ikusi eguneraketak",
   "home.pending_critical_update.title": "Segurtasun eguneraketa kritikoa eskuragarri!",
   "home.show_announcements": "Erakutsi iragarpenak",
@@ -357,7 +393,7 @@
   "keyboard_shortcuts.muted": "mutututako erabiltzaileen zerrenda irekitzeko",
   "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
   "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
-  "keyboard_shortcuts.open_media": "media zabaltzeko",
+  "keyboard_shortcuts.open_media": "Ireki edukia",
   "keyboard_shortcuts.pinned": "Ireki finkatutako bidalketen zerrenda",
   "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "Erantzun bidalketari",
@@ -377,7 +413,7 @@
   "lightbox.previous": "Aurrekoa",
   "limited_account_hint.action": "Erakutsi profila hala ere",
   "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
-  "link_preview.author": "{name}(r)en eskutik",
+  "link_preview.author": "Egilea: {name}",
   "lists.account.add": "Gehitu zerrendara",
   "lists.account.remove": "Kendu zerrendatik",
   "lists.delete": "Ezabatu zerrenda",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Kargatzen…",
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
-  "mute_modal.duration": "Iraupena",
-  "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
-  "mute_modal.indefinite": "Zehaztu gabe",
+  "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
+  "mute_modal.hide_options": "Ezkutatu aukerak",
+  "mute_modal.indefinite": "Desmututua izan arte",
+  "mute_modal.show_options": "Erakutsi aukerak",
+  "mute_modal.they_can_mention_and_follow": "Aipa eta jarrai zaitzakete, baina ez dituzu ikusiko.",
+  "mute_modal.they_wont_know": "Ez dute jakingo mututuak izan direnik.",
+  "mute_modal.title": "Erabiltzailea mututu nahi duzu?",
+  "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
+  "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
   "navigation_bar.about": "Honi buruz",
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Aipamen pribatuak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
@@ -432,20 +473,35 @@
   "notification.follow": "{name}(e)k jarraitzen dizu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
   "notification.mention": "{name}(e)k aipatu zaitu",
+  "notification.moderation-warning.learn_more": "Informazio gehiago",
+  "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
+  "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
+  "notification.moderation_warning.action_disable": "Zure kontua desaktibatua izan da.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Argitalpen batzuk hunkigarri gisa ezarri dira.",
+  "notification.moderation_warning.action_none": "Kontuak moderazio-abisu bat jaso du.",
+  "notification.moderation_warning.action_sensitive": "Argitalpenak hunkigarri gisa markatuko dira hemendik aurrera.",
+  "notification.moderation_warning.action_silence": "Kontua murriztu egin da.",
+  "notification.moderation_warning.action_suspend": "Kontua itxi da.",
   "notification.own_poll": "Zure inkesta amaitu da",
   "notification.poll": "Zuk erantzun duzun inkesta bat bukatu da",
   "notification.reblog": "{name}(e)k bultzada eman dio zure bidalketari",
+  "notification.relationships_severance_event": "{name} erabiltzailearekin galdutako konexioak",
+  "notification.relationships_severance_event.account_suspension": "{from} zerbitzariko administratzaile batek {target} bertan behera utzi du, hau da, ezin izango dituzu jaso hango eguneratzerik edo hangoekin elkarreragin.",
+  "notification.relationships_severance_event.learn_more": "Informazio gehiago",
   "notification.status": "{name} erabiltzaileak bidalketa egin berri du",
   "notification.update": "{name} erabiltzaileak bidalketa bat editatu du",
+  "notification_requests.accept": "Onartu",
+  "notification_requests.dismiss": "Baztertu",
+  "notification_requests.notifications_from": "{name} erabiltzailearen jakinarazpenak",
+  "notification_requests.title": "Iragazitako jakinarazpenak",
   "notifications.clear": "Garbitu jakinarazpenak",
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
-  "notifications.column_settings.filter_bar.advanced": "Erakutsi kategoria guztiak",
-  "notifications.column_settings.filter_bar.category": "Iragazki azkarraren barra",
-  "notifications.column_settings.filter_bar.show_bar": "Erakutsi iragazki-barra",
+  "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak",
+  "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
@@ -471,6 +527,15 @@
   "notifications.permission_denied": "Mahaigaineko jakinarazpenak ez daude erabilgarri, nabigatzaileari baimen eskaera ukatu zitzaiolako",
   "notifications.permission_denied_alert": "Mahaigaineko jakinarazpenak ezin dira gaitu, nabigatzaileari baimena ukatu zitzaiolako",
   "notifications.permission_required": "Mahaigaineko jakinarazpenak ez daude erabilgarri, horretarako behar den baimena ez delako eman.",
+  "notifications.policy.filter_new_accounts.hint": "Azken {days, plural, one {egunean} other {# egunetan}} sortua",
+  "notifications.policy.filter_new_accounts_title": "Kontu berriak",
+  "notifications.policy.filter_not_followers_hint": "{days, plural, one {Egun batez} other {# egunez}} baino gutxiago jarraitu zaituen jendea barne",
+  "notifications.policy.filter_not_followers_title": "Jarraitzen ez zaituen jendea",
+  "notifications.policy.filter_not_following_hint": "Eskuz onartzen dituzun arte",
+  "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
+  "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
+  "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
+  "notifications.policy.title": "Ez iragazi hemengo jakinarazpenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
@@ -497,7 +562,7 @@
   "onboarding.share.message": "{username} naiz #Mastodon-en! Jarrai nazazu hemen: {url}",
   "onboarding.share.next_steps": "Hurrengo urrats posibleak:",
   "onboarding.share.title": "Partekatu zure profila",
-  "onboarding.start.lead": "Zure Mastodoneko kontu berria prest dago. Jakin nola atera diezaioekun etekin handiena hemen:",
+  "onboarding.start.lead": "Mastodon-en parte zara orain, bakarra eta deszentralizatua den sare sozialaren plataforma, non zuk, eta ez algoritmo batek, zeure esperientzia pertsonaliza dezakezun. Igaro ezazu muga soziala:",
   "onboarding.start.skip": "Urrats guztiak saltatu nahi dituzu?",
   "onboarding.start.title": "Lortu duzu!",
   "onboarding.steps.follow_people.body": "Zure jarioa zuk pertsonalizatzen duzu. Bete dezagun jende interesgarriaz.",
@@ -511,7 +576,7 @@
   "onboarding.tips.2fa": "<strong>Bazenekien?</strong> Zure kontua babes dezakezu, bi faktoreko autentifikazioa zure kontuko ezarpenetan ezarriaz. Edozein TOTP aplikaziorekin dabil, ez da telefono-zenbakirik behar!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Badakizu?</strong> Mastodon deszentralizatua denez, beste zerbitzarietako profilak topatuko dituzu. Eta, hala ere, arazorik gabe jardun dezakezu haiekin! Haien zerbitzaria erabiltzaile-izenaren bigarren erdian dago!",
   "onboarding.tips.migration": "<strong>Bazenekien?</strong> Uste baduzu {domain} ez dela aukera on bat zuretzako etorkizunari begira, beste Mastodon zerbitzari batera alda zaitezke, zure jarraitzaileak galdu gabe. Zure zerbitzaria propioa ere ostata dezakezu!",
-  "onboarding.tips.verification": "<strong>Bazenekien?</strong> Zure kontua egiazta dezakezu zure webgunean zure Mastodoneko profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
+  "onboarding.tips.verification": "<strong>Bazenekien?</strong> Zure kontua egiazta dezakezu zure webgunean zure Mastodon-go profilaren esteka jarriz, eta profilean webgunea gehituz. Ordainketa edo dokumenturik gabe!",
   "password_confirmation.exceeds_maxlength": "Pasahitzaren berrespenak pasahitzaren gehienezko luzera gainditzen du",
   "password_confirmation.mismatching": "Pasahitzaren berrespena ez dator bat",
   "picture_in_picture.restore": "Leheneratu",
@@ -526,14 +591,15 @@
   "poll_button.add_poll": "Gehitu inkesta bat",
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
-  "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Aipatutako jendea soilik",
-  "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Jarraitzaileak soilik",
-  "privacy.public.long": "Guztientzat ikusgai",
+  "privacy.direct.long": "Argitalpen honetan aipatutako denak",
+  "privacy.direct.short": "Jende jakina",
+  "privacy.private.long": "Soilik jarraitzaileak",
+  "privacy.private.short": "Jarraitzaileak",
+  "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
-  "privacy.unlisted.short": "Zerrendatu gabea",
+  "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
+  "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
+  "privacy.unlisted.short": "Deiadar urrikoa",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
   "recommended": "Gomendatua",
@@ -551,7 +617,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "gaur",
+  "reply_indicator.attachments": "{count, plural, one {# eranskin} other {# eranskin}}",
   "reply_indicator.cancel": "Utzi",
+  "reply_indicator.poll": "Inkesta",
   "report.block": "Blokeatu",
   "report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
   "report.categories.legal": "Juridikoa",
@@ -644,10 +712,11 @@
   "status.direct": "Aipatu pribatuki @{name}",
   "status.direct_indicator": "Aipamen pribatua",
   "status.edit": "Editatu",
-  "status.edited": "Editatua {date}",
+  "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
+  "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
   "status.filtered": "Iragazita",
   "status.hide": "Tuta ezkutatu",
@@ -668,6 +737,7 @@
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
   "status.reblogged_by": "{name}(r)en bultzada",
+  "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.remove_bookmark": "Kendu laster-marka",
@@ -715,10 +785,8 @@
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
   "upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
-  "upload_form.description_missing": "Ez da deskribapenik gehitu",
   "upload_form.edit": "Editatu",
   "upload_form.thumbnail": "Aldatu koadro txikia",
-  "upload_form.undo": "Ezabatu",
   "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
   "upload_modal.analyzing_picture": "Irudia aztertzen…",
   "upload_modal.apply": "Aplikatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9f3201ca78..6d6b7d612c 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "اعلامیه",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
-  "autosuggest_hashtag.per_week": "{count} در هفته",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -111,7 +110,7 @@
   "column.about": "درباره",
   "column.blocks": "کاربران مسدود شده",
   "column.bookmarks": "نشانک‌ها",
-  "column.community": "خط زمانی محلّی",
+  "column.community": "خط زمانی محلی",
   "column.direct": "اشاره‌های خصوصی",
   "column.directory": "مرور نمایه‌ها",
   "column.domain_blocks": "دامنه‌های مسدود شده",
@@ -132,7 +131,7 @@
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "برداشتن سنجاق",
   "column_subheading.settings": "تنظیمات",
-  "community.column_settings.local_only": "فقط محلّی",
+  "community.column_settings.local_only": "فقط محلی",
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
   "compose.language.change": "تغییر زبان",
@@ -146,26 +145,22 @@
   "compose_form.lock_disclaimer": "حسابتان {locked} نیست. هر کسی می‌تواند پی‌گیرتان شده و فرسته‌های ویژهٔ پی‌گیرانتان را ببیند.",
   "compose_form.lock_disclaimer.lock": "قفل‌شده",
   "compose_form.placeholder": "تازه چه خبر؟",
-  "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
+  "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
-  "compose_form.poll.remove_option": "برداشتن این گزینه",
+  "compose_form.poll.single": "گزینش یکی",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
-  "compose_form.publish": "انتشار",
+  "compose_form.poll.type": "سبک",
+  "compose_form.publish": "فرستادن",
   "compose_form.publish_form": "انتشار",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ذخیرهٔ تغییرات",
-  "compose_form.sensitive.hide": "{count, plural, one {علامت‌گذاری رسانه به عنوان حساس} other {علامت‌گذاری رسانه‌ها به عنوان حساس}}",
-  "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری شد} other {رسانه‌ها به عنوان حساس علامت‌گذاری شدند}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری نشد} other {رسانه‌ها به عنوان حساس علامت‌گذاری نشدند}}",
+  "compose_form.reply": "پاسخ",
+  "compose_form.save_changes": "به‌روز رسانی",
   "compose_form.spoiler.marked": "برداشتن هشدار محتوا",
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
-  "compose_form.spoiler_placeholder": "هشدارتان را این‌جا بنویسید",
+  "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
-  "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
-  "confirmations.block.message": "مطمئنید که می‌خواهید {name} را مسدود کنید؟",
   "confirmations.cancel_follow_request.confirm": "رد کردن درخواست",
   "confirmations.cancel_follow_request.message": "مطمئنید که می خواهید درخواست پی‌گیری {name} را لغو کنید؟",
   "confirmations.delete.confirm": "حذف",
@@ -174,15 +169,12 @@
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
-  "confirmations.domain_block.confirm": "انسداد تمام دامنه",
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهی‌هایتان نخواهید دید. پی‌گیرانتان از این دامنه هم برداشته خواهند شد.",
   "confirmations.edit.confirm": "ویرایش",
   "confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. می‌خواهید ادامه دهید؟",
   "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
   "confirmations.mute.confirm": "خموش",
-  "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی‌گیری کنند.",
-  "confirmations.mute.message": "مطمئنید می‌خواهید {name} را بخموشانید؟",
   "confirmations.redraft.confirm": "حذف و بازنویسی",
   "confirmations.redraft.message": "مطمئنید که می‌خواهید این فرسته را حذف کنید و از نو بنویسید؟ با این کار تقویت‌ها و پسندهایش از دست رفته و پاسخ‌ها به آن بی‌مرجع می‌شود.",
   "confirmations.reply.confirm": "پاسخ",
@@ -231,7 +223,7 @@
   "empty_column.account_unavailable": "نمایهٔ موجود نیست",
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
   "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
-  "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
+  "empty_column.community": "خط زمانی محلی خالیست. چیزی نوشته تا چرخش بچرخد!",
   "empty_column.direct": "هنوز هیچ اشاره خصوصی‌ای ندارید. هنگامی که چنین پیامی بگیرید یا بفرستید این‌جا نشان داده خواهد شد.",
   "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
   "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
@@ -280,6 +272,17 @@
   "follow_request.authorize": "اجازه دهید",
   "follow_request.reject": "رد کنید",
   "follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
+  "follow_suggestions.curated_suggestion": "گزینش سردبیر",
+  "follow_suggestions.dismiss": "دیگر نشان داده نشود",
+  "follow_suggestions.hints.featured": "این نمایه به دست گروه {domain} دستچین شده.",
+  "follow_suggestions.hints.friends_of_friends": "این نمایه بین کسانی که پی می‌گیرید محبوب است.",
+  "follow_suggestions.hints.most_followed": "این نمایه روی {domain} بسیار پی‌گرفته شده.",
+  "follow_suggestions.hints.most_interactions": "این نمایه اخیراُ روی {domain} توجّه زیادی گرفته.",
+  "follow_suggestions.hints.similar_to_recently_followed": "این نمایه شبیه نمایه‌هاییست که اخیراً پی‌گرفته‌اید.",
+  "follow_suggestions.personalized_suggestion": "پیشنهاد شخصی",
+  "follow_suggestions.popular_suggestion": "پیشنهاد محبوب",
+  "follow_suggestions.view_all": "دیدن همه",
+  "follow_suggestions.who_to_follow": "افرادی برای پی‌گیری",
   "followed_tags": "برچسب‌های پی‌گرفته",
   "footer.about": "درباره",
   "footer.directory": "فهرست نمایه‌ها",
@@ -306,13 +309,8 @@
   "hashtag.follow": "پی‌گرفتن برچسب",
   "hashtag.unfollow": "پی‌نگرفتن برچسب",
   "hashtags.and_other": "…و {count, plural, other {# بیش‌تر}}",
-  "home.actions.go_to_explore": "ببینید چه داغ است",
-  "home.actions.go_to_suggestions": "یافتن افراد برای پی‌گیری",
-  "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
-  "home.explore_prompt.body": "خوراک خانگیتان ترکیبی از فرسته‌ها از برچسب‌هایی که برای پی‌گیری گزیده‌اید، افرادی که پی می‌گیرید و فرسته‌هایی که تقویت می‌کنند را خواهد داشت. اگر خیلی خلوت به نظر می‌رسد،‌ شاید بخواهید:",
-  "home.explore_prompt.title": "این پایگاه خانگیتان در ماستودون است.",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
   "home.pending_critical_update.body": "لطفاً کارساز ماستودونتان را در نخستین فرصت به‌روز کنید!",
   "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
@@ -322,8 +320,8 @@
   "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
   "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
   "interaction_modal.description.reply": "با حسابی روی ماستودون می‌توانید به این فرسته پاسخ دهید.",
-  "interaction_modal.login.action": "من رو ببر خونه",
-  "interaction_modal.login.prompt": "دامنه سرور شخصی شما، به عنوان مثال. mastodon.social",
+  "interaction_modal.login.action": "رفتن به خانه",
+  "interaction_modal.login.prompt": "دامنهٔ کارساز شخصیتان چون mastodon.social",
   "interaction_modal.no_account_yet": "در ماستودون نیست؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
@@ -352,7 +350,7 @@
   "keyboard_shortcuts.home": "گشودن خط زمانی خانگی",
   "keyboard_shortcuts.hotkey": "میان‌بر",
   "keyboard_shortcuts.legend": "نمایش این نشانه",
-  "keyboard_shortcuts.local": "گشودن خط زمانی محلّی",
+  "keyboard_shortcuts.local": "گشودن خط زمانی محلی",
   "keyboard_shortcuts.mention": "اشاره به نویسنده",
   "keyboard_shortcuts.muted": "گشودن فهرست کاربران خموش",
   "keyboard_shortcuts.my_profile": "گشودن نمایه‌تان",
@@ -396,19 +394,15 @@
   "loading_indicator.label": "در حال بارگذاری…",
   "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
-  "mute_modal.duration": "مدت زمان",
-  "mute_modal.hide_notifications": "نهفتن آگاهی‌ها از این کاربر؟",
-  "mute_modal.indefinite": "نامعلوم",
   "navigation_bar.about": "درباره",
   "navigation_bar.advanced_interface": "بازکردن در رابط کاربری وب پیشرفته",
   "navigation_bar.blocks": "کاربران مسدود شده",
   "navigation_bar.bookmarks": "نشانک‌ها",
-  "navigation_bar.community_timeline": "خط زمانی محلّی",
+  "navigation_bar.community_timeline": "خط زمانی محلی",
   "navigation_bar.compose": "نوشتن فرستهٔ تازه",
   "navigation_bar.direct": "اشاره‌های خصوصی",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.edit_profile": "ویرایش نمایه",
   "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "برگزیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
@@ -443,9 +437,6 @@
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
-  "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
-  "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
-  "notifications.column_settings.filter_bar.show_bar": "نمایش نوار پالایه",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
   "notifications.column_settings.mention": "اشاره‌ها:",
@@ -471,6 +462,8 @@
   "notifications.permission_denied": "آگاهی‌های میزکار به دلیل رد کردن درخواست اجازهٔ پیشین مرورگر، در دسترس نیستند",
   "notifications.permission_denied_alert": "از آن‌جا که پیش از این اجازهٔ مرورگر رد شده است، آگاهی‌های میزکار نمی‌توانند به کار بیفتند",
   "notifications.permission_required": "آگاهی‌های میزکار در دسترس نیستند زیرا اجازه‌های لازم، اعطا نشده.",
+  "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند",
+  "notifications.policy.filter_not_following_hint": "",
   "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
   "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",
   "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",
@@ -483,8 +476,10 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "نمایه خود را قابل نمایش کنید",
+  "onboarding.profile.discoverable_hint": "خواسته‌اید روی ماستودون کشف شوید. ممکن است فرسته‌هایتان در نتیحهٔ جست‌وجوها و فرسته‌های داغ ظاهر شده و نمایه‌تان به افرادی با علایق مشابهتان پیشنهاد شود.",
   "onboarding.profile.display_name": "نام نمایشی",
   "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
+  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌ّای شخصی سازی بیش‌تری نیز دارد کامل کنید.",
   "onboarding.profile.note": "درباره شما",
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
   "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@@ -524,14 +519,15 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
-  "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
-  "privacy.direct.short": "فقط افراد اشاره شده",
-  "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "فقط پی‌گیرندگان",
-  "privacy.public.long": "نمایان برای همه",
+  "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+  "privacy.direct.short": "افراد مشخّص",
+  "privacy.private.long": "تنها پی‌گیرندگانتان",
+  "privacy.private.short": "پی‌گیرندگان",
+  "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیت‌های کشف",
-  "privacy.unlisted.short": "فهرست نشده",
+  "privacy.unlisted.additional": "درست مثل عمومی رفتار می‌کند؛ جز این که فرسته در برچسب‌ها یا خوراک‌های زنده، کشف یا جست‌وجوی ماستودون ظاهر نخواهد شد. حتا اگر کلیّت نمایه‌تان اجازه داده باشد.",
+  "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
+  "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
   "recommended": "پیشنهادشده",
@@ -549,7 +545,9 @@
   "relative_time.minutes": "{number} دقیقه",
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
+  "reply_indicator.attachments": "{count, plural, one {# پیوست} other {# پیوست}}",
   "reply_indicator.cancel": "لغو",
+  "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
   "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
   "report.categories.legal": "حقوقی",
@@ -642,7 +640,6 @@
   "status.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "status.direct_indicator": "اشارهٔ خصوصی",
   "status.edit": "ویرایش",
-  "status.edited": "ویرایش شده در {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
@@ -713,10 +710,8 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
-  "upload_form.description_missing": "شرحی افزوده نشده",
   "upload_form.edit": "ویرایش",
   "upload_form.thumbnail": "تغییر بندانگشتی",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
   "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
   "upload_modal.apply": "اعمال",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 00df0e537a..bae714b1d2 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -2,8 +2,8 @@
   "about.blocks": "Moderoidut palvelimet",
   "about.contact": "Ota yhteys:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
-  "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
-  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja vuorovaikuttaa eri palvelinten käyttäjien kanssa. Nämä ovat tälle palvelimelle määritetyt poikkeukset.",
+  "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
+  "about.domain_blocks.preamble": "Mastodonin avulla voidaan yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä, ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
   "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
   "about.domain_blocks.silenced.title": "Rajoitettu",
   "about.domain_blocks.suspended.explanation": "Mitään tämän palvelimen tietoja ei käsitellä, tallenneta tai vaihdeta, mikä tekee vuorovaikutuksesta ja viestinnästä sen käyttäjien kanssa mahdotonta.",
@@ -19,7 +19,7 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
+  "account.browse_more_on_origin_server": "Selaile kattavampaa alkuperäprofiilia",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
@@ -27,7 +27,7 @@
   "account.domain_blocked": "Verkkotunnus estetty",
   "account.edit_profile": "Muokkaa profiilia",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
-  "account.endorse": "Pidä esillä profiilissa",
+  "account.endorse": "Suosittele profiilissasi",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
   "account.featured_tags.last_status_never": "Ei julkaisuja",
   "account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
@@ -39,7 +39,7 @@
   "account.following": "Seuratut",
   "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
-  "account.go_to_profile": "Avaa profiili",
+  "account.go_to_profile": "Mene profiiliin",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
   "account.joined_short": "Liittynyt",
@@ -64,10 +64,10 @@
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
   "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
-  "account.unblock": "Poista käyttäjän @{name} esto",
-  "account.unblock_domain": "Poista verkkotunnuksen {domain} esto",
+  "account.unblock": "Kumoa käyttäjän @{name} esto",
+  "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
   "account.unblock_short": "Poista esto",
-  "account.unendorse": "Älä pidä esillä profiilissa",
+  "account.unendorse": "Kumoa suosittelu profiilissasi",
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
@@ -75,7 +75,7 @@
   "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
   "admin.dashboard.daily_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen päivittäin",
   "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys rekisteröitymisen jälkeen kuukausittain",
-  "admin.dashboard.retention.average": "Keskimäärin",
+  "admin.dashboard.retention.average": "Keskiarvo",
   "admin.dashboard.retention.cohort": "Rekisteröitymis-kk.",
   "admin.dashboard.retention.cohort_size": "Uusia käyttäjiä",
   "admin.impact_report.instance_accounts": "Tilien profiilit, jotka tämä poistaisi",
@@ -86,10 +86,17 @@
   "alert.rate_limited.title": "Pyyntömäärää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
-  "announcement.announcement": "Ilmoitus",
+  "announcement.announcement": "Tiedote",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
-  "autosuggest_hashtag.per_week": "{count} viikossa",
+  "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
+  "block_modal.show_less": "Näytä vähemmän",
+  "block_modal.show_more": "Näytä enemmän",
+  "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+  "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+  "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
+  "block_modal.title": "Estetäänkö käyttäjä?",
+  "block_modal.you_wont_see_mentions": "Et enää näe hänen julkaisujaan etkä voi seurata häntä.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -146,49 +153,43 @@
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
   "compose_form.placeholder": "Mitä mietit?",
-  "compose_form.poll.add_option": "Lisää valinta",
   "compose_form.poll.duration": "Äänestyksen kesto",
-  "compose_form.poll.option_placeholder": "Valinta {number}",
-  "compose_form.poll.remove_option": "Poista tämä valinta",
-  "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
-  "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+  "compose_form.poll.multiple": "Monivalinta",
+  "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
+  "compose_form.poll.single": "Valitse yksi",
+  "compose_form.poll.switch_to_multiple": "Muuta kysely monivalinnaksi",
+  "compose_form.poll.switch_to_single": "Muuta kysely sallimaan vain yksi valinta",
+  "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Tallenna muutokset",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluonteiseksi} other {Merkitse mediat arkaluonteisiksi}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluonteiseksi} other {Mediat on merkitty arkaluonteisiksi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluonteiseksi} other {Medioita ei ole merkitty arkaluonteisiksi}}",
+  "compose_form.reply": "Vastaa",
+  "compose_form.save_changes": "Päivitä",
   "compose_form.spoiler.marked": "Poista sisältövaroitus",
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
-  "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
+  "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
-  "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
-  "confirmations.block.message": "Haluatko varmasti estää käyttäjän {name}?",
   "confirmations.cancel_follow_request.confirm": "Peruuta pyyntö",
-  "confirmations.cancel_follow_request.message": "Haluatko varmasti peruuttaa pyyntösi seurata profiilia {name}?",
+  "confirmations.cancel_follow_request.message": "Haluatko varmasti perua pyyntösi seurata käyttäjätiliä {name}?",
   "confirmations.delete.confirm": "Poista",
   "confirmations.delete.message": "Haluatko varmasti poistaa tämän julkaisun?",
   "confirmations.delete_list.confirm": "Poista",
   "confirmations.delete_list.message": "Haluatko varmasti poistaa tämän listan pysyvästi?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
-  "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun, hylätäänkö ne silti?",
-  "confirmations.domain_block.confirm": "Estä koko verkkotunnus",
+  "confirmations.discard_edit_media.message": "Sinulla on tallentamattomia muutoksia median kuvaukseen tai esikatseluun. Hylätäänkö ne silti?",
+  "confirmations.domain_block.confirm": "Estä palvelin",
   "confirmations.domain_block.message": "Haluatko aivan varmasti estää koko verkkotunnuksen {domain}? Useimmiten muutama kohdistettu esto tai mykistys on riittävä ja suositeltava toimi. Et näe sisältöä tästä verkkotunnuksesta millään julkisilla aikajanoilla tai ilmoituksissa. Tähän verkkotunnukseen kuuluvat seuraajasi poistetaan.",
   "confirmations.edit.confirm": "Muokkaa",
   "confirmations.edit.message": "Jos muokkaat viestiä nyt, se korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
   "confirmations.mute.confirm": "Mykistä",
-  "confirmations.mute.explanation": "Tämä toiminto piilottaa heidän julkaisunsa sinulta – mukaan lukien ne, joissa heidät mainitaan – sallien heidän yhä nähdä julkaisusi ja seurata sinua.",
-  "confirmations.mute.message": "Haluatko varmasti mykistää käyttäjän {name}?",
-  "confirmations.redraft.confirm": "Poista & palauta muokattavaksi",
+  "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
   "confirmations.reply.confirm": "Vastaa",
   "confirmations.reply.message": "Jos vastaat nyt, vastaus korvaa parhaillaan työstämäsi viestin. Haluatko varmasti jatkaa?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
-  "confirmations.unfollow.message": "Haluatko varmasti lakata seuraamasta profiilia {name}?",
+  "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -202,12 +203,33 @@
   "directory.recently_active": "Hiljattain aktiiviset",
   "disabled_account_banner.account_settings": "Tilin asetukset",
   "disabled_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä.",
-  "dismissable_banner.community_timeline": "Nämä ovat viimeisimpiä julkaisuja käyttäjiltä, joiden tili sijaitsee palvelimella {domain}.",
+  "dismissable_banner.community_timeline": "Nämä ovat tuoreimpia julkaisuja käyttäjiltä, joiden tili on palvelimella {domain}.",
   "dismissable_banner.dismiss": "Hylkää",
-  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeimmalle.",
-  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikiksi lisätyimmät nousevat listauksessa korkeimmalle.",
-  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeimmalle.",
+  "dismissable_banner.explore_links": "Näitä uutisia jaetaan tänään sosiaalisessa verkossa eniten. Uusimmat ja eri käyttäjien eniten lähettämät uutiset nousevat listauksessa korkeammalle.",
+  "dismissable_banner.explore_statuses": "Nämä sosiaalisen verkon julkaisut keräävät tänään eniten huomiota. Uusimmat, tehostetuimmat ja suosikeiksi lisätyimmät julkaisut nousevat listauksessa korkeammalle.",
+  "dismissable_banner.explore_tags": "Nämä sosiaalisen verkon aihetunnisteet keräävät tänään eniten huomiota. Useimman käyttäjän käyttämät aihetunnisteet nousevat listauksessa korkeammalle.",
   "dismissable_banner.public_timeline": "Nämä ovat viimeisimpiä julkaisuja sosiaalisen verkon käyttäjiltä, joita seurataan palvelimella {domain}.",
+  "domain_block_modal.block": "Estä palvelin",
+  "domain_block_modal.block_account_instead": "Estä sen sijaan @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ihmiset tältä palvelimelta eivät voi olla vuorovaikutuksessa vanhojen julkaisujesi kanssa.",
+  "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
+  "domain_block_modal.they_wont_know": "Hän ei saa tietää, että hänet on estetty.",
+  "domain_block_modal.title": "Estetäänkö verkkotunnus?",
+  "domain_block_modal.you_will_lose_followers": "Kaikki seuraajasi tältä palvelimelta poistetaan.",
+  "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
+  "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
+  "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
+  "domain_pill.server": "Palvelin",
+  "domain_pill.their_handle": "Hänen käyttäjänimensä:",
+  "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
+  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+  "domain_pill.username": "Käyttäjänimi",
+  "domain_pill.whats_in_a_handle": "Mitä käyttäjänimessä on?",
+  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa ihmisten kanssa läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, ihmiset voivat olla vaikutuksessa kanssasi läpi sosiaalisen verkon, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
+  "domain_pill.your_handle": "Käyttäjänimesi:",
+  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
+  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Tältä se näyttää:",
   "emoji_button.activity": "Aktiviteetit",
@@ -217,18 +239,18 @@
   "emoji_button.food": "Ruoka ja juoma",
   "emoji_button.label": "Lisää emoji",
   "emoji_button.nature": "Luonto",
-  "emoji_button.not_found": "Vastaavia emojeja ei löytynyt",
+  "emoji_button.not_found": "Vastaavia emojeita ei löytynyt",
   "emoji_button.objects": "Esineet",
   "emoji_button.people": "Ihmiset",
   "emoji_button.recent": "Usein käytetyt",
-  "emoji_button.search": "Hae...",
+  "emoji_button.search": "Etsi...",
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
-  "empty_column.account_hides_collections": "Käyttäjä on päättänyt olla julkaisematta näitä tietoja",
+  "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",
   "empty_column.account_timeline": "Ei viestejä täällä.",
-  "empty_column.account_unavailable": "Profiilia ei löydy",
+  "empty_column.account_unavailable": "Profiilia ei ole saatavilla",
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
@@ -239,17 +261,18 @@
   "empty_column.favourites": "Kukaan ei ole vielä lisännyt tätä julkaisua suosikkeihinsa. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "empty_column.follow_requests": "Et ole vielä vastaanottanut seuraamispyyntöjä. Saamasi pyynnöt näkyvät täällä.",
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
-  "empty_column.hashtag": "Tällä aihetunnisteella ei ole vielä mitään.",
+  "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
   "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia henkilöjä, niin näet enemmän sisältöä.",
   "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
+  "empty_column.notification_requests": "Kaikki kunnossa! Täällä ei ole mitään. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
   "empty_column.notifications": "Sinulla ei ole vielä ilmoituksia. Kun keskustelet muille, näet sen täällä.",
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti. Voit myös seurata muiden palvelimien käyttäjiä",
-  "error.unexpected_crash.explanation": "Sivua ei voi näyttää oikein, johtuen bugista tai ongelmasta selaimen yhteensopivuudessa.",
+  "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
   "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, voi Mastodonin käyttö ehkä onnistua eri selaimella tai natiivisovelluksella.",
-  "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä ja päivittää sivu. Jos se ei auta, voit silti käyttää Mastodonia eri selaimen tai sovelluksen kautta.",
+  "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä, ja virkistä sitten sivunlataus. Mikäli ongelma jatkuu, voit mahdollisesti käyttää Mastodonia eri selaimella tai natiivilla sovelluksella.",
   "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
   "explore.search_results": "Hakutulokset",
@@ -258,13 +281,13 @@
   "explore.trending_links": "Uutiset",
   "explore.trending_statuses": "Julkaisut",
   "explore.trending_tags": "Aihetunnisteet",
-  "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske kontekstia, jossa olet tarkastellut tätä julkaisua. Jos haluat, että julkaisu suodatetaan myös tässä kontekstissa, sinun pitää muokata suodatinta.",
-  "filter_modal.added.context_mismatch_title": "Konteksti ei täsmää!",
-  "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatin on voimassa.",
+  "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet tarkastellut tätä julkaisua. Jos haluat julkaisun suodatettavan myös tässä asiayhteydessä, muokkaa suodatinta.",
+  "filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
+  "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatusta käytettäisiin.",
   "filter_modal.added.expired_title": "Vanhentunut suodatin!",
-  "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin kohdassa {settings_link}.",
+  "filter_modal.added.review_and_configure": "Voit tarkastella tätä suodatinluokkaa ja määrittää sen tarkemmin {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Suodattimen asetukset",
-  "filter_modal.added.settings_link": "asetukset-sivulle",
+  "filter_modal.added.settings_link": "asetussivulla",
   "filter_modal.added.short_explanation": "Tämä julkaisu on lisätty seuraavaan suodatinluokkaan: {title}.",
   "filter_modal.added.title": "Suodatin lisätty!",
   "filter_modal.select_filter.context_mismatch": "ei sovellu tähän kontekstiin",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {maininta} other {mainintaa}}",
+  "filtered_notifications_banner.pending_requests": "Ilmoituksia {count, plural, =0 {ei ole} one {1 henkilöltä} other {# henkilöltä}}, jonka saatat tuntea",
+  "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
   "firehose.local": "Tämä palvelin",
   "firehose.remote": "Muut palvelimet",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "Hylkää",
   "follow_requests.unlocked_explanation": "Vaikkei tiliäsi ole lukittu, palvelimen {domain} ylläpito on arvioinut, että saatat olla halukas tarkistamaan nämä seuraamispyynnöt erikseen.",
+  "follow_suggestions.curated_suggestion": "Ehdotus ylläpidolta",
+  "follow_suggestions.dismiss": "Älä näytä uudelleen",
+  "follow_suggestions.featured_longer": "Valinnut käsin palvelimen {domain} tiimi",
+  "follow_suggestions.friends_of_friends_longer": "Suosittu seuraamiesi ihmisten keskuudessa",
+  "follow_suggestions.hints.featured": "Tämän profiilin on valinnut palvelimen {domain} tiimi.",
+  "follow_suggestions.hints.friends_of_friends": "Seuraamasi käyttäjät suosivat tätä profiilia.",
+  "follow_suggestions.hints.most_followed": "Tämä profiili on palvelimen {domain} seuratuimpia.",
+  "follow_suggestions.hints.most_interactions": "Tämä profiili on viime aikoina saanut paljon huomiota palvelimella {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tämä profiili on samankaltainen kuin profiilit, joita olet viimeksi seurannut.",
+  "follow_suggestions.personalized_suggestion": "Mukautettu ehdotus",
+  "follow_suggestions.popular_suggestion": "Suosittu ehdotus",
+  "follow_suggestions.popular_suggestion_longer": "Suosittu palvelimella {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
+  "follow_suggestions.view_all": "Näytä kaikki",
+  "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
   "followed_tags": "Seuratut aihetunnisteet",
   "footer.about": "Tietoja",
   "footer.directory": "Profiilihakemisto",
@@ -306,15 +347,10 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
-  "home.actions.go_to_explore": "Katso, mikä on suosittua",
-  "home.actions.go_to_suggestions": "Löydä seurattavia käyttäjiä",
-  "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
-  "home.explore_prompt.body": "Kotisyötteesi on sekoitus seuraamiasi aihetunnisteita ja käyttäjiä sekä heidän tehostamiaan julkaisuja. Jos se tuntuu liian hiljaiselta, saatat haluta:",
-  "home.explore_prompt.title": "Tämä on tukikohtasi Mastodonissa.",
   "home.hide_announcements": "Piilota tiedotteet",
-  "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelimen mahdollisimman pian!",
+  "home.pending_critical_update.body": "Päivitäthän Mastodon-palvelinohjelmistosi mahdollisimman pian!",
   "home.pending_critical_update.link": "Tutustu päivityssisältöihin",
   "home.pending_critical_update.title": "Kriittinen tietoturvapäivitys saatavilla!",
   "home.show_announcements": "Näytä tiedotteet",
@@ -353,7 +389,7 @@
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
-  "keyboard_shortcuts.mention": "Mainitse kirjoittaja",
+  "keyboard_shortcuts.mention": "Mainitse julkaisija",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
   "keyboard_shortcuts.my_profile": "Avaa profiilisi",
   "keyboard_shortcuts.notifications": "Avaa ilmoitussarake",
@@ -371,12 +407,12 @@
   "keyboard_shortcuts.unfocus": "Poistu teksti-/hakukentästä",
   "keyboard_shortcuts.up": "Siirry listassa ylöspäin",
   "lightbox.close": "Sulje",
-  "lightbox.compress": "Pakkaa kuvan näkymälaatikko",
-  "lightbox.expand": "Laajenna kuvan näkymälaatikko",
+  "lightbox.compress": "Tiivis kuvankatselunäkymä",
+  "lightbox.expand": "Laajennettu kuvankatselunäkymä",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
-  "limited_account_hint.title": "Palvelun {domain} valvojat ovat piilottaneet tämän profiilin.",
+  "limited_account_hint.title": "Palvelimen {domain} valvojat ovat piilottaneet tämän käyttäjätilin.",
   "link_preview.author": "Julkaissut {name}",
   "lists.account.add": "Lisää listalle",
   "lists.account.remove": "Poista listalta",
@@ -390,25 +426,30 @@
   "lists.replies_policy.list": "Listan jäsenille",
   "lists.replies_policy.none": "Ei kellekään",
   "lists.replies_policy.title": "Näytä vastaukset:",
-  "lists.search": "Etsi seuraamistasi henkilöistä",
+  "lists.search": "Etsi seuraamiesi henkilöiden keskuudesta",
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
   "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
-  "mute_modal.duration": "Kesto",
-  "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
-  "mute_modal.indefinite": "Ikuisesti",
+  "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
+  "mute_modal.hide_options": "Piilota valinnat",
+  "mute_modal.indefinite": "Kunnes poistan mykistyksen häneltä",
+  "mute_modal.show_options": "Näytä valinnat",
+  "mute_modal.they_can_mention_and_follow": "Hän voi mainita sinut ja seurata sinua, mutta sinä et näe häntä.",
+  "mute_modal.they_wont_know": "Hän ei saa tietää, että hänet on mykistetty.",
+  "mute_modal.title": "Mykistetäänkö käyttäjä?",
+  "mute_modal.you_wont_see_mentions": "Et enää näe julkaisuja, joissa hänet mainitaan.",
+  "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
-  "navigation_bar.compose": "Kirjoita uusi julkaisu",
+  "navigation_bar.compose": "Luo uusi julkaisu",
   "navigation_bar.direct": "Yksityiset maininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
@@ -430,13 +471,31 @@
   "notification.admin.sign_up": "{name} rekisteröityi",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow_request": "{name} haluaa seurata sinua",
+  "notification.follow_request": "{name} on pyytänyt lupaa saada seurata sinua",
   "notification.mention": "{name} mainitsi sinut",
+  "notification.moderation-warning.learn_more": "Lue lisää",
+  "notification.moderation_warning": "Olet saanut moderointivaroituksen",
+  "notification.moderation_warning.action_delete_statuses": "Jotkin julkaisusi on poistettu.",
+  "notification.moderation_warning.action_disable": "Tilisi on poistettu käytöstä.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Jotkin julkaisusi on merkitty arkaluonteisiksi.",
+  "notification.moderation_warning.action_none": "Tilisi on saanut moderointivaroituksen.",
+  "notification.moderation_warning.action_sensitive": "Tästä lähtien julkaisusi merkitään arkaluonteisiksi.",
+  "notification.moderation_warning.action_silence": "Tiliäsi on rajoitettu.",
+  "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
-  "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+  "notification.poll": "Kysely, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
+  "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
+  "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
+  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.learn_more": "Lue lisää",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
+  "notification_requests.accept": "Hyväksy",
+  "notification_requests.dismiss": "Hylkää",
+  "notification_requests.notifications_from": "Ilmoitukset käyttäjältä {name}",
+  "notification_requests.title": "Suodatetut ilmoitukset",
   "notifications.clear": "Tyhjennä ilmoitukset",
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvästi?",
   "notifications.column_settings.admin.report": "Uudet ilmoitukset:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Suosikit:",
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
-  "notifications.column_settings.filter_bar.show_bar": "Näytä suodatinpalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seuraamispyynnöt:",
   "notifications.column_settings.mention": "Maininnat:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Työpöytäilmoitukset eivät ole käytettävissä, koska selaimen käyttöoikeuspyyntö on aiemmin evätty",
   "notifications.permission_denied_alert": "Työpöytäilmoituksia ei voi ottaa käyttöön, koska selaimen käyttöoikeus on aiemmin estetty",
   "notifications.permission_required": "Työpöytäilmoitukset eivät ole käytettävissä, koska siihen tarvittavaa lupaa ei ole myönnetty.",
+  "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivänä} other {viimeisenä # päivänä}}",
+  "notifications.policy.filter_new_accounts_title": "Uudet tilit",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien ne, jotka ovat seuranneet sinua vähemmän kuin {days, plural, one {päivän} other {# päivää}}",
+  "notifications.policy.filter_not_followers_title": "Henkilöt, jotka eivät seuraa sinua",
+  "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt ne manuaalisesti",
+  "notifications.policy.filter_not_following_title": "Henkilöt, joita et seuraa",
+  "notifications.policy.filter_private_mentions_hint": "Suodatetaan, ellei se vastaa omaan mainintaasi tai ellet seuraa lähettäjää",
+  "notifications.policy.filter_private_mentions_title": "Ei-toivotut yksityismaininnat",
+  "notifications.policy.title": "Suodata ilmoitukset pois kohteesta…",
   "notifications_permission_banner.enable": "Ota työpöytäilmoitukset käyttöön",
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
@@ -480,7 +547,7 @@
   "onboarding.actions.go_to_home": "Siirry kotisyötteeseeni",
   "onboarding.compose.template": "Tervehdys #Mastodon!",
   "onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa tai yrittää myöhemmin uudelleen.",
-  "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
+  "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta – voit milloin tahansa myös lopettaa niiden seuraamisen:",
   "onboarding.follows.title": "Mukauta kotisyötettäsi",
   "onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
   "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa. Lisäksi profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneita kanssasi samoista aiheista.",
@@ -501,14 +568,14 @@
   "onboarding.start.skip": "Haluatko hypätä suoraan eteenpäin ilman alkuunpääsyohjeistuksia?",
   "onboarding.start.title": "Olet tehnyt sen!",
   "onboarding.steps.follow_people.body": "Mastodon perustuu sinua kiinnostavien henkilöjen julkaisujen seuraamiseen.",
-  "onboarding.steps.follow_people.title": "Mukauta kotisyötteesi",
+  "onboarding.steps.follow_people.title": "Mukauta kotisyötettäsi",
   "onboarding.steps.publish_status.body": "Tervehdi maailmaa sanoin, kuvin tai äänestyksin {emoji}",
   "onboarding.steps.publish_status.title": "Laadi ensimmäinen julkaisusi",
   "onboarding.steps.setup_profile.body": "Täydentämällä profiilisi tietoja tehostat vuorovaikutteisuutta.",
   "onboarding.steps.setup_profile.title": "Mukauta profiiliasi",
   "onboarding.steps.share_profile.body": "Kerro kavereillesi, kuinka sinut löytää Mastodonista",
   "onboarding.steps.share_profile.title": "Jaa Mastodon-profiilisi",
-  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeroa!",
+  "onboarding.tips.2fa": "<strong>Tiesitkö?</strong> Voit suojata tilisi ottamalla kaksivaiheisen todennuksen käyttöön tilisi asetuksista. Se toimii millä tahansa TOTP-sovelluksella, eikä sen käyttö edellytä puhelinnumeron antoa!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Tiesitkö?</strong> Koska Mastodon on hajautettu, osa kohtaamistasi profiileista sijaitsee muilla kuin sinun palvelimellasi. Voit silti viestiä saumattomasti heidän kanssaan! Heidän palvelimensa mainitaan käyttäjänimen jälkiosassa!",
   "onboarding.tips.migration": "<strong>Tiesitkö?</strong> Jos koet, ettei {domain} ole jatkossa itsellesi hyvä palvelinvalinta, voit siirtyä toiselle Mastodon-palvelimelle menettämättä seuraajiasi. Voit jopa isännöidä omaa palvelintasi!",
   "onboarding.tips.verification": "<strong>Tiesitkö?</strong> Voit vahvistaa tilisi lisäämällä omalle verkkosivustollesi linkin Mastodon-profiiliisi ja lisäämällä sitten verkkosivustosi osoitteen Mastodon-profiilisi lisäkenttään. Tämä ei maksa mitään, eikä sinun tarvitse lähetellä asiakirjoja!",
@@ -523,17 +590,18 @@
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
   "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
-  "poll_button.add_poll": "Lisää äänestys",
-  "poll_button.remove_poll": "Poista äänestys",
+  "poll_button.add_poll": "Lisää kysely",
+  "poll_button.remove_poll": "Poista kysely",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
-  "privacy.direct.long": "Näkyy vain mainituille käyttäjille",
-  "privacy.direct.short": "Vain mainitut käyttäjät",
-  "privacy.private.long": "Näkyy vain seuraajille",
-  "privacy.private.short": "Vain seuraajat",
-  "privacy.public.long": "Näkyy kaikille",
+  "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
+  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.private.long": "Vain seuraajasi",
+  "privacy.private.short": "Seuraajat",
+  "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Näkyy kaikille mutta jää pois löytämisominaisuuksista",
-  "privacy.unlisted.short": "Listaamaton",
+  "privacy.unlisted.additional": "Tämä on muutoin kuin julkinen julkaisu, mutta sitä ei näytetä livesyöte-, aihetunniste- tai selailunäkymissä eikä Mastodon-hakutuloksissakaan, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
+  "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
+  "privacy.unlisted.short": "Vaivihkaisesti julkinen",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
@@ -551,19 +619,21 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
+  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
+  "reply_indicator.poll": "Kysely",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
-  "report.categories.legal": "Lakiasiat",
+  "report.categories.legal": "Juridiset tiedot",
   "report.categories.other": "Muu",
   "report.categories.spam": "Roskaposti",
-  "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen sääntöä",
+  "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen säännöistä",
   "report.category.subtitle": "Valitse sopivin",
   "report.category.title": "Kerro meille, miksi tämä {type} pitää raportoida",
-  "report.category.title_account": "profiili",
-  "report.category.title_status": "julkaisu",
+  "report.category.title_account": "profiilissa",
+  "report.category.title_status": "julkaisussa",
   "report.close": "Valmis",
-  "report.comment.title": "Olisiko jotain muuta, mitä meidän pitäisi tietää?",
+  "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?",
   "report.forward": "Välitä kohteeseen {target}",
   "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
   "report.mute": "Mykistä",
@@ -571,18 +641,18 @@
   "report.next": "Seuraava",
   "report.placeholder": "Lisäkommentit",
   "report.reasons.dislike": "En pidä siitä",
-  "report.reasons.dislike_description": "Et halua nähdä sitä",
+  "report.reasons.dislike_description": "Sisältö on sen tyyppistä, ettet halua nähdä sitä",
   "report.reasons.legal": "Se on laitonta",
   "report.reasons.legal_description": "Katsot sisällön rikkovan maasi tai palvelimen kotimaan lakeja",
   "report.reasons.other": "Jotain muuta",
-  "report.reasons.other_description": "Ongelma ei sovi muihin kategorioihin",
+  "report.reasons.other_description": "Muut raportointisyyt eivät kuvaa ongelmaa",
   "report.reasons.spam": "Se on roskapostia",
-  "report.reasons.spam_description": "Haitalliset linkit, väärennetyt sitoutumiset tai toistuvat vastaukset",
+  "report.reasons.spam_description": "Haitalliset linkit, henkilöväärennökset tai itseään toistavat vastaukset",
   "report.reasons.violation": "Se rikkoo palvelimen sääntöjä",
-  "report.reasons.violation_description": "Tiedät, että se rikkoo tiettyjä sääntöjä",
+  "report.reasons.violation_description": "Tiedät sisällön rikkovan tiettyjä sääntöjä",
   "report.rules.subtitle": "Valitse kaikki sopivat",
   "report.rules.title": "Mitä sääntöjä rikotaan?",
-  "report.statuses.subtitle": "Valitse kaikki sopivat",
+  "report.statuses.subtitle": "Valitse kaikki soveltuvat julkaisut",
   "report.statuses.title": "Onko julkaisuja, jotka tukevat tätä raporttia?",
   "report.submit": "Lähetä",
   "report.target": "Raportoidaan {target}",
@@ -596,14 +666,14 @@
   "report_notification.categories.legal": "Laillinen",
   "report_notification.categories.other": "Muu",
   "report_notification.categories.spam": "Roskaposti",
-  "report_notification.categories.violation": "Sääntöjen rikkominen",
+  "report_notification.categories.violation": "Sääntörikkomus",
   "report_notification.open": "Avaa raportti",
   "search.no_recent_searches": "Ei viimeaikaisia hakuja",
   "search.placeholder": "Hae",
   "search.quick_action.account_search": "Profiilit haulla {x}",
   "search.quick_action.go_to_account": "Siirry profiiliin {x}",
   "search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
-  "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
+  "search.quick_action.open_url": "Avaa verkko-osoite Mastodonissa",
   "search.quick_action.status_search": "Julkaisut haulla {x}",
   "search.search_or_paste": "Hae tai liitä URL-osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
@@ -612,16 +682,16 @@
   "search_popout.options": "Hakuvalinnat",
   "search_popout.quick_actions": "Pikatoiminnot",
   "search_popout.recent": "Viimeaikaiset haut",
-  "search_popout.specific_date": "tarkka päiväys",
+  "search_popout.specific_date": "tietty päivämäärä",
   "search_popout.user": "käyttäjä",
   "search_results.accounts": "Profiilit",
   "search_results.all": "Kaikki",
   "search_results.hashtags": "Aihetunnisteet",
-  "search_results.nothing_found": "Näille hakusanoille ei löytynyt mitään",
+  "search_results.nothing_found": "Hakusi ei tuottanut tuloksia",
   "search_results.see_all": "Näytä kaikki",
   "search_results.statuses": "Julkaisut",
   "search_results.title": "Hae {q}",
-  "server_banner.about_active_users": "Palvelinta käyttäneet ihmiset viimeisen 30 päivän aikana (kuukauden aktiiviset käyttäjät)",
+  "server_banner.about_active_users": "Palvelimen käyttäjät viimeisten 30 päivän ajalta (kuukauden aktiiviset käyttäjät)",
   "server_banner.active_users": "aktiivista käyttäjää",
   "server_banner.administered_by": "Ylläpitäjä:",
   "server_banner.introduction": "{domain} kuuluu hajautettuun sosiaaliseen verkostoon, jonka voimanlähde on {mastodon}.",
@@ -644,21 +714,22 @@
   "status.direct": "Mainitse @{name} yksityisesti",
   "status.direct_indicator": "Yksityinen maininta",
   "status.edit": "Muokkaa",
-  "status.edited": "Muokattu {date}",
+  "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Upota",
   "status.favourite": "Suosikki",
+  "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
   "status.filtered": "Suodatettu",
   "status.hide": "Piilota julkaisu",
-  "status.history.created": "{name} luotu {date}",
+  "status.history.created": "{name} loi {date}",
   "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
   "status.media.open": "Avaa napsauttamalla",
   "status.media.show": "Napsauta näyttääksesi",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",
-  "status.more": "Lisää",
+  "status.more": "Enemmän",
   "status.mute": "Mykistä @{name}",
   "status.mute_conversation": "Mykistä keskustelu",
   "status.open": "Laajenna julkaisu",
@@ -668,6 +739,7 @@
   "status.reblog": "Tehosta",
   "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
   "status.reblogged_by": "{name} tehosti",
+  "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
   "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",
@@ -680,14 +752,14 @@
   "status.show_filter_reason": "Näytä joka tapauksessa",
   "status.show_less": "Näytä vähemmän",
   "status.show_less_all": "Näytä kaikista vähemmän",
-  "status.show_more": "Näytä lisää",
+  "status.show_more": "Näytä enemmän",
   "status.show_more_all": "Näytä kaikista enemmän",
   "status.show_original": "Näytä alkuperäinen",
   "status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
   "status.translate": "Käännä",
-  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen {provider}",
+  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
   "status.uncached_media_warning": "Esikatselu ei ole käytettävissä",
-  "status.unmute_conversation": "Poista keskustelun mykistys",
+  "status.unmute_conversation": "Kumoa keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
   "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
   "subscribed_languages.save": "Tallenna muutokset",
@@ -697,9 +769,9 @@
   "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
   "time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
-  "time_remaining.moments": "Hetki jäljellä",
+  "time_remaining.moments": "Hetkiä jäljellä",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "{resource} muilta palvelimilta ei näytetä.",
+  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource}-tietoa ei näytetä täällä.",
   "timeline_hint.resources.followers": "Seuraajat",
   "timeline_hint.resources.follows": "seurattua",
   "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
@@ -712,25 +784,23 @@
   "upload_area.title": "Lataa raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolatauksien rajoitus ylitetty.",
-  "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
+  "upload_error.poll": "Tiedostojen lisääminen ei ole sallittua kyselyjen ohessa.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
-  "upload_form.description_missing": "Kuvausta ei ole lisätty",
   "upload_form.edit": "Muokkaa",
-  "upload_form.thumbnail": "Vaihda pikkukuva",
-  "upload_form.undo": "Poista",
+  "upload_form.thumbnail": "Vaihda pienoiskuva",
   "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
-  "upload_modal.applying": "Asetetaan…",
+  "upload_modal.applying": "Otetaan käyttöön…",
   "upload_modal.choose_image": "Valitse kuva",
   "upload_modal.description_placeholder": "Nopea ruskea kettu hyppää laiskan koiran yli",
   "upload_modal.detect_text": "Tunnista teksti kuvasta",
   "upload_modal.edit_media": "Muokkaa mediaa",
-  "upload_modal.hint": "Klikkaa tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
+  "upload_modal.hint": "Napsauta tai vedä ympyrä esikatselussa valitaksesi keskipiste, joka näkyy aina pienoiskuvissa.",
   "upload_modal.preparing_ocr": "Valmistellaan tekstintunnistusta…",
   "upload_modal.preview_label": "Esikatselu ({ratio})",
-  "upload_progress.label": "Ladataan...",
+  "upload_progress.label": "Tallennetaan...",
   "upload_progress.processing": "Käsitellään…",
   "username.taken": "Käyttäjänimi on jo varattu. Kokeile toista",
   "video.close": "Sulje video",
@@ -740,7 +810,7 @@
   "video.fullscreen": "Koko näyttö",
   "video.hide": "Piilota video",
   "video.mute": "Mykistä ääni",
-  "video.pause": "Keskeytä",
+  "video.pause": "Tauko",
   "video.play": "Toista",
   "video.unmute": "Palauta ääni"
 }
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index ec27c8f60e..894d73c8cc 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -27,6 +27,7 @@
   "account.featured_tags.last_status_never": "Walang mga post",
   "account.featured_tags.title": "Nakatampok na hashtag ni {name}",
   "account.follow": "Sundan",
+  "account.follow_back": "Sundan pabalik",
   "account.followers": "Mga tagasunod",
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
   "account.following": "Sinusundan",
@@ -41,6 +42,15 @@
   "account.media": "Medya",
   "account.mention": "Banggitin si @{name}",
   "account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+  "account.open_original_page": "Buksan ang pinagmulang pahina",
+  "account.report": "I-ulat si/ang @{name}",
+  "account.requested_follow": "Hinihiling ni {name} na sundan ka",
+  "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
+  "account.unendorse": "Huwag itampok sa profile",
+  "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
+  "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
+  "audio.hide": "Itago ang tunog",
+  "block_modal.title": "Harangan ang tagagamit?",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -91,6 +101,23 @@
   "compose_form.direct_message_warning_learn_more": "Matuto pa",
   "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
   "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
+  "compose_form.placeholder": "Anong nangyari?",
+  "compose_form.poll.multiple": "Maraming pagpipilian",
+  "compose_form.poll.single": "Piliin ang isa",
+  "compose_form.reply": "Tumugon",
+  "compose_form.spoiler.marked": "Tanggalin ang babala sa nilalaman",
+  "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
+  "confirmation_modal.cancel": "Pagpaliban",
+  "confirmations.block.confirm": "Harangan",
+  "confirmations.cancel_follow_request.confirm": "Bawiin ang kahilingan",
+  "confirmations.cancel_follow_request.message": "Sigurdo ka bang gusto mong bawiin ang kahilingang sundan si/ang {name}?",
+  "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
+  "confirmations.delete_list.confirm": "Tanggalin",
+  "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
+  "confirmations.discard_edit_media.confirm": "Ipagpaliban",
+  "confirmations.edit.confirm": "Baguhin",
+  "confirmations.reply.confirm": "Tumugon",
+  "conversation.mark_as_read": "Markahan bilang nabasa na",
   "copy_icon_button.copied": "Sinipi sa clipboard",
   "copypaste.copied": "Sinipi",
   "copypaste.copy_to_clipboard": "I-sipi sa clipboard",
@@ -106,6 +133,10 @@
   "dismissable_banner.explore_statuses": "Ito ang mga sumisikat na mga post sa iba't ibang bahagi ng social web ngayon. Ang mga mas bagong post na mas marami ang mga pagpapalakas at paborito ay tinataasan ng antas.",
   "dismissable_banner.explore_tags": "Ito ang mga sumisikat na mga hashtag sa iba't ibang bahagi ng social web ngayon. Ang mga hashtag ginagamit ng mas maraming mga iba't ibang tao ay tinataasan ng antas.",
   "dismissable_banner.public_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong nasa social web na sinusundan ng mga tao sa {domain}.",
+  "domain_block_modal.block": "Harangan ang serbiro",
+  "domain_block_modal.title": "Harangan ang domain?",
+  "domain_block_modal.you_will_lose_followers": "Mabubura ang iyong mga tagasunod mula sa serbirong ito.",
+  "domain_pill.server": "Serbiro",
   "embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
   "embed.preview": "Ito ang magiging itsura:",
   "emoji_button.activity": "Aktibidad",
@@ -140,5 +171,154 @@
   "empty_column.hashtag": "Wala pang laman ang hashtag na ito.",
   "empty_column.home": "Walang laman ang timeline ng tahanan mo! Sumunod sa marami pang tao para mapunan ito.",
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
-  "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito."
+  "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
+  "explore.search_results": "Mga resulta ng paghahanap",
+  "explore.title": "Tuklasin",
+  "explore.trending_links": "Mga balita",
+  "filter_modal.select_filter.search": "Hanapin o gumawa",
+  "firehose.all": "Lahat",
+  "firehose.local": "Itong serbiro",
+  "firehose.remote": "Ibang mga serbiro",
+  "follow_request.authorize": "Tanggapin",
+  "follow_request.reject": "Tanggihan",
+  "follow_suggestions.dismiss": "Huwag nang ipakita muli",
+  "follow_suggestions.view_all": "Tingnan lahat",
+  "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
+  "footer.about": "Tungkol dito",
+  "footer.get_app": "Kunin ang app",
+  "generic.saved": "Nakaimbak",
+  "hashtag.column_header.tag_mode.all": "at {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "home.column_settings.show_replies": "Ipakita ang mga tugon",
+  "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
+  "interaction_modal.login.action": "Iuwi mo ako",
+  "interaction_modal.no_account_yet": "Wala sa Mastodon?",
+  "interaction_modal.on_another_server": "Sa ibang serbiro",
+  "interaction_modal.on_this_server": "Sa serbirong ito",
+  "interaction_modal.title.follow": "Sundan si {name}",
+  "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
+  "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
+  "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
+  "keyboard_shortcuts.description": "Paglalarawan",
+  "keyboard_shortcuts.down": "Ilipat pababa sa talaan",
+  "keyboard_shortcuts.mention": "Banggitin ang may-akda",
+  "keyboard_shortcuts.requests": "Buksan ang talaan ng mga kahilingan sa pagsunod",
+  "keyboard_shortcuts.up": "Ilipat pataas sa talaan",
+  "lightbox.close": "Isara",
+  "lightbox.next": "Susunod",
+  "lightbox.previous": "Nakaraan",
+  "link_preview.author": "Ni/ng {name}",
+  "lists.account.add": "Idagdag sa talaan",
+  "lists.account.remove": "Tanggalin mula sa talaan",
+  "lists.new.create": "Idagdag sa talaan",
+  "lists.new.title_placeholder": "Bagong pangalan ng talaan",
+  "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
+  "lists.subheading": "Iyong mga talaan",
+  "loading_indicator.label": "Kumakarga…",
+  "navigation_bar.about": "Tungkol dito",
+  "navigation_bar.blocks": "Nakaharang na mga tagagamit",
+  "navigation_bar.direct": "Mga palihim na banggit",
+  "navigation_bar.favourites": "Mga paborito",
+  "navigation_bar.follows_and_followers": "Mga sinusundan at tagasunod",
+  "navigation_bar.lists": "Mga listahan",
+  "navigation_bar.search": "Maghanap",
+  "notification.admin.report": "Iniulat ni {name} si {target}",
+  "notification.follow": "Sinundan ka ni {name}",
+  "notification.follow_request": "Hinihiling ni {name} na sundan ka",
+  "notification.mention": "Binanggit ka ni {name}",
+  "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
+  "notification_requests.accept": "Tanggapin",
+  "notification_requests.notifications_from": "Mga abiso mula kay/sa {name}",
+  "notifications.clear": "Burahin mga abiso",
+  "notifications.column_settings.admin.report": "Mga bagong ulat:",
+  "notifications.column_settings.alert": "Mga abiso sa Desktop",
+  "notifications.column_settings.favourite": "Mga paborito:",
+  "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
+  "notifications.column_settings.update": "Mga pagbago:",
+  "notifications.filter.all": "Lahat",
+  "notifications.filter.favourites": "Mga paborito",
+  "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
+  "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
+  "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
+  "onboarding.action.back": "Ibalik mo ako",
+  "onboarding.actions.back": "Ibalik mo ako",
+  "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
+  "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
+  "onboarding.share.next_steps": "Mga posibleng susunod na hakbang:",
+  "poll.closed": "Sarado",
+  "poll.reveal": "Ipakita ang mga resulta",
+  "poll.voted": "Binoto mo para sa sagot na ito",
+  "poll_button.remove_poll": "Tanggalin ang boto",
+  "privacy.direct.long": "Lahat ng mga binanggit sa post",
+  "privacy.private.long": "Mga tagasunod mo lamang",
+  "privacy.private.short": "Mga tagasunod",
+  "privacy.public.long": "Sinumang nasa loob at labas ng Mastodon",
+  "regeneration_indicator.label": "Kumakarga…",
+  "relative_time.days": "{number}a",
+  "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
+  "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",
+  "relative_time.full.just_now": "ngayon lang",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang nakalipas",
+  "relative_time.full.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang nakalipas",
+  "relative_time.hours": "{number}o",
+  "relative_time.just_now": "ngayon",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "Ipagpaliban",
+  "report.block": "Harangan",
+  "report.categories.other": "Iba pa",
+  "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
+  "report.close": "Tapos na",
+  "report.next": "Sunod",
+  "report.reasons.violation": "Lumalabag ito sa mga panuntunan ng serbiro",
+  "report.reasons.violation_description": "Alam mo na lumalabag ito sa mga partikular na panuntunan",
+  "report.rules.title": "Aling mga patakaran ang nilabag?",
+  "report.submit": "Isumite",
+  "report.target": "Iniulat si/ang {target}",
+  "report.thanks.take_action_actionable": "Habang sinusuri namin ito, maaari kang gumawa ng aksyon laban kay/sa {name}:",
+  "report.thanks.title": "Ayaw mo bang makita ito?",
+  "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
+  "report_notification.categories.other": "Iba pa",
+  "search.quick_action.open_url": "Buksan ang URL sa Mastodon",
+  "search.search_or_paste": "Maghanap o ilagay ang URL",
+  "search_popout.full_text_search_disabled_message": "Hindi magagamit sa {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Magagamit lamang kapag naka-log in.",
+  "search_results.all": "Lahat",
+  "search_results.see_all": "Ipakita lahat",
+  "server_banner.learn_more": "Matuto nang higit pa",
+  "server_banner.server_stats": "Katayuan ng serbiro:",
+  "status.block": "Harangan si @{name}",
+  "status.delete": "Tanggalin",
+  "status.direct": "Palihim na banggitin si/ang @{name}",
+  "status.direct_indicator": "Palihim na banggit",
+  "status.edit": "Baguhin",
+  "status.edited_x_times": "Binago {count, plural, one {{count} beses} other {{count} na beses}}",
+  "status.history.created": "Nilikha ni/ng {name} {date}",
+  "status.history.edited": "Binago ni/ng {name} {date}",
+  "status.media.open": "Pindutin upang buksan",
+  "status.media.show": "Pindutin upang ipakita",
+  "status.mention": "Banggitin ang/si @{name}",
+  "status.more": "Higit pa",
+  "status.read_more": "Basahin ang higit pa",
+  "status.reblogs.empty": "Wala pang nagpalakas ng post na ito. Kung may sinumang nagpalakas, makikita sila rito.",
+  "status.reply": "Tumugon",
+  "status.report": "I-ulat si/ang @{name}",
+  "status.sensitive_warning": "Sensitibong nilalaman",
+  "status.share": "Ibahagi",
+  "status.show_less": "Magpakita ng mas kaunti",
+  "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
+  "status.show_more": "Magpakita ng higit pa",
+  "status.show_more_all": "Magpakita ng higit pa para sa lahat",
+  "status.translate": "Isalin",
+  "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
+  "status.uncached_media_warning": "Hindi makuha ang paunang tigin",
+  "tabs_bar.notifications": "Mga abiso",
+  "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
+  "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
+  "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
+  "timeline_hint.remote_resource_not_displayed": "Hindi ipinapakita ang {resource} mula sa ibang mga serbiro.",
+  "timeline_hint.resources.followers": "Mga tagasunod",
+  "timeline_hint.resources.follows": "Mga sinusundan"
 }
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 9259f20154..f22a829c0c 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -7,7 +7,7 @@
   "about.domain_blocks.silenced.explanation": "Yvirhøvur, so sært tú ikki vangar og innihald frá hesum ambætaranum, uttan so at tú skilliga leitar hesi upp ella velur tey við at fylgja teimum.",
   "about.domain_blocks.silenced.title": "Avmarkað",
   "about.domain_blocks.suspended.explanation": "Ongar dátur frá hesum ambætara verða viðgjørd, goymd ella deild, tað ger, at samskifti við aðrar ambætarar er iki møguligt.",
-  "about.domain_blocks.suspended.title": "Koyrdur frá",
+  "about.domain_blocks.suspended.title": "Gjørt óvirkið",
   "about.not_available": "Hetta er ikki tøkt á føroyska servaranum enn.",
   "about.powered_by": "Miðfirra almennur miðil koyrandi á {mastodon}",
   "about.rules": "Ambætarareglur",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
-  "autosuggest_hashtag.per_week": "{count} um vikuna",
+  "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
+  "block_modal.show_less": "Vís minni",
+  "block_modal.show_more": "Vís meiri",
+  "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
+  "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
+  "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
+  "block_modal.title": "Banna brúkara?",
+  "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Kontoin hjá tær er ikki {locked}. Øll kunnu fylgja tær og lesa tað, tú bert letur fyljgarar lesa.",
   "compose_form.lock_disclaimer.lock": "læst",
   "compose_form.placeholder": "Hvat hevur tú í huga?",
-  "compose_form.poll.add_option": "Legg valmøguleika afturat",
   "compose_form.poll.duration": "Atkvøðugreiðslutíð",
+  "compose_form.poll.multiple": "Fleiri valmøguleikar",
   "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
-  "compose_form.poll.remove_option": "Strika valmøguleikan",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
   "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
-  "compose_form.publish": "Legg út",
+  "compose_form.poll.type": "Stílur",
+  "compose_form.publish": "Posta",
   "compose_form.publish_form": "Legg út",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Goym broytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Dagfør",
   "compose_form.spoiler.marked": "Ávaring um at strika innihald",
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
-  "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+  "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
-  "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
-  "confirmations.block.message": "Ert tú vís/ur í, at tú vilt banna {name}?",
   "confirmations.cancel_follow_request.confirm": "Tak umbønina aftur",
   "confirmations.cancel_follow_request.message": "Er tað tilætlað, at tú tekur umbønina at fylgja {name} aftur?",
   "confirmations.delete.confirm": "Strika",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ert tú vís/ur í, at tú vilt strika hetta uppslagið?",
   "confirmations.discard_edit_media.confirm": "Vraka",
   "confirmations.discard_edit_media.message": "Tú hevur broytingar í miðlalýsingini ella undansýningini, sum ikki eru goymdar. Vilt tú kortini vraka?",
-  "confirmations.domain_block.confirm": "Banna heilum økisnavni",
+  "confirmations.domain_block.confirm": "Banna ambætara",
   "confirmations.domain_block.message": "Ert tú púra, púra vís/ur í, at tú vilt banna øllum {domain}? Í flestu førum er nóg mikið og betri, bert at banna ella doyva onkrum ávísum. Tú fert eingi evni at síggja frá økisnavninum á nakrari almennari tíðarrás ella í tínum fráboðanum. Tínir fylgjarar undir økisnavninum verða eisini strikaðir.",
   "confirmations.edit.confirm": "Rætta",
   "confirmations.edit.message": "Rættingar, sum verða gjørdar nú, skriva yvir boðini, sum tú ert í holt við. Ert tú vís/ur í, at tú vilt halda fram?",
   "confirmations.logout.confirm": "Rita út",
   "confirmations.logout.message": "Ert tú vís/ur í, at tú vilt útrita teg?",
   "confirmations.mute.confirm": "Doyv",
-  "confirmations.mute.explanation": "Henda atgerð fjalir teirra postar og postar, ið nevna tey; men tey kunnu framvegis síggja tínar postar og fylgja tær.",
-  "confirmations.mute.message": "Ert tú vís/ur í, at tú vilt doyva {name}?",
   "confirmations.redraft.confirm": "Sletta og skriva umaftur",
   "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
   "confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Hesi uppsløg, frá hesum og øðrum ambætarum á miðspjadda netverkinum, hava framgongd á hesum ambætara júst nú. Nýggjari postar, sum fleiri hava framhevja og dáma, verða raðfestir hægri.",
   "dismissable_banner.explore_tags": "Hesi frámerki vinna í løtuni fótafesti millum fólk á hesum og øðrum ambætarum í desentrala netverkinum beint nú.",
   "dismissable_banner.public_timeline": "Hetta eru teir nýggjast postarnir frá fólki á sosialu vevinum, sum fólk á {domain} fylgja.",
+  "domain_block_modal.block": "Banna ambætara",
+  "domain_block_modal.block_account_instead": "Banna @{name} ístaðin",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá hesum ambætara kunnu svara tínum gomlu postum.",
+  "domain_block_modal.they_cant_follow": "Eingin frá hesum ambætara kann fylgja tær.",
+  "domain_block_modal.they_wont_know": "Tey vita ikki, at tey eru bannað.",
+  "domain_block_modal.title": "Banna økisnavni?",
+  "domain_block_modal.you_will_lose_followers": "Allir tínir fylgjarar á hesum ambætara hvørva.",
+  "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
+  "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
+  "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
+  "domain_pill.server": "Ambætari",
+  "domain_pill.their_handle": "Teirra hald:",
+  "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
+  "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+  "domain_pill.username": "Brúkaranavn",
+  "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
+  "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum <button>ActivityPub-riknum pallum</button>.",
+  "domain_pill.your_handle": "Títt hald:",
+  "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
+  "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
   "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
   "embed.preview": "Soleiðis fer tað at síggja út:",
   "emoji_button.activity": "Virksemi",
@@ -244,6 +266,7 @@
   "empty_column.list": "Einki er í hesum listanum enn. Tá limir í hesum listanum posta nýggjar postar, so síggjast teir her.",
   "empty_column.lists": "Tú hevur ongar goymdar listar enn. Tá tú gert ein lista, so sært tú hann her.",
   "empty_column.mutes": "Tú hevur enn ikki doyvt nakran brúkara.",
+  "empty_column.notification_requests": "Alt er klárt! Her er einki. Tá tú fært nýggjar fráboðanir, síggjast tær her sambært tínum stillingum.",
   "empty_column.notifications": "Tú hevur ongar fráboðanir enn. Tá onnur samskifta við teg, so sær tú fráboðaninar her.",
   "empty_column.public": "Einki er her! Skriva okkurt alment ella fylg brúkarum frá øðrum ambætarum fyri at fylla tilfar í",
   "error.unexpected_crash.explanation": "Orsakað av einum feili í okkara kotu ella orsakað av at kagin hjá tær ikki er sambæriligur við skipanina, so bar ikki til at vísa hesa síðuna rætt.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {umrøða} other {umrøður}}",
+  "filtered_notifications_banner.pending_requests": "Fráboðanir frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
+  "filtered_notifications_banner.title": "Sáldaðar fráboðanir",
   "firehose.all": "Allar",
   "firehose.local": "Hesin ambætarin",
   "firehose.remote": "Aðrir ambætarar",
   "follow_request.authorize": "Veit myndugleika",
   "follow_request.reject": "Nokta",
   "follow_requests.unlocked_explanation": "Sjálvt um konta tín ikki er læst, so hugsa {domain} starvsfólkini, at tú kanska hevur hug at kanna umbønir um at fylgja frá hesum kontum við hond.",
+  "follow_suggestions.curated_suggestion": "Val hjá ábyrgdarfólki",
+  "follow_suggestions.dismiss": "Lat vera við at vísa",
+  "follow_suggestions.featured_longer": "Vald burturúr av {domain} toyminum",
+  "follow_suggestions.friends_of_friends_longer": "Vælumtókt millum fólk, sum tú fylgir",
+  "follow_suggestions.hints.featured": "Hesin vangin er úrvaldur av toyminum handan {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Hesin vangin er vælumtóktur millum tey, tú fylgir.",
+  "follow_suggestions.hints.most_followed": "Hesin vangin er ein av teimum, sum er mest fylgdur á {domain}.",
+  "follow_suggestions.hints.most_interactions": "Nýliga hava nógv lagt merki til hendan vangan á {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Hesin vangin líkist teimum, sum tú nýliga hevur fylgt.",
+  "follow_suggestions.personalized_suggestion": "Persónligt uppskot",
+  "follow_suggestions.popular_suggestion": "Vælumtókt uppskot",
+  "follow_suggestions.popular_suggestion_longer": "Vælumtókt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Líkist vangum, sum tú nýliga hevur fylgt",
+  "follow_suggestions.view_all": "Vís øll",
+  "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
   "followed_tags": "Fylgd frámerki",
   "footer.about": "Um",
   "footer.directory": "Vangaskrá",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
-  "home.actions.go_to_explore": "Sí rákið",
-  "home.actions.go_to_suggestions": "Finn fólk at fylgja",
-  "home.column_settings.basic": "Grundleggjandi",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
-  "home.explore_prompt.body": "Heimarásin fer at hava eitt bland av postum frá frámerkjunum, sum tú hevur valt at fylgja, brúkarunum, tú hevur valt at fylgja, og postunum, sum tey stimbra. Um tað kennist ov friðarligt, so kanst tú:",
-  "home.explore_prompt.title": "Hetta er tín heimastøð í Mastodon.",
   "home.hide_announcements": "Fjal kunngerðir",
   "home.pending_critical_update.body": "Vinarliga dagfør Mastodon ambætaran hjá tær so skjótt sum møguligt!",
   "home.pending_critical_update.link": "Sí dagføringar",
@@ -393,11 +429,18 @@
   "lists.search": "Leita millum fólk, sum tú fylgir",
   "lists.subheading": "Tínir listar",
   "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
+  "loading_indicator.label": "Innlesur…",
   "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
-  "mute_modal.duration": "Tíðarbil",
-  "mute_modal.hide_notifications": "Fjal fráboðanir frá hesum brúkaranum?",
-  "mute_modal.indefinite": "Óásett tíðarskeið",
+  "mute_modal.hide_from_notifications": "Fjal boð",
+  "mute_modal.hide_options": "Fjal valmøguleikar",
+  "mute_modal.indefinite": "Inntil eg tendri tey aftur",
+  "mute_modal.show_options": "Vís valmøguleikar",
+  "mute_modal.they_can_mention_and_follow": "Tey kunnu bæði nevna og fylgja tær, men tú sært ikki tey.",
+  "mute_modal.they_wont_know": "Tey vita ikki, at tey eru sløkt.",
+  "mute_modal.title": "Sløkk brúkara?",
+  "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
+  "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -407,7 +450,6 @@
   "navigation_bar.direct": "Privatar umrøður",
   "navigation_bar.discover": "Uppdaga",
   "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.edit_profile": "Broyt vanga",
   "navigation_bar.explore": "Rannsaka",
   "navigation_bar.favourites": "Dámdir postar",
   "navigation_bar.filters": "Doyvd orð",
@@ -431,11 +473,29 @@
   "notification.follow": "{name} fylgdi tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
   "notification.mention": "{name} nevndi teg",
+  "notification.moderation-warning.learn_more": "Lær meira",
+  "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávaring",
+  "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
+  "notification.moderation_warning.action_disable": "Konta tín er gjørd óvirkin.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nakrir av postum tínum eru merktir sum viðkvæmir.",
+  "notification.moderation_warning.action_none": "Konta tín hevur móttikið eina umsjónarávaring.",
+  "notification.moderation_warning.action_sensitive": "Postar tínir verða merktir sum viðkvæmir frá nú av.",
+  "notification.moderation_warning.action_silence": "Konta tín er avmarkað.",
+  "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú hevur atkvøtt, er endað",
   "notification.reblog": "{name} lyfti tín post",
+  "notification.relationships_severance_event": "Mist sambond við {name}",
+  "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
+  "notification.relationships_severance_event.domain_block": "Ein umsitari frá {from} hevur blokerað {target}, íroknað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
+  "notification.relationships_severance_event.learn_more": "Lær meira",
+  "notification.relationships_severance_event.user_domain_block": "Tú hevur blokerað {target}, strikað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
   "notification.status": "{name} hevur júst postað",
   "notification.update": "{name} rættaði ein post",
+  "notification_requests.accept": "Góðtak",
+  "notification_requests.dismiss": "Avvís",
+  "notification_requests.notifications_from": "Fráboðanir frá {name}",
+  "notification_requests.title": "Sáldaðar fráboðanir",
   "notifications.clear": "Rudda fráboðanir",
   "notifications.clear_confirmation": "Ert tú vís/ur í, at tú vilt strika allar tínar fráboðanir?",
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
@@ -444,7 +504,6 @@
   "notifications.column_settings.favourite": "Dámdir postar:",
   "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
   "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
-  "notifications.column_settings.filter_bar.show_bar": "Vís filturbjálka",
   "notifications.column_settings.follow": "Nýggir fylgjarar:",
   "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
   "notifications.column_settings.mention": "Umrøður:",
@@ -470,6 +529,15 @@
   "notifications.permission_denied": "Skriviborðsfráboðanir eru ikki tøkar tí at ein kaga-umbøn áður bleiv noktað",
   "notifications.permission_denied_alert": "Tað ber ikki til at sláa skriviborðsfráboðanir til, tí at kagarættindi áður eru noktaði",
   "notifications.permission_required": "Skriviborðsfráboðanir eru ikki tøkar, tí at neyðugu rættindini eru ikki latin.",
+  "notifications.policy.filter_new_accounts.hint": "Stovnaðar {days, plural, one {seinasta dagin} other {seinastu # dagarnar}}",
+  "notifications.policy.filter_new_accounts_title": "Nýggjar kontur",
+  "notifications.policy.filter_not_followers_hint": "Íroknað fólk, sum hava fylgt tær styttri enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Fólk, sum ikki fylgja tær",
+  "notifications.policy.filter_not_following_hint": "Til tú góðkennir tey manuelt",
+  "notifications.policy.filter_not_following_title": "Fólk, sum tú ikki fylgir",
+  "notifications.policy.filter_private_mentions_hint": "Sáldaði, uttan so at tað er í svari til tínar egnu nevningar ella um tú fylgir sendaranum",
+  "notifications.policy.filter_private_mentions_title": "Óbidnar privatar umrøður",
+  "notifications.policy.title": "Sálda burtur fráboðanir frá…",
   "notifications_permission_banner.enable": "Ger skriviborðsfráboðanir virknar",
   "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
   "notifications_permission_banner.title": "Miss einki",
@@ -483,6 +551,15 @@
   "onboarding.follows.title": "Vælumtókt á Mastodon",
   "onboarding.profile.discoverable": "Ger tað møguligt hjá øðrum at finna vangan hjá mær",
   "onboarding.profile.discoverable_hint": "Tá tú játtar at onnur skulu kunna finna teg á Mastodon, so kann henda, at postar tínir síggjast í leitiúrslitum og rákum, og vangin hjá tær kann vera skotin upp fyri fólki við áhugamálum sum minna um tíni.",
+  "onboarding.profile.display_name": "Navn, sum skal vísast",
+  "onboarding.profile.display_name_hint": "Títt fulla navn ella títt stuttliga navn…",
+  "onboarding.profile.lead": "Tú kanst altíð gera hetta liðugt seinni í stillingunum, har enn fleiri tillagingarmøguleikar eru tøkir.",
+  "onboarding.profile.note": "Ævilýsing",
+  "onboarding.profile.note_hint": "Tú kanst @umrøða onnur fólk ella #frámerki…",
+  "onboarding.profile.save_and_continue": "Goym og halt fram",
+  "onboarding.profile.title": "Vangauppsetan",
+  "onboarding.profile.upload_avatar": "Legg vangamynd upp",
+  "onboarding.profile.upload_header": "Legg vangahøvd upp",
   "onboarding.share.lead": "Lat fólk vita, hvussu tey kunnu finna teg á Mastodon!",
   "onboarding.share.message": "Eg eri {username} á #Mastodon! Kom og fylg mær á {url}",
   "onboarding.share.next_steps": "Møgulig næstu stig:",
@@ -516,14 +593,15 @@
   "poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
   "poll_button.remove_poll": "Strika atkvøðugreiðslu",
   "privacy.change": "Broyt privatverju av posti",
-  "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
-  "privacy.direct.short": "Bert nevnd fólk",
-  "privacy.private.long": "Bert sjónligt hjá fylgjarum",
-  "privacy.private.short": "Einans fylgjarar",
-  "privacy.public.long": "Sjónligt hjá øllum",
+  "privacy.direct.long": "Øll, sum eru nevnd í postinum",
+  "privacy.direct.short": "Ávís fólk",
+  "privacy.private.long": "Einans tey, ið fylgja tær",
+  "privacy.private.short": "Fylgjarar",
+  "privacy.public.long": "Øll í og uttanfyri Mastodon",
   "privacy.public.short": "Alment",
-  "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
-  "privacy.unlisted.short": "Ikki listað",
+  "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
+  "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+  "privacy.unlisted.short": "Stillur almenningur",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
   "recommended": "Viðmælt",
@@ -541,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
   "reply_indicator.cancel": "Ógilda",
+  "reply_indicator.poll": "Atkvøðugreiðsla",
   "report.block": "Blokera",
   "report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
   "report.categories.legal": "Løgfrøðisligt",
@@ -634,10 +714,11 @@
   "status.direct": "Umrøð @{name} privat",
   "status.direct_indicator": "Privat umrøða",
   "status.edit": "Rætta",
-  "status.edited": "Rættað {date}",
+  "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
   "status.embed": "Legg inní",
   "status.favourite": "Dámdur postur",
+  "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
   "status.filtered": "Filtrerað",
   "status.hide": "Fjal post",
@@ -658,6 +739,7 @@
   "status.reblog": "Stimbra",
   "status.reblog_private": "Stimbra við upprunasýni",
   "status.reblogged_by": "{name} stimbrað",
+  "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
   "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
   "status.redraft": "Strika & ger nýggja kladdu",
   "status.remove_bookmark": "Gloym",
@@ -705,10 +787,8 @@
   "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
   "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
   "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
-  "upload_form.description_missing": "Lýsing vantar",
   "upload_form.edit": "Rætta",
   "upload_form.thumbnail": "Broyt smámynd",
-  "upload_form.undo": "Strika",
   "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Ger virkið",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f2d99412d2..9e29852904 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.show_less": "Afficher moins",
+  "block_modal.show_more": "Afficher plus",
+  "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "À quoi pensez-vous?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
+  "compose_form.poll.multiple": "Choix multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Choisissez-en un",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
+  "compose_form.poll.type": "Style",
   "compose_form.publish": "Publier",
   "compose_form.publish_form": "Publier",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
+  "compose_form.reply": "Répondre",
+  "compose_form.save_changes": "Mis à jour",
   "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
+  "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirer cette demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name}?",
   "confirmations.delete.confirm": "Supprimer",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
-  "confirmations.domain_block.confirm": "Bloquer ce domaine entier",
+  "confirmations.domain_block.confirm": "Bloquer le serveur",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Éditer",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses publications et celle le/la mentionnant, mais cela lui permettra toujours de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name}?",
   "confirmations.redraft.confirm": "Supprimer et réécrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Voici des publications venant de tout le web social gagnant en popularité aujourd’hui. Les nouvelles publications avec plus de boosts et de favoris sont classés plus haut.",
   "dismissable_banner.explore_tags": "Ces hashtags sont présentement en train de gagner de l'ampleur parmi des personnes sur les serveurs du réseau décentralisé dont celui-ci.",
   "dismissable_banner.public_timeline": "Ce sont les messages publics les plus récents de personnes sur le web social que les gens de {domain} suivent.",
+  "domain_block_modal.block": "Bloquer le serveur",
+  "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
+  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
+  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
+  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
+  "domain_pill.server": "Serveur",
+  "domain_pill.their_handle": "Son identifiant :",
+  "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
+  "domain_pill.username": "Nom d’utilisateur",
+  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
+  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.your_handle": "Votre identifiant :",
+  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
   "embed.preview": "Voici comment il apparaîtra:",
   "emoji_button.activity": "Activité",
@@ -244,6 +266,7 @@
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouvelles publications, elles apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
   "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
+  "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.",
   "empty_column.notifications": "Vous n'avez pas encore de notifications. Quand d'autres personnes interagissent avec vous, vous en verrez ici.",
   "empty_column.public": "Il n’y a rien ici! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bogue dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -274,12 +297,25 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir peut-être consulter manuellement les demandes d'abonnement de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",
@@ -306,13 +342,8 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.actions.go_to_explore": "Voir les tendances",
-  "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
-  "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
   "home.pending_critical_update.link": "Voir les mises à jour",
@@ -396,9 +427,15 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de ce compte?",
-  "mute_modal.indefinite": "Indéfinie",
+  "mute_modal.hide_from_notifications": "Cacher des notifications",
+  "mute_modal.hide_options": "Masquer les options",
+  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.show_options": "Afficher les options",
+  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -408,7 +445,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -435,8 +471,17 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé est terminé",
   "notification.reblog": "{name} a boosté votre message",
+  "notification.relationships_severance_event": "Connexions perdues avec {name}",
+  "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+  "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+  "notification.relationships_severance_event.learn_more": "En savoir plus",
+  "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié une publication",
+  "notification_requests.accept": "Accepter",
+  "notification_requests.dismiss": "Rejeter",
+  "notification_requests.notifications_from": "Notifications de {name}",
+  "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications?",
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
@@ -444,8 +489,7 @@
   "notifications.column_settings.alert": "Notifications navigateur",
   "notifications.column_settings.favourite": "Favoris:",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+  "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
   "notifications.column_settings.mention": "Mentions:",
@@ -471,6 +515,15 @@
   "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
+  "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
+  "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
+  "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
+  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
@@ -526,14 +579,15 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
-  "privacy.private.short": "Abonné·e·s seulement",
-  "privacy.public.long": "Visible pour tous",
+  "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.private.long": "Seulement vos abonnés",
+  "privacy.private.short": "Abonnés",
+  "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
+  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.short": "Public calme",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -551,7 +605,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Bloquer",
   "report.block_explanation": "Vous ne verrez plus les publications de ce compte. Il ne pourra ni vous suivre ni voir vos publications. Il pourra savoir qu'il a été bloqué.",
   "report.categories.legal": "Légal",
@@ -644,10 +700,11 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifiée le {date}",
+  "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
+  "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
   "status.filtered": "Filtrée",
   "status.hide": "Masquer le message",
@@ -668,6 +725,7 @@
   "status.reblog": "Booster",
   "status.reblog_private": "Booster avec visibilité originale",
   "status.reblogged_by": "{name} a boosté",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des signets",
@@ -715,10 +773,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyants",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 774702f98c..1a5803623f 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.show_less": "Afficher moins",
+  "block_modal.show_more": "Afficher plus",
+  "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
+  "compose_form.poll.multiple": "Choix multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Choisissez-en un",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
+  "compose_form.poll.type": "Style",
   "compose_form.publish": "Publier",
   "compose_form.publish_form": "Nouvelle publication",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
+  "compose_form.reply": "Répondre",
+  "compose_form.save_changes": "Mis à jour",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
+  "compose_form.spoiler_placeholder": "Avertissement de contenu (optionnel)",
   "confirmation_modal.cancel": "Annuler",
-  "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirer la demande",
   "confirmations.cancel_follow_request.message": "Êtes-vous sûr de vouloir retirer votre demande pour suivre {name} ?",
   "confirmations.delete.confirm": "Supprimer",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
-  "confirmations.domain_block.confirm": "Bloquer tout le domaine",
+  "confirmations.domain_block.confirm": "Bloquer le serveur",
   "confirmations.domain_block.message": "Voulez-vous vraiment, vraiment bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables. Vous ne verrez plus de contenu provenant de ce domaine, ni dans vos fils publics, ni dans vos notifications. Vos abonné·e·s utilisant ce domaine seront retiré·e·s.",
   "confirmations.edit.confirm": "Modifier",
   "confirmations.edit.message": "Modifier maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
-  "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
-  "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ces messages venant de tout le web social gagnent en popularité aujourd’hui. Les nouveaux messages avec plus de boosts et de favoris sont classés plus haut.",
   "dismissable_banner.explore_tags": "Ces hashtags sont actuellement en train de gagner de l'ampleur parmi les personnes sur les serveurs du réseau décentralisé dont celui-ci.",
   "dismissable_banner.public_timeline": "Ce sont les posts publics les plus récents de personnes sur le web social que les gens sur {domain} suivent.",
+  "domain_block_modal.block": "Bloquer le serveur",
+  "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
+  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
+  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_followers": "Tous vos abonnés de ce serveur seront supprimés.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
+  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
+  "domain_pill.server": "Serveur",
+  "domain_pill.their_handle": "Son identifiant :",
+  "domain_pill.their_server": "Son foyer numérique, là où tous ses posts résident.",
+  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
+  "domain_pill.username": "Nom d’utilisateur",
+  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
+  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, vous pouvez interagir avec <button>les autres plateformes sociales implémentant ActivityPub</button>.",
+  "domain_pill.your_handle": "Votre identifiant :",
+  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
+  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
   "emoji_button.activity": "Activités",
@@ -244,6 +266,7 @@
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouveaux messages, ils apparaîtront ici.",
   "empty_column.lists": "Vous n’avez pas encore de liste. Lorsque vous en créerez une, elle apparaîtra ici.",
   "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
+  "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "error.unexpected_crash.explanation": "En raison d’un bug dans notre code ou d’un problème de compatibilité avec votre navigateur, cette page n’a pas pu être affichée correctement.",
@@ -274,12 +297,25 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
+  "filtered_notifications_banner.pending_requests": "Notifications {count, plural, =0 {de personne} one {d’une personne} other {de # personnes}} que vous pouvez connaitre",
+  "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
   "firehose.local": "Ce serveur",
   "firehose.remote": "Autres serveurs",
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "follow_requests.unlocked_explanation": "Même si votre compte n’est pas privé, l’équipe de {domain} a pensé que vous pourriez vouloir consulter manuellement les demandes de suivi de ces comptes.",
+  "follow_suggestions.curated_suggestion": "Choix du staff",
+  "follow_suggestions.dismiss": "Ne plus afficher",
+  "follow_suggestions.hints.featured": "Ce profil a été sélectionné par l'équipe de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ce profil est populaire parmi les personnes que vous suivez.",
+  "follow_suggestions.hints.most_followed": "Ce profil est l'un des plus suivis sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ce profil a récemment fait l'objet d'une grande attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ce profil est similaire aux profils que vous avez suivis le plus récemment.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personnalisée",
+  "follow_suggestions.popular_suggestion": "Suggestion populaire",
+  "follow_suggestions.view_all": "Tout afficher",
+  "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
   "footer.about": "À propos",
   "footer.directory": "Annuaire des profils",
@@ -306,13 +342,8 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
-  "home.actions.go_to_explore": "Voir les tendances",
-  "home.actions.go_to_suggestions": "Trouver des personnes à suivre",
-  "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
-  "home.explore_prompt.body": "Votre fil d'actualité aura un mélange de messages depuis les hashtags que vous avez choisi de suivre, les personnes que vous avez choisi de suivre, et les messages qu'elles boostent. Si ça vous semble trop calme à votre goût, n’hésitez pas à :",
-  "home.explore_prompt.title": "C'est votre page d'accueil dans Mastodon.",
   "home.hide_announcements": "Masquer les annonces",
   "home.pending_critical_update.body": "Veuillez mettre à jour votre serveur Mastodon dès que possible !",
   "home.pending_critical_update.link": "Voir les mises à jour",
@@ -396,9 +427,15 @@
   "loading_indicator.label": "Chargement…",
   "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
-  "mute_modal.duration": "Durée",
-  "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
-  "mute_modal.indefinite": "Indéfinie",
+  "mute_modal.hide_from_notifications": "Cacher des notifications",
+  "mute_modal.hide_options": "Masquer les options",
+  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.show_options": "Afficher les options",
+  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
   "navigation_bar.blocks": "Comptes bloqués",
@@ -408,7 +445,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -435,8 +471,17 @@
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
   "notification.reblog": "{name} a partagé votre message",
+  "notification.relationships_severance_event": "Connexions perdues avec {name}",
+  "notification.relationships_severance_event.account_suspension": "Un·e administrateur·rice de {from} a suspendu {target}, ce qui signifie que vous ne pourrez plus recevoir de mises à jour ou interagir avec lui.",
+  "notification.relationships_severance_event.domain_block": "Un·e administrateur·rice de {from} en a bloqué {target}, comprenant {followersCount} de vos abonné·e·s et {followingCount, plural, one {# compte} other {# comptes}} vous suivez.",
+  "notification.relationships_severance_event.learn_more": "En savoir plus",
+  "notification.relationships_severance_event.user_domain_block": "Vous avez bloqué {target}, en supprimant {followersCount} de vos abonnés et {followingCount, plural, one {# compte} other {# comptes}} que vous suivez.",
   "notification.status": "{name} vient de publier",
   "notification.update": "{name} a modifié un message",
+  "notification_requests.accept": "Accepter",
+  "notification_requests.dismiss": "Rejeter",
+  "notification_requests.notifications_from": "Notifications de {name}",
+  "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer les notifications",
   "notifications.clear_confirmation": "Voulez-vous vraiment effacer toutes vos notifications ?",
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
@@ -444,8 +489,7 @@
   "notifications.column_settings.alert": "Notifications du navigateur",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
-  "notifications.column_settings.filter_bar.category": "Barre de filtrage rapide",
-  "notifications.column_settings.filter_bar.show_bar": "Afficher la barre de filtre",
+  "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
   "notifications.column_settings.mention": "Mentions :",
@@ -471,6 +515,15 @@
   "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
+  "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
+  "notifications.policy.filter_not_followers_title": "Personnes qui ne vous suivent pas",
+  "notifications.policy.filter_not_following_hint": "Jusqu'à ce que vous les validiez manuellement",
+  "notifications.policy.filter_not_following_title": "Personnes que vous ne suivez pas",
+  "notifications.policy.filter_private_mentions_hint": "Filtré sauf si c'est en réponse à une mention de vous ou si vous suivez l'expéditeur",
+  "notifications.policy.filter_private_mentions_title": "Mentions privées non sollicitées",
+  "notifications.policy.title": "Filtrer les notifications de…",
   "notifications_permission_banner.enable": "Activer les notifications de bureau",
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
@@ -480,7 +533,7 @@
   "onboarding.actions.go_to_home": "Allers vers mon flux principal",
   "onboarding.compose.template": "Bonjour #Mastodon !",
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page de découverte pour trouver des personnes à suivre, ou réessayez plus tard.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+  "onboarding.follows.lead": "Votre flux principal est le principal moyen de découvrir Mastodon. Plus vous suivez de personnes, plus il sera actif et intéressant. Pour commencer, voici quelques suggestions :",
   "onboarding.follows.title": "Personnaliser votre flux principal",
   "onboarding.profile.discoverable": "Rendre mon profil découvrable",
   "onboarding.profile.discoverable_hint": "Lorsque vous acceptez d'être découvert sur Mastodon, vos messages peuvent apparaître dans les résultats de recherche et les tendances, et votre profil peut être suggéré à des personnes ayant des intérêts similaires aux vôtres.",
@@ -497,10 +550,10 @@
   "onboarding.share.message": "Je suis {username} sur #Mastodon ! Suivez-moi sur {url}",
   "onboarding.share.next_steps": "Étapes suivantes possibles :",
   "onboarding.share.title": "Partager votre profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.start.lead": "Vous faites désormais partie de Mastodon, une plateforme de médias sociaux unique et décentralisée où c'est vous, et non un algorithme, qui créez votre propre expérience. Nous allons vous aider à vous lancer dans cette nouvelle frontière sociale :",
   "onboarding.start.skip": "Vous n’avez donc pas besoin d’aide pour commencer ?",
   "onboarding.start.title": "Vous avez réussi !",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "Suivre des personnes intéressantes, c'est la raison d'être de Mastodon.",
   "onboarding.steps.follow_people.title": "Personnaliser votre flux principal",
   "onboarding.steps.publish_status.body": "Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages {emoji}",
   "onboarding.steps.publish_status.title": "Rédigez votre premier message",
@@ -526,14 +579,15 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement par vos abonnés",
-  "privacy.private.short": "Abonnés uniquement",
-  "privacy.public.long": "Visible pour tous",
+  "privacy.direct.long": "Toutes les personnes mentionnées dans le post",
+  "privacy.direct.short": "Personnes spécifiques",
+  "privacy.private.long": "Seulement vos abonnés",
+  "privacy.private.short": "Abonnés",
+  "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
+  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.short": "Public calme",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -551,7 +605,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Bloquer",
   "report.block_explanation": "Vous ne verrez plus les messages de ce profil, et il ne pourra ni vous suivre ni voir vos messages. Il pourra savoir qu'il a été bloqué.",
   "report.categories.legal": "Légal",
@@ -644,10 +700,11 @@
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
   "status.edit": "Modifier",
-  "status.edited": "Modifié le {date}",
+  "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
   "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
+  "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
   "status.filtered": "Filtré",
   "status.hide": "Masquer le message",
@@ -668,6 +725,7 @@
   "status.reblog": "Partager",
   "status.reblog_private": "Partager à l’audience originale",
   "status.reblogged_by": "{name} a partagé",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des marque-pages",
@@ -715,10 +773,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyant·e·s",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index ea42ef91c0..a22f4767a6 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -13,7 +13,7 @@
   "about.rules": "Serverrigels",
   "account.account_note_header": "Opmerking",
   "account.add_or_remove_from_list": "Tafoegje oan of fuortsmite út listen",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatisearre",
   "account.badges.group": "Groep",
   "account.block": "@{name} blokkearje",
   "account.block_domain": "Domein {domain} blokkearje",
@@ -89,7 +89,11 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
-  "autosuggest_hashtag.per_week": "{count} yn ’e wike",
+  "block_modal.show_less": "Minder toane",
+  "block_modal.show_more": "Mear toane",
+  "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
+  "block_modal.title": "Brûker blokkearje?",
+  "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -146,26 +150,22 @@
   "compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
   "compose_form.lock_disclaimer.lock": "beskoattele",
   "compose_form.placeholder": "Wat wolle jo kwyt?",
-  "compose_form.poll.add_option": "Kar tafoegje",
   "compose_form.poll.duration": "Doer fan de enkête",
-  "compose_form.poll.option_placeholder": "Kar {number}",
-  "compose_form.poll.remove_option": "Dizze kar fuortsmite",
+  "compose_form.poll.multiple": "Mearkar",
+  "compose_form.poll.option_placeholder": "Opsje {number}",
+  "compose_form.poll.single": "Kies ien",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
-  "compose_form.publish": "Publisearje",
+  "compose_form.poll.type": "Styl",
+  "compose_form.publish": "Toot",
   "compose_form.publish_form": "Publisearje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wizigingen bewarje",
-  "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
+  "compose_form.reply": "Reagearje",
+  "compose_form.save_changes": "Bywurkje",
   "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
-  "compose_form.spoiler_placeholder": "Warskôgingstekst",
+  "compose_form.spoiler_placeholder": "Ynhâldswarskôging (opsjoneel)",
   "confirmation_modal.cancel": "Annulearje",
-  "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
-  "confirmations.block.message": "Binne jo wis dat jo {name} blokkearje wolle?",
   "confirmations.cancel_follow_request.confirm": "Fersyk annulearje",
   "confirmations.cancel_follow_request.message": "Binne jo wis dat jo jo fersyk om {name} te folgjen annulearje wolle?",
   "confirmations.delete.confirm": "Fuortsmite",
@@ -174,15 +174,13 @@
   "confirmations.delete_list.message": "Binne jo wis dat jo dizze list foar permanint fuortsmite wolle?",
   "confirmations.discard_edit_media.confirm": "Fuortsmite",
   "confirmations.discard_edit_media.message": "Jo hawwe net-bewarre wizigingen yn de mediabeskriuwing of foarfertoaning, wolle jo dizze dochs fuortsmite?",
-  "confirmations.domain_block.confirm": "Alles fan dit domein blokkearje",
+  "confirmations.domain_block.confirm": "Server blokkearje",
   "confirmations.domain_block.message": "Binne jo echt wis dat jo alles fan {domain} negearje wolle? Yn de measte gefallen is it blokkearjen of negearjen fan in pear spesifike persoanen genôch en better. Jo sille gjin berjochten fan dizze server op iepenbiere tiidlinen sjen of yn jo meldingen. Jo folgers fan dizze server wurde fuortsmiten.",
   "confirmations.edit.confirm": "Bewurkje",
   "confirmations.edit.message": "Troch no te bewurkjen sil it berjocht dat jo no oan it skriuwen binne oerskreaun wurde. Wolle jo trochgean?",
   "confirmations.logout.confirm": "Ofmelde",
   "confirmations.logout.message": "Binne jo wis dat jo ôfmelde wolle?",
   "confirmations.mute.confirm": "Negearje",
-  "confirmations.mute.explanation": "Dit sil berjochten fan harren en berjochten dêr’t se yn fermeld wurde ûnsichtber meitsje, mar se sille jo berjochten noch hieltyd sjen kinne en jo folgje kinne.",
-  "confirmations.mute.message": "Binne jo wis dat jo {name} negearje wolle?",
   "confirmations.redraft.confirm": "Fuortsmite en opnij opstelle",
   "confirmations.redraft.message": "Binne jo wis dat jo dit berjocht fuortsmite en opnij opstelle wolle? Favoriten en boosts geane dan ferlern en reaksjes op it oarspronklike berjocht reitsje jo kwyt.",
   "confirmations.reply.confirm": "Reagearje",
@@ -208,6 +206,20 @@
   "dismissable_banner.explore_statuses": "Dizze berjochten winne oan populariteit op dizze en oare servers binnen it desintrale netwurk. Nijere berjochten mei mear boosts en favoriten stean heger.",
   "dismissable_banner.explore_tags": "Dizze hashtags winne oan populariteit op dizze en oare servers binnen it desintrale netwurk.",
   "dismissable_banner.public_timeline": "Dit binne de meast resinte iepenbiere berjochten fan accounts op it sosjale web dy’t troch minsken op {domain} folge wurde.",
+  "domain_block_modal.block": "Server blokkearje",
+  "domain_block_modal.block_account_instead": "Yn stee hjirfan {name} blokkearje",
+  "domain_block_modal.they_can_interact_with_old_posts": "Minsken op dizze server kinne ynteraksje hawwe mei jo âlde berjochten.",
+  "domain_block_modal.they_cant_follow": "Net ien op dizze server kin jo folgje.",
+  "domain_block_modal.they_wont_know": "Se krije net te witten dat se blokkearre wurde.",
+  "domain_block_modal.title": "Domein blokkearje?",
+  "domain_block_modal.you_will_lose_followers": "Al jo folgers fan dizze server wurde ûntfolge.",
+  "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Harren fediverse-adres:",
+  "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
+  "domain_pill.username": "Brûkersnamme",
+  "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
+  "domain_pill.your_handle": "Jo fediverse-adres:",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",
   "emoji_button.activity": "Aktiviteiten",
@@ -274,12 +286,24 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
+  "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Dizze server",
   "firehose.remote": "Oare servers",
   "follow_request.authorize": "Goedkarre",
   "follow_request.reject": "Wegerje",
   "follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
+  "follow_suggestions.curated_suggestion": "Spesjaal selektearre",
+  "follow_suggestions.dismiss": "Net mear werjaan",
+  "follow_suggestions.hints.featured": "Dit profyl is hânmjittich troch it {domain}-team selektearre.",
+  "follow_suggestions.hints.friends_of_friends": "Dit profyl is populêr ûnder de minsken dy’t jo folgje.",
+  "follow_suggestions.hints.most_followed": "Dit profyl is ien fan de meast folge op {domain}.",
+  "follow_suggestions.hints.most_interactions": "Dit profyl hat de lêste tiid in protte oandacht krigen op {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Dit profyl is hast lyk oan de profilen dy’t jo koartlyn folge hawwe.",
+  "follow_suggestions.personalized_suggestion": "Personalisearre suggestje",
+  "follow_suggestions.popular_suggestion": "Populêre suggestje",
+  "follow_suggestions.view_all": "Alles werjaan",
+  "follow_suggestions.who_to_follow": "Wa te folgjen",
   "followed_tags": "Folge hashtags",
   "footer.about": "Oer",
   "footer.directory": "Profylmap",
@@ -306,13 +330,8 @@
   "hashtag.follow": "Hashtag folgje",
   "hashtag.unfollow": "Hashtag ûntfolgje",
   "hashtags.and_other": "…en {count, plural, one {}other {# mear}}",
-  "home.actions.go_to_explore": "De aktuele trends besjen",
-  "home.actions.go_to_suggestions": "Sykje minsken om te folgjen",
-  "home.column_settings.basic": "Algemien",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
-  "home.explore_prompt.body": "Jo starttiidline befettet in miks fan berjochten mei hashtags dy’t jo keazen hawwe om te folgjen, fan minsken dy’t jo keazen hawwe om te folgjen en berjochten dy’t se booste. As jo dit te rêstich fine, kinne jo:",
-  "home.explore_prompt.title": "Dit is jo thúsbasis op Mastodon.",
   "home.hide_announcements": "Meidielingen ferstopje",
   "home.pending_critical_update.body": "Fernij sa gau as mooglik jo Mastodon-server!",
   "home.pending_critical_update.link": "Fernijingen besjen",
@@ -396,9 +415,9 @@
   "loading_indicator.label": "Lade…",
   "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
-  "mute_modal.duration": "Doer",
-  "mute_modal.hide_notifications": "Meldingen fan dizze brûker ferstopje?",
-  "mute_modal.indefinite": "Foar ûnbepaalde tiid",
+  "mute_modal.hide_options": "Opsjes ferstopje",
+  "mute_modal.indefinite": "Oant ik se net mear negearje",
+  "mute_modal.show_options": "Opsjes toane",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
@@ -408,7 +427,6 @@
   "navigation_bar.direct": "Priveefermeldingen",
   "navigation_bar.discover": "Untdekke",
   "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.edit_profile": "Profyl bewurkje",
   "navigation_bar.explore": "Ferkenne",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Negearre wurden",
@@ -435,8 +453,13 @@
   "notification.own_poll": "Jo poll is beëinige",
   "notification.poll": "In enkête dêr’t jo yn stimd hawwe is beëinige",
   "notification.reblog": "{name} hat jo berjocht boost",
+  "notification.relationships_severance_event.learn_more": "Mear ynfo",
   "notification.status": "{name} hat in berjocht pleatst",
   "notification.update": "{name} hat in berjocht bewurke",
+  "notification_requests.accept": "Akseptearje",
+  "notification_requests.dismiss": "Ofwize",
+  "notification_requests.notifications_from": "Meldingen fan {name}",
+  "notification_requests.title": "Filtere meldingen",
   "notifications.clear": "Meldingen wiskje",
   "notifications.clear_confirmation": "Binne jo wis dat jo al jo meldingen permanint fuortsmite wolle?",
   "notifications.column_settings.admin.report": "Nije rapportaazjes:",
@@ -444,8 +467,6 @@
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
-  "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalke toane",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
   "notifications.column_settings.mention": "Fermeldingen:",
@@ -526,13 +547,14 @@
   "poll_button.add_poll": "Poll tafoegje",
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
-  "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
-  "privacy.direct.short": "Allinnich fermelde minsken",
-  "privacy.private.long": "Allinnich sichtber foar folgers",
-  "privacy.private.short": "Allinnich folgers",
-  "privacy.public.long": "Sichtber foar elkenien",
+  "privacy.direct.long": "Elkenien dy’ yn it berjocht fermeld wurdt",
+  "privacy.direct.short": "Bepaalde minsken",
+  "privacy.private.long": "Allinnich jo folgers",
+  "privacy.private.short": "Folgers",
+  "privacy.public.long": "Elkenien op Mastodon en dêrbûten",
   "privacy.public.short": "Iepenbier",
-  "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
+  "privacy.unlisted.additional": "Dit is fergelykber mei iepenbier, útsein dat it berjocht net ferskynt op iepenbiere tiidlijnen of hashtags, ûnder ferkenne of Mastodon sykje, sels as jo jo account dêrfoar ynsteld hawwe.",
+  "privacy.unlisted.long": "Minder algoritmyske fanfare",
   "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
@@ -551,7 +573,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hjoed",
+  "reply_indicator.attachments": "{count, plural, one {# bylage} other {# bylagen}}",
   "reply_indicator.cancel": "Annulearje",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkearje",
   "report.block_explanation": "Jo sille harren berjochten net sjen kinne. Se sille jo berjochten net sjen kinne en jo net folgje kinne. Se sille wol sjen kinne dat se blokkearre binne.",
   "report.categories.legal": "Juridysk",
@@ -644,7 +668,6 @@
   "status.direct": "Privee fermelde @{name}",
   "status.direct_indicator": "Priveefermelding",
   "status.edit": "Bewurkje",
-  "status.edited": "Bewurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
   "status.embed": "Ynslute",
   "status.favourite": "Favoryt",
@@ -715,10 +738,8 @@
   "upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Gjin omskriuwing tafoege",
   "upload_form.edit": "Bewurkje",
   "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
-  "upload_form.undo": "Fuortsmite",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ofbylding analysearje…",
   "upload_modal.apply": "Tapasse",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index f0f9c55549..c71effe06d 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Fógra",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
-  "autosuggest_hashtag.per_week": "{count} sa seachtain",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -127,23 +126,14 @@
   "compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
   "compose_form.lock_disclaimer.lock": "faoi ghlas",
   "compose_form.placeholder": "Cad atá ag tarlú?",
-  "compose_form.poll.add_option": "Cuir rogha isteach",
   "compose_form.poll.duration": "Achar suirbhéanna",
-  "compose_form.poll.option_placeholder": "Rogha {number}",
-  "compose_form.poll.remove_option": "Bain an rogha seo",
   "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
-  "compose_form.publish": "Foilsigh",
   "compose_form.publish_form": "Foilsigh\n",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sábháil",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
-  "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
   "confirmation_modal.cancel": "Cealaigh",
-  "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhac?",
   "confirmations.cancel_follow_request.confirm": "Éirigh as iarratas",
   "confirmations.cancel_follow_request.message": "An bhfuil tú cinnte gur mhaith leat éirigh as an iarratas leanta {name}?",
   "confirmations.delete.confirm": "Scrios",
@@ -152,13 +142,10 @@
   "confirmations.delete_list.message": "An bhfuil tú cinnte gur mhaith leat an liosta seo a scriosadh go buan?",
   "confirmations.discard_edit_media.confirm": "Faigh réidh de",
   "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
-  "confirmations.domain_block.confirm": "Bac fearann go hiomlán",
   "confirmations.domain_block.message": "An bhfuil tú iontach cinnte gur mhaith leat bac an t-ainm fearainn {domain} in iomlán? I bhformhór na gcásanna, is leor agus is fearr cúpla baic a cur i bhfeidhm nó cúpla úsáideoirí a balbhú. Ní fheicfidh tú ábhair ón t-ainm fearainn sin in amlíne ar bith, nó i d'fhógraí. Scaoilfear do leantóirí ón ainm fearainn sin.",
   "confirmations.logout.confirm": "Logáil amach",
   "confirmations.logout.message": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
   "confirmations.mute.confirm": "Balbhaigh",
-  "confirmations.mute.explanation": "Cuiridh seo teachtaireachtaí uathu agus fúthu i bhfolach, ach beidh siad in ann fós do theachtaireachtaí a fheiceáil agus tú a leanúint.",
-  "confirmations.mute.message": "An bhfuil tú cinnte gur mhaith leat {name} a bhalbhú?",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
@@ -234,6 +221,11 @@
   "follow_request.authorize": "Ceadaigh",
   "follow_request.reject": "Diúltaigh",
   "follow_requests.unlocked_explanation": "Cé nach bhfuil do chuntas faoi ghlas, cheap foireann {domain} gur mhaith leat súil siar ar iarratais leanúnaí as na cuntais seo.",
+  "follow_suggestions.dismiss": "Ná taispeáin arís",
+  "follow_suggestions.personalized_suggestion": "Nod pearsantaithe",
+  "follow_suggestions.popular_suggestion": "Nod coiteann",
+  "follow_suggestions.view_all": "Féach uile",
+  "follow_suggestions.who_to_follow": "Cé le leanúint",
   "footer.about": "Maidir le",
   "footer.directory": "Eolaire próifílí",
   "footer.get_app": "Faigh an aip",
@@ -252,7 +244,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Lean haischlib",
   "hashtag.unfollow": "Ná lean haischlib",
-  "home.column_settings.basic": "Bunúsach",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
   "home.hide_announcements": "Cuir fógraí i bhfolach",
@@ -315,9 +306,6 @@
   "lists.replies_policy.title": "Taispeáin freagraí:",
   "lists.search": "Cuardaigh i measc daoine atá á leanúint agat",
   "lists.subheading": "Do liostaí",
-  "mute_modal.duration": "Tréimhse",
-  "mute_modal.hide_notifications": "Cuir póstalacha ón t-úsáideoir seo i bhfolach?",
-  "mute_modal.indefinite": "Gan téarma",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
@@ -325,7 +313,6 @@
   "navigation_bar.compose": "Cum postáil nua",
   "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
-  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
   "navigation_bar.explore": "Féach thart",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -353,9 +340,6 @@
   "notifications.clear": "Glan fógraí",
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
-  "notifications.column_settings.filter_bar.advanced": "Taispeáin na catagóirí go léir",
-  "notifications.column_settings.filter_bar.category": "Barra scagaire tapa",
-  "notifications.column_settings.filter_bar.show_bar": "Taispeáin barra scagaire",
   "notifications.column_settings.follow": "Leantóirí nua:",
   "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
   "notifications.column_settings.mention": "Tráchtanna:",
@@ -401,12 +385,7 @@
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
-  "privacy.private.short": "Leantóirí amháin",
-  "privacy.public.long": "Infheicthe do chách",
   "privacy.public.short": "Poiblí",
-  "privacy.unlisted.short": "Neamhliostaithe",
   "privacy_policy.title": "Polasaí príobháideachais",
   "refresh": "Athnuaigh",
   "regeneration_indicator.label": "Ag lódáil…",
@@ -471,7 +450,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Scrios",
   "status.edit": "Cuir in eagar",
-  "status.edited": "Curtha in eagar in {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
   "status.embed": "Leabaigh",
   "status.filter": "Déan scagadh ar an bpostáil seo",
@@ -529,7 +507,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
-  "upload_form.undo": "Scrios",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 11d83d6ceb..9e79793de1 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -12,7 +12,7 @@
   "about.powered_by": "Lìonra sòisealta sgaoilte le cumhachd {mastodon}",
   "about.rules": "Riaghailtean an fhrithealaiche",
   "account.account_note_header": "Nòta",
-  "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o na liostaichean",
+  "account.add_or_remove_from_list": "Cuir ris no thoir air falbh o liostaichean",
   "account.badges.bot": "Fèin-obrachail",
   "account.badges.group": "Buidheann",
   "account.block": "Bac @{name}",
@@ -21,6 +21,7 @@
   "account.blocked": "’Ga bhacadh",
   "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
   "account.cancel_follow_request": "Sguir dhen leantainn",
+  "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "account.disable_notifications": "Na cuir brath thugam tuilleadh nuair a chuireas @{name} post ris",
   "account.domain_blocked": "Chaidh an àrainn a bhacadh",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Gun phost",
   "account.featured_tags.title": "Na tagaichean hais brosnaichte aig {name}",
   "account.follow": "Lean",
+  "account.follow_back": "Lean air ais",
   "account.followers": "Luchd-leantainn",
   "account.followers.empty": "Chan eil neach sam bith a’ leantainn air a’ chleachdaiche seo fhathast.",
   "account.followers_counter": "{count, plural, one {{counter} neach-leantainn} two {{counter} neach-leantainn} few {{counter} luchd-leantainn} other {{counter} luchd-leantainn}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Mùch na brathan",
   "account.mute_short": "Mùch",
   "account.muted": "’Ga mhùchadh",
+  "account.mutual": "Co-dhàimh",
   "account.no_bio": "Cha deach tuairisgeul a sholar.",
   "account.open_original_page": "Fosgail an duilleag thùsail",
   "account.posts": "Postaichean",
@@ -86,7 +89,14 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
-  "autosuggest_hashtag.per_week": "{count} san t-seachdain",
+  "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
+  "block_modal.show_less": "Seall nas lugha dheth",
+  "block_modal.show_more": "Seall barrachd dheth",
+  "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.",
+  "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.",
+  "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
+  "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
+  "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -143,26 +153,22 @@
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
-  "compose_form.poll.add_option": "Cuir roghainn ris",
-  "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
+  "compose_form.poll.duration": "Faide a’ chunntais",
+  "compose_form.poll.multiple": "Iomadh-roghainn",
   "compose_form.poll.option_placeholder": "Roghainn {number}",
-  "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
+  "compose_form.poll.single": "Aonan",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
-  "compose_form.publish": "Foillsich",
+  "compose_form.poll.type": "Stoidhle",
+  "compose_form.publish": "Postaich",
   "compose_form.publish_form": "Post ùr",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sàbhail na h-atharraichean",
-  "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
+  "compose_form.reply": "Freagair",
+  "compose_form.save_changes": "Ùraich",
   "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
-  "compose_form.spoiler_placeholder": "Sgrìobh an rabhadh agad an-seo",
+  "compose_form.spoiler_placeholder": "Rabhadh susbainte (roghainneil)",
   "confirmation_modal.cancel": "Sguir dheth",
-  "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
-  "confirmations.block.message": "A bheil thu cinnteach gu bheil thu airson {name} a bhacadh?",
   "confirmations.cancel_follow_request.confirm": "Cuir d’ iarrtas dhan dàrna taobh",
   "confirmations.cancel_follow_request.message": "A bheil thu cinnteach gu bheil thu airson d’ iarrtas airson {name} a leantainn a chur dhan dàrna taobh?",
   "confirmations.delete.confirm": "Sguab às",
@@ -171,15 +177,13 @@
   "confirmations.delete_list.message": "A bheil thu cinnteach gu bheil thu airson an liosta seo a sguabadh às gu buan?",
   "confirmations.discard_edit_media.confirm": "Tilg air falbh",
   "confirmations.discard_edit_media.message": "Tha atharraichean gun sàbhaladh agad ann an tuairisgeul no ro-shealladh a’ mheadhain, a bheil thu airson an tilgeil air falbh co-dhiù?",
-  "confirmations.domain_block.confirm": "Bac an àrainn uile gu lèir",
+  "confirmations.domain_block.confirm": "Bac am frithealaiche",
   "confirmations.domain_block.message": "A bheil thu cinnteach dha-rìribh gu bheil thu airson an àrainn {domain} a bhacadh uile gu lèir? Mar as trice, foghnaidh gun dèan thu bacadh no mùchadh no dhà gu sònraichte agus bhiodh sin na b’ fheàrr. Chan fhaic thu susbaint on àrainn ud air loidhne-ama phoblach sam bith no am measg nam brathan agad. Thèid an luchd-leantainn agad on àrainn ud a thoirt air falbh.",
   "confirmations.edit.confirm": "Deasaich",
   "confirmations.edit.message": "Ma nì thu deasachadh an-dràsta, thèid seo a sgrìobhadh thairis air an teachdaireachd a tha thu a’ sgrìobhadh an-dràsta. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.logout.confirm": "Clàraich a-mach",
   "confirmations.logout.message": "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?",
   "confirmations.mute.confirm": "Mùch",
-  "confirmations.mute.explanation": "Cuiridh seo na postaichean uapa ’s na postaichean a bheir iomradh orra am falach ach chì iad-san na postaichean agad fhathast is faodaidh iad ’gad leantainn.",
-  "confirmations.mute.message": "A bheil thu cinnteach gu bheil thu airson {name} a mhùchadh?",
   "confirmations.redraft.confirm": "Sguab às ⁊ dèan dreachd ùr",
   "confirmations.redraft.message": "A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às agus dreachd ùr a thòiseachadh? Caillidh tu gach annsachd is brosnachadh air agus thèid freagairtean dhan phost thùsail ’nan dìlleachdanan.",
   "confirmations.reply.confirm": "Freagair",
@@ -190,6 +194,7 @@
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
   "conversation.with": "Còmhla ri {names}",
+  "copy_icon_button.copied": "Chaidh lethbhreac dheth a chur air an stòr-bhòrd",
   "copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
   "copypaste.copy_to_clipboard": "Cuir lethbhreac dheth air an stòr-bhòrd",
   "directory.federated": "On cho-shaoghal aithnichte",
@@ -204,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Tha fèill air na postaichean seo a’ fàs thar an lìona shòisealta an-diugh. Gheibh postaichean nas ùire le barrachd brosnaichean is annsachdan rangachadh nas àirde.",
   "dismissable_banner.explore_tags": "Tha fèill air na tagaichean hais seo a’ fàs air an fhrithealaiche seo is frithealaichean eile dhen lìonra sgaoilte an-diugh. Gheibh tagaichean hais a tha ’gan cleachdadh le daoine eadar-dhealaichte rangachadh nas àirde.",
   "dismissable_banner.public_timeline": "Seo na postaichean poblach as ùire o dhaoine air an lìonra sòisealta tha ’gan leantainn le daoine air {domain}.",
+  "domain_block_modal.block": "Bac am frithealaiche",
+  "domain_block_modal.block_account_instead": "Bac @{name} ’na àite",
+  "domain_block_modal.they_can_interact_with_old_posts": "’S urrainn do dhaoine a th’ air an fhrithealaiche seo eadar-ghabhail leis na seann-phostaichean agad.",
+  "domain_block_modal.they_cant_follow": "Chan urrainn do neach sam bith a th’ air an fhrithealaiche seo do leantainn.",
+  "domain_block_modal.they_wont_know": "Cha bhi fios aca gun deach am bacadh.",
+  "domain_block_modal.title": "A bheil thu airson an àrainn a bhacadh?",
+  "domain_block_modal.you_will_lose_followers": "Thèid a h-uile neach-leantainn agad a th’ air an fhrithealaiche seo a thoirt air falbh.",
+  "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
+  "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
+  "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
+  "domain_pill.server": "Frithealaiche",
+  "domain_pill.their_handle": "An t-aithnichear aca:",
+  "domain_pill.their_server": "An dachaigh dhigiteach far a bheil na postaichean uile aca a’ fuireach.",
+  "domain_pill.their_username": "Seo an t-aithnichear àraidh aca air an fhrithealaiche aca. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
+  "domain_pill.username": "Ainm-cleachdaiche",
+  "domain_pill.whats_in_a_handle": "Dè th’ ann an aithnichear?",
+  "domain_pill.who_they_are": "On a dh’innseas aithnichearan cò cuideigin agus càit a bheil iad, ’s urrainn dhut conaltradh le daoine thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.who_you_are": "On a dh’innseas d’ aithnichear cò thusa agus càit a bheil thu, ’s urrainn do dhaoine conaltradh leat thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
+  "domain_pill.your_handle": "An t-aithnichear agad:",
+  "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
+  "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
   "embed.instructions": "Leabaich am post seo san làrach-lìn agad is tu a’ dèanamh lethbhreac dhen chòd gu h-ìosal.",
   "embed.preview": "Seo an coltas a bhios air:",
   "emoji_button.activity": "Gnìomhachd",
@@ -221,6 +247,7 @@
   "emoji_button.search_results": "Toraidhean an luirg",
   "emoji_button.symbols": "Samhlaidhean",
   "emoji_button.travel": "Siubhal ⁊ àitichean",
+  "empty_column.account_hides_collections": "Chuir an cleachdaiche seo roimhe nach eil am fiosrachadh seo ri fhaighinn",
   "empty_column.account_suspended": "Chaidh an cunntas a chur à rèim",
   "empty_column.account_timeline": "Chan eil post an-seo!",
   "empty_column.account_unavailable": "Chan eil a’ phròifil ri làimh",
@@ -239,6 +266,7 @@
   "empty_column.list": "Chan eil dad air an liosta seo fhathast. Nuair a phostaicheas buill a tha air an liosta seo postaichean ùra, nochdaidh iad an-seo.",
   "empty_column.lists": "Chan eil liosta agad fhathast. Nuair chruthaicheas tu tè, nochdaidh i an-seo.",
   "empty_column.mutes": "Cha do mhùch thu cleachdaiche sam bith fhathast.",
+  "empty_column.notification_requests": "Glan! Chan eil dad an-seo. Nuair a gheibh thu brathan ùra, nochdaidh iad an-seo a-rèir nan roghainnean agad.",
   "empty_column.notifications": "Cha d’ fhuair thu brath sam bith fhathast. Nuair a nì càch conaltradh leat, chì thu an-seo e.",
   "empty_column.public": "Chan eil dad an-seo! Sgrìobh rudeigin gu poblach no lean càch o fhrithealaichean eile a làimh airson seo a lìonadh",
   "error.unexpected_crash.explanation": "Air sàilleibh buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair, chan urrainn dhuinn an duilleag seo a shealltainn mar bu chòir.",
@@ -269,12 +297,28 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {iomradh} two {iomradh} few {iomraidhean} other {iomradh}}",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil brath ann o dhaoine} one {Tha brathan ann o # neach} two {Tha brathan ann o # neach} few {Tha brathan ann o # daoine} other {Tha brathan ann o # duine}} air a bheil thu eòlach ’s dòcha",
+  "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
   "firehose.local": "Am frithealaiche seo",
   "firehose.remote": "Frithealaichean eile",
   "follow_request.authorize": "Ùghdarraich",
   "follow_request.reject": "Diùlt",
   "follow_requests.unlocked_explanation": "Ged nach eil an cunntas agad glaiste, tha sgioba {domain} dhen bheachd gum b’ fheàirrde thu lèirmheas a dhèanamh air na h-iarrtasan leantainn o na cunntasan seo a làimh.",
+  "follow_suggestions.curated_suggestion": "Roghainn an sgioba",
+  "follow_suggestions.dismiss": "Na seall seo a-rithist",
+  "follow_suggestions.friends_of_friends_longer": "Fèill mhòr am measg nan daoine a leanas tu",
+  "follow_suggestions.hints.featured": "Chaidh a’ phròifil seo a thaghadh le sgioba {domain} a làimh.",
+  "follow_suggestions.hints.friends_of_friends": "Tha fèill mhòr air a’ phròifil seo am measg nan daoine a leanas tu.",
+  "follow_suggestions.hints.most_followed": "Tha a’ phròifil seo am measg an fheadhainn a leanar as trice air {domain}.",
+  "follow_suggestions.hints.most_interactions": "Chaidh mòran aire a thoirt air a’ phròifil seo air {domain} o chionn goirid.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tha a’ phròifil seo coltach ris na pròifilean air an lean thu o chionn goirid.",
+  "follow_suggestions.personalized_suggestion": "Moladh pearsanaichte",
+  "follow_suggestions.popular_suggestion": "Moladh air a bheil fèill mhòr",
+  "follow_suggestions.popular_suggestion_longer": "Fèill mhòr air {domain}",
+  "follow_suggestions.view_all": "Seall na h-uile",
+  "follow_suggestions.who_to_follow": "Molaidhean leantainn",
   "followed_tags": "Tagaichean hais ’gan leantainn",
   "footer.about": "Mu dhèidhinn",
   "footer.directory": "Eòlaire nam pròifil",
@@ -301,13 +345,8 @@
   "hashtag.follow": "Lean an taga hais",
   "hashtag.unfollow": "Na lean an taga hais tuilleadh",
   "hashtags.and_other": "…agus {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}",
-  "home.actions.go_to_explore": "Faic na tha a’ treandadh",
-  "home.actions.go_to_suggestions": "Lorg daoine gus an leantainn",
-  "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
-  "home.explore_prompt.body": "Bidh measgachadh de phostaichean o na tagaichean hais a leanas tu, na daoine a leanas tu is na postaichean a bhrosnaicheas iad air do dhachaigh. Ma tha cùisean ro shàmhach dhut, seo nas urrainn dhut a dhèanamh:",
-  "home.explore_prompt.title": "Seo do dhachaigh am broinn Mastodon.",
   "home.hide_announcements": "Falaich na brathan-fios",
   "home.pending_critical_update.body": "Ùraich am frithealaiche Mastodon agad cho luath ’s a ghabhas!",
   "home.pending_critical_update.link": "Faic na h-ùrachaidhean",
@@ -388,11 +427,18 @@
   "lists.search": "Lorg am measg nan daoine a leanas tu",
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
+  "loading_indicator.label": "’Ga luchdadh…",
   "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
-  "mute_modal.duration": "Faide",
-  "mute_modal.hide_notifications": "A bheil thu airson na brathan fhalach on chleachdaiche seo?",
-  "mute_modal.indefinite": "Gun chrìoch",
+  "mute_modal.hide_from_notifications": "Falaich o na brathan",
+  "mute_modal.hide_options": "Roghainnean falaich",
+  "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
+  "mute_modal.show_options": "Seall na roghainnean",
+  "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
+  "mute_modal.they_wont_know": "Cha bhi fios aca gun deach am mùchadh.",
+  "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
+  "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
+  "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -402,7 +448,6 @@
   "navigation_bar.direct": "Iomraidhean prìobhaideach",
   "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.edit_profile": "Deasaich a’ phròifil",
   "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
@@ -426,11 +471,21 @@
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.mention": "Thug {name} iomradh ort",
+  "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
   "notification.reblog": "Bhrosnaich {name} am post agad",
+  "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
+  "notification.relationships_severance_event.account_suspension": "Chuir rianaire aig {from} {target} à rèim agus is ciall dha sin nach fhaigh thu naidheachdan uapa ’s nach urrainn dhut conaltradh leotha.",
+  "notification.relationships_severance_event.domain_block": "Bhac rianaire aig {from} {target}, a’ gabhail a-staigh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
+  "notification.relationships_severance_event.learn_more": "Barrachd fiosrachaidh",
+  "notification.relationships_severance_event.user_domain_block": "Bhac thu {target} agus thug sin air falbh {followersCount} dhen luchd-leantainn agad agus {followingCount, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}} a tha thu fhèin a’ leantainn.",
   "notification.status": "Phostaich {name} rud",
   "notification.update": "Dheasaich {name} post",
+  "notification_requests.accept": "Gabh ris",
+  "notification_requests.dismiss": "Leig seachad",
+  "notification_requests.notifications_from": "Brathan o {name}",
+  "notification_requests.title": "Brathan criathraichte",
   "notifications.clear": "Falamhaich na brathan",
   "notifications.clear_confirmation": "A bheil thu cinnteach gu bheil thu airson na brathan uile agad fhalamhachadh gu buan?",
   "notifications.column_settings.admin.report": "Gearanan ùra:",
@@ -439,7 +494,6 @@
   "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
-  "notifications.column_settings.filter_bar.show_bar": "Seall am bàr-criathraidh",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
   "notifications.column_settings.mention": "Iomraidhean:",
@@ -465,6 +519,15 @@
   "notifications.permission_denied": "Chan eil brathan deasga ri fhaighinn on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_denied_alert": "Cha ghabh brathan deasga a chur an comas on a chaidh iarrtas ceadan a’ bhrabhsair a dhiùltadh cheana",
   "notifications.permission_required": "Chan eil brathan deasga ri fhaighinn on nach deach an cead riatanach a thoirt seachad.",
+  "notifications.policy.filter_new_accounts.hint": "A chaidh a chruthachadh o chionn {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
+  "notifications.policy.filter_new_accounts_title": "Cunntasan ùra",
+  "notifications.policy.filter_not_followers_hint": "A’ gabhail a-staigh an fheadhainn a lean ort nas lugha na {days, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} seo chaidh",
+  "notifications.policy.filter_not_followers_title": "Daoine nach eil gad leantainn",
+  "notifications.policy.filter_not_following_hint": "Gus an aontaich thu riutha a làimh",
+  "notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
+  "notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair",
+  "notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
+  "notifications.policy.title": "Falamhaich na brathan o…",
   "notifications_permission_banner.enable": "Cuir brathan deasga an comas",
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
@@ -476,6 +539,17 @@
   "onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
   "onboarding.follows.lead": "’S e do prìomh-doras do Mhastodon a th’ ann san dachaigh. Mar as motha an t-uiread de dhaoine a leanas tu ’s ann nas beòthaile inntinniche a bhios i. Seo moladh no dhà dhut airson tòiseachadh:",
   "onboarding.follows.title": "Cuir dreach pearsanta air do dhachaigh",
+  "onboarding.profile.discoverable": "Bu mhath leam gun gabh a’ phròifil agam a rùrachadh",
+  "onboarding.profile.discoverable_hint": "Ma chuir thu romhad gun gabh a’ phròifil agad a rùrachadh air Mastodon, faodaidh na postaichean agad nochdadh ann an toraidhean luirg agus treandaichean agus dh’fhaoidte gun dèid a’ phròifil agad a mholadh dhan fheadhainn aig a bheil ùidhean coltach ri d’ ùidhean-sa.",
+  "onboarding.profile.display_name": "Ainm-taisbeanaidh",
+  "onboarding.profile.display_name_hint": "D’ ainm slàn no spòrsail…",
+  "onboarding.profile.lead": "’S urrainn dhut seo a choileanadh uair sam bith eile sna roghainnean far am bi roghainnean gnàthachaidh eile ri làimh dhut cuideachd.",
+  "onboarding.profile.note": "Cunntas-beatha",
+  "onboarding.profile.note_hint": "’S urrainn dhut @iomradh a thoirt air càch no air #tagaicheanHais…",
+  "onboarding.profile.save_and_continue": "Sàbhail ’s lean air adhart",
+  "onboarding.profile.title": "Suidheachadh na pròifile",
+  "onboarding.profile.upload_avatar": "Luchdaich suas dealbh na pròifil",
+  "onboarding.profile.upload_header": "Luchdaich suas bann-cinn na pròifil",
   "onboarding.share.lead": "Innis do dhaoine mar a gheibh iad grèim ort air Mastodon!",
   "onboarding.share.message": "Is mise {username} air #Mastodon! Thig ’gam leantainn air {url}",
   "onboarding.share.next_steps": "Ceuman eile as urrainn dhut gabhail:",
@@ -509,16 +583,18 @@
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
-  "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
-  "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
-  "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine e",
+  "privacy.direct.long": "A h-uile duine air a bheil iomradh sa phost",
+  "privacy.direct.short": "Daoine àraidh",
+  "privacy.private.long": "An luchd-leantainn agad a-mhàin",
+  "privacy.private.short": "Luchd-leantainn",
+  "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
-  "privacy.unlisted.short": "Falaichte o liostaichean",
+  "privacy.unlisted.additional": "Tha seo coltach ris an fhaicsinneachd phoblach ach cha nochd am post air loidhnichean-ama an t-saoghail phoblaich, nan tagaichean hais no an rùrachaidh no ann an toraidhean luirg Mhastodon fiù ’s ma thug thu ro-aonta airson sin seachad.",
+  "privacy.unlisted.long": "Ìre bheag an algairim",
+  "privacy.unlisted.short": "Poblach ach sàmhach",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
+  "recommended": "Molta",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.label": "’Ga luchdadh…",
   "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
@@ -533,7 +609,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "an-diugh",
+  "reply_indicator.attachments": "{count, plural, one {# cheanglachan} two {# cheanglachan} few {# ceanglachain} other {# ceanglachan}}",
   "reply_indicator.cancel": "Sguir dheth",
+  "reply_indicator.poll": "Cunntas-bheachd",
   "report.block": "Bac",
   "report.block_explanation": "Chan fhaic thu na postaichean aca. Chan fhaic iad na postaichean agad is chan urrainn dhaibh do leantainn. Bheir iad an aire gun deach am bacadh.",
   "report.categories.legal": "Laghail",
@@ -589,6 +667,7 @@
   "search.quick_action.status_search": "Postaichean a fhreagras ri {x}",
   "search.search_or_paste": "Dèan lorg no cuir a-steach URL",
   "search_popout.full_text_search_disabled_message": "Chan eil seo ri fhaighinn air {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Chan eil seo ri fhaighinn ach nuair a bhios tu air do chlàradh a-steach.",
   "search_popout.language_code": "Còd cànain ISO",
   "search_popout.options": "Roghainnean luirg",
   "search_popout.quick_actions": "Grad-ghnìomhan",
@@ -625,10 +704,11 @@
   "status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "status.direct_indicator": "Iomradh prìobhaideach",
   "status.edit": "Deasaich",
-  "status.edited": "Air a dheasachadh {date}",
-  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{counter} turas} two {{counter} thuras} few {{counter} tursan} other {{counter} turas}}",
+  "status.edited": "An deasachadh mu dheireadh {date}",
+  "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
   "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
+  "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
   "status.filtered": "Criathraichte",
   "status.hide": "Falaich am post",
@@ -649,6 +729,7 @@
   "status.reblog": "Brosnaich",
   "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
   "status.reblogged_by": "’Ga bhrosnachadh le {name}",
+  "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}}",
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
@@ -696,10 +777,8 @@
   "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
   "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
   "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
-  "upload_form.description_missing": "Cha deach tuairisgeul a chur ris",
   "upload_form.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
-  "upload_form.undo": "Sguab às",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
   "upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
   "upload_modal.apply": "Cuir an sàs",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 48bbb6b307..98cc313948 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -2,7 +2,7 @@
   "about.blocks": "Servidores suxeitos a moderación",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon é software libre, de código aberto, e unha marca comercial de Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Motivo non indicado. ",
+  "about.domain_blocks.no_reason_available": "Motivo non indicado",
   "about.domain_blocks.preamble": "Mastodon de xeito xeral permíteche ver contidos doutros servidores do fediverso e interactuar coas súas usuarias. Estas son as excepcións que se estabeleceron neste servidor en particular.",
   "about.domain_blocks.silenced.explanation": "Por defecto non verás perfís e contido desde este servidor, a menos que mires de xeito explícito ou optes por seguir ese contido ou usuaria.",
   "about.domain_blocks.silenced.title": "Limitado",
@@ -20,7 +20,7 @@
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueada",
   "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
-  "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
+  "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
   "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar máis",
+  "block_modal.they_cant_mention": "Non te poden seguir nin mencionar.",
+  "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
+  "block_modal.they_will_know": "Pode ver que a bloqueaches.",
+  "block_modal.title": "Bloquear usuaria?",
+  "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -108,7 +115,7 @@
   "closed_registrations_modal.find_another_server": "Atopa outro servidor",
   "closed_registrations_modal.preamble": "Mastodon é descentralizado, así que non importa onde crees a conta, poderás seguir e interactuar con calquera conta deste servidor. Incluso podes ter o teu servidor!",
   "closed_registrations_modal.title": "Crear conta en Mastodon",
-  "column.about": "Acerca de",
+  "column.about": "Sobre",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronoloxía local",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueada",
   "compose_form.placeholder": "Que contas?",
-  "compose_form.poll.add_option": "Engadir unha opción",
   "compose_form.poll.duration": "Duración da enquisa",
+  "compose_form.poll.multiple": "Escolla múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.single": "Elixe unha",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
-  "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
+  "compose_form.spoiler_placeholder": "Aviso sobre o contido (optativo)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "Tes a certeza de querer bloquear a {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar solicitude",
   "confirmations.cancel_follow_request.message": "Tes a certeza de querer retirar a solicitude para seguir a {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -174,17 +177,15 @@
   "confirmations.delete_list.message": "Tes a certeza de querer eliminar de xeito permanente esta listaxe?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tes cambios sen gardar para a vista previa ou descrición do multimedia, descartamos os cambios?",
-  "confirmations.domain_block.confirm": "Agochar dominio enteiro",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "Tes a certeza de querer bloquear todo de {domain}? Na meirande parte dos casos uns bloqueos ou silenciados específicos son suficientes. Non verás máis o contido deste dominio en ningunha cronoloxía pública ou nas túas notificacións. As túas seguidoras deste dominio serán eliminadas.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Ao editar sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.mute.confirm": "Acalar",
-  "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
-  "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
-  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as comparticións e favoritas, e as respostas á publicación orixinal ficarán orfas.",
+  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
@@ -204,10 +205,31 @@
   "disabled_account_banner.text": "Actualmente a túa conta {disabledAccount} está desactivada.",
   "dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.",
   "dismissable_banner.dismiss": "Desbotar",
-  "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.",
+  "dismissable_banner.explore_links": "Estas son as novas historias más compartidas hoxe na web social. Aparecen primeiro as novas compartidas por máis persoas diferentes.",
   "dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
   "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Prefiro bloquear a @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "As persoas deste servidor poden interactuar coas túas publicacións antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguén deste servidor pode seguirte.",
+  "domain_block_modal.they_wont_know": "Non saberá que a bloqueaches.",
+  "domain_block_modal.title": "Bloquear dominio?",
+  "domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
+  "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificación das usuarias neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
+  "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "O seu alcume:",
+  "domain_pill.their_server": "O seu fogar dixital, onde están as súas publicacións.",
+  "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
+  "domain_pill.username": "Nome de usuaria",
+  "domain_pill.whats_in_a_handle": "Que é o alcume?",
+  "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social de <button>plataformas ActivityPub</button>.",
+  "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social de <button>plataformas ActivityPub</button>.",
+  "domain_pill.your_handle": "O teu alcume:",
+  "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
+  "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
   "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
   "embed.preview": "Así será mostrado:",
   "emoji_button.activity": "Actividade",
@@ -240,10 +262,11 @@
   "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
   "empty_column.followed_tags": "Aínda non seguiches ningún cancelo. Cando o fagas aparecerán aquí.",
   "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
-  "empty_column.home": "A túa cronoloxía inicial está baleira! Segue a outras usuarias para enchela. {suggestions}",
+  "empty_column.home": "A túa cronoloxía inicial está baleira! Sigue a outras usuarias para enchela.",
   "empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
+  "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificación aparecerán aquí seguindo o criterio dos teus axustes.",
   "empty_column.notifications": "Aínda non tes notificacións. Aparecerán cando outras persoas interactúen contigo.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
@@ -274,14 +297,32 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mención} other {mencións}}",
+  "filtered_notifications_banner.pending_requests": "Notificacións de {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que poderías coñecer",
+  "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
   "follow_requests.unlocked_explanation": "Malia que a túa conta non é privada, a administración de {domain} pensou que quizabes terías que revisar de xeito manual as solicitudes de seguiminto.",
+  "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
+  "follow_suggestions.dismiss": "Non mostrar máis",
+  "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
+  "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
+  "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tivo moitas interaccións últimamente en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil ten semellanzas cos perfís que ti seguiches últimamente.",
+  "follow_suggestions.personalized_suggestion": "Suxestión personalizada",
+  "follow_suggestions.popular_suggestion": "Suxestión popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Perfís semellantes aos que seguiches recentemente",
+  "follow_suggestions.view_all": "Ver todas",
+  "follow_suggestions.who_to_follow": "A quen seguir",
   "followed_tags": "Cancelos seguidos",
-  "footer.about": "Acerca de",
+  "footer.about": "Sobre",
   "footer.directory": "Directorio de perfís",
   "footer.get_app": "Descarga a app",
   "footer.invite": "Convidar persoas",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
-  "home.actions.go_to_explore": "Mira do que se está a falar",
-  "home.actions.go_to_suggestions": "Atopa persoas ás que seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
-  "home.explore_prompt.body": "A túa cronoloxía de inicio vai ter unha mistura de publicacións procedentes dos cancelos que segues, das persoas que elexiches seguir e das publicacións que elas promoven. Se non tes moito que ler, podes probar a:",
-  "home.explore_prompt.title": "Iste é o teu fogar en Mastodon.",
   "home.hide_announcements": "Agochar anuncios",
   "home.pending_critical_update.body": "Por favor actualiza o antes posible o teu servidor Mastodon!",
   "home.pending_critical_update.link": "Mira as actualizacións",
@@ -346,7 +382,7 @@
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
   "keyboard_shortcuts.favourite": "Marcar como favorita",
-  "keyboard_shortcuts.favourites": "Para abrir a listaxe das favoritas",
+  "keyboard_shortcuts.favourites": "Para abrir a lista das favoritas",
   "keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
   "keyboard_shortcuts.heading": "Atallos do teclado",
   "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
@@ -383,7 +419,7 @@
   "lists.delete": "Eliminar listaxe",
   "lists.edit": "Editar listaxe",
   "lists.edit.submit": "Mudar o título",
-  "lists.exclusive": "Agocha estas publicacións no inicio",
+  "lists.exclusive": "Agocha estas publicacións no Inicio",
   "lists.new.create": "Engadir listaxe",
   "lists.new.title_placeholder": "Título da nova listaxe",
   "lists.replies_policy.followed": "Toda usuaria seguida",
@@ -396,10 +432,16 @@
   "loading_indicator.label": "Estase a cargar…",
   "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
-  "mute_modal.duration": "Duración",
-  "mute_modal.hide_notifications": "Agochar notificacións desta persoa?",
-  "mute_modal.indefinite": "Indefinida",
-  "navigation_bar.about": "Acerca de",
+  "mute_modal.hide_from_notifications": "Ocultar nas notificacións",
+  "mute_modal.hide_options": "Opcións ao ocultar",
+  "mute_modal.indefinite": "Ata que as reactive",
+  "mute_modal.show_options": "Mostrar opcións",
+  "mute_modal.they_can_mention_and_follow": "Pódete mencionar e seguirte, pero non o verás.",
+  "mute_modal.they_wont_know": "Non saberá que a acalaches.",
+  "mute_modal.title": "Acalar usuaria?",
+  "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
+  "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
+  "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Mencións privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Descubrir",
   "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -432,20 +473,37 @@
   "notification.follow": "{name} comezou a seguirte",
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.mention": "{name} mencionoute",
+  "notification.moderation-warning.learn_more": "Saber máis",
+  "notification.moderation_warning": "Recibiches unha advertencia da moderación",
+  "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
+  "notification.moderation_warning.action_disable": "A túa conta foi desactivada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunha das túas publicacións foron marcadas como sensibles.",
+  "notification.moderation_warning.action_none": "A túa conta recibeu unha advertencia da moderación.",
+  "notification.moderation_warning.action_sensitive": "De agora en diante as túas publicacións van ser marcadas como sensibles.",
+  "notification.moderation_warning.action_silence": "A túa conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
+  "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
+  "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
+  "notification.relationships_severance_event.domain_block": "A administración de {from} bloqueou a {target}, que inclúe a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
+  "notification.relationships_severance_event.learn_more": "Saber máis",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueaches a {target}, eliminando a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
   "notification.status": "{name} publicou",
   "notification.update": "{name} editou unha publicación",
+  "notification_requests.accept": "Aceptar",
+  "notification_requests.dismiss": "Desbotar",
+  "notification_requests.notifications_from": "Notificacións de {name}",
+  "notification_requests.title": "Notificacións filtradas",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
   "notifications.column_settings.favourite": "Favoritas:",
-  "notifications.column_settings.filter_bar.advanced": "Amosar todas as categorías",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
-  "notifications.column_settings.filter_bar.show_bar": "Amosar barra de filtros",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
   "notifications.column_settings.mention": "Mencións:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Non se activaron as notificacións de escritorio porque se denegou o permiso",
   "notifications.permission_denied_alert": "Non se poden activar as notificacións de escritorio, xa que o permiso para o navegador foi denegado previamente",
   "notifications.permission_required": "As notificacións de escritorio non están dispoñibles porque non se concedeu o permiso necesario.",
+  "notifications.policy.filter_new_accounts.hint": "Creadas desde {days, plural, one {onte} other {fai # días}}",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Inclúe a persoas que te seguen desde fai menos de {days, plural, one {1 día} other {# días}}",
+  "notifications.policy.filter_not_followers_title": "Persoas que non te seguen",
+  "notifications.policy.filter_not_following_hint": "Ata que as autorices",
+  "notifications.policy.filter_not_following_title": "Persoas que ti non segues",
+  "notifications.policy.filter_private_mentions_hint": "Filtradas a non ser que sexa unha resposta á túa propia mención ou se ti segues á remitente",
+  "notifications.policy.filter_private_mentions_title": "Mencións privadas non solicitadas",
+  "notifications.policy.title": "Desbotar notificacións de…",
   "notifications_permission_banner.enable": "Activar notificacións de escritorio",
   "notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
   "notifications_permission_banner.title": "Non perder nada",
@@ -480,8 +547,8 @@
   "onboarding.actions.go_to_home": "Vai á cronoloxía de inicio",
   "onboarding.compose.template": "Ola #Mastodon!",
   "onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
-  "onboarding.follows.lead": "Podes facer que a túa cronoloxía de inicio sexa como ti a queres. Canta máis xente sigas máis interesante será. Estes perfís poderían axudarche a comezar —sempre poderás deixar de seguilos despois!",
-  "onboarding.follows.title": "Popular en Mastodon",
+  "onboarding.follows.lead": "A cronoloxía de Inicio é o principal xeito de desfrutar Mastodon. Cantas máis persoas sigas mais interesante e activa será. Para comezar, aquí tes algunhas suxestións:",
+  "onboarding.follows.title": "Personaliza a cronoloxía de inicio",
   "onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
   "onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
   "onboarding.profile.display_name": "Nome público",
@@ -494,20 +561,20 @@
   "onboarding.profile.upload_avatar": "Subir imaxe do perfil",
   "onboarding.profile.upload_header": "Subir cabeceira para o perfil",
   "onboarding.share.lead": "Fai que as persoas saiban como atoparte en Mastodon!",
-  "onboarding.share.message": "Son {username} en #Mastodon! Ségueme en {url}",
+  "onboarding.share.message": "Son {username} en #Mastodon! Sígueme en {url}",
   "onboarding.share.next_steps": "Seguintes pasos:",
   "onboarding.share.title": "Comparte o teu perfil",
-  "onboarding.start.lead": "A túa nova conta en Mastodon está preparada. Mira de que xeito lle podes sacar proveito:",
+  "onboarding.start.lead": "Xa formas parte de Mastodon, unha plataforma de relacións sociais descentralizada, única, onde ti —e non un algoritmo— elixes o que les. Axudámosche cos primeiros pasos:",
   "onboarding.start.skip": "Queres omitir todo isto?",
   "onboarding.start.title": "Pois xa está!",
-  "onboarding.steps.follow_people.body": "Constrúes a túa cronoloxía. Énchea con persoas interesantes.",
-  "onboarding.steps.follow_people.title": "Segue a {count, plural, one {unha persoa} other {# persoas}}",
-  "onboarding.steps.publish_status.body": "Saúda a todo o mundo.",
+  "onboarding.steps.follow_people.body": "Mastodon consiste en seguir a persoas interesantes.",
+  "onboarding.steps.follow_people.title": "Personaliza a túa cronoloxía",
+  "onboarding.steps.publish_status.body": "Exprésate con texto, fotos, vídeos ou enquisas {emoji}",
   "onboarding.steps.publish_status.title": "Escribe a túa primeira publicación",
   "onboarding.steps.setup_profile.body": "Ao engadir información ao teu perfil é máis probable que teñas máis interaccións.",
   "onboarding.steps.setup_profile.title": "Personaliza o perfil",
   "onboarding.steps.share_profile.body": "Dille ás amizades como poden atoparte en Mastodon!",
-  "onboarding.steps.share_profile.title": "Comparte o teu perfil",
+  "onboarding.steps.share_profile.title": "Comparte o teu perfil en Mastodon",
   "onboarding.tips.2fa": "<strong>Sabes que?</strong> Podes protexer a túa conta configurando un segundo factor de autenticación nos axustes. Funciona con calquera app TOTP, non precisas un número de teléfono!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Sabes que?</strong> Como Mastodon é descentralizado, algúns perfís que atopes estarán en servidores diferentes ao teu. Pero podes interactuar igualmente con eles! O seu servidor é o que ven despois da @ no seu identificador!",
   "onboarding.tips.migration": "<strong>Sabes que?</strong> Se cres que {domain} non é o servidor axeitado para ti, podes mover a conta a outro servidor Mastodon sen perder as túas seguidoras. Incluso podes hospedar o teu propio servidor!",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
-  "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só persoas mencionadas",
-  "privacy.private.long": "Só para persoas que te seguen",
-  "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Visible por todas",
+  "privacy.direct.long": "Todas as mencionadas na publicación",
+  "privacy.direct.short": "Persoas concretas",
+  "privacy.private.long": "Só para seguidoras",
+  "privacy.private.short": "Seguidoras",
+  "privacy.public.long": "Para todas dentro e fóra de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
-  "privacy.unlisted.short": "Sen listar",
+  "privacy.unlisted.additional": "Do mesmo xeito que público, menos que a publicación non aparecerá nas cronoloxías en directo ou nos cancelos, en descubrir ou nas buscas de Mastodon, incluso se estivese establecido nas opcións xerais da conta.",
+  "privacy.unlisted.long": "Menor implicación dos algoritmos",
+  "privacy.unlisted.short": "Público limitado",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoxe",
+  "reply_indicator.attachments": "{count, plural, one {# adxunto} other {# adxuntos}}",
   "reply_indicator.cancel": "Desbotar",
+  "reply_indicator.poll": "Enquisa",
   "report.block": "Bloquear",
   "report.block_explanation": "Non vas ver as súas publicacións. Nin verá as túas publicacións nin poderá seguirte. Poderá comprobar que as bloqueaches.",
   "report.categories.legal": "Legal",
@@ -573,7 +643,7 @@
   "report.reasons.dislike": "Non me gusta",
   "report.reasons.dislike_description": "Non é algo que queiras ver",
   "report.reasons.legal": "É ilegal",
-  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu servidor",
+  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu pais ou servidor",
   "report.reasons.other": "É outra cousa",
   "report.reasons.other_description": "O problema non cae dentro de outras categorías",
   "report.reasons.spam": "É spam",
@@ -644,10 +714,11 @@
   "status.direct": "Mencionar de xeito privado a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
-  "status.edited": "Editado {date}",
+  "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustar",
   "status.favourite": "Favorecer",
+  "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
   "status.filtered": "Filtrado",
   "status.hide": "Agochar publicación",
@@ -668,6 +739,7 @@
   "status.reblog": "Promover",
   "status.reblog_private": "Compartir coa audiencia orixinal",
   "status.reblogged_by": "{name} promoveu",
+  "status.reblogs": "{count, plural, one {promoción} other {promocións}}",
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
   "upload_form.audio_description": "Describir para persoas con problemas auditivos",
   "upload_form.description": "Describir para persoas cegas ou con problemas visuais",
-  "upload_form.description_missing": "Sen descrición",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar a miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
   "upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 6758457273..600de39597 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
-  "autosuggest_hashtag.per_week": "{count} לשבוע",
+  "block_modal.remote_users_caveat": "אנו נבקש מהשרת {domain} לכבד את החלטתך. עם זאת, ציות למוסכמות איננו מובטח כיוון ששרתים מסויימים עשויים לטפל בחסימות בצורה אחרת. הודעות פומביות עדיין יהיו גלויות לעיני משתמשים שאינם מחוברים.",
+  "block_modal.show_less": "הצג פחות",
+  "block_modal.show_more": "הצג עוד",
+  "block_modal.they_cant_mention": "הם אינם יכולים לאזכר אותך או לעקוב אחריך.",
+  "block_modal.they_cant_see_posts": "הם לא יכולים לראות את הודעותיך ואתם לא תוכלו לראות את שלהם.",
+  "block_modal.they_will_know": "הם יכולים לראות שהם חסומים.",
+  "block_modal.title": "לחסום משתמש?",
+  "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
   "compose_form.placeholder": "על מה את.ה חושב.ת?",
-  "compose_form.poll.add_option": "הוסיפו בחירה",
   "compose_form.poll.duration": "משך הסקר",
-  "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
-  "compose_form.poll.remove_option": "הסר בחירה זו",
+  "compose_form.poll.multiple": "בחירה מרובה",
+  "compose_form.poll.option_placeholder": "אפשרות {number}",
+  "compose_form.poll.single": "נא לבחור",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
-  "compose_form.publish": "פרסום",
+  "compose_form.poll.type": "סוג משאל",
+  "compose_form.publish": "הודעה",
   "compose_form.publish_form": "לפרסם",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "שמירת שינויים",
-  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
-  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+  "compose_form.reply": "תגובה",
+  "compose_form.save_changes": "עדכון",
   "compose_form.spoiler.marked": "הסר אזהרת תוכן",
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
-  "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
+  "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
-  "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
-  "confirmations.block.message": "האם את/ה בטוח/ה שברצונך למחוק את \"{name}\"?",
   "confirmations.cancel_follow_request.confirm": "ויתור על בקשה",
   "confirmations.cancel_follow_request.message": "לבטל את בקשת המעקב אחרי {name}?",
   "confirmations.delete.confirm": "למחוק",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
   "confirmations.discard_edit_media.confirm": "השלך",
   "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
-  "confirmations.domain_block.confirm": "חסמו לגמרי את שם המתחם (דומיין)",
+  "confirmations.domain_block.confirm": "חסימת שרת",
   "confirmations.domain_block.message": "בטוחה שברצונך באמת לחסום את קהילת {domain}? ברב המקרים השתקה וחסימה של מספר משתמשים עשוייה להספיק. לא תראי תוכל מכלל שם המתחם בפידים הציבוריים או בהתראות שלך. העוקבים שלך מהקהילה הזאת יוסרו",
   "confirmations.edit.confirm": "עריכה",
   "confirmations.edit.message": "עריכה תדרוס את ההודעה שכבר התחלת לכתוב. האם להמשיך?",
   "confirmations.logout.confirm": "התנתקות",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
-  "confirmations.mute.explanation": "זה יסתיר הודעות שלהם והודעות שמאזכרות אותם, אבל עדיין יתיר להם לראות הודעות שלך ולעקוב אחריך.",
-  "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
   "confirmations.reply.confirm": "תגובה",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "אלו הודעות משרת זה ואחרים ברשת המבוזרת שצוברות חשיפה היום. הודעות חדשות יותר עם יותר הדהודים וחיבובים מדורגות גבוה יותר.",
   "dismissable_banner.explore_tags": "התגיות האלו, משרת זה ואחרים ברשת המבוזרת, צוברות חשיפה כעת.",
   "dismissable_banner.public_timeline": "אלו ההודעות האחרונות שהתקבלו מהמשתמשים שנעקבים על ידי משתמשים מ־{domain}.",
+  "domain_block_modal.block": "חסימת שרת",
+  "domain_block_modal.block_account_instead": "לחסום את @{name} במקום שרת שלם",
+  "domain_block_modal.they_can_interact_with_old_posts": "משתמשים משרת זה יכולים להתייחס להודעותיך הישנות.",
+  "domain_block_modal.they_cant_follow": "משתמש משרת זה לא יכול לעקוב אחריך.",
+  "domain_block_modal.they_wont_know": "הם לא ידעו כי נחסמו.",
+  "domain_block_modal.title": "לחסום שרת?",
+  "domain_block_modal.you_will_lose_followers": "כל עוקביך משרת זה יוסרו.",
+  "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
+  "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
+  "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
+  "domain_pill.server": "שרת",
+  "domain_pill.their_handle": "הכינוי שלהם:",
+  "domain_pill.their_server": "הבית המקוון שלהם, היכן שהודעותיהם שוכנות.",
+  "domain_pill.their_username": "המזהה הייחודי של השרת שלהם. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
+  "domain_pill.username": "שם משתמש/ת",
+  "domain_pill.whats_in_a_handle": "מה כולל כינוי?",
+  "domain_pill.who_they_are": "מאחר וכינויים מספרים על מישהו ומה מיקומו, ניתן להיות בקשר עם אנשים לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.who_you_are": "מאחר והכינוי שלך מספר על מי את.ה ומה מקומך בעולם, משתמשים מכל העולם יוכלו להיות בקשר עמך לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
+  "domain_pill.your_handle": "הכינוי שלך:",
+  "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
+  "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
   "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
@@ -226,7 +248,7 @@
   "emoji_button.symbols": "סמלים",
   "emoji_button.travel": "טיולים ואתרים",
   "empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה",
-  "empty_column.account_suspended": "חשבון מושהה",
+  "empty_column.account_suspended": "חשבון מושעה",
   "empty_column.account_timeline": "אין עדיין אף הודעה!",
   "empty_column.account_unavailable": "פרופיל לא זמין",
   "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
@@ -244,6 +266,7 @@
   "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו הודעות חדשות, הן יופיעו פה.",
   "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
   "empty_column.mutes": "עוד לא השתקת שום משתמש.",
+  "empty_column.notification_requests": "בום! אין פה כלום. כשיווצרו עוד התראות, הן יופיעו כאן על בסיס ההעדפות שלך.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
   "error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
+  "filtered_notifications_banner.mentions": "{count, plural, one {איזכור} other {איזכורים} two {איזכוריים}}",
+  "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין התראות ממשתמשים ה}one {התראה אחת ממישהו/מישהי ה}two {יש התראותיים ממשתמשים }other {יש # התראות ממשתמשים }}מוכרים לך",
+  "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
   "firehose.local": "שרת זה",
   "firehose.remote": "שרתים אחרים",
   "follow_request.authorize": "הרשאה",
   "follow_request.reject": "דחיה",
   "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
+  "follow_suggestions.curated_suggestion": "בחירת הצוות",
+  "follow_suggestions.dismiss": "לא להציג שוב",
+  "follow_suggestions.featured_longer": "נבחר ידנית על ידי הצוות של {domain}",
+  "follow_suggestions.friends_of_friends_longer": "פופולרי בין הנעקבים שלך",
+  "follow_suggestions.hints.featured": "החשבון הזה נבחר אישית על ידי צוות {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "חשבון זה פופולרי בין הנעקבים שלך.",
+  "follow_suggestions.hints.most_followed": "חשבון זה הוא מבין הנעקבים ביותר בשרת {domain}.",
+  "follow_suggestions.hints.most_interactions": "חשבון זה קיבל לאחרונה הרבה תשומת לב על שרת {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "חשבון זה דומה לחשבונות אחרים שאחריהם התחלת לעקוב לאחרונה.",
+  "follow_suggestions.personalized_suggestion": "הצעות מותאמות אישית",
+  "follow_suggestions.popular_suggestion": "הצעה פופולרית",
+  "follow_suggestions.popular_suggestion_longer": "פופולרי בקהילת {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "דומה למשתמשות.ים שעקבת אחריהן.ם לאחרונה",
+  "follow_suggestions.view_all": "צפיה בכל",
+  "follow_suggestions.who_to_follow": "אחרי מי לעקוב",
   "followed_tags": "התגיות שהחשבון שלך עוקב אחריהן",
   "footer.about": "אודות",
   "footer.directory": "ספריית פרופילים",
@@ -306,13 +347,8 @@
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
-  "home.actions.go_to_explore": "הצגת מגמות",
-  "home.actions.go_to_suggestions": "למצוא א.נשים לעקוב אחריהן.ם",
-  "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.explore_prompt.body": "פיד הבית שלך יכיל תערובת של הודעות מהתגיות והאנשים שבחרת למעקב, וההודעות שהנעקבים בוחרים להדהד. אם זה נראה שקט מדי כרגע אז מה לגבי:",
-  "home.explore_prompt.title": "זהו בסיס הבית שלך בתוך מסטודון.",
   "home.hide_announcements": "הסתר הכרזות",
   "home.pending_critical_update.body": "יש לעדכן את תוכנת מסטודון בהקדם האפשרי!",
   "home.pending_critical_update.link": "צפיה בעדכונים",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "בטעינה…",
   "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
   "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
-  "mute_modal.duration": "משך הזמן",
-  "mute_modal.hide_notifications": "להסתיר התראות מחשבון זה?",
-  "mute_modal.indefinite": "ללא תאריך סיום",
+  "mute_modal.hide_from_notifications": "להסתיר מהתראות",
+  "mute_modal.hide_options": "הסתרת אפשרויות",
+  "mute_modal.indefinite": "עד שאסיר השתקה",
+  "mute_modal.show_options": "הצגת אפשרויות",
+  "mute_modal.they_can_mention_and_follow": "הם יכולם לאזכר אתכם ולעקוב אחריכם, אבל לא תראו אותם.",
+  "mute_modal.they_wont_know": "הם לא ידעו כי הושתקו.",
+  "mute_modal.title": "להשתיק משתמש?",
+  "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
+  "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "הודעות פרטיות",
   "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.edit_profile": "עריכת פרופיל",
   "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
   "navigation_bar.filters": "מילים מושתקות",
@@ -432,20 +473,37 @@
   "notification.follow": "{name} במעקב אחרייך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.mention": "אוזכרת על ידי {name}",
+  "notification.moderation-warning.learn_more": "למידע נוסף",
+  "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
+  "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
+  "notification.moderation_warning.action_disable": "חשבונך הושבת.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "חלק מהודעותיך סומנו כרגישות.",
+  "notification.moderation_warning.action_none": "חשבונך קיבל אזהרה מצוות ניהול התוכן.",
+  "notification.moderation_warning.action_sensitive": "הודעותיך יסומנו כרגישות מעתה ואילך.",
+  "notification.moderation_warning.action_silence": "חשבונך הוגבל.",
+  "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
+  "notification.relationships_severance_event": "אבד הקשר עם {name}",
+  "notification.relationships_severance_event.account_suspension": "מנהל.ת משרת {from} השע(ת)ה את {target}, ולפיכך לא תעודכנו יותר על ידם ולא תוכלו להיות איתם בקשר.",
+  "notification.relationships_severance_event.domain_block": "מנהל.ת מאתר {from} חסמו את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
+  "notification.relationships_severance_event.learn_more": "למידע נוסף",
+  "notification.relationships_severance_event.user_domain_block": "חסמת את {target} ובכלל זה {followersCount} מעוקביך וגם {followingCount, plural, one {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו הודעה",
+  "notification_requests.accept": "לקבל",
+  "notification_requests.dismiss": "לבטל",
+  "notification_requests.notifications_from": "התראות מ־ {name}",
+  "notification_requests.title": "התראות מסוננות",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "חיבובים:",
-  "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
+  "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות",
   "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
-  "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
   "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
   "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
+  "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
+  "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
+  "notifications.policy.filter_not_followers_title": "משתמשים שלא עוקבות.ים אחריך",
+  "notifications.policy.filter_not_following_hint": "עד שיאושרו ידנית על ידיך",
+  "notifications.policy.filter_not_following_title": "משתמשים שאינך עוקב(ת) אחריהםן",
+  "notifications.policy.filter_private_mentions_hint": "מסונן אלא אם זו תשובה למינשון שלך או אם אתם עוקבים אחרי העונה",
+  "notifications.policy.filter_private_mentions_title": "מינשונים בפרטי שלא הוזמנו",
+  "notifications.policy.title": "להסתיר התראות מ…",
   "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "הוספת סקר",
   "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
-  "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
-  "privacy.direct.short": "למאוזכרים בלבד",
-  "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "לעוקבים בלבד",
-  "privacy.public.long": "גלוי לכל",
+  "privacy.direct.long": "כל המוזכרים בהודעה",
+  "privacy.direct.short": "א.נשים מסוימים",
+  "privacy.private.long": "לעוקביך בלבד",
+  "privacy.private.short": "עוקבים",
+  "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
-  "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
+  "privacy.unlisted.additional": "ההתנהגות דומה להודעה ציבורית, מלבד שההודעה לא תופיע בפיד החי המקומי או בתגיות, תגליות או חיפוש מסטודון, אפילו אם ביקשת שהחשבון כולו יהיה פומבי.",
+  "privacy.unlisted.long": "פחות חשיפה לאלגוריתמים",
+  "privacy.unlisted.short": "ציבורי שקט",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} דקות",
   "relative_time.seconds": "{number} שניות",
   "relative_time.today": "היום",
+  "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
   "reply_indicator.cancel": "ביטול",
+  "reply_indicator.poll": "משאל",
   "report.block": "לחסום",
   "report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
   "report.categories.legal": "חוקי",
@@ -644,10 +714,11 @@
   "status.direct": "הודעה פרטית אל @{name}",
   "status.direct_indicator": "הודעה פרטית",
   "status.edit": "עריכה",
-  "status.edited": "נערך ב{date}",
+  "status.edited": "נערך לאחרונה {date}",
   "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
+  "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
   "status.filtered": "סונן",
   "status.hide": "הסתרת חיצרוץ",
@@ -668,6 +739,7 @@
   "status.reblog": "הדהוד",
   "status.reblog_private": "להדהד ברמת הנראות המקורית",
   "status.reblogged_by": "{name} הידהד/ה:",
+  "status.reblogs": "{count, plural, one {הדהוד אחד} two {שני הדהודים} other {# הדהודים}}",
   "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
   "status.redraft": "מחיקה ועריכה מחדש",
   "status.remove_bookmark": "הסרת סימניה",
@@ -715,10 +787,8 @@
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
   "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.description_missing": "לא הוסף תיאור",
   "upload_form.edit": "עריכה",
   "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
-  "upload_form.undo": "ביטול",
   "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
   "upload_modal.analyzing_picture": "מנתח תמונה…",
   "upload_modal.apply": "החל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 76d7c1d381..5dc99dd76e 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -21,6 +21,7 @@
   "account.blocked": "ब्लॉक",
   "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
+  "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
   "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
   "account.domain_blocked": "छिपा हुआ डोमेन",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
   "account.featured_tags.title": "{name} के चुनिंदा हैशटैग",
   "account.follow": "फॉलो करें",
+  "account.follow_back": "फॉलो करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
   "account.followers_counter": "{count, plural, one {{counter} अनुगामी} other {{counter} समर्थक}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "सूचनाओ को शांत करे",
   "account.mute_short": "शांत करे",
   "account.muted": "म्यूट है",
+  "account.mutual": "आपसी",
   "account.no_bio": "कोई विवरण नहि दिया गया हे",
   "account.open_original_page": "ओरिजिनल पोस्ट खोलें",
   "account.posts": "टूट्स",
@@ -75,6 +78,8 @@
   "admin.dashboard.retention.average": "औसत",
   "admin.dashboard.retention.cohort": "साईन-अप महिना",
   "admin.dashboard.retention.cohort_size": "नये उपयोगकर्ता",
+  "admin.impact_report.instance_accounts": "ये अकाउंट प्रोफाइल मिटा देगा",
+  "admin.impact_report.instance_followers": "हमारे यूजर्स इन फॉलोअर्स को खो देंगे",
   "admin.impact_report.title": "प्रभावकां सारांश",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
@@ -83,7 +88,13 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
-  "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
+  "block_modal.show_less": "कम दिखाएं",
+  "block_modal.show_more": "और दिखाएँ",
+  "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते",
+  "block_modal.they_cant_see_posts": "वो आपके पोस्ट नहीं देख सकते और न आप उनके",
+  "block_modal.they_will_know": "वे नहीं देख सकते कि उन्हें ब्लॉक किया गया है",
+  "block_modal.title": "यूजर को ब्लॉक करें?",
+  "block_modal.you_wont_see_mentions": "वो पोस्ट आप नहीं देख सकते जिनमें उन्हें मेंशन किया गया है",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -131,33 +142,31 @@
   "community.column_settings.remote_only": "केवल सुदूर",
   "compose.language.change": "भाषा बदलें",
   "compose.language.search": "भाषाएँ खोजें...",
+  "compose.published.body": "पोस्ट प्रकाशित हुआ।",
   "compose.published.open": "खोलें",
+  "compose.saved.body": "पोस्ट सुरक्षित किया गया।",
   "compose_form.direct_message_warning_learn_more": "और जानें",
   "compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
   "compose_form.hashtag_warning": "ये पोस्ट किसी भी हैशटैग में लिस्ट नहीं किया जाएगा क्योंकि ये पब्लिक नहीं है। सिर्फ पब्लिक पोस्ट ही हैशटैग से खोजे जा सकते हैं।",
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "विकल्प जोड़े",
   "compose_form.poll.duration": "चुनाव की अवधि",
-  "compose_form.poll.option_placeholder": "कुल विकल्प {number}",
-  "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
+  "compose_form.poll.multiple": "बहुविकल्पी",
+  "compose_form.poll.option_placeholder": "विकल्प {number}",
+  "compose_form.poll.single": "कोई एक चुनें",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
-  "compose_form.publish": "पब्लिश",
+  "compose_form.poll.type": "स्टाइल",
+  "compose_form.publish": "पोस्ट करें",
   "compose_form.publish_form": "पब्लिश",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनों को सहेजें",
-  "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
-  "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
-  "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
+  "compose_form.reply": "जवाब दें",
+  "compose_form.save_changes": "अपडेट करें",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
-  "compose_form.spoiler_placeholder": "अपनी चेतावनी यहाँ लिखें",
+  "compose_form.spoiler_placeholder": "सामग्री चेतावनी (वैकल्पिक)",
   "confirmation_modal.cancel": "रद्द करें",
-  "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
-  "confirmations.block.message": "क्या आप वाकई {name} को ब्लॉक करना चाहते हैं?",
   "confirmations.cancel_follow_request.confirm": "रिक्वेस्ट वापस लें",
   "confirmations.cancel_follow_request.message": "क्या आप सुनिश्चित है की आप {name} का फॉलो रिक्वेस्ट वापिस लेना चाहते हैं?",
   "confirmations.delete.confirm": "मिटाए",
@@ -166,15 +175,13 @@
   "confirmations.delete_list.message": "क्या आप वाकई इस लिस्ट को हमेशा के लिये मिटाना चाहते हैं?",
   "confirmations.discard_edit_media.confirm": "डिस्कार्ड",
   "confirmations.discard_edit_media.message": "लिस्ट में जोड़ें",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन छिपाएं",
+  "confirmations.domain_block.confirm": "सर्वर ब्लॉक करें",
   "confirmations.domain_block.message": "क्या आप वास्तव में, वास्तव में आप पूरे {domain} को ब्लॉक करना चाहते हैं? ज्यादातर मामलों में कुछ लक्षित ब्लॉक या म्यूट पर्याप्त और बेहतर हैं। आप किसी भी सार्वजनिक समय-सीमा या अपनी सूचनाओं में उस डोमेन की सामग्री नहीं देखेंगे। उस डोमेन से आपके फॉलोवर्स को हटा दिया जाएगा।",
   "confirmations.edit.confirm": "संशोधित करें",
   "confirmations.edit.message": "अभी संपादन किया तो वो संदेश मिट जायेगा जिसे आप लिख रहे थे। क्या आप जारी रखना चाहते हैं?",
   "confirmations.logout.confirm": "लॉग आउट करें",
   "confirmations.logout.message": "आप सुनिश्चित हैं कि लॉगआउट करना चाहते हैं?",
   "confirmations.mute.confirm": "शांत",
-  "confirmations.mute.explanation": "यह उनसे और पोस्टों का उल्लेख करते हुए उनसे छिपाएगा, लेकिन यह अभी भी उन्हें आपकी पोस्ट देखने और आपको फॉलो करने की अनुमति देगा।",
-  "confirmations.mute.message": "क्या आप वाकई {name} को शांत करना चाहते हैं?",
   "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
   "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
   "confirmations.reply.confirm": "उत्तर दें",
@@ -185,6 +192,7 @@
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
   "conversation.with": "{names} के साथ",
+  "copy_icon_button.copied": "क्लिपबोर्ड पर कॉपी किया गया",
   "copypaste.copied": "कॉपी किआ जा चूका है",
   "copypaste.copy_to_clipboard": "क्लिपबोर्ड पर कॉपी करें",
   "directory.federated": "ज्ञात फेडीवर्स से",
@@ -197,6 +205,10 @@
   "dismissable_banner.dismiss": "डिसमिस",
   "dismissable_banner.explore_links": "इन समाचारों के बारे में लोगों द्वारा इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर अभी बात की जा रही है।",
   "dismissable_banner.explore_tags": "ये हैशटैग अभी इस पर और डेसेंट्रलीसेड नेटवर्क के अन्य सर्वरों पर लोगों के बीच कर्षण प्राप्त कर रहे हैं।",
+  "domain_block_modal.block": "सर्वर ब्लॉक करें",
+  "domain_block_modal.title": "डोमेन ब्लॉक करें",
+  "domain_pill.server": "सर्वर",
+  "domain_pill.username": "यूज़रनेम",
   "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
   "embed.preview": "यह ऐसा दिखेगा :",
   "emoji_button.activity": "गतिविधि",
@@ -266,6 +278,7 @@
   "follow_request.authorize": "अधिकार दें",
   "follow_request.reject": "अस्वीकार करें",
   "follow_requests.unlocked_explanation": "हालाँकि आपका खाता लॉक नहीं है, फिर भी {domain} डोमेन स्टाफ ने सोचा कि आप इन खातों के मैन्युअल अनुरोधों की समीक्षा करना चाहते हैं।",
+  "follow_suggestions.dismiss": "दोबारा न दिखाएं",
   "followed_tags": "फॉलो किए गए हैशटैग्स",
   "footer.about": "अबाउट",
   "footer.directory": "प्रोफाइल्स डायरेक्टरी",
@@ -288,9 +301,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हैशटैग को फॉलो करें",
   "hashtag.unfollow": "हैशटैग को उनफ़ोल्लोव करें",
-  "home.actions.go_to_explore": "देखिए क्या पक रहा है",
-  "home.actions.go_to_suggestions": "अनुसरने के लिए लोगो को ढूंढे",
-  "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
   "home.hide_announcements": "घोषणाएँ छिपाएँ",
@@ -359,9 +369,6 @@
   "lists.replies_policy.none": "कोई नहीं",
   "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.subheading": "आपकी सूचियाँ",
-  "mute_modal.duration": "अवधि",
-  "mute_modal.hide_notifications": "इस सभ्य की ओरसे आनेवाली सूचनाए शांत करे",
-  "mute_modal.indefinite": "अनिश्चितकालीन",
   "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
@@ -370,7 +377,6 @@
   "navigation_bar.direct": "निजी संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
   "navigation_bar.explore": "अन्वेषण करें",
   "navigation_bar.favourites": "पसंदीदा",
   "navigation_bar.filters": "वारित शब्द",
@@ -386,11 +392,10 @@
   "navigation_bar.security": "सुरक्षा",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} ने अभी पोस्ट किया",
   "notifications.clear": "सूचनाएं हटाए",
   "notifications.column_settings.admin.report": "नई रिपोर्ट:",
   "notifications.column_settings.favourite": "पसंदीदा:",
-  "notifications.column_settings.filter_bar.advanced": "सभी श्रेणियाँ दिखाएं",
-  "notifications.column_settings.filter_bar.category": "फ़िल्टर बार",
   "notifications.column_settings.follow": "नए फ़ॉलोअर्स",
   "notifications.column_settings.mention": "उल्लेख:",
   "notifications.column_settings.poll": "चुनाव परिणाम",
@@ -399,9 +404,12 @@
   "notifications.column_settings.show": "कॉलम में दिखाएँ",
   "notifications.column_settings.sound": "ध्वनि चलाएँ",
   "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.unread_notifications.category": "अपठित सूचनाएं",
+  "notifications.column_settings.unread_notifications.highlight": "अपठित सूचनाओं को हाइलाइट करें",
   "notifications.column_settings.update": "संपादन:",
   "notifications.filter.all": "सभी",
   "notifications.filter.boosts": "बूस्ट",
+  "notifications.filter.favourites": "पसंदीदा",
   "notifications.filter.follows": "फॉलो",
   "notifications.filter.mentions": "उल्लेख",
   "notifications.filter.polls": "चुनाव परिणाम",
@@ -416,6 +424,7 @@
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "अपना प्रोफाइल खोजने योग्य बनाएं",
   "onboarding.profile.discoverable_hint": "जब आप मॅस्टोडॉन पर डिस्कवरेबिलिटी चुनते हैं तो आपके पोस्ट ट्रेंडिंग और सर्च में दिख सकते हैं और आपका प्रोफाइल आपके ही जैसे अकाउंट्स को सुझाया जा सकता है।",
+  "onboarding.profile.display_name": "प्रदर्शित नाम",
   "onboarding.share.message": "मैं {username} मॅस्टोडॉन पर हूं! मुझे यहां {url} फॉलो करें",
   "onboarding.share.next_steps": "आगे कि संभवित विधि",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -435,16 +444,13 @@
   "poll.vote": "वोट",
   "poll.voted": "आपने इसी उत्तर का चुनाव किया है।",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.short": "अनलिस्टेड",
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
+  "relative_time.days": "{number}दिन",
+  "relative_time.full.days": "{number, plural, one {# दिन} other {# दिन}} पहले",
+  "relative_time.full.hours": "{number, plural,one {# घंटा} other {# घंटे}} पहले",
   "relative_time.full.just_now": "अभी-अभी",
   "relative_time.full.minutes": "{number, plural, one {# मिनट} other {# मिनट}} पहले",
   "relative_time.full.seconds": "{number, plural, one {# सेकंड} other {# सेकंड}} पहले",
@@ -454,15 +460,23 @@
   "relative_time.seconds": "{number} सेकंड",
   "relative_time.today": "आज",
   "reply_indicator.cancel": "रद्द करें",
+  "report.block": "ब्लॉक",
   "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।",
   "report.categories.other": "अन्य",
   "report.categories.spam": "अवांछित",
   "report.category.title_account": "रूपरेखा",
   "report.close": "स्वीकार करें",
   "report.comment.title": "क्या और कुछ है जिसके बारे में आपको लगता है कि हमें सूचित होना चाहिए?",
+  "report.next": "आगे",
   "report.placeholder": "Type or paste additional comments",
   "report.reasons.dislike": "मुझे यह पसंद नहीं है",
+  "report.reasons.legal": "यह अवैध है",
+  "report.reasons.legal_description": "आप मानते हैं कि यह आपके या सर्वर के देश के कानून का उल्लंघन करता है",
   "report.reasons.other": "कुछ और है।",
+  "report.reasons.violation": "यह सर्वर नियमों का उल्लंघन करता है",
+  "report.rules.title": "किन नियमों का उल्लंघन हो रहा है?",
+  "report.statuses.subtitle": "लागू होने वाले सभी का चयन करें",
+  "report.statuses.title": "क्या ऐसे कोई पोस्ट हैं जो इस रिपोर्ट का समर्थन करते हों?",
   "report.submit": "सबमिट करें",
   "report.target": "Report {target}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
@@ -480,11 +494,25 @@
   "search_results.statuses": "Toots",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "@{name} को ब्लॉक करें",
+  "status.bookmark": "बुकमार्क",
+  "status.cannot_reblog": "रिपोस्ट को बूस्ट नहीं किया जा सकता",
   "status.copy": "Copy link to status",
+  "status.delete": "हटाएं",
+  "status.detailed_status": "विस्तृत वार्ता दृश्य",
   "status.direct": "निजी संदेश @{name} से",
+  "status.edited": "पिछला संशोधन {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.media.open": "खोलने के लिए क्लिक करें",
+  "status.media.show": "दिखाने के लिए क्लिक करें",
+  "status.mention": "@{name} का उल्लेख करें",
+  "status.more": "अतिरिक्त",
+  "status.mute": "@{name} म्यूट करें",
+  "status.mute_conversation": "इस वार्तालाप को म्यूट करें",
   "status.open": "Expand this status",
+  "status.pin": "प्रोफ़ाइल पर पिन करें",
   "status.pinned": "Pinned toot",
+  "status.read_more": "और पढ़ें",
   "status.reblog": "बूस्ट",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.replied_to": "{name} का उत्तर दें",
@@ -502,7 +530,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "संशोधन करें",
-  "upload_form.undo": "मिटाए",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.apply": "लागू करें",
   "upload_modal.edit_media": "मीडिया में संशोधन करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c535f1affc..ec8d62dbba 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -88,7 +88,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
   "bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
@@ -140,26 +139,14 @@
   "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "Što ti je na umu?",
-  "compose_form.poll.add_option": "Dodaj opciju",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Opcija {number}",
-  "compose_form.poll.remove_option": "Ukloni ovu opciju",
   "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
   "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spremi promjene",
-  "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
-  "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
-  "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
-  "compose_form.spoiler_placeholder": "Ovdje upišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Sigurno želite blokirati {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtjev",
   "confirmations.delete.confirm": "Obriši",
   "confirmations.delete.message": "Stvarno želite obrisati ovaj toot?",
@@ -167,14 +154,11 @@
   "confirmations.delete_list.message": "Jeste li sigurni da želite trajno obrisati ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaciti",
   "confirmations.discard_edit_media.message": "Postoje nespremljene promjene u opisu medija ili u pretpregledu, svejedno ih odbaciti?",
-  "confirmations.domain_block.confirm": "Blokiraj cijelu domenu",
   "confirmations.domain_block.message": "Jeste li zaista, zaista sigurni da želite blokirati cijelu domenu {domain}? U većini slučajeva dovoljno je i preferirano nekoliko ciljanih blokiranja ili utišavanja. Nećete vidjeti sadržaj s te domene ni u kojim javnim vremenskim crtama ili Vašim obavijestima. Vaši pratitelji s te domene bit će uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Jeste li sigurni da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišaj",
-  "confirmations.mute.explanation": "Ovo će sakriti njihove objave i objave koje ih spominju, ali i dalje će im dopuštati da vide Vaše objave i da Vas prate.",
-  "confirmations.mute.message": "Jeste li sigurni da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši i ponovno uredi",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovaranje sada će prepisati poruku koju upravo pišete. Jeste li sigurni da želite nastaviti?",
@@ -272,8 +256,6 @@
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
   "hashtag.follow": "Prati hashtag",
   "hashtag.unfollow": "Prestani pratiti hashtag",
-  "home.actions.go_to_explore": "Vidi trendove",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Sakrij najave",
@@ -336,8 +318,6 @@
   "lists.search": "Traži među praćenim ljudima",
   "lists.subheading": "Vaše liste",
   "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakrij obavijesti ovog korisnika?",
   "navigation_bar.about": "O aplikaciji",
   "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
@@ -346,7 +326,6 @@
   "navigation_bar.direct": "Privatna spominjanja",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
@@ -371,8 +350,6 @@
   "notifications.clear": "Očisti obavijesti",
   "notifications.clear_confirmation": "Želite li zaista trajno očistiti sve Vaše obavijesti?",
   "notifications.column_settings.alert": "Obavijesti radne površine",
-  "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
-  "notifications.column_settings.filter_bar.category": "Brza traka filtera",
   "notifications.column_settings.follow": "Novi pratitelji:",
   "notifications.column_settings.follow_request": "Novi zahtjevi za praćenje:",
   "notifications.column_settings.mention": "Spominjanja:",
@@ -415,13 +392,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
-  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vidljivo svima",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.short": "Neprikazano",
   "privacy_policy.last_updated": "Zadnje ažurirannje {date}",
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
   "recommended": "Preporučeno",
@@ -497,7 +468,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Obriši",
   "status.edit": "Uredi",
-  "status.edited": "Uređeno {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
@@ -561,10 +531,8 @@
   "upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
   "upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
   "upload_form.description": "Opišite za ljude sa slabim vidom",
-  "upload_form.description_missing": "Bez opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promijeni pretpregled",
-  "upload_form.undo": "Obriši",
   "upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiza slike…",
   "upload_modal.apply": "Primijeni",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0d50e36feb..ba7fd6ddc2 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -16,7 +16,7 @@
   "account.badges.bot": "Automatizált",
   "account.badges.group": "Csoport",
   "account.block": "@{name} letiltása",
-  "account.block_domain": "Domain blokkolása: {domain}",
+  "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
   "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
-  "autosuggest_hashtag.per_week": "{count} hetente",
+  "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
+  "block_modal.show_less": "Kevesebb mutatása",
+  "block_modal.show_more": "Több mutatása",
+  "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.",
+  "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.",
+  "block_modal.they_will_know": "Láthatja, hogy le van tiltva.",
+  "block_modal.title": "Letiltsuk a felhasználót?",
+  "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -114,10 +121,10 @@
   "column.community": "Helyi idővonal",
   "column.direct": "Személyes említések",
   "column.directory": "Profilok böngészése",
-  "column.domain_blocks": "Letiltott tartománynevek",
+  "column.domain_blocks": "Letiltott domainek",
   "column.favourites": "Kedvencek",
   "column.firehose": "Hírfolyamok",
-  "column.follow_requests": "Követési kérelmek",
+  "column.follow_requests": "Követési kérések",
   "column.home": "Kezdőlap",
   "column.lists": "Listák",
   "column.mutes": "Némított felhasználók",
@@ -126,8 +133,8 @@
   "column.public": "Föderációs idővonal",
   "column_back_button.label": "Vissza",
   "column_header.hide_settings": "Beállítások elrejtése",
-  "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
-  "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
+  "column_header.moveLeft_settings": "Oszlop áthelyezése balra",
+  "column_header.moveRight_settings": "Oszlop áthelyezése jobbra",
   "column_header.pin": "Kitűzés",
   "column_header.show_settings": "Beállítások megjelenítése",
   "column_header.unpin": "Kitűzés eltávolítása",
@@ -136,7 +143,7 @@
   "community.column_settings.media_only": "Csak média",
   "community.column_settings.remote_only": "Csak távoli",
   "compose.language.change": "Nyelv megváltoztatása",
-  "compose.language.search": "Nyelv keresése...",
+  "compose.language.search": "Nyelvek keresése…",
   "compose.published.body": "A bejegyzés publikálásra került.",
   "compose.published.open": "Megnyitás",
   "compose.saved.body": "A bejegyzés mentve.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
-  "compose_form.poll.add_option": "Lehetőség hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
-  "compose_form.poll.option_placeholder": "{number}. lehetőség",
-  "compose_form.poll.remove_option": "Lehetőség eltávolítása",
+  "compose_form.poll.multiple": "Több lehetőség",
+  "compose_form.poll.option_placeholder": "Válasz {number}",
+  "compose_form.poll.single": "Egyetlen válasz",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
-  "compose_form.publish": "Közzététel",
+  "compose_form.poll.type": "Stílus",
+  "compose_form.publish": "Bejegyzés",
   "compose_form.publish_form": "Új bejegyzés",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Módosítások mentése",
-  "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
-  "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
+  "compose_form.reply": "Válasz",
+  "compose_form.save_changes": "Frissítés",
   "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
-  "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+  "compose_form.spoiler_placeholder": "Tartalmi figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
-  "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
-  "confirmations.block.message": "Biztos, hogy letiltod: {name}?",
   "confirmations.cancel_follow_request.confirm": "Kérés visszavonása",
   "confirmations.cancel_follow_request.message": "Biztos, hogy visszavonod a(z) {name} felhasználóra vonatkozó követési kérésedet?",
   "confirmations.delete.confirm": "Törlés",
@@ -173,16 +176,14 @@
   "confirmations.delete_list.confirm": "Törlés",
   "confirmations.delete_list.message": "Biztos, hogy véglegesen törölni szeretnéd ezt a listát?",
   "confirmations.discard_edit_media.confirm": "Elvetés",
-  "confirmations.discard_edit_media.message": "Elmentetlen változtatásaid vannak a média leírásában vagy előnézetében. Eldobjuk őket?",
-  "confirmations.domain_block.confirm": "Teljes tartomány tiltása",
+  "confirmations.discard_edit_media.message": "Mentetlen változtatásaid vannak a média leírásában vagy előnézetében, mindenképp elveted?",
+  "confirmations.domain_block.confirm": "Kiszolgáló letiltása",
   "confirmations.domain_block.message": "Biztos, hogy le szeretnéd tiltani a teljes {domain} domaint? A legtöbb esetben néhány célzott tiltás vagy némítás elegendő, és kívánatosabb megoldás. Semmilyen tartalmat nem fogsz látni ebből a domainből se az idővonalakon, se az értesítésekben. Az ebben a domainben lévő követőidet is eltávolítjuk.",
   "confirmations.edit.confirm": "Szerkesztés",
   "confirmations.edit.message": "Ha most szerkeszted, ez felülírja a most szerkesztés alatt álló üzenetet. Mégis ezt szeretnéd?",
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
   "confirmations.mute.confirm": "Némítás",
-  "confirmations.mute.explanation": "Ez elrejti a tőlük érkező bejegyzéseket, valamint az őket megemlítőket, de ők továbbra is láthatják a te bejegyzéseid, és követhetnek is téged.",
-  "confirmations.mute.message": "Biztos, hogy némítod: {name}?",
   "confirmations.redraft.confirm": "Törlés és újraírás",
   "confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
   "confirmations.reply.confirm": "Válasz",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ezek jelenleg népszerűvé váló bejegyzések a háló különböző szegleteiből. Az újabb vagy több megtolással rendelkező bejegyzéseket, illetve a kedvencnek jelöléssel rendelkezőeket rangsoroljuk előrébb.",
   "dismissable_banner.explore_tags": "Jelenleg ezek a hashtagek hódítanak teret a közösségi weben. Azokat a hashtageket, amelyeket több különböző ember használ, magasabbra rangsorolják.",
   "dismissable_banner.public_timeline": "Ezek a legfrissebb nyilvános bejegyzések a közösségi weben, amelyeket {domain} domain felhasználói követnek.",
+  "domain_block_modal.block": "Kiszolgáló letiltása",
+  "domain_block_modal.block_account_instead": "Helyette @{name} letiltása",
+  "domain_block_modal.they_can_interact_with_old_posts": "Az ezen a kiszolgálón lévő emberek interaktálhatnak a régi bejegyzéseiddel.",
+  "domain_block_modal.they_cant_follow": "Erről a kiszolgálóról senki sem követhet.",
+  "domain_block_modal.they_wont_know": "Nem fogja tudni, hogy letiltották.",
+  "domain_block_modal.title": "Letiltsuk a domaint?",
+  "domain_block_modal.you_will_lose_followers": "Az ezen a kiszolgálón lévő összes követődet törölni fogjuk.",
+  "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
+  "domain_pill.activitypub_lets_connect": "Lehetővé teszi, hogy kapcsolatba lépj nem csak a Mastodonon, hanem a más közösségi alkalmazásokon lévő emberekkel is.",
+  "domain_pill.activitypub_like_language": "Az ActivityPub olyan mint egy nyelv, amelyet a Mastodon a más közösségi hálózatokkal való kommunikációra használ.",
+  "domain_pill.server": "Kiszolgáló",
+  "domain_pill.their_handle": "A fiókneve:",
+  "domain_pill.their_server": "A digitális otthona, ahol a bejegyzései találhatók.",
+  "domain_pill.their_username": "Az egyedi azonosítója a kiszolgálóján. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
+  "domain_pill.username": "Felhasználónév",
+  "domain_pill.whats_in_a_handle": "Mi is egy fióknév?",
+  "domain_pill.who_they_are": "Mivel a fióknevek mondják meg, hogy valaki kicsoda és hol található, így ezek használatával léphetsz kapcsolatba az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberekkel.",
+  "domain_pill.who_you_are": "Mivel a fiókneved mondja meg, hogy ki vagy és hol, így ezek használatával léphetnek kapcsolatba veled az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberek.",
+  "domain_pill.your_handle": "Saját fióknév:",
+  "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
+  "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
   "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
   "embed.preview": "Így fog kinézni:",
   "emoji_button.activity": "Tevékenység",
@@ -233,7 +255,7 @@
   "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.",
-  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen tartomány sem.",
+  "empty_column.domain_blocks": "Még nem lett letiltva egyetlen domain sem.",
   "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
   "empty_column.favourites": "Még senki sem jelölte ezt a bejegyzést kedvencnek. Ha valaki mégis megteszi, itt fogjuk mutatni.",
@@ -244,6 +266,7 @@
   "empty_column.list": "A lista jelenleg üres. Ha a listatagok bejegyzést tesznek közzé, itt fog megjelenni.",
   "empty_column.lists": "Még nincs egyetlen listád sem. Ha létrehozol egyet, itt fog megjelenni.",
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
+  "empty_column.notification_requests": "Minden tiszta! Itt nincs semmi. Ha új értesítéseket kapsz, azok itt jelennek meg a beállításoknak megfelelően.",
   "empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
   "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
   "error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filtered_notifications_banner.mentions": "{count, plural, one {említés} other {említés}}",
+  "filtered_notifications_banner.pending_requests": "Értesítések {count, plural, =0 {nincsenek} one {egy valósztínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
+  "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
   "firehose.local": "Ez a kiszolgáló",
   "firehose.remote": "Egyéb kiszolgálók",
   "follow_request.authorize": "Hitelesítés",
   "follow_request.reject": "Elutasítás",
   "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
+  "follow_suggestions.curated_suggestion": "A stáb választása",
+  "follow_suggestions.dismiss": "Ne jelenjen meg újra",
+  "follow_suggestions.featured_longer": "A {domain} csapata által kézzel kiválasztott",
+  "follow_suggestions.friends_of_friends_longer": "Népszerű az általad követett emberek körében",
+  "follow_suggestions.hints.featured": "Ezt a profilt a(z) {domain} csapata választotta ki.",
+  "follow_suggestions.hints.friends_of_friends": "Ez a profil népszerű az általad követett emberek körében.",
+  "follow_suggestions.hints.most_followed": "Ez a profil a leginkább követett a(z) {domain} oldalon.",
+  "follow_suggestions.hints.most_interactions": "Ez a profil mostanában sok figyelmet kap a(z) {domain} oldalon.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ez a profil hasonló azokhoz a profilokhoz, melyeket nemrég kezdtél el követni.",
+  "follow_suggestions.personalized_suggestion": "Személyre szabott javaslat",
+  "follow_suggestions.popular_suggestion": "Népszerű javaslat",
+  "follow_suggestions.popular_suggestion_longer": "Népszerű itt: {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Hasonló azokhoz a profilokhoz, melyeket nemrég követtél be",
+  "follow_suggestions.view_all": "Összes megtekintése",
+  "follow_suggestions.who_to_follow": "Kit érdemes követni",
   "followed_tags": "Követett hashtagek",
   "footer.about": "Névjegy",
   "footer.directory": "Profiltár",
@@ -306,20 +347,15 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
-  "home.actions.go_to_explore": "Felkapottak megtekintése",
-  "home.actions.go_to_suggestions": "Követhetők keresése",
-  "home.column_settings.basic": "Általános",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
-  "home.explore_prompt.body": "A saját hírfolyam a követésre kiválasztott hashtagek, a követésre kiválasztott személyek és az általuk népszerűsített bejegyzések keverékét tartalmazza. Ha csendesnek tűnik, akkor megpróbálhatod ezeket:",
-  "home.explore_prompt.title": "Ez a kezdőpontod a Mastodonon belül.",
   "home.hide_announcements": "Közlemények elrejtése",
   "home.pending_critical_update.body": "A lehető leghamarabb frissítsd a Mastodon kiszolgálódat!",
   "home.pending_critical_update.link": "Frissítések megtekintése",
   "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
   "home.show_announcements": "Közlemények megjelenítése",
   "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
-  "interaction_modal.description.follow": "Egy Mastodon fiókkal bekövetheted {name} fiókot, hogy lásd a bejegyzéseit a saját hírfolyamodban.",
+  "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
   "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
   "interaction_modal.login.action": "Vigyen haza",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Betöltés…",
   "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
   "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
-  "mute_modal.duration": "Időtartam",
-  "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
-  "mute_modal.indefinite": "Határozatlan",
+  "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
+  "mute_modal.hide_options": "Beállítások elrejtése",
+  "mute_modal.indefinite": "Amíg nem oldom fel a némítást",
+  "mute_modal.show_options": "Beállítások megjelenítése",
+  "mute_modal.they_can_mention_and_follow": "Megemlíthet vagy követhet téged, de te nem fogod ezeket látni.",
+  "mute_modal.they_wont_know": "Nem fogja tudni, hogy lenémítottad.",
+  "mute_modal.title": "Elnémítsuk a felhasználót?",
+  "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
+  "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -407,8 +449,7 @@
   "navigation_bar.compose": "Új bejegyzés írása",
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
-  "navigation_bar.domain_blocks": "Letiltott tartományok",
-  "navigation_bar.edit_profile": "Profil szerkesztése",
+  "navigation_bar.domain_blocks": "Letiltott domainek",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} követni szeretne téged",
   "notification.mention": "{name} megemlített",
+  "notification.moderation-warning.learn_more": "További információ",
+  "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
+  "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
+  "notification.moderation_warning.action_disable": "A fiókod le van tiltva.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Néhány bejegyzésedet kényesnek jelölték.",
+  "notification.moderation_warning.action_none": "A fiókod moderációs figyelmeztetést kapott.",
+  "notification.moderation_warning.action_sensitive": "A bejegyzéseid mostantól érzékenynek lesznek jelölve.",
+  "notification.moderation_warning.action_silence": "A fiókod korlátozásra került.",
+  "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Egy szavazás, melyben részt vettél, véget ért",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
+  "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
+  "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
+  "notification.relationships_severance_event.domain_block": "Egy admin a(z) {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
+  "notification.relationships_severance_event.learn_more": "További információk",
+  "notification.relationships_severance_event.user_domain_block": "Letiltottad a(z) {target} domaint, ezzel eltávolítva {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
   "notification.status": "{name} bejegyzést tett közzé",
   "notification.update": "{name} szerkesztett egy bejegyzést",
+  "notification_requests.accept": "Elfogadás",
+  "notification_requests.dismiss": "Elvetés",
+  "notification_requests.notifications_from": "{name} értesítései",
+  "notification_requests.title": "Szűrt értesítések",
   "notifications.clear": "Értesítések törlése",
   "notifications.clear_confirmation": "Biztos, hogy véglegesen törölni akarod az összes értesítésed?",
   "notifications.column_settings.admin.report": "Új jelentések:",
@@ -445,9 +504,8 @@
   "notifications.column_settings.favourite": "Kedvencek:",
   "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
-  "notifications.column_settings.filter_bar.show_bar": "Szűrősáv megjelenítése",
   "notifications.column_settings.follow": "Új követők:",
-  "notifications.column_settings.follow_request": "Új követési kérelmek:",
+  "notifications.column_settings.follow_request": "Új követési kérések:",
   "notifications.column_settings.mention": "Megemlítések:",
   "notifications.column_settings.poll": "Szavazási eredmények:",
   "notifications.column_settings.push": "Leküldéses értesítések",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Az asztali értesítések nem érhetők el a korábban elutasított böngészőengedély-kérelem miatt",
   "notifications.permission_denied_alert": "Az asztali értesítések nem engedélyezhetők a korábban elutasított böngésző engedély miatt",
   "notifications.permission_required": "Az asztali értesítések nem érhetőek el, mivel a szükséges engedély nem lett megadva.",
+  "notifications.policy.filter_new_accounts.hint": "Az elmúlt {days, plural, one {napban} other {# napban}} létrehozva",
+  "notifications.policy.filter_new_accounts_title": "Új fiókok",
+  "notifications.policy.filter_not_followers_hint": "Beleértve azokat, akik kevesebb mint {days, plural, one {egy napja} other {# napja}} követnek",
+  "notifications.policy.filter_not_followers_title": "Olyan emberek, akik nem követnek",
+  "notifications.policy.filter_not_following_hint": "Amíg kézileg jóvá nem hagyod őket",
+  "notifications.policy.filter_not_following_title": "Nem követett emberek",
+  "notifications.policy.filter_private_mentions_hint": "Kiszűrve, hacsak nem a saját említésedre válaszol, vagy ha nem követed a feladót",
+  "notifications.policy.filter_private_mentions_title": "Kéretlen személyes említések",
+  "notifications.policy.title": "Feladó értesítéseinek kiszűrése…",
   "notifications_permission_banner.enable": "Asztali értesítések engedélyezése",
   "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
   "notifications_permission_banner.title": "Soha ne mulassz el semmit",
@@ -498,14 +565,14 @@
   "onboarding.share.next_steps": "Lehetséges következő lépések:",
   "onboarding.share.title": "Profil megosztása",
   "onboarding.start.lead": "Az új Mastodon-fiók használatra kész. Így hozhatod ki belőle a legtöbbet:",
-  "onboarding.start.skip": "Szeretnél előreugrani?",
+  "onboarding.start.skip": "Nincs szükséged segítségre a kezdéshez?",
   "onboarding.start.title": "Ez sikerült!",
   "onboarding.steps.follow_people.body": "A Mastodon az érdekes emberek követéséről szól.",
-  "onboarding.steps.follow_people.title": "{count, plural, one {egy ember} other {# ember}} követése",
-  "onboarding.steps.publish_status.body": "Üdvözöljük a világot.",
+  "onboarding.steps.follow_people.title": "Szabd személyre a kezdőlapodat",
+  "onboarding.steps.publish_status.body": "Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal {emoji}",
   "onboarding.steps.publish_status.title": "Az első bejegyzés létrehozása",
-  "onboarding.steps.setup_profile.body": "Mások nagyobb valószínűséggel lépnek kapcsolatba veled egy kitöltött profil esetén.",
-  "onboarding.steps.setup_profile.title": "Profilod testreszabása",
+  "onboarding.steps.setup_profile.body": "Növeld az interakciók számát a profilod részletesebb kitöltésével.",
+  "onboarding.steps.setup_profile.title": "Szabd személyre a profilodat",
   "onboarding.steps.share_profile.body": "Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon",
   "onboarding.steps.share_profile.title": "Oszd meg a Mastodon profilodat",
   "onboarding.tips.2fa": "<strong>Tudtad?</strong> A fiókod biztonságossá teheted, ha a fiók beállításaiban beállítod a kétlépcsős hitelesítést. Bármilyen választott TOTP alkalmazással működik, nincs szükség telefonszámra!",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
-  "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Csak megemlítetteknek",
-  "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követők",
-  "privacy.public.long": "Mindenki számára látható",
+  "privacy.direct.long": "Mindenki, akit a bejegyzés említ",
+  "privacy.direct.short": "Megadott személyek",
+  "privacy.private.long": "Csak a követőid",
+  "privacy.private.short": "Követők",
+  "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
-  "privacy.unlisted.short": "Listázatlan",
+  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírfolyamokban, hashtagekben, felfedezésben vagy a Mastodonos keresésben, még akkor sem, ha ezt az egész fiókra engedélyezted.",
+  "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+  "privacy.unlisted.short": "Csendes nyilvános",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
+  "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
   "reply_indicator.cancel": "Mégsem",
+  "reply_indicator.poll": "Szavazás",
   "report.block": "Letiltás",
   "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
   "report.categories.legal": "Jogi információk",
@@ -644,10 +714,11 @@
   "status.direct": "@{name} személyes említése",
   "status.direct_indicator": "Személyes említés",
   "status.edit": "Szerkesztés",
-  "status.edited": "Szerkesztve: {date}",
+  "status.edited": "Utoljára szerkesztve {date}",
   "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
   "status.embed": "Beágyazás",
   "status.favourite": "Kedvenc",
+  "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
   "status.filtered": "Megszűrt",
   "status.hide": "Bejegyzés elrejtése",
@@ -668,6 +739,7 @@
   "status.reblog": "Megtolás",
   "status.reblog_private": "Megtolás az eredeti közönségnek",
   "status.reblogged_by": "{name} megtolta",
+  "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
   "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
   "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
-  "upload_form.description_missing": "Nincs leírás megadva",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Bélyegkép megváltoztatása",
-  "upload_form.undo": "Törlés",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
   "upload_modal.apply": "Alkalmaz",
@@ -730,9 +800,9 @@
   "upload_modal.hint": "Kattints vagy húzd a kört az előnézetben arra a fókuszpontra, mely minden bélyegképen látható kell, hogy legyen.",
   "upload_modal.preparing_ocr": "OCR előkészítése…",
   "upload_modal.preview_label": "Előnézet ({ratio})",
-  "upload_progress.label": "Feltöltés...",
+  "upload_progress.label": "Feltöltés…",
   "upload_progress.processing": "Feldolgozás…",
-  "username.taken": "Ez a felhasználónév foglalt. Válassz másikat",
+  "username.taken": "Ez a felhasználónév foglalt. Válassz másikat.",
   "video.close": "Videó bezárása",
   "video.download": "Fájl letöltése",
   "video.exit_fullscreen": "Kilépés teljes képernyőből",
@@ -742,5 +812,5 @@
   "video.mute": "Hang némítása",
   "video.pause": "Szünet",
   "video.play": "Lejátszás",
-  "video.unmute": "Hang némításának vége"
+  "video.unmute": "Hang némításának feloldása"
 }
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 835105218d..7310104bf9 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,6 @@
   "alert.unexpected.title": "Վա՜յ",
   "announcement.announcement": "Յայտարարութիւններ",
   "audio.hide": "Թաքցնել աուդիոն",
-  "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.error.title": "Օ՜, ոչ։",
   "bundle_column_error.network.title": "Ցանցի սխալ",
@@ -117,40 +116,25 @@
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
   "compose_form.placeholder": "Ի՞նչ կայ մտքիդ",
-  "compose_form.poll.add_option": "Աւելացնել տարբերակ",
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
-  "compose_form.poll.option_placeholder": "Տարբերակ {number}",
-  "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
   "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
   "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
-  "compose_form.publish": "Հրապարակել",
   "compose_form.publish_form": "Հրապարակել",
-  "compose_form.publish_loud": "Հրապարակե՜լ",
-  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
-  "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
-  "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
-  "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
-  "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
   "confirmation_modal.cancel": "Չեղարկել",
-  "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
-  "confirmations.block.message": "Վստա՞հ ես, որ ուզում ես արգելափակել {name}֊ին։",
   "confirmations.cancel_follow_request.confirm": "Կասեցնել հայցը",
   "confirmations.delete.confirm": "Ջնջել",
   "confirmations.delete.message": "Վստա՞հ ես, որ ուզում ես ջնջել այս գրառումը։",
   "confirmations.delete_list.confirm": "Ջնջել",
   "confirmations.delete_list.message": "Վստա՞հ ես, որ ուզում ես մշտապէս ջնջել այս ցանկը։",
   "confirmations.discard_edit_media.confirm": "Չեղարկել",
-  "confirmations.domain_block.confirm": "Թաքցնել ամբողջ տիրույթը",
   "confirmations.domain_block.message": "Հաստատ֊հաստա՞տ վստահ ես, որ ուզում ես արգելափակել ամբողջ {domain} տիրոյթը։ Սովորաբար մի երկու թիրախաւորուած արգելափակում կամ լռեցում բաւական է ու նախընտրելի։",
   "confirmations.edit.confirm": "Խմբագրել",
   "confirmations.logout.confirm": "Ելք",
   "confirmations.logout.message": "Համոզո՞ւած ես, որ ուզում ես դուրս գալ",
   "confirmations.mute.confirm": "Լռեցնել",
-  "confirmations.mute.explanation": "Սա թաքցնելու ա իրենց գրառումներն, ինչպէս նաեւ իրենց նշող գրառումներն, բայց իրենք միեւնոյն է կը կարողանան հետեւել ձեզ եւ տեսնել ձեր գրառումները։",
-  "confirmations.mute.message": "Վստա՞հ ես, որ ուզում ես {name}֊ին լռեցնել։",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.reply.confirm": "Պատասխանել",
   "confirmations.reply.message": "Այս պահին պատասխանելը կը չեղարկի ձեր՝ այս պահին անաւարտ հաղորդագրութիւնը։ Համոզուա՞ծ էք։",
@@ -246,7 +230,6 @@
   "hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
   "hashtag.follow": "Հետեւել պիտակին",
   "hashtag.unfollow": "Չհետեւել պիտակին",
-  "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
   "home.hide_announcements": "Թաքցնել յայտարարութիւնները",
@@ -314,9 +297,6 @@
   "lists.subheading": "Քո ցանկերը",
   "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
-  "mute_modal.duration": "Տեւողութիւն",
-  "mute_modal.hide_notifications": "Թաքցնե՞լ ծանուցումներն այս օգտատիրոջից։",
-  "mute_modal.indefinite": "Անժամկէտ",
   "navigation_bar.about": "Մասին",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
@@ -325,7 +305,6 @@
   "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.edit_profile": "Խմբագրել հաշիւը",
   "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
@@ -357,9 +336,6 @@
   "notifications.column_settings.admin.sign_up": "Նոր գրանցումներ՝",
   "notifications.column_settings.alert": "Աշխատատիրոյթի ծանուցումներ",
   "notifications.column_settings.favourite": "Հաւանածներ՝",
-  "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
-  "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
-  "notifications.column_settings.filter_bar.show_bar": "Ցոյց տալ զտման պանելը",
   "notifications.column_settings.follow": "Նոր հետեւողներ՝",
   "notifications.column_settings.follow_request": "Նոր հետեւելու հայցեր:",
   "notifications.column_settings.mention": "Նշումներ՝",
@@ -414,13 +390,7 @@
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
-  "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողները",
-  "privacy.public.long": "Տեսանելի բոլորին",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.short": "Ծածուկ",
   "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
   "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
   "refresh": "Թարմացնել",
@@ -489,7 +459,6 @@
   "status.direct": "Մասնաւոր յիշատակում @{name}",
   "status.direct_indicator": "Մասնաւոր յիշատակում",
   "status.edit": "Խմբագրել",
-  "status.edited": "Խմբագրուել է՝ {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
@@ -556,7 +525,6 @@
   "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.thumbnail": "Փոխել պատկերակը",
-  "upload_form.undo": "Յետարկել",
   "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e790306e9c..313563bdfe 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -2,61 +2,120 @@
   "about.blocks": "Servitores moderate",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Ration non disponibile",
+  "about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.",
+  "about.domain_blocks.silenced.explanation": "Generalmente, tu non videra le profilos e le contento de iste servitor, excepte si tu expressemente cerca le contento o seque le profilos.",
+  "about.domain_blocks.silenced.title": "Limitate",
+  "about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
+  "about.domain_blocks.suspended.title": "Suspendite",
+  "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
+  "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
   "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Adder o remover ab listas",
+  "account.add_or_remove_from_list": "Adder a, o remover de listas",
+  "account.badges.bot": "Automatisate",
   "account.badges.group": "Gruppo",
   "account.block": "Blocar @{name}",
+  "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
+  "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
+  "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
+  "account.direct": "Mentionar privatemente @{name}",
+  "account.disable_notifications": "Non plus notificar me quando @{name} publica",
+  "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
+  "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
-  "account.featured_tags.last_status_at": "Ultime message in {date}",
-  "account.featured_tags.last_status_never": "Necun messages",
+  "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
+  "account.featured_tags.last_status_never": "Necun message",
+  "account.featured_tags.title": "Hashtags eminente de {name}",
   "account.follow": "Sequer",
-  "account.follow_back": "Sequer etiam",
+  "account.follow_back": "Sequer in retorno",
   "account.followers": "Sequitores",
+  "account.followers.empty": "Necuno seque ancora iste usator.",
+  "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
   "account.following": "Sequente",
+  "account.following_counter": "{count, plural, one {{counter} sequite} other {{counter} sequites}}",
+  "account.follows.empty": "Iste usator non seque ancora alcuno.",
   "account.go_to_profile": "Vader al profilo",
-  "account.hide_reblogs": "Celar boosts de @{name}",
+  "account.hide_reblogs": "Celar impulsos de @{name}",
+  "account.in_memoriam": "In memoriam.",
+  "account.joined_short": "Inscribite",
   "account.languages": "Cambiar le linguas subscribite",
-  "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
-  "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
+  "account.link_verified_on": "Le proprietate de iste ligamine ha essite verificate le {date}",
+  "account.locked_info": "Le stato de confidentialitate de iste conto es definite como serrate. Le proprietario determina manualmente qui pote sequer le.",
+  "account.media": "Multimedia",
   "account.mention": "Mentionar @{name}",
-  "account.moved_to": "{name} indicava que lor nove conto ora es:",
+  "account.moved_to": "{name} ha indicate que su nove conto ora es:",
   "account.mute": "Silentiar @{name}",
   "account.mute_notifications_short": "Silentiar le notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiate",
+  "account.mutual": "Mutue",
   "account.no_bio": "Nulle description fornite.",
+  "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
+  "account.report": "Signalar @{name}",
+  "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
+  "account.requested_follow": "{name} ha requestate de sequer te",
   "account.share": "Compartir profilo de @{name}",
-  "account.show_reblogs": "Monstrar responsas de @{name}",
+  "account.show_reblogs": "Monstrar impulsos de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Disblocar @{name}",
   "account.unblock_domain": "Disblocar dominio {domain}",
   "account.unblock_short": "Disblocar",
   "account.unendorse": "Non evidentiar sur le profilo",
+  "account.unfollow": "Non plus sequer",
   "account.unmute": "Non plus silentiar @{name}",
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
   "account_note.placeholder": "Clicca pro adder un nota",
+  "admin.dashboard.daily_retention": "Retention de usatores per die post inscription",
+  "admin.dashboard.monthly_retention": "Retention de usatores per mense post inscription",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mense de inscription",
   "admin.dashboard.retention.cohort_size": "Nove usatores",
-  "admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
-  "admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
-  "alert.rate_limited.message": "Retenta depost {retry_time, time, medium}.",
-  "alert.unexpected.message": "Ocurreva un error inexpectate.",
+  "admin.impact_report.instance_accounts": "Numero de contos que isto delerea",
+  "admin.impact_report.instance_followers": "Sequitores que nostre usatores perderea",
+  "admin.impact_report.instance_follows": "Sequitores que lor usatores perderea",
+  "admin.impact_report.title": "Summario de impacto",
+  "alert.rate_limited.message": "Per favor retenta post {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Excesso de requestas",
+  "alert.unexpected.message": "Un error inexpectate ha occurrite.",
+  "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Annuncio",
+  "attachments_list.unprocessed": "(non processate)",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per septimana",
+  "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.",
+  "block_modal.show_less": "Monstrar minus",
+  "block_modal.show_more": "Monstrar plus",
+  "block_modal.they_cant_mention": "Le persona non pote mentionar te o sequer te.",
+  "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.",
+  "block_modal.they_will_know": "Le persona pote saper de esser blocate.",
+  "block_modal.title": "Blocar usator?",
+  "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+  "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
+  "bundle_column_error.copy_stacktrace": "Copiar reporto de error",
+  "bundle_column_error.error.body": "Le pagina requestate non pote esser visualisate. Pote esser a causa de un defecto in nostre codice o de un problema de compatibilitate del navigator.",
+  "bundle_column_error.error.title": "Oh, no!",
+  "bundle_column_error.network.body": "Un error ha occurrite durante le cargamento de iste pagina. Isto pote esser a causa de un problema temporari con tu connexion a internet o con iste servitor.",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
+  "bundle_column_error.routing.body": "Le pagina requestate non pote esser trovate. Es tu secur que le URL in le barra de adresse es correcte?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Clauder",
+  "bundle_modal_error.message": "Un error ha occurrite durante le cargamento de iste componente.",
   "bundle_modal_error.retry": "Tentar novemente",
-  "closed_registrations_modal.find_another_server": "Trovar altere servitor",
-  "column.about": "A proposito de",
+  "closed_registrations.other_server_instructions": "Perque Mastodon es decentralisate, tu pote crear un conto sur un altere servitor e totevia interager con iste servitor.",
+  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
+  "closed_registrations_modal.preamble": "Mastodon es decentralisate, dunque, non importa ubi tu crea tu conto, tu pote sequer e communicar con omne persona sur iste servitor. Tu pote mesmo hospitar tu proprie servitor!",
+  "closed_registrations_modal.title": "Crear un conto sur Mastodon",
+  "column.about": "A proposito",
   "column.blocks": "Usatores blocate",
   "column.bookmarks": "Marcapaginas",
   "column.community": "Chronologia local",
@@ -64,47 +123,73 @@
   "column.directory": "Navigar profilos",
   "column.domain_blocks": "Dominios blocate",
   "column.favourites": "Favoritos",
-  "column.firehose": "Fluxos in directe",
+  "column.firehose": "Fluxos in directo",
+  "column.follow_requests": "Requestas de sequimento",
   "column.home": "Initio",
   "column.lists": "Listas",
   "column.mutes": "Usatores silentiate",
   "column.notifications": "Notificationes",
+  "column.pins": "Messages fixate",
   "column.public": "Chronologia federate",
+  "column_back_button.label": "Retro",
   "column_header.hide_settings": "Celar le parametros",
   "column_header.moveLeft_settings": "Mover columna al sinistra",
   "column_header.moveRight_settings": "Mover columna al dextra",
+  "column_header.pin": "Fixar",
   "column_header.show_settings": "Monstrar le parametros",
+  "column_header.unpin": "Disfixar",
   "column_subheading.settings": "Parametros",
+  "community.column_settings.local_only": "Solmente local",
+  "community.column_settings.media_only": "Solmente multimedia",
+  "community.column_settings.remote_only": "A distantia solmente",
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.body": "Message publicate.",
   "compose.published.open": "Aperir",
   "compose.saved.body": "Message salvate.",
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
+  "compose_form.encryption_warning": "Le messages sur Mastodon non es cryptate de puncta a puncta. Non condivide alcun information sensibile usante Mastodon.",
+  "compose_form.hashtag_warning": "Iste message non essera listate sub alcun hashtag perque illo non es public. Solmente le messages public pote esser cercate per hashtag.",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
-  "compose_form.lock_disclaimer.lock": "blocate",
-  "compose_form.poll.add_option": "Adder un option",
-  "compose_form.poll.remove_option": "Remover iste option",
+  "compose_form.lock_disclaimer.lock": "serrate",
+  "compose_form.placeholder": "Que ha tu in mente?",
+  "compose_form.poll.duration": "Durata del sondage",
+  "compose_form.poll.multiple": "Selection multiple",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.single": "Seliger un",
+  "compose_form.poll.switch_to_multiple": "Cambiar le sondage pro permitter selectiones multiple",
+  "compose_form.poll.switch_to_single": "Cambiar le sondage pro permitter selection singule",
+  "compose_form.poll.type": "Stilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar le cambiamentos",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover advertimento de contento",
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
-  "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
+  "compose_form.spoiler_placeholder": "Advertimento de contento (optional)",
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
+  "confirmations.cancel_follow_request.confirm": "Retirar requesta",
+  "confirmations.cancel_follow_request.message": "Es tu secur que tu vole retirar tu requesta de sequer {name}?",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
-  "confirmations.domain_block.confirm": "Blocar le dominio complete",
+  "confirmations.discard_edit_media.confirm": "Abandonar",
+  "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
+  "confirmations.domain_block.confirm": "Blocar le servitor",
+  "confirmations.domain_block.message": "Es tu realmente, absolutemente secur de voler blocar tote le dominio {domain}? In le major parte del casos es preferibile blocar o silentiar alcun personas specific. Si tu bloca tote le dominio, tu non videra alcun contento de ille dominio in alcun chronologia public o in tu notificationes, e tu sequitores de ille dominio essera removite.",
   "confirmations.edit.confirm": "Modificar",
-  "confirmations.logout.confirm": "Clauder le session",
+  "confirmations.edit.message": "Si tu modifica isto ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+  "confirmations.logout.confirm": "Clauder session",
   "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
+  "confirmations.redraft.confirm": "Deler e rescriber",
+  "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
   "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
+  "confirmations.unfollow.confirm": "Non plus sequer",
+  "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -114,40 +199,133 @@
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
   "directory.federated": "Ab le fediverso cognoscite",
   "directory.local": "Solmente ab {domain}",
+  "directory.new_arrivals": "Nove arrivatas",
   "directory.recently_active": "Recentemente active",
   "disabled_account_banner.account_settings": "Parametros de conto",
   "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
+  "dismissable_banner.community_timeline": "Ecce le messages public le plus recente del personas con contos sur {domain}.",
   "dismissable_banner.dismiss": "Dimitter",
+  "dismissable_banner.explore_links": "Istes es le articulos de novas que se condivide le plus sur le rete social hodie. Le articulos de novas le plus recente, publicate per plus personas differente, se classifica plus in alto.",
+  "dismissable_banner.explore_statuses": "Ecce le messages de tote le rete social que gania popularitate hodie. Le messages plus nove con plus impulsos e favorites se classifica plus in alto.",
+  "dismissable_banner.explore_tags": "Ecce le hashtags que gania popularitate sur le rete social hodie. Le hashtags usate per plus personas differente se classifica plus in alto.",
+  "dismissable_banner.public_timeline": "Istes es le messages public le plus recente del personas sur le rete social que le gente sur {domain} seque.",
+  "domain_block_modal.block": "Blocar le servitor",
+  "domain_block_modal.block_account_instead": "Blocar @{name} in su loco",
+  "domain_block_modal.they_can_interact_with_old_posts": "Le personas de iste servitor pote interager con tu messages ancian.",
+  "domain_block_modal.they_cant_follow": "Nulle persona ab iste servitor pote sequer te.",
+  "domain_block_modal.they_wont_know": "Illes non sapera que illes ha essite blocate.",
+  "domain_block_modal.title": "Blocar dominio?",
+  "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
+  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
+  "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
+  "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
+  "domain_pill.server": "Servitor",
+  "domain_pill.their_handle": "Su pseudonymo:",
+  "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
+  "domain_pill.their_username": "Su identificator unic sur su servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
+  "domain_pill.username": "Nomine de usator",
+  "domain_pill.whats_in_a_handle": "Que significa un pseudonymo?",
+  "domain_pill.who_they_are": "Un pseudonymo indica qui un persona es e ubi se trova, de maniera que tu pote interager con personas sur tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
+  "domain_pill.who_you_are": "Perque tu pseudonymo indica qui tu es e ubi tu te trova, le gente pote interager con te desde tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
+  "domain_pill.your_handle": "Tu pseudonymo:",
+  "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
+  "domain_pill.your_username": "Tu identificator unic sur iste servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
+  "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
+  "embed.preview": "Ecce como illlo parera:",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
+  "emoji_button.flags": "Bandieras",
+  "emoji_button.food": "Alimentos e bibitas",
+  "emoji_button.label": "Inserer emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Necun emoji correspondente trovate",
+  "emoji_button.objects": "Objectos",
+  "emoji_button.people": "Personas",
   "emoji_button.recent": "Frequentemente usate",
   "emoji_button.search": "Cercar...",
   "emoji_button.search_results": "Resultatos de recerca",
+  "emoji_button.symbols": "Symbolos",
+  "emoji_button.travel": "Viages e locos",
+  "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
   "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
+  "empty_column.bookmarked_statuses": "Tu non ha ancora messages in marcapaginas. Quando tu adde un message al marcapaginas, illo apparera hic.",
+  "empty_column.community": "Le chronologia local es vacue. Scribe qualcosa public pro poner le cosas in marcha!",
+  "empty_column.direct": "Tu non ha ancora mentiones private. Quando tu invia o recipe un mention, illo apparera hic.",
+  "empty_column.domain_blocks": "Il non ha dominios blocate ancora.",
+  "empty_column.explore_statuses": "Il non ha tendentias in iste momento. Reveni plus tarde!",
+  "empty_column.favourited_statuses": "Tu non ha alcun message favorite ancora. Quando tu marca un message como favorite, illo apparera hic.",
+  "empty_column.favourites": "Necuno ha ancora marcate iste message como favorite. Quando alcuno lo face, ille apparera hic.",
+  "empty_column.follow_requests": "Tu non ha ancora requestas de sequimento. Quando tu recipe un, illo apparera hic.",
+  "empty_column.followed_tags": "Tu non ha ancora sequite alcun hashtags. Quando tu lo face, illos apparera hic.",
+  "empty_column.hashtag": "Il non ha ancora alcun cosa in iste hashtag.",
+  "empty_column.home": "Tu chronologia de initio es vacue! Seque plus personas pro plenar lo.",
+  "empty_column.list": "Iste lista es ancora vacue. Quando le membros de iste lista publica nove messages, illos apparera hic.",
+  "empty_column.lists": "Tu non ha ancora listas. Quando tu crea un, illo apparera hic.",
+  "empty_column.mutes": "Tu non ha ancora silentiate alcun usator.",
+  "empty_column.notification_requests": "Iste lista es toto vacue! Quando tu recipe notificationes, illos apparera hic como configurate in tu parametros.",
+  "empty_column.notifications": "Tu non ha ancora notificationes. Quando altere personas interage con te, tu lo videra hic.",
+  "empty_column.public": "Il ha nihil hic! Scribe qualcosa public, o manualmente seque usatores de altere servitores, pro plenar lo",
+  "error.unexpected_crash.explanation": "A causa de un defecto in nostre codice o de un problema de compatibilitate del navigator, iste pagina non pote esser visualisate correctemente.",
+  "error.unexpected_crash.explanation_addons": "Iste pagina non pote esser visualisate correctemente. Iste error es probabilemente causate per un additivo al navigator o per un utensile de traduction automatic.",
+  "error.unexpected_crash.next_steps": "Tenta refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+  "error.unexpected_crash.next_steps_addons": "Tenta disactivar istes e refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
+  "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
+  "explore.suggested_follows": "Personas",
   "explore.title": "Explorar",
   "explore.trending_links": "Novas",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Iste categoria de filtros non se applica al contexto in le qual tu ha accedite a iste message. Pro filtrar le message in iste contexto tamben, modifica le filtro.",
+  "filter_modal.added.context_mismatch_title": "Contexto incoherente!",
+  "filter_modal.added.expired_explanation": "Iste categoria de filtros ha expirate. Tu debe modificar le data de expiration pro applicar lo.",
+  "filter_modal.added.expired_title": "Filtro expirate!",
+  "filter_modal.added.review_and_configure": "Pro revider e configurar ulteriormente iste categoria de filtros, visita le {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Parametros de filtro",
   "filter_modal.added.settings_link": "pagina de parametros",
-  "filter_modal.added.short_explanation": "Iste message esseva addite al sequente categoria de filtros: {title}.",
+  "filter_modal.added.short_explanation": "Iste message ha essite addite al sequente categoria de filtros: {title}.",
   "filter_modal.added.title": "Filtro addite!",
+  "filter_modal.select_filter.context_mismatch": "non se applica a iste contexto",
+  "filter_modal.select_filter.expired": "expirate",
   "filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
   "filter_modal.select_filter.search": "Cercar o crear",
+  "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
+  "filtered_notifications_banner.pending_requests": "Notificationes ab {count, plural, =0 {nemo} one {un persona} other {# personas}} tu poterea cognoscer",
+  "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
-  "footer.about": "A proposito de",
+  "follow_request.authorize": "Autorisar",
+  "follow_request.reject": "Rejectar",
+  "follow_requests.unlocked_explanation": "Benque tu conto non es serrate, le personal de {domain} pensa que es un bon idea que tu revide manualmente le sequente requestas de iste contos.",
+  "follow_suggestions.curated_suggestion": "Selection del equipa",
+  "follow_suggestions.dismiss": "Non monstrar novemente",
+  "follow_suggestions.featured_longer": "Seligite con cura per le equipa de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular inter le gente que tu seque",
+  "follow_suggestions.hints.featured": "Iste profilo ha essite seligite manualmente per le equipa de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Iste profilo es popular inter le gente que tu seque.",
+  "follow_suggestions.hints.most_followed": "Iste profilo es un del plus sequites sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Iste profilo ha recentemente recipite multe attention sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Iste profilo es similar al profilos que tu ha recentemente sequite.",
+  "follow_suggestions.personalized_suggestion": "Suggestion personalisate",
+  "follow_suggestions.popular_suggestion": "Suggestion personalisate",
+  "follow_suggestions.popular_suggestion_longer": "Popular sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar al profilos que tu ha sequite recentemente",
+  "follow_suggestions.view_all": "Vider toto",
+  "follow_suggestions.who_to_follow": "Qui sequer",
+  "followed_tags": "Hashtags sequite",
+  "footer.about": "A proposito",
   "footer.directory": "Directorio de profilos",
-  "footer.get_app": "Obtene le application",
+  "footer.get_app": "Obtener le application",
+  "footer.invite": "Invitar personas",
   "footer.keyboard_shortcuts": "Accessos directe de claviero",
   "footer.privacy_policy": "Politica de confidentialitate",
   "footer.source_code": "Vider le codice fonte",
@@ -156,155 +334,479 @@
   "getting_started.heading": "Prime passos",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
   "hashtag.column_settings.select.placeholder": "Insere hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Tote istes",
+  "hashtag.column_settings.tag_mode.any": "Un o plus de istes",
+  "hashtag.column_settings.tag_mode.none": "Necun de istes",
+  "hashtag.column_settings.tag_toggle": "Includer etiquettas additional pro iste columna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} message} other {{counter} messages}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} message} other {{counter} messages}} hodie",
   "hashtag.follow": "Sequer hashtag",
-  "home.column_settings.show_reblogs": "Monstrar boosts",
+  "hashtag.unfollow": "Non sequer plus le hashtag",
+  "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
+  "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
   "home.hide_announcements": "Celar annuncios",
   "home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
   "home.pending_critical_update.link": "Vider actualisationes",
+  "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
+  "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e salveguarda pro plus tarde.",
+  "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
+  "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
+  "interaction_modal.description.reply": "Con un conto sur Mastodon, tu pote responder a iste message.",
+  "interaction_modal.login.action": "Porta me a casa",
+  "interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
   "interaction_modal.no_account_yet": "Non sur Mstodon?",
-  "interaction_modal.on_another_server": "In un servitor differente",
-  "interaction_modal.on_this_server": "In iste servitor",
+  "interaction_modal.on_another_server": "Sur un altere servitor",
+  "interaction_modal.on_this_server": "Sur iste servitor",
+  "interaction_modal.sign_in": "Tu non es in session sur iste servitor. Sur qual servitor se trova tu conto?",
+  "interaction_modal.sign_in_hint": "Consilio: Se tracta del sito web ubi tu te ha inscribite. Si tu non te lo rememora, cerca le e-mail de benvenita in tu cassa de entrata. Tu pote etiam inserer tu pseudonymo complete! (p.ex. @Mastodon@mastodon.social)",
+  "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
   "interaction_modal.title.follow": "Sequer {name}",
-  "interaction_modal.title.reblog": "Facer boost al message de {name}",
+  "interaction_modal.title.reblog": "Impulsar le message de {name}",
   "interaction_modal.title.reply": "Responder al message de {name}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+  "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
+  "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
+  "keyboard_shortcuts.back": "Navigar retro",
   "keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
-  "keyboard_shortcuts.boost": "Facer boost al message",
+  "keyboard_shortcuts.boost": "Impulsar le message",
+  "keyboard_shortcuts.column": "Focalisar al columna",
+  "keyboard_shortcuts.compose": "Focalisar al area de composition de texto",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "aperir le columna de mentiones private",
+  "keyboard_shortcuts.down": "Displaciar a basso in le lista",
   "keyboard_shortcuts.enter": "Aperir message",
+  "keyboard_shortcuts.favourite": "Message favorite",
   "keyboard_shortcuts.favourites": "Aperir lista de favoritos",
   "keyboard_shortcuts.federated": "Aperir le chronologia federate",
   "keyboard_shortcuts.heading": "Accessos directe de claviero",
   "keyboard_shortcuts.home": "Aperir le chronologia de initio",
+  "keyboard_shortcuts.hotkey": "Clave accelerator",
+  "keyboard_shortcuts.legend": "Monstrar iste legenda",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
+  "keyboard_shortcuts.mention": "Mentionar le author",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
+  "keyboard_shortcuts.open_media": "Aperir multimedia",
+  "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
+  "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
+  "keyboard_shortcuts.requests": "Aperir le lista de requestas de sequimento",
+  "keyboard_shortcuts.search": "Focalisar barra de recerca",
   "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
+  "keyboard_shortcuts.start": "Aperir columna “comenciar”",
+  "keyboard_shortcuts.toggle_hidden": "Monstrar/celar texto detra advertimento de contento",
+  "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar multimedia",
   "keyboard_shortcuts.toot": "Initiar un nove message",
+  "keyboard_shortcuts.unfocus": "Disfocalisar le area de composition de texto/de recerca",
+  "keyboard_shortcuts.up": "Displaciar in alto in le lista",
   "lightbox.close": "Clauder",
+  "lightbox.compress": "Comprimer le quadro de visualisation de imagine",
+  "lightbox.expand": "Expander le quadro de visualisation de imagine",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
+  "limited_account_hint.action": "Monstrar profilo in omne caso",
+  "limited_account_hint.title": "Iste profilo esseva celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
-  "lists.account.remove": "Remover ab le lista",
+  "lists.account.remove": "Remover del lista",
   "lists.delete": "Deler lista",
   "lists.edit": "Modificar lista",
   "lists.edit.submit": "Cambiar titulo",
-  "lists.exclusive": "Celar iste messages ab le initio",
+  "lists.exclusive": "Celar iste messages sur le pagina de initio",
   "lists.new.create": "Adder lista",
   "lists.new.title_placeholder": "Nove titulo del lista",
+  "lists.replies_policy.followed": "Qualcunque usator sequite",
+  "lists.replies_policy.list": "Membros del lista",
+  "lists.replies_policy.none": "Nemo",
   "lists.replies_policy.title": "Monstrar responsas a:",
+  "lists.search": "Cercar inter le gente que tu seque",
   "lists.subheading": "Tu listas",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
-  "navigation_bar.about": "A proposito de",
-  "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
+  "load_pending": "{count, plural, one {# nove entrata} other {# nove entratas}}",
+  "loading_indicator.label": "Cargante…",
+  "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
+  "moved_to_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate perque tu ha cambiate de conto a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Celar ab notificationes",
+  "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.indefinite": "Usque io dissilentia iste persona",
+  "mute_modal.show_options": "Monstrar optiones",
+  "mute_modal.they_can_mention_and_follow": "Illes pote mentionar te e sequer te, ma tu non potera vider los.",
+  "mute_modal.they_wont_know": "Illes non sapera que illes ha essite silentiate.",
+  "mute_modal.title": "Silentiar le usator?",
+  "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
+  "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
+  "navigation_bar.about": "A proposito",
+  "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
   "navigation_bar.community_timeline": "Chronologia local",
+  "navigation_bar.compose": "Componer un nove message",
   "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
-  "navigation_bar.edit_profile": "Modificar profilo",
+  "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
+  "navigation_bar.follow_requests": "Requestas de sequimento",
+  "navigation_bar.followed_tags": "Hashtags sequite",
+  "navigation_bar.follows_and_followers": "Sequites e sequitores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder le session",
   "navigation_bar.mutes": "Usatores silentiate",
+  "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Messages fixate",
   "navigation_bar.preferences": "Preferentias",
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
-  "notification.update": "{name} modificava un message",
+  "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
+  "notification.admin.report": "{name} ha signalate {target}",
+  "notification.admin.sign_up": "{name} se ha inscribite",
+  "notification.favourite": "{name} ha marcate tu message como favorite",
+  "notification.follow": "{name} te ha sequite",
+  "notification.follow_request": "{name} ha requestate de sequer te",
+  "notification.mention": "{name} te ha mentionate",
+  "notification.moderation-warning.learn_more": "Apprender plus",
+  "notification.moderation_warning": "Tu ha recepite un aviso de moderation",
+  "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
+  "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
+  "notification.moderation_warning.action_none": "Tu conto ha recipite un advertimento de moderation.",
+  "notification.moderation_warning.action_sensitive": "Tu messages essera marcate como sensibile a partir de ora.",
+  "notification.moderation_warning.action_silence": "Tu conto ha essite limitate.",
+  "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
+  "notification.own_poll": "Tu sondage ha finite",
+  "notification.poll": "Un sondage in le qual tu ha votate ha finite",
+  "notification.reblog": "{name} ha impulsate tu message",
+  "notification.relationships_severance_event": "Connexiones perdite con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
+  "notification.relationships_severance_event.domain_block": "Un administrator de {from} ha blocate {target}, includente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
+  "notification.relationships_severance_event.learn_more": "Apprender plus",
+  "notification.relationships_severance_event.user_domain_block": "Tu ha blocate {target}, assi removente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
+  "notification.status": "{name} ha justo ora publicate",
+  "notification.update": "{name} ha modificate un message",
+  "notification_requests.accept": "Acceptar",
+  "notification_requests.dismiss": "Dimitter",
+  "notification_requests.notifications_from": "Notificationes de {name}",
+  "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
+  "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
+  "notifications.column_settings.admin.report": "Nove signalationes:",
+  "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
+  "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
   "notifications.column_settings.follow": "Nove sequitores:",
+  "notifications.column_settings.follow_request": "Nove requestas de sequimento:",
   "notifications.column_settings.mention": "Mentiones:",
+  "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",
+  "notifications.column_settings.reblog": "Impulsos:",
+  "notifications.column_settings.show": "Monstrar in columna",
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.column_settings.status": "Nove messages:",
+  "notifications.column_settings.unread_notifications.category": "Notificationes non legite",
+  "notifications.column_settings.unread_notifications.highlight": "Marcar le notificationes non legite",
+  "notifications.column_settings.update": "Modificationes:",
   "notifications.filter.all": "Toto",
+  "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.follows": "Sequites",
   "notifications.filter.mentions": "Mentiones",
+  "notifications.filter.polls": "Resultatos del sondage",
+  "notifications.filter.statuses": "Actualisationes de personas que tu seque",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
+  "notifications.mark_as_read": "Marcar cata notification como legite",
+  "notifications.permission_denied": "Le notificationes de scriptorio es indisponibile a causa de un requesta anteriormente refusate de permissiones del navigator",
+  "notifications.permission_denied_alert": "Le notificationes de scriptorio non pote esser activate perque le permission del navigator ha essite refusate anteriormente",
+  "notifications.permission_required": "Le notificationes de scriptorio es indisponibile perque le permission necessari non ha essite concedite.",
+  "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
+  "notifications.policy.filter_new_accounts_title": "Nove contos",
+  "notifications.policy.filter_not_followers_hint": "Includente le personas que te ha sequite durante minus de {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_not_followers_title": "Personas qui non te seque",
+  "notifications.policy.filter_not_following_hint": "Usque tu les approba manualmente",
+  "notifications.policy.filter_not_following_title": "Personas que tu non seque",
+  "notifications.policy.filter_private_mentions_hint": "Filtrate, excepte si es in responsa a tu proprie mention o si tu seque le expeditor",
+  "notifications.policy.filter_private_mentions_title": "Mentiones private indesirate",
+  "notifications.policy.title": "Filtrar notificationes de…",
+  "notifications_permission_banner.enable": "Activar notificationes de scriptorio",
+  "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
+  "notifications_permission_banner.title": "Non mancar jammais a un cosa",
+  "onboarding.action.back": "Porta me retro",
+  "onboarding.actions.back": "Porta me retro",
+  "onboarding.actions.go_to_explore": "Porta me al tendentias",
+  "onboarding.actions.go_to_home": "Porta me a mi fluxo de initio",
   "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.follows.empty": "Regrettabilemente, non es possibile monstrar resultatos al momento. Tu pote tentar usar le recerca o percurrer le pagina de exploration pro cercar personas a sequer, o tentar lo de novo plus tarde.",
+  "onboarding.follows.lead": "Le fluxo de initio es le maniera principal de discoperir Mastodon. Quanto plus personas tu seque, tanto plus active e interessante illo essera. Pro comenciar, ecce alcun suggestiones:",
+  "onboarding.follows.title": "Personalisar tu fluxo de initio",
+  "onboarding.profile.discoverable": "Render mi profilo discoperibile",
+  "onboarding.profile.discoverable_hint": "Quando tu opta pro devenir discoperibile sur Mastodon, tu messages pote apparer in resultatos de recerca e in tendentias, e tu profilo pote esser suggerite al personas con interesses simile al tues.",
+  "onboarding.profile.display_name": "Nomine a monstrar",
+  "onboarding.profile.display_name_hint": "Tu nomine complete o tu supernomine…",
+  "onboarding.profile.lead": "Tu pote sempre completar isto plus tarde in le parametros, ubi se trova mesmo plus optiones de personalisation.",
+  "onboarding.profile.note": "Bio",
+  "onboarding.profile.note_hint": "Tu pote @mentionar altere personas o #hashtags…",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
+  "onboarding.profile.title": "Configuration del profilo",
+  "onboarding.profile.upload_avatar": "Incargar imagine de profilo",
+  "onboarding.profile.upload_header": "Actualisar capite de profilo",
+  "onboarding.share.lead": "Face saper al gente como illes pote trovar te sur Mastodon!",
+  "onboarding.share.message": "Io es {username} sur Mastodon! Veni sequer me a {url}",
   "onboarding.share.next_steps": "Sequente passos possibile:",
   "onboarding.share.title": "Compartir tu profilo",
-  "onboarding.steps.follow_people.title": "Personalisa tu fluxo de initio",
+  "onboarding.start.lead": "Tu face ora parte de Mastodon, un platteforma de medios social unic e decentralisate ubi es tu, e non un algorithmo, qui crea tu proprie experientia. Nos va adjutar te a lancear te in iste nove frontiera social:",
+  "onboarding.start.skip": "Non require adjuta a comenciar?",
+  "onboarding.start.title": "Tu ha arrivate!",
+  "onboarding.steps.follow_people.body": "Sequer personas interessante es le ration de esser de Mastodon.",
+  "onboarding.steps.follow_people.title": "Personalisar tu fluxo de initio",
+  "onboarding.steps.publish_status.body": "Saluta le mundo con texto, photos, videos o sondages {emoji}",
   "onboarding.steps.publish_status.title": "Face tu prime message",
+  "onboarding.steps.setup_profile.body": "Impulsa tu interactiones con un profilo comprehensive.",
   "onboarding.steps.setup_profile.title": "Personalisa tu profilo",
+  "onboarding.steps.share_profile.body": "Face saper a tu amicos como trovar te sur Mastodon",
   "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
+  "onboarding.tips.2fa": "<strong>Lo sapeva tu?</strong> Tu pote securisar tu conto configurante le authentication bifactorial in le parametros de tu conto. Isto functiona con le application TOTP de tu preferentia, sin necessitate de un numero de telephono!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Lo sapeva tu?</strong> Perque Mastodon es decentralisate, le profilos que tu incontra pote esser hospitate sur servitores altere que le tue. Nonobstante, tu pote interager con illos sin problema! Lor servitor se trova in le secunde medietate de lor nomine de usator!",
+  "onboarding.tips.migration": "<strong>Lo sapeva tu?</strong> Si tu pensa que {domain} non es un bon servitor pro te in le futuro, tu pote cambiar a un altere servitor Mastodon sin perder tu sequitores. Tu pote mesmo hospitar tu proprie servitor!",
+  "onboarding.tips.verification": "<strong>Lo sapeva tu?</strong> Pro verificar tu conto, insere un ligamine a tu profilo Mastodon sur tu proprie sito web e adde le sito web a tu profilo. Nulle moneta o documentos necessari!",
+  "password_confirmation.exceeds_maxlength": "Le confirmation del contrasigno excede le longitude maxime del contrasigno",
+  "password_confirmation.mismatching": "Le confirmation del contrasigno non corresponde",
+  "picture_in_picture.restore": "Restaurar",
   "poll.closed": "Claudite",
+  "poll.refresh": "Refrescar",
   "poll.reveal": "Vider le resultatos",
-  "privacy.change": "Cambiar privacitate del message",
-  "privacy.private.long": "Visibile solmente pro sequitores",
-  "privacy.public.long": "Visibile pro totos",
+  "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
+  "poll.vote": "Votar",
+  "poll.voted": "Tu ha votate pro iste responsa",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+  "poll_button.add_poll": "Adder un inquesta",
+  "poll_button.remove_poll": "Remover un inquesta",
+  "privacy.change": "Cambiar le confidentialitate del message",
+  "privacy.direct.long": "Tote le personas mentionate in le message",
+  "privacy.direct.short": "Personas specific",
+  "privacy.private.long": "Solmente tu sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunque, sur Mastodon o non",
   "privacy.public.short": "Public",
+  "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
+  "privacy.unlisted.long": "Minus fanfares algorithmic",
+  "privacy.unlisted.short": "Public, non listate",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "recommended": "Recommendate",
+  "refresh": "Refrescar",
+  "regeneration_indicator.label": "Cargamento…",
+  "regeneration_indicator.sublabel": "Tu fluxo de initio es in preparation!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "{number, plural, one {# die} other {# dies}} retro",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} retro",
+  "relative_time.full.just_now": "justo ora",
+  "relative_time.full.minutes": "{number, plural, one {# minuta} other {# minutas}} retro",
+  "relative_time.full.seconds": "{number, plural, one {# secunda} other {# secundas}} retro",
+  "relative_time.hours": "{number}h",
   "relative_time.just_now": "ora",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
   "reply_indicator.cancel": "Cancellar",
+  "reply_indicator.poll": "Inquesta",
   "report.block": "Blocar",
+  "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
+  "report.categories.legal": "Juridic",
   "report.categories.other": "Alteres",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Le contento viola un o plus regulas del servitor",
+  "report.category.subtitle": "Elige le option plus adequate",
+  "report.category.title": "Describe le problema con iste {type}",
   "report.category.title_account": "profilo",
   "report.category.title_status": "message",
-  "report.close": "Preste",
+  "report.close": "Facite",
+  "report.comment.title": "Ha il altere cosas que nos deberea saper?",
+  "report.forward": "Reinviar a {target}",
+  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del signalation a illo tamben?",
   "report.mute": "Silentiar",
+  "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
   "report.next": "Sequente",
   "report.placeholder": "Commentos additional",
   "report.reasons.dislike": "Non me place",
+  "report.reasons.dislike_description": "Non es qualcosa que tu vole vider",
+  "report.reasons.legal": "Es illegal",
+  "report.reasons.legal_description": "Tu crede que viola le lege de tu pais o del pais del servitor",
+  "report.reasons.other": "Es altere cosa",
+  "report.reasons.other_description": "Le problema non entra in altere categorias",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Ligamines malevolente, interaction false, o responsas repetitive",
+  "report.reasons.violation": "Viola le regulas del servitor",
+  "report.reasons.violation_description": "Tu sape que viola regulas specific",
+  "report.rules.subtitle": "Selige tote le responsas appropriate",
+  "report.rules.title": "Qual regulas es violate?",
+  "report.statuses.subtitle": "Selige tote le responsas appropriate",
+  "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
+  "report.submit": "Submitter",
+  "report.target": "Signalamento de {target}",
+  "report.thanks.take_action": "Ecce tu optiones pro controlar lo que tu vide sur Mastodon:",
+  "report.thanks.take_action_actionable": "Durante que nos revide isto, tu pote prender mesuras contra @{name}:",
+  "report.thanks.title": "Non vole vider isto?",
+  "report.thanks.title_actionable": "Gratias pro signalar, nos investigara isto.",
+  "report.unfollow": "Cessar de sequer @{name}",
+  "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
+  "report_notification.categories.legal": "Juridic",
   "report_notification.categories.other": "Alteres",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violation del regulas",
+  "report_notification.open": "Aperir reporto",
+  "search.no_recent_searches": "Nulle recercas recente",
+  "search.placeholder": "Cercar",
+  "search.quick_action.account_search": "Profilos correspondente a {x}",
   "search.quick_action.go_to_account": "Vader al profilo {x}",
   "search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
   "search.quick_action.open_url": "Aperir URL in Mastodon",
+  "search.quick_action.status_search": "Messages correspondente a {x}",
+  "search.search_or_paste": "Cerca o colla un URL",
   "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solmente disponibile al initiar le session.",
   "search_popout.language_code": "Codice de lingua ISO",
   "search_popout.options": "Optiones de recerca",
   "search_popout.quick_actions": "Actiones rapide",
   "search_popout.recent": "Recercas recente",
+  "search_popout.specific_date": "data specific",
   "search_popout.user": "usator",
   "search_results.accounts": "Profilos",
+  "search_results.all": "Toto",
   "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Nihil trovate pro iste terminos de recerca",
   "search_results.see_all": "Vider toto",
   "search_results.statuses": "Messages",
+  "search_results.title": "Cercar {q}",
+  "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
+  "server_banner.active_users": "usatores active",
+  "server_banner.administered_by": "Administrate per:",
+  "server_banner.introduction": "{domain} face parte del rete social decentralisate actionate per {mastodon}.",
   "server_banner.learn_more": "Apprender plus",
+  "server_banner.server_stats": "Statos del servitor:",
   "sign_in_banner.create_account": "Crear un conto",
-  "sign_in_banner.sign_in": "Initiar le session",
+  "sign_in_banner.sign_in": "Aperir session",
+  "sign_in_banner.sso_redirect": "Aperir session o crear conto",
+  "sign_in_banner.text": "Aperi session pro sequer profilos o hashtags, marcar messages como favorite, e condivider e responder a messages. Tu pote etiam interager desde tu conto sur un altere servitor.",
+  "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
+  "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
+  "status.admin_status": "Aperir iste message in le interfacie de moderation",
   "status.block": "Blocar @{name}",
+  "status.bookmark": "Adder al marcapaginas",
+  "status.cancel_reblog_private": "Disfacer impulso",
+  "status.cannot_reblog": "Iste message non pote esser impulsate",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
+  "status.detailed_status": "Vista detaliate del conversation",
+  "status.direct": "Mentionar privatemente @{name}",
   "status.direct_indicator": "Mention private",
   "status.edit": "Modificar",
+  "status.edited": "Ultime modification le {date}",
+  "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
+  "status.embed": "Incastrar",
+  "status.favourite": "Adder al favoritos",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
+  "status.filtered": "Filtrate",
   "status.hide": "Celar le message",
   "status.history.created": "create per {name} le {date}",
   "status.history.edited": "modificate per {name} le {date}",
+  "status.load_more": "Cargar plus",
   "status.media.open": "Clicca pro aperir",
   "status.media.show": "Clicca pro monstrar",
+  "status.media_hidden": "Medios celate",
+  "status.mention": "Mentionar @{name}",
   "status.more": "Plus",
+  "status.mute": "Silentiar @{name}",
   "status.mute_conversation": "Silentiar conversation",
+  "status.open": "Expander iste message",
+  "status.pin": "Fixar sur profilo",
+  "status.pinned": "Message fixate",
   "status.read_more": "Leger plus",
+  "status.reblog": "Impulsar",
+  "status.reblog_private": "Impulsar con visibilitate original",
+  "status.reblogged_by": "Impulsate per {name}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
+  "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
+  "status.redraft": "Deler e reconciper",
+  "status.remove_bookmark": "Remover marcapagina",
+  "status.replied_to": "Respondite a {name}",
+  "status.reply": "Responder",
+  "status.replyAll": "Responder al discussion",
+  "status.report": "Signalar @{name}",
+  "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
+  "status.show_filter_reason": "Monstrar in omne caso",
+  "status.show_less": "Monstrar minus",
+  "status.show_less_all": "Monstrar minus pro totes",
+  "status.show_more": "Monstrar plus",
+  "status.show_more_all": "Monstrar plus pro totes",
+  "status.show_original": "Monstrar original",
+  "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
   "status.translate": "Traducer",
   "status.translated_from_with": "Traducite ab {lang} usante {provider}",
+  "status.uncached_media_warning": "Previsualisation non disponibile",
+  "status.unmute_conversation": "Non plus silentiar conversation",
+  "status.unpin": "Disfixar del profilo",
+  "subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
+  "subscribed_languages.save": "Salveguardar le cambiamentos",
+  "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
   "tabs_bar.home": "Initio",
   "tabs_bar.notifications": "Notificationes",
+  "time_remaining.days": "{number, plural, one {# die} other {# dies}} restante",
+  "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restante",
+  "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
+  "time_remaining.moments": "Qualque momentos restante",
+  "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
+  "timeline_hint.remote_resource_not_displayed": "Le {resource} de altere servitores non appare hic.",
+  "timeline_hint.resources.followers": "Sequitores",
+  "timeline_hint.resources.follows": "Sequites",
   "timeline_hint.resources.statuses": "Messages ancian",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Ora in tendentias",
-  "upload_form.undo": "Deler",
+  "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Traher e deponer pro incargar",
+  "upload_button.label": "Adde imagines, un video o un file de audio",
+  "upload_error.limit": "Limite de incargamento de files excedite.",
+  "upload_error.poll": "Incargamento de files non permittite con sondages.",
+  "upload_form.audio_description": "Describe lo pro le gente con difficultates auditive",
+  "upload_form.description": "Describe lo pro le gente con difficultates visual",
+  "upload_form.edit": "Modificar",
+  "upload_form.thumbnail": "Cambiar le miniatura",
+  "upload_form.video_description": "Describe lo pro le gente con difficultates auditive o visual",
+  "upload_modal.analyzing_picture": "Analysa imagine…",
+  "upload_modal.apply": "Applicar",
+  "upload_modal.applying": "Applicante…",
   "upload_modal.choose_image": "Seliger un imagine",
-  "upload_modal.detect_text": "Deteger texto ab un pictura",
+  "upload_modal.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
+  "upload_modal.detect_text": "Deteger texto de un imagine",
+  "upload_modal.edit_media": "Modificar le medio",
+  "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
+  "upload_modal.preparing_ocr": "Preparation del OCR…",
+  "upload_modal.preview_label": "Previsualisation ({ratio})",
+  "upload_progress.label": "Incargante...",
+  "upload_progress.processing": "Processante…",
+  "username.taken": "Iste nomine de usator es ja in uso. Proba con un altere",
   "video.close": "Clauder le video",
   "video.download": "Discargar le file",
+  "video.exit_fullscreen": "Sortir del schermo plen",
+  "video.expand": "Expander video",
   "video.fullscreen": "Schermo plen",
   "video.hide": "Celar video",
   "video.mute": "Silentiar le sono",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5af20a97f7..33161f8882 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -21,6 +21,7 @@
   "account.blocked": "Terblokir",
   "account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
   "account.cancel_follow_request": "Batalkan permintaan ikut",
+  "account.copy": "Salin tautan ke profil",
   "account.direct": "Sebut secara pribadi @{name}",
   "account.disable_notifications": "Berhenti memberitahu saya ketika @{name} memposting",
   "account.domain_blocked": "Domain diblokir",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Tidak ada kiriman",
   "account.featured_tags.title": "Tagar {name} yang difiturkan",
   "account.follow": "Ikuti",
+  "account.follow_back": "Ikuti balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Pengguna ini belum ada pengikut.",
   "account.followers_counter": "{count, plural, other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Senyapkan Notifikasi",
   "account.mute_short": "Senyapkan",
   "account.muted": "Dibisukan",
+  "account.mutual": "Saling ikuti",
   "account.no_bio": "Tidak ada deskripsi yang diberikan.",
   "account.open_original_page": "Buka halaman asli",
   "account.posts": "Kiriman",
@@ -75,6 +78,10 @@
   "admin.dashboard.retention.average": "Rata-rata",
   "admin.dashboard.retention.cohort": "Bulan pendaftaran",
   "admin.dashboard.retention.cohort_size": "Pengguna baru",
+  "admin.impact_report.instance_accounts": "Akun profil yang akan terhapus",
+  "admin.impact_report.instance_followers": "Pengikut yang akan kehilangan oleh pengguna kita",
+  "admin.impact_report.instance_follows": "Pengikut yang akan kehilangan oleh pengguna lain",
+  "admin.impact_report.title": "Ringkasan dampak",
   "alert.rate_limited.message": "Mohon ulangi setelah {retry_time, time, medium}.",
   "alert.rate_limited.title": "Jumlah akses dibatasi",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
@@ -82,7 +89,14 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} per minggu",
+  "block_modal.remote_users_caveat": "Kami akan meminta {domain} server untuk menghargai keputusan Anda. Namun, kepatuhan tak dapat dipastikan karena beberapa server dapat menangani blokir secara beragam. Postingan publik masih dapat terlihat oleh pengguna tanpa masuk.",
+  "block_modal.show_less": "Tampilkan lebih sedikit",
+  "block_modal.show_more": "Tampilkan lebih banyak",
+  "block_modal.they_cant_mention": "Mereka tidak dapat menyebut atau mengikuti Anda.",
+  "block_modal.they_cant_see_posts": "Mereka tidak dapat melihat postingan Anda dan Anda tidak dapat melihat postingan mereka.",
+  "block_modal.they_will_know": "Mereka dapat melihat bahwa mereka diblokir.",
+  "block_modal.title": "Blokir pengguna?",
+  "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -105,8 +119,11 @@
   "column.blocks": "Pengguna yang diblokir",
   "column.bookmarks": "Markah",
   "column.community": "Linimasa Lokal",
+  "column.direct": "Sebut secara pribadi",
   "column.directory": "Jelajahi profil",
   "column.domain_blocks": "Domain tersembunyi",
+  "column.favourites": "Favorit",
+  "column.firehose": "Feed yang sedang berlangsung",
   "column.follow_requests": "Permintaan mengikuti",
   "column.home": "Beranda",
   "column.lists": "List",
@@ -127,33 +144,31 @@
   "community.column_settings.remote_only": "Hanya jarak jauh",
   "compose.language.change": "Ganti bahasa",
   "compose.language.search": "Telusuri bahasa...",
+  "compose.published.body": "Postingan diterbitkan.",
   "compose.published.open": "Buka",
+  "compose.saved.body": "Postingan tersimpan.",
   "compose_form.direct_message_warning_learn_more": "Pelajari lebih lanjut",
   "compose_form.encryption_warning": "Kiriman di Mastodon tidak dienkripsi secara end-to-end. Jangan bagikan informasi sensitif melalui Mastodon.",
   "compose_form.hashtag_warning": "Kiriman ini tidak akan didaftarkan di bawah tagar apapun selama tidak diatur ke publik. Hanya kiriman publik yang dapat dicari dengan tagar.",
   "compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
   "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
-  "compose_form.poll.add_option": "Tambahkan pilihan",
   "compose_form.poll.duration": "Durasi japat",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Hapus opsi ini",
+  "compose_form.poll.multiple": "Pilihan ganda",
+  "compose_form.poll.option_placeholder": "Opsi {number}",
+  "compose_form.poll.single": "Pilih Satu",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
-  "compose_form.publish": "Terbitkan",
+  "compose_form.poll.type": "Gaya",
+  "compose_form.publish": "Postingan",
   "compose_form.publish_form": "Terbitkan",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
+  "compose_form.reply": "Balas",
+  "compose_form.save_changes": "Perbarui",
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
-  "compose_form.spoiler_placeholder": "Peringatan konten",
+  "compose_form.spoiler_placeholder": "Peringatan konten (opsional)",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
-  "confirmations.block.message": "Apa Anda yakin ingin memblokir {name}?",
   "confirmations.cancel_follow_request.confirm": "Batalkan permintaan",
   "confirmations.cancel_follow_request.message": "Apakah Anda yakin ingin membatalkan permintaan Anda untuk mengikuti {name}?",
   "confirmations.delete.confirm": "Hapus",
@@ -162,15 +177,15 @@
   "confirmations.delete_list.message": "Apakah Anda yakin untuk menghapus daftar ini secara permanen?",
   "confirmations.discard_edit_media.confirm": "Buang",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan deskripsi atau pratinjau media, buang saja?",
-  "confirmations.domain_block.confirm": "Sembunyikan keseluruhan domain",
+  "confirmations.domain_block.confirm": "Blokir server",
   "confirmations.domain_block.message": "Apakah Anda benar-benar yakin untuk memblokir keseluruhan {domain}? Dalam kasus tertentu beberapa pemblokiran atau penyembunyian lebih baik.",
   "confirmations.edit.confirm": "Ubah",
+  "confirmations.edit.message": "Mengubah akan menimpa pesan yang sedang anda tulis. Apakah anda yakin ingin melanjutkan?",
   "confirmations.logout.confirm": "Keluar",
   "confirmations.logout.message": "Apakah Anda yakin ingin keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan pos dari mereka dan pos yang menyebut mereka, tapi ini tetap mengizinkan mereka melihat posmu dan mengikutimu.",
-  "confirmations.mute.message": "Apa Anda yakin ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Hapus dan susun ulang",
+  "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
   "confirmations.reply.confirm": "Balas",
   "confirmations.reply.message": "Membalas sekarang akan menimpa pesan yang sedang Anda buat. Anda yakin ingin melanjutkan?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
@@ -179,6 +194,7 @@
   "conversation.mark_as_read": "Tandai sudah dibaca",
   "conversation.open": "Lihat percakapan",
   "conversation.with": "Dengan {names}",
+  "copy_icon_button.copied": "Disalin ke clipboard",
   "copypaste.copied": "Disalin",
   "copypaste.copy_to_clipboard": "Salin ke clipboard",
   "directory.federated": "Dari fediverse yang dikenal",
@@ -190,7 +206,27 @@
   "dismissable_banner.community_timeline": "Ini adalah kiriman publik terkini dari orang yang akunnya berada di {domain}.",
   "dismissable_banner.dismiss": "Abaikan",
   "dismissable_banner.explore_links": "Cerita berita ini sekarang sedang dibicarakan oleh orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.explore_statuses": "Ini adalah postingan dari seluruh web sosial yang mendapatkan daya tarik saat ini. Postingan baru dengan lebih banyak peningkatan dan favorit memiliki peringkat lebih tinggi.",
   "dismissable_banner.explore_tags": "Tagar ini sekarang sedang tren di antara orang di server ini dan lainnya dalam jaringan terdesentralisasi.",
+  "dismissable_banner.public_timeline": "Ini adalah postingan publik dari orang-orang di web sosial yang diikuti oleh {domain}.",
+  "domain_block_modal.block": "Blokir server",
+  "domain_block_modal.block_account_instead": "Blokir @{name} saja",
+  "domain_block_modal.they_can_interact_with_old_posts": "Orang-orang dari server ini dapat berinteraksi dengan kiriman lama anda.",
+  "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
+  "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
+  "domain_block_modal.title": "Blokir domain?",
+  "domain_block_modal.you_will_lose_followers": "Semua pengikut anda dari server ini akan dihapus.",
+  "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
+  "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
+  "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Nama penggunanya:",
+  "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
+  "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
+  "domain_pill.username": "Nama pengguna",
+  "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
+  "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial  <button>ActivityPub-powered platforms</button>.",
+  "domain_pill.your_handle": "Nama pengguna anda:",
   "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
   "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
@@ -259,6 +295,10 @@
   "follow_request.authorize": "Izinkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "Pilihan staf",
+  "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+  "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
   "followed_tags": "Tagar yang diikuti",
   "footer.about": "Tentang",
   "footer.directory": "Direktori profil",
@@ -281,9 +321,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Ikuti tagar",
   "hashtag.unfollow": "Batalkan pengikutan tagar",
-  "home.actions.go_to_explore": "Lihat apa yang lagi tranding",
-  "home.actions.go_to_suggestions": "Temukan Orang untuk Diikuti",
-  "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
@@ -354,9 +391,6 @@
   "load_pending": "{count, plural, other {# item baru}}",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
-  "mute_modal.duration": "Durasi",
-  "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
-  "mute_modal.indefinite": "Tak terbatas",
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",
@@ -364,7 +398,6 @@
   "navigation_bar.compose": "Tulis toot baru",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.edit_profile": "Ubah profil",
   "navigation_bar.explore": "Jelajahi",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
@@ -395,9 +428,6 @@
   "notifications.column_settings.admin.report": "Laporan baru:",
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Notifikasi desktop",
-  "notifications.column_settings.filter_bar.advanced": "Tampilkan semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bilah penyaring cepat",
-  "notifications.column_settings.filter_bar.show_bar": "Tampilkan bilah filter",
   "notifications.column_settings.follow": "Pengikut baru:",
   "notifications.column_settings.follow_request": "Permintaan mengikuti baru:",
   "notifications.column_settings.mention": "Balasan:",
@@ -454,14 +484,7 @@
   "poll_button.add_poll": "Tambah japat",
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Ubah privasi kiriman",
-  "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Orang yang disebutkan saja",
-  "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
-  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
-  "privacy.unlisted.short": "Tak Terdaftar",
   "privacy_policy.last_updated": "Terakhir diperbarui {date}",
   "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
@@ -548,7 +571,6 @@
   "status.delete": "Hapus",
   "status.detailed_status": "Tampilan detail percakapan",
   "status.edit": "Edit",
-  "status.edited": "Diedit {date}",
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
@@ -615,10 +637,8 @@
   "upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
   "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
   "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
-  "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambar…",
   "upload_modal.apply": "Terapkan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8579fc89c6..1921509478 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per semane",
+  "block_modal.remote_users_caveat": "Noi va petir que li servitor {domain} mey respecter tui decision. Támen, obedientie ne es garantit pro que chascun servitor gere bloccas diferentmen. Possibilmen public postas va restar visibil a usatores de inloggat.",
+  "block_modal.show_less": "Monstrar minu",
+  "block_modal.show_more": "Monstrar plu",
+  "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
+  "block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.",
+  "block_modal.they_will_know": "Va esser conscient que tu ha bloccat.",
+  "block_modal.title": "Bloccar usator?",
+  "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
   "compose_form.placeholder": "Quo es in tui spiritu?",
-  "compose_form.poll.add_option": "Adjunter un option",
   "compose_form.poll.duration": "Duration del balotation",
+  "compose_form.poll.multiple": "Selection multiplic",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.remove_option": "Remover ti-ci option",
+  "compose_form.poll.single": "Selecter un",
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postar",
   "compose_form.publish_form": "Nov posta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Conservar changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
-  "compose_form.spoiler_placeholder": "Scri tui avise ci",
+  "compose_form.spoiler_placeholder": "Advertiment de contenete (optional)",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
-  "confirmations.block.message": "Esque tu vermen vole bloccar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retraer petition",
   "confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
   "confirmations.delete.confirm": "Deleter",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
   "confirmations.discard_edit_media.confirm": "Forjettar",
   "confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
-  "confirmations.domain_block.confirm": "Bloccar li tot dominia",
+  "confirmations.domain_block.confirm": "Bloccar servitor",
   "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
   "confirmations.edit.confirm": "Redacter",
   "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.logout.confirm": "Exear",
   "confirmations.logout.message": "Esque tu vermen vole exear?",
   "confirmations.mute.confirm": "Silentiar",
-  "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
-  "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
   "confirmations.redraft.confirm": "Deleter & redacter",
   "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
   "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
   "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
+  "domain_block_modal.block": "Bloccar servitor",
+  "domain_block_modal.block_account_instead": "Altrimen, bloccar @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Persones de ti servitor posse interacter con tui old postas.",
+  "domain_block_modal.they_cant_follow": "Nequi de ti-ci servitor posse sequer te.",
+  "domain_block_modal.they_wont_know": "Ne va esser conscient pri li bloccada.",
+  "domain_block_modal.title": "Bloccar dominia?",
+  "domain_block_modal.you_will_lose_followers": "Omni tui sequitores de ti-ci servitor va esser efaciat.",
+  "domain_block_modal.you_wont_see_posts": "Tu ne va vider postas ni notificationes de usatores sur ti-ci servitor.",
+  "domain_pill.activitypub_lets_connect": "It possibilisa tui conexiones e interactiones con persones ne solmen sur Mastodon, ma anc tra diferent social aplis.",
+  "domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
+  "domain_pill.server": "Servitor",
+  "domain_pill.their_handle": "Identificator:",
+  "domain_pill.their_server": "Su digital hem e omni su postas.",
+  "domain_pill.their_username": "Su unic identificator sur su servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
+  "domain_pill.username": "Usator-nómine",
+  "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
+  "domain_pill.who_they_are": "Pro que identificatores informa qui e u un person is, tu posse interacter con persones tra li rete social de <button>ActivityPub-usant platformes</button>.",
+  "domain_pill.who_you_are": "Pro que tui identificator informa qui e u tu es, persones posse interacter con te tra li rete social de <button>ActivityPub-usant platformes</button>.",
+  "domain_pill.your_handle": "Tui identificator:",
+  "domain_pill.your_server": "Tui digital hem, u trova se omni tui postas. Si it ne plese te, tu posse transferer ad un altri servitor quandecunc e tui sequitores con te.",
+  "domain_pill.your_username": "Tui unic identificator sur ti-ci servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -244,6 +266,7 @@
   "empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
   "empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
   "empty_column.mutes": "Tu ancor ha silentiat null usatores.",
+  "empty_column.notification_requests": "Omnicos clar! Hay necos ci. Nov notificationes va venir ci quande tu recive les secun tui parametres.",
   "empty_column.notifications": "Tu have null notificationes. Quande altri persones interacte con te, tu va vider it ci.",
   "empty_column.public": "Hay nullcos ci! Scri alquo publicmen, o manualmen seque usatores de altri servitores por plenar to-ci",
   "error.unexpected_crash.explanation": "Pro un error in nor code o un problema de compatibilitá in li navigator, ti-ci págine ne posset esser monstrat correctmen.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
   "filter_modal.select_filter.title": "Filtrar ti-ci posta",
   "filter_modal.title.status": "Filtrar un posta",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentiones}}",
+  "filtered_notifications_banner.pending_requests": "Notificationes de {count, plural, =0 {nequi} one {un person} other {# persones}} quel tu possibilmen conosse",
+  "filtered_notifications_banner.title": "Filtrat notificationes",
   "firehose.all": "Omno",
   "firehose.local": "Ti-ci servitor",
   "firehose.remote": "Altri servitores",
   "follow_request.authorize": "Autorisar",
   "follow_request.reject": "Rejecter",
   "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+  "follow_suggestions.curated_suggestion": "Selection del employates",
+  "follow_suggestions.dismiss": "Ne monstrar plu",
+  "follow_suggestions.featured_longer": "Selectet manualmen del equip de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populari ínter li persones queles tu seque",
+  "follow_suggestions.hints.featured": "Ti-ci profil ha esset selectet directmen del equip de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ti-ci profil es populari ínter tis qui tu seque.",
+  "follow_suggestions.hints.most_followed": "Ti-ci profil es un del max sequet sur {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ti-ci profil ha recivet mult atention recentmen sur {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ti-ci profil es simil al profiles queles tu ha recentmen sequet.",
+  "follow_suggestions.personalized_suggestion": "Personalisat suggestion",
+  "follow_suggestions.popular_suggestion": "Populari suggestion",
+  "follow_suggestions.popular_suggestion_longer": "Populari sur {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Simil a profiles queles tu sequet recentmen",
+  "follow_suggestions.view_all": "Vider omnicos",
+  "follow_suggestions.who_to_follow": "Persones a sequer",
   "followed_tags": "Sequet hashtags",
   "footer.about": "Information",
   "footer.directory": "Profilarium",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Dessequer hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in plu}}",
-  "home.actions.go_to_explore": "Vider lu populari",
-  "home.actions.go_to_suggestions": "Trovar gente por sequer",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Monstrar boosts",
   "home.column_settings.show_replies": "Monstrar responses",
-  "home.explore_prompt.body": "Tui hemal témpor-linea have un mixtura del hashtags queles tu selectet sequer, li gente quem tu selectet sequer, e li postas queles ili boosta. Si to sembla tro quiet, tu fórsan vole:",
-  "home.explore_prompt.title": "To-ci es tui hemal págine in Mastodon.",
   "home.hide_announcements": "Celar proclamationes",
   "home.pending_critical_update.body": "Ples actualisar tui Mastodon-servitor tam rapid quam es possibil!",
   "home.pending_critical_update.link": "Vider actualisationes",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Cargant…",
   "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
   "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
-  "mute_modal.duration": "Duration",
-  "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
-  "mute_modal.indefinite": "Índefinit",
+  "mute_modal.hide_from_notifications": "Celar de notificationes",
+  "mute_modal.hide_options": "Celar optiones",
+  "mute_modal.indefinite": "Til quande yo dessilentia li usator",
+  "mute_modal.show_options": "Monstrar optiones",
+  "mute_modal.they_can_mention_and_follow": "Posse mentionar e sequer te, ma va esser ínvisibil a te.",
+  "mute_modal.they_wont_know": "Ne va esser conscient pri li silentation.",
+  "mute_modal.title": "Silentiar usator?",
+  "mute_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
+  "mute_modal.you_wont_see_posts": "Ne posse vider tui postas e inversi.",
   "navigation_bar.about": "Information",
   "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Privat mentiones",
   "navigation_bar.discover": "Decovrir",
   "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.edit_profile": "Redacter profil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} sequet te",
   "notification.follow_request": "{name} ha petit sequer te",
   "notification.mention": "{name} mentionat te",
+  "notification.moderation-warning.learn_more": "Aprender plu",
+  "notification.moderation_warning": "Tu ha recivet un moderatori advertiment",
+  "notification.moderation_warning.action_delete_statuses": "Alcun de tui postas ha esset efaciat.",
+  "notification.moderation_warning.action_disable": "Tui conto ha esset desactivisat.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcun de tui postas ha esset marcat quam sensitiv.",
+  "notification.moderation_warning.action_none": "Tui conto ha recivet un moderatori advertiment.",
+  "notification.moderation_warning.action_sensitive": "Desde nu tui postas va esser marcat quam sensitiv.",
+  "notification.moderation_warning.action_silence": "Tui conto ha esset limitat.",
+  "notification.moderation_warning.action_suspend": "Tui conto ha esset suspendet.",
   "notification.own_poll": "Tui balotation ha finit",
   "notification.poll": "Un balotation in quel tu votat ha finit",
   "notification.reblog": "{name} boostat tui posta",
+  "notification.relationships_severance_event": "Perdit conexiones con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un admin de {from} ha suspendet {target}, dunc con ti person tu ne plu posse reciver actualisationes ni far interactiones.",
+  "notification.relationships_severance_event.domain_block": "Un admin de {from} ha bloccat {target}, includente {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
+  "notification.relationships_severance_event.learn_more": "Aprender plu",
+  "notification.relationships_severance_event.user_domain_block": "Tu ha bloccat {target}, efaciante {followersCount} de tui sequitores e {followingCount, plural, one {# conto} other {# contos}} sequet de te.",
   "notification.status": "{name} just postat",
   "notification.update": "{name} modificat un posta",
+  "notification_requests.accept": "Acceptar",
+  "notification_requests.dismiss": "Demisser",
+  "notification_requests.notifications_from": "Notificationes de {name}",
+  "notification_requests.title": "Filtrat notificationes",
   "notifications.clear": "Aclarar notificationes",
   "notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
   "notifications.column_settings.admin.report": "Nov raportas:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
   "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
-  "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Notificationes sur li computator es índisponibil pro que on ha previamen rejectet un petition por navigator-permissiones",
   "notifications.permission_denied_alert": "Notificationes sur li computator ne posse esser activisat, pro que navigator-permission ha esset previamen rejectet",
   "notifications.permission_required": "Notificationes sur li computator es índisponibil pro que li besonat permission ne ha esset dat.",
+  "notifications.policy.filter_new_accounts.hint": "Creat durant li passat {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_new_accounts_title": "Nov contos",
+  "notifications.policy.filter_not_followers_hint": "Includente tis qui ha sequet te minu quam {days, plural, one {un die} other {# dies}}",
+  "notifications.policy.filter_not_followers_title": "Persones qui ne seque te",
+  "notifications.policy.filter_not_following_hint": "Til quande tu manualmen aproba",
+  "notifications.policy.filter_not_following_title": "Persones queles tu ne seque",
+  "notifications.policy.filter_private_mentions_hint": "Filtrat except si it es un response a tui propri mention o si tu seque li missor",
+  "notifications.policy.filter_private_mentions_title": "Ínsolicitat privat mentiones",
+  "notifications.policy.title": "Filtrar notificationes de…",
   "notifications_permission_banner.enable": "Activisar notificationes sur li computator",
   "notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
   "notifications_permission_banner.title": "Nequande preterlassa quocunc",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Adjunter un balotation",
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
-  "privacy.direct.long": "Visibil solmen a mentionat usatores",
-  "privacy.direct.short": "Solmen persones mentionat",
-  "privacy.private.long": "Visibil solmen por sequitores",
-  "privacy.private.short": "Solmen sequitores",
-  "privacy.public.long": "Visibil a omnes",
+  "privacy.direct.long": "Omnes mentionat in li posta",
+  "privacy.direct.short": "Specific persones",
+  "privacy.private.long": "Solmen tui sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
-  "privacy.unlisted.short": "Delistat",
+  "privacy.unlisted.additional": "It acte just quam public, except que li posta ne va aparir in tendentie o hashtags, explorar, o sercha de Mastodon, mem si tu ha optet por les sur tui tot conto.",
+  "privacy.unlisted.long": "Minu fanfare algoritmic",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# atachament} other {# atachamentes}}",
   "reply_indicator.cancel": "Anullar",
+  "reply_indicator.poll": "Balotar",
   "report.block": "Bloccar",
   "report.block_explanation": "Tu ne va vider su postas. Li usator ni va posser vider tui postas, ni sequer te, ni va posser saver pri li statu de esser bloccat.",
   "report.categories.legal": "Legal",
@@ -644,10 +714,11 @@
   "status.direct": "Privatmen mentionar @{name}",
   "status.direct_indicator": "Privat mention",
   "status.edit": "Modificar",
-  "status.edited": "Modificat ye {date}",
+  "status.edited": "Ultimmen actualisat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",
+  "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",
   "status.filtered": "Filtrat",
   "status.hide": "Celar posta",
@@ -668,6 +739,7 @@
   "status.reblog": "Boostar",
   "status.reblog_private": "Boostar con li original visibilitá",
   "status.reblogged_by": "{name} boostat",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Ancor nequi ha boostat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
   "status.redraft": "Deleter & redacter",
   "status.remove_bookmark": "Remover marcator",
@@ -715,10 +787,8 @@
   "upload_error.poll": "On ne es permisset cargar medie con balotationes.",
   "upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
   "upload_form.description": "Descrir por persones qui es ciec o have mal vision",
-  "upload_form.description_missing": "Null descrition adjuntet",
   "upload_form.edit": "Redacter",
   "upload_form.thumbnail": "Changear previsual image",
-  "upload_form.undo": "Deleter",
   "upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
   "upload_modal.analyzing_picture": "Analisant image…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index f163567f17..90253743fc 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -20,6 +20,7 @@
   "column.bookmarks": "Ebenrụtụakā",
   "column.home": "Be",
   "column.lists": "Ndepụta",
+  "column.notifications": "Nziọkwà",
   "column.pins": "Pinned post",
   "column_header.pin": "Gbado na profaịlụ gị",
   "column_subheading.settings": "Mwube",
@@ -37,23 +38,33 @@
   "confirmations.delete.confirm": "Hichapụ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Hichapụ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.edit.confirm": "Dezie",
   "confirmations.mute.confirm": "Mee ogbi",
   "confirmations.reply.confirm": "Zaa",
   "confirmations.unfollow.confirm": "Kwụsị iso",
   "conversation.delete": "Hichapụ nkata",
+  "disabled_account_banner.account_settings": "Mwube akaụntụ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_pill.username": "Ahaojiaru",
   "embed.instructions": "Embed this status on your website by copying the code below.",
+  "emoji_button.activity": "Mmemme",
+  "emoji_button.label": "Tibanye emoji",
   "emoji_button.search": "Chọọ...",
+  "emoji_button.symbols": "Ọdịmara",
   "empty_column.account_timeline": "No posts found",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "errors.unexpected_crash.report_issue": "Kpesa nsogbu",
+  "explore.trending_links": "Akụkọ",
+  "firehose.all": "Ha niine",
+  "follow_request.authorize": "Nye ikike",
   "footer.privacy_policy": "Iwu nzuzu",
   "getting_started.heading": "Mbido",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "home.column_settings.show_replies": "Gosi nzaghachị",
+  "home.hide_announcements": "Zoo ọkwa",
+  "home.show_announcements": "Gosi ọkwa",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to boost",
@@ -107,8 +118,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "relative_time.full.just_now": "kịta",
   "relative_time.just_now": "kịta",
   "relative_time.today": "taa",
@@ -142,7 +151,6 @@
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "Hichapụ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Họrọ onyonyo",
   "upload_progress.label": "Uploading…"
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 233b768457..3382fa1aec 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Anunco",
   "attachments_list.unprocessed": "(neprocedita)",
   "audio.hide": "Celez audio",
-  "autosuggest_hashtag.per_week": "{count} dum singla semano",
   "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "bundle_column_error.copy_stacktrace": "Kopierorraporto",
   "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
@@ -143,26 +142,14 @@
   "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
   "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Insertez selekto",
   "compose_form.poll.duration": "Votpostoduro",
-  "compose_form.poll.option_placeholder": "Selektato {number}",
-  "compose_form.poll.remove_option": "Efacez ca selektajo",
   "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
   "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
-  "compose_form.publish": "Publikigez",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sparez chanji",
-  "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Averto di kontenajo",
   "confirmation_modal.cancel": "Anulez",
-  "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
-  "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
   "confirmations.cancel_follow_request.confirm": "Desendez demando",
   "confirmations.cancel_follow_request.message": "Ka vu certe volas desendar vua demando di sequar {name}?",
   "confirmations.delete.confirm": "Efacez",
@@ -171,15 +158,12 @@
   "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
   "confirmations.discard_edit_media.confirm": "Efacez",
   "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.edit.confirm": "Modifikez",
   "confirmations.edit.message": "Modifikar nun remplasos la mesajo quon vu nune skribas. Ka vu certe volas procedar?",
   "confirmations.logout.confirm": "Ekirez",
   "confirmations.logout.message": "Ka tu certe volas ekirar?",
   "confirmations.mute.confirm": "Silencigez",
-  "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
-  "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
   "confirmations.redraft.confirm": "Efacez e riskisez",
   "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.reply.confirm": "Respondez",
@@ -303,13 +287,8 @@
   "hashtag.follow": "Sequez hashtago",
   "hashtag.unfollow": "Desequez hashtago",
   "hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
-  "home.actions.go_to_explore": "Videz quo es populara nun",
-  "home.actions.go_to_suggestions": "Trovez personi por sequar",
-  "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
-  "home.explore_prompt.body": "Vua hemala fluo havos mixuro de la hashtagi quin vu selektis sequar, la personi quin vu selektis sequar, e la posti quin ili repetis. Se to semblas tro tacanta, vu darfas volar:",
-  "home.explore_prompt.title": "Co es vua hemo en Mastodon.",
   "home.hide_announcements": "Celez anunci",
   "home.pending_critical_update.body": "Voluntez aktualigar vua Mastodon-servilo tam balde kam es posibla!",
   "home.pending_critical_update.link": "Vidar aktualigaji",
@@ -393,9 +372,6 @@
   "loading_indicator.label": "Kargante…",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
-  "mute_modal.duration": "Durado",
-  "mute_modal.hide_notifications": "Celez avizi de ca uzanto?",
-  "mute_modal.indefinite": "Nedefinitiva",
   "navigation_bar.about": "Pri co",
   "navigation_bar.advanced_interface": "Apertez per retintervizajo",
   "navigation_bar.blocks": "Blokusita uzeri",
@@ -405,7 +381,6 @@
   "navigation_bar.direct": "Privata mencioni",
   "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Modifikar profilo",
   "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favoriziti",
   "navigation_bar.filters": "Silencigita vorti",
@@ -440,9 +415,6 @@
   "notifications.column_settings.admin.sign_up": "Nova registranti:",
   "notifications.column_settings.alert": "Desktopavizi",
   "notifications.column_settings.favourite": "Favoriziti:",
-  "notifications.column_settings.filter_bar.advanced": "Montrez omna kategorii",
-  "notifications.column_settings.filter_bar.category": "Rapidfiltrobaro",
-  "notifications.column_settings.filter_bar.show_bar": "Montrez filtrobaro",
   "notifications.column_settings.follow": "Nova sequanti:",
   "notifications.column_settings.follow_request": "Nova sequodemandi:",
   "notifications.column_settings.mention": "Mencioni:",
@@ -519,14 +491,7 @@
   "poll_button.add_poll": "Insertez votposto",
   "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
-  "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Mencionita personi nur",
-  "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Sequanti nur",
-  "privacy.public.long": "Videbla da omnu",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
-  "privacy.unlisted.short": "Ne enlistigota",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
   "recommended": "Rekomendata",
@@ -637,7 +602,6 @@
   "status.direct": "Private mencionez @{name}",
   "status.direct_indicator": "Privata menciono",
   "status.edit": "Modifikez",
-  "status.edited": "Modifikesis ye {date}",
   "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
   "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
@@ -708,10 +672,8 @@
   "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
   "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
   "upload_form.description": "Deskriptez por personi kun vidnekapableso",
-  "upload_form.description_missing": "Deskriptajo ne insertesis",
   "upload_form.edit": "Modifikez",
   "upload_form.thumbnail": "Chanjez imajeto",
-  "upload_form.undo": "Desfacar",
   "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
   "upload_modal.analyzing_picture": "Analizas imajo…",
   "upload_modal.apply": "Aplikez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index fb839503e9..f5bf7c3281 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
-  "autosuggest_hashtag.per_week": "{count} á viku",
+  "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
+  "block_modal.show_less": "Sýna minna",
+  "block_modal.show_more": "Sýna meira",
+  "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.",
+  "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.",
+  "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.",
+  "block_modal.title": "Útiloka notanda?",
+  "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Aðgangurinn þinn er ekki {locked}. Hver sem er getur fylgst með þér til að sjá þær færslur sem einungis eru til fylgjenda þinna.",
   "compose_form.lock_disclaimer.lock": "læstur",
   "compose_form.placeholder": "Hvað liggur þér á hjarta?",
-  "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
+  "compose_form.poll.multiple": "Margir valkostir",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
-  "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
+  "compose_form.poll.single": "Veldu eitt",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
+  "compose_form.poll.type": "Stíll",
   "compose_form.publish": "Birta",
   "compose_form.publish_form": "Birta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Vista breytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppfæra",
   "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
-  "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
+  "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
-  "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
-  "confirmations.block.message": "Ertu viss um að þú viljir loka á {name}?",
   "confirmations.cancel_follow_request.confirm": "Taka beiðni til baka",
   "confirmations.cancel_follow_request.message": "Ertu viss um að þú viljir taka til baka beiðnina um að fylgjast með {name}?",
   "confirmations.delete.confirm": "Eyða",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ertu viss um að þú viljir eyða þessum lista endanlega?",
   "confirmations.discard_edit_media.confirm": "Henda",
   "confirmations.discard_edit_media.message": "Þú ert með óvistaðar breytingar á lýsingu myndefnis eða forskoðunar, henda þeim samt?",
-  "confirmations.domain_block.confirm": "Útiloka allt lénið",
+  "confirmations.domain_block.confirm": "Útiloka netþjón",
   "confirmations.domain_block.message": "Ertu alveg algjörlega viss um að þú viljir loka á allt {domain}? Í flestum tilfellum er vænlegra að nota færri en markvissari útilokanir eða að þagga niður tiltekna aðila. Þú munt ekki sjá efni frá þessu léni í neinum opinberum tímalínum eða í tilkynningunum þínum. Fylgjendur þínir frá þessu léni verða fjarlægðir.",
   "confirmations.edit.confirm": "Breyta",
   "confirmations.edit.message": "Ef þú breytir núna verður skrifað yfir skilaboðin sem þú ert að semja núna. Ertu viss um að þú viljir halda áfram?",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.mute.confirm": "Þagga",
-  "confirmations.mute.explanation": "Þetta mun fela færslur frá þeim og þær færslur þar sem minnst er á þau, en það mun samt sem áður gera þeim kleift að sjá færslurnar þínar og að fylgjast með þér.",
-  "confirmations.mute.message": "Ertu viss um að þú viljir þagga niður í {name}?",
   "confirmations.redraft.confirm": "Eyða og endurvinna drög",
   "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
   "confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Þessar færslur frá þessum og öðrum netþjónum á dreifhýsta netkerfinu eru að fá aukna athygli í þessu töluðum orðum.",
   "dismissable_banner.explore_tags": "Þetta eru myllumerki sem í augnablikinu eru að fá aukna athygli hjá fólki á þessum og öðrum netþjónum á dreifhýsta netkerfinu.",
   "dismissable_banner.public_timeline": "Þetta eru nýjustu opinberu færslurnar frá fólki á samfélagsnetinu sem fólk á {domain} fylgjast með.",
+  "domain_block_modal.block": "Útiloka netþjón",
+  "domain_block_modal.block_account_instead": "Útiloka {name} í staðinn",
+  "domain_block_modal.they_can_interact_with_old_posts": "Fólk frá þessum netþjóni getur sýslað með eldri færslur þínar.",
+  "domain_block_modal.they_cant_follow": "Enginn frá þessum netþjóni getur fylgst með þér.",
+  "domain_block_modal.they_wont_know": "Viðkomandi mun ekki vita að hann hafi verið útilokaður.",
+  "domain_block_modal.title": "Útiloka lén?",
+  "domain_block_modal.you_will_lose_followers": "Allir fylgjendur þínir af þessum netþjóni verða fjarlægðir.",
+  "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
+  "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
+  "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
+  "domain_pill.server": "Netþjónn",
+  "domain_pill.their_handle": "Kennislóðin þeirra:",
+  "domain_pill.their_server": "Stafrænt heimili viðkomandi, þar sem allar færslur hans eru hýstar.",
+  "domain_pill.their_username": "Sértækt auðkenni viðkomandi á netþjóni hans. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
+  "domain_pill.username": "Notandanafn",
+  "domain_pill.whats_in_a_handle": "Hvað er í kennislóð (handle)?",
+  "domain_pill.who_they_are": "Vegna þess að kennislóðir segja hver einhver sé og hvar hann sé að finna, getur þú átt í samskiptum við fólk í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.who_you_are": "Vegna þess að kennislóðin þín segir hver þú sért og hvar þig sé að finna, getur fólk átt í samskiptum við þig í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
+  "domain_pill.your_handle": "Kennislóðin þín:",
+  "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
+  "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
   "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
   "embed.preview": "Svona mun þetta líta út:",
   "emoji_button.activity": "Virkni",
@@ -244,6 +266,7 @@
   "empty_column.list": "Það er ennþá ekki neitt á þessum lista. Þegar meðlimir á listanum senda inn nýjar færslur, munu þær birtast hér.",
   "empty_column.lists": "Þú ert ennþá ekki með neina lista. Þegar þú býrð til einhvern lista, munu hann birtast hér.",
   "empty_column.mutes": "Þú hefur ekki þaggað niður í neinum notendum ennþá.",
+  "empty_column.notification_requests": "Allt hreint! Það er ekkert hér. Þegar þú færð nýjar tilkynningar, munu þær birtast hér í samræmi við stillingarnar þínar.",
   "empty_column.notifications": "Þú ert ekki ennþá með neinar tilkynningar. Vertu í samskiptum við aðra til að umræður fari af stað.",
   "empty_column.public": "Það er ekkert hér! Skrifaðu eitthvað opinberlega, eða fylgstu með notendum á öðrum netþjónum til að fylla upp í þetta",
   "error.unexpected_crash.explanation": "Vegna villu í kóðanum okkar eða samhæfnivandamála í vafra er ekki hægt að birta þessa síðu svo vel sé.",
@@ -274,19 +297,37 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {tilvísun} other {tilvísanir}}",
+  "filtered_notifications_banner.pending_requests": "Tilkynningar frá {count, plural, =0 {engum} one {einum aðila} other {# aðilum}} sem þú gætir þekkt",
+  "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
   "firehose.local": "þessum netþjóni",
   "firehose.remote": "öðrum netþjónum",
   "follow_request.authorize": "Heimila",
   "follow_request.reject": "Hafna",
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
+  "follow_suggestions.curated_suggestion": "Úrval starfsfólks",
+  "follow_suggestions.dismiss": "Ekki birta þetta aftur",
+  "follow_suggestions.featured_longer": "Handvalið af {domain}-teyminu",
+  "follow_suggestions.friends_of_friends_longer": "Vinsælt hjá fólki sem þú fylgist með",
+  "follow_suggestions.hints.featured": "Þetta notandasnið hefur verið handvalið af {domain}-teyminu.",
+  "follow_suggestions.hints.friends_of_friends": "Þetta notandasnið er vinsælt hjá fólki sem þú fylgist með.",
+  "follow_suggestions.hints.most_followed": "Þetta notandasnið er eitt af þeim sem mest er fylgst með á {domain}.",
+  "follow_suggestions.hints.most_interactions": "Þetta notandasnið hefur vakið mikla athygli að undanförnu á {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Þetta notandasnið er líkt þeim sniðum sem þú hefur valið að fylgjast með að undanförnu.",
+  "follow_suggestions.personalized_suggestion": "Persónuaðlöguð tillaga",
+  "follow_suggestions.popular_suggestion": "Vinsæl tillaga",
+  "follow_suggestions.popular_suggestion_longer": "Vinsælt á {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Svipar til notenda sem þú hefur nýlega farið að fylgjast með",
+  "follow_suggestions.view_all": "Skoða allt",
+  "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
   "followed_tags": "Myllumerki sem fylgst er með",
   "footer.about": "Nánari upplýsingar",
   "footer.directory": "Notandasniðamappa",
   "footer.get_app": "Ná í forritið",
   "footer.invite": "Bjóða fólki",
   "footer.keyboard_shortcuts": "Flýtileiðir á lyklaborði",
-  "footer.privacy_policy": "Persónuverndarstefna",
+  "footer.privacy_policy": "Meðferð persónuupplýsinga",
   "footer.source_code": "Skoða frumkóða",
   "footer.status": "Staða",
   "generic.saved": "Vistað",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
-  "home.actions.go_to_explore": "Sjá hvað er í umræðunni",
-  "home.actions.go_to_suggestions": "Finna fólk til að fylgjast með",
-  "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
-  "home.explore_prompt.body": "Heimastreymið þitt verður með blöndu af færslum úr myllumerkjunum sem þú hefur valið að fylgja, færslum frá fólki sem þú hefur valið að fylgja og færslum sem þau endurbirta. Ef þér finnst þetta allt of kyrrlátt, gætirðu viljað:",
-  "home.explore_prompt.title": "Þetta er bækistöð þín innan samfélagsins.",
   "home.hide_announcements": "Fela auglýsingar",
   "home.pending_critical_update.body": "Uppfærðu Mastodon-þjóninn þinn eins fljótt og mögulegt er!",
   "home.pending_critical_update.link": "Skoða uppfærslur",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Hleð inn…",
   "media_gallery.toggle_visible": "Víxla sýnileika",
   "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
-  "mute_modal.duration": "Lengd",
-  "mute_modal.hide_notifications": "Fela tilkynningar frá þessum notanda?",
-  "mute_modal.indefinite": "Óendanlegt",
+  "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
+  "mute_modal.hide_options": "Fela valkosti",
+  "mute_modal.indefinite": "Þar til ég hætti að þagga niður í viðkomandi",
+  "mute_modal.show_options": "Birta valkosti",
+  "mute_modal.they_can_mention_and_follow": "Viðkomandi geta minnst á þig og fylgst með þér, en þú munt ekki sjá þá.",
+  "mute_modal.they_wont_know": "Viðkomandi aðilar munu ekki vita að þaggað hefur verið niður í þeim.",
+  "mute_modal.title": "Þagga niður í notanda?",
+  "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
+  "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Einkaspjall",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.edit_profile": "Breyta notandasniði",
   "navigation_bar.explore": "Kanna",
   "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} fylgist með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
   "notification.mention": "{name} minntist á þig",
+  "notification.moderation-warning.learn_more": "Kanna nánar",
+  "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
+  "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
+  "notification.moderation_warning.action_disable": "Aðgangurinn þinn hefur verið gerður óvirkur.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sumar færslurnar þínar hafa verið merktar sem viðkvæmt efni.",
+  "notification.moderation_warning.action_none": "Aðgangurinn þinn hefur fengið aðvörun frá umsjónarmanni.",
+  "notification.moderation_warning.action_sensitive": "Færslur þínar á verða héðan í frá merktar sem viðkvæmar.",
+  "notification.moderation_warning.action_silence": "Notandaaðgangurinn þinn hefur verið takmarkaður.",
+  "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú tókst þátt í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
+  "notification.relationships_severance_event": "Missti tengingar við {name}",
+  "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
+  "notification.relationships_severance_event.domain_block": "Stjórnandi á {from} hefur lokað á {target} og þar með {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
+  "notification.relationships_severance_event.learn_more": "Kanna nánar",
+  "notification.relationships_severance_event.user_domain_block": "Þú hefur lokað á {target} og þar með fjarlægt {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
   "notification.status": "{name} sendi inn rétt í þessu",
   "notification.update": "{name} breytti færslu",
+  "notification_requests.accept": "Samþykkja",
+  "notification_requests.dismiss": "Afgreiða",
+  "notification_requests.notifications_from": "Tilkynningar frá {name}",
+  "notification_requests.title": "Síaðar tilkynningar",
   "notifications.clear": "Hreinsa tilkynningar",
   "notifications.clear_confirmation": "Ertu viss um að þú viljir endanlega eyða öllum tilkynningunum þínum?",
   "notifications.column_settings.admin.report": "Nýjar kærur:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Eftirlæti:",
   "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",
-  "notifications.column_settings.filter_bar.show_bar": "Birta síustikuna",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
   "notifications.column_settings.mention": "Tilvísanir:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Tilkynningar á skjáborði eru ekki aðgengilegar megna áður hafnaðra beiðna fyrir vafra",
   "notifications.permission_denied_alert": "Ekki var hægt að virkja tilkynningar á skjáborði, þar sem heimildum fyrir vafra var áður hafnað",
   "notifications.permission_required": "Tilkynningar á skjáborði eru ekki aðgengilegar þar sem nauðsynlegar heimildir hafa ekki verið veittar.",
+  "notifications.policy.filter_new_accounts.hint": "Útbúið {days, plural, one {síðasta daginn} other {síðustu # daga}}",
+  "notifications.policy.filter_new_accounts_title": "Nýir notendur",
+  "notifications.policy.filter_not_followers_hint": "Þar með talið fólk sem hefur fylgst með þér í minna en {days, plural, one {einn dag} other {# daga}}",
+  "notifications.policy.filter_not_followers_title": "Fólk sem fylgist ekki með þér",
+  "notifications.policy.filter_not_following_hint": "Þar til þú samþykkir viðkomandi handvirkt",
+  "notifications.policy.filter_not_following_title": "Fólk sem þú fylgist ekki með",
+  "notifications.policy.filter_private_mentions_hint": "Síað nema það sé í svari við einhverju þar sem þú minntist á viðkomandi eða ef þú fylgist með sendandanum",
+  "notifications.policy.filter_private_mentions_title": "Óumbeðið einkaspjall",
+  "notifications.policy.title": "Sía út tilkynningar frá…",
   "notifications_permission_banner.enable": "Virkja tilkynningar á skjáborði",
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Bæta við könnun",
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
-  "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Aðeins fólk sem minnst er á",
-  "privacy.private.long": "Senda einungis á fylgjendur",
-  "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Sýnilegt fyrir alla",
+  "privacy.direct.long": "Allir sem minnst er á í færslunni",
+  "privacy.direct.short": "Tilteknir aðilar",
+  "privacy.private.long": "Einungis þeir sem fylgjast með þér",
+  "privacy.private.short": "Fylgjendur",
+  "privacy.public.long": "Hver sem er, á og utan Mastodon",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
-  "privacy.unlisted.short": "Óskráð",
+  "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
+  "privacy.unlisted.long": "Minni stælar í reikniritum",
+  "privacy.unlisted.short": "Hljóðlátt opinbert",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
   "recommended": "Mælt með",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
   "reply_indicator.cancel": "Hætta við",
+  "reply_indicator.poll": "Könnun",
   "report.block": "Útiloka",
   "report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
   "report.categories.legal": "Lagalegt",
@@ -644,10 +714,11 @@
   "status.direct": "Einkaspjall við @{name}",
   "status.direct_indicator": "Einkaspjall",
   "status.edit": "Breyta",
-  "status.edited": "Breytt {date}",
+  "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
   "status.embed": "Ívefja",
   "status.favourite": "Eftirlæti",
+  "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
   "status.filtered": "Síað",
   "status.hide": "Fela færslu",
@@ -668,10 +739,11 @@
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
   "status.reblogged_by": "{name} endurbirti",
+  "status.reblogs": "{count, plural, one {endurbirting} other {endurbirtingar}}",
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
-  "status.replied_to": "Svaraði {name}",
+  "status.replied_to": "Svaraði til {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara þræði",
   "status.report": "Kæra @{name}",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
   "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
   "upload_form.description": "Lýstu þessu fyrir sjónskerta",
-  "upload_form.description_missing": "Engri lýsingu bætt við",
   "upload_form.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
-  "upload_form.undo": "Eyða",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Virkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4fb4d88cbc..8ab5db1b17 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -83,13 +83,20 @@
   "admin.impact_report.instance_follows": "I seguaci che i loro utenti perderebbero",
   "admin.impact_report.title": "Riepilogo dell'impatto",
   "alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tasso limitato",
+  "alert.rate_limited.title": "Limitazione per eccesso di richieste",
   "alert.unexpected.message": "Si è verificato un errore imprevisto.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
-  "autosuggest_hashtag.per_week": "{count} a settimana",
+  "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.",
+  "block_modal.show_less": "Mostra meno",
+  "block_modal.show_more": "Mostra di più",
+  "block_modal.they_cant_mention": "Non possono menzionarti o seguirti.",
+  "block_modal.they_cant_see_posts": "Non possono vedere i tuoi post e tu non vedrai i loro.",
+  "block_modal.they_will_know": "Possono vedere che sono bloccati.",
+  "block_modal.title": "Bloccare l'utente?",
+  "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
@@ -146,43 +153,37 @@
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
-  "compose_form.poll.add_option": "Aggiungi una scelta",
   "compose_form.poll.duration": "Durata del sondaggio",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Rimuovi questa scelta",
+  "compose_form.poll.multiple": "Scelta multipla",
+  "compose_form.poll.option_placeholder": "Opzione {number}",
+  "compose_form.poll.single": "Scegli uno",
   "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
   "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+  "compose_form.poll.type": "Stile",
   "compose_form.publish": "Pubblica",
   "compose_form.publish_form": "Nuovo post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salva le modifiche",
-  "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+  "compose_form.reply": "Rispondi",
+  "compose_form.save_changes": "Aggiorna",
   "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
-  "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
+  "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
-  "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
   "confirmations.cancel_follow_request.confirm": "Annulla la richiesta",
   "confirmations.cancel_follow_request.message": "Sei sicuro di voler annullare la tua richiesta per seguire {name}?",
   "confirmations.delete.confirm": "Elimina",
   "confirmations.delete.message": "Sei sicuro di voler eliminare questo post?",
   "confirmations.delete_list.confirm": "Elimina",
-  "confirmations.delete_list.message": "Sei sicuro di voler eliminare permanentemente questa lista?",
+  "confirmations.delete_list.message": "Sei sicuro/a di voler eliminare permanentemente questo elenco?",
   "confirmations.discard_edit_media.confirm": "Scarta",
   "confirmations.discard_edit_media.message": "Hai delle modifiche non salvate alla descrizione o anteprima del media, scartarle comunque?",
-  "confirmations.domain_block.confirm": "Blocca l'intero dominio",
+  "confirmations.domain_block.confirm": "Blocca il server",
   "confirmations.domain_block.message": "Sei davvero sicuro di voler bloccare l'intero {domain}? In gran parte dei casi, è sufficiente e preferibile bloccare o silenziare alcuni profili. Non visualizzerai i contenuti da quel dominio in alcuna cronologia pubblica o tra le tue notifiche. I tuoi seguaci da quel dominio saranno rimossi.",
   "confirmations.edit.confirm": "Modifica",
   "confirmations.edit.message": "Modificare ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
-  "confirmations.mute.explanation": "Questo nasconderà i post da loro e i post che li menzionano, ma consentirà comunque loro di visualizzare i tuoi post e di seguirti.",
-  "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.reply.confirm": "Rispondi",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Questi sono post da tutto il social web che stanno guadagnando popolarità oggi. I post più recenti con più condivisioni e preferiti sono classificati più in alto.",
   "dismissable_banner.explore_tags": "Questi hashtag stanno ottenendo popolarità tra le persone su questo e altri server della rete decentralizzata, al momento.",
   "dismissable_banner.public_timeline": "Questi sono i post pubblici più recenti di persone sul social che le persone su {domain} seguono.",
+  "domain_block_modal.block": "Blocca il server",
+  "domain_block_modal.block_account_instead": "Blocca invece @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Le persone da questo server possono interagire con i tuoi vecchi post.",
+  "domain_block_modal.they_cant_follow": "Nessuno da questo server può seguirti.",
+  "domain_block_modal.they_wont_know": "Non sapranno di essere stati bloccati.",
+  "domain_block_modal.title": "Bloccare il dominio?",
+  "domain_block_modal.you_will_lose_followers": "Tutti i tuoi seguaci da questo server verranno rimossi.",
+  "domain_block_modal.you_wont_see_posts": "Non vedrai post o notifiche dagli utenti su questo server.",
+  "domain_pill.activitypub_lets_connect": "Ti consente di connetterti e interagire con le persone non solo su Mastodon, ma anche su diverse app social.",
+  "domain_pill.activitypub_like_language": "ActivityPub è come la lingua che Mastodon parla con altri social network.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Il loro nome univoco:",
+  "domain_pill.their_server": "La loro casa digitale, dove risiedono tutti i loro post.",
+  "domain_pill.their_username": "Il loro identificatore univoco sul loro server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
+  "domain_pill.username": "Nome utente",
+  "domain_pill.whats_in_a_handle": "Cosa c'è in un nome univoco?",
+  "domain_pill.who_they_are": "Poiché i nomi univoci indicano chi sia qualcuno e dove si trovi, puoi interagire con le persone attraverso la rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
+  "domain_pill.who_you_are": "Poiché il tuo nome univoco indica chi tu sia e dove ti trovi, le persone possono interagire con te sulla rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
+  "domain_pill.your_handle": "Il tuo nome univoco:",
+  "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi seguaci.",
+  "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
   "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.",
   "embed.preview": "Ecco come apparirà:",
   "emoji_button.activity": "Attività",
@@ -241,9 +263,10 @@
   "empty_column.followed_tags": "Non hai ancora seguito alcun hashtag. Quando lo farai, appariranno qui.",
   "empty_column.hashtag": "Non c'è ancora nulla in questo hashtag.",
   "empty_column.home": "La cronologia della tua home è vuota! Segui altre persone per riempirla. {suggestions}",
-  "empty_column.list": "Non c'è ancora nulla in questa lista. Quando i membri di questa lista pubblicheranno dei nuovi post, appariranno qui.",
-  "empty_column.lists": "Non hai ancora alcuna lista. Quando ne creerai una, apparirà qui.",
+  "empty_column.list": "Non c'è ancora nulla in questo elenco. Quando i membri di questo elenco pubblicheranno nuovi post, appariranno qui.",
+  "empty_column.lists": "Non hai ancora nessun elenco. Quando ne creerai uno, apparirà qui.",
   "empty_column.mutes": "Non hai ancora silenziato alcun utente.",
+  "empty_column.notification_requests": "Tutto chiaro! Non c'è niente qui. Quando ricevi nuove notifiche, verranno visualizzate qui in base alle tue impostazioni.",
   "empty_column.notifications": "Non hai ancora nessuna notifica. Quando altre persone interagiranno con te, le vedrai qui.",
   "empty_column.public": "Non c'è nulla qui! Scrivi qualcosa pubblicamente o segui manualmente gli utenti dagli altri server per riempire questo spazio",
   "error.unexpected_crash.explanation": "A causa di un bug nel nostro codice o di un problema di compatibilità del browser, non è stato possibile visualizzare correttamente questa pagina.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menzione} other {menzioni}}",
+  "filtered_notifications_banner.pending_requests": "Notifiche da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
+  "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
   "firehose.local": "Questo server",
   "firehose.remote": "Altri server",
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
   "follow_requests.unlocked_explanation": "Anche se il tuo profilo non è privato, lo staff di {domain} ha pensato che potresti voler revisionare manualmente le richieste di seguirti da questi profili.",
+  "follow_suggestions.curated_suggestion": "Scelta personale",
+  "follow_suggestions.dismiss": "Non visualizzare più",
+  "follow_suggestions.featured_longer": "Selezionato personalmente dal team di {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popolare tra le persone che segui",
+  "follow_suggestions.hints.featured": "Questo profilo è stato selezionato personalmente dal team di {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Questo profilo è popolare tra le persone che segui.",
+  "follow_suggestions.hints.most_followed": "Questo profilo è uno dei più seguiti su {domain}.",
+  "follow_suggestions.hints.most_interactions": "Recentemente, questo profilo ha ricevuto molta attenzione su {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Questo profilo è simile ai profili che hai seguito più recentemente.",
+  "follow_suggestions.personalized_suggestion": "Suggerimenti personalizzati",
+  "follow_suggestions.popular_suggestion": "Suggerimento frequente",
+  "follow_suggestions.popular_suggestion_longer": "Popolare su {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Simile ai profili che hai seguito di recente",
+  "follow_suggestions.view_all": "Vedi tutto",
+  "follow_suggestions.who_to_follow": "Chi seguire",
   "followed_tags": "Hashtag seguiti",
   "footer.about": "Info",
   "footer.directory": "Cartella dei profili",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
-  "home.actions.go_to_explore": "Scopri cosa sia di tendenza",
-  "home.actions.go_to_suggestions": "Trova persone da seguire",
-  "home.column_settings.basic": "Base",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
-  "home.explore_prompt.body": "La tua home feed conterrà un mix di post degli hashtag che hai scelto di seguire, delle persone che hai scelto di seguire e dei post che condividono. Sembra abbastanza tranquillo in questo momento, quindi che ne dici di:",
-  "home.explore_prompt.title": "Questa è la tua base all'interno di Mastodon.",
   "home.hide_announcements": "Nascondi annunci",
   "home.pending_critical_update.body": "Ti preghiamo di aggiornare il tuo server di Mastodon, il prima possibile!",
   "home.pending_critical_update.link": "Visualizza aggiornamenti",
@@ -322,7 +358,7 @@
   "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
   "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
   "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
-  "interaction_modal.login.action": "Torna all’inizio",
+  "interaction_modal.login.action": "Portami alla pagina iniziale",
   "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
   "interaction_modal.no_account_yet": "Non su Mastodon?",
   "interaction_modal.on_another_server": "Su un altro server",
@@ -378,27 +414,33 @@
   "limited_account_hint.action": "Mostra comunque il profilo",
   "limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
   "link_preview.author": "Di {name}",
-  "lists.account.add": "Aggiungi alla lista",
-  "lists.account.remove": "Togli dalla lista",
-  "lists.delete": "Elimina lista",
-  "lists.edit": "Modifica lista",
+  "lists.account.add": "Aggiungi all'elenco",
+  "lists.account.remove": "Rimuovi dall'elenco",
+  "lists.delete": "Elimina elenco",
+  "lists.edit": "Modifica elenco",
   "lists.edit.submit": "Cambia il titolo",
   "lists.exclusive": "Nascondi questi post dalla home",
   "lists.new.create": "Aggiungi lista",
-  "lists.new.title_placeholder": "Titolo della nuova lista",
+  "lists.new.title_placeholder": "Titolo del nuovo elenco",
   "lists.replies_policy.followed": "Qualsiasi utente seguito",
-  "lists.replies_policy.list": "Membri della lista",
+  "lists.replies_policy.list": "Membri dell'elenco",
   "lists.replies_policy.none": "Nessuno",
   "lists.replies_policy.title": "Mostra risposte a:",
   "lists.search": "Cerca tra le persone che segui",
-  "lists.subheading": "Le tue liste",
+  "lists.subheading": "I tuoi elenchi",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
   "loading_indicator.label": "Caricamento…",
   "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Nascondere le notifiche da questo utente?",
-  "mute_modal.indefinite": "Per sempre",
+  "mute_modal.hide_from_notifications": "Nascondi dalle notifiche",
+  "mute_modal.hide_options": "Nascondi le opzioni",
+  "mute_modal.indefinite": "Finché io non le riattivo",
+  "mute_modal.show_options": "Mostre le opzioni",
+  "mute_modal.they_can_mention_and_follow": "Possono menzionarti e seguirti, ma non li vedrai.",
+  "mute_modal.they_wont_know": "Non sapranno di essere stati silenziati.",
+  "mute_modal.title": "Silenziare l'utente?",
+  "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
+  "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Menzioni private",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.edit_profile": "Modifica il profilo",
   "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} ha iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
   "notification.mention": "{name} ti ha menzionato",
+  "notification.moderation-warning.learn_more": "Scopri di più",
+  "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
+  "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
+  "notification.moderation_warning.action_disable": "Il tuo account è stato disattivato.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcuni dei tuoi post sono stati contrassegnati come sensibili.",
+  "notification.moderation_warning.action_none": "Il tuo account ha ricevuto un avviso di moderazione.",
+  "notification.moderation_warning.action_sensitive": "I tuoi post d'ora in poi saranno contrassegnati come sensibili.",
+  "notification.moderation_warning.action_silence": "Il tuo account è stato limitato.",
+  "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
+  "notification.relationships_severance_event": "Connessioni perse con {name}",
+  "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
+  "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
+  "notification.relationships_severance_event.learn_more": "Scopri di più",
+  "notification.relationships_severance_event.user_domain_block": "Tu hai bloccato {target}, rimuovendo {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
+  "notification_requests.accept": "Accetta",
+  "notification_requests.dismiss": "Ignora",
+  "notification_requests.notifications_from": "Notifiche da {name}",
+  "notification_requests.title": "Notifiche filtrate",
   "notifications.clear": "Cancella le notifiche",
   "notifications.clear_confirmation": "Sei sicuro di voler cancellare permanentemente tutte le tue notifiche?",
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
@@ -444,8 +503,7 @@
   "notifications.column_settings.alert": "Notifiche desktop",
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
-  "notifications.column_settings.filter_bar.category": "Barra rapida del filtro",
-  "notifications.column_settings.filter_bar.show_bar": "Mostra la barra del filtro",
+  "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Notifiche desktop non disponibili a causa della precedentemente negata richiesta di autorizzazioni del browser",
   "notifications.permission_denied_alert": "Impossibile abilitare le notifiche desktop, poiché l'autorizzazione del browser è stata precedentemente negata",
   "notifications.permission_required": "Notifiche destkop non disponibili poiché l'autorizzazione richiesta non è stata concessa.",
+  "notifications.policy.filter_new_accounts.hint": "Creato {days, plural, one {un giorno} other {# giorni}} fa",
+  "notifications.policy.filter_new_accounts_title": "Nuovi account",
+  "notifications.policy.filter_not_followers_hint": "Incluse le persone che ti seguono da meno di {days, plural, one {un giorno} other {# giorni}}",
+  "notifications.policy.filter_not_followers_title": "Persone che non ti seguono",
+  "notifications.policy.filter_not_following_hint": "Fino a quando non le approvi manualmente",
+  "notifications.policy.filter_not_following_title": "Persone che non segui",
+  "notifications.policy.filter_private_mentions_hint": "Filtrate, a meno che non sia in risposta alla tua menzione o se segui il mittente",
+  "notifications.policy.filter_private_mentions_title": "Menzioni private indesiderate",
+  "notifications.policy.title": "Filtra le notifiche da…",
   "notifications_permission_banner.enable": "Abilita le notifiche desktop",
   "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Aggiungi un sondaggio",
   "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
-  "privacy.direct.long": "Visibile solo per gli utenti menzionati",
-  "privacy.direct.short": "Solo persone menzionate",
-  "privacy.private.long": "Visibile solo ai seguaci",
-  "privacy.private.short": "Solo seguaci",
-  "privacy.public.long": "Visibile a tutti",
+  "privacy.direct.long": "Tutti quelli menzioniati nel post",
+  "privacy.direct.short": "Persone specifiche",
+  "privacy.private.long": "Solo i tuoi follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
-  "privacy.unlisted.short": "Non elencato",
+  "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
+  "privacy.unlisted.long": "Meno fanfare algoritmiche",
+  "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
   "recommended": "Consigliato",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
+  "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
   "reply_indicator.cancel": "Annulla",
+  "reply_indicator.poll": "Sondaggio",
   "report.block": "Blocca",
   "report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
   "report.categories.legal": "Informazioni legali",
@@ -644,10 +714,11 @@
   "status.direct": "Menziona privatamente @{name}",
   "status.direct_indicator": "Menzione privata",
   "status.edit": "Modifica",
-  "status.edited": "Modificato il {date}",
+  "status.edited": "Ultima modifica {date}",
   "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
   "status.embed": "Incorpora",
   "status.favourite": "Preferito",
+  "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
   "status.filtered": "Filtrato",
   "status.hide": "Nascondi il post",
@@ -668,6 +739,7 @@
   "status.reblog": "Reblog",
   "status.reblog_private": "Reblog con visibilità originale",
   "status.reblogged_by": "Rebloggato da {name}",
+  "status.reblogs": "{count, plural, one {boost} other {boost}}",
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
   "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
   "upload_form.description": "Descrizione per ipovedenti",
-  "upload_form.description_missing": "Nessuna descrizione aggiunta",
   "upload_form.edit": "Modifica",
   "upload_form.thumbnail": "Cambia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
   "upload_modal.analyzing_picture": "Analizzando l'immagine…",
   "upload_modal.apply": "Applica",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7aafe852a..0371c68fa9 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,17 +1,27 @@
 {
   "about.blocks": "制限中のサーバー",
   "about.contact": "連絡先",
+  "about.disabled": "無効",
   "about.disclaimer": "Mastodonは自由なオープンソースソフトウェアであり、Mastodon gGmbHの商標です。",
   "about.domain_blocks.no_reason_available": "理由未記載",
   "about.domain_blocks.preamble": "Mastodonでは原則的にあらゆるサーバー同士で交流したり、互いの投稿を読んだりできますが、当サーバーでは例外的に次のような制限を設けています。",
   "about.domain_blocks.silenced.explanation": "このサーバーのプロフィールやコンテンツは、明示的に検索したり、フォローでオプトインしない限り、通常は表示されません。",
+  "about.domain_blocks.noop.title": "一部制限",
+  "about.domain_blocks.noop.explanation": "このサーバーは部分的に制限されています。",
   "about.domain_blocks.silenced.title": "制限",
   "about.domain_blocks.suspended.explanation": "これらのサーバーからのデータは処理されず、保存や変換もされません。該当するユーザーとの交流もできません。",
   "about.domain_blocks.suspended.title": "停止中",
+  "about.enabled": "有効",
+  "about.full_text_search": "全文検索",
+  "about.kmyblue_capability": "このサーバーは、kmyblueというMastodonフォークを利用しています。kmyblue独自機能の一部は、サーバー管理者によって有効・無効を切り替えることができます。",
   "about.not_available": "この情報はこのサーバーでは利用できません。",
   "about.powered_by": "{mastodon}による分散型ソーシャルメディア",
+  "about.public_visibility": "公開投稿を許可",
   "about.rules": "サーバーのルール",
   "account.account_note_header": "メモ",
+  "account.add_or_remove_from_antenna": "アンテナから追加または外す",
+  "account.add_or_remove_from_exclude_antenna": "アンテナ除外条件から追加または外す",
+  "account.add_or_remove_from_circle": "サークルから追加または外す",
   "account.add_or_remove_from_list": "リストから追加または外す",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -78,6 +88,7 @@
   "admin.dashboard.retention.average": "平均",
   "admin.dashboard.retention.cohort": "サインアップ月",
   "admin.dashboard.retention.cohort_size": "新しいユーザー",
+  "admin.dimenssions.disabled_key": "この情報は無効です。",
   "admin.impact_report.instance_accounts": "プロフィール情報が削除されるアカウントの数",
   "admin.impact_report.instance_followers": "このサーバーのユーザーが失うフォロワー数",
   "admin.impact_report.instance_follows": "対象のサーバーのユーザーが失うフォロワー数",
@@ -87,9 +98,64 @@
   "alert.unexpected.message": "不明なエラーが発生しました。",
   "alert.unexpected.title": "エラー！",
   "announcement.announcement": "お知らせ",
+  "antennas.account.add": "アンテナに追加",
+  "antennas.account.remove": "アンテナから外す",
+  "antennas.accounts": "{count} のアカウント",
+  "antennas.add_domain": "新規ドメイン",
+  "antennas.add_domain_placeholder": "新しいドメイン名",
+  "antennas.add_keyword": "新規キーワード",
+  "antennas.add_keyword_placeholder": "新しいキーワード",
+  "antennas.add_tag": "新規タグ",
+  "antennas.add_tag_placeholder": "新しいタグ",
+  "antennas.delete": "アンテナを削除",
+  "antennas.domains": "{count} のドメイン",
+  "antennas.edit": "アンテナを編集",
+  "antennas.edit.submit": "タイトルを変更",
+  "antennas.edit_static": "旧編集画面に移動",
+  "antennas.edit_accounts": "アカウントを編集",
+  "antennas.exclude_accounts": "除外するアカウント",
+  "antennas.exclude_domains": "除外するドメイン",
+  "antennas.exclude_keywords": "除外するキーワード",
+  "antennas.exclude_tags": "除外するタグ",
+  "antennas.filter": "絞り込み条件",
+  "antennas.filter_not": "絞り込み条件の例外",
+  "antennas.go_timeline": "タイムラインを見る",
+  "antennas.ignore_reblog": "ブーストを除外",
+  "antennas.in_stl_mode": "STLモードが有効になっています",
+  "antennas.insert_feeds": "リストまたはホームに挿入",
+  "antennas.keywords": "{count} のキーワード",
+  "antennas.media_only": "メディアのみ",
+  "antennas.new.create": "アンテナを作成",
+  "antennas.new.title_placeholder": "新規アンテナ名",
+  "antennas.not_related_list": "このアンテナはどのリストにも関連付けられていません。",
+  "antennas.related_list": "このアンテナは {listTitle} に関連付けられています。",
+  "antennas.search": "すべてのユーザーから検索",
+  "antennas.select.no_options_message": "リストがありません",
+  "antennas.select.placeholder": "リストを選択",
+  "antennas.select.set_home": "リセット (ホームに関連付ける)",
+  "antennas.subheading": "あなたのアンテナ",
+  "antennas.stl": "STLモード",
+  "antennas.tags": "{count} のタグ",
+  "antennas.warnings.content_radio": "キーワードとタグの同時指定は推奨されません。",
+  "antennas.warnings.range_radio": "アカウントとドメインの同時指定は推奨されません。",
   "attachments_list.unprocessed": "(未処理)",
   "audio.hide": "音声を閉じる",
-  "autosuggest_hashtag.per_week": "{count} 回 / 週",
+  "bookmark_categories.all_bookmarks": "すべてのブックマーク",
+  "bookmark_categories.delete": "分類を削除",
+  "bookmark_categories.edit": "分類を編集",
+  "bookmark_categories.new.create": "新規分類",
+  "bookmark_categories.new.title_placeholder": "新規分類名",
+  "bookmark_categories.status.add": "分類に追加",
+  "bookmark_categories.status.remove": "分類から削除",
+  "bookmark_categories.subheading": "あなたの分類",
+  "block_modal.remote_users_caveat": "このサーバーはあなたのブロックの意思を尊重するように {domain} へ通知します。しかしながら、ブロックの扱い方はサーバーによってさまざまで、相手のサーバーは必ずしもこのブロックを適切に取り扱うものではないことに留意が必要です。また、あなたの公開投稿はサーバーからログアウトすれば誰からも見ることができます。",
+  "block_modal.show_less": "注意事項を閉じる",
+  "block_modal.show_more": "注意事項",
+  "block_modal.they_cant_mention": "相手はあなたへの返信やフォローができなくなります。",
+  "block_modal.they_cant_see_posts": "相手はあなたの投稿を閲覧できなくなり、あなたも相手の投稿を閲覧できなくなります。",
+  "block_modal.they_will_know": "ブロックは相手からわかります。",
+  "block_modal.title": "ユーザーをブロックしますか？",
+  "block_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -103,27 +169,44 @@
   "bundle_modal_error.close": "閉じる",
   "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_modal_error.retry": "再試行",
+  "circles.account.add": "サークルに追加",
+  "circles.account.remove": "サークルから外す",
+  "circles.delete": "サークルを削除",
+  "circles.edit": "サークルを編集",
+  "circles.edit.submit": "タイトルを変更",
+  "circles.new.create": "サークルを作成",
+  "circles.new.title_placeholder": "新規サークル名",
+  "circles.search": "フォロワーの中から検索",
+  "circles.subheading": "あなたのサークル",
   "closed_registrations.other_server_instructions": "Mastodonは分散型なので他のサーバーにアカウントを作ってもこのサーバーとやり取りできます。",
   "closed_registrations_modal.description": "現在{domain}でアカウント作成はできませんがMastodonは{domain}のアカウントでなくても利用できます。",
+  "closed_registrations_modal.description_when_reaching_limit": "新規登録は現在一時的に制限されています。登録の上限人数に達しています。詳細を管理人に問い合わせるか、制限が解除されるまでお待ち下さい。",
   "closed_registrations_modal.find_another_server": "別のサーバーを探す",
   "closed_registrations_modal.preamble": "Mastodonは分散型なのでどのサーバーでアカウントを作成してもこのサーバーのユーザーを誰でもフォローして交流することができます。また自分でホスティングすることもできます！",
   "closed_registrations_modal.title": "Mastodonでアカウントを作成",
   "column.about": "概要",
+  "column.antennas": "アンテナ",
   "column.blocks": "ブロックしたユーザー",
+  "column.bookmark_categories": "ブックマーク分類",
   "column.bookmarks": "ブックマーク",
+  "column.circles": "サークル",
   "column.community": "ローカルタイムライン",
+  "column.deep_local": "ディープ",
   "column.direct": "非公開の返信",
   "column.directory": "ディレクトリ",
   "column.domain_blocks": "ブロックしたドメイン",
+  "column.emoji_reactions": "絵文字リアクション",
   "column.favourites": "お気に入り",
   "column.firehose": "リアルタイムフィード",
   "column.follow_requests": "フォローリクエスト",
   "column.home": "ホーム",
   "column.lists": "リスト",
+  "column.local": "ローカル",
   "column.mutes": "ミュートしたユーザー",
   "column.notifications": "通知",
   "column.pins": "固定された投稿",
   "column.public": "連合タイムライン",
+  "column.reaction_deck": "絵文字デッキ",
   "column_back_button.label": "戻る",
   "column_header.hide_settings": "設定を隠す",
   "column_header.moveLeft_settings": "カラムを左に移動する",
@@ -143,46 +226,51 @@
   "compose_form.direct_message_warning_learn_more": "もっと詳しく",
   "compose_form.encryption_warning": "Mastodonの投稿はエンドツーエンド暗号化に対応していません。安全に送受信されるべき情報をMastodonで共有しないでください。",
   "compose_form.hashtag_warning": "この投稿は公開設定ではないのでハッシュタグの一覧に表示されません。公開投稿だけがハッシュタグで検索できます。",
+  "compose_form.limited_post_warning": "限定投稿は、v4.3.0以降のMastodon、またはkmyblue・Fedibirdを含む一部のMastodonにしか届きません（2024年1月時点）",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
+  "compose_form.markdown.marked": "Markdown有効",
+  "compose_form.markdown.unmarked": "Markdownは有効になっていません",
+  "compose_form.mention_warning": "限定投稿にメンションを追加すると、そのアカウントはサークルメンバー・相互などに関係なくこの投稿を読むことができます",
   "compose_form.placeholder": "今なにしてる？",
-  "compose_form.poll.add_option": "追加",
+  "compose_form.searchability_warning": "検索許可「自分のみ」はkmyblue内の検索でのみ有効です。他のサーバーでは「リアクションした人のみ」と同等に扱われます",
   "compose_form.poll.duration": "アンケート期間",
-  "compose_form.poll.option_placeholder": "項目 {number}",
-  "compose_form.poll.remove_option": "この項目を削除",
+  "compose_form.poll.multiple": "複数選択",
+  "compose_form.poll.option_placeholder": "項目{number}",
+  "compose_form.poll.single": "単一選択",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
+  "compose_form.poll.type": "スタイル",
   "compose_form.publish": "投稿",
   "compose_form.publish_form": "投稿",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "変更を保存",
-  "compose_form.sensitive.hide": "メディアを閲覧注意にする",
-  "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
-  "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
+  "compose_form.reply": "返信",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
   "compose_form.spoiler.unmarked": "本文は隠されていません",
-  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
+  "compose_form.spoiler_placeholder": "閲覧注意 (オプション)",
   "confirmation_modal.cancel": "キャンセル",
-  "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
-  "confirmations.block.message": "本当に{name}さんをブロックしますか？",
   "confirmations.cancel_follow_request.confirm": "フォローリクエストを取り消す",
   "confirmations.cancel_follow_request.message": "{name}に対するフォローリクエストを取り消しますか?",
   "confirmations.delete.confirm": "削除",
   "confirmations.delete.message": "本当に削除しますか？",
+  "confirmations.delete_bookmark_category.confirm": "削除",
+  "confirmations.delete_bookmark_category.message": "本当にこの分類を完全に削除しますか？各投稿からこの分類は削除されますが、ブックマークは解除されません。",
+  "confirmations.delete_circle.confirm": "削除",
+  "confirmations.delete_circle.message": "本当にこのサークルを完全に削除しますか？",
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
+  "confirmations.delete_antenna.confirm": "削除",
+  "confirmations.delete_antenna.message": "本当にこのアンテナを完全に削除しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
-  "confirmations.domain_block.confirm": "ドメイン全体をブロック",
+  "confirmations.domain_block.confirm": "サーバーをブロック",
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？ 多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。公開タイムラインにそのドメインのコンテンツが表示されなくなり、通知も届かなくなります。そのドメインのフォロワーはアンフォローされます。",
   "confirmations.edit.confirm": "編集",
   "confirmations.edit.message": "今編集すると現在作成中のメッセージが上書きされます。本当に実行しますか？",
   "confirmations.logout.confirm": "ログアウト",
   "confirmations.logout.message": "本当にログアウトしますか？",
   "confirmations.mute.confirm": "ミュート",
-  "confirmations.mute.explanation": "これにより相手の投稿と返信は見えなくなりますが、相手はあなたをフォローし続け投稿を見ることができます。",
-  "confirmations.mute.message": "本当に{name}さんをミュートしますか？",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
   "confirmations.reply.confirm": "返信",
@@ -208,6 +296,27 @@
   "dismissable_banner.explore_statuses": "ネットワーク上で注目を集めている投稿です。ブーストやお気に入り登録の多い新しい投稿が上位に表示されます。",
   "dismissable_banner.explore_tags": "ネットワーク上でトレンドになっているハッシュタグです。たくさんのユーザーに使われたタグほど上位に表示されます。",
   "dismissable_banner.public_timeline": "{domain}のユーザーがリモートフォローしているアカウントからの公開投稿のタイムラインです。",
+  "domain_block_modal.block": "サーバーをブロック",
+  "domain_block_modal.block_account_instead": "@{name} さんのみをブロック",
+  "domain_block_modal.they_can_interact_with_old_posts": "あなたの今までの投稿は、引き続きこのサーバーのユーザーが閲覧できます。",
+  "domain_block_modal.they_cant_follow": "このサーバーのユーザーはあなたをフォローできなくなります。",
+  "domain_block_modal.they_wont_know": "ドメインブロックは相手からはわかりません。",
+  "domain_block_modal.title": "ドメインをブロックしますか？",
+  "domain_block_modal.you_will_lose_followers": "このサーバーのフォロワーはすべてフォロー解除されます。",
+  "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
+  "domain_pill.activitypub_lets_connect": "Mastodonからほかのソーシャルアプリのユーザーへ、そのまた別のアプリのユーザーへと、それぞれが互いにつながり関わり合うことをこのActivityPubの仕組みが実現しています。",
+  "domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
+  "domain_pill.server": "サーバー",
+  "domain_pill.their_handle": "このユーザーのユーザーID:",
+  "domain_pill.their_server": "ユーザーの仮想の住所です。そのユーザーIDによるすべての投稿を保持しています。",
+  "domain_pill.their_username": "ユーザーを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
+  "domain_pill.username": "ユーザー名",
+  "domain_pill.whats_in_a_handle": "ユーザーIDについて",
+  "domain_pill.who_they_are": "そのユーザーが「誰であるか」「どこに住んでいるか」はユーザーIDから知ることができます。これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してそれぞれのユーザーと関わり合うことができます。",
+  "domain_pill.who_you_are": "ほかのユーザーはあなたが「誰であるか」「どこに住んでいるか」をユーザーIDから認識でき、これにより<button>いくつものActivityPub対応のプラットフォーム</button>の集まりからなるネットワークを介してあなたと関わり合うことができます。",
+  "domain_pill.your_handle": "あなたのユーザーID:",
+  "domain_pill.your_server": "あなたの仮想の住所です。投稿した内容はすべてここに保持されます。もし今いるサーバーが気に入っていない場合は、フォロワーを引き継いで別のサーバーに引っ越すこともできます。",
+  "domain_pill.your_username": "あなたを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
   "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
   "embed.preview": "表示例:",
   "emoji_button.activity": "活動",
@@ -229,11 +338,17 @@
   "empty_column.account_suspended": "アカウントは停止されています",
   "empty_column.account_timeline": "投稿がありません！",
   "empty_column.account_unavailable": "プロフィールは利用できません",
+  "empty_column.antenna": "このアンテナはまだ何も拾っていません。このアンテナの設定にマッチした投稿が検出されるとここに表示されます。",
+  "empty_column.antennas": "まだアンテナがありません。アンテナを作るとここに表示されます。",
   "empty_column.blocks": "まだ誰もブロックしていません。",
+  "empty_column.bookmark_categories": "まだ分類がありません。分類を作るとここに表示されます。",
   "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
+  "empty_column.circles": "まだサークルがありません。サークルを作るとここに表示されます。",
+  "empty_column.circle_statuses": "まだサークル投稿がありません。このサークルでなにか投稿するとここに表示されます。",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
   "empty_column.direct": "非公開の返信はまだありません。非公開でやりとりをするとここに表示されます。",
   "empty_column.domain_blocks": "ブロックしているドメインはありません。",
+  "empty_column.emoji_reactions": "まだ誰も絵文字をつけていません。絵文字をつけられるとここに表示されます。",
   "empty_column.explore_statuses": "まだ何もありません。後で確認してください。",
   "empty_column.favourited_statuses": "お気に入りの投稿はまだありません。お気に入りに登録すると、ここに表示されます。",
   "empty_column.favourites": "まだ誰もこの投稿をお気に入りに登録していません。お気に入りに登録されると、ここに表示されます。",
@@ -244,8 +359,10 @@
   "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しい投稿をするとここに表示されます。",
   "empty_column.lists": "まだリストがありません。リストを作るとここに表示されます。",
   "empty_column.mutes": "まだ誰もミュートしていません。",
+  "empty_column.notification_requests": "ここに表示するものはありません。新しい通知を受け取ったとき、フィルタリング設定で通知がブロックされたアカウントがある場合はここに表示されます。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
+  "empty_column.status_references": "まだ誰も引用していません。引用されるとここに表示されます。",
   "error.unexpected_crash.explanation": "不具合かブラウザの互換性問題のため、このページを正しく表示できませんでした。",
   "error.unexpected_crash.explanation_addons": "このページは正しく表示できませんでした。このエラーはブラウザのアドオンや自動翻訳ツールによって引き起こされることがあります。",
   "error.unexpected_crash.next_steps": "ページの再読み込みをお試しください。それでも解決しない場合、別のブラウザかアプリを使えば使用できることがあります。",
@@ -274,12 +391,30 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
+  "filtered_notifications_banner.mentions": "{count, plural, one {メンション} other {メンション}}",
+  "filtered_notifications_banner.pending_requests": "{count, plural, =0 {通知がブロックされているアカウントはありません} other {#アカウントからの通知がブロックされています}}",
+  "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
   "firehose.local": "このサーバー",
   "firehose.remote": "ほかのサーバー",
   "follow_request.authorize": "許可",
   "follow_request.reject": "拒否",
   "follow_requests.unlocked_explanation": "あなたのアカウントは承認制ではありませんが、{domain}のスタッフはこれらのアカウントからのフォローリクエストの確認が必要であると判断しました。",
+  "follow_suggestions.curated_suggestion": "サーバースタッフ公認",
+  "follow_suggestions.dismiss": "今後表示しない",
+  "follow_suggestions.featured_longer": "{domain} スタッフ公認",
+  "follow_suggestions.friends_of_friends_longer": "フォロー中のユーザーに人気",
+  "follow_suggestions.hints.featured": "{domain} の運営スタッフが選んだアカウントです。",
+  "follow_suggestions.hints.friends_of_friends": "フォロー中のユーザーのあいだで人気のアカウントです。",
+  "follow_suggestions.hints.most_followed": "{domain} でもっともフォローされているアカウントのひとつです。",
+  "follow_suggestions.hints.most_interactions": "{domain} でいま大きな注目を集めています。",
+  "follow_suggestions.hints.similar_to_recently_followed": "最近フォローしたユーザーに似ているアカウントです。",
+  "follow_suggestions.personalized_suggestion": "フォローに基づく提案",
+  "follow_suggestions.popular_suggestion": "人気のアカウント",
+  "follow_suggestions.popular_suggestion_longer": "{domain} で人気",
+  "follow_suggestions.similar_to_recently_followed_longer": "最近フォローしたユーザーと似ているアカウント",
+  "follow_suggestions.view_all": "すべて表示",
+  "follow_suggestions.who_to_follow": "フォローを増やしてみませんか？",
   "followed_tags": "フォロー中のハッシュタグ",
   "footer.about": "概要",
   "footer.directory": "ディレクトリ",
@@ -302,17 +437,12 @@
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
   "hashtag.counter_by_accounts": "{count, plural, other {{counter}人投稿}}",
   "hashtag.counter_by_uses": "{count, plural, other {{counter}件}}",
-  "hashtag.counter_by_uses_today": "今日{count, plural, other {{counter}件}}",
+  "hashtag.counter_by_uses_today": "本日{count, plural, other {#件}}",
   "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "hashtags.and_other": "ほか{count, plural, other {#個}}",
-  "home.actions.go_to_explore": "話題をさがす",
-  "home.actions.go_to_suggestions": "フォローするユーザーを検索",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
-  "home.explore_prompt.body": "ユーザーやハッシュタグをフォローすると、この「ホーム」タイムラインに投稿やブーストが流れるようになります。タイムラインをもう少しにぎやかにしてみませんか？",
-  "home.explore_prompt.title": "Mastodonのタイムラインへようこそ。",
   "home.hide_announcements": "お知らせを隠す",
   "home.pending_critical_update.body": "速やかにMastodonサーバーをアップデートしてください。",
   "home.pending_critical_update.link": "詳細",
@@ -344,6 +474,7 @@
   "keyboard_shortcuts.description": "説明",
   "keyboard_shortcuts.direct": "非公開の返信のカラムを開く",
   "keyboard_shortcuts.down": "カラム内一つ下に移動",
+  "keyboard_shortcuts.emoji_reactions": "絵文字リアクションのリストを開く",
   "keyboard_shortcuts.enter": "投稿の詳細を表示",
   "keyboard_shortcuts.favourite": "お気に入りの投稿",
   "keyboard_shortcuts.favourites": "お気に入りリストを開く",
@@ -380,12 +511,14 @@
   "link_preview.author": "{name}",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
+  "lists.antennas": "関連付けられたアンテナ",
   "lists.delete": "リストを削除",
   "lists.edit": "リストを編集",
   "lists.edit.submit": "タイトルを変更",
-  "lists.exclusive": "ホームタイムラインからこれらの投稿を非表示にする",
+  "lists.exclusive": "ホームからリスト・アンテナに登録されたアカウントの投稿を非表示にする",
   "lists.new.create": "リストを作成",
   "lists.new.title_placeholder": "新規リスト名",
+  "lists.notify": "これらの投稿を通知する",
   "lists.replies_policy.followed": "フォロー中のユーザー全員",
   "lists.replies_policy.list": "リストのメンバー",
   "lists.replies_policy.none": "表示しない",
@@ -396,19 +529,28 @@
   "loading_indicator.label": "読み込み中…",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
-  "mute_modal.duration": "ミュートする期間",
-  "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
+  "mute_modal.hide_from_notifications": "通知をオフにする",
+  "mute_modal.hide_options": "オプションを閉じる",
   "mute_modal.indefinite": "無期限",
+  "mute_modal.show_options": "オプションを表示",
+  "mute_modal.they_can_mention_and_follow": "相手はあなたへの返信やフォローができますが、あなたには見えません。",
+  "mute_modal.they_wont_know": "ミュートは相手からはわかりません。",
+  "mute_modal.title": "ユーザーをミュートしますか？",
+  "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
+  "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
+  "navigation_bar.antennas": "アンテナ",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.bookmarks": "ブックマーク",
+  "navigation_bar.circles": "サークル",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "投稿の新規作成",
+  "navigation_bar.deep_timeline": "ディープタイムライン",
   "navigation_bar.direct": "非公開の返信",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.edit_profile": "プロフィールを編集",
+  "navigation_bar.emoji_reactions": "絵文字リアクション",
   "navigation_bar.explore": "探索する",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -423,29 +565,52 @@
   "navigation_bar.pins": "固定した投稿",
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.public_timeline": "連合タイムライン",
+  "navigation_bar.reaction_deck": "絵文字デッキ",
+  "navigation_bar.refresh": "画面をリロード",
   "navigation_bar.search": "検索",
   "navigation_bar.security": "セキュリティ",
   "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。",
   "notification.admin.report": "{name}さんが{target}さんを通報しました",
   "notification.admin.sign_up": "{name}さんがサインアップしました",
+  "notification.emoji_reaction": "{name}さんがあなたの投稿に絵文字をつけました",
   "notification.favourite": "{name}さんがお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
+  "notification.list_status": "{name}さんの投稿が{listName}に追加されました",
   "notification.mention": "{name}さんがあなたに返信しました",
+  "notification.moderation-warning.learn_more": "さらに詳しく",
+  "notification.moderation_warning": "管理者から警告が来ています",
+  "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
+  "notification.moderation_warning.action_disable": "あなたのアカウントは無効になりました。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "あなたの投稿のいくつかは閲覧注意として判定されています。",
+  "notification.moderation_warning.action_none": "あなたのアカウントは管理者からの警告を受けています。",
+  "notification.moderation_warning.action_sensitive": "あなたの投稿はこれから閲覧注意としてマークされます。",
+  "notification.moderation_warning.action_silence": "あなたのアカウントは制限されています。",
+  "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "アンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
+  "notification.relationships_severance_event": "{name} との関係が失われました",
+  "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
+  "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
+  "notification.relationships_severance_event.learn_more": "詳細を確認",
+  "notification.relationships_severance_event.user_domain_block": "{target} のブロックにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が解除されました。",
   "notification.status": "{name}さんが投稿しました",
+  "notification.status_reference": "{name}さんがあなたの投稿を引用しました",
   "notification.update": "{name}さんが投稿を編集しました",
+  "notification_requests.accept": "受け入れる",
+  "notification_requests.dismiss": "無視",
+  "notification_requests.notifications_from": "{name}からの通知",
+  "notification_requests.title": "保留中の通知",
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
+  "notifications.column_settings.emoji_reaction": "絵文字リアクション",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
-  "notifications.column_settings.filter_bar.show_bar": "フィルターバーを表示",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
   "notifications.column_settings.mention": "返信:",
@@ -455,22 +620,34 @@
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
   "notifications.column_settings.status": "新しい投稿:",
+  "notifications.column_settings.status_reference": "引用",
   "notifications.column_settings.unread_notifications.category": "未読の通知:",
   "notifications.column_settings.unread_notifications.highlight": "未読の通知を強調表示",
   "notifications.column_settings.update": "編集:",
   "notifications.filter.all": "すべて",
   "notifications.filter.boosts": "ブースト",
+  "notifications.filter.emoji_reactions": "絵文字リアクション",
   "notifications.filter.favourites": "お気に入り",
   "notifications.filter.follows": "フォロー",
   "notifications.filter.mentions": "返信",
   "notifications.filter.polls": "アンケート結果",
   "notifications.filter.statuses": "フォローしている人の新着情報",
+  "notifications.filter.status_references": "引用",
   "notifications.grant_permission": "権限の付与",
   "notifications.group": "{count}件の通知",
   "notifications.mark_as_read": "すべて既読にする",
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
+  "notifications.policy.filter_new_accounts.hint": "作成から{days, plural, other {#日}}以内のアカウントからの通知がブロックされます",
+  "notifications.policy.filter_new_accounts_title": "新しいアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_followers_hint": "フォローされていても、フォローから{days, plural, other {#日}}経っていない場合はブロックされます",
+  "notifications.policy.filter_not_followers_title": "フォローされていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_not_following_hint": "手動で通知を受け入れたアカウントはブロックされません",
+  "notifications.policy.filter_not_following_title": "フォローしていないアカウントからの通知をブロックする",
+  "notifications.policy.filter_private_mentions_hint": "あなたがメンションした相手からの返信、およびフォローしているアカウントからの返信以外がブロックされます",
+  "notifications.policy.filter_private_mentions_title": "外部からの非公開の返信をブロックする",
+  "notifications.policy.title": "通知のフィルタリング",
   "notifications_permission_banner.enable": "デスクトップ通知を有効にする",
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
@@ -478,6 +655,7 @@
   "onboarding.actions.back": "チュートリアルに戻る",
   "onboarding.actions.go_to_explore": "話題をさがす",
   "onboarding.actions.go_to_home": "タイムラインに移動",
+  "onboarding.actions.go_to_local_timeline": "ローカルの投稿を見る",
   "onboarding.compose.template": "#Mastodon はじめました",
   "onboarding.follows.empty": "表示できる結果はありません。検索やエクスプローラーを使ったり、ほかのアカウントをフォローしたり、後でもう一度試しください。",
   "onboarding.follows.lead": "ホームタイムラインはMastodonの軸足となる場所です。たくさんのユーザーをフォローすることで、ホームタイムラインはよりにぎやかでおもしろいものになります。手はじめに、おすすめのアカウントから何人かフォローしてみましょう:",
@@ -498,7 +676,7 @@
   "onboarding.share.next_steps": "次のステップに進む:",
   "onboarding.share.title": "プロフィールをシェアする",
   "onboarding.start.lead": "Mastodonへようこそ。Mastodonは非中央集権型SNSのひとつで、ユーザーそれぞれの考えかたを尊重するプラットフォームです。ユーザーはどんな「好き」も自由に追いかけることができます。次のステップに進んで、新天地でのつながりをみつけましょう:",
-  "onboarding.start.skip": "チュートリアルをスキップする:",
+  "onboarding.start.skip": "下のどれかをクリックしてチュートリアルを終了",
   "onboarding.start.title": "はじめに",
   "onboarding.steps.follow_people.body": "ユーザーをフォローしてみましょう。これがMastodonを楽しむ基本です。",
   "onboarding.steps.follow_people.title": "ホームタイムラインを埋める",
@@ -525,17 +703,34 @@
   "poll.votes": "{votes}票",
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
+  "privacy.banned.long": "全ての公開範囲が、ユーザー設定により無効になっています",
+  "privacy.banned.short": "投稿不可",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "指定された相手のみ閲覧可",
-  "privacy.direct.short": "指定された相手のみ",
-  "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可",
+  "privacy.circle.long": "サークルメンバーのみ閲覧可",
+  "privacy.circle.short": "サークル (投稿時点)",
+  "privacy.direct.long": "本文で指定した相手のみ",
+  "privacy.direct.short": "特定の人",
+  "privacy.limited.short": "限定投稿",
+  "privacy.login.long": "ログインユーザーのみ閲覧可、公開",
+  "privacy.login.short": "ログインユーザーのみ",
+  "privacy.mutual.long": "相互フォローのみ閲覧可",
+  "privacy.mutual.short": "相互 (投稿時点)",
+  "privacy.personal.short": "自分限定",
+  "privacy.private.long": "フォロワーのみ",
+  "privacy.private.short": "フォロワー",
+  "privacy.public.long": "すべての人、ﾎｰﾑ＋ﾛｰｶﾙ＋連合TL",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
-  "privacy.unlisted.short": "非収載",
+  "privacy.public_unlisted.long": "すべての人、ﾎｰﾑ＋ﾛｰｶﾙTL",
+  "privacy.public_unlisted.short": "ローカル公開",
+  "privacy.reply.long": "元投稿と同じメンバーが閲覧可",
+  "privacy.reply.short": "限定投稿への返信",
+  "privacy.unlisted.additional": "「公開」とほとんど同じですが、リアルタイムフィードやハッシュタグ、探索機能、Mastodon検索などに投稿が表示されない点で「公開」と異なります。また、アカウント設定で投稿の検索や表示を許可している場合でも、この公開範囲を設定した投稿は前述の機能には表示されません。",
+  "privacy.unlisted.long": "すべての人、ﾎｰﾑTL",
+  "privacy.unlisted.short": "ひかえめな公開 (非収載)",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
+  "reaction_deck.add": "追加",
+  "reaction_deck.remove": "削除",
   "recommended": "おすすめ",
   "refresh": "更新",
   "regeneration_indicator.label": "読み込み中…",
@@ -551,7 +746,9 @@
   "relative_time.minutes": "{number}分前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今日",
+  "reply_indicator.attachments": "{count, plural, other {#件のメディア}}",
   "reply_indicator.cancel": "キャンセル",
+  "reply_indicator.poll": "アンケート",
   "report.block": "ブロック",
   "report.block_explanation": "相手の投稿が表示されなくなります。相手はあなたの投稿を見ることやフォローすることができません。相手はブロックされていることがわかります。",
   "report.categories.legal": "法令違反",
@@ -606,6 +803,18 @@
   "search.quick_action.open_url": "MastodonでURLを開く",
   "search.quick_action.status_search": "{x}に該当する投稿",
   "search.search_or_paste": "検索またはURLを入力",
+  "searchability.change": "検索許可範囲を変更",
+  "searchability.direct.long": "この投稿はあなたしか検索できません",
+  "searchability.direct.short": "自分のみ",
+  "searchability.private.long": "この投稿に反応した人だけが検索できます",
+  "searchability.private.short": "反応者のみ",
+  "searchability.public.long": "この投稿は誰でも検索できます",
+  "searchability.public.short": "誰でも",
+  "searchability.public_unlisted.long": "ローカルユーザーとフォロワーが検索できます",
+  "searchability.public_unlisted.short": "ローカルとフォロワー",
+  "searchability.unlisted.long": "この投稿はあなたのフォロワーと反応者だけが検索できます",
+  "searchability.unlisted.short": "フォロワーと反応者",
+  "search_popout.domain": "ドメイン",
   "search_popout.full_text_search_disabled_message": "{domain}では利用できません。",
   "search_popout.full_text_search_logged_out_message": "ログイン時のみ利用できます。",
   "search_popout.language_code": "ISO言語コード",
@@ -636,6 +845,8 @@
   "status.admin_status": "この投稿をモデレーション画面で開く",
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
+  "status.bookmark_category": "ブックマーク分類を指定",
+  "status.cancel_reblog": "ブースト解除",
   "status.cancel_reblog_private": "ブースト解除",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.copy": "投稿へのリンクをコピー",
@@ -644,10 +855,23 @@
   "status.direct": "@{name}さんに非公開で投稿",
   "status.direct_indicator": "非公開の返信",
   "status.edit": "編集",
-  "status.edited": "{date}に編集",
+  "status.edited": "最終更新日 {date}",
   "status.edited_x_times": "{count}回編集",
   "status.embed": "埋め込み",
+  "status.emoji_reaction": "絵文字リアクション",
+  "status.emoji_reaction.pick": "絵文字を追加する",
+  "status.emoji_reactions": "{count, plural, one {絵文字} other {絵文字}}",
+  "status.expiration.5_minutes": "5 分後に削除",
+  "status.expiration.30_minutes": "30 分後に削除",
+  "status.expiration.1_hour": "1 時間後に削除",
+  "status.expiration.3_hours": "3 時間後に削除",
+  "status.expiration.12_hours": "12 時間後に削除",
+  "status.expiration.1_day": "1 日後に削除",
+  "status.expiration.7_days": "7 日後に削除",
+  "status.expiration.add": "時限投稿を設定",
   "status.favourite": "お気に入り",
+  "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
+  "status.featured_tags.add": "おすすめハッシュタグを追加",
   "status.filter": "この投稿をフィルターする",
   "status.filtered": "フィルターされました",
   "status.hide": "投稿を非表示",
@@ -658,18 +882,24 @@
   "status.media.show": "クリックして表示",
   "status.media_hidden": "非表示のメディア",
   "status.mention": "@{name}さんに投稿",
+  "status.mentions": "メンション先一覧",
   "status.more": "もっと見る",
   "status.mute": "@{name}さんをミュート",
   "status.mute_conversation": "会話をミュート",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
   "status.pinned": "固定された投稿",
+  "status.quote": "引用",
+  "status.quotes": "{count, plural, one {引用} other {引用}}",
   "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
   "status.reblog_private": "ブースト",
+  "status.reblog_with_detail": "公開範囲を指定してブースト",
   "status.reblogged_by": "{name}さんがブースト",
+  "status.reblogs": "{count, plural, one {ブースト} other {ブースト}}",
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
+  "status.reference": "ひかえめな引用",
   "status.remove_bookmark": "ブックマークを削除",
   "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",
@@ -715,10 +945,8 @@
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "説明を追加していません",
   "upload_form.edit": "編集",
   "upload_form.thumbnail": "サムネイルを変更",
-  "upload_form.undo": "削除",
   "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
   "upload_modal.analyzing_picture": "画像を解析中…",
   "upload_modal.apply": "適用",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9d977e9331..7af4dccd86 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -36,7 +36,6 @@
   "admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
   "alert.unexpected.title": "უპს!",
-  "autosuggest_hashtag.per_week": "კვირაში {count}",
   "boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
   "bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
   "bundle_modal_error.close": "დახურვა",
@@ -68,22 +67,16 @@
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
   "compose_form.placeholder": "რაზე ფიქრობ?",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
-  "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
   "compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
-  "compose_form.spoiler_placeholder": "თქვენი გაფრთხილება დაწერეთ აქ",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
-  "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
   "confirmations.delete.confirm": "გაუქმება",
   "confirmations.delete.message": "დარწმუნებული ხართ, გსურთ გააუქმოთ ეს სტატუსი?",
   "confirmations.delete_list.confirm": "გაუქმება",
   "confirmations.delete_list.message": "დარწმუნებული ხართ, გსურთ სამუდამოდ გააუქმოთ ეს სია?",
-  "confirmations.domain_block.confirm": "მთელი დომენის დამალვა",
   "confirmations.domain_block.message": "ნაღდად, ნაღდად, დარწმუნებული ხართ, გსურთ დაბლოკოთ მთელი {domain}? უმეტეს შემთხვევაში რამდენიმე გამიზნული ბლოკი ან გაჩუმება საკმარისი და უკეთესია. კონტენტს ამ დომენიდან ვერ იხილავთ ვერც ერთ ღია თაიმლაინზე ან თქვენს შეტყობინებებში. ამ დომენიდან არსებული მიმდევრები ამოიშლება.",
   "confirmations.mute.confirm": "გაჩუმება",
-  "confirmations.mute.message": "დარწმუნებული ხართ, გსურთ გააჩუმოთ {name}?",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
   "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
@@ -118,7 +111,6 @@
   "follow_request.reject": "უარყოფა",
   "getting_started.heading": "დაწყება",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
   "keyboard_shortcuts.back": "უკან გადასასვლელად",
@@ -165,13 +157,11 @@
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
-  "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
-  "navigation_bar.edit_profile": "შეცვალე პროფილი",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.lists": "სიები",
@@ -211,12 +201,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
-  "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.short": "ჩამოუთვლელი",
   "regeneration_indicator.label": "იტვირთება…",
   "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
@@ -279,7 +264,6 @@
   "upload_button.label": "მედიის დამატება",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
-  "upload_form.undo": "გაუქმება",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "იტვირთება...",
   "video.close": "ვიდეოს დახურვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 08c70a9405..9fdf602992 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,5 +1,8 @@
 {
   "about.contact": "Anermis:",
+  "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
+  "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
+  "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
   "about.rules": "Ilugan n uqeddac",
   "account.account_note_header": "Tazmilt",
   "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
@@ -10,31 +13,42 @@
   "account.block_short": "Sewḥel",
   "account.blocked": "Yettusewḥel",
   "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.cancel_follow_request": "Sefsex taḍfart",
+  "account.copy": "Nɣel assaɣ ɣer umaɣnu",
+  "account.direct": "Bder-d @{name} weḥd-s",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
   "account.domain_blocked": "Taɣult yeffren",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
+  "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
+  "account.following": "Yeṭṭafaṛ",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
+  "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
+  "account.joined_short": "Izeddi da seg ass n",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Timidyatin",
   "account.mention": "Bder-d @{name}",
+  "account.moved_to": "{name} yenna-d dakken amiḍan-is amaynut yuɣal :",
   "account.mute": "Sgugem @{name}",
+  "account.mute_notifications_short": "Susem ilɣa",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
+  "account.no_bio": "Ulac aglam i d-yettunefken.",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
+  "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
@@ -53,8 +67,12 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "autosuggest_hashtag.per_week": "{count} i yimalas",
-  "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
+  "block_modal.show_less": "Ssken-d drus",
+  "block_modal.show_more": "Ssken-d ugar",
+  "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
+  "block_modal.they_cant_see_posts": "Ur zmiren ad walin tisufaɣ-nwen, ur tettwalim tid-nsen.",
+  "block_modal.title": "Sewḥel aseqdac ?",
+  "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
   "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
@@ -64,12 +82,15 @@
   "bundle_modal_error.close": "Mdel",
   "bundle_modal_error.message": "Tella-d kra n tuccḍa mi d-yettali ugbur-agi.",
   "bundle_modal_error.retry": "Ɛreḍ tikelt-nniḍen",
+  "closed_registrations_modal.description": "Asnulfu n umiḍan deg {domain} mačči d ayen izemren ad yili, maca ttxil-k·m, err deg lbal-ik·im belli ur teḥwaǧeḍ ara amiḍan s wudem ibanen ɣef {domain} akken ad tesqedceḍ Mastodon.",
   "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
-  "column.about": "Γef",
+  "closed_registrations_modal.title": "Ajerred deg Masṭudun",
+  "column.about": "Ɣef",
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
-  "column.directory": "Inig deg imaɣnuten",
+  "column.direct": "Tabdarin tusligin",
+  "column.directory": "Inig deg imeɣna",
   "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Imenyafen",
   "column.follow_requests": "Isuturen n teḍfeṛt",
@@ -77,7 +98,7 @@
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
   "column.notifications": "Tilɣa",
-  "column.pins": "Tijewwaqin yettwasenṭḍen",
+  "column.pins": "Tisuffaɣ yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
   "column_back_button.label": "Tuɣalin",
   "column_header.hide_settings": "Ffer iɣewwaṛen",
@@ -88,46 +109,43 @@
   "column_header.unpin": "Kkes asenteḍ",
   "column_subheading.settings": "Iɣewwaṛen",
   "community.column_settings.local_only": "Adigan kan",
-  "community.column_settings.media_only": "Allal n teywalt kan",
+  "community.column_settings.media_only": "Imidyaten kan",
   "community.column_settings.remote_only": "Anmeggag kan",
   "compose.language.change": "Beddel tutlayt",
   "compose.language.search": "Nadi tutlayin …",
+  "compose.published.body": "Yeffeɣ-d yizen-nni.",
   "compose.published.open": "Ldi",
+  "compose.saved.body": "Tettwasekles tsuffeɣt.",
   "compose_form.direct_message_warning_learn_more": "Issin ugar",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.encryption_warning": "",
+  "compose_form.hashtag_warning": "",
   "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
-  "compose_form.poll.add_option": "Rnu afran",
   "compose_form.poll.duration": "Tanzagt n tefrant",
-  "compose_form.poll.option_placeholder": "Afran {number}",
-  "compose_form.poll.remove_option": "Sfeḍ afran-agi",
+  "compose_form.poll.multiple": "Aṭas n ufran",
+  "compose_form.poll.option_placeholder": "Taxtiṛt {number}",
+  "compose_form.poll.single": "Fren yiwen",
+  "compose_form.poll.type": "Aɣanib",
   "compose_form.publish": "Suffeɣ",
-  "compose_form.publish_form": "Suffeɣ",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sekles ibeddilen",
-  "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
-  "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
+  "compose_form.publish_form": "Tasuffeɣt tamaynut",
+  "compose_form.reply": "Err",
+  "compose_form.save_changes": "Leqqem",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
-  "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
   "confirmation_modal.cancel": "Sefsex",
-  "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
-  "confirmations.block.message": "Tebγiḍ s tidet ad tesḥebseḍ {name}?",
   "confirmations.delete.confirm": "Kkes",
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
-  "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
+  "confirmations.domain_block.confirm": "Sewḥel aqeddac",
+  "confirmations.edit.confirm": "Ẓreg",
+  "confirmations.edit.message": "Abeddel tura ad d-yaru izen-nni i d-tegreḍ akka tura. Tetḥeqqeḍ tebɣiḍ ad tkemmleḍ?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
-  "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
-  "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?",
   "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
   "confirmations.reply.confirm": "Err",
   "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
@@ -137,17 +155,28 @@
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
+  "copy_icon_button.copied": "Yettwanɣel ɣer ufus",
   "copypaste.copied": "Yettwanɣel",
+  "copypaste.copy_to_clipboard": "Nɣel ɣer afus",
   "directory.federated": "Deg fedivers yettwasnen",
   "directory.local": "Seg {domain} kan",
   "directory.new_arrivals": "Imaynuten id yewḍen",
   "directory.recently_active": "Yermed xas melmi kan",
-  "disabled_account_banner.account_settings": "Iγewwaṛen n umiḍan",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "disabled_account_banner.account_settings": "Iɣewwaṛen n umiḍan",
+  "dismissable_banner.dismiss": "Agi",
+  "dismissable_banner.explore_links": "D tiqsiḍin n yisallen i yettwabḍan ass-a deg web inmetti. Tiqsiḍin n yisallen timaynutin i d-yettwassufɣen s wugar n medden yemgaraden, d tid i d-yufraren ugar.",
+  "dismissable_banner.explore_statuses": "Ti d tisufaɣ seg uzeṭṭa anmetti i d-yettawin tamyigawt ass-a. Tisufaɣ timaynutin yesεan aṭas n lǧehd d tid iḥemmlen s waṭas, ttwaεlayit d timezwura.",
+  "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
+  "domain_block_modal.block": "Sewḥel aqeddac",
+  "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
+  "domain_pill.server": "Aqeddac",
+  "domain_pill.username": "Isem n useqdac",
+  "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek s wenγal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
+  "emoji_button.clear": "Sfeḍ",
   "emoji_button.custom": "Udmawan",
   "emoji_button.flags": "Innayen",
   "emoji_button.food": "Tegwella & Tissit",
@@ -162,19 +191,19 @@
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
   "empty_column.account_suspended": "Amiḍan yettwaḥbas",
-  "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
+  "empty_column.account_timeline": "Ulac tisuffaɣ da !",
   "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
-  "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
+  "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
-  "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
+  "empty_column.follow_requests": "Ulac ɣur-k·m ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
-  "empty_column.lists": "Ulac ɣur-k kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
-  "empty_column.mutes": "Ulac ɣur-k imseqdacen i yettwasgugmen.",
-  "empty_column.notifications": "Ulac ɣur-k tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+  "empty_column.lists": "Ulac ɣur-k·m kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
+  "empty_column.notifications": "Ulac ɣur-k·m tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
@@ -183,17 +212,27 @@
   "explore.suggested_follows": "Imdanen",
   "explore.title": "Snirem",
   "explore.trending_links": "Isallen",
-  "explore.trending_statuses": "Tisuffiɣin",
+  "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
+  "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
+  "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
+  "filter_modal.select_filter.expired": "yemmut",
   "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
   "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
+  "filter_modal.select_filter.title": "Sizdeg tassufeɣt-a",
+  "filter_modal.title.status": "Sizdeg tassufeɣt",
   "firehose.all": "Akk",
   "firehose.local": "Deg uqeddac-ayi",
+  "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
-  "footer.about": "Γef",
-  "footer.directory": "Akaram n imaγnuten",
+  "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+  "follow_suggestions.view_all": "Wali-ten akk",
+  "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
+  "followed_tags": "Ihacṭagen yettwaḍfaren",
+  "footer.about": "Ɣef",
+  "footer.directory": "Akaram n imeɣna",
   "footer.get_app": "Awi-d asnas",
   "footer.invite": "Ɛreḍ-d kra n yimdanen",
   "footer.keyboard_shortcuts": "Inegzumen n unasiw",
@@ -210,14 +249,30 @@
   "hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} imtekki} other {{counter} n imtekkiyen}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
   "hashtag.follow": "Ḍfeṛ ahacṭag",
-  "home.column_settings.basic": "Igejdanen",
+  "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
+  "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
+  "home.pending_critical_update.link": "Wali ileqman",
   "home.show_announcements": "Ssken-d ulɣuyen",
+  "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
+  "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
+  "interaction_modal.description.reblog": "S umiḍan deg Mastodon, tzemreḍ ad tesnerniḍ tasuffeɣt-a akken ad tt-tebḍuḍ d yineḍfaren-ik·im.",
+  "interaction_modal.description.reply": "S umiḍan deg Mastodon, tzemreḍ ad d-terreḍ ɣef tsuffeɣt-a.",
+  "interaction_modal.login.action": "Awi-yi ɣer uqeddac-iw",
+  "interaction_modal.login.prompt": "Taɣult n uqeddac-ik·im agejdan, amedya mastodon.social",
+  "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
+  "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
+  "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
+  "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
+  "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -230,6 +285,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+  "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
@@ -256,8 +312,9 @@
   "lightbox.close": "Mdel",
   "lightbox.compress": "Ḥemmeẓ tamnaḍt n uskan n tugna",
   "lightbox.expand": "Simeɣer tamnaḍt n uskan n tugna",
-  "lightbox.next": "Γer zdat",
-  "lightbox.previous": "Γer deffir",
+  "lightbox.next": "Ɣer zdat",
+  "lightbox.previous": "Ɣer deffir",
+  "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
   "link_preview.author": "S-ɣur {name}",
   "lists.account.add": "Rnu ɣer tebdart",
   "lists.account.remove": "Kkes seg tebdart",
@@ -273,45 +330,52 @@
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
   "lists.subheading": "Tibdarin-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
-  "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
-  "mute_modal.duration": "Tanzagt",
-  "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
-  "mute_modal.indefinite": "Ur yettwasbadu ara",
-  "navigation_bar.about": "Γef",
-  "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
+  "loading_indicator.label": "Yessalay-d …",
+  "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
+  "mute_modal.hide_options": "Ffer tinefrunin",
+  "mute_modal.show_options": "Sken-d tinefrunin",
+  "mute_modal.title": "Sgugem aseqdac?",
+  "navigation_bar.about": "Ɣef",
+  "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
+  "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
-  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
+  "navigation_bar.followed_tags": "Ihacṭagen yettwaḍfaren",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
   "navigation_bar.lists": "Tibdarin",
   "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
+  "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
   "navigation_bar.personal": "Udmawan",
-  "navigation_bar.pins": "Tijewwiqin yettwasentḍen",
+  "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
   "navigation_bar.preferences": "Imenyafen",
   "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
   "navigation_bar.search": "Nadi",
   "navigation_bar.security": "Taɣellist",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
-  "notification.follow": "{name} yeṭṭafaṛ-ik",
-  "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
+  "notification.follow": "iṭṭafar-ik·em-id {name}",
+  "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
+  "notification.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",
+  "notification_requests.accept": "Qbel",
+  "notification_requests.dismiss": "Agi",
+  "notification_requests.notifications_from": "Ilɣa sɣur {name}",
   "notifications.clear": "Sfeḍ tilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
   "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
-  "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
+  "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
@@ -321,7 +385,8 @@
   "notifications.column_settings.reblog": "Seǧhed:",
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
-  "notifications.column_settings.status": "Tiẓenẓunin timaynutin:",
+  "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
+  "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Seǧhed",
   "notifications.filter.favourites": "Imenyafen",
@@ -333,25 +398,48 @@
   "notifications.group": "{count} n tilɣa",
   "notifications.mark_as_read": "Creḍ meṛṛa iilɣa am wakken ttwaɣran",
   "notifications.permission_denied": "D awezɣi ad yili wermad n yilɣa n tnarit axateṛ turagt tettwagdel.",
+  "notifications.policy.filter_new_accounts.hint": "Imiḍanen imaynuten i d-yennulfan deg {days, plural, one {yiwen n wass} other {# n wussan}} yezrin",
+  "notifications.policy.filter_new_accounts_title": "Imiḍan imaynuten",
+  "notifications.policy.filter_not_followers_hint": "Ula d wid akked tid i k·m-id-iḍefren, ur wwiḍen ara {days, plural, one {yiwen n wass} other {# n wussan}}",
+  "notifications.policy.filter_not_followers_title": "Wid akked tid ur k·m-id-yeṭṭafaren ara",
+  "notifications.policy.filter_not_following_hint": "Alamma tqebleḍ-ten s ufus",
+  "notifications.policy.filter_not_following_title": "Wid akked tid ur tettḍafareḍ ara",
+  "notifications.policy.filter_private_mentions_title": "Abdar uslig ur yettwasferken ara",
+  "notifications.policy.title": "Sizdeg ilɣa sɣur …",
   "notifications_permission_banner.enable": "Rmed talɣutin n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
+  "onboarding.action.back": "Tuɣalin ɣer deffir",
+  "onboarding.actions.back": "Tuɣalin ɣer deffir",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Azul a #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "Ttwassnen deg Mastodon",
+  "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.note": "Tameddurt",
+  "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
+  "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
+  "onboarding.profile.title": "Asbadu n umaɣnu",
+  "onboarding.profile.upload_avatar": "Sali tugna n umaɣnu",
+  "onboarding.profile.upload_header": "Sali tacacit n umaɣnu",
+  "onboarding.share.lead": "Ini-asen i medden amek ara k·m-id-afen deg Mastodon!",
+  "onboarding.share.message": "Nekk d {username} deg #Mastodon! Ḍfer iyi-d sya {url}",
+  "onboarding.share.title": "Bḍu amaɣnu-inek·inem",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.start.title": "Tseggmeḍ-tt !",
+  "onboarding.steps.follow_people.body": "Aḍfer n medden yelhan, d tikti n Mastodon.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.body": "Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin {emoji}",
+  "onboarding.steps.publish_status.title": "Aru tasuffeɣt-inek·inem tamezwarutt",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "picture_in_picture.restore": "Err-it amkan-is",
-  "poll.closed": "Ifukk",
+  "poll.closed": "Tfukk",
   "poll.refresh": "Smiren",
+  "poll.reveal": "Wali igmaḍ",
   "poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
   "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
   "poll.vote": "Dɣeṛ",
@@ -359,13 +447,16 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
-  "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Imeḍfaṛen kan",
+  "privacy.direct.long": "Wid akk i d-yettwabdaren deg tsuffeɣt",
+  "privacy.direct.short": "Imdanen yettwafernen",
+  "privacy.private.long": "Ala wid i k·m-yeṭṭafaṛen",
+  "privacy.private.short": "Imeḍfaren",
+  "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.short": "War tabdert",
+  "privacy.unlisted.long": "Kra kan n ilguritmen",
+  "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
+  "recommended": "Yettuwelleh",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
@@ -380,24 +471,41 @@
   "report.block": "Sewḥel",
   "report.categories.other": "Tiyyaḍ",
   "report.categories.spam": "Aspam",
-  "report.category.title_account": "ameγnu",
+  "report.category.title_account": "ameɣnu",
   "report.category.title_status": "tasuffeɣt",
   "report.close": "Immed",
   "report.forward": "Bren-it ɣeṛ {target}",
   "report.mute": "Sgugem",
+  "report.next": "Uḍfiṛ",
   "report.placeholder": "Iwenniten-nniḍen",
+  "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
+  "report.reasons.other": "D ayen nniḍen",
   "report.reasons.spam": "D aspam",
   "report.submit": "Azen",
   "report.target": "Mmel {target}",
+  "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
   "report.unfollow": "Seḥbes aḍfar n @{name}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.other": "Ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
   "report_notification.open": "Ldi aneqqis",
+  "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
+  "search.quick_action.account_search": "Imaɣnuten mṣadan d {x}",
+  "search.quick_action.go_to_account": "Ddu ɣer umaɣnu {x}",
+  "search.quick_action.go_to_hashtag": "Ddu ɣer uhacṭag {x}",
+  "search.quick_action.open_url": "Ldi tansa URL deg Mastodon",
+  "search.quick_action.status_search": "Tisuffaɣ mṣadan d {x}",
   "search.search_or_paste": "Nadi neɣ senṭeḍ URL",
+  "search_popout.full_text_search_disabled_message": "Ur yelli ara deg {domain}.",
+  "search_popout.language_code": "Tangalt ISO n tutlayt",
+  "search_popout.options": "Iwellihen n unadi",
+  "search_popout.recent": "Inadiyen ineggura",
+  "search_popout.user": "amseqdac",
+  "search_results.accounts": "Imeɣna",
   "search_results.all": "Akk",
   "search_results.hashtags": "Ihacṭagen",
+  "search_results.see_all": "Wali-ten akk",
   "search_results.statuses": "Tisuffaɣ",
   "search_results.title": "Anadi ɣef {q}",
   "server_banner.administered_by": "Yettwadbel sɣur :",
@@ -413,12 +521,13 @@
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
   "status.edit": "Ẓreg",
-  "status.edited": "Tettwaẓreg deg {date}",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Seddu",
+  "status.filter": "Sizdeg tassufeɣt-a",
   "status.filtered": "Yettwasizdeg",
+  "status.hide": "Ffer tasuffeɣt",
   "status.load_more": "Sali ugar",
-  "status.media_hidden": "Taɣwalt tettwaffer",
+  "status.media_hidden": "Amidya yettwaffer",
   "status.mention": "Bder-d @{name}",
   "status.more": "Ugar",
   "status.mute": "Sussem @{name}",
@@ -432,13 +541,15 @@
   "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tɛiwdeḍ tira",
   "status.remove_bookmark": "Kkes tacreḍt",
+  "status.replied_to": "Y·terra-yas i {name}",
   "status.reply": "Err",
   "status.replyAll": "Err i lxiḍ",
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
+  "status.show_filter_reason": "Ssken-d akken yebɣu yili",
   "status.show_less": "Ssken-d drus",
-  "status.show_less_all": "Semẓi akk tisuffγin",
+  "status.show_less_all": "Semẓi akk tisuffɣin",
   "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -457,8 +568,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
-  "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} n wemdan} other {{counter} n medden}} deg {days, plural, one {ass} other {{days} n wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",
@@ -472,17 +583,17 @@
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
   "upload_form.thumbnail": "Beddel tugna",
-  "upload_form.undo": "Kkes",
   "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
   "upload_modal.choose_image": "Fren tugna",
   "upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
   "upload_modal.detect_text": "Sefru-d aḍris seg tugna",
-  "upload_modal.edit_media": "Ẓreg taɣwalt",
+  "upload_modal.edit_media": "Ẓreg amidya",
   "upload_modal.preparing_ocr": "Aheyyi n OCR…",
   "upload_modal.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
+  "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
   "video.close": "Mdel tabidyutt",
   "video.download": "Sidered afaylu",
   "video.exit_fullscreen": "Ffeɣ seg ugdil ačuran",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 97b1991803..bd0a806cdb 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -64,7 +64,6 @@
   "alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
   "alert.unexpected.title": "Өй!",
   "announcement.announcement": "Хабарландыру",
-  "autosuggest_hashtag.per_week": "{count} аптасына",
   "boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
   "bundle_column_error.retry": "Қайтадан көріңіз",
   "bundle_modal_error.close": "Жабу",
@@ -99,34 +98,22 @@
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
   "compose_form.placeholder": "Не бөліскіңіз келеді?",
-  "compose_form.poll.add_option": "Жауап қос",
   "compose_form.poll.duration": "Сауалнама мерзімі",
-  "compose_form.poll.option_placeholder": "Жауап {number}",
-  "compose_form.poll.remove_option": "Бұл жауапты өшір",
   "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
   "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
-  "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
-  "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
-  "compose_form.spoiler_placeholder": "Ескертуіңізді осында жазыңыз",
   "confirmation_modal.cancel": "Қайтып алу",
-  "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
-  "confirmations.block.message": "{name} атты қолданушыны бұғаттайтыныңызға сенімдісіз бе?",
   "confirmations.delete.confirm": "Өшіру",
   "confirmations.delete.message": "Бұл жазбаны өшіресіз бе?",
   "confirmations.delete_list.confirm": "Өшіру",
   "confirmations.delete_list.message": "Бұл тізімді жоясыз ба шынымен?",
-  "confirmations.domain_block.confirm": "Бұл доменді бұғатта",
   "confirmations.domain_block.message": "Бұл домендегі {domain} жазбаларды шынымен бұғаттайсыз ба? Кейде үнсіз қылып тастау да жеткілікті.",
   "confirmations.logout.confirm": "Шығу",
   "confirmations.logout.message": "Шығатыныңызға сенімдісіз бе?",
   "confirmations.mute.confirm": "Үнсіз қылу",
-  "confirmations.mute.explanation": "Олардың посттары же олар туралы меншндар сізге көрінбейді, бірақ олар сіздің посттарды көре алады және жазыла алады.",
-  "confirmations.mute.message": "{name} атты қолданушы үнсіз болсын ба?",
   "confirmations.redraft.confirm": "Өшіруді құптау",
   "confirmations.reply.confirm": "Жауап",
   "confirmations.reply.message": "Жауабыңыз жазып жатқан жазбаңыздың үстіне кетеді. Жалғастырамыз ба?",
@@ -189,7 +176,6 @@
   "hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
   "hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
   "hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
-  "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
   "home.hide_announcements": "Анонстарды жасыр",
@@ -243,14 +229,12 @@
   "lists.subheading": "Тізімдеріңіз",
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
   "media_gallery.toggle_visible": "Көрінуді қосу",
-  "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
   "navigation_bar.compose": "Жаңа жазба бастау",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
-  "navigation_bar.edit_profile": "Профиль түзету",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
   "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
@@ -272,8 +256,6 @@
   "notifications.clear": "Ескертпелерді тазарт",
   "notifications.clear_confirmation": "Шынымен барлық ескертпелерді өшіресіз бе?",
   "notifications.column_settings.alert": "Үстел ескертпелері",
-  "notifications.column_settings.filter_bar.advanced": "Барлық категорияны көрсет",
-  "notifications.column_settings.filter_bar.category": "Жедел сүзгі",
   "notifications.column_settings.follow": "Жаңа оқырмандар:",
   "notifications.column_settings.follow_request": "Жазылуға жаңа сұранымдар:",
   "notifications.column_settings.mention": "Аталымдар:",
@@ -311,12 +293,7 @@
   "poll_button.add_poll": "Сауалнама қосу",
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
-  "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.short": "Тізімсіз",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",
   "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
@@ -399,7 +376,6 @@
   "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
   "upload_form.edit": "Түзету",
   "upload_form.thumbnail": "Суретті өзгерту",
-  "upload_form.undo": "Өшіру",
   "upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
   "upload_modal.analyzing_picture": "Суретті анализ жасау…",
   "upload_modal.apply": "Қолдану",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 473690070f..ceb0f8b9b6 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -31,7 +31,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -91,10 +90,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 264781baa3..52ce9455a9 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -68,7 +68,7 @@
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
-  "account.unfollow": "팔로우 해제",
+  "account.unfollow": "언팔로우",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications_short": "알림 뮤트 해제",
   "account.unmute_short": "뮤트 해제",
@@ -89,7 +89,14 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
-  "autosuggest_hashtag.per_week": "주간 {count}회",
+  "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.",
+  "block_modal.show_less": "간략히 보기",
+  "block_modal.show_more": "더 보기",
+  "block_modal.they_cant_mention": "나를 멘션하거나 팔로우 할 수 없습니다.",
+  "block_modal.they_cant_see_posts": "내가 작성한 게시물을 볼 수 없고 나도 그가 작성한 게시물을 보지 않게 됩니다.",
+  "block_modal.they_will_know": "자신이 차단 당했다는 사실을 확인할 수 있습니다.",
+  "block_modal.title": "사용자를 차단할까요?",
+  "block_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않습니다.",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "이 계정은 {locked}상태가 아닙니다. 누구나 이 계정을 팔로우 하여 팔로워 전용의 게시물을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
-  "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
-  "compose_form.poll.option_placeholder": "{number}번 항목",
-  "compose_form.poll.remove_option": "이 항목 삭제",
+  "compose_form.poll.multiple": "다중 선택",
+  "compose_form.poll.option_placeholder": "{option}번째 항목",
+  "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
+  "compose_form.poll.type": "형식",
   "compose_form.publish": "게시",
   "compose_form.publish_form": "새 게시물",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "변경사항 저장",
-  "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
-  "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
-  "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
+  "compose_form.reply": "답장",
+  "compose_form.save_changes": "수정",
   "compose_form.spoiler.marked": "열람주의 제거",
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
-  "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
+  "compose_form.spoiler_placeholder": "내용 경고 (선택사항)",
   "confirmation_modal.cancel": "취소",
-  "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
-  "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
   "confirmations.cancel_follow_request.confirm": "요청 삭제",
   "confirmations.cancel_follow_request.message": "정말 {name}님에 대한 팔로우 요청을 취소하시겠습니까?",
   "confirmations.delete.confirm": "삭제",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "정말로 이 리스트를 영구적으로 삭제하시겠습니까?",
   "confirmations.discard_edit_media.confirm": "저장 안함",
   "confirmations.discard_edit_media.message": "미디어 설명이나 미리보기에 대한 저장하지 않은 변경사항이 있습니다. 버리시겠습니까?",
-  "confirmations.domain_block.confirm": "도메인 전체를 차단",
+  "confirmations.domain_block.confirm": "서버 차단",
   "confirmations.domain_block.message": "정말로 {domain} 전체를 차단하시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다. 모든 공개 타임라인과 알림에서 해당 도메인에서 작성된 콘텐츠를 보지 못합니다. 해당 도메인에 속한 팔로워와의 관계가 사라집니다.",
   "confirmations.edit.confirm": "수정",
   "confirmations.edit.message": "지금 편집하면 작성 중인 메시지를 덮어씁니다. 진행이 확실한가요?",
   "confirmations.logout.confirm": "로그아웃",
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.mute.confirm": "뮤트",
-  "confirmations.mute.explanation": "이 동작은 해당 계정의 게시물과 해당 계정을 멘션하는 게시물을 숨깁니다, 하지만 여전히 해당 계정이 당신의 게시물을 보고 팔로우 할 수 있습니다.",
-  "confirmations.mute.message": "정말로 {name} 님을 뮤트하시겠습니까?",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.reply.confirm": "답글",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "이 게시물들은 오늘 소셜 웹에서 호응을 얻고 있는 게시물들입니다. 부스트와 관심을 받는 새로운 글들이 높은 순위가 됩니다.",
   "dismissable_banner.explore_tags": "이 해시태그들은 이 서버와 분산화된 네트워크의 다른 서버에서 사람들의 인기를 끌고 있는 것들입니다.",
   "dismissable_banner.public_timeline": "이것들은 {domain}에 있는 사람들이 팔로우한 사람들의 최신 공개 게시물들입니다.",
+  "domain_block_modal.block": "서버 차단",
+  "domain_block_modal.block_account_instead": "대신 @{name}를 차단",
+  "domain_block_modal.they_can_interact_with_old_posts": "이 서버에 있는 사람들이 내 예전 게시물에 상호작용할 수는 있습니다.",
+  "domain_block_modal.they_cant_follow": "이 서버의 누구도 나를 팔로우 할 수 없습니다.",
+  "domain_block_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "domain_block_modal.title": "도메인을 차단할까요?",
+  "domain_block_modal.you_will_lose_followers": "이 서버에 있는 팔로워들이 모두 제거될 것입니다.",
+  "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
+  "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
+  "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
+  "domain_pill.server": "서버",
+  "domain_pill.their_handle": "이 사람의 핸들:",
+  "domain_pill.their_server": "그의 게시물이 살고 있는 디지털 거처입니다.",
+  "domain_pill.their_username": "그의 서버에서 유일한 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
+  "domain_pill.username": "사용자명",
+  "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
+  "domain_pill.who_they_are": "핸들은 어디에 있는 누구인지를 나타내기 때문에 <button>액티비티펍을 사용하는 플랫폼</button>들의 소셜 웹을 넘나들며 사람들과 상호작용 할 수 있습니다.",
+  "domain_pill.who_you_are": "내 핸들은 내가 어디에 있는 누군지 나타내기 때문에 사람들은 <button>액티비티펍</button>을 통해 소셜 웹을 넘나들며 나와 상호작용 할 수 있습니다.",
+  "domain_pill.your_handle": "내 핸들:",
+  "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
+  "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -215,7 +237,7 @@
   "emoji_button.custom": "사용자 지정",
   "emoji_button.flags": "깃발",
   "emoji_button.food": "음식과 마실것",
-  "emoji_button.label": "에모지를 추가",
+  "emoji_button.label": "에모지 추가",
   "emoji_button.nature": "자연",
   "emoji_button.not_found": "해당하는 에모지가 없습니다",
   "emoji_button.objects": "물건",
@@ -244,6 +266,7 @@
   "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
+  "empty_column.notification_requests": "깔끔합니다! 여기엔 아무 것도 없습니다. 알림을 받게 되면 설정에 따라 여기에 나타나게 됩니다.",
   "empty_column.notifications": "아직 알림이 없습니다. 다른 사람들이 당신에게 반응했을 때, 여기에서 볼 수 있습니다.",
   "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 사용자를 팔로우 해서 채워보세요",
   "error.unexpected_crash.explanation": "버그 혹은 브라우저 호환성 문제로 이 페이지를 올바르게 표시할 수 없습니다.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
+  "filtered_notifications_banner.mentions": "{count, plural, other {멘션}}",
+  "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터의 알림",
+  "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
   "firehose.local": "이 서버",
   "firehose.remote": "다른 서버",
-  "follow_request.authorize": "허가",
+  "follow_request.authorize": "승인",
   "follow_request.reject": "거부",
   "follow_requests.unlocked_explanation": "귀하의 계정이 잠긴 계정이 아닐지라도, {domain} 스태프는 이 계정들의 팔로우 요청을 수동으로 처리해 주시면 좋겠다고 생각했습니다.",
+  "follow_suggestions.curated_suggestion": "스태프의 추천",
+  "follow_suggestions.dismiss": "다시 보지 않기",
+  "follow_suggestions.featured_longer": "{domain} 팀이 손수 고름",
+  "follow_suggestions.friends_of_friends_longer": "내가 팔로우 하는 사람들 사이에서 인기",
+  "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
+  "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
+  "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
+  "follow_suggestions.hints.most_interactions": "이 프로필은 최근 {domain}에서 많은 관심을 받았습니다.",
+  "follow_suggestions.hints.similar_to_recently_followed": "이 프로필은 내가 최근에 팔로우 한 프로필들과 유사합니다.",
+  "follow_suggestions.personalized_suggestion": "개인화된 추천",
+  "follow_suggestions.popular_suggestion": "인기있는 추천",
+  "follow_suggestions.popular_suggestion_longer": "{domain}에서 인기",
+  "follow_suggestions.similar_to_recently_followed_longer": "내가 최근에 팔로우 한 프로필들과 유사",
+  "follow_suggestions.view_all": "모두 보기",
+  "follow_suggestions.who_to_follow": "팔로우할 만한 사람",
   "followed_tags": "팔로우 중인 해시태그",
   "footer.about": "정보",
   "footer.directory": "프로필 책자",
@@ -306,13 +347,8 @@
   "hashtag.follow": "팔로우",
   "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
-  "home.actions.go_to_explore": "무엇이 유행인지 보기",
-  "home.actions.go_to_suggestions": "팔로우할 사람 찾기",
-  "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
-  "home.explore_prompt.body": "홈 피드에는 내가 팔로우한 해시태그 그리고 팔로우한 사람과 부스트가 함께 나타납니다. 너무 고요하게 느껴진다면, 다음 것들을 살펴볼 수 있습니다.",
-  "home.explore_prompt.title": "이곳은 마스토돈의 내 본거지입니다.",
   "home.hide_announcements": "공지사항 숨기기",
   "home.pending_critical_update.body": "서둘러 마스토돈 서버를 업데이트 하세요!",
   "home.pending_critical_update.link": "업데이트 보기",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "불러오는 중...",
   "media_gallery.toggle_visible": "이미지 숨기기",
   "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
-  "mute_modal.duration": "기간",
-  "mute_modal.hide_notifications": "이 사용자로부터의 알림을 숨기시겠습니까?",
-  "mute_modal.indefinite": "무기한",
+  "mute_modal.hide_from_notifications": "알림에서 숨기기",
+  "mute_modal.hide_options": "옵션 숨기기",
+  "mute_modal.indefinite": "내가 뮤트를 해제하기 전까지",
+  "mute_modal.show_options": "옵션 표시",
+  "mute_modal.they_can_mention_and_follow": "나를 멘션하거나 팔로우 할 수 있습니다, 다만 나에게 안 보일 것입니다.",
+  "mute_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
+  "mute_modal.title": "사용자를 뮤트할까요?",
+  "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
+  "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "개인적인 멘션",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.edit_profile": "프로필 수정",
   "navigation_bar.explore": "둘러보기",
   "navigation_bar.favourites": "좋아요",
   "navigation_bar.filters": "뮤트한 단어",
@@ -432,20 +473,37 @@
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
   "notification.mention": "{name} 님의 멘션",
+  "notification.moderation-warning.learn_more": "더 알아보기",
+  "notification.moderation_warning": "중재 경고를 받았습니다",
+  "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
+  "notification.moderation_warning.action_disable": "계정이 비활성화되었습니다.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "게시물 몇 개가 민감함 처리되었습니다.",
+  "notification.moderation_warning.action_none": "계정에 중재 경고를 받았습니다.",
+  "notification.moderation_warning.action_sensitive": "앞으로의 게시물을 민감한 것으로 표시됩니다.",
+  "notification.moderation_warning.action_silence": "계정이 제한되었습니다.",
+  "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 설문이 종료됨",
   "notification.reblog": "{name} 님이 부스트했습니다",
+  "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
+  "notification.relationships_severance_event.account_suspension": "{from}의 관리자가 {target}를 정지시켰기 때문에 그들과 더이상 상호작용 할 수 없고 정보를 받아볼 수 없습니다.",
+  "notification.relationships_severance_event.domain_block": "{from}의 관리자가 {target}를 차단하였고 여기에는 나의 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 포함되었습니다.",
+  "notification.relationships_severance_event.learn_more": "더 알아보기",
+  "notification.relationships_severance_event.user_domain_block": "내가 {target}를 차단하여 {followersCount} 명의 팔로워와 {followingCount, plural, other {#}} 명의 팔로우가 제거되었습니다.",
   "notification.status": "{name} 님이 방금 게시물을 올렸습니다",
   "notification.update": "{name} 님이 게시물을 수정했습니다",
+  "notification_requests.accept": "수락",
+  "notification_requests.dismiss": "지우기",
+  "notification_requests.notifications_from": "{name} 님으로부터의 알림",
+  "notification_requests.title": "걸러진 알림",
   "notifications.clear": "알림 비우기",
   "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
   "notifications.column_settings.favourite": "좋아요:",
-  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시하기",
+  "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
   "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
-  "notifications.column_settings.filter_bar.show_bar": "필터 막대 보이기",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
   "notifications.column_settings.mention": "멘션:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "권한이 거부되었기 때문에 데스크탑 알림을 활성화할 수 없음",
   "notifications.permission_denied_alert": "이전에 브라우저 권한이 거부되었기 때문에, 데스크탑 알림이 활성화 될 수 없습니다.",
   "notifications.permission_required": "필요한 권한이 승인되지 않아 데스크탑 알림을 사용할 수 없습니다.",
+  "notifications.policy.filter_new_accounts.hint": "{days, plural, one {하루} other {#일}} 안에 만들어진",
+  "notifications.policy.filter_new_accounts_title": "새 계정",
+  "notifications.policy.filter_not_followers_hint": "나를 팔로우 한 지 {days, plural, other {# 일}}이 되지 않은 사람들을 포함",
+  "notifications.policy.filter_not_followers_title": "나를 팔로우하지 않는 사람들",
+  "notifications.policy.filter_not_following_hint": "내가 수동으로 승인하지 않는 한",
+  "notifications.policy.filter_not_following_title": "내가 팔로우하지 않는 사람들",
+  "notifications.policy.filter_private_mentions_hint": "내가 한 멘션에 단 답글이거나 내가 발신자를 팔로우 한 것이 아닌 이상 걸러집니다",
+  "notifications.policy.filter_private_mentions_title": "청하지 않은 개인적인 멘션",
+  "notifications.policy.title": "알림을 제외할 조건들…",
   "notifications_permission_banner.enable": "데스크탑 알림 활성화",
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
@@ -479,7 +546,7 @@
   "onboarding.actions.go_to_explore": "무엇이 유행인지 보러 가기",
   "onboarding.actions.go_to_home": "홈 피드로 가기",
   "onboarding.compose.template": "안녕 #마스토돈!",
-  "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 발견하기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
+  "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 둘러보기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
   "onboarding.follows.lead": "홈 피드는 마스토돈을 경험하는 주된 경로입니다. 더 많은 사람들을 팔로우 할수록 더 활발하고 흥미로워질 것입니다. 여기 시작을 위한 몇몇 추천을 드립니다:",
   "onboarding.follows.title": "내게 맞는 홈 피드 꾸미기",
   "onboarding.profile.discoverable": "내 프로필을 발견 가능하도록 설정",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "설문 추가",
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
-  "privacy.direct.long": "언급된 사용자만 볼 수 있음",
-  "privacy.direct.short": "멘션한 사람들만",
-  "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "모두가 볼 수 있음",
+  "privacy.direct.long": "이 게시물에서 언급된 모두",
+  "privacy.direct.short": "특정 인물",
+  "privacy.private.long": "내 팔로워만",
+  "privacy.private.short": "팔로워",
+  "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
-  "privacy.unlisted.short": "미등재",
+  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
+  "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
   "recommended": "추천함",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
+  "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
   "reply_indicator.cancel": "취소",
+  "reply_indicator.poll": "투표",
   "report.block": "차단",
   "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
   "report.categories.legal": "법적인 문제",
@@ -644,10 +714,11 @@
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
   "status.edit": "수정",
-  "status.edited": "{date}에 수정함",
+  "status.edited": "{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count}번 수정됨",
   "status.embed": "임베드",
   "status.favourite": "좋아요",
+  "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
   "status.filtered": "필터로 걸러짐",
   "status.hide": "게시물 숨기기",
@@ -668,6 +739,7 @@
   "status.reblog": "부스트",
   "status.reblog_private": "원래의 수신자들에게 부스트",
   "status.reblogged_by": "{name} 님이 부스트했습니다",
+  "status.reblogs": "{count, plural, other {부스트}}",
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
   "status.redraft": "지우고 다시 쓰기",
   "status.remove_bookmark": "북마크 삭제",
@@ -683,7 +755,7 @@
   "status.show_more": "펼치기",
   "status.show_more_all": "모두 펼치기",
   "status.show_original": "원본 보기",
-  "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부} other {{attachmentCount}개 첨부}}하여 게시",
+  "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
   "status.translate": "번역",
   "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
   "status.uncached_media_warning": "마리보기 허용되지 않음",
@@ -715,10 +787,8 @@
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
-  "upload_form.description_missing": "설명이 추가되지 않음",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
   "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 7d8603cae1..c78861b60c 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "Daxuyanî",
   "attachments_list.unprocessed": "(bêpêvajo)",
   "audio.hide": "Dengê veşêre",
-  "autosuggest_hashtag.per_week": "Her hefte {count}",
   "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
   "bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
   "bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
@@ -129,26 +128,14 @@
   "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
   "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
-  "compose_form.poll.remove_option": "Vê hilbijarê rake",
   "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
   "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
-  "compose_form.publish": "Biweşîne",
   "compose_form.publish_form": "Biweşîne",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guhertinan tomar bike",
-  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
-  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
   "confirmation_modal.cancel": "Dev jê berde",
-  "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
-  "confirmations.block.message": "Ma tu dixwazî ku {name} asteng bikî?",
   "confirmations.cancel_follow_request.confirm": "Daxwazê vekişîne",
   "confirmations.cancel_follow_request.message": "Tu dixwazî ​​daxwaza xwe ya şopandina {name} vekşînî?",
   "confirmations.delete.confirm": "Jê bibe",
@@ -157,14 +144,11 @@
   "confirmations.delete_list.message": "Tu ji dil dixwazî vê lîsteyê bi awayekî mayînde jê bibî?",
   "confirmations.discard_edit_media.confirm": "Biavêje",
   "confirmations.discard_edit_media.message": "Guhertinên neqedandî di danasîna an pêşdîtina medyayê de hene, wan bi her awayî bavêje?",
-  "confirmations.domain_block.confirm": "Tevahiya navperê asteng bike",
   "confirmations.domain_block.message": "Tu pê bawerî ku tu dixwazî tevahiya {domain} asteng bikî? Di gelek rewşan de astengkirin an jî bêdengkirin têrê dike û tê hilbijartin. Tu nikarî naveroka vê navperê di demnameyê an jî agahdariyên xwe de bibînî. Şopînerên te yê di vê navperê wê werin jêbirin.",
   "confirmations.edit.confirm": "Serrast bike",
   "confirmations.logout.confirm": "Derkeve",
   "confirmations.logout.message": "Ma tu dixwazî ku derkevî?",
   "confirmations.mute.confirm": "Bêdeng bike",
-  "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
-  "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
   "confirmations.reply.confirm": "Bersivê bide",
   "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
@@ -269,7 +253,6 @@
   "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
   "hashtag.follow": "Hashtagê bişopîne",
   "hashtag.unfollow": "Hashtagê neşopîne",
-  "home.column_settings.basic": "Bingehîn",
   "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
   "home.column_settings.show_replies": "Bersivan nîşan bide",
   "home.hide_announcements": "Reklaman veşêre",
@@ -340,9 +323,6 @@
   "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
   "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
   "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
-  "mute_modal.duration": "Dem",
-  "mute_modal.hide_notifications": "Agahdariyan ji ev bikarhêner veşêre?",
-  "mute_modal.indefinite": "Nediyar",
   "navigation_bar.about": "Derbar",
   "navigation_bar.blocks": "Bikarhênerên astengkirî",
   "navigation_bar.bookmarks": "Şûnpel",
@@ -351,7 +331,6 @@
   "navigation_bar.direct": "Qalkirinên taybet",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.edit_profile": "Profîlê serrast bike",
   "navigation_bar.explore": "Vekole",
   "navigation_bar.filters": "Peyvên bêdengkirî",
   "navigation_bar.follow_requests": "Daxwazên şopandinê",
@@ -382,9 +361,6 @@
   "notifications.column_settings.admin.report": "Ragihandinên nû:",
   "notifications.column_settings.admin.sign_up": "Tomarkirinên nû:",
   "notifications.column_settings.alert": "Agahdariyên sermaseyê",
-  "notifications.column_settings.filter_bar.advanced": "Hemû beşan nîşan bide",
-  "notifications.column_settings.filter_bar.category": "Şivika parzûna bilêz",
-  "notifications.column_settings.filter_bar.show_bar": "Darika parzûnê nîşan bide",
   "notifications.column_settings.follow": "Şopînerên nû:",
   "notifications.column_settings.follow_request": "Daxwazên şopandinê nû:",
   "notifications.column_settings.mention": "Qalkirin:",
@@ -437,14 +413,7 @@
   "poll_button.add_poll": "Rapirsîyek zêde bike",
   "poll_button.remove_poll": "Rapirsî yê rake",
   "privacy.change": "Nepênîtiya şandiyan biguherîne",
-  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Tenê kesên qalkirî",
-  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
-  "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo hemûyan xuyabar e",
   "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
-  "privacy.unlisted.short": "Nelîstekirî",
   "privacy_policy.last_updated": "Rojanekirina dawî {date}",
   "privacy_policy.title": "Politîka taybetiyê",
   "refresh": "Nû bike",
@@ -541,7 +510,6 @@
   "status.direct": "Bi taybetî qale @{name} bike",
   "status.direct_indicator": "Qalkirinê taybet",
   "status.edit": "Serrast bike",
-  "status.edited": "Di {date} de hate serrastkirin",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
@@ -608,10 +576,8 @@
   "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
   "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
   "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
-  "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
   "upload_form.edit": "Serrast bike",
   "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "upload_form.undo": "Jê bibe",
   "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
   "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
   "upload_modal.apply": "Bisepîne",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f384fe125..794cbd9ede 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -45,7 +45,6 @@
   "alert.unexpected.message": "Gwall anwaytyadow re dharva.",
   "alert.unexpected.title": "Oups!",
   "announcement.announcement": "Deklaryans",
-  "autosuggest_hashtag.per_week": "{count} an seythen",
   "boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
   "bundle_column_error.retry": "Assayewgh arta",
   "bundle_modal_error.close": "Degea",
@@ -80,35 +79,22 @@
   "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
   "compose_form.lock_disclaimer.lock": "Alhwedhys",
   "compose_form.placeholder": "Pyth eus yn agas brys?",
-  "compose_form.poll.add_option": "Keworra dewis",
   "compose_form.poll.duration": "Duryans sondyans",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Dilea'n dewis ma",
   "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
   "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
-  "compose_form.spoiler_placeholder": "Skrifewgh agas gwarnyans omma",
   "confirmation_modal.cancel": "Hedhi",
-  "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
-  "confirmations.block.message": "Owgh hwi sur a vynnes lettya {name}?",
   "confirmations.delete.confirm": "Dilea",
   "confirmations.delete.message": "Owgh hwi sur a vynnes dilea'n post ma?",
   "confirmations.delete_list.confirm": "Dilea",
   "confirmations.delete_list.message": "Owgh hwi sur a vynnes dilea'n rol ma yn fast?",
-  "confirmations.domain_block.confirm": "Lettya gorfarth dhien",
   "confirmations.domain_block.message": "Owgh hwi wir, wir sur a vynnes lettya'n {domain} dhien? Y'n brassa rann a gasow, boghes lettyansow medrys po tawheansow yw lowr ha gwell. Ny wrewgh hwi gweles dalgh a'n worfarth na yn py amserlin boblek pynag po yn agas gwarnyansow. Agas holyoryon an worfarth na a vydh diles.",
   "confirmations.logout.confirm": "Digelmi",
   "confirmations.logout.message": "Owgh hwi sur a vynnes digelmi?",
   "confirmations.mute.confirm": "Tawhe",
-  "confirmations.mute.explanation": "Hemm a wra kudha postow anedha ha postow orth aga meneges, mes hwath aga gasa dhe weles agas postow ha'gas holya.",
-  "confirmations.mute.message": "Owgh hwi sur a vynnes tawhe {name}?",
   "confirmations.redraft.confirm": "Dilea & daskynskrifa",
   "confirmations.reply.confirm": "Gorthebi",
   "confirmations.reply.message": "Gorthebi lemmyn a wra ughskrifa'n messach esowgh hwi orth y skrifa lemmyn. Owgh hwi sur a vynnes pesya?",
@@ -175,7 +161,6 @@
   "hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
   "hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
   "hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
-  "home.column_settings.basic": "Selyek",
   "home.column_settings.show_reblogs": "Diskwedhes kenerthow",
   "home.column_settings.show_replies": "Diskwedhes gorthebow",
   "home.hide_announcements": "Kudha deklaryansow",
@@ -235,16 +220,12 @@
   "lists.subheading": "Agas rolyow",
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
   "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
-  "mute_modal.duration": "Duryans",
-  "mute_modal.hide_notifications": "Kudha gwarnyansow a'n devnydhyer ma?",
-  "mute_modal.indefinite": "Andhevri",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
   "navigation_bar.compose": "Komposya post nowydh",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
-  "navigation_bar.edit_profile": "Golegi profil",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
   "navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
@@ -267,8 +248,6 @@
   "notifications.clear": "Dilea gwarnyansow",
   "notifications.clear_confirmation": "Owgh hwi sur a vynnes dilea agas gwarnyansow oll yn fast?",
   "notifications.column_settings.alert": "Gwarnyansow pennskrin",
-  "notifications.column_settings.filter_bar.advanced": "Displetya rummow oll",
-  "notifications.column_settings.filter_bar.category": "Barr sidhla skav",
   "notifications.column_settings.follow": "Holyoryon nowydh:",
   "notifications.column_settings.follow_request": "Govynnow holya nowydh:",
   "notifications.column_settings.mention": "Menegow:",
@@ -316,12 +295,7 @@
   "poll_button.add_poll": "Keworra sondyans",
   "poll_button.remove_poll": "Dilea sondyans",
   "privacy.change": "Chanjya privetter an post",
-  "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.short": "Anrelys",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",
   "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
@@ -407,7 +381,6 @@
   "upload_form.description": "Deskrifewgh rag tus dhallek",
   "upload_form.edit": "Golegi",
   "upload_form.thumbnail": "Chanjya avenik",
-  "upload_form.undo": "Dilea",
   "upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
   "upload_modal.analyzing_picture": "Ow tytratya skeusen…",
   "upload_modal.apply": "Gweytha",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 3e5747ba8b..48b2334008 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -34,16 +34,13 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "Barrire",
   "compose_form.publish_form": "Barrire",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.block.confirm": "Impedire",
   "confirmations.delete.confirm": "Oblitterare",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Oblitterare",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.mute.confirm": "Confutare",
   "confirmations.reply.confirm": "Respondere",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -116,9 +113,6 @@
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Coram publico",
   "privacy.public.short": "Coram publico",
   "relative_time.full.just_now": "nunc",
   "relative_time.just_now": "nunc",
@@ -144,7 +138,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "Oblitterare",
   "status.edit": "Recolere",
-  "status.edited": "Recultum {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Expand this status",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -153,7 +146,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
-  "upload_form.undo": "Oblitterare",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2a911483de..533f074004 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -4,16 +4,16 @@
   "about.disclaimer": "Mastodon es un programario libero, kon kodiche avierto i una marka komersiala de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razon no desponivle",
   "about.domain_blocks.preamble": "Mastodon djeneralmente te permete ver kontenido de i enteraktuar kon utilizadores de kualseker otro sirvidor en el fediverso. Estas son las eksepsiones en este sirvidor en partikolar.",
-  "about.domain_blocks.silenced.explanation": "\"Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
+  "about.domain_blocks.silenced.explanation": "Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
   "about.domain_blocks.silenced.title": "Limitado",
-  "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor sera prosesado, magazinado o enterkambiado kon este sirvidor. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
+  "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor seran prosesados, magazinados o enterkambiados. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
   "about.domain_blocks.suspended.title": "Suspendido",
   "about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
   "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
   "about.rules": "Reglas del sirvidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adjusta a o kita de listas",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Otomatizado",
   "account.badges.group": "Grupo",
   "account.block": "Bloka @{name}",
   "account.block_domain": "Bloka el domeno {domain}",
@@ -23,13 +23,13 @@
   "account.cancel_follow_request": "Anula solisitud de segir",
   "account.copy": "Kopia atadijo de profil",
   "account.direct": "Enmenta a @{name} en privado",
-  "account.disable_notifications": "No me avizes mas sovre publikasyones de @{name}",
+  "account.disable_notifications": "Desha de avizarme sovre publikasyones de @{name}",
   "account.domain_blocked": "Domeno blokado",
   "account.edit_profile": "Edita profil",
   "account.enable_notifications": "Avizame kuando @{name} publike",
   "account.endorse": "Avalia en profil",
   "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
-  "account.featured_tags.last_status_never": "\"No ay publikasyones",
+  "account.featured_tags.last_status_never": "No ay publikasyones",
   "account.featured_tags.title": "Etiketas avaliadas de {name}",
   "account.follow": "Sige",
   "account.follow_back": "Sige tamyen",
@@ -38,19 +38,19 @@
   "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
   "account.following": "Sigiendo",
   "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
-  "account.follows.empty": "Este utilizador ainda no sige a ningun.",
+  "account.follows.empty": "Este utilizador ainda no sige a dingun.",
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
   "account.in_memoriam": "De bendicha memoria.",
   "account.joined_short": "Adjunto",
-  "account.languages": "Troka linguas suskrividas",
+  "account.languages": "Troka linguas abonadas",
   "account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
   "account.locked_info": "El estado de privasita de este konto esta konfigurado komo serado. El proprietario reviza manualmente kien le puede segir.",
   "account.media": "Multimedia",
   "account.mention": "Enmenta a @{name}",
   "account.moved_to": "{name} tiene endikado ke su muevo kuento agora es:",
   "account.mute": "Silensia a @{name}",
-  "account.mute_notifications_short": "Silensia avizos de @{name}",
+  "account.mute_notifications_short": "Silensia avizos",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
   "account.mutual": "Mutual",
@@ -64,7 +64,7 @@
   "account.share": "Partaja el profil de @{name}",
   "account.show_reblogs": "Amostra repartajasyones de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
-  "account.unblock": "Dezbloka @{name}",
+  "account.unblock": "Dezbloka a @{name}",
   "account.unblock_domain": "Dezbloka domeno {domain}",
   "account.unblock_short": "Dezbloka",
   "account.unendorse": "No avalia en profil",
@@ -79,8 +79,8 @@
   "admin.dashboard.retention.cohort": "Mez de enrejistrasyon",
   "admin.dashboard.retention.cohort_size": "Muevos utilizadores",
   "admin.impact_report.instance_accounts": "Profiles de kuentos esto efasaria",
-  "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores perderian",
-  "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores perderian",
+  "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores pedrerian",
+  "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores pedrerian",
   "admin.impact_report.title": "Rezumen de impakto",
   "alert.rate_limited.message": "Por favor aprova dempues de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Trafiko limitado",
@@ -88,8 +88,13 @@
   "alert.unexpected.title": "Atyo!",
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
-  "audio.hide": "Eskonder audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "audio.hide": "Eskonde audio",
+  "block_modal.show_less": "Amostra manko",
+  "block_modal.show_more": "Amostra mas",
+  "block_modal.they_cant_mention": "No te puede enmentar ni segir.",
+  "block_modal.they_will_know": "Puede ver ke esta blokado.",
+  "block_modal.title": "Bloka utilizador?",
+  "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -111,7 +116,7 @@
   "column.about": "Sovre mozotros",
   "column.blocks": "Utilizadores blokados",
   "column.bookmarks": "Markadores",
-  "column.community": "Linya de tiempo lokala",
+  "column.community": "Linya lokala",
   "column.direct": "Enmentaduras privadas",
   "column.directory": "Eksplora profiles",
   "column.domain_blocks": "Domenos blokados",
@@ -123,7 +128,7 @@
   "column.mutes": "Utilizadores silensiados",
   "column.notifications": "Avizos",
   "column.pins": "Publikasyones fiksadas",
-  "column.public": "Linya de tiempo federada",
+  "column.public": "Linya federada",
   "column_back_button.label": "Atras",
   "column_header.hide_settings": "Eskonde opsyones",
   "column_header.moveLeft_settings": "Move kolumna a la siedra",
@@ -146,26 +151,22 @@
   "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
   "compose_form.lock_disclaimer.lock": "serrado",
   "compose_form.placeholder": "Ke haber?",
-  "compose_form.poll.add_option": "Adjusta opsyon",
   "compose_form.poll.duration": "Durasion de anketa",
+  "compose_form.poll.multiple": "Multiples opsyones",
   "compose_form.poll.option_placeholder": "Opsyon {number}",
-  "compose_form.poll.remove_option": "Kita esta opsyon",
-  "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
-  "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
+  "compose_form.poll.single": "Eskoje uno",
+  "compose_form.poll.switch_to_multiple": "Troka anketa para permeter a eskojer mas ke una opsyon",
+  "compose_form.poll.switch_to_single": "Troka anketa para permeter a eskojer solo una opsyon",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publika",
   "compose_form.publish_form": "Mueva publikasyon",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guadra trokamientos",
-  "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
+  "compose_form.reply": "Arisponde",
+  "compose_form.save_changes": "Aktualiza",
   "compose_form.spoiler.marked": "Kita avertensya de kontenido",
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
-  "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
+  "compose_form.spoiler_placeholder": "Avertensya de kontenido (opsyonal)",
   "confirmation_modal.cancel": "Anula",
-  "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
-  "confirmations.block.message": "Estas siguro ke keres blokar a {name}?",
   "confirmations.cancel_follow_request.confirm": "Anula solisitud",
   "confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
   "confirmations.delete.confirm": "Efasa",
@@ -174,19 +175,17 @@
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
-  "confirmations.domain_block.confirm": "Bloka domeno entero",
+  "confirmations.domain_block.confirm": "Bloka sirvidor",
   "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
   "confirmations.edit.confirm": "Edita",
-  "confirmations.edit.message": "Editar agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.edit.message": "Si edites agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.logout.confirm": "Sal",
   "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
   "confirmations.mute.confirm": "Silensia",
-  "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
-  "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
-  "confirmations.redraft.confirm": "Efasar i reeskrivir",
+  "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
   "confirmations.reply.confirm": "Arisponde",
-  "confirmations.reply.message": "Arispondir agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.reply.message": "Si arispondas agora, kitaras el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
   "confirmations.unfollow.confirm": "Desige",
   "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
   "conversation.delete": "Efasa konversasyon",
@@ -208,14 +207,26 @@
   "dismissable_banner.explore_statuses": "Estas publikasyones de este sirvidor i otros de la red desentralizada estan agora popularas. Publikasyones mas muevas, kon mas repartajasiones i favoritadas por mas djente aparesen primero.",
   "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
+  "domain_block_modal.block": "Bloka sirvidor",
+  "domain_block_modal.block_account_instead": "Bloka @{name} en su lugar",
+  "domain_block_modal.they_cant_follow": "Dingun de este sirvidor puede segirte.",
+  "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.",
+  "domain_block_modal.title": "Bloka el domeno?",
+  "domain_block_modal.you_will_lose_followers": "Se efasaran todos tus suivantes de este sirvidor.",
+  "domain_block_modal.you_wont_see_posts": "No veras publikasyones ni avizos de utilizadores en este sirvidor.",
+  "domain_pill.server": "Sirvidor",
+  "domain_pill.their_handle": "Su alias:",
+  "domain_pill.username": "Nombre de utilizador",
+  "domain_pill.whats_in_a_handle": "En ke konsiste el alias?",
+  "domain_pill.your_handle": "Tu alias:",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
-  "embed.preview": "Ansi paresera:",
+  "embed.preview": "Paresera ansina:",
   "emoji_button.activity": "Aktivita",
   "emoji_button.clear": "Alimpia",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Bandieras",
   "emoji_button.food": "Kumidas i beverajes",
-  "emoji_button.label": "Adjustar emoji",
+  "emoji_button.label": "Adjusta emoji",
   "emoji_button.nature": "Natura",
   "emoji_button.not_found": "Emojis no topados",
   "emoji_button.objects": "Objektos",
@@ -225,7 +236,7 @@
   "emoji_button.search_results": "Rizultados de bushkeda",
   "emoji_button.symbols": "Simbolos",
   "emoji_button.travel": "Viajes i lugares",
-  "empty_column.account_hides_collections": "Este utilizador desidio no mostrar esta enformasyon",
+  "empty_column.account_hides_collections": "Este utilizador desidio no amostrar esta enformasyon",
   "empty_column.account_suspended": "Kuento suspendido",
   "empty_column.account_timeline": "No ay publikasyones aki!",
   "empty_column.account_unavailable": "Profil no desponivle",
@@ -236,9 +247,9 @@
   "empty_column.domain_blocks": "Ainda no ay domenos blokados.",
   "empty_column.explore_statuses": "No ay dingunos trendes agora. Mira mas tadre!",
   "empty_column.favourited_statuses": "Ainda no tienes publikasyones favoritas. Kuando indikes ke una te plaze, se amostrara aki.",
-  "empty_column.favourites": "Nadie tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo aga, se amostrara aki.",
+  "empty_column.favourites": "Dingun no tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo ayga, se amostrara aki.",
   "empty_column.follow_requests": "No tienes dinguna solisitud de suivante. Kuando risivas una, se amostrara aki.",
-  "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo agas, se amostraran aki.",
+  "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo aygas, se amostraran aki.",
   "empty_column.hashtag": "Ainda no ay niente en esta etiketa.",
   "empty_column.home": "Tu linya de tiempo esta vaziya! Sige a mas personas para inchirla.",
   "empty_column.list": "Ainda no ay niente en esta lista. Kuando miembros de esta lista publiken muevas publikasyones, se amostraran aki.",
@@ -247,14 +258,14 @@
   "empty_column.notifications": "Ainda no tienes dingun avizo. Kuando otras personas enteraktuen kontigo, se amostraran aki.",
   "empty_column.public": "No ay niente aki! Eskrive algo publikamente o manualmente sige utilizadores de otros sirvidores para inchirlo",
   "error.unexpected_crash.explanation": "Por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador, no se puede amostrar esta pajina djustamente.",
-  "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksion.",
+  "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksyon.",
   "error.unexpected_crash.next_steps": "Aprova arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulaenar Mastodon kon otro navigador u otra aplikasyon nativa.",
-  "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
-  "errors.unexpected_crash.copy_stacktrace": "Kopiar stacktrace al portapapeles",
-  "errors.unexpected_crash.report_issue": "Raportar problema",
+  "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no te ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopia stacktrace al portapapeles",
+  "errors.unexpected_crash.report_issue": "Raporta problema",
   "explore.search_results": "Rizultados de bushkeda",
   "explore.suggested_follows": "Djente",
-  "explore.title": "Eksplorar",
+  "explore.title": "Eksplora",
   "explore.trending_links": "Haberes",
   "explore.trending_statuses": "Publikasyones",
   "explore.trending_tags": "Etiketas",
@@ -270,22 +281,36 @@
   "filter_modal.select_filter.context_mismatch": "no se aplika a este konteksto",
   "filter_modal.select_filter.expired": "kadukado",
   "filter_modal.select_filter.prompt_new": "Mueva kategoria: {name}",
-  "filter_modal.select_filter.search": "Bushkar o kriyar",
-  "filter_modal.select_filter.subtitle": "Kulanear una kategoria egzistente o kriya mueva",
-  "filter_modal.select_filter.title": "Filtrar esta publikasyon",
-  "filter_modal.title.status": "Filtrar una publikasyon",
+  "filter_modal.select_filter.search": "Bushka o kriya",
+  "filter_modal.select_filter.subtitle": "Kulanea una kategoria egzistente o kriya mueva",
+  "filter_modal.select_filter.title": "Filtra esta publikasyon",
+  "filter_modal.title.status": "Filtra una publikasyon",
+  "filtered_notifications_banner.pending_requests": "Avizos de {count, plural, =0 {dingun} one {una persona} other {# personas}} ke puedes koneser",
+  "filtered_notifications_banner.title": "Avizos filtrados",
   "firehose.all": "Todo",
   "firehose.local": "Este sirvidor",
   "firehose.remote": "Otros sirvidores",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuza",
   "follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
+  "follow_suggestions.curated_suggestion": "Seleksyon de la taifa",
+  "follow_suggestions.dismiss": "No amostra mas",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre personas a las kualas siges",
+  "follow_suggestions.hints.featured": "Este profil tiene sido eskojido por la taifa de {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este profil es popular entre las personas ke siges.",
+  "follow_suggestions.hints.most_followed": "Este profil es uno de los mas segidos en {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este profil tiene resivido muncha atansion resientemente en {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este profil es similar a otros ke tienes segido resientemente.",
+  "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
+  "follow_suggestions.popular_suggestion": "Sujestion populara",
+  "follow_suggestions.view_all": "Ve todos",
+  "follow_suggestions.who_to_follow": "A ken segir",
   "followed_tags": "Etiketas segidas",
   "footer.about": "Sovre mozotros",
   "footer.directory": "Katalogo de profiles",
   "footer.get_app": "Abasha aplikasyon",
-  "footer.invite": "Envitar a djente",
-  "footer.keyboard_shortcuts": "Akortamientos de klavye",
+  "footer.invite": "Envita a djente",
+  "footer.keyboard_shortcuts": "Akortamientos de klaviatura",
   "footer.privacy_policy": "Politika de privasita",
   "footer.source_code": "Ve kodiche fuente",
   "footer.status": "Estado",
@@ -295,24 +320,19 @@
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "hashtag.column_settings.select.no_options_message": "Rekomendasyones no topadas",
-  "hashtag.column_settings.select.placeholder": "Meter etiketas…",
+  "hashtag.column_settings.select.placeholder": "Mete etiketas…",
   "hashtag.column_settings.tag_mode.all": "Todos estos",
   "hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
   "hashtag.column_settings.tag_mode.none": "Dinguno de estos",
-  "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+  "hashtag.column_settings.tag_toggle": "Inkluye etiketas adisionalas en esta kolumna",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} partisipante} other {{counter} partisipantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
-  "hashtag.follow": "Segir etiketa",
-  "hashtag.unfollow": "Desegir etiketa",
+  "hashtag.follow": "Sige etiketa",
+  "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
-  "home.actions.go_to_explore": "Ve los trendes",
-  "home.actions.go_to_suggestions": "Topa a djente para segir",
-  "home.column_settings.basic": "Opsyones bazikas",
-  "home.column_settings.show_reblogs": "Amostrar repartajasyones",
-  "home.column_settings.show_replies": "Amostrar repuestas",
-  "home.explore_prompt.body": "Tu linya prinsipala es una mikstura de publikasyones kon etiketas a las kualas eskojites a segir, la djente a la kuala eskojites a segir i las publikasyones ke eyos repartajan. Si esta demaziado trankila, puedes:",
-  "home.explore_prompt.title": "Esta es tu baza prinsipala en Mastodon.",
+  "home.column_settings.show_reblogs": "Amostra repartajasyones",
+  "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
   "home.pending_critical_update.body": "Por favor aktualiza tu sirvidor de Mastodon pishin!",
   "home.pending_critical_update.link": "Ve aktualizasyones",
@@ -328,6 +348,7 @@
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
   "interaction_modal.sign_in": "No estas konektado kon este sirvidor. Ande tyenes tu kuento?",
+  "interaction_modal.sign_in_hint": "Konsejo: Akel es el sitio adonde te enrejistrates. Si no lo akodras, bushka el mesaj de posta elektronika de bienvenida en tu kuti de arivo. Tambien puedes eskrivir tu nombre de utilizador kompleto (por enshemplo @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
   "interaction_modal.title.follow": "Sige a {name}",
   "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
@@ -347,7 +368,7 @@
   "keyboard_shortcuts.favourite": "Endika ke te plaze una publikasyon",
   "keyboard_shortcuts.favourites": "Avre lista de favoritos",
   "keyboard_shortcuts.federated": "Avre linya federada",
-  "keyboard_shortcuts.heading": "Akortamientos de klavye",
+  "keyboard_shortcuts.heading": "Akortamientos de klaviatura",
   "keyboard_shortcuts.home": "Avre linya prinsipala",
   "keyboard_shortcuts.hotkey": "Klave rapido",
   "keyboard_shortcuts.legend": "Amostra esta lejenda",
@@ -395,9 +416,13 @@
   "loading_indicator.label": "Eskargando…",
   "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
   "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
-  "mute_modal.duration": "Durasyon",
-  "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
-  "mute_modal.indefinite": "Indefinida",
+  "mute_modal.hide_from_notifications": "Eskonde de avizos",
+  "mute_modal.hide_options": "Eskonde opsyones",
+  "mute_modal.indefinite": "Asta ke desho de silensyarlo",
+  "mute_modal.show_options": "Amostra opsyones",
+  "mute_modal.they_wont_know": "No savra ke tiene sido silensyado.",
+  "mute_modal.title": "Silensiar utilizador?",
+  "mute_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "navigation_bar.about": "Sovre mozotros",
   "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
@@ -407,8 +432,7 @@
   "navigation_bar.direct": "Enmentaduras privadas",
   "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.edit_profile": "Edita profil",
-  "navigation_bar.explore": "Eksplorar",
+  "navigation_bar.explore": "Eksplora",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
   "navigation_bar.follow_requests": "Solisitudes de segimiento",
@@ -421,7 +445,7 @@
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Publikasyones fiksadas",
   "navigation_bar.preferences": "Preferensyas",
-  "navigation_bar.public_timeline": "Linya de tiempo federada",
+  "navigation_bar.public_timeline": "Linya federada",
   "navigation_bar.search": "Bushka",
   "navigation_bar.security": "Segurita",
   "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
@@ -431,12 +455,21 @@
   "notification.follow": "{name} te ampeso a segir",
   "notification.follow_request": "{name} tiene solisitado segirte",
   "notification.mention": "{name} te enmento",
+  "notification.moderation-warning.learn_more": "Ambezate mas",
+  "notification.moderation_warning.action_silence": "Tu kuento tiene sido limitado.",
+  "notification.moderation_warning.action_suspend": "Tu kuento tiene sido suspendido.",
   "notification.own_poll": "Tu anketa eskapo",
   "notification.poll": "Anketa en ke votates eskapo",
   "notification.reblog": "{name} repartajo tu publikasyon",
+  "notification.relationships_severance_event": "Koneksyones pedridas kon {name}",
+  "notification.relationships_severance_event.learn_more": "Ambezate mas",
   "notification.status": "{name} publiko algo",
   "notification.update": "{name} edito una publikasyon",
-  "notifications.clear": "Efasar avizos",
+  "notification_requests.accept": "Acheta",
+  "notification_requests.dismiss": "Kita",
+  "notification_requests.notifications_from": "Avizos de {name}",
+  "notification_requests.title": "Avizos filtrados",
+  "notifications.clear": "Efasa avizos",
   "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
@@ -444,7 +477,6 @@
   "notifications.column_settings.favourite": "Te plazen:",
   "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
   "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
-  "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
   "notifications.column_settings.follow": "Muevos suivantes:",
   "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
   "notifications.column_settings.mention": "Enmentaduras:",
@@ -452,10 +484,10 @@
   "notifications.column_settings.push": "Avizos arrepushados",
   "notifications.column_settings.reblog": "Repartajasyones:",
   "notifications.column_settings.show": "Amostra en kolumna",
-  "notifications.column_settings.sound": "Reproduzir son",
+  "notifications.column_settings.sound": "Reproduse son",
   "notifications.column_settings.status": "Publikasyones muevas:",
   "notifications.column_settings.unread_notifications.category": "Avizos no meldados",
-  "notifications.column_settings.unread_notifications.highlight": "Avaliar avizos no meldados",
+  "notifications.column_settings.unread_notifications.highlight": "Avalia avizos no meldados",
   "notifications.column_settings.update": "Edisyones:",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Repartajasyones",
@@ -470,16 +502,26 @@
   "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
   "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
   "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
-  "notifications_permission_banner.enable": "Kapasitar avizos de ensimameza",
+  "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
+  "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
+  "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
+  "notifications.policy.filter_not_following_hint": "Asta ke las aproves manualmente",
+  "notifications.policy.filter_not_following_title": "Personas ke no siges",
+  "notifications.policy.filter_private_mentions_title": "Enmentaduras privadas no solisitadas",
+  "notifications.policy.title": "Filtra avizos de…",
+  "notifications_permission_banner.enable": "Kapasita avizos de ensimameza",
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
-  "notifications_permission_banner.title": "Nunka te piedres niente",
+  "notifications_permission_banner.title": "Nunkua te piedres niente",
   "onboarding.action.back": "Va atras",
   "onboarding.actions.back": "Va atras",
   "onboarding.actions.go_to_explore": "Va a los trendes",
   "onboarding.actions.go_to_home": "Va a tu linya prinsipala",
   "onboarding.compose.template": "Ke haber, #Mastodon?",
+  "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
+  "onboarding.follows.lead": "Tu linya prinsipala es la forma prinsipala de eksperiensa de Mastodon. Kuantas mas personas sigas, sera mas aktiva o interesante. Para ampesar, aki ay algunas sujestyones:",
   "onboarding.follows.title": "Personaliza tu linya prinsipala",
   "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
+  "onboarding.profile.discoverable_hint": "Kuando permites ke tu profil sea diskuvriravle en Mastodon, tus publikasyones podran apareser en rezultados de bushkedas i trendes i tu profil podra ser sujerido a personas kon intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
   "onboarding.profile.lead": "Siempre puedes kompletar esto mas tadre en las preferensyas, ande tambien ay mas opsyones de personalizasyon.",
@@ -493,14 +535,21 @@
   "onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}",
   "onboarding.share.next_steps": "Posivles sigientes pasos:",
   "onboarding.share.title": "Partaja tu profil",
+  "onboarding.start.lead": "Agora eres parte de Mastodon, una red sosyala unika y desentralizada ande tu, no un algoritmo, puedes personalizar tu propya eksperyensya. Te entrodiziramos a esta mueva frontera sosyala:",
   "onboarding.start.skip": "No nesesitas ayudo para ampesar?",
   "onboarding.start.title": "Lo logrates!",
   "onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
   "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
+  "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo kon teksto, fotos, videos o anketas {emoji}",
   "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
+  "onboarding.steps.setup_profile.body": "Kompleta tu profil para aumentar tus enteraksyones.",
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
-  "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
+  "onboarding.steps.share_profile.body": "Informa a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
+  "onboarding.tips.2fa": "<strong>Saviyas?</strong> Puedes protejar tu kuento konfigurando la autentifikasyon de dos pasos en la konfigurasyon de tu kuento. Funksyona kon kualsekera aplikasyon de TOTP ke eskojas. No ay menester de uzar tu numero de telefon!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Saviyas?</strong> komo Mastodon es desentralizado, algunos profiles que topas estan lokalizados en sirvidores distinktos del tuyo. I malgrado esto, puedes enteraktuar kon eyos! Sus sirvidor forma la sigunda mitad de sus nombres de utilizador!",
+  "onboarding.tips.migration": "<strong>Savias?</strong> Si en el avenir pensas ke {domain} no es el sirvidor adekuado para ti, puedes moverte a otruno sirvidor de Mastodon sir pedrer a tus suivantes. Inkluzo puedes ser el balabay de tu propyo sirvidor!",
+  "onboarding.tips.verification": "<strong>Savias?</strong> Puedes verifikar tu kuento ponyendo un atadijo a tu profil de Mastodon en tu propio sitio web i adjustando el sitio a tu profil. No ay menester de pagamyentos o dokumentos!",
   "password_confirmation.exceeds_maxlength": "La konfirmasyon de kod es demaziado lunga",
   "password_confirmation.mismatching": "Los dos kodes son desferentes",
   "picture_in_picture.restore": "Restora",
@@ -515,14 +564,15 @@
   "poll_button.add_poll": "Adjusta anketa",
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
-  "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
-  "privacy.direct.short": "Solo personas enmentadas",
-  "privacy.private.long": "Vizivle solo para suivantes",
-  "privacy.private.short": "Solo suivantes",
-  "privacy.public.long": "Vizivle para todos",
+  "privacy.direct.long": "Todos enmentados en la publikasyon",
+  "privacy.direct.short": "Djente espesifika",
+  "privacy.private.long": "Solo para tus suivantes",
+  "privacy.private.short": "Suivantes",
+  "privacy.public.long": "Todos en i afuera de Mastodon",
   "privacy.public.short": "Publiko",
-  "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto funksyona exaktamente komo publiko, eksepto ke la publikasyon no aparesera en linyas publikas o etiketas, la eksplorasyon o bushkedas de Mastodon, inkluzo si kapasites esto para tu kuento.",
+  "privacy.unlisted.long": "Vizivle para todos, ama no en trendes, etiketas o linyas publikas",
+  "privacy.unlisted.short": "Publiko i silensyozo",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
@@ -540,7 +590,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "oy",
+  "reply_indicator.attachments": "{count, plural, one {# anekso} other {# aneksos}}",
   "reply_indicator.cancel": "Anula",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Bloka",
   "report.block_explanation": "No veras sus publikasyones. No podra ver tus publikasyones ni segirte. Podra saver ke le blokates.",
   "report.categories.legal": "Legal",
@@ -553,7 +605,7 @@
   "report.category.title_status": "publikasyon",
   "report.close": "Fecho",
   "report.comment.title": "Ay algo mas ke deveriamos saver?",
-  "report.forward": "Reembiar a {target}",
+  "report.forward": "Reembia a {target}",
   "report.forward_hint": "Este kuento es de otro sirvidor. Embiar una kopia anonimizada del raporto ayi tamyen?",
   "report.mute": "Silensia",
   "report.mute_explanation": "No veras sus publikasyones. Ainda pueden segirte i no va saver ke le silensiates.",
@@ -573,19 +625,19 @@
   "report.rules.title": "Kualas reglas estan violadas?",
   "report.statuses.subtitle": "Eskoje todas ke korespondan",
   "report.statuses.title": "Ay alguna publikasyon ke suporta este raporto?",
-  "report.submit": "Embiar",
+  "report.submit": "Embia",
   "report.target": "Raportando a {target}",
   "report.thanks.take_action": "Aki estan tus opsyones para kontrolar lo ke ves en Mastodon:",
   "report.thanks.take_action_actionable": "Mientres revizamos esto, puedes tomar aksyones kontra @{name}:",
   "report.thanks.title": "No keres ver esto?",
   "report.thanks.title_actionable": "Mersi por raportarlo, vamos revizarlo.",
-  "report.unfollow": "Desegir a @{name}",
+  "report.unfollow": "Desige a @{name}",
   "report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.other": "Otros",
   "report_notification.categories.spam": "Spam",
-  "report_notification.categories.violation": "Violasion de reglas",
+  "report_notification.categories.violation": "Violasyon de reglas",
   "report_notification.open": "Avre raporto",
   "search.no_recent_searches": "No ay bushkedas resientes",
   "search.placeholder": "Bushka",
@@ -599,7 +651,7 @@
   "search_popout.full_text_search_logged_out_message": "Solo desponivle kuando estas konektado kon tu kuento.",
   "search_popout.language_code": "kodiche ISO de lingua",
   "search_popout.options": "Opsyones de bushkeda",
-  "search_popout.quick_actions": "Aksiones rapidas",
+  "search_popout.quick_actions": "Aksyones rapidas",
   "search_popout.recent": "Bushkedas resientes",
   "search_popout.specific_date": "dato espesifiko",
   "search_popout.user": "utilizador",
@@ -633,7 +685,7 @@
   "status.direct": "Enmenta a @{name} en privado",
   "status.direct_indicator": "Enmentadura privada",
   "status.edit": "Edita",
-  "status.edited": "Editado {date}",
+  "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
@@ -676,7 +728,7 @@
   "status.translate": "Trezlada",
   "status.translated_from_with": "Trezladado dizde {lang} kon {provider}",
   "status.uncached_media_warning": "Vista previa no desponivle",
-  "status.unmute_conversation": "Desilensiar konversasyon",
+  "status.unmute_conversation": "Desilensia konversasyon",
   "status.unpin": "Defiksar del profil",
   "subscribed_languages.lead": "Solo publikasyones en linguas eskojidas se amostraran en tus linya de tiempo prinsipala i listas dempues del trokamiento. Eskoje dinguna para risivir publikasyones en todas las linguas.",
   "subscribed_languages.save": "Guadra trokamientos",
@@ -704,10 +756,8 @@
   "upload_error.poll": "No se permite kargar dosyas kon anketas.",
   "upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
   "upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
-  "upload_form.description_missing": "No adjustates deskripsion",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Troka minyatura",
-  "upload_form.undo": "Efasa",
   "upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
   "upload_modal.analyzing_picture": "Analizando imaje…",
   "upload_modal.apply": "Aplika",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index ec0d30363c..0f42e97fcf 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
-  "about.contact": "Kontaktuoti:",
-  "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
+  "about.contact": "Kontaktai:",
+  "about.disclaimer": "Mastodon – tai nemokama atvirojo kodo programinė įranga ir Mastodon gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
   "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
@@ -9,7 +9,7 @@
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
   "about.domain_blocks.suspended.title": "Uždrausta",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
-  "about.powered_by": "Decentralizuota socialinė žiniasklaida, kurią valdo {mastodon}",
+  "about.powered_by": "Decentralizuota socialinė medija, kurią valdo {mastodon}",
   "about.rules": "Serverio taisyklės",
   "account.account_note_header": "Pastaba",
   "account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašų",
@@ -27,18 +27,18 @@
   "account.domain_blocked": "Užblokuotas domenas",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
-  "account.endorse": "Savybė profilyje",
-  "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
+  "account.endorse": "Rodyti profilyje",
+  "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
-  "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
+  "account.featured_tags.title": "{name} rodomi saitažodžiai",
   "account.follow": "Sekti",
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
   "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
-  "account.following": "Seka",
-  "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
-  "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
+  "account.following": "Sekama",
+  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
+  "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
@@ -53,13 +53,13 @@
   "account.mute_notifications_short": "Nutildyti pranešimus",
   "account.mute_short": "Nutildyti",
   "account.muted": "Nutildytas",
-  "account.mutual": "Abipusis",
+  "account.mutual": "Bendri",
   "account.no_bio": "Nėra pateikto aprašymo.",
   "account.open_original_page": "Atidaryti originalinį puslapį",
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
-  "account.report": "Pranešti @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą",
+  "account.report": "Pranešti apie @{name}",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
   "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@@ -69,45 +69,52 @@
   "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
-  "account.unmute": "Atitildyti @{name}",
-  "account.unmute_notifications_short": "Atitildyti pranešimus",
-  "account.unmute_short": "Atitildyti",
-  "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
-  "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
-  "admin.dashboard.monthly_retention": "Naudotojų išlaikymo rodiklis pagal mėnesį po registracijos",
+  "account.unmute": "Atšaukti nutildymą @{name}",
+  "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
+  "account.unmute_short": "Atšaukti nutildymą",
+  "account_note.placeholder": "Spustelėk norint pridėti pastabą.",
+  "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
+  "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
-  "admin.dashboard.retention.cohort": "Registravimo mėnuo",
+  "admin.dashboard.retention.cohort": "Registracijos mėnuo",
   "admin.dashboard.retention.cohort_size": "Nauji naudotojai",
   "admin.impact_report.instance_accounts": "Paskyrų profiliai, kuriuos tai ištrintų",
   "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
-  "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Spartos ribojimas",
+  "alert.rate_limited.message": "Bandyk vėliau po {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Sparta ribota.",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
-  "autosuggest_hashtag.per_week": "{count} per savaitę",
-  "boost_modal.combo": "Gali spausti {combo}, kad praleisti kitą kartą",
+  "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
+  "block_modal.show_less": "Rodyti mažiau",
+  "block_modal.show_more": "Rodyti daugiau",
+  "block_modal.they_cant_mention": "Jie negali tave paminėti ar sekti.",
+  "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
+  "block_modal.they_will_know": "Jie mato, kad yra užblokuoti.",
+  "block_modal.title": "Blokuoti naudotoją?",
+  "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
+  "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
-  "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
+  "bundle_column_error.error.body": "Paprašytos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
   "bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
   "bundle_column_error.network.title": "Tinklo klaida",
   "bundle_column_error.retry": "Bandyti dar kartą",
-  "bundle_column_error.return": "Grįžti į pradžią",
+  "bundle_column_error.return": "Grįžti į pagrindinį",
   "bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Uždaryti",
   "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
   "bundle_modal_error.retry": "Bandyti dar kartą",
   "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą {domain}.",
+  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
   "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
   "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
-  "closed_registrations_modal.title": "Užsiregistravimas į Mastodon",
+  "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
   "column.about": "Apie",
   "column.blocks": "Užblokuoti naudotojai",
   "column.bookmarks": "Žymės",
@@ -115,16 +122,16 @@
   "column.direct": "Privatūs paminėjimai",
   "column.directory": "Naršyti profilius",
   "column.domain_blocks": "Užblokuoti domenai",
-  "column.favourites": "Mėgstamiausi",
-  "column.firehose": "Tiesioginiai padavimai",
-  "column.follow_requests": "Sekti prašymus",
+  "column.favourites": "Mėgstami",
+  "column.firehose": "Tiesioginiai srautai",
+  "column.follow_requests": "Sekimo prašymai",
   "column.home": "Pagrindinis",
   "column.lists": "Sąrašai",
   "column.mutes": "Nutildyti naudotojai",
   "column.notifications": "Pranešimai",
   "column.pins": "Prisegti įrašai",
   "column.public": "Federacinė laiko skalė",
-  "column_back_button.label": "Atgal",
+  "column_back_button.label": "Grįžti",
   "column_header.hide_settings": "Slėpti nustatymus",
   "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
   "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
@@ -132,7 +139,7 @@
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_subheading.settings": "Nustatymai",
-  "community.column_settings.local_only": "Tik vietinis",
+  "community.column_settings.local_only": "Tik vietinė",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
   "compose.language.change": "Keisti kalbą",
@@ -141,52 +148,48 @@
   "compose.published.open": "Atidaryti",
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
+  "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
+  "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
-  "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
-  "compose_form.poll.option_placeholder": "{number} pasirinkimas",
-  "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+  "compose_form.poll.multiple": "Keli pasirinkimai",
+  "compose_form.poll.option_placeholder": "{number} parinktis",
+  "compose_form.poll.single": "Pasirinkti vieną",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
-  "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
+  "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Išsaugoti pakeitimus",
-  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+  "compose_form.reply": "Atsakyti",
+  "compose_form.save_changes": "Atnaujinti",
   "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
-  "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+  "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
-  "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
-  "confirmations.block.message": "Ar tikrai nori užblokuoti {name}?",
   "confirmations.cancel_follow_request.confirm": "Atšaukti prašymą",
   "confirmations.cancel_follow_request.message": "Ar tikrai nori atšaukti savo prašymą sekti {name}?",
   "confirmations.delete.confirm": "Ištrinti",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
   "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "Blokuoti serverį",
+  "confirmations.domain_block.message": "Ar tikrai, tikrai nori užblokuoti visą {domain}? Daugeliu atvejų užtenka kelių tikslinių blokavimų arba nutildymų. Šio domeno turinio nematysi jokiose viešose laiko skalėse ar pranešimuose. Tavo sekėjai iš to domeno bus pašalinti.",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.logout.confirm": "Atsijungti",
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, tačiau jie vis tiek galės matyti tavo įrašus ir sekti.",
-  "confirmations.mute.message": "Ar tikrai norite nutildyti {name}?",
   "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
+  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
   "confirmations.reply.confirm": "Atsakyti",
-  "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
+  "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.unfollow.confirm": "Nebesekti",
-  "confirmations.unfollow.message": "Ar tikrai norite atsisakyti sekimo {name}?",
+  "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -194,85 +197,131 @@
   "copy_icon_button.copied": "Nukopijuota į iškarpinę",
   "copypaste.copied": "Nukopijuota",
   "copypaste.copy_to_clipboard": "Kopijuoti į iškarpinę",
-  "directory.local": "Iš {domain} tik",
-  "directory.new_arrivals": "Naujos prekės",
-  "directory.recently_active": "Neseniai aktyvus",
+  "directory.federated": "Iš žinomų fediversų",
+  "directory.local": "Tik iš {domain}",
+  "directory.new_arrivals": "Nauji atvykėliai",
+  "directory.recently_active": "Neseniai aktyvus (-i)",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
-  "disabled_account_banner.text": "Jūsų paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-  "dismissable_banner.explore_statuses": "Tai įrašai iš viso socialinio tinklo, kurie šiandien sulaukia vis daugiau dėmesio. Naujesni įrašai, turintys daugiau boosts ir mėgstamiausių įrašų, yra vertinami aukščiau.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
+  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
+  "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
+  "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai iš žmonių socialiniame žiniatinklyje, kuriuos seka {domain} žmonės.",
+  "domain_block_modal.block": "Blokuoti serverį",
+  "domain_block_modal.block_account_instead": "Blokuoti {name} vietoj to",
+  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+  "domain_block_modal.they_cant_follow": "Niekas iš šio serverio negali tavęs sekti.",
+  "domain_block_modal.they_wont_know": "Jie nežinos, kad buvo užblokuoti.",
+  "domain_block_modal.title": "Blokuoti domeną?",
+  "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
+  "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau sąveikauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "domain_pill.server": "Serveris",
+  "domain_pill.their_handle": "Jų socialinis medijos vardas:",
+  "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
+  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.username": "Naudotojo vardas",
+  "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas žmogus yra ir kur jie yra, gali sąveikauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali sąveikauti su tavimi visame socialiniame tinkle, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
+  "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
+  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
+  "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijavus (-usi) toliau pateiktą kodą.",
   "embed.preview": "Štai kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
   "emoji_button.clear": "Išvalyti",
   "emoji_button.custom": "Pasirinktinis",
   "emoji_button.flags": "Vėliavos",
-  "emoji_button.food": "Maistas ir Gėrimai",
-  "emoji_button.label": "Įterpti veidelius",
+  "emoji_button.food": "Maistas ir gėrimai",
+  "emoji_button.label": "Įterpti jaustuką",
   "emoji_button.nature": "Gamta",
-  "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų",
+  "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų.",
   "emoji_button.objects": "Objektai",
   "emoji_button.people": "Žmonės",
-  "emoji_button.recent": "Dažniausiai naudojama",
-  "emoji_button.search": "Paieška...",
+  "emoji_button.recent": "Dažniausiai naudojami",
+  "emoji_button.search": "Ieškoti...",
   "emoji_button.search_results": "Paieškos rezultatai",
   "emoji_button.symbols": "Simboliai",
-  "emoji_button.travel": "Kelionės ir Vietos",
-  "empty_column.account_hides_collections": "Šis naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą",
-  "empty_column.account_suspended": "Paskyra sustabdyta",
-  "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profilis neprieinamas",
-  "empty_column.blocks": "Dar neužblokavote nė vieno naudotojo.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.community": "Vietinė laiko juosta yra tuščia. Parašykite ką nors viešai, kad pradėtumėte veikti!",
-  "empty_column.direct": "Dar neturite jokių privačių paminėjimų. Kai išsiųsite arba gausite tokį pranešimą, jis bus rodomas čia.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.favourited_statuses": "Dar neturite mėgstamiausių įrašų. Kai vieną iš jų pamėgsite, jis bus rodomas čia.",
-  "empty_column.follow_requests": "Dar neturite jokių sekimo užklausų. Kai gausite tokį prašymą, jis bus rodomas čia.",
-  "empty_column.followed_tags": "Dar nesekėte jokių grotažymių. Kai tai padarysite, jie bus rodomi čia.",
+  "emoji_button.travel": "Kelionės ir vietos",
+  "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
+  "empty_column.account_suspended": "Paskyra pristabdyta.",
+  "empty_column.account_timeline": "Nėra čia įrašų.",
+  "empty_column.account_unavailable": "Profilis neprieinamas.",
+  "empty_column.blocks": "Dar neužblokavai nė vieno naudotojo.",
+  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
+  "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
+  "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
+  "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
+  "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
+  "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
+  "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
+  "empty_column.followed_tags": "Dar neseki jokių saitažodžių. Kai tai padarysi, jie bus rodomi čia.",
   "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "empty_column.lists": "Dar neturite jokių sąrašų. Kai jį sukursite, jis bus rodomas čia.",
-  "empty_column.mutes": "Dar nesate nutildę nė vieno naudotojo.",
-  "empty_column.notifications": "Dar neturite jokių pranešimų. Kai kiti žmonės su jumis bendraus, matysite tai čia.",
-  "empty_column.public": "Čia nieko nėra! Parašykite ką nors viešai arba rankiniu būdu sekite naudotojus iš kitų serverių, kad jį užpildytumėte",
-  "error.unexpected_crash.explanation": "Dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
-  "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko teisingai parodyti. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
-  "error.unexpected_crash.next_steps": "Pabandykite atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
-  "error.unexpected_crash.next_steps_addons": "Pabandykite juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
-  "errors.unexpected_crash.report_issue": "Pranešti apie triktį",
+  "empty_column.home": "Tavo pagrindinio laiko skalė tuščia. Sek daugiau žmonių, kad ją užpildytum.",
+  "empty_column.list": "Nėra nieko šiame sąraše kol kas. Kai šio sąrašo nariai paskelbs naujų įrašų, jie bus rodomi čia.",
+  "empty_column.lists": "Dar neturi jokių sąrašų. Kai jį sukursi, jis bus rodomas čia.",
+  "empty_column.mutes": "Dar nesi nutildęs (-usi) nė vieno naudotojo.",
+  "empty_column.notification_requests": "Viskas švaru! Čia nieko nėra. Kai gausi naujų pranešimų, jie bus rodomi čia pagal tavo nustatymus.",
+  "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi sąveikaus, matysi tai čia.",
+  "empty_column.public": "Čia nieko nėra. Parašyk ką nors viešai arba rankiniu būdu sek naudotojus iš kitų serverių, kad jį užpildytum.",
+  "error.unexpected_crash.explanation": "Dėl mūsų kodo riktos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
+  "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko parodyti teisingai. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
+  "error.unexpected_crash.next_steps": "Pabandyk atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+  "error.unexpected_crash.next_steps_addons": "Pabandyk juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsi naudotis Mastodon per kitą naršyklę arba savąją programėlę.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopijuoti dėklo eigą į iškarpinę",
+  "errors.unexpected_crash.report_issue": "Pranešti apie problemą",
   "explore.search_results": "Paieškos rezultatai",
   "explore.suggested_follows": "Žmonės",
   "explore.title": "Naršyti",
   "explore.trending_links": "Naujienos",
   "explore.trending_statuses": "Įrašai",
   "explore.trending_tags": "Saitažodžiai",
-  "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekste, kuriame peržiūrėjote šį pranešimą. Jei norite, kad pranešimas būtų filtruojamas ir šiame kontekste, turėsite redaguoti filtrą.",
-  "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas!",
-  "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti, kad ji būtų taikoma, turėsite pakeisti galiojimo datą.",
-  "filter_modal.added.expired_title": "Pasibaigė filtro galiojimo laikas!",
-  "filter_modal.added.review_and_configure": "Norėdami peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eikite į {settings_link}.",
-  "filter_modal.added.review_and_configure_title": "Filtro nuostatos",
-  "filter_modal.added.settings_link": "nustatymų puslapis",
-  "filter_modal.added.short_explanation": "Šis pranešimas buvo įtrauktas į šią filtro kategoriją: {title}.",
-  "filter_modal.added.title": "Pridėtas filtras!",
-  "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste",
-  "filter_modal.select_filter.expired": "nebegalioja",
+  "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekstui, kuriame peržiūrėjai šį įrašą. Jei nori, kad įrašas būtų filtruojamas ir šiame kontekste, turėsi redaguoti filtrą.",
+  "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas.",
+  "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti. Kad ji būtų taikoma, turėsi pakeisti galiojimo datą.",
+  "filter_modal.added.expired_title": "Baigėsi filtro galiojimas.",
+  "filter_modal.added.review_and_configure": "Norint peržiūrėti ir toliau konfigūruoti šią filtro kategoriją, eik į {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Filtro nustatymai",
+  "filter_modal.added.settings_link": "nustatymų puslapį",
+  "filter_modal.added.short_explanation": "Šis įrašas buvo pridėtas į šią filtro kategoriją: {title}.",
+  "filter_modal.added.title": "Pridėtas filtras.",
+  "filter_modal.select_filter.context_mismatch": "netaikoma šiame kontekste.",
+  "filter_modal.select_filter.expired": "nebegalioja.",
   "filter_modal.select_filter.prompt_new": "Nauja kategorija: {name}",
   "filter_modal.select_filter.search": "Ieškoti arba sukurti",
-  "filter_modal.select_filter.subtitle": "Naudoti esamą kategoriją arba sukurti naują",
+  "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
-  "filter_modal.title.status": "Filtruoti šį įrašą",
+  "filter_modal.title.status": "Filtruoti įrašą",
+  "filtered_notifications_banner.mentions": "{count, plural, one {paminėjimas} few {paminėjimai} many {paminėjimo} other {paminėjimų}}",
+  "filtered_notifications_banner.pending_requests": "Pranešimai iš {count, plural, =0 {nė vieno} one {vienos žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
+  "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Kiti serveriai",
-  "follow_request.authorize": "Autorizuoti",
+  "follow_request.authorize": "Leisti",
   "follow_request.reject": "Atmesti",
-  "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo užklausas.",
-  "followed_tags": "Sekamos saitažodžiai",
+  "follow_requests.unlocked_explanation": "Nors tavo paskyra neužrakinta, {domain} personalas mano, kad galbūt norėsi rankiniu būdu patikrinti šių paskyrų sekimo prašymus.",
+  "follow_suggestions.curated_suggestion": "Personalo pasirinkimai",
+  "follow_suggestions.dismiss": "Daugiau nerodyti",
+  "follow_suggestions.featured_longer": "Rankomis atrinkta {domain} komanda",
+  "follow_suggestions.friends_of_friends_longer": "Populiarus tarp žmonių, kurių seki",
+  "follow_suggestions.hints.featured": "Šį profilį atrinko {domain} komanda.",
+  "follow_suggestions.hints.friends_of_friends": "Šis profilis yra populiarus tarp žmonių, kuriuos seki.",
+  "follow_suggestions.hints.most_followed": "Šis profilis yra vienas iš labiausiai sekamų domene {domain}.",
+  "follow_suggestions.hints.most_interactions": "Pastaruoju metu šis profilis sulaukia daug dėmesio domane {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Šis profilis panašus į profilius, kuriuos neseniai sekei.",
+  "follow_suggestions.personalized_suggestion": "Suasmenintas pasiūlymas",
+  "follow_suggestions.popular_suggestion": "Populiarus pasiūlymas",
+  "follow_suggestions.popular_suggestion_longer": "Populiarus domene {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Panašūs į profilius, kuriuos neseniai seki",
+  "follow_suggestions.view_all": "Peržiūrėti viską",
+  "follow_suggestions.who_to_follow": "Ką sekti",
+  "followed_tags": "Sekami saitažodžiai",
   "footer.about": "Apie",
   "footer.directory": "Profilių katalogas",
   "footer.get_app": "Gauti programėlę",
@@ -280,222 +329,299 @@
   "footer.keyboard_shortcuts": "Spartieji klavišai",
   "footer.privacy_policy": "Privatumo politika",
   "footer.source_code": "Peržiūrėti šaltinio kodą",
-  "footer.status": "Būsena",
-  "generic.saved": "Išsaugoti",
-  "getting_started.heading": "Pradedant",
+  "footer.status": "Statusas",
+  "generic.saved": "Išsaugota",
+  "getting_started.heading": "Kaip pradėti",
   "hashtag.column_header.tag_mode.all": "ir {additional}",
   "hashtag.column_header.tag_mode.any": "ar {additional}",
   "hashtag.column_header.tag_mode.none": "be {additional}",
-  "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta",
-  "hashtag.column_settings.select.placeholder": "Įvesti grotažymes…",
+  "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta.",
+  "hashtag.column_settings.select.placeholder": "Įvesti saitažodžius…",
   "hashtag.column_settings.tag_mode.all": "Visi šie",
-  "hashtag.column_settings.tag_mode.any": "Bet kuris šių",
+  "hashtag.column_settings.tag_mode.any": "Bet kuris iš šių",
   "hashtag.column_settings.tag_mode.none": "Nė vienas iš šių",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{count, plural,one {{counter} dalyvis}other {{counter} dalyviai}}",
-  "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} other {{counter} įrašų}} šiandien",
-  "hashtag.follow": "Sekti grotažymę",
-  "hashtag.unfollow": "Nesekti grotažymės",
-  "hashtags.and_other": "…ir{count, plural,other {#daugiau}}",
-  "home.actions.go_to_explore": "Žiūrėti kas populiaru",
-  "home.actions.go_to_suggestions": "Rasti žmonių sekimui",
-  "home.column_settings.basic": "Pagrindinis",
-  "home.column_settings.show_reblogs": "Rodyti \"boosts\"",
+  "hashtag.column_settings.tag_toggle": "Įtraukti papildomas šio stulpelio žymes",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalyvis} few {{counter} dalyviai} many {{counter} dalyvio} other {{counter} dalyvių}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}} šiandien",
+  "hashtag.follow": "Sekti saitažodį",
+  "hashtag.unfollow": "Nebesekti saitažodį",
+  "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
+  "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
+  "home.pending_critical_update.body": "Kuo greičiau atnaujink savo Mastodon serverį.",
+  "home.pending_critical_update.link": "Žiūrėti naujinimus",
+  "home.pending_critical_update.title": "Galimas kritinis saugumo naujinimas.",
+  "home.show_announcements": "Rodyti skelbimus",
+  "interaction_modal.description.favourite": "Su Mastodon paskyra gali pamėgti šį įrašą, kad autorius (-ė) žinotų, jog vertinti tai ir išsaugoti jį vėliau.",
+  "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
+  "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
+  "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
+  "interaction_modal.login.action": "Į pagrindinį puslapį",
+  "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
   "interaction_modal.no_account_yet": "Nesi Mastodon?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
-  "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra laikoma tavo paskyra?",
+  "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra talpinama tavo paskyra?",
   "interaction_modal.sign_in_hint": "Patarimas: tai svetainė, kurioje užsiregistravai. Jei neprisimeni, ieškok sveikinimo el. laiško savo pašto dėžutėje. Taip pat gali įvesti visą savo naudotojo vardą (pvz., @Mastodon@mastodon.social).",
-  "interaction_modal.title.favourite": "Mėgstamiausias {name} įrašas",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "interaction_modal.title.favourite": "Pamėgti {name} įrašą",
+  "interaction_modal.title.follow": "Sekti {name}",
+  "interaction_modal.title.reblog": "Pakelti {name} įrašą",
+  "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
+  "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+  "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+  "intervals.full.minutes": "{number, plural, one {# minutė} few {# minutes} many {# minutės} other {# minučių}}",
+  "keyboard_shortcuts.back": "Naršyti atgal",
+  "keyboard_shortcuts.blocked": "Atidaryti užblokuotų naudotojų sąrašą",
+  "keyboard_shortcuts.boost": "Pakelti įrašą",
+  "keyboard_shortcuts.column": "Fokusuoti stulpelį",
+  "keyboard_shortcuts.compose": "Fokusuoti rengykles teksto sritį",
+  "keyboard_shortcuts.description": "Aprašymas",
+  "keyboard_shortcuts.direct": "atidaryti privačių paminėjimų stulpelį",
+  "keyboard_shortcuts.down": "Perkelti žemyn sąraše",
+  "keyboard_shortcuts.enter": "Atidaryti įrašą",
+  "keyboard_shortcuts.favourite": "Pamėgti įrašą",
+  "keyboard_shortcuts.favourites": "Atidaryti mėgstamųjų sąrašą",
+  "keyboard_shortcuts.federated": "Atidaryti federacinę laiko skalę",
+  "keyboard_shortcuts.heading": "Spartieji klavišai",
+  "keyboard_shortcuts.home": "Atidaryti pagrindinį laiko skalę",
   "keyboard_shortcuts.hotkey": "Spartusis klavišas",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.local": "to open local timeline",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.legend": "Rodyti šią legendą",
+  "keyboard_shortcuts.local": "Atidaryti vietinę laiko skalę",
+  "keyboard_shortcuts.mention": "Paminėti autorių (-ę)",
+  "keyboard_shortcuts.muted": "Atidaryti nutildytų naudotojų sąrašą",
+  "keyboard_shortcuts.my_profile": "Atidaryti savo profilį",
+  "keyboard_shortcuts.notifications": "Atidaryti pranešimų stulpelį",
   "keyboard_shortcuts.open_media": "Atidaryti mediją",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.requests": "to open follow requests list",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.pinned": "Atidaryti prisegtų įrašų sąrašą",
+  "keyboard_shortcuts.profile": "Atidaryti autoriaus (-ės) profilį",
+  "keyboard_shortcuts.reply": "Atsakyti į įrašą",
+  "keyboard_shortcuts.requests": "Atidaryti sekimo prašymų sąrašą",
+  "keyboard_shortcuts.search": "Fokusuoti paieškos juostą",
+  "keyboard_shortcuts.spoilers": "Rodyti / slėpti TĮ lauką",
+  "keyboard_shortcuts.start": "Atidarykite stulpelį Kaip pradėti",
+  "keyboard_shortcuts.toggle_hidden": "Rodyti / slėpti tekstą po TĮ",
   "keyboard_shortcuts.toggle_sensitivity": "Rodyti / slėpti mediją",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "to move up in the list",
+  "keyboard_shortcuts.toot": "Pradėti naują įrašą",
+  "keyboard_shortcuts.unfocus": "Nebefokusuoti rengykles teksto sritį / paiešką",
+  "keyboard_shortcuts.up": "Perkelti į viršų sąraše",
   "lightbox.close": "Uždaryti",
+  "lightbox.compress": "Suspausti vaizdo peržiūros langelį",
+  "lightbox.expand": "Išplėsti vaizdo peržiūros langelį",
+  "lightbox.next": "Kitas",
+  "lightbox.previous": "Ankstesnis",
+  "limited_account_hint.action": "Vis tiek rodyti profilį",
+  "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
+  "link_preview.author": "Sukūrė {name}",
+  "lists.account.add": "Pridėti į sąrašą",
+  "lists.account.remove": "Pašalinti iš sąrašo",
+  "lists.delete": "Ištrinti sąrašą",
+  "lists.edit": "Redaguoti sąrašą",
+  "lists.edit.submit": "Keisti pavadinimą",
+  "lists.exclusive": "Slėpti šiuos įrašus iš pagrindinio",
+  "lists.new.create": "Pridėti sąrašą",
+  "lists.new.title_placeholder": "Naujas sąrašo pavadinimas",
+  "lists.replies_policy.followed": "Bet kuriam sekamam naudotojui",
+  "lists.replies_policy.list": "Sąrašo nariams",
+  "lists.replies_policy.none": "Nei vienam",
+  "lists.replies_policy.title": "Rodyti atsakymus:",
+  "lists.search": "Ieškoti tarp sekamų žmonių",
+  "lists.subheading": "Tavo sąrašai",
+  "load_pending": "{count, plural, one {# naujas elementas} few {# nauji elementai} many {# naujo elemento} other {# naujų elementų}}",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
-  "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
-  "mute_modal.duration": "Trukmė",
-  "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
-  "mute_modal.indefinite": "Neribotas",
+  "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
+  "mute_modal.show_options": "Rodyti parinktis",
   "navigation_bar.about": "Apie",
-  "navigation_bar.advanced_interface": "Atidarykite išplėstinę žiniatinklio sąsają",
+  "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
   "navigation_bar.bookmarks": "Žymės",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.community_timeline": "Vietinė laiko skalė",
+  "navigation_bar.compose": "Sukurti naują įrašą",
   "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
-  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Redaguoti profilį",
+  "navigation_bar.domain_blocks": "Užblokuoti domenai",
   "navigation_bar.explore": "Naršyti",
-  "navigation_bar.favourites": "Mėgstamiausi",
-  "navigation_bar.filters": "Nutylėti žodžiai",
-  "navigation_bar.follow_requests": "Sekti prašymus",
-  "navigation_bar.followed_tags": "Sekti grotažymę",
+  "navigation_bar.favourites": "Mėgstami",
+  "navigation_bar.filters": "Nutildyti žodžiai",
+  "navigation_bar.follow_requests": "Sekimo prašymai",
+  "navigation_bar.followed_tags": "Sekami saitažodžiai",
   "navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
   "navigation_bar.lists": "Sąrašai",
   "navigation_bar.logout": "Atsijungti",
-  "navigation_bar.mutes": "Užtildyti naudotojai",
+  "navigation_bar.mutes": "Nutildyti naudotojai",
   "navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
   "navigation_bar.personal": "Asmeninis",
-  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.pins": "Prisegti įrašai",
   "navigation_bar.preferences": "Nuostatos",
-  "navigation_bar.public_timeline": "Federuota laiko juosta",
+  "navigation_bar.public_timeline": "Federacinė laiko skalė",
   "navigation_bar.search": "Ieškoti",
   "navigation_bar.security": "Apsauga",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
-  "notification.admin.report": "{name} pranešė.{target}",
+  "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
+  "notification.admin.report": "{name} pranešė {target}",
   "notification.admin.sign_up": "{name} užsiregistravo",
-  "notification.favourite": "{name} pamėgo jūsų įrašą",
-  "notification.follow": "{name} pradėjo jus sekti",
-  "notification.follow_request": "{name} nori tapti jūsų sekėju",
-  "notification.mention": "{name} paminėjo jus",
+  "notification.favourite": "{name} pamėgo tavo įrašą",
+  "notification.follow": "{name} seka tave",
+  "notification.follow_request": "{name} paprašė tave sekti",
+  "notification.mention": "{name} paminėjo tave",
+  "notification.moderation-warning.learn_more": "Sužinoti daugiau",
+  "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
+  "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
+  "notification.moderation_warning.action_none": "Tavo paskyra gavo prižiūrėjimo įspėjimą.",
+  "notification.moderation_warning.action_sensitive": "Nuo šiol tavo įrašai bus pažymėti kaip jautrūs.",
+  "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
+  "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
-  "notification.reblog": "{name} boosted your status",
+  "notification.reblog": "{name} pakėlė tavo įrašą",
+  "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
+  "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
   "notification.status": "{name} ką tik paskelbė",
   "notification.update": "{name} redagavo įrašą",
+  "notification_requests.accept": "Priimti",
+  "notification_requests.dismiss": "Atmesti",
+  "notification_requests.notifications_from": "Pranešimai iš {name}",
+  "notification_requests.title": "Filtruojami pranešimai",
   "notifications.clear": "Išvalyti pranešimus",
   "notifications.clear_confirmation": "Ar tikrai nori visam laikui išvalyti visus pranešimus?",
-  "notifications.column_settings.admin.report": "Nauji ataskaitos:",
-  "notifications.column_settings.admin.sign_up": "Nauji prisiregistravimai:",
+  "notifications.column_settings.admin.report": "Naujos ataskaitos:",
+  "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
-  "notifications.column_settings.favourite": "Mėgstamiausi:",
+  "notifications.column_settings.favourite": "Mėgstami:",
   "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Greito filtro juosta",
-  "notifications.column_settings.filter_bar.show_bar": "Rodyti filtro juostą",
+  "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
   "notifications.column_settings.follow": "Nauji sekėjai:",
-  "notifications.column_settings.follow_request": "Nauji prašymai sekti:",
+  "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
-  "notifications.column_settings.push": "\"Push\" pranešimai",
-  "notifications.column_settings.reblog": "\"Boost\" kiekis:",
+  "notifications.column_settings.push": "Tiesioginiai pranešimai",
+  "notifications.column_settings.reblog": "Pakėlimai:",
   "notifications.column_settings.show": "Rodyti stulpelyje",
   "notifications.column_settings.sound": "Paleisti garsą",
-  "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.status": "Nauji įrašai:",
   "notifications.column_settings.unread_notifications.category": "Neperskaityti pranešimai",
   "notifications.column_settings.unread_notifications.highlight": "Paryškinti neperskaitytus pranešimus",
   "notifications.column_settings.update": "Redagavimai:",
   "notifications.filter.all": "Visi",
-  "notifications.filter.boosts": "\"Boost\" kiekis",
-  "notifications.filter.favourites": "Mėgstamiausi",
+  "notifications.filter.boosts": "Pakėlimai",
+  "notifications.filter.favourites": "Mėgstami",
   "notifications.filter.follows": "Sekimai",
   "notifications.filter.mentions": "Paminėjimai",
   "notifications.filter.polls": "Balsavimo rezultatai",
-  "notifications.filter.statuses": "Atnaujinimai iš žmonių kuriuos sekate",
+  "notifications.filter.statuses": "Naujinimai iš žmonių, kuriuos seki",
   "notifications.grant_permission": "Suteikti leidimą.",
   "notifications.group": "{count} pranešimai",
   "notifications.mark_as_read": "Pažymėti kiekvieną pranešimą kaip perskaitytą",
-  "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos",
-  "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas",
-  "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nesuteiktas reikiamas leidimas.",
+  "notifications.permission_denied": "Darbalaukio pranešimai nepasiekiami dėl anksčiau atmestos naršyklės leidimų užklausos.",
+  "notifications.permission_denied_alert": "Negalima įjungti darbalaukio pranešimų, nes prieš tai naršyklės leidimas buvo atmestas.",
+  "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nebuvo suteiktas reikiamas leidimas.",
+  "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
+  "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
+  "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
+  "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
+  "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
+  "notifications.policy.title": "Filtruoti pranešimus iš…",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
-  "notifications_permission_banner.how_to_control": "Jei norite gauti pranešimus, kai \"Mastodon\" nėra atidarytas, įjunkite darbalaukio pranešimus. Įjungę darbalaukio pranešimus, galite tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudodamiesi pirmiau esančiu mygtuku {icon}.",
-  "notifications_permission_banner.title": "Niekada nieko nepraleiskite",
-  "onboarding.action.back": "Gražinkite mane atgal",
-  "onboarding.actions.back": "Gražinkite mane atgal",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
+  "notifications_permission_banner.title": "Niekada nieko nepraleisk",
+  "onboarding.action.back": "Grąžinti mane atgal",
+  "onboarding.actions.back": "Grąžinti mane atgal",
+  "onboarding.actions.go_to_explore": "Į tendencijų puslapį",
+  "onboarding.actions.go_to_home": "Į mano pagrindinį srautų puslapį",
   "onboarding.compose.template": "Sveiki #Mastodon!",
-  "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Galite pabandyti naudoti paiešką arba naršyti atradimo puslapyje, kad surastumėte žmonių, kuriuos norite sekti, arba pabandyti vėliau.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Gali pabandyti naudoti paiešką arba naršyti atradimo puslapį, kad surastum žmonių, kuriuos nori sekti, arba bandyti vėliau.",
+  "onboarding.follows.lead": "Tavo pagrindinis srautas – pagrindinis būdas patirti Mastodon. Kuo daugiau žmonių seksi, tuo jis bus aktyvesnis ir įdomesnis. Norint pradėti, pateikiame keletą pasiūlymų:",
+  "onboarding.follows.title": "Suasmenink savo pagrindinį srautą",
   "onboarding.profile.discoverable": "Padaryti mano profilį atrandamą",
-  "onboarding.profile.discoverable_hint": "Kai pasirenki Mastodon atrandamumą, tavo įrašai gali būti rodomi paieškos rezultatuose ir trendose, o profilis gali būti siūlomas panašių interesų turintiems žmonėms.",
+  "onboarding.profile.discoverable_hint": "Kai sutinki su Mastodon atrandamumu, tavo įrašai gali būti rodomi paieškos rezultatuose ir tendencijose, o profilis gali būti siūlomas panašių pomėgių turintiems žmonėms.",
   "onboarding.profile.display_name": "Rodomas vardas",
   "onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
   "onboarding.profile.lead": "Gali visada tai užbaigti vėliau nustatymuose, kur yra dar daugiau pritaikymo parinkčių.",
   "onboarding.profile.note": "Biografija",
   "onboarding.profile.note_hint": "Gali @paminėti kitus žmones arba #saitažodžius…",
   "onboarding.profile.save_and_continue": "Išsaugoti ir tęsti",
-  "onboarding.profile.title": "Profilio konfigūravimas",
+  "onboarding.profile.title": "Profilio sąranka",
   "onboarding.profile.upload_avatar": "Įkelti profilio nuotrauką",
   "onboarding.profile.upload_header": "Įkelti profilio antraštę",
-  "onboarding.share.lead": "Praneškite žmonėms, kaip jus rasti \"Mastodon\"!",
-  "onboarding.share.message": "Aš {username} #Mastodon! Ateik sekti manęs adresu {url}",
+  "onboarding.share.lead": "Leisk žmonėms sužinoti, kaip tave rasti Mastodon!",
+  "onboarding.share.message": "Aš {username}, esant #Mastodon! Ateik sekti manęs adresu {url}.",
   "onboarding.share.next_steps": "Galimi kiti žingsniai:",
-  "onboarding.share.title": "Bendrinkite savo profilį",
-  "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės žiniasklaidos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
-  "onboarding.start.skip": "Want to skip right ahead?",
-  "onboarding.start.title": "Jums pavyko!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
-  "onboarding.steps.publish_status.title": "Susikūrk savo pirmąjį įrašą",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
-  "picture_in_picture.restore": "Padėkite jį atgal",
-  "poll.closed": "Uždaryti",
+  "onboarding.share.title": "Bendrink savo profilį",
+  "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės medijos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
+  "onboarding.start.skip": "Nereikia pagalbos pradėti?",
+  "onboarding.start.title": "Tau pavyko!",
+  "onboarding.steps.follow_people.body": "Sekti įdomius žmones – tai, kas yra Mastodon.",
+  "onboarding.steps.follow_people.title": "Suasmenink savo pagrindinį srautą",
+  "onboarding.steps.publish_status.body": "Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis {emoji}.",
+  "onboarding.steps.publish_status.title": "Sukūrk savo pirmąjį įrašą",
+  "onboarding.steps.setup_profile.body": "Padidink savo sąveiką turint išsamų profilį.",
+  "onboarding.steps.setup_profile.title": "Suasmenink savo profilį",
+  "onboarding.steps.share_profile.body": "Leisk draugams sužinoti, kaip tave rasti Mastodon.",
+  "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
+  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatęs (-usi) dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Ar žinojai?</strong> Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
+  "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
+  "onboarding.tips.verification": "<strong>Ar žinojai?</strong> Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
+  "password_confirmation.exceeds_maxlength": "Slaptažodžio patvirtinimas viršija maksimalų slaptažodžio ilgį.",
+  "password_confirmation.mismatching": "Slaptažodžio patvirtinimas nesutampa.",
+  "picture_in_picture.restore": "Padėti jį atgal",
+  "poll.closed": "Uždaryta",
   "poll.refresh": "Atnaujinti",
   "poll.reveal": "Peržiūrėti rezultatus",
+  "poll.total_people": "{count, plural, one {# žmogus} few {# žmonės} many {# žmogus} other {# žmonių}}",
+  "poll.total_votes": "{count, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
   "poll.vote": "Balsuoti",
   "poll.voted": "Tu balsavai už šį atsakymą",
   "poll.votes": "{votes, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
   "poll_button.add_poll": "Pridėti apklausą",
-  "poll_button.remove_poll": "Šalinti apklausą",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visiems matomas",
-  "privacy.public.short": "Viešas",
-  "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
-  "privacy.unlisted.short": "Neįtrauktas į sąrašą",
+  "poll_button.remove_poll": "Pašalinti apklausą",
+  "privacy.change": "Keisti įrašo privatumą",
+  "privacy.direct.long": "Visus, paminėtus įraše",
+  "privacy.direct.short": "Konkretūs žmonės",
+  "privacy.private.long": "Tik sekėjams",
+  "privacy.private.short": "Sekėjai",
+  "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
+  "privacy.public.short": "Vieša",
+  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
+  "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
   "refresh": "Atnaujinti",
-  "regeneration_indicator.label": "Kraunasi…",
+  "regeneration_indicator.label": "Kraunama…",
+  "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
+  "relative_time.days": "{number} d.",
+  "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}",
+  "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}",
   "relative_time.full.just_now": "ką tik",
+  "relative_time.full.minutes": "prieš {number, plural, one {# minutę} few {# minutes} many {# minutės} other {# minučių}}",
+  "relative_time.full.seconds": "prieš {number, plural, one {# sekundę} few {# sekundes} many {# sekundės} other {# sekundžių}}",
   "relative_time.hours": "{number} val.",
   "relative_time.just_now": "dabar",
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
   "reply_indicator.cancel": "Atšaukti",
+  "reply_indicator.poll": "Apklausa",
   "report.block": "Blokuoti",
-  "report.categories.legal": "Legalus",
+  "report.block_explanation": "Jų įrašų nematysi. Jie negalės matyti tavo įrašų ar sekti tavęs. Jie galės pamatyti, kad yra užblokuoti.",
+  "report.categories.legal": "Teisinės",
   "report.categories.other": "Kita",
   "report.categories.spam": "Šlamštas",
   "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
-  "report.category.subtitle": "Pasirinkite tinkamiausią variantą",
+  "report.category.subtitle": "Pasirink geriausią atitikmenį.",
+  "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}",
   "report.category.title_account": "profilis",
   "report.category.title_status": "įrašas",
   "report.close": "Atlikta",
-  "report.comment.title": "Ar yra dar kas nors, ką, jūsų manymu, turėtume žinoti?",
+  "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?",
+  "report.forward": "Persiųsti į {target}",
+  "report.forward_hint": "Paskyra yra iš kito serverio. Siųsti anoniminę šios ataskaitos kopiją ir ten?",
+  "report.mute": "Nutildyti",
   "report.mute_explanation": "Jų įrašų nematysi. Jie vis tiek gali tave sekti ir matyti įrašus, bet nežinos, kad jie nutildyti.",
   "report.next": "Tęsti",
   "report.placeholder": "Papildomi komentarai",
@@ -504,57 +630,107 @@
   "report.reasons.legal": "Tai nelegalu",
   "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
   "report.reasons.other": "Tai kažkas kita",
-  "report.rules.subtitle": "Pasirink viską, kas tinka",
+  "report.reasons.other_description": "Problema netinka kitoms kategorijoms",
+  "report.reasons.spam": "Tai šlamštas",
+  "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
+  "report.reasons.violation": "Tai pažeidžia serverio taisykles",
+  "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",
+  "report.rules.subtitle": "Pasirink viską, kas tinka.",
   "report.rules.title": "Kokios taisyklės pažeidžiamos?",
-  "report.statuses.subtitle": "Pasirinkti viską, kas tinka",
-  "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį pranešimą?",
+  "report.statuses.subtitle": "Pasirink viską, kas tinka.",
+  "report.statuses.title": "Ar yra kokių nors įrašų, patvirtinančių šį ataskaitą?",
   "report.submit": "Pateikti",
-  "report.target": "Report {target}",
-  "report.thanks.take_action": "Čia pateikiamos galimybės kontroliuoti, ką matote \"Mastodon\":",
-  "report.thanks.take_action_actionable": "Kol tai peržiūrėsime, galite imtis veiksmų prieš @{name}:",
-  "report.thanks.title": "Nenorite to matyti?",
-  "report.thanks.title_actionable": "Ačiū, kad pranešėte, mes tai išnagrinėsime.",
+  "report.target": "Pranešama apie {target}",
+  "report.thanks.take_action": "Štai parinktys, kaip kontroliuoti, ką matai Mastodon:",
+  "report.thanks.take_action_actionable": "Kol peržiūrėsime, gali imtis veiksmų prieš {name}:",
+  "report.thanks.title": "Nenori to matyti?",
+  "report.thanks.title_actionable": "Ačiū, kad pranešei, mes tai išnagrinėsime.",
   "report.unfollow": "Nebesekti @{name}",
-  "report.unfollow_explanation": "Jūs sekate šią paskyrą. Norėdami nebematyti jų įrašų savo pagrindiniame kanale, panaikinkite jų sekimą.",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report.unfollow_explanation": "Tu seki šią paskyrą. Jei nori nebematyti jų įrašų savo pagrindiniame sraute, nebesek jų.",
+  "report_notification.attached_statuses": "Pridėti {count, plural, one {{count} įrašas} few {{count} įrašai} many {{count} įrašo} other {{count} įrašų}}",
+  "report_notification.categories.legal": "Teisinės",
+  "report_notification.categories.other": "Kita",
+  "report_notification.categories.spam": "Šlamštas",
+  "report_notification.categories.violation": "Taisyklės pažeidimas",
+  "report_notification.open": "Atidaryti ataskaitą",
+  "search.no_recent_searches": "Nėra naujausių paieškų.",
   "search.placeholder": "Paieška",
-  "search.search_or_paste": "Ieškok arba įklijuok URL",
+  "search.quick_action.account_search": "Profiliai, atitinkantys {x}",
+  "search.quick_action.go_to_account": "Eiti į profilį {x}",
+  "search.quick_action.go_to_hashtag": "Eiti į saitažodį {x}",
+  "search.quick_action.open_url": "Atidaryti URL adresą Mastodon",
+  "search.quick_action.status_search": "Pranešimai, atitinkantys {x}",
+  "search.search_or_paste": "Ieškoti arba įklijuoti URL",
   "search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
   "search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
   "search_popout.language_code": "ISO kalbos kodas",
+  "search_popout.options": "Paieškos nustatymai",
+  "search_popout.quick_actions": "Spartūs veiksmai",
+  "search_popout.recent": "Naujausios paieškos",
   "search_popout.specific_date": "konkreti data",
   "search_popout.user": "naudotojas",
   "search_results.accounts": "Profiliai",
   "search_results.all": "Visi",
   "search_results.hashtags": "Saitažodžiai",
   "search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
-  "search_results.statuses": "Toots",
+  "search_results.see_all": "Žiūrėti viską",
+  "search_results.statuses": "Įrašai",
+  "search_results.title": "Ieškoti {q}",
   "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
   "server_banner.active_users": "aktyvūs naudotojai",
+  "server_banner.administered_by": "Administruoja:",
+  "server_banner.introduction": "{domain} – decentralizuoto socialinio tinklo dalis, kurį palaiko {mastodon}.",
+  "server_banner.learn_more": "Sužinoti daugiau",
+  "server_banner.server_stats": "Serverio statistika:",
+  "sign_in_banner.create_account": "Sukurti paskyrą",
   "sign_in_banner.sign_in": "Prisijungimas",
+  "sign_in_banner.sso_redirect": "Prisijungti arba užsiregistruoti",
   "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
+  "status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
+  "status.admin_status": "Atidaryti šį įrašą prižiūrėjimo sąsajoje",
+  "status.block": "Blokuoti @{name}",
+  "status.bookmark": "Pridėti į žymės",
+  "status.cancel_reblog_private": "Nebepakelti",
+  "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",
+  "status.detailed_status": "Išsami pokalbio peržiūra",
+  "status.direct": "Privačiai paminėti @{name}",
+  "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
-  "status.edited": "Redaguota {date}",
-  "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.edited": "Paskutinį kartą redaguota {date}",
+  "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
+  "status.embed": "Įterpti",
+  "status.favourite": "Pamėgti",
+  "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
+  "status.filter": "Filtruoti šį įrašą",
+  "status.filtered": "Filtruota",
   "status.hide": "Slėpti įrašą",
-  "status.load_more": "Pakrauti daugiau",
+  "status.history.created": "{name} sukurta {date}",
+  "status.history.edited": "{name} redaguota {date}",
+  "status.load_more": "Krauti daugiau",
   "status.media.open": "Spausk, kad atidaryti",
   "status.media.show": "Spausk, kad matyti",
   "status.media_hidden": "Paslėpta medija",
   "status.mention": "Paminėti @{name}",
   "status.more": "Daugiau",
-  "status.open": "Expand this status",
+  "status.mute": "Nutildyti @{name}",
+  "status.mute_conversation": "Nutildyti pokalbį",
+  "status.open": "Išplėsti šį įrašą",
   "status.pin": "Prisegti prie profilio",
   "status.pinned": "Prisegtas įrašas",
   "status.read_more": "Skaityti daugiau",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Ištrinti ir iš naujo parengti juodraštį",
+  "status.reblog": "Pakelti",
+  "status.reblog_private": "Pakelti su originaliu matomumu",
+  "status.reblogged_by": "{name} pakėlė",
+  "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "status.redraft": "Ištrinti ir parengti iš naujo",
+  "status.remove_bookmark": "Pašalinti žymę",
+  "status.replied_to": "Atsakyta į {name}",
   "status.reply": "Atsakyti",
   "status.replyAll": "Atsakyti į giją",
-  "status.report": "Pranešti @{name}",
+  "status.report": "Pranešti apie @{name}",
   "status.sensitive_warning": "Jautrus turinys",
   "status.share": "Bendrinti",
   "status.show_filter_reason": "Rodyti vis tiek",
@@ -563,38 +739,62 @@
   "status.show_more": "Rodyti daugiau",
   "status.show_more_all": "Rodyti daugiau visiems",
   "status.show_original": "Rodyti originalą",
-  "status.title.with_attachments": "{user}{attachmentCount, plural, one {priedas} few {{attachmentCount} priedai} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
+  "status.title.with_attachments": "{user} paskelbė {attachmentCount, plural, one {priedą} few {{attachmentCount} priedus} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
   "status.translate": "Versti",
-  "status.translated_from_with": "Išversta iš {lang} naudojant {provider}",
-  "status.uncached_media_warning": "Peržiūra nepasiekiama",
-  "tabs_bar.home": "Pradžia",
+  "status.translated_from_with": "Išversta iš {lang} naudojant {provider}.",
+  "status.uncached_media_warning": "Peržiūra nepasiekiama.",
+  "status.unmute_conversation": "Atšaukti pokalbio nutildymą",
+  "status.unpin": "Atsegti iš profilio",
+  "subscribed_languages.lead": "Po pakeitimo tavo pagrindinėje ir sąrašo laiko skalėje bus rodomi tik įrašai pasirinktomis kalbomis. Jei nori gauti įrašus visomis kalbomis, pasirink nė vieno.",
+  "subscribed_languages.save": "Išsaugoti pakeitimus",
+  "subscribed_languages.target": "Keisti prenumeruojamas kalbas {target}",
+  "tabs_bar.home": "Pagrindinis",
   "tabs_bar.notifications": "Pranešimai",
-  "time_remaining.days": "Liko {number, plural, one {# diena} few {# dienos} many {# dieno} other {# dienų}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomas.",
+  "time_remaining.days": "liko {number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
+  "time_remaining.hours": "liko {number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
+  "time_remaining.minutes": "liko {number, plural, one {# minutė} few {# minutės} many {# minutės} other {# minučių}}",
+  "time_remaining.moments": "liko akimirkos",
+  "time_remaining.seconds": "liko {number, plural, one {# sekundė} few {# sekundės} many {# sekundės} other {# sekundžių}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
   "timeline_hint.resources.followers": "Sekėjai",
   "timeline_hint.resources.follows": "Seka",
   "timeline_hint.resources.statuses": "Senesni įrašai",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
+  "trends.trending_now": "Tendencinga dabar",
   "ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",
+  "units.short.billion": "{count} mlrd.",
+  "units.short.million": "{count} mln.",
   "units.short.thousand": "{count} tūkst.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Nėra pridėto aprašymo",
+  "upload_area.title": "Nuvilk, kad įkeltum",
+  "upload_button.label": "Pridėti vaizdų, vaizdo įrašą arba garso failą",
+  "upload_error.limit": "Viršyta failo įkėlimo riba.",
+  "upload_error.poll": "Failų įkėlimas neleidžiamas su apklausomis.",
+  "upload_form.audio_description": "Aprašyk žmonėms, kurie yra kurtieji ar neprigirdintys.",
+  "upload_form.description": "Aprašyk žmonėms, kurie yra aklieji arba silpnaregiai.",
   "upload_form.edit": "Redaguoti",
-  "upload_form.undo": "Ištrinti",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.thumbnail": "Keisti miniatiūrą",
+  "upload_form.video_description": "Aprašyk žmonėms, kurie yra kurtieji, neprigirdintys, aklieji ar silpnaregiai.",
+  "upload_modal.analyzing_picture": "Analizuojamas vaizdas…",
+  "upload_modal.apply": "Taikyti",
+  "upload_modal.applying": "Pritaikoma…",
   "upload_modal.choose_image": "Pasirinkti vaizdą",
   "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
+  "upload_modal.detect_text": "Aptikti tekstą iš nuotraukos",
   "upload_modal.edit_media": "Redaguoti mediją",
+  "upload_modal.hint": "Spustelėk arba nuvilk apskritimą peržiūroje, kad pasirinktum centrinį tašką, kuris visada bus matomas visose miniatiūrose.",
+  "upload_modal.preparing_ocr": "Rengimas OCR…",
+  "upload_modal.preview_label": "Peržiūra ({ratio})",
   "upload_progress.label": "Įkeliama...",
   "upload_progress.processing": "Apdorojama…",
   "username.taken": "Šis naudotojo vardas užimtas. Pabandyk kitą.",
   "video.close": "Uždaryti vaizdo įrašą",
   "video.download": "Atsisiųsti failą",
   "video.exit_fullscreen": "Išeiti iš viso ekrano",
+  "video.expand": "Išplėsti vaizdo įrašą",
   "video.fullscreen": "Visas ekranas",
   "video.hide": "Slėpti vaizdo įrašą",
-  "video.mute": "Nutildyti garsą",
+  "video.mute": "Išjungti garsą",
+  "video.pause": "Pristabdyti",
   "video.play": "Leisti",
-  "video.unmute": "Atitildyti garsą"
+  "video.unmute": "Įjungti garsą"
 }
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c06a1d9368..32ea6e47c4 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -8,7 +8,7 @@
   "about.domain_blocks.silenced.title": "Ierobežotie",
   "about.domain_blocks.suspended.explanation": "Nekādi dati no šī servera netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu mijiedarbību vai saziņu ar lietotājiem no šī servera.",
   "about.domain_blocks.suspended.title": "Apturētie",
-  "about.not_available": "Šī informācija šajā serverī nav bijusi pieejama.",
+  "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
   "about.rules": "Servera noteikumi",
   "account.account_note_header": "Piezīme",
@@ -21,24 +21,26 @@
   "account.blocked": "Bloķēts",
   "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
   "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
+  "account.copy": "Ievietot saiti uz profilu starpliktuvē",
   "account.direct": "Pieminēt @{name} privāti",
   "account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
   "account.domain_blocked": "Domēns ir bloķēts",
-  "account.edit_profile": "Rediģēt profilu",
+  "account.edit_profile": "Labot profilu",
   "account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
   "account.endorse": "Izcelts profilā",
   "account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
   "account.featured_tags.last_status_never": "Ierakstu nav",
   "account.featured_tags.title": "{name} izceltie tēmturi",
   "account.follow": "Sekot",
+  "account.follow_back": "Sekot atpakaļ",
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
-  "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
+  "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
   "account.following": "Seko",
-  "account.following_counter": "{count, plural, one {{counter} sekojamais} other {{counter} sekojamie}}",
+  "account.following_counter": "{count, plural, zero{{counter} sekojamo} one {{counter} sekojamais} other {{counter} sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.go_to_profile": "Doties uz profilu",
-  "account.hide_reblogs": "Slēpt @{name} izceltas ziņas",
+  "account.hide_reblogs": "Paslēpt @{name} pastiprinātos ierakstus",
   "account.in_memoriam": "Piemiņai.",
   "account.joined_short": "Pievienojās",
   "account.languages": "Mainīt abonētās valodas",
@@ -51,13 +53,14 @@
   "account.mute_notifications_short": "Izslēgt paziņojumu skaņu",
   "account.mute_short": "Apklusināt",
   "account.muted": "Apklusināts",
+  "account.mutual": "Savstarpējs",
   "account.no_bio": "Apraksts nav sniegts.",
   "account.open_original_page": "Atvērt oriģinālo lapu",
   "account.posts": "Ieraksti",
   "account.posts_with_replies": "Ieraksti un atbildes",
   "account.report": "Sūdzēties par @{name}",
   "account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
-  "account.requested_follow": "{name} nosūtīja tev sekošanas pieprasījumu",
+  "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.share": "Dalīties ar @{name} profilu",
   "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
   "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
@@ -86,7 +89,9 @@
   "announcement.announcement": "Paziņojums",
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
-  "autosuggest_hashtag.per_week": "{count} nedēļā",
+  "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
+  "block_modal.show_less": "Parādīt vairāk",
+  "block_modal.show_more": "Parādīt mazāk",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -98,18 +103,18 @@
   "bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Aizvērt",
-  "bundle_modal_error.message": "Kaut kas nogāja greizi, ielādējot šo komponenti.",
+  "bundle_modal_error.message": "Kaut kas nogāja greizi šīs sastāvdaļas ielādēšanas laikā.",
   "bundle_modal_error.retry": "Mēģināt vēlreiz",
   "closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
-  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču ņem vērā, ka tev nav nepieciešams konts tieši {domain}, lai lietotu Mastodon.",
+  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu {domain}, bet, lūdzu, ņem vērā, ka Tev nav nepieciešams tieši {domain} konts, lai lietotu Mastodon!",
   "closed_registrations_modal.find_another_server": "Atrast citu serveri",
-  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsi sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
+  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur Tu izveido savu kontu, varēsi sekot un mijiedarboties ar ikvienu šajā serverī. Tu pat vari to pašizvietot!",
   "closed_registrations_modal.title": "Reģistrēšanās Mastodon",
   "column.about": "Par",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
   "column.community": "Vietējā laika līnija",
-  "column.direct": "Privāti pieminēti",
+  "column.direct": "Privātas pieminēšanas",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
   "column.favourites": "Iecienītie",
@@ -134,76 +139,72 @@
   "community.column_settings.remote_only": "Tikai attālinātie",
   "compose.language.change": "Mainīt valodu",
   "compose.language.search": "Meklēt valodas...",
-  "compose.published.body": "Ziņa publicēta.",
+  "compose.published.body": "Ieraksts publicēta.",
   "compose.published.open": "Atvērt",
   "compose.saved.body": "Ziņa saglabāta.",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
-  "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
+  "compose_form.encryption_warning": "Mastodon ieraksti nav pilnībā šifrēti. Nedalies ar jebkādu jutīgu informāciju caur Mastodon!",
   "compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
-  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
+  "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot, lai redzētu tikai sekotājiem paredzētos ierakstus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
-  "compose_form.placeholder": "Kas tev padomā?",
-  "compose_form.poll.add_option": "Pievienot izvēli",
+  "compose_form.placeholder": "Kas Tev padomā?",
   "compose_form.poll.duration": "Aptaujas ilgums",
-  "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
-  "compose_form.poll.remove_option": "Noņemt šo izvēli",
+  "compose_form.poll.multiple": "Vairākas izvēles iespējas",
+  "compose_form.poll.option_placeholder": "Izvēle {number}",
+  "compose_form.poll.single": "Jāizvēlas viens",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
-  "compose_form.publish": "Publicēt",
+  "compose_form.publish": "Iesūtīt",
   "compose_form.publish_form": "Jauns ieraksts",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Saglabāt izmaiņas",
-  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
+  "compose_form.reply": "Atbildēt",
+  "compose_form.save_changes": "Atjaunināt",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
-  "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
+  "compose_form.spoiler_placeholder": "Satura brīdinājums (pēc izvēles)",
   "confirmation_modal.cancel": "Atcelt",
-  "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
   "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
   "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
   "confirmations.delete_list.confirm": "Dzēst",
-  "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?",
+  "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
-  "confirmations.discard_edit_media.message": "Tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā. Vēlies tās atmest?",
-  "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
+  "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
-  "confirmations.edit.confirm": "Rediģēt",
+  "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
-  "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.",
-  "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
   "confirmations.reply.confirm": "Atbildēt",
-  "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?",
+  "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
   "conversation.with": "Ar {names}",
+  "copy_icon_button.copied": "Ievietots starpliktuvē",
   "copypaste.copied": "Nokopēts",
   "copypaste.copy_to_clipboard": "Kopēt uz starpliktuvi",
   "directory.federated": "No pazīstamas federācijas",
   "directory.local": "Tikai no {domain}",
   "directory.new_arrivals": "Jaunpienācēji",
-  "directory.recently_active": "Nesen aktīvie",
+  "directory.recently_active": "Nesen aktīvi",
   "disabled_account_banner.account_settings": "Konta iestatījumi",
   "disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
-  "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.",
+  "dismissable_banner.community_timeline": "Šie ir jaunākie publiskie ieraksti no cilvēkiem, kuru konti ir mitināti {domain}.",
   "dismissable_banner.dismiss": "Atcelt",
   "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
-  "dismissable_banner.explore_statuses": "Ieraksti, kas šobrīd gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti neseni ieraksti, kas pastiprināti un pievienoti izlasēm.",
+  "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
-  "dismissable_banner.public_timeline": "Šīs ir jaunākās publiskās ziņas no lietotājiem sociālajā tīmeklī, kurām seko lietotāji domēnā {domain}.",
+  "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
+  "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
+  "domain_pill.server": "Serveris",
+  "domain_pill.username": "Lietotājvārds",
   "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
@@ -226,22 +227,22 @@
   "empty_column.account_timeline": "Šeit ziņojumu nav!",
   "empty_column.account_unavailable": "Profils nav pieejams",
   "empty_column.blocks": "Pašreiz tu neesi nevienu bloķējis.",
-  "empty_column.bookmarked_statuses": "Pašreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
+  "empty_column.bookmarked_statuses": "Pašlaik Tev nav neviena grāmatzīmēs pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
   "empty_column.community": "Vietējā laika līnija ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.direct": "Jums vēl nav nevienas privātas pieminēšanas. Nosūtot vai saņemot to, tas tiks parādīts šeit.",
+  "empty_column.direct": "Tev vēl nav privātu pieminēšanu. Kad Tu nosūtīsi vai saņemsi kādu, tā pārādīsies šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
-  "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!",
-  "empty_column.favourited_statuses": "Tev vēl nav nevienas iecienītākās ziņas. Kad iecienīsi kādu, tas tiks parādīts šeit.",
+  "empty_column.explore_statuses": "Pašlaik nav nekā aktuāla. Ieskaties šeit vēlāk!",
+  "empty_column.favourited_statuses": "Tev vēl nav iecienītāko ierakstu. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.",
   "empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.",
-  "empty_column.follow_requests": "Šobrīd tev nav sekošanas pieprasījumu. Kad kāds pieteiksies tev sekot, pieprasījums parādīsies šeit.",
+  "empty_column.follow_requests": "Šobrīd Tev nav sekošanas pieprasījumu. Kad saņemsi kādu, tas parādīsies šeit.",
   "empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
   "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
-  "empty_column.home": "Tava mājas laikrinda ir tukša! Lai to aizpildītu, pieseko vairāk cilvēkiem.",
-  "empty_column.list": "Šis saraksts pašreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
-  "empty_column.lists": "Pašreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
+  "empty_column.home": "Tava mājas laikjosla ir tukša. Seko vairāk cilvēkiem, lai to piepildītu!",
+  "empty_column.list": "Pagaidām šajā sarakstā nekā nav. Kad šī saraksta dalībnieki ievietos jaunus ierakstus, tie parādīsies šeit.",
+  "empty_column.lists": "Pašlaik Tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
   "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.",
-  "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar tevi mijiedarbosies, tu to redzēsi šeit.",
-  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai pieseko lietotājiem no citiem serveriem",
+  "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar Tevi mijiedarbosies, Tu to redzēsi šeit.",
+  "empty_column.public": "Šeit nekā nav. Ieraksti kaut ko publiski vai seko lietotājiem no citiem serveriem, lai iegūtu saturu",
   "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.",
   "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.",
   "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai lietotni.",
@@ -250,13 +251,13 @@
   "errors.unexpected_crash.report_issue": "Ziņot par problēmu",
   "explore.search_results": "Meklēšanas rezultāti",
   "explore.suggested_follows": "Cilvēki",
-  "explore.title": "Pārlūkot",
+  "explore.title": "Izpētīt",
   "explore.trending_links": "Jaunumi",
-  "explore.trending_statuses": "Ziņas",
+  "explore.trending_statuses": "Ieraksti",
   "explore.trending_tags": "Tēmturi",
-  "filter_modal.added.context_mismatch_explanation": "Šī filtra kategorija neattiecas uz kontekstu, kurā esi piekļuvis šai ziņai. Ja vēlies, lai ziņa tiktu filtrēta arī šajā kontekstā, tev būs jārediģē filtrs.",
+  "filter_modal.added.context_mismatch_explanation": "Šī atlases kategorija neattiecas uz kontekstu, kurā esi piekļuvis šim ierakstam. Ja vēlies, lai ieraksts tiktu atlasīts arī šajā kontekstā, Tev būs jālabo atlase.",
   "filter_modal.added.context_mismatch_title": "Konteksta neatbilstība!",
-  "filter_modal.added.expired_explanation": "Šai filtra kategorijai ir beidzies derīguma termiņš. Lai to lietotu, tev būs jāmaina derīguma termiņš.",
+  "filter_modal.added.expired_explanation": "Šai atlases kategorijai ir beidzies derīguma termiņš. Lai to lietotu, Tev būs jāmaina derīguma termiņš.",
   "filter_modal.added.expired_title": "Filtra termiņš beidzies!",
   "filter_modal.added.review_and_configure": "Lai pārskatītu un tālāk konfigurētu šo filtru kategoriju, dodies uz {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Filtra iestatījumi",
@@ -266,16 +267,23 @@
   "filter_modal.select_filter.context_mismatch": "neattiecas uz šo kontekstu",
   "filter_modal.select_filter.expired": "beidzies",
   "filter_modal.select_filter.prompt_new": "Jauna kategorija: {name}",
-  "filter_modal.select_filter.search": "Meklē vai izveido",
+  "filter_modal.select_filter.search": "Meklēt vai izveidot",
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
+  "filtered_notifications_banner.pending_requests": "Paziņojumi no {count, plural, =0 {neviena} one {viena cilvēka} other {# cilvēkiem}}, ko Tu varētu zināt",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
   "follow_request.authorize": "Autorizēt",
   "follow_request.reject": "Noraidīt",
-  "follow_requests.unlocked_explanation": "Lai gan tavs konts nav bloķēts, {domain} darbinieki iedomājās, ka, iespējams, vēlēsies pārskatīt pieprasījumus no šiem kontiem.",
+  "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.",
+  "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
+  "follow_suggestions.dismiss": "Vairs nerādīt",
+  "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
+  "follow_suggestions.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
+  "follow_suggestions.view_all": "Skatīt visu",
+  "follow_suggestions.who_to_follow": "Kam sekot",
   "followed_tags": "Sekojamie tēmturi",
   "footer.about": "Par",
   "footer.directory": "Profilu direktorija",
@@ -297,34 +305,29 @@
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
   "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalībnieks} other {{counter} dalībnieki}}",
-  "hashtag.counter_by_uses": "{count, plural, zero {{counter} ziņa} one {{counter} ieraksts} other {{counter} ziņas}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}} šodien",
+  "hashtag.counter_by_uses": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
+  "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "..un {count, plural, other {# vairāk}}",
-  "home.actions.go_to_explore": "Skatīt tendences",
-  "home.actions.go_to_suggestions": "Atrodi cilvēkus kam sekot",
-  "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
-  "home.explore_prompt.body": "Tavā mājas plūsmā būs dažādu ziņu sajaukums no atsaucēm, kurām esi izvēlējies sekot, personām, kurām esi izvēlējies sekot, un ziņām, kuras tās izceļ. Ja tas šķiet pārāk kluss, iespējams, vēlēsies:",
-  "home.explore_prompt.title": "Šī ir tava Mastodon mājvieta.",
   "home.hide_announcements": "Slēpt paziņojumus",
   "home.pending_critical_update.body": "Lūdzu, pēc iespējas ātrāk atjaunini savu Mastodon serveri!",
   "home.pending_critical_update.link": "Skatīt jauninājumus",
   "home.pending_critical_update.title": "Pieejams kritisks drošības jauninājums!",
   "home.show_announcements": "Rādīt paziņojumus",
   "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
-  "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.",
-  "interaction_modal.description.reblog": "Izmantojot kontu Mastodon, tu vari izcelt šo ziņu, lai kopīgotu to ar saviem sekotājiem.",
+  "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
+  "interaction_modal.description.reblog": "Ar Mastodon kontu Tu vari izvirzīt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
   "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
-  "interaction_modal.login.action": "Nogādā mani mājās",
+  "interaction_modal.login.action": "Nogādāt mani mājās",
   "interaction_modal.login.prompt": "Tavas mājvietas servera domēns, piem., mastodon.social",
   "interaction_modal.no_account_yet": "Neesi Mastodon?",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
-  "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts tavs konts?",
-  "interaction_modal.sign_in_hint": "Padoms: Šī ir vietne, kurā tu piereģistrējies. Ja neatceries, meklē sveiciena e-pastu savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu! (piem., @Mastodon@mastodon.social)",
+  "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts Tavs konts?",
+  "interaction_modal.sign_in_hint": "Padoms: tā ir tīmekļvietne, kurā Tu reģistrējies. Ja neatceries, jāmeklē sveiciena e-pasts savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu (piem., @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei",
   "interaction_modal.title.follow": "Sekot {name}",
   "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
@@ -376,12 +379,12 @@
   "link_preview.author": "Pēc {name}",
   "lists.account.add": "Pievienot sarakstam",
   "lists.account.remove": "Noņemt no saraksta",
-  "lists.delete": "Dzēst sarakstu",
-  "lists.edit": "Rediģēt sarakstu",
+  "lists.delete": "Izdzēst sarakstu",
+  "lists.edit": "Labot sarakstu",
   "lists.edit.submit": "Mainīt virsrakstu",
-  "lists.exclusive": "Paslēpt šīs ziņas no mājvietas",
+  "lists.exclusive": "Nerādīt šos ierakstus sākumā",
   "lists.new.create": "Pievienot sarakstu",
-  "lists.new.title_placeholder": "Jaunais saraksta nosaukums",
+  "lists.new.title_placeholder": "Jaunā saraksta nosaukums",
   "lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
   "lists.replies_policy.list": "Saraksta dalībniekiem",
   "lists.replies_policy.none": "Nevienam",
@@ -389,22 +392,23 @@
   "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
+  "loading_indicator.label": "Ielādē…",
   "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
-  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
-  "mute_modal.duration": "Ilgums",
-  "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
-  "mute_modal.indefinite": "Beztermiņa",
+  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Paslēpt paziņojumos",
+  "mute_modal.hide_options": "Paslēpt iespējas",
+  "mute_modal.show_options": "Parādīt iespējas",
+  "mute_modal.title": "Apklusināt lietotāju?",
   "navigation_bar.about": "Par",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
   "navigation_bar.community_timeline": "Vietējā laika līnija",
   "navigation_bar.compose": "Veidot jaunu ziņu",
-  "navigation_bar.direct": "Privāti pieminēti",
+  "navigation_bar.direct": "Privātas pieminēšanas",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.edit_profile": "Rediģēt profilu",
-  "navigation_bar.explore": "Pārlūkot",
+  "navigation_bar.explore": "Izpētīt",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
@@ -413,37 +417,46 @@
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
-  "navigation_bar.opened_in_classic_interface": "Ziņas, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
+  "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
   "navigation_bar.personal": "Personīgie",
   "navigation_bar.pins": "Piespraustās ziņas",
   "navigation_bar.preferences": "Iestatījumi",
   "navigation_bar.public_timeline": "Apvienotā laika līnija",
   "navigation_bar.search": "Meklēt",
   "navigation_bar.security": "Drošība",
-  "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.",
+  "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.",
   "notification.admin.report": "{name} ziņoja par {target}",
-  "notification.admin.sign_up": "{name} ir pierakstījies",
+  "notification.admin.sign_up": "{name} pierakstījās",
   "notification.favourite": "{name} pievienoja tavu ziņu izlasei",
-  "notification.follow": "{name} uzsāka tev sekot",
-  "notification.follow_request": "{name} nosūtīja tev sekošanas pieprasījumu",
-  "notification.mention": "{name} pieminēja tevi",
+  "notification.follow": "{name} uzsāka Tev sekot",
+  "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
+  "notification.mention": "{name} pieminēja Tevi",
+  "notification.moderation-warning.learn_more": "Uzzināt vairāk",
+  "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
+  "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Daži no Taviem ierakstiem tika atzīmēti kā jutīgi.",
+  "notification.moderation_warning.action_sensitive": "Tavi ieraksti turpmāk tiks atzīmēti kā jutīgi.",
+  "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
+  "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
   "notification.own_poll": "Tava aptauja ir noslēgusies",
   "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
-  "notification.reblog": "{name} pastiprināja tavu ierakstu",
+  "notification.reblog": "{name} pastiprināja Tavu ierakstu",
+  "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
+  "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
   "notification.status": "{name} tikko publicēja",
   "notification.update": "{name} rediģēja ierakstu",
+  "notification_requests.accept": "Pieņemt",
+  "notification_requests.dismiss": "Noraidīt",
+  "notification_requests.notifications_from": "Paziņojumi no {name}",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
   "notifications.column_settings.admin.report": "Jauni ziņojumi:",
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlase:",
-  "notifications.column_settings.filter_bar.advanced": "Rādīt visas kategorijas",
-  "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
-  "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
-  "notifications.column_settings.mention": "Pieminējumi:",
+  "notifications.column_settings.mention": "Pieminēšanas:",
   "notifications.column_settings.poll": "Aptaujas rezultāti:",
   "notifications.column_settings.push": "Uznirstošie paziņojumi",
   "notifications.column_settings.reblog": "Pastiprinātie ieraksti:",
@@ -457,7 +470,7 @@
   "notifications.filter.boosts": "Pastiprinātie ieraksti",
   "notifications.filter.favourites": "Izlases",
   "notifications.filter.follows": "Seko",
-  "notifications.filter.mentions": "Pieminējumi",
+  "notifications.filter.mentions": "Pieminēšanas",
   "notifications.filter.polls": "Aptaujas rezultāti",
   "notifications.filter.statuses": "Jaunumi no cilvēkiem, kuriem tu seko",
   "notifications.grant_permission": "Piešķirt atļauju.",
@@ -466,6 +479,9 @@
   "notifications.permission_denied": "Darbvirsmas paziņojumi nav pieejami, jo iepriekš tika noraidīts pārlūka atļauju pieprasījums",
   "notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
+  "notifications.policy.filter_new_accounts_title": "Jauni konti",
+  "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
+  "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
   "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
@@ -474,35 +490,44 @@
   "onboarding.actions.go_to_explore": "Skatīt tendences",
   "onboarding.actions.go_to_home": "Dodieties uz manu mājas plūsmu",
   "onboarding.compose.template": "Sveiki, #Mastodon!",
-  "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu personas, kurām sekot, vai mēģināt vēlreiz vēlāk.",
+  "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
   "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā izbaudīt Mastodon. Jo vairāk cilvēku sekosi, jo aktīvāk un interesantāk tas būs. Lai sāktu, šeit ir daži ieteikumi:",
-  "onboarding.follows.title": "Populārs Mastodon",
-  "onboarding.share.lead": "Paziņo citiem, kā viņi tevi var atrast Mastodon!",
+  "onboarding.follows.title": "Pielāgo savu mājas barotni",
+  "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
+  "onboarding.profile.display_name": "Attēlojamais vārds",
+  "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…",
+  "onboarding.profile.note": "Apraksts",
+  "onboarding.profile.note_hint": "Tu vari @pieminēt citus cilvēkus vai #tēmturus…",
+  "onboarding.profile.save_and_continue": "Saglabāt un turpināt",
+  "onboarding.profile.title": "Profila iestatīšana",
+  "onboarding.profile.upload_avatar": "Augšupielādēt profila attēlu",
+  "onboarding.profile.upload_header": "Augšupielādēt profila galveni",
+  "onboarding.share.lead": "Dari cilvēkiem zināmu, ka viņi var Tevi atrast Mastodon!",
   "onboarding.share.message": "Es esmu {username} #Mastodon! Nāc sekot man uz {url}",
   "onboarding.share.next_steps": "Iespējamie nākamie soļi:",
   "onboarding.share.title": "Kopīgo savu profilu",
-  "onboarding.start.lead": "Tagad tu esat daļa no Mastodon — unikālas, decentralizētas sociālo mediju platformas, kurā tu, nevis algoritms, veido savu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
+  "onboarding.start.lead": "Tagad Tu esi daļa no Mastodon — vienreizējas, decentralizētas sociālās mediju platformas, kurā Tu, nevis algoritms, veido Tavu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
   "onboarding.start.skip": "Nav nepieciešama palīdzība darba sākšanai?",
   "onboarding.start.title": "Tev tas izdevās!",
   "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.",
-  "onboarding.steps.follow_people.title": "Sekot {count, plural, one {one person} other {# cilvēkiem}}",
-  "onboarding.steps.publish_status.body": "Sveicini pasauli ar tekstu, fotoattēliem, video, vai aptaujām {emoji}",
+  "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni",
+  "onboarding.steps.publish_status.body": "Pasveicini pasauli ar tekstu, attēliem, video vai aptaujām {emoji}",
   "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
-  "onboarding.steps.setup_profile.body": "Citi, visticamāk, sazināsies ar tevi, izmantojot aizpildītu profilu.",
+  "onboarding.steps.setup_profile.body": "Palielini mijiedarbību ar aptverošu profilu!",
   "onboarding.steps.setup_profile.title": "Pielāgo savu profilu",
-  "onboarding.steps.share_profile.body": "Paziņo saviem draugiem, kā tevi atrast Mastodon!",
+  "onboarding.steps.share_profile.body": "Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!",
   "onboarding.steps.share_profile.title": "Kopīgo savu Mastodon profilu",
-  "onboarding.tips.2fa": "<strong>Vai zināji?</strong> Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divu faktoru autentifikāciju. Tas darbojas ar jebkuru tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
+  "onboarding.tips.2fa": "<strong>Vai zināji?</strong> Tu vari aizsargāt savu kontu, konta iestatījumos iestatot divpakāpju autentifikāciju. Tas darbojas ar jebkuru Tevis izvēlētu TOTP lietotni, nav nepieciešams tālruņa numurs!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Vai zināji?</strong> Tā kā Mastodon ir decentralizēts, daži profili, ar kuriem saskaraties, tiks mitināti citos, nevis tavos serveros. Un tomēr tu varat sazināties ar viņiem nevainojami! Viņu serveris atrodas viņu lietotājvārda otrajā pusē!",
-  "onboarding.tips.migration": "<strong>Vai zināji?</strong> Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu personīgo serveri!",
-  "onboarding.tips.verification": "<strong>Vai zināji?</strong> Tu vari verificēt savu kontu, ievietojot saiti uz savu Mastodon profilu savā vietnē un pievienojot vietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti!",
+  "onboarding.tips.migration": "<strong>Vai zināji?</strong> Ja uzskati, ka {domain} nākotnē nav lieliska servera izvēle, vari pāriet uz citu Mastodon serveri, nezaudējot savus sekotājus. Tu pat vari mitināt savu serveri!",
+  "onboarding.tips.verification": "<strong>Vai zināji?</strong> Tu vari apliecināt savu kontu, ievietojot savā tīmekļvietnē saiti uz savu Mastodon profilu un pievienojot tīmekļvietni savam profilam. Nav nepieciešami nekādi maksājumi vai dokumenti.",
   "password_confirmation.exceeds_maxlength": "Paroles apstiprināšana pārsniedz maksimālo paroles garumu",
   "password_confirmation.mismatching": "Paroles apstiprinājums neatbilst",
   "picture_in_picture.restore": "Novietot atpakaļ",
   "poll.closed": "Pabeigta",
   "poll.refresh": "Atsvaidzināt",
   "poll.reveal": "Skatīt rezultātus",
-  "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}",
+  "poll.total_people": "{count, plural, zero {# cilvēku} one {# cilvēks} other {# cilvēki}}",
   "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}",
   "poll.vote": "Balsot",
   "poll.voted": "Tu balsoji par šo atbildi",
@@ -510,16 +535,14 @@
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
-  "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai minētie cilvēki",
-  "privacy.private.long": "Redzama tikai sekotājiem",
-  "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem",
+  "privacy.direct.long": "Visi ierakstā pieminētie",
+  "privacy.direct.short": "Noteikti cilvēki",
+  "privacy.private.long": "Tikai Tavi sekotāji",
+  "privacy.private.short": "Sekotāji",
   "privacy.public.short": "Publiska",
-  "privacy.unlisted.long": "Redzams visiem, bet izslēgts no satura atklāšanas funkcijām",
-  "privacy.unlisted.short": "Neiekļautie",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
+  "recommended": "Ieteicams",
   "refresh": "Atsvaidzināt",
   "regeneration_indicator.label": "Ielādē…",
   "regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
@@ -535,8 +558,9 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "šodien",
   "reply_indicator.cancel": "Atcelt",
+  "reply_indicator.poll": "Aptauja",
   "report.block": "Bloķēt",
-  "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
+  "report.block_explanation": "Tu neredzēsi viņu ierakstus. Viņi nevarēs redzēt Tavus ierakstus vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
   "report.categories.legal": "Tiesisks",
   "report.categories.other": "Citi",
   "report.categories.spam": "Spams",
@@ -550,7 +574,7 @@
   "report.forward": "Pārsūtīt {target}",
   "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
   "report.mute": "Apklusināt",
-  "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņi ir apklusināti.",
+  "report.mute_explanation": "Tu neredzēsi viņu ierakstus. Viņi joprojām var Tev sekot un redzēt Tavus ierakstus un nezinās, ka viņi ir apklusināti.",
   "report.next": "Tālāk",
   "report.placeholder": "Papildu komentāri",
   "report.reasons.dislike": "Man tas nepatīk",
@@ -566,15 +590,15 @@
   "report.rules.subtitle": "Atlasi visus atbilstošos",
   "report.rules.title": "Kuri noteikumi tiek pārkāpti?",
   "report.statuses.subtitle": "Atlasi visus atbilstošos",
-  "report.statuses.title": "Vai ir kādi ieraksti, kas atbalsta šo sūdzību?",
+  "report.statuses.title": "Vai ir kādi ieraksti, kas apstiprina šo ziņojumu?",
   "report.submit": "Iesniegt",
   "report.target": "Ziņošana par: {target}",
-  "report.thanks.take_action": "Tālāk ir norādītas iespējas, kā kontrolēt Mastodon redzamo saturu:",
+  "report.thanks.take_action": "Šeit ir iespējas, lai pārvaldītu Mastodon redzamo saturu:",
   "report.thanks.take_action_actionable": "Kamēr mēs to izskatām, tu vari veikt darbības pret @{name}:",
   "report.thanks.title": "Vai nevēlies to redzēt?",
   "report.thanks.title_actionable": "Paldies, ka ziņoji, mēs to izskatīsim.",
   "report.unfollow": "Pārtraukt sekot @{name}",
-  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā mājas plūsmā, pārtrauc viņiem sekot.",
+  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu tā ierakstus savā mājas plūsmā, pārtrauc sekot tam!",
   "report_notification.attached_statuses": "Pievienoti {count, plural,one {{count} sūtījums} other {{count} sūtījumi}}",
   "report_notification.categories.legal": "Tiesisks",
   "report_notification.categories.other": "Cita",
@@ -587,56 +611,57 @@
   "search.quick_action.go_to_account": "Doties uz profilu {x}",
   "search.quick_action.go_to_hashtag": "Doties uz tēmturi {x}",
   "search.quick_action.open_url": "Atvērt URL Mastodonā",
-  "search.quick_action.status_search": "Ziņas atbilst {x}",
-  "search.search_or_paste": "Meklē vai iekopē URL",
+  "search.quick_action.status_search": "Ieraksti, kas atbilst {x}",
+  "search.search_or_paste": "Meklēt vai ielīmēt URL",
   "search_popout.full_text_search_disabled_message": "Nav pieejams {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Pieejams tikai pēc pieteikšanās.",
   "search_popout.language_code": "ISO valodas kods",
   "search_popout.options": "Meklēšanas iespējas",
   "search_popout.quick_actions": "Ātrās darbības",
   "search_popout.recent": "Nesen meklētais",
-  "search_popout.specific_date": "konkrēts datums",
+  "search_popout.specific_date": "noteikts datums",
   "search_popout.user": "lietotājs",
   "search_results.accounts": "Profili",
   "search_results.all": "Visi",
   "search_results.hashtags": "Tēmturi",
-  "search_results.nothing_found": "Nevarēja atrast neko šiem meklēšanas vienumiem",
+  "search_results.nothing_found": "Nevarēja atrast neko, kas atbilstu šim meklēšanas vaicājumam",
   "search_results.see_all": "Skatīt visus",
   "search_results.statuses": "Ieraksti",
   "search_results.title": "Meklēt {q}",
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
-  "server_banner.active_users": "aktīvie lietotāji",
+  "server_banner.active_users": "aktīvi lietotāji",
   "server_banner.administered_by": "Administrē:",
   "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
   "server_banner.learn_more": "Uzzināt vairāk",
   "server_banner.server_stats": "Servera statistika:",
   "sign_in_banner.create_account": "Izveidot kontu",
-  "sign_in_banner.sign_in": "Pierakstīties",
+  "sign_in_banner.sign_in": "Pieteikties",
   "sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
-  "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu izlasei, kopīgotu ziņas un atbildētu uz tām. Vari arī mijiedarboties no sava konta citā serverī.",
+  "sign_in_banner.text": "Jāpiesakās, lai sekotu profiliem vai tēmturiem, pievienotu izlasei, kopīgotu ierakstus un atbildētu uz tiem. Vari arī mijiedarboties ar savu kontu citā serverī.",
   "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
   "status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
-  "status.cancel_reblog_private": "Neizcelt",
+  "status.cancel_reblog_private": "Nepastiprināt",
   "status.cannot_reblog": "Šo ziņu nevar izcelt",
-  "status.copy": "Kopēt saiti uz ziņu",
+  "status.copy": "Ievietot ieraksta saiti starpliktuvē",
   "status.delete": "Dzēst",
   "status.detailed_status": "Detalizēts sarunas skats",
   "status.direct": "Pieminēt @{name} privāti",
   "status.direct_indicator": "Pieminēts privāti",
-  "status.edit": "Rediģēt",
-  "status.edited": "Rediģēts {date}",
-  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reize} other {{count} reizes}}",
-  "status.embed": "Iestrādāt",
-  "status.favourite": "Iecienīts",
+  "status.edit": "Labot",
+  "status.edited": "Pēdējoreiz labots {date}",
+  "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
+  "status.embed": "Iegult",
+  "status.favourite": "Izlasē",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",
   "status.history.created": "{name} izveidoja {date}",
-  "status.history.edited": "{name} rediģēja {date}",
+  "status.history.edited": "{name} laboja {date}",
   "status.load_more": "Ielādēt vairāk",
-  "status.media.open": "Noklikšķini, lai atvērtu",
+  "status.media.open": "Jānoklikšķina, lai atvērtu",
   "status.media.show": "Noklikšķini, lai parādītu",
   "status.media_hidden": "Multivides ir paslēpts",
   "status.mention": "Pieminēt @{name}",
@@ -671,7 +696,7 @@
   "status.uncached_media_warning": "Priekšskatījums nav pieejams",
   "status.unmute_conversation": "Noņemt sarunas apklusinājumu",
   "status.unpin": "Noņemt profila piespraudumu",
-  "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas un sarakstu laika līnijā tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
+  "subscribed_languages.lead": "Pēc izmaiņu veikšanas Tavā mājas un sarakstu laika līnijā tiks rādīti tikai tie ieraksti atlasītajās valodās. Neatlasīt nevienu, lai saņemtu ierakstus visās valodās.",
   "subscribed_languages.save": "Saglabāt izmaiņas",
   "subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
   "tabs_bar.home": "Sākums",
@@ -685,8 +710,8 @@
   "timeline_hint.resources.followers": "Sekotāji",
   "timeline_hint.resources.follows": "Seko",
   "timeline_hint.resources.statuses": "Vecāki ieraksti",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {# dienu} other {{days} dienām}}",
-  "trends.trending_now": "Aktuālās tendences",
+  "trends.counter_by_accounts": "{count, plural, zero {{counter} cilvēku} one {{counter} cilvēks} other {{counter} cilvēki}} {days, plural, one {{day} dienā} other {{days} dienās}}",
+  "trends.trending_now": "Pašlaik populāri",
   "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
   "units.short.billion": "{count}Mjd",
   "units.short.million": "{count}M",
@@ -697,10 +722,8 @@
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
   "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
   "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
-  "upload_form.description_missing": "Apraksts nav pievienots",
-  "upload_form.edit": "Rediģēt",
+  "upload_form.edit": "Labot",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
-  "upload_form.undo": "Dzēst",
   "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
   "upload_modal.apply": "Pielietot",
@@ -708,7 +731,7 @@
   "upload_modal.choose_image": "Izvēlēties attēlu",
   "upload_modal.description_placeholder": "Raibais runcis rīgā ratu rumbā rūc",
   "upload_modal.detect_text": "Noteikt tekstu no attēla",
-  "upload_modal.edit_media": "Rediģēt multividi",
+  "upload_modal.edit_media": "Labot informācijas nesēju",
   "upload_modal.hint": "Noklikšķini vai velc apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
   "upload_modal.preparing_ocr": "Sagatavo OCR…",
   "upload_modal.preview_label": "Priekšskatīt ({ratio})",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index bdef3f4a5f..d8a470ed47 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -48,7 +48,6 @@
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.unexpected.message": "Неочекувана грешка.",
   "alert.unexpected.title": "Упс!",
-  "autosuggest_hashtag.per_week": "{count} неделно",
   "boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
   "bundle_column_error.retry": "Обидете се повторно",
   "bundle_modal_error.close": "Затвори",
@@ -76,31 +75,20 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "заклучен",
   "compose_form.placeholder": "Што имате на ум?",
-  "compose_form.poll.add_option": "Додај избор",
   "compose_form.poll.duration": "Времетрање на анкета",
-  "compose_form.poll.option_placeholder": "Избери {number}",
-  "compose_form.poll.remove_option": "Избриши избор",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
-  "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
-  "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
-  "confirmations.block.block_and_report": "Блокирај и Пријави",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.block.message": "Сигурни сте дека дека го блокирате {name}?",
   "confirmations.delete.confirm": "Избриши",
   "confirmations.delete.message": "Сигурни сте дека го бришите статусот?",
   "confirmations.delete_list.confirm": "Избриши",
   "confirmations.delete_list.message": "Дали сте сигурни дека сакате да го избришете списоков?",
-  "confirmations.domain_block.confirm": "Сокриј цел домеин",
   "confirmations.domain_block.message": "Дали скроз сте сигурни дека ќе блокирате сѐ од {domain}? Во повеќето случаеви неколку таргетирани блокирања или заќутувања се доволни и предложени. Нема да ја видите содржината од тој домеин во никој јавен времеплов или вашите нотификации. Вашите следбеници од тој домеин ќе бидат остранети.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
-  "confirmations.mute.explanation": "Ќе сокрие објави од нив и објави кои ги спомнуваат нив, но сеуште ќе им дозволи да ги видат вашите постови и ве следат.",
-  "confirmations.mute.message": "Дали ќе го заќутите {name}?",
   "confirmations.reply.confirm": "Одговори",
   "confirmations.unfollow.confirm": "Одследи",
   "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
@@ -144,7 +132,6 @@
   "hashtag.column_settings.tag_mode.any": "Било кои",
   "hashtag.column_settings.tag_mode.none": "Никои",
   "hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи бустирања",
   "home.column_settings.show_replies": "Прикажи одговори",
   "intervals.full.days": "{number, plural, one {# ден} other {# дена}}",
@@ -182,7 +169,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
   "navigation_bar.follows_and_followers": "Следења и следбеници",
@@ -229,12 +215,7 @@
   "poll_button.add_poll": "Додадете нова анкета",
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
-  "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.short": "Необјавено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",
   "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 11636646b2..8fb4e818db 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -60,7 +60,6 @@
   "announcement.announcement": "അറിയിപ്പ്",
   "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
   "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
-  "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
   "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
@@ -102,26 +101,18 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
   "compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
-  "compose_form.poll.add_option": "ഒരു ചോയ്‌സ് ചേർക്കുക",
   "compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
-  "compose_form.poll.option_placeholder": "ചോയ്‌സ് {number}",
-  "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
-  "compose_form.spoiler_placeholder": "നിങ്ങളുടെ മുന്നറിയിപ്പ് ഇവിടെ എഴുതുക",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
-  "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
-  "confirmations.block.message": "{name} തടയാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
   "confirmations.delete.confirm": "മായ്ക്കുക",
   "confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "confirmations.delete_list.confirm": "മായ്ക്കുക",
   "confirmations.delete_list.message": "ഈ പട്ടിക എന്നെന്നേക്കുമായി നീക്കം ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
-  "confirmations.domain_block.confirm": "മുഴുവൻ ഡൊമെയ്‌നും തടയുക",
   "confirmations.logout.confirm": "പുറത്തുകടക്കുക",
   "confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?",
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
@@ -187,7 +178,6 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
-  "home.column_settings.basic": "അടിസ്ഥാനം",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
@@ -236,15 +226,12 @@
   "lists.replies_policy.none": "ആരുമില്ല",
   "lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
   "lists.subheading": "എന്റെ പട്ടികകൾ",
-  "mute_modal.duration": "കാലാവധി",
-  "mute_modal.indefinite": "അനിശ്ചിതകാല",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
@@ -262,7 +249,6 @@
   "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
   "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
-  "notifications.column_settings.filter_bar.advanced": "എല്ലാ വിഭാഗങ്ങളും പ്രദർശിപ്പിക്കുക",
   "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
   "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
   "notifications.column_settings.mention": "സൂചനകൾ:",
@@ -302,10 +288,6 @@
   "poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
@@ -372,7 +354,6 @@
   "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.edit": "തിരുത്തുക",
   "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
-  "upload_form.undo": "ഇല്ലാതാക്കുക",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
   "upload_modal.apply": "പ്രയോഗിക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 7f5b7d6524..a00b39e838 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -73,7 +73,6 @@
   "alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
   "alert.unexpected.title": "अरेरे!",
   "announcement.announcement": "घोषणा",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
   "bundle_column_error.retry": "पुन्हा प्रयत्न करा",
   "bundle_modal_error.close": "बंद करा",
   "bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
@@ -99,9 +98,6 @@
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.placeholder": "आपल्या मनात काय आहे?",
-  "compose_form.poll.add_option": "नवीन पर्याय",
-  "compose_form.poll.option_placeholder": "निवड {number}",
-  "compose_form.poll.remove_option": "हा पर्याय काढा",
   "compose_form.publish_form": "Publish",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
@@ -109,7 +105,6 @@
   "confirmations.delete.message": "हे स्टेटस तुम्हाला नक्की हटवायचंय?",
   "confirmations.delete_list.confirm": "हटवा",
   "confirmations.delete_list.message": "ही यादी तुम्हाला नक्की कायमची हटवायचीय?",
-  "confirmations.domain_block.confirm": "संपूर्ण डोमेन लपवा",
   "confirmations.logout.message": "तुमची खात्री आहे की तुम्ही लॉग आउट करू इच्छिता?",
   "confirmations.mute.confirm": "आवाज बंद करा",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
@@ -126,7 +121,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "हॅशटॅग फॉलो करा",
   "hashtag.unfollow": "हॅशटॅग अनफॉलो करा",
-  "home.column_settings.basic": "मूळ",
   "home.column_settings.show_reblogs": "बूस्ट दाखवा",
   "home.column_settings.show_replies": "उत्तरे दाखवा",
   "home.hide_announcements": "घोषणा लपवा",
@@ -228,10 +222,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50a48db1ea..8fe043c5dc 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -21,6 +21,7 @@
   "account.blocked": "Disekat",
   "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
+  "account.copy": "Salin pautan ke profil",
   "account.direct": "Sebut secara persendirian @{name}",
   "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocked": "Domain disekat",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Tiada hantaran",
   "account.featured_tags.title": "Tanda pagar pilihan {name}",
   "account.follow": "Ikuti",
+  "account.follow_back": "Ikut balik",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
   "account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Redam pemberitahuan",
   "account.mute_short": "Redam",
   "account.muted": "Dibisukan",
+  "account.mutual": "Rakan kongsi",
   "account.no_bio": "Tiada penerangan diberikan.",
   "account.open_original_page": "Buka halaman asal",
   "account.posts": "Hantaran",
@@ -86,7 +89,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(belum diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} seminggu",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
   "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
   "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
@@ -143,26 +145,22 @@
   "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
   "compose_form.lock_disclaimer.lock": "dikunci",
   "compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
-  "compose_form.poll.add_option": "Tambah pilihan",
   "compose_form.poll.duration": "Tempoh undian",
+  "compose_form.poll.multiple": "Pelbagai pilihan",
   "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Buang pilihan ini",
+  "compose_form.poll.single": "Pilih satu",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
-  "compose_form.publish": "Terbit",
+  "compose_form.poll.type": "Gaya",
+  "compose_form.publish": "Siaran",
   "compose_form.publish_form": "Terbit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
+  "compose_form.reply": "Balas",
+  "compose_form.save_changes": "Kemas kini",
   "compose_form.spoiler.marked": "Buang amaran kandungan",
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
-  "compose_form.spoiler_placeholder": "Tulis amaran anda di sini",
+  "compose_form.spoiler_placeholder": "Amaran kandungan (pilihan)",
   "confirmation_modal.cancel": "Batal",
-  "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
-  "confirmations.block.message": "Adakah anda pasti anda ingin menyekat {name}?",
   "confirmations.cancel_follow_request.confirm": "Tarik balik permintaan",
   "confirmations.cancel_follow_request.message": "Adakah anda pasti ingin menarik balik permintaan anda untuk mengikut {name}?",
   "confirmations.delete.confirm": "Padam",
@@ -171,15 +169,12 @@
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
   "confirmations.discard_edit_media.confirm": "Singkir",
   "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
-  "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.edit.confirm": "Sunting",
   "confirmations.edit.message": "Mengedit sekarang akan menimpa mesej yang sedang anda karang. Adakah anda pasti mahu meneruskan?",
   "confirmations.logout.confirm": "Log keluar",
   "confirmations.logout.message": "Adakah anda pasti anda ingin log keluar?",
   "confirmations.mute.confirm": "Bisukan",
-  "confirmations.mute.explanation": "Ini akan menyembunyikan hantaran daripada mereka dan juga hantaran yang menyebut mereka, tetapi ia masih membenarkan mereka melihat hantaran anda dan mengikuti anda.",
-  "confirmations.mute.message": "Adakah anda pasti anda ingin membisukan {name}?",
   "confirmations.redraft.confirm": "Padam & rangka semula",
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam pos ini dan merangkanya semula? Kegemaran dan galakan akan hilang, dan balasan ke pos asal akan menjadi yatim.",
   "confirmations.reply.confirm": "Balas",
@@ -190,6 +185,7 @@
   "conversation.mark_as_read": "Tanda sudah dibaca",
   "conversation.open": "Lihat perbualan",
   "conversation.with": "Dengan {names}",
+  "copy_icon_button.copied": "Disalin ke papan klip",
   "copypaste.copied": "Disalin",
   "copypaste.copy_to_clipboard": "Salin ke papan klip",
   "directory.federated": "Dari fediverse yang diketahui",
@@ -221,6 +217,7 @@
   "emoji_button.search_results": "Hasil carian",
   "emoji_button.symbols": "Simbol",
   "emoji_button.travel": "Kembara & Tempat",
+  "empty_column.account_hides_collections": "Pengguna ini telah memilih untuk tidak menyediakan informasi tersebut",
   "empty_column.account_suspended": "Akaun digantung",
   "empty_column.account_timeline": "Tiada hantaran di sini!",
   "empty_column.account_unavailable": "Profil tidak tersedia",
@@ -275,6 +272,14 @@
   "follow_request.authorize": "Benarkan",
   "follow_request.reject": "Tolak",
   "follow_requests.unlocked_explanation": "Walaupun akaun anda tidak dikunci, kakitangan {domain} merasakan anda mungkin ingin menyemak permintaan ikutan daripada akaun ini secara manual.",
+  "follow_suggestions.curated_suggestion": "",
+  "follow_suggestions.dismiss": "Jangan papar lagi",
+  "follow_suggestions.hints.featured": "Profil{domain.",
+  "follow_suggestions.hints.friends_of_friends": "This profile is popular among the people you follow.",
+  "follow_suggestions.hints.most_followed": ".",
+  "follow_suggestions.personalized_suggestion": "Cadangan peribadi",
+  "follow_suggestions.popular_suggestion": "Cadangan terkenal",
+  "follow_suggestions.view_all": "Lihat semua",
   "followed_tags": "Topik terpilih",
   "footer.about": "Perihal",
   "footer.directory": "Direktori profil",
@@ -295,16 +300,14 @@
   "hashtag.column_settings.tag_mode.any": "Mana-mana daripada yang ini",
   "hashtag.column_settings.tag_mode.none": "Tiada apa pun daripada yang ini",
   "hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
+  "hashtag.counter_by_accounts": "{count, plural, other {{counter} peserta}}",
+  "hashtag.counter_by_uses": "{count, plural, other {{counter} siaran}}",
+  "hashtag.counter_by_uses_today": "{count, plural, other {{counter} siaran}} hari ini",
   "hashtag.follow": "Ikuti hashtag",
   "hashtag.unfollow": "Nyahikut tanda pagar",
   "hashtags.and_other": "…dan {count, plural, other {# more}}",
-  "home.actions.go_to_explore": "Lihat apa yand sedang tren",
-  "home.actions.go_to_suggestions": "Cari orang untuk diikuti",
-  "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
-  "home.explore_prompt.body": "Suapan rumah anda akan mempunyai gabungan pos daripada hashtag yang telah anda pilih untuk diikuti, orang yang telah anda pilih untuk diikuti dan pos yang mereka tingkatkan. Jika itu terasa terlalu senyap, anda mungkin mahu:",
-  "home.explore_prompt.title": "Ini adalah pusat operasi anda dalam Mastodon.",
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.pending_critical_update.body": "Sila kemas kini pelayan Mastodon anda secepat yang mungkin!",
   "home.pending_critical_update.link": "Lihat pengemaskinian",
@@ -385,11 +388,9 @@
   "lists.search": "Cari dalam kalangan orang yang anda ikuti",
   "lists.subheading": "Senarai anda",
   "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
+  "loading_indicator.label": "Memuatkan…",
   "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
-  "mute_modal.duration": "Tempoh",
-  "mute_modal.hide_notifications": "Sembunyikan pemberitahuan daripada pengguna ini?",
-  "mute_modal.indefinite": "Tidak tentu",
   "navigation_bar.about": "Perihal",
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
   "navigation_bar.blocks": "Pengguna yang disekat",
@@ -399,7 +400,6 @@
   "navigation_bar.direct": "Sebutan peribadi",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
-  "navigation_bar.edit_profile": "Sunting profil",
   "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
@@ -434,9 +434,6 @@
   "notifications.column_settings.admin.sign_up": "Pendaftaran baru:",
   "notifications.column_settings.alert": "Pemberitahuan atas meja",
   "notifications.column_settings.favourite": "Kegemaran:",
-  "notifications.column_settings.filter_bar.advanced": "Papar semua kategori",
-  "notifications.column_settings.filter_bar.category": "Bar penapis pantas",
-  "notifications.column_settings.filter_bar.show_bar": "Paparkan bar penapis",
   "notifications.column_settings.follow": "Pengikut baharu:",
   "notifications.column_settings.follow_request": "Permintaan ikutan baharu:",
   "notifications.column_settings.mention": "Sebutan:",
@@ -473,6 +470,11 @@
   "onboarding.follows.empty": "Malangnya, tiada hasil dapat ditunjukkan sekarang. Anda boleh cuba menggunakan carian atau menyemak imbas halaman teroka untuk mencari orang untuk diikuti atau cuba lagi kemudian.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Nama paparan",
+  "onboarding.profile.display_name_hint": "Nama penuh anda atau nama anda yang menyeronokkan…",
+  "onboarding.profile.note_hint": "Anda boleh @menyebut orang lain atau #hashtags…",
+  "onboarding.profile.save_and_continue": "Simpan dan teruskan",
+  "onboarding.profile.upload_avatar": "Muat naik gambar profil",
   "onboarding.share.lead": "Beritahu orang ramai bagaimana mereka boleh menemui anda di Mastodon!",
   "onboarding.share.message": "Saya {username} di #Mastodon! Jom ikut saya di {url}",
   "onboarding.share.next_steps": "Langkah seterusnya yang mungkin:",
@@ -506,16 +508,14 @@
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
-  "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Orang yang disebut sahaja",
-  "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Pengikut sahaja",
-  "privacy.public.long": "Kelihatan untuk semua",
+  "privacy.direct.long": "Semua orang yang disebutkan dalam siaran",
+  "privacy.direct.short": "Orang tertentu",
+  "privacy.private.long": "Pengikut anda sahaja",
+  "privacy.private.short": "Pengikut",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
-  "privacy.unlisted.short": "Tidak tersenarai",
   "privacy_policy.last_updated": "Dikemaskini {date}",
   "privacy_policy.title": "Dasar Privasi",
+  "recommended": "Disyorkan",
   "refresh": "Muat semula",
   "regeneration_indicator.label": "Memuatkan…",
   "regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
@@ -530,7 +530,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hari ini",
+  "reply_indicator.attachments": "{count, plural, other {# lampiran}}",
   "reply_indicator.cancel": "Batal",
+  "reply_indicator.poll": "Undian",
   "report.block": "Sekat",
   "report.block_explanation": "Anda tidak akan melihat hantaran mereka. Mereka tidak dapat melihat hantaran anda atau mengikuti anda. Mereka akan sedar bahawa mereka disekat.",
   "report.categories.legal": "Sah",
@@ -622,7 +624,6 @@
   "status.direct": "Sebut secara peribadi @{name}",
   "status.direct_indicator": "Sebutan peribadi",
   "status.edit": "Sunting",
-  "status.edited": "Disunting {date}",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
@@ -693,10 +694,8 @@
   "upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
   "upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
   "upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
-  "upload_form.description_missing": "Tiada keterangan ditambah",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Padam",
   "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Menganalisis gambar…",
   "upload_modal.apply": "Guna",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 3ca03b616a..23eaa8564b 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "ကြေငြာချက်",
   "attachments_list.unprocessed": "(မလုပ်ဆောင်ရသေး)",
   "audio.hide": "အသံပိတ်မည်",
-  "autosuggest_hashtag.per_week": "တစ်ပတ်လျှင် {count}\n",
   "boost_modal.combo": "ဤအရာကို နောက်တစ်ကြိမ်ကျော်ရန် {combo} ကိုနှိပ်နိုင်သည်။",
   "bundle_column_error.copy_stacktrace": "စာကူးရာတွင်ပြဿနာရှိသည်",
   "bundle_column_error.error.body": "ဤစာမျက်နှာကို ဖော်ပြရာတွင် ပြဿနာရှိနေသည်",
@@ -144,26 +143,14 @@
   "compose_form.lock_disclaimer": "သင့်အကောင့်ကို {သော့ခတ်မထားပါ}။ သင့်နောက်လိုက်-သီးသန့်ပို့စ်များကို ကြည့်ရှုရန် မည်သူမဆို သင့်အား လိုက်ကြည့်နိုင်ပါသည်။",
   "compose_form.lock_disclaimer.lock": "သော့ခတ်ထားမယ်",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "ရွေးချယ်မှုထပ်မံပေါင်းထည့်ပါ",
   "compose_form.poll.duration": "စစ်တမ်းကြာချိန်",
-  "compose_form.poll.option_placeholder": "ရွေးချယ်မှု {number}\n",
-  "compose_form.poll.remove_option": "ဤရွေးချယ်မှုကို ဖယ်ထုတ်ပါ",
   "compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်",
   "compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်",
-  "compose_form.publish": "ပို့စ်တင်မည်",
   "compose_form.publish_form": "ပို့စ်တင်မည်",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ပြောင်းလဲမှုများကို သိမ်းဆည်းပါ",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "သတိပေးစာကိုဤနေရာတွင်ရေးပါ",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
-  "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
-  "confirmations.block.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.cancel_follow_request.confirm": "ပန်ကြားချက်ကို ပယ်ဖျက်မည်",
   "confirmations.cancel_follow_request.message": "{name} ကို စောင့်ကြည့်ခြင်းအားပယ်ဖျက်ရန် သေချာပါသလား။",
   "confirmations.delete.confirm": "ဖျက်မည်",
@@ -172,15 +159,12 @@
   "confirmations.delete_list.message": "ဖျက်ရန် သေချာပါသလား?",
   "confirmations.discard_edit_media.confirm": "ဖယ်ထုတ်ပါ",
   "confirmations.discard_edit_media.message": "သင်သည် မီဒီယာဖော်ပြချက် သို့မဟုတ် အစမ်းကြည့်ရှုခြင်းတွင် မသိမ်းဆည်းရသေးသော အပြောင်းအလဲများရှိသည်။ မည်သို့ပင်ဖြစ်စေ ဖျက်ပစ်မည်လား။",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "{domain} တစ်ခုလုံးကို ဘလော့လုပ်ရန် တကယ် သေချာပါသလား? များသောအားဖြင့် အနည်းစုကို ပစ်မှတ်ထား ဘလော့လုပ်ခြင်းသည် လုံလောက်ပါသည်။ ထို ဒိုမိန်းမှ အကြောင်းအရာ တစ်ခုမှ မြင်ရမည်မဟုတ်သည့်အပြင် ထို ဒိုမိန်းတွင်ရှိသော သင်၏ စောင့်ကြည့်သူများပါ ဖယ်ရှားပစ်မည်ဖြစ်သည်။",
   "confirmations.edit.confirm": "ပြင်ရန်",
   "confirmations.edit.message": "ယခုပြင်ဆင်ခြင်းတွင် သင်လက်ရှိမက်ဆေ့ချ်ကို ဖျက်ပစ်ပြီး အသစ်ရေးပါမည်။ ရှေ့ဆက်လိုသည်မှာ သေချာပါသလား။",
   "confirmations.logout.confirm": "အကောင့်မှထွက်မည်",
   "confirmations.logout.message": "အကောင့်မှ ထွက်ရန် သေချာပါသလား?",
   "confirmations.mute.confirm": "ပိတ်ထားရန်",
-  "confirmations.mute.explanation": "၎င်းသည် ၎င်းတို့ထံမှ ပို့စ်များနှင့် ၎င်းတို့ကို ဖော်ပြထားသော ပို့စ်များကို ဖျောက်ထားမည်ဖြစ်ပြီး၊ သို့သော် ၎င်းတို့သည် သင့်ပို့စ်များကို မြင်နိုင်ပြီး သင့်အား လိုက်ကြည့်နိုင်စေမည်ဖြစ်သည်။",
-  "confirmations.mute.message": "{name} ကို မမြင်လိုသည်မှာ သေချာပါသလား။ ",
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
   "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.reply.confirm": "စာပြန်မည်",
@@ -303,13 +287,8 @@
   "hashtag.follow": "Hashtag ကို စောင့်ကြည့်မယ်",
   "hashtag.unfollow": "Hashtag ကို မစောင့်ကြည့်ပါ",
   "hashtags.and_other": "{count, plural, other {# more}} နှင့်",
-  "home.actions.go_to_explore": "ခေတ်စားနေသည်များကို ကြည့်ပါ",
-  "home.actions.go_to_suggestions": "စောင့်ကြည့်သူများရှာပါ",
-  "home.column_settings.basic": "အခြေခံ",
   "home.column_settings.show_reblogs": "Boost များကို ပြပါ",
   "home.column_settings.show_replies": "ပြန်စာများကို ပြပါ",
-  "home.explore_prompt.body": "သင့်ရဲ့သတင်းစဥ် မှာ သင် စောင့်ကြည့်​နေတယ့် ခေါင်းစဥ်​တွေ၊သင်​စောင့်ကြည့်​နေတယ့်အ​ကောင့်​တွေ နဲ့ အဆိုပါ အ​ကောင့်​တွေပြန်မျှ​ဝေထားတယ့် ပိုစ့်​တွေကို မြင်ရမှာပါ။:",
-  "home.explore_prompt.title": "ဤသည်မှာ Mastodon ရှိ သင့်ပင်မစာမျက်နှာဖြစ်သည်။",
   "home.hide_announcements": "ကြေညာချက်များကို ဖျောက်ပါ",
   "home.pending_critical_update.body": "သင့် Mastodon ဆာဗာ အမြန်ဆုံး အပ်ဒိတ်လုပ်ပါ။",
   "home.pending_critical_update.link": "အပ်ဒိတ်များကြည့်ရန်",
@@ -393,9 +372,6 @@
   "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
-  "mute_modal.duration": "ကြာချိန်",
-  "mute_modal.hide_notifications": "ဤအကောင့်မှသတိပေးချက်များကိုပိတ်မလား?",
-  "mute_modal.indefinite": "ရေတွက်လို့မရပါ",
   "navigation_bar.about": "အကြောင်း",
   "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
   "navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
@@ -405,7 +381,6 @@
   "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
   "navigation_bar.discover": "ရှာဖွေပါ",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
   "navigation_bar.explore": "စူးစမ်းရန်",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
@@ -440,9 +415,6 @@
   "notifications.column_settings.admin.sign_up": "အကောင့်အသစ်များ -",
   "notifications.column_settings.alert": "Desktop သတိပေးချက်များ",
   "notifications.column_settings.favourite": "Favorites:",
-  "notifications.column_settings.filter_bar.advanced": "ခေါင်းစဥ်အားလုံးများကိုဖော်ပြပါ",
-  "notifications.column_settings.filter_bar.category": "အမြန်စစ်ထုတ်မှုဘား",
-  "notifications.column_settings.filter_bar.show_bar": "စစ်ထုတ်မှုဘားကို ပြပါ",
   "notifications.column_settings.follow": "စောင့်ကြည့်သူအသစ်များ -",
   "notifications.column_settings.follow_request": "စောင့်ကြည့်ရန် တောင်းဆိုမှုအသစ်များ -",
   "notifications.column_settings.mention": "ဖော်ပြချက်များ -",
@@ -519,14 +491,7 @@
   "poll_button.add_poll": "စစ်တမ်းကောက်မည်",
   "poll_button.remove_poll": "စစ်တမ်းပယ်ဖျက်မည်",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "မန်းရှင်းခေါ်သူသီးသန့်",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "ဖော်လိုးလုပ်သူသီးသန့်",
-  "privacy.private.short": "စောင့်ကြည့်သူများသာ",
-  "privacy.public.long": "အားလုံး မြင်နိုင်သည်",
   "privacy.public.short": "အများကိုပြမည်",
-  "privacy.unlisted.long": "အားလုံးမြင်နိုင်သော်လည်း ရှာဖွေမှုများမှ ဖယ်ထုတ်ထားသည်",
-  "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
   "privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "recommended": "အကြံပြုသည်",
@@ -637,7 +602,6 @@
   "status.direct": "@{name} ကို သီးသန့်ဖော်ပြမည်\n",
   "status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
   "status.edit": "ပြင်ဆင်ရန်",
-  "status.edited": "{date} ကို ပြင်ဆင်ပြီးပါပြီ",
   "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
   "status.embed": "Embed",
   "status.favourite": "Favorite",
@@ -708,10 +672,8 @@
   "upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
   "upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_form.description_missing": "ဖော်ပြချက် မထည့်ပါ",
   "upload_form.edit": "ပြင်ရန်",
   "upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
-  "upload_form.undo": "ဖျက်ရန်",
   "upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
   "upload_modal.apply": "သုံးပါ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 229d4f4718..500261a34b 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -50,6 +50,12 @@
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
   "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+  "announcement.announcement": "घोषणा",
+  "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
+  "block_modal.show_less": "कम देखाउनुहोस्",
+  "block_modal.show_more": "थप देखाउनुहोस्",
+  "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्",
+  "bundle_column_error.network.title": "नेटवर्क त्रुटि",
   "bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
   "bundle_modal_error.close": "बन्द गर्नुहोस्",
   "bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",
@@ -69,12 +75,5 @@
   "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
   "compose.language.search": "भाषाहरू खोज्नुहोस्...",
   "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
-  "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
-  "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
-  "compose_form.publish_form": "नयाँ पोस्ट",
-  "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
-  "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
-  "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
-  "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
+  "compose_form.publish_form": "नयाँ पोस्ट"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 86617d4a54..1958e4a6a0 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
+  "block_modal.show_less": "Minder tonen",
+  "block_modal.show_more": "Meer tonen",
+  "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.",
+  "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.",
+  "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.",
+  "block_modal.title": "Gebruiker blokkeren?",
+  "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -114,7 +121,7 @@
   "column.community": "Lokale tijdlijn",
   "column.direct": "Privéberichten",
   "column.directory": "Gebruikersgids",
-  "column.domain_blocks": "Geblokkeerde domeinen",
+  "column.domain_blocks": "Geblokkeerde servers",
   "column.favourites": "Favorieten",
   "column.firehose": "Openbare tijdlijnen",
   "column.follow_requests": "Volgverzoeken",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
-  "compose_form.poll.add_option": "Keuze toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
-  "compose_form.poll.option_placeholder": "Keuze {number}",
-  "compose_form.poll.remove_option": "Deze keuze verwijderen",
+  "compose_form.poll.multiple": "Meerkeuze",
+  "compose_form.poll.option_placeholder": "Optie {number}",
+  "compose_form.poll.single": "Enkele keuze",
   "compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
+  "compose_form.poll.type": "Stijl",
   "compose_form.publish": "Toot",
   "compose_form.publish_form": "Nieuw bericht",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wijzigingen opslaan",
-  "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
+  "compose_form.reply": "Reageren",
+  "compose_form.save_changes": "Bijwerken",
   "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
-  "compose_form.spoiler_placeholder": "Waarschuwingstekst",
+  "compose_form.spoiler_placeholder": "Inhoudswaarschuwing (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
-  "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
-  "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
   "confirmations.cancel_follow_request.confirm": "Verzoek annuleren",
   "confirmations.cancel_follow_request.message": "Weet je zeker dat je jouw verzoek om {name} te volgen wilt annuleren?",
   "confirmations.delete.confirm": "Verwijderen",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
   "confirmations.discard_edit_media.confirm": "Weggooien",
   "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch weggooien?",
-  "confirmations.domain_block.confirm": "Blokkeer alles van deze server",
-  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je zult geen berichten van deze server op openbare tijdlijnen zien of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
+  "confirmations.domain_block.confirm": "Server blokkeren",
+  "confirmations.domain_block.message": "Weet je het echt heel erg zeker dat je alles van {domain} wilt blokkeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en beter. Je ziet geen berichten van deze server meer op openbare tijdlijnen of in jouw meldingen. Jouw volgers van deze server worden verwijderd.",
   "confirmations.edit.confirm": "Bewerken",
   "confirmations.edit.message": "Door nu te reageren overschrijf je het bericht dat je op dit moment aan het schrijven bent. Weet je zeker dat je verder wil gaan?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.mute.confirm": "Negeren",
-  "confirmations.mute.explanation": "Dit verbergt diens berichten en berichten waar diegene in wordt vermeld, maar diegene kan nog steeds jouw berichten bekijken en jou volgen.",
-  "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
   "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
   "confirmations.reply.confirm": "Reageren",
@@ -204,10 +205,31 @@
   "disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.",
   "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
   "dismissable_banner.dismiss": "Sluiten",
-  "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.",
-  "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
-  "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web. Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
-  "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web die door mensen op {domain} worden gevolgd.",
+  "dismissable_banner.explore_links": "Dit zijn nieuwsberichten die vandaag het meest op het sociale web (fediverse) worden gedeeld. Nieuwere nieuwsberichten die door meer verschillende mensen zijn geplaatst staan hoger op de lijst.",
+  "dismissable_banner.explore_statuses": "Dit zijn berichten op het sociale web (fediverse) die vandaag aan populariteit winnen. Nieuwere berichten met meer boosts en favorieten staan hoger.",
+  "dismissable_banner.explore_tags": "Deze hashtags winnen aan populariteit op het sociale web (fediverse). Hashtags die door meer verschillende mensen worden gebruikt staan hoger.",
+  "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van accounts op het sociale web (fediverse) die door mensen op {domain} worden gevolgd.",
+  "domain_block_modal.block": "Server blokkeren",
+  "domain_block_modal.block_account_instead": "In plaats hiervan {name} blokkeren",
+  "domain_block_modal.they_can_interact_with_old_posts": "Mensen op deze server kunnen interactie hebben met jouw oude berichten.",
+  "domain_block_modal.they_cant_follow": "Niemand op deze server kan jou volgen.",
+  "domain_block_modal.they_wont_know": "Ze krijgen niet te weten dat ze worden geblokkeerd.",
+  "domain_block_modal.title": "Server blokkeren?",
+  "domain_block_modal.you_will_lose_followers": "Al jouw volgers van deze server worden ontvolgd.",
+  "domain_block_modal.you_wont_see_posts": "Je ziet geen berichten of meldingen meer van gebruikers op deze server.",
+  "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Hun fediverse-adres:",
+  "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.",
+  "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
+  "domain_pill.username": "Gebruikersnaam",
+  "domain_pill.whats_in_a_handle": "Wat is een fediverse-adres?",
+  "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien hoe iemand heet en op welke server die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) communiceren.",
+  "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien hoe je heet en op welke server je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) met jou communiceren.",
+  "domain_pill.your_handle": "Jouw fediverse-adres:",
+  "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
+  "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
@@ -232,18 +254,19 @@
   "empty_column.blocks": "Je hebt nog geen gebruikers geblokkeerd.",
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, zullen deze hier verschijnen.",
-  "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
+  "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, komen deze hier te staan.",
+  "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde servers.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je een bericht als favoriet markeert, valt deze hier te zien.",
   "empty_column.favourites": "Niemand heeft dit bericht nog als favoriet gemarkeerd. Wanneer iemand dit doet, valt dat hier te zien.",
-  "empty_column.follow_requests": "Je hebt nog geen volgverzoeken. Wanneer je er een ontvangt, zal dat hier te zien zijn.",
-  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Wanneer je dit doet, zullen ze hier verschijnen.",
+  "empty_column.follow_requests": "Jij hebt nog enkel volgverzoek ontvangen. Wanneer je er eentje ontvangt, valt dat hier te zien.",
+  "empty_column.followed_tags": "Je hebt nog geen hashtags gevolgd. Nadat je dit doet, komen deze hier te staan.",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Deze tijdlijn is leeg! Volg meer mensen om het te vullen.",
   "empty_column.list": "Er is nog niks te zien in deze lijst. Wanneer lijstleden nieuwe berichten plaatsen, zijn deze hier te zien.",
-  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, zal dat hier verschijnen.",
+  "empty_column.lists": "Je hebt nog geen lijsten. Wanneer je er een aanmaakt, valt dat hier te zien.",
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
+  "empty_column.notification_requests": "Helemaal leeg! Er is hier niets. Wanneer je nieuwe meldingen ontvangt, verschijnen deze hier volgens jouw instellingen.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
   "empty_column.public": "Er is hier helemaal niks! Plaatst een openbaar bericht of volg mensen van andere servers om het te vullen",
   "error.unexpected_crash.explanation": "Als gevolg van een bug in onze broncode of als gevolg van een compatibiliteitsprobleem met jouw webbrowser, kan deze pagina niet goed worden weergegeven.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filtered_notifications_banner.mentions": "{count, plural, one {vermelding} other {vermeldingen}}",
+  "filtered_notifications_banner.pending_requests": "Meldingen van {count, plural, =0 {niemand} one {één persoon} other {# mensen}} die je misschien kent",
+  "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
   "firehose.local": "Deze server",
   "firehose.remote": "Andere servers",
   "follow_request.authorize": "Goedkeuren",
   "follow_request.reject": "Afwijzen",
   "follow_requests.unlocked_explanation": "Ook al is jouw account niet besloten, de medewerkers van {domain} denken dat jij misschien de volgende volgverzoeken handmatig wil controleren.",
+  "follow_suggestions.curated_suggestion": "Speciaal geselecteerd",
+  "follow_suggestions.dismiss": "Niet meer weergeven",
+  "follow_suggestions.featured_longer": "Handmatig geselecteerd door het team van {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Populair onder mensen die je volgt",
+  "follow_suggestions.hints.featured": "Deze gebruiker is handmatig geselecteerd door het team van {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Deze gebruiker is populair onder de mensen die jij volgt.",
+  "follow_suggestions.hints.most_followed": "Deze gebruiker is een van de meest gevolgde gebruikers op {domain}.",
+  "follow_suggestions.hints.most_interactions": "Deze gebruiker is de laatste tijd erg populair op {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Deze gebruiker is vergelijkbaar met gebruikers die je recentelijk hebt gevolgd.",
+  "follow_suggestions.personalized_suggestion": "Gepersonaliseerde aanbeveling",
+  "follow_suggestions.popular_suggestion": "Populaire aanbeveling",
+  "follow_suggestions.popular_suggestion_longer": "Populair op {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Vergelijkbaar met accounts die je recentelijk bent gaan volgen",
+  "follow_suggestions.view_all": "Alles weergeven",
+  "follow_suggestions.who_to_follow": "Wie te volgen",
   "followed_tags": "Gevolgde hashtags",
   "footer.about": "Over",
   "footer.directory": "Gebruikersgids",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
-  "home.actions.go_to_explore": "De huidige trends bekijken",
-  "home.actions.go_to_suggestions": "Zoek mensen om te volgen",
-  "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
-  "home.explore_prompt.body": "Jouw starttijdlijn bevat een mix van berichten met hashtags die je volgt, van accounts die je volgt en van berichten die deze accounts boosten. Wanneer je dit te stil vind, kun je:",
-  "home.explore_prompt.title": "Dit is jouw thuisbasis op Mastodon.",
   "home.hide_announcements": "Mededelingen verbergen",
   "home.pending_critical_update.body": "Update alstublieft zo snel mogelijk jouw Mastodon-server!",
   "home.pending_critical_update.link": "Bekijk updates",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Laden…",
   "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
-  "mute_modal.duration": "Tijdsduur",
-  "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
-  "mute_modal.indefinite": "Voor onbepaalde tijd",
+  "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
+  "mute_modal.hide_options": "Opties verbergen",
+  "mute_modal.indefinite": "Totdat ik ze niet meer negeer",
+  "mute_modal.show_options": "Opties tonen",
+  "mute_modal.they_can_mention_and_follow": "De persoon kan jou vermelden en volgen, maar jij ziet niks meer van deze persoon.",
+  "mute_modal.they_wont_know": "De persoon krijgt niet te weten dat die wordt genegeerd.",
+  "mute_modal.title": "Gebruiker negeren?",
+  "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
+  "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -407,8 +449,7 @@
   "navigation_bar.compose": "Nieuw bericht schrijven",
   "navigation_bar.direct": "Privéberichten",
   "navigation_bar.discover": "Ontdekken",
-  "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
-  "navigation_bar.edit_profile": "Profiel bewerken",
+  "navigation_bar.domain_blocks": "Geblokkeerde servers",
   "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} volgt jou nu",
   "notification.follow_request": "{name} wil jou graag volgen",
   "notification.mention": "{name} vermeldde jou",
+  "notification.moderation-warning.learn_more": "Meer informatie",
+  "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
+  "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
+  "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
+  "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
+  "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
+  "notification.moderation_warning.action_silence": "Jouw account is beperkt.",
+  "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
   "notification.reblog": "{name} boostte jouw bericht",
+  "notification.relationships_severance_event": "Verloren verbindingen met {name}",
+  "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
+  "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt.",
+  "notification.relationships_severance_event.learn_more": "Meer informatie",
+  "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt, bent verloren.",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
   "notification.update": "{name} heeft een bericht bewerkt",
+  "notification_requests.accept": "Accepteren",
+  "notification_requests.dismiss": "Afwijzen",
+  "notification_requests.notifications_from": "Meldingen van {name}",
+  "notification_requests.title": "Gefilterde meldingen",
   "notifications.clear": "Meldingen verwijderen",
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
-  "notifications.column_settings.filter_bar.show_bar": "Filterbalk tonen",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
   "notifications.column_settings.mention": "Vermeldingen:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Desktopmeldingen zijn niet beschikbaar omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_denied_alert": "Desktopmeldingen kunnen niet worden ingeschakeld, omdat een eerdere browsertoestemming werd geweigerd",
   "notifications.permission_required": "Desktopmeldingen zijn niet beschikbaar omdat de benodigde toestemming niet is verleend.",
+  "notifications.policy.filter_new_accounts.hint": "In de afgelopen {days, plural, one {24 uur} other {# dagen}} geregistreerd",
+  "notifications.policy.filter_new_accounts_title": "Nieuwe accounts",
+  "notifications.policy.filter_not_followers_hint": "Inclusief mensen die jou korter dan {days, plural, one {24 uur} other {# dagen}} volgen",
+  "notifications.policy.filter_not_followers_title": "Mensen die jou niet volgen",
+  "notifications.policy.filter_not_following_hint": "Totdat je ze handmatig goedkeurt",
+  "notifications.policy.filter_not_following_title": "Mensen die jij niet volgt",
+  "notifications.policy.filter_private_mentions_hint": "Onzichtbaar tenzij het een antwoord is op een privébericht van jou of wanneer je de afzender volgt",
+  "notifications.policy.filter_private_mentions_title": "Ongevraagde privéberichten",
+  "notifications.policy.title": "Meldingen verbergen van…",
   "notifications_permission_banner.enable": "Desktopmeldingen inschakelen",
   "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
@@ -480,7 +547,7 @@
   "onboarding.actions.go_to_home": "Ga naar je starttijdlijn",
   "onboarding.compose.template": "Hallo #Mastodon!",
   "onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
-  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het zal zijn. Om te beginnen, zijn hier enkele suggesties:",
+  "onboarding.follows.lead": "Jouw starttijdlijn is de belangrijkste manier om Mastodon te ervaren. Hoe meer mensen je volgt, hoe actiever en interessanter het wordt. Om te beginnen zijn hier enkele suggesties:",
   "onboarding.follows.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.profile.discoverable": "Maak mijn profiel vindbaar",
   "onboarding.profile.discoverable_hint": "Wanneer je akkoord gaat met het vindbaar zijn op Mastodon, verschijnen je berichten in zoekresultaten en kunnen ze trending worden, en je profiel kan aan andere mensen worden aanbevolen wanneer ze vergelijkbare interesses hebben.",
@@ -504,7 +571,7 @@
   "onboarding.steps.follow_people.title": "Je starttijdlijn aan jouw wensen aanpassen",
   "onboarding.steps.publish_status.body": "Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen {emoji}",
   "onboarding.steps.publish_status.title": "Maak je eerste bericht",
-  "onboarding.steps.setup_profile.body": "Anderen zullen eerder met je in contact treden als je wat over jezelf vertelt.",
+  "onboarding.steps.setup_profile.body": "Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.",
   "onboarding.steps.setup_profile.title": "Je profiel aanpassen",
   "onboarding.steps.share_profile.body": "Laat je vrienden weten waar je te vinden bent op Mastodon",
   "onboarding.steps.share_profile.title": "Deel je Mastodonprofiel",
@@ -526,12 +593,13 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
+  "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
   "privacy.direct.short": "Privébericht",
-  "privacy.private.long": "Alleen aan volgers tonen",
-  "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar",
+  "privacy.private.long": "Alleen jouw volgers",
+  "privacy.private.short": "Volgers",
+  "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
   "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
+  "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
   "reply_indicator.cancel": "Annuleren",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkeren",
   "report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
   "report.categories.legal": "Juridisch",
@@ -644,10 +714,11 @@
   "status.direct": "@{name} een privébericht sturen",
   "status.direct_indicator": "Privébericht",
   "status.edit": "Bewerken",
-  "status.edited": "Bewerkt op {date}",
+  "status.edited": "Laatste bewerking op {date}",
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
   "status.embed": "Embedden",
   "status.favourite": "Favoriet",
+  "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",
   "status.filtered": "Gefilterd",
   "status.hide": "Bericht verbergen",
@@ -660,7 +731,7 @@
   "status.mention": "@{name} vermelden",
   "status.more": "Meer",
   "status.mute": "@{name} negeren",
-  "status.mute_conversation": "Negeer gesprek",
+  "status.mute_conversation": "Gesprek negeren",
   "status.open": "Volledig bericht tonen",
   "status.pin": "Aan profielpagina vastmaken",
   "status.pinned": "Vastgemaakt bericht",
@@ -668,12 +739,13 @@
   "status.reblog": "Boosten",
   "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
   "status.reblogged_by": "{name} boostte",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
-  "status.replyAll": "Reageer op iedereen",
+  "status.replyAll": "Op iedereen reageren",
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
   "upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
-  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
-  "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
   "upload_modal.analyzing_picture": "Afbeelding analyseren…",
   "upload_modal.apply": "Toepassen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ec2ff82144..14b355233b 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "Ingen innlegg",
   "account.featured_tags.title": "{name} sine framheva emneknaggar",
   "account.follow": "Fylg",
-  "account.follow_back": "Følg tilbake",
+  "account.follow_back": "Fylg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
@@ -40,7 +40,7 @@
   "account.following_counter": "{count, plural, one {Fylgjer {counter}} other {Fylgjer {counter}}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
   "account.go_to_profile": "Gå til profil",
-  "account.hide_reblogs": "Skjul framhevingar frå @{name}",
+  "account.hide_reblogs": "Gøym framhevingar frå @{name}",
   "account.in_memoriam": "Til minne om.",
   "account.joined_short": "Vart med",
   "account.languages": "Endre språktingingar",
@@ -49,7 +49,7 @@
   "account.media": "Media",
   "account.mention": "Nemn @{name}",
   "account.moved_to": "{name} seier at deira nye konto no er:",
-  "account.mute": "Målbind @{name}",
+  "account.mute": "Demp @{name}",
   "account.mute_notifications_short": "Demp varslingar",
   "account.mute_short": "Demp",
   "account.muted": "Målbunden",
@@ -69,9 +69,9 @@
   "account.unblock_short": "Stopp blokkering",
   "account.unendorse": "Ikkje vis på profil",
   "account.unfollow": "Slutt å fylgja",
-  "account.unmute": "Opphev målbinding av @{name}",
+  "account.unmute": "Opphev demping av @{name}",
   "account.unmute_notifications_short": "Opphev demping av varslingar",
-  "account.unmute_short": "Opphev målbinding",
+  "account.unmute_short": "Opphev demping",
   "account_note.placeholder": "Klikk for å leggja til merknad",
   "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering",
   "admin.dashboard.monthly_retention": "Mengda brukarar aktive ved månader etter registrering",
@@ -79,8 +79,8 @@
   "admin.dashboard.retention.cohort": "Registrert månad",
   "admin.dashboard.retention.cohort_size": "Nye brukarar",
   "admin.impact_report.instance_accounts": "Kontoprofilar dette vil sletta",
-  "admin.impact_report.instance_followers": "Følgjarar våre brukarar vil mista",
-  "admin.impact_report.instance_follows": "Følgjarar deira brukarar vil mista",
+  "admin.impact_report.instance_followers": "Fylgjarar som brukarane våre ville mista",
+  "admin.impact_report.instance_follows": "Fylgjarar som brukarane deira ville mista",
   "admin.impact_report.title": "Samandrag av konsekvensane",
   "alert.rate_limited.message": "Ver venleg å prøv på nytt etter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Redusert kapasitet",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "autosuggest_hashtag.per_week": "{count} per veke",
+  "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektere di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.",
+  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_more": "Vis meir",
+  "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
+  "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.",
+  "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.",
+  "block_modal.title": "Blokker brukaren?",
+  "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -114,7 +121,7 @@
   "column.community": "Lokal tidsline",
   "column.direct": "Private omtaler",
   "column.directory": "Sjå gjennom profilar",
-  "column.domain_blocks": "Skjulte domene",
+  "column.domain_blocks": "Blokkerte domene",
   "column.favourites": "Favorittar",
   "column.firehose": "Tidslinjer",
   "column.follow_requests": "Fylgjeførespurnadar",
@@ -125,7 +132,7 @@
   "column.pins": "Festa tut",
   "column.public": "Samla tidsline",
   "column_back_button.label": "Attende",
-  "column_header.hide_settings": "Gøym innstillingar",
+  "column_header.hide_settings": "Gøym innstillingane",
   "column_header.moveLeft_settings": "Flytt kolonne til venstre",
   "column_header.moveRight_settings": "Flytt kolonne til høgre",
   "column_header.pin": "Fest",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
-  "compose_form.poll.add_option": "Legg til eit val",
   "compose_form.poll.duration": "Varigheit for rundspørjing",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Fjern dette valet",
+  "compose_form.poll.multiple": "Fleirval",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
   "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
-  "compose_form.publish": "Legg ut",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Legg ut",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringar",
-  "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
-  "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
+  "compose_form.spoiler_placeholder": "Innhaldsåtvaring (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
-  "confirmations.block.message": "Er du sikker på at du vil blokkera {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk attende førespurnad",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekkje attende førespurnaden din om å fylgje {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil sletta denne lista for alltid?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagra endringar i mediaskildringa eller førehandsvisinga. Vil du forkasta dei likevel?",
-  "confirmations.domain_block.confirm": "Skjul alt frå domenet",
-  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller målbindingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
+  "confirmations.domain_block.confirm": "Blokker tenaren",
+  "confirmations.domain_block.message": "Er du heilt, heilt sikker på at du vil skjula heile {domain}? I dei fleste tilfelle er det godt nok og føretrekt med nokre få målretta blokkeringar eller dempingar. Du kjem ikkje til å sjå innhald frå domenet i fødererte tidsliner eller i varsla dine. Fylgjarane dine frå domenet vert fjerna.",
   "confirmations.edit.confirm": "Rediger",
   "confirmations.edit.message": "Å redigera no vil overskriva den meldinga du er i ferd med å skriva. Er du sikker på at du vil halda fram?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logga ut?",
-  "confirmations.mute.confirm": "Målbind",
-  "confirmations.mute.explanation": "Dette vil skjula innlegg som kjem frå og som nemner dei, men vil framleis la dei sjå innlegga dine og fylgje deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil målbinda {name}?",
+  "confirmations.mute.confirm": "Demp",
   "confirmations.redraft.confirm": "Slett & skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil sletta denne statusen og skriva han på nytt? Då misser du favorittar og framhevingar, og svar til det opprinnelege innlegget vert foreldrelause.",
   "confirmations.reply.confirm": "Svar",
@@ -207,7 +208,28 @@
   "dismissable_banner.explore_links": "Desse nyhendesakene snakkast om av folk på denne og andre tenarar på det desentraliserte nettverket no.",
   "dismissable_banner.explore_statuses": "Dette er innlegg frå det desentraliserte nettverket som er i støytet i dag. Nye statusar som er mykje framheva og merkte som favorittar er rangert høgare.",
   "dismissable_banner.explore_tags": "Desse emneknaggane er populære blant folk på denne tenaren og andre tenarar i det desentraliserte nettverket nett no.",
-  "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} følgjer.",
+  "dismissable_banner.public_timeline": "Dette er dei nyaste offentlege innlegga frå menneske på det sosiale nettet som folk på {domain} fylgjer.",
+  "domain_block_modal.block": "Blokker tenaren",
+  "domain_block_modal.block_account_instead": "Blokker @{name} i staden",
+  "domain_block_modal.they_can_interact_with_old_posts": "Folk på denne tenaren kan samhandla med dei gamle innlegga dine.",
+  "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.",
+  "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.",
+  "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_followers": "Alle fylgjarane dine frå denne tenaren blir fjerna.",
+  "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
+  "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
+  "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
+  "domain_pill.server": "Tenar",
+  "domain_pill.their_handle": "Deira handtak:",
+  "domain_pill.their_server": "Deira digitale heim, som alle innlegga deira bur.",
+  "domain_pill.their_username": "Deira unike identifikator på serveren deira. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
+  "domain_pill.username": "Brukarnamn",
+  "domain_pill.whats_in_a_handle": "Kva er i eit handtak?",
+  "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
+  "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
+  "domain_pill.your_handle": "Handtaket ditt:",
+  "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur i. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
+  "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
   "embed.instructions": "Bygg inn denne statusen på nettsida di ved å kopiera koden nedanfor.",
   "embed.preview": "Slik kjem det til å sjå ut:",
   "emoji_button.activity": "Aktivitet",
@@ -226,26 +248,27 @@
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
   "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
-  "empty_column.account_suspended": "Kontoen er suspendert",
+  "empty_column.account_suspended": "Kontoen er utestengd",
   "empty_column.account_timeline": "Ingen tut her!",
   "empty_column.account_unavailable": "Profil ikkje tilgjengeleg",
   "empty_column.blocks": "Du har ikkje blokkert nokon enno.",
   "empty_column.bookmarked_statuses": "Du har ikkje lagra noko bokmerke enno. Når du set bokmerke på eit innlegg, dukkar det opp her.",
   "empty_column.community": "Den lokale tidslina er tom. Skriv noko offentleg å få ballen til å rulle!",
   "empty_column.direct": "Du har ingen private omtaler enda. Etter du har sendt eller mottatt en, så vil den dukke opp her.",
-  "empty_column.domain_blocks": "Det er ingen skjulte domene til no.",
+  "empty_column.domain_blocks": "Det er ingen blokkerte domene enno.",
   "empty_column.explore_statuses": "Ingenting er i støytet nett no. Prøv igjen seinare!",
   "empty_column.favourited_statuses": "Du har ingen favoritt-statusar ennå. Når du merkjer ein som favoritt, dukkar han opp her.",
   "empty_column.favourites": "Ingen har merkt denne statusen som favoritt enno. Når nokon gjer det, dukkar dei opp her.",
-  "empty_column.follow_requests": "Du har ingen følgjeførespurnadar ennå. Når du får ein, så vil den dukke opp her.",
+  "empty_column.follow_requests": "Ingen har spurt om å fylgja deg enno. Når nokon gjer det, vil det dukka opp her.",
   "empty_column.followed_tags": "Du fylgjer ingen emneknaggar enno. Når du gjer det, vil dei syna her.",
   "empty_column.hashtag": "Det er ingenting i denne emneknaggen enno.",
-  "empty_column.home": "Heime-tidslina di er tom! Følg fleire folk for å fylle ho med innhald. {suggestions}",
+  "empty_column.home": "Heime-tidslina di er tom! Fylg fleire folk for å fylla ho med innhald. {suggestions}.",
   "empty_column.list": "Det er ingenting i denne lista enno. Når medlemer av denne lista legg ut nye statusar, så dukkar dei opp her.",
   "empty_column.lists": "Du har ingen lister enno. Når du lagar ei, så dukkar ho opp her.",
   "empty_column.mutes": "Du har ikkje målbunde nokon enno.",
+  "empty_column.notification_requests": "Ferdig! Her er det ingenting. Når du får nye varsel, kjem dei opp her slik du har valt.",
   "empty_column.notifications": "Du har ingen varsel enno. Kommuniser med andre for å starte samtalen.",
-  "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller følg brukarar frå andre tenarar manuelt for å fylle det opp",
+  "empty_column.public": "Det er ingenting her! Skriv noko offentleg, eller fylg brukarar frå andre tenarar manuelt for å få meir her",
   "error.unexpected_crash.explanation": "På grunn av eit nettlesarkompatibilitetsproblem eller ein feil i koden vår, kunne ikkje denne sida bli vist slik den skal.",
   "error.unexpected_crash.explanation_addons": "Denne sida kunne ikkje visast som den skulle. Feilen kjem truleg frå ei nettleserutviding eller frå automatiske omsetjingsverktøy.",
   "error.unexpected_crash.next_steps": "Prøv å lasta inn sida på nytt. Hjelper ikkje dette kan du framleis nytta Mastodon i ein annan nettlesar eller app.",
@@ -274,12 +297,25 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
+  "filtered_notifications_banner.pending_requests": "Varsel frå {count, plural, =0 {ingen} one {ein person} other {# folk}} du kanskje kjenner",
+  "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
   "firehose.local": "Denne tenaren",
   "firehose.remote": "Andre tenarar",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Sjølv om kontoen din ikkje er låst tenkte dei som driv {domain} at du kanskje ville gå gjennom førespurnadar frå desse kontoane manuelt.",
+  "follow_suggestions.curated_suggestion": "Utvalt av staben",
+  "follow_suggestions.dismiss": "Ikkje vis igjen",
+  "follow_suggestions.hints.featured": "Denne profilen er handplukka av folka på {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Denne profilen er populær hjå dei du fylgjer.",
+  "follow_suggestions.hints.most_followed": "Mange på {domain} fylgjer denne profilen.",
+  "follow_suggestions.hints.most_interactions": "Denne profilen har nyss fått mykje merksemd på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denne profilen liknar på dei andre profilane du har fylgt i det siste.",
+  "follow_suggestions.personalized_suggestion": "Personleg forslag",
+  "follow_suggestions.popular_suggestion": "Populært forslag",
+  "follow_suggestions.view_all": "Vis alle",
+  "follow_suggestions.who_to_follow": "Kven du kan fylgja",
   "followed_tags": "Fylgde emneknaggar",
   "footer.about": "Om",
   "footer.directory": "Profilmappe",
@@ -306,13 +342,8 @@
   "hashtag.follow": "Fylg emneknagg",
   "hashtag.unfollow": "Slutt å fylgje emneknaggen",
   "hashtags.and_other": "…og {count, plural, one {}other {# fleire}}",
-  "home.actions.go_to_explore": "Sjå kva som er populært",
-  "home.actions.go_to_suggestions": "Finn folk å følgje",
-  "home.column_settings.basic": "Grunnleggjande",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinja di vil ha ei blanding av innlegg frå emneknaggar du har vald å følgje, personane du har vald å følgje, og innlegga dei framhevar. Om det ser ganske stille ut akkurat no, så kan du:",
-  "home.explore_prompt.title": "Dette er heimen din i Mastodon.",
   "home.hide_announcements": "Skjul kunngjeringar",
   "home.pending_critical_update.body": "Oppdater mastodontenaren din så snart som mogleg!",
   "home.pending_critical_update.link": "Sjå oppdateringar",
@@ -396,9 +427,15 @@
   "loading_indicator.label": "Lastar…",
   "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
-  "mute_modal.duration": "Varigheit",
-  "mute_modal.hide_notifications": "Skjul varsel frå denne brukaren?",
-  "mute_modal.indefinite": "På ubestemt tid",
+  "mute_modal.hide_from_notifications": "Ikkje vis varslingar",
+  "mute_modal.hide_options": "Gøym val",
+  "mute_modal.indefinite": "Til eg avdempar dei",
+  "mute_modal.show_options": "Vis val",
+  "mute_modal.they_can_mention_and_follow": "Dei kan nemna og fylgja deg, men du vil ikkje sjå dei.",
+  "mute_modal.they_wont_know": "Dei veit ikkje at dei er dempa.",
+  "mute_modal.title": "Demp brukaren?",
+  "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
+  "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -408,7 +445,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
@@ -432,11 +468,29 @@
   "notification.follow": "{name} fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
   "notification.mention": "{name} nemnde deg",
+  "notification.moderation-warning.learn_more": "Lær meir",
+  "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
+  "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
+  "notification.moderation_warning.action_disable": "Kontoen din har blitt deaktivert.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nokre av innlegga dine har blitt markert som sensitive.",
+  "notification.moderation_warning.action_none": "Kontoen din har mottatt ei moderasjonsåtvaring.",
+  "notification.moderation_warning.action_sensitive": "Innlegga dine vil bli markerte som sensitive frå no av.",
+  "notification.moderation_warning.action_silence": "Kontoen din har blitt avgrensa.",
+  "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du har røysta i er ferdig",
   "notification.reblog": "{name} framheva innlegget ditt",
+  "notification.relationships_severance_event": "Tapte samband med {name}",
+  "notification.relationships_severance_event.account_suspension": "Ein administrator på {from} har utvist {target}, som tyder at du ikkje lenger får oppdateringar frå dei eller kan samhandla med dei.",
+  "notification.relationships_severance_event.domain_block": "Ein administrator på {from} har blokkert {target}, inkludert {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
+  "notification.relationships_severance_event.learn_more": "Lær meir",
+  "notification.relationships_severance_event.user_domain_block": "Du har blokkert {target}, fjerna {followersCount} av fylgjarane dine og {followingCount, plural, one {# konto} other {# kontoar}} du fylgjer.",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte eit innlegg",
+  "notification_requests.accept": "Godkjenn",
+  "notification_requests.dismiss": "Avvis",
+  "notification_requests.notifications_from": "Varslingar frå {name}",
+  "notification_requests.title": "Filtrerte varslingar",
   "notifications.clear": "Tøm varsel",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerna alle varsla dine for alltid?",
   "notifications.column_settings.admin.report": "Nye rapportar:",
@@ -444,8 +498,7 @@
   "notifications.column_settings.alert": "Skrivebordsvarsel",
   "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
-  "notifications.column_settings.filter_bar.category": "Snarfilterlinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinja",
+  "notifications.column_settings.filter_bar.category": "Snøggfilterline",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
   "notifications.column_settings.mention": "Omtalar:",
@@ -471,6 +524,15 @@
   "notifications.permission_denied": "Skrivebordsvarsel er ikkje tilgjengelege på grunn av at nettlesaren tidlegare ikkje har fått naudsynte rettar til å vise dei",
   "notifications.permission_denied_alert": "Sidan nettlesaren tidlegare har blitt nekta naudsynte rettar, kan ikkje skrivebordsvarsel aktiverast",
   "notifications.permission_required": "Skrivebordsvarsel er utilgjengelege fordi naudsynte rettar ikkje er gitt.",
+  "notifications.policy.filter_new_accounts.hint": "Skrive siste {days, plural, one {dag} other {# dagar}}",
+  "notifications.policy.filter_new_accounts_title": "Nye brukarkontoar",
+  "notifications.policy.filter_not_followers_hint": "Inkludert folk som har fylgt deg mindre enn {days, plural, one {ein dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
+  "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
+  "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne nemningar eller viss du fylgjer avsendaren",
+  "notifications.policy.filter_private_mentions_title": "Masseutsende private nemningar",
+  "notifications.policy.title": "Filtrer ut varslingar frå…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
   "notifications_permission_banner.title": "Gå aldri glipp av noko",
@@ -482,7 +544,8 @@
   "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.profile.discoverable": "Gjør min profil synlig",
+  "onboarding.profile.discoverable": "Gjer profilen min synleg",
+  "onboarding.profile.discoverable_hint": "Når du vel å gjera profilen din synleg på Mastodon, vil innlegga dine syna i søkjeresultat og populære innlegg, og profilen din kan bli føreslegen for folk med liknande interesser som deg.",
   "onboarding.profile.display_name": "Synleg namn",
   "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
   "onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.",
@@ -525,17 +588,18 @@
   "poll_button.add_poll": "Lag ei rundspørjing",
   "poll_button.remove_poll": "Fjern rundspørjing",
   "privacy.change": "Endre personvernet på innlegg",
-  "privacy.direct.long": "Synleg kun for omtala brukarar",
-  "privacy.direct.short": "Kun nemnde personar",
-  "privacy.private.long": "Kun synleg for fylgjarar",
-  "privacy.private.short": "Kun fylgjarar",
-  "privacy.public.long": "Synleg for alle",
+  "privacy.direct.long": "Alle nemnde i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Berre dei som fylgjer deg",
+  "privacy.private.short": "Fylgjarar",
+  "privacy.public.long": "Kven som helst på og av Mastodon",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarar",
+  "privacy.unlisted.short": "Stille offentleg",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
-  "recommended": "Anbefalt",
+  "recommended": "Tilrådd",
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
   "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
@@ -550,7 +614,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -565,7 +631,7 @@
   "report.comment.title": "Er det noko anna du meiner me bør vite?",
   "report.forward": "Vidaresend til {target}",
   "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
-  "report.mute": "Målbind",
+  "report.mute": "Demp",
   "report.mute_explanation": "Du vil ikkje lenger sjå innlegga deira. Dei kan framleis fylgje deg og sjå innlegga dine, men vil ikkje vite at du har valt å ikkje sjå innlegga deira.",
   "report.next": "Neste",
   "report.placeholder": "Tilleggskommentarar",
@@ -606,7 +672,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig når man er logget inn.",
+  "search_popout.full_text_search_logged_out_message": "Berre tilgjengeleg når du er logga inn.",
   "search_popout.language_code": "ISO-språkkode",
   "search_popout.options": "Søkjealternativ",
   "search_popout.quick_actions": "Hurtighandlinger",
@@ -636,17 +702,18 @@
   "status.block": "Blokker @{name}",
   "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
-  "status.cannot_reblog": "Denne posten kan ikkje framhevast",
+  "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",
   "status.detailed_status": "Detaljert samtalevisning",
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
+  "status.edited": "Sist endra {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
   "status.embed": "Bygg inn",
   "status.favourite": "Favoritt",
+  "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
   "status.filtered": "Filtrert",
   "status.hide": "Skjul innlegget",
@@ -655,11 +722,11 @@
   "status.load_more": "Last inn meir",
   "status.media.open": "Klikk for å opne",
   "status.media.show": "Klikk for å vise",
-  "status.media_hidden": "Medium gøymd",
+  "status.media_hidden": "Mediet er gøymt",
   "status.mention": "Nemn @{name}",
   "status.more": "Meir",
-  "status.mute": "Målbind @{name}",
-  "status.mute_conversation": "Målbind samtale",
+  "status.mute": "Demp @{name}",
+  "status.mute_conversation": "Demp samtale",
   "status.open": "Utvid denne statusen",
   "status.pin": "Fest på profil",
   "status.pinned": "Festa tut",
@@ -667,6 +734,7 @@
   "status.reblog": "Framhev",
   "status.reblog_private": "Framhev til dei originale mottakarane",
   "status.reblogged_by": "{name} framheva",
+  "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}",
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
@@ -682,11 +750,11 @@
   "status.show_more": "Vis meir",
   "status.show_more_all": "Vis meir for alle",
   "status.show_original": "Vis original",
-  "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}",
+  "status.title.with_attachments": "{user} la ut {attachmentCount, plural, one {eitt vedlegg} other {{attachmentCount} vedlegg}}",
   "status.translate": "Omset",
   "status.translated_from_with": "Omsett frå {lang} ved bruk av {provider}",
   "status.uncached_media_warning": "Førehandsvisning er ikkje tilgjengeleg",
-  "status.unmute_conversation": "Opphev målbinding av samtalen",
+  "status.unmute_conversation": "Opphev demping av samtalen",
   "status.unpin": "Løys frå profil",
   "subscribed_languages.lead": "Kun innlegg på valde språk vil bli dukke opp i heimestraumen din og i listene dine etter denne endringa. For å motta innlegg på alle språk, la vere å velje nokon.",
   "subscribed_languages.save": "Lagre endringar",
@@ -714,10 +782,8 @@
   "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
   "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
   "upload_form.description": "Skildre for blinde og svaksynte",
-  "upload_form.description_missing": "Inga skildring er lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
-  "upload_form.undo": "Slett",
   "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 50da3bb2be..7f93ff0465 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} per uke",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
@@ -146,26 +145,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
-  "compose_form.poll.add_option": "Legg til et valg",
   "compose_form.poll.duration": "Avstemningens varighet",
+  "compose_form.poll.multiple": "Flervalg",
   "compose_form.poll.option_placeholder": "Valg {number}",
-  "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Publiser",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringer",
-  "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innholdsvarsel",
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
-  "compose_form.spoiler_placeholder": "Skriv advarselen din her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
-  "confirmations.block.message": "Er du sikker på at du vil blokkere {name}?",
   "confirmations.cancel_follow_request.confirm": "Trekk tilbake forespørsel",
   "confirmations.cancel_follow_request.message": "Er du sikker på at du vil trekke tilbake forespørselen din for å følge {name}?",
   "confirmations.delete.confirm": "Slett",
@@ -174,15 +169,12 @@
   "confirmations.delete_list.message": "Er du sikker på at du vil slette denne listen permanent?",
   "confirmations.discard_edit_media.confirm": "Forkast",
   "confirmations.discard_edit_media.message": "Du har ulagrede endringer i mediebeskrivelsen eller i forhåndsvisning, forkast dem likevel?",
-  "confirmations.domain_block.confirm": "Skjul alt fra domenet",
   "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.edit.confirm": "Redigér",
   "confirmations.edit.message": "Å redigere nå vil overskrive meldingen du skriver for øyeblikket. Er du sikker på at du vil fortsette?",
   "confirmations.logout.confirm": "Logg ut",
   "confirmations.logout.message": "Er du sikker på at du vil logge ut?",
   "confirmations.mute.confirm": "Demp",
-  "confirmations.mute.explanation": "Dette vil skjule innlegg fra dem og innlegg som nevner dem, men det vil fortsatt la dem se dine innlegg og å følge deg.",
-  "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
   "confirmations.redraft.confirm": "Slett og skriv på nytt",
   "confirmations.redraft.message": "Er du sikker på at du vil slette dette innlegget og lagre det på nytt? Favoritter og fremhevinger vil gå tapt, og svar til det originale innlegget vil bli foreldreløse.",
   "confirmations.reply.confirm": "Svar",
@@ -280,6 +272,7 @@
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
   "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
+  "follow_suggestions.view_all": "Vis alle",
   "followed_tags": "Fulgte emneknagger",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
@@ -306,13 +299,8 @@
   "hashtag.follow": "Følg emneknagg",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
-  "home.actions.go_to_explore": "Se hva som er populært",
-  "home.actions.go_to_suggestions": "Finn folk å følge",
-  "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
-  "home.explore_prompt.body": "Tidslinjen din inneholder en blanding av innlegg fra emneknagger du har valgt å følge, personene du har valgt å følge, og innleggene de fremhever. Hvis det føles for stille, kan det være lurt å:",
-  "home.explore_prompt.title": "Dette er hjemmet ditt i Mastodon.",
   "home.hide_announcements": "Skjul kunngjøring",
   "home.pending_critical_update.body": "Vennligst oppdater Mastodon-serveren din så snart som mulig!",
   "home.pending_critical_update.link": "Se oppdateringer",
@@ -396,9 +384,6 @@
   "loading_indicator.label": "Laster…",
   "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
-  "mute_modal.duration": "Varighet",
-  "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
-  "mute_modal.indefinite": "På ubestemt tid",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åpne i det avanserte nettgrensesnittet",
   "navigation_bar.blocks": "Blokkerte brukere",
@@ -408,7 +393,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
@@ -443,9 +427,6 @@
   "notifications.column_settings.admin.sign_up": "Nye registreringer:",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
   "notifications.column_settings.favourite": "Favoritter:",
-  "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
-  "notifications.column_settings.filter_bar.category": "Hurtigfiltreringslinje",
-  "notifications.column_settings.filter_bar.show_bar": "Vis filterlinjen",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgerforespørsler:",
   "notifications.column_settings.mention": "Nevnt:",
@@ -525,14 +506,14 @@
   "poll_button.add_poll": "Legg til en avstemning",
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Juster synlighet",
-  "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Kun nevnte personer",
-  "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
   "recommended": "Anbefalt",
@@ -550,7 +531,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -643,7 +626,6 @@
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
-  "status.edited": "Redigert {date}",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
   "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
@@ -714,10 +696,8 @@
   "upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
   "upload_form.audio_description": "Beskriv det for folk med hørselstap",
   "upload_form.description": "Beskriv for synshemmede",
-  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
-  "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet …",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 833bfe6ace..3c32fed0ef 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -18,6 +18,7 @@
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Navigar sul perfil original",
   "account.cancel_follow_request": "Retirar la demanda d’abonament",
+  "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
   "account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
   "account.domain_blocked": "Domeni amagat",
@@ -28,6 +29,7 @@
   "account.featured_tags.last_status_never": "Cap de publicacion",
   "account.featured_tags.title": "Etiquetas en avant de {name}",
   "account.follow": "Sègre",
+  "account.follow_back": "Sègre en retorn",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
@@ -48,6 +50,7 @@
   "account.mute_notifications_short": "Amudir las notificacions",
   "account.mute_short": "Amudir",
   "account.muted": "Mes en silenci",
+  "account.mutual": "Mutual",
   "account.no_bio": "Cap de descripcion pas fornida.",
   "account.open_original_page": "Dobrir la pagina d’origina",
   "account.posts": "Tuts",
@@ -77,7 +80,6 @@
   "announcement.announcement": "Anóncia",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
   "bundle_column_error.error.title": "Oh non !",
@@ -128,26 +130,14 @@
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
   "compose_form.placeholder": "A de qué pensatz ?",
-  "compose_form.poll.add_option": "Ajustar una causida",
   "compose_form.poll.duration": "Durada del sondatge",
-  "compose_form.poll.option_placeholder": "Opcion {number}",
-  "compose_form.poll.remove_option": "Levar aquesta opcion",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Salvar los cambiaments",
-  "compose_form.sensitive.hide": "Marcar coma sensible",
-  "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
-  "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
-  "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
   "confirmation_modal.cancel": "Anullar",
-  "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
-  "confirmations.block.message": "Volètz vertadièrament blocar {name} ?",
   "confirmations.cancel_follow_request.confirm": "Retirar la demandar",
   "confirmations.cancel_follow_request.message": "Volètz vertadièrament retirar la demanda de seguiment de {name} ?",
   "confirmations.delete.confirm": "Escafar",
@@ -155,14 +145,11 @@
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
   "confirmations.discard_edit_media.confirm": "Ignorar",
-  "confirmations.domain_block.confirm": "Amagar tot lo domeni",
   "confirmations.domain_block.message": "Volètz vertadièrament blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.\nVeiretz pas cap de contengut d’aquel domeni dins cap de flux public o dins vòstras notificacions. Vòstres seguidors d’aquel domeni seràn levats.",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Desconnexion",
   "confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
   "confirmations.mute.confirm": "Rescondre",
-  "confirmations.mute.explanation": "Aquò lor escondrà las publicacions e mencions, mas aquò lor permetrà encara de veire vòstra publicacions e de vos sègre.",
-  "confirmations.mute.message": "Volètz vertadièrament rescondre {name} ?",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
   "confirmations.reply.confirm": "Respondre",
   "confirmations.reply.message": "Respondre remplaçarà lo messatge que sètz a escriure. Volètz vertadièrament contunhar ?",
@@ -172,6 +159,7 @@
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
   "conversation.with": "Amb {names}",
+  "copy_icon_button.copied": "Copiat al quichapapièr",
   "copypaste.copied": "Copiat",
   "copypaste.copy_to_clipboard": "Copiar al quichapapièr",
   "directory.federated": "Del fediverse conegut",
@@ -269,9 +257,6 @@
   "hashtag.follow": "Sègre l’etiqueta",
   "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
-  "home.actions.go_to_explore": "Agachatz las tendéncias",
-  "home.actions.go_to_suggestions": "Trobatz de monde de sègre",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
   "home.hide_announcements": "Rescondre las anóncias",
@@ -294,6 +279,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "far davalar dins la lista",
   "keyboard_shortcuts.enter": "dobrir los estatuts",
+  "keyboard_shortcuts.favourite": "Marcar coma favorit",
+  "keyboard_shortcuts.favourites": "Dobrir la lista dels favorits",
   "keyboard_shortcuts.federated": "dobrir lo flux public global",
   "keyboard_shortcuts.heading": "Acorchis clavièr",
   "keyboard_shortcuts.home": "dobrir lo flux public local",
@@ -339,10 +326,8 @@
   "lists.search": "Cercar demest lo mond que seguètz",
   "lists.subheading": "Vòstras listas",
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
+  "loading_indicator.label": "Cargament…",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
-  "mute_modal.indefinite": "Cap de data de fin",
   "navigation_bar.about": "A prepaus",
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
   "navigation_bar.blocks": "Personas blocadas",
@@ -352,7 +337,6 @@
   "navigation_bar.direct": "Mencions privadas",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
-  "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
@@ -371,6 +355,7 @@
   "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
   "notification.admin.report": "{name} senhalèt {target}",
   "notification.admin.sign_up": "{name} se marquèt",
+  "notification.favourite": "{name} a mes vòstre estatut en favorit",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} a demandat a vos sègre",
   "notification.mention": "{name} vos a mencionat",
@@ -385,9 +370,6 @@
   "notifications.column_settings.admin.sign_up": "Nòus inscrits :",
   "notifications.column_settings.alert": "Notificacions localas",
   "notifications.column_settings.favourite": "Favorits :",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar totas las categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de recèrca rapida",
-  "notifications.column_settings.filter_bar.show_bar": "Afichar la barra de filtres",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.follow_request": "Novèla demanda d’abonament :",
   "notifications.column_settings.mention": "Mencions :",
@@ -423,6 +405,8 @@
   "onboarding.compose.template": "Adiu #Mastodon !",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Nom d’afichatge",
+  "onboarding.profile.note": "Biografia",
   "onboarding.share.title": "Partejar vòstre perfil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
@@ -447,14 +431,7 @@
   "poll_button.add_poll": "Ajustar un sondatge",
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
-  "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Sonque per las personas mencionadas",
-  "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Sonque pels seguidors",
-  "privacy.public.long": "Visiblas per totes",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
-  "privacy.unlisted.short": "Pas-listat",
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
@@ -504,6 +481,7 @@
   "report_notification.categories.spam": "Messatge indesirable",
   "report_notification.categories.violation": "Violacion de las règlas",
   "report_notification.open": "Dobrir lo senhalament",
+  "search.no_recent_searches": "Cap de recèrcas recentas",
   "search.placeholder": "Recercar",
   "search.search_or_paste": "Recercar o picar una URL",
   "search_popout.language_code": "Còdi ISO de lenga",
@@ -536,9 +514,9 @@
   "status.copy": "Copiar lo ligam de l’estatut",
   "status.delete": "Escafar",
   "status.detailed_status": "Vista detalhada de la convèrsa",
+  "status.direct": "Mencionar @{name} en privat",
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
-  "status.edited": "Modificat {date}",
   "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
@@ -609,10 +587,8 @@
   "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
   "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
-  "upload_form.description_missing": "Cap de descripcion pas aponduda",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar la vinheta",
-  "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de l’imatge…",
   "upload_modal.apply": "Aplicar",
@@ -626,6 +602,7 @@
   "upload_modal.preview_label": "Apercebut ({ratio})",
   "upload_progress.label": "Mandadís…",
   "upload_progress.processing": "Tractament…",
+  "username.taken": "Aqueste nom d’utilizaire es pres. Ensajatz-ne un autre",
   "video.close": "Tampar la vidèo",
   "video.download": "Telecargar lo fichièr",
   "video.exit_fullscreen": "Sortir plen ecran",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 132b695cda..c693c24721 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,5 +1,6 @@
 {
   "about.contact": "ਸੰਪਰਕ:",
+  "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
   "about.rules": "ਸਰਵਰ ਨਿਯਮ",
@@ -12,18 +13,34 @@
   "account.block_short": "ਪਾਬੰਦੀ",
   "account.blocked": "ਪਾਬੰਦੀਸ਼ੁਦਾ",
   "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
+  "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
+  "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
+  "account.domain_blocked": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ",
   "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+  "account.enable_notifications": "ਜਦੋਂ {name} ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਦਿਓ",
+  "account.endorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ",
+  "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
+  "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
   "account.follow": "ਫ਼ਾਲੋ",
+  "account.follow_back": "ਵਾਪਸ ਫਾਲ਼ੋ ਕਰੋ",
   "account.followers": "ਫ਼ਾਲੋਅਰ",
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.followers_counter": "{count, plural, one {{counter} ਫ਼ਾਲੋਅਰ} other {{counter} ਫ਼ਾਲੋਅਰ}}",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
+  "account.following_counter": "{count, plural, one {{counter} ਨੂੰ ਫ਼ਾਲੋ} other {{counter} ਨੂੰ ਫ਼ਾਲੋ}}",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
   "account.media": "ਮੀਡੀਆ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
+  "account.mutual": "ਸਾਂਝੇ",
+  "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
+  "account.open_original_page": "ਅਸਲ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹੋ",
   "account.posts": "ਪੋਸਟਾਂ",
   "account.posts_with_replies": "ਪੋਸਤਾਂ ਅਤੇ ਜਵਾਬ",
+  "account.report": "{name} ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ",
   "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
   "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
+  "account.share": "{name} ਦਾ ਪਰੋਫ਼ਾਇਲ ਸਾਂਝਾ ਕਰੋ",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
@@ -35,9 +52,16 @@
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "announcement.announcement": "ਹੋਕਾ",
+  "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ",
+  "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
+  "block_modal.title": "ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
+  "bundle_column_error.error.title": "ਓਹ ਹੋ!",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
   "bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "bundle_column_error.return": "ਵਾਪਸ ਮੁੱਖ ਸਫ਼ੇ ਉੱਤੇ ਜਾਓ",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
+  "bundle_modal_error.message": "ਭਾਗ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਗਲਤ ਵਾਪਰਿਆ ਹੈ।",
   "bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
   "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -67,18 +91,20 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
+  "compose_form.poll.type": "ਸਟਾਈਲ",
+  "compose_form.publish": "ਪੋਸਟ",
   "compose_form.publish_form": "Publish",
-  "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
+  "compose_form.reply": "ਜਵਾਬ ਦਿਓ",
+  "compose_form.save_changes": "ਅੱਪਡੇਟ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
+  "compose_form.spoiler_placeholder": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ (ਚੋਣਵਾਂ)",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
   "confirmations.block.confirm": "ਪਾਬੰਦੀ",
   "confirmations.delete.confirm": "ਹਟਾਓ",
   "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.delete_list.confirm": "ਹਟਾਓ",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
-  "confirmations.domain_block.confirm": "ਪੂਰੀ ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "confirmations.edit.confirm": "ਸੋਧ",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
@@ -118,7 +144,10 @@
   "firehose.local": "ਇਹ ਸਰਵਰ",
   "firehose.remote": "ਹੋਰ ਸਰਵਰ",
   "follow_request.reject": "ਰੱਦ ਕਰੋ",
+  "follow_suggestions.dismiss": "ਮੁੜ ਨਾ ਵੇਖਾਓ",
+  "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ",
   "footer.about": "ਸਾਡੇ ਬਾਰੇ",
+  "footer.directory": "ਪਰੋਫਾਇਲ ਡਾਇਰੈਕਟਰੀ",
   "footer.get_app": "ਐਪ ਲਵੋ",
   "footer.invite": "ਲੋਕਾਂ ਨੂੰ ਸੱਦਾ ਭੇਜੋ",
   "footer.keyboard_shortcuts": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
@@ -130,12 +159,13 @@
   "hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
   "hashtag.column_header.tag_mode.any": "ਜਾਂ {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} ਬਿਨਾਂ",
+  "hashtag.column_settings.select.no_options_message": "ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ ਲੱਭਾ",
   "hashtag.column_settings.tag_mode.any": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ",
   "hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
-  "home.column_settings.basic": "ਆਮ",
+  "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
   "keyboard_shortcuts.blocked": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੂਚੀ ਖੋਲ੍ਹੋ",
@@ -178,7 +208,6 @@
   "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
   "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
-  "mute_modal.duration": "ਮਿਆਦ",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -188,14 +217,15 @@
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.discover": "ਖੋਜ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
-  "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
+  "navigation_bar.filters": "ਮੌਨ ਕੀਤੇ ਸ਼ਬਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
   "navigation_bar.followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
   "navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
+  "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.personal": "ਨਿੱਜੀ",
   "navigation_bar.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
   "navigation_bar.preferences": "ਪਸੰਦਾਂ",
@@ -205,6 +235,8 @@
   "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
   "notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "notification.reblog": "{name} boosted your status",
+  "notifications.column_settings.alert": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ",
+  "notifications.column_settings.favourite": "ਮਨਪਸੰਦ:",
   "notifications.column_settings.follow": "ਨਵੇਂ ਫ਼ਾਲੋਅਰ:",
   "notifications.column_settings.follow_request": "ਨਵੀਆਂ ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ:",
   "notifications.column_settings.status": "ਨਵੀਆਂ ਪੋਸਟਾਂ:",
@@ -238,8 +270,6 @@
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
-  "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
-  "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
@@ -266,9 +296,11 @@
   "report.target": "{target} ਰਿਪੋਰਟ",
   "report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "ਕਨੂੰਨੀ",
   "report_notification.categories.other": "ਬਾਕੀ",
   "report_notification.categories.spam": "ਸਪੈਮ",
   "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
+  "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
   "search.placeholder": "ਖੋਜੋ",
   "search_popout.quick_actions": "ਫੌਰੀ ਕਾਰਵਾਈਆਂ",
   "search_popout.specific_date": "ਖਾਸ ਤਾਰੀਖ",
@@ -276,17 +308,19 @@
   "search_results.accounts": "ਪਰੋਫਾਈਲ",
   "search_results.all": "ਸਭ",
   "search_results.hashtags": "ਹੈਸ਼ਟੈਗ",
+  "search_results.see_all": "ਸਭ ਵੇਖੋ",
   "search_results.statuses": "ਪੋਸਟਾਂ",
+  "search_results.title": "{q} ਲਈ ਖੋਜ",
   "server_banner.learn_more": "ਹੋਰ ਜਾਣੋ",
   "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
   "sign_in_banner.sign_in": "ਲਾਗਇਨ",
+  "sign_in_banner.sso_redirect": "ਲਾਗਇਨ ਜਾਂ ਰਜਿਸਟਰ ਕਰੋ",
   "status.admin_status": "",
   "status.block": "@{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "status.bookmark": "ਬੁੱਕਮਾਰਕ",
   "status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
-  "status.edited": "{date} ਨੂੰ ਸੋਧਿਆ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ਮੜ੍ਹੋ",
   "status.favourite": "ਪਸੰਦ",
@@ -327,7 +361,6 @@
   "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.undo": "ਹਟਾਓ",
   "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
   "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
   "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35dbc6661d..b763f740a2 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Ogłoszenie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
-  "autosuggest_hashtag.per_week": "{count} co tydzień",
+  "block_modal.remote_users_caveat": "Poprosimy serwer {domain} o uszanowanie twojej decyzji. Zgodność nie jest jednak gwarantowana, bo niektóre serwery mogą inaczej obsługiwać blokowanie. Wpisy publiczne mogą być widoczne dla niezalogowanych użytkowników.",
+  "block_modal.show_less": "Pokaż mniej",
+  "block_modal.show_more": "Pokaż więcej",
+  "block_modal.they_cant_mention": "Użytkownik nie może Cię obserwować ani dodawać wzmianek o Tobie.",
+  "block_modal.they_cant_see_posts": "Użytkownik nie będzie widzieć Twoich wpisów, a Ty jego.",
+  "block_modal.they_will_know": "Użytkownik będzie wiedział, że jest zablokowany.",
+  "block_modal.title": "Zablokować użytkownika?",
+  "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię obserwuje, może wyświetlać Twoje wpisy przeznaczone tylko dla obserwujących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
   "compose_form.placeholder": "Co chodzi ci po głowie?",
-  "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
+  "compose_form.poll.multiple": "Wielokrotny wybór",
   "compose_form.poll.option_placeholder": "Opcja {number}",
-  "compose_form.poll.remove_option": "Usuń tę opcję",
+  "compose_form.poll.single": "Wybierz jedną",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
+  "compose_form.poll.type": "Styl",
   "compose_form.publish": "Opublikuj",
   "compose_form.publish_form": "Opublikuj",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Zapisz zmiany",
-  "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
+  "compose_form.reply": "Odpowiedz",
+  "compose_form.save_changes": "Aktualizuj",
   "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
-  "compose_form.spoiler_placeholder": "Wpisz ostrzeżenie tutaj",
+  "compose_form.spoiler_placeholder": "Ostrzeżenie o treści (opcjonalne)",
   "confirmation_modal.cancel": "Anuluj",
-  "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
-  "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
   "confirmations.cancel_follow_request.confirm": "Wycofaj prośbę",
   "confirmations.cancel_follow_request.message": "Czy na pewno chcesz wycofać prośbę o możliwość obserwowania {name}?",
   "confirmations.delete.confirm": "Usuń",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
   "confirmations.discard_edit_media.confirm": "Odrzuć",
   "confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
-  "confirmations.domain_block.confirm": "Ukryj wszystko z domeny",
+  "confirmations.domain_block.confirm": "Blokuj serwer",
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.edit.confirm": "Edytuj",
   "confirmations.edit.message": "Edytowanie wpisu nadpisze wiadomość, którą obecnie piszesz. Czy na pewno chcesz to zrobić?",
   "confirmations.logout.confirm": "Wyloguj",
   "confirmations.logout.message": "Czy na pewno chcesz się wylogować?",
   "confirmations.mute.confirm": "Wycisz",
-  "confirmations.mute.explanation": "To schowa ich i wspominające ich posty, ale wciąż pozwoli im widzieć twoje posty i obserwować cię.",
-  "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
   "confirmations.redraft.confirm": "Usuń i przeredaguj",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i przeredagować ten wpis? Polubienia i podbicia zostaną utracone, a odpowiedzi do oryginalnego wpisu zostaną osierocone.",
   "confirmations.reply.confirm": "Odpowiedz",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Obecnie te wpisy z tego serwera i pozostałych serwerów w zdecentralizowanej sieci zyskują popularność na tym serwerze.",
   "dismissable_banner.explore_tags": "Te hasztagi obecnie zyskują popularność wśród osób z tego serwera i pozostałych w zdecentralizowanej sieci.",
   "dismissable_banner.public_timeline": "Są to najnowsze publiczne wpisy osób w serwisie społecznościowym, które obserwują ludzie w serwisie {domain}.",
+  "domain_block_modal.block": "Blokuj serwer",
+  "domain_block_modal.block_account_instead": "Zamiast tego zablokuj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ludzie z tego serwera mogą wchodzić w interakcje z Twoimi starymi wpisami.",
+  "domain_block_modal.they_cant_follow": "Nikt z tego serwera nie może Cię obserwować.",
+  "domain_block_modal.they_wont_know": "Użytkownik nie dowie się, że został zablokowany.",
+  "domain_block_modal.title": "Zablokować domenę?",
+  "domain_block_modal.you_will_lose_followers": "Wszyscy twoi obserwujący z tego serwera zostaną usunięci.",
+  "domain_block_modal.you_wont_see_posts": "Nie zobaczysz postów ani powiadomień od użytkowników na tym serwerze.",
+  "domain_pill.activitypub_lets_connect": "Pozwala połączyć się z ludźmi na Mastodonie, jak i na innych serwisach społecznościowych.",
+  "domain_pill.activitypub_like_language": "ActivityPub jest językiem używanym przez Mastodon do wymiany danych z innymi serwisami społecznościowymi.",
+  "domain_pill.server": "Serwer",
+  "domain_pill.their_handle": "Uchwyt:",
+  "domain_pill.their_server": "Cyfrowy dom, w którym znajdują się wszystkie wpisy.",
+  "domain_pill.their_username": "Unikalny identyfikator na serwerze. Możliwe jest znalezienie użytkowników o tej samej nazwie użytkownika na różnych serwerach.",
+  "domain_pill.username": "Nazwa użytkownika",
+  "domain_pill.whats_in_a_handle": "Co zawiera uchwyt użytkownika?",
+  "domain_pill.who_they_are": "Ponieważ uchwyty mówią kto jest kim i gdzie się znajduje, możesz wchodzić w interakcje z ludźmi korzystającymi z <button>serwisów opartych o ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ponieważ Twój uchwyt mówi kim jesteś i gdzie się znajdujesz, inni mogą wchodzić z Tobą w interakcje korzystając z <button>serwisów opartych o ActivityPub</button>.",
+  "domain_pill.your_handle": "Twój uchwyt:",
+  "domain_pill.your_server": "Twój cyfrowy dom, w którym żyją wszystkie Twoje wpisy. Nie lubisz tego? Zmień serwer w dowolnym momencie i przenieś swoich obserwujących.",
+  "domain_pill.your_username": "Twój unikalny identyfikator na tym serwerze. Użytkownicy o tej samej nazwie mogą współistnieć na różnych serwerach.",
   "embed.instructions": "Osadź ten wpis na swojej stronie wklejając poniższy kod.",
   "embed.preview": "Będzie to wyglądać tak:",
   "emoji_button.activity": "Aktywność",
@@ -244,6 +266,7 @@
   "empty_column.list": "Nie ma nic na tej liście. Kiedy członkowie listy dodadzą nowe wpisy, pojawia się one tutaj.",
   "empty_column.lists": "Nie masz żadnych list. Kiedy utworzysz jedną, pojawi się tutaj.",
   "empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
+  "empty_column.notification_requests": "To wszystko – kiedy otrzymasz nowe powiadomienia, pokażą się tutaj zgodnie z twoimi ustawieniami.",
   "empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
   "empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych serwerów, aby to wyświetlić",
   "error.unexpected_crash.explanation": "W związku z błędem w naszym kodzie lub braku kompatybilności przeglądarki, ta strona nie może być poprawnie wyświetlona.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
+  "filtered_notifications_banner.mentions": "{count, plural, one {wzmianka} few {wzmianki} other {wzmianek}}",
+  "filtered_notifications_banner.pending_requests": "Powiadomienia od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
+  "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
   "firehose.local": "Ten serwer",
   "firehose.remote": "Inne serwery",
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "Odrzuć",
   "follow_requests.unlocked_explanation": "Mimo że Twoje konto nie jest zablokowane, zespół {domain} uznał że możesz chcieć ręcznie przejrzeć prośby o możliwość obserwacji.",
+  "follow_suggestions.curated_suggestion": "Wybrane przez personel",
+  "follow_suggestions.dismiss": "Nie pokazuj ponownie",
+  "follow_suggestions.featured_longer": "Wybrane przez zespół {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popularni wśród ludzi których obserwujesz",
+  "follow_suggestions.hints.featured": "Ten profil został wybrany przez zespół {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ten profil jest popularny w gronie użytkowników, których obserwujesz.",
+  "follow_suggestions.hints.most_followed": "Ten profil jest jednym z najczęściej obserwowanych na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ten profil otrzymuje dużo interakcji na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ten profil jest podobny do profili ostatnio przez ciebie zaobserwowanych.",
+  "follow_suggestions.personalized_suggestion": "Sugestia spersonalizowana",
+  "follow_suggestions.popular_suggestion": "Sugestia popularna",
+  "follow_suggestions.popular_suggestion_longer": "Popularni na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobne do ostatnio zaobserwowanych przez ciebie profilów",
+  "follow_suggestions.view_all": "Pokaż wszystkie",
+  "follow_suggestions.who_to_follow": "Kogo obserwować",
   "followed_tags": "Obserwowane hasztagi",
   "footer.about": "O serwerze",
   "footer.directory": "Katalog profilów",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
-  "home.actions.go_to_explore": "Zobacz, co jest teraz popularne",
-  "home.actions.go_to_suggestions": "Znajdź ludzi wartych obserwowania",
-  "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
-  "home.explore_prompt.body": "Twój kanał główny będzie zawierał kombinację postów z tagów i osób które obserwujesz oraz wpisów przezeń podbitych. Jeżeli wydaje się to za spokojnym, spróbuj czegoś poniżej.",
-  "home.explore_prompt.title": "To twój punkt podparcia w Mastodonie.",
   "home.hide_announcements": "Ukryj ogłoszenia",
   "home.pending_critical_update.body": "Zaktualizuj serwer jak tylko będzie to możliwe!",
   "home.pending_critical_update.link": "Pokaż aktualizacje",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Ładowanie…",
   "media_gallery.toggle_visible": "Przełącz widoczność",
   "moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, ponieważ zostało przeniesione na {movedToAccount}.",
-  "mute_modal.duration": "Czas",
-  "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
-  "mute_modal.indefinite": "Nieokreślony",
+  "mute_modal.hide_from_notifications": "Ukryj z powiadomień",
+  "mute_modal.hide_options": "Ukryj opcje",
+  "mute_modal.indefinite": "Do ręcznego usunięcia wyciszenia",
+  "mute_modal.show_options": "Pokaż opcje",
+  "mute_modal.they_can_mention_and_follow": "Użytkownik może Cię obserwować oraz dodawać wzmianki, ale Ty ich nie zobaczysz.",
+  "mute_modal.they_wont_know": "Użytkownik nie dowie się, że został wyciszony.",
+  "mute_modal.title": "Wyciszyć użytkownika?",
+  "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
+  "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Prywatne wzmianki",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
-  "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Ulubione",
   "navigation_bar.filters": "Wyciszone słowa",
@@ -432,11 +473,28 @@
   "notification.follow": "{name} obserwuje Cię",
   "notification.follow_request": "{name} chce cię zaobserwować",
   "notification.mention": "Wspomniało o Tobie przez {name}",
+  "notification.moderation-warning.learn_more": "Dowiedz się więcej",
+  "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
+  "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
+  "notification.moderation_warning.action_disable": "Twoje konto zostało wyłączone.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektóre twoje wpisy zostały oznaczone jako wrażliwe.",
+  "notification.moderation_warning.action_none": "Twoje konto otrzymało ostrzeżenie moderacyjne.",
+  "notification.moderation_warning.action_sensitive": "Twoje wpisy będą od teraz oznaczane jako wrażliwe.",
+  "notification.moderation_warning.action_silence": "Twoje konto zostało ograniczone.",
+  "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie w którym brałeś(-aś) udział zakończyło się",
   "notification.reblog": "Twój post został podbity przez {name}",
+  "notification.relationships_severance_event": "Utracone związki z {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
+  "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
+  "notification.relationships_severance_event.learn_more": "Dowiedz się więcej",
   "notification.status": "{name} opublikował(a) nowy wpis",
   "notification.update": "{name} edytował(a) post",
+  "notification_requests.accept": "Akceptuj",
+  "notification_requests.dismiss": "Odrzuć",
+  "notification_requests.notifications_from": "Powiadomienia od {name}",
+  "notification_requests.title": "Powiadomienia filtrowane",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
@@ -445,7 +503,6 @@
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
-  "notifications.column_settings.filter_bar.show_bar": "Pokaż filtry",
   "notifications.column_settings.follow": "Nowi obserwujący:",
   "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
   "notifications.column_settings.mention": "Wspomnienia:",
@@ -471,6 +528,15 @@
   "notifications.permission_denied": "Powiadomienia na pulpicie nie są dostępne, ponieważ wcześniej nie udzielono uprawnień w przeglądarce",
   "notifications.permission_denied_alert": "Powiadomienia na pulpicie nie mogą zostać włączone, ponieważ wcześniej odmówiono uprawnień",
   "notifications.permission_required": "Powiadomienia na pulpicie nie są dostępne, ponieważ nie przyznano wymaganego uprawnienia.",
+  "notifications.policy.filter_new_accounts.hint": "Utworzone w ciągu {days, plural, one {ostatniego dnia} other {ostatnich # dni}}",
+  "notifications.policy.filter_new_accounts_title": "Nowe konta",
+  "notifications.policy.filter_not_followers_hint": "Zawierające osoby które obserwują cię krócej niż {days, plural, one {dzień} other {# dni}}",
+  "notifications.policy.filter_not_followers_title": "Ludzie, którzy cię nie obserwują",
+  "notifications.policy.filter_not_following_hint": "Aż ich ręcznie nie zatwierdzisz",
+  "notifications.policy.filter_not_following_title": "Ludzie, których nie obserwujesz",
+  "notifications.policy.filter_private_mentions_hint": "Odfiltrowane, chyba że są odpowiedzią na twoją własną wzmiankę, lub obserwujesz wysyłającego",
+  "notifications.policy.filter_private_mentions_title": "Nieproszone prywatne wzmianki",
+  "notifications.policy.title": "Odfiltruj powiadomienia od…",
   "notifications_permission_banner.enable": "Włącz powiadomienia na pulpicie",
   "notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia pulpitu. Możesz dokładnie kontrolować, októrych działaniach będziesz powiadomienia na pulpicie za pomocą przycisku {icon} powyżej, jeżeli tylko zostaną włączone.",
   "notifications_permission_banner.title": "Nie przegap niczego",
@@ -526,12 +592,13 @@
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
-  "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspomniane osoby",
-  "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
-  "privacy.private.short": "Tylko obserwujący",
-  "privacy.public.long": "Widoczne dla każdego",
+  "privacy.direct.long": "Wszyscy wspomnieni w tym wpisie",
+  "privacy.direct.short": "Konkretni ludzie",
+  "privacy.private.long": "Tylko ci, którzy cię obserwują",
+  "privacy.private.short": "Obserwujący",
+  "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
   "privacy.public.short": "Publiczny",
+  "privacy.unlisted.additional": "Taki sam jak \"Publiczny\", ale wpis nie pojawi się w kanałach na żywo, hasztagach, odkrywaniu, ani w wyszukiwaniu w Mastodonie, nawet jeżeli jest to włączone w ustawieniach konta.",
   "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
   "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
@@ -551,7 +618,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} s.",
   "relative_time.today": "dzisiaj",
+  "reply_indicator.attachments": "{count, plural, one {# załącznik} few {# załączniki} many {# załączników} other {# załączniku}}",
   "reply_indicator.cancel": "Anuluj",
+  "reply_indicator.poll": "Ankieta",
   "report.block": "Zablokuj",
   "report.block_explanation": "Nie zobaczysz ich wpisów. Nie będą mogli zobaczyć Twoich postów ani cię obserwować. Będą mogli domyślić się, że są zablokowani.",
   "report.categories.legal": "Prawne",
@@ -644,10 +713,11 @@
   "status.direct": "Prywatna wzmianka @{name}",
   "status.direct_indicator": "Prywatna wzmianka",
   "status.edit": "Edytuj",
-  "status.edited": "Edytowano {date}",
+  "status.edited": "Ostatnio edytowane {date}",
   "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
   "status.embed": "Osadź",
   "status.favourite": "Dodaj do ulubionych",
+  "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",
   "status.filtered": "Filtrowany(-a)",
   "status.hide": "Ukryj post",
@@ -668,6 +738,7 @@
   "status.reblog": "Podbij",
   "status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu",
   "status.reblogged_by": "Podbite przez {name}",
+  "status.reblogs": "{count, plural, one {podbicie} few {podbicia} other {podbić}}",
   "status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
   "status.redraft": "Usuń i przeredaguj",
   "status.remove_bookmark": "Usuń zakładkę",
@@ -715,10 +786,8 @@
   "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
   "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
   "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
-  "upload_form.description_missing": "Nie dodano opisu",
   "upload_form.edit": "Edytuj",
   "upload_form.thumbnail": "Zmień miniaturę",
-  "upload_form.undo": "Usuń",
   "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
   "upload_modal.analyzing_picture": "Analizowanie obrazu…",
   "upload_modal.apply": "Zastosuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 482cc8ee73..1a6de08359 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Sem publicações",
   "account.featured_tags.title": "Hashtags em destaque de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificações",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
+  "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
   "account.posts": "Toots",
@@ -87,7 +89,14 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Pediremos ao servidor {domínio} que respeite sua decisão. No entanto, a conformidade não é garantida pois alguns servidores podem lidar com os blocos de maneira diferente. As postagens públicas ainda podem estar visíveis para usuários não logados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Eles não podem mencionar ou seguir você.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver suas postagens e você não verá as deles.",
+  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.title": "Bloquear usuário?",
+  "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -144,26 +153,22 @@
   "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
   "compose_form.lock_disclaimer.lock": "trancado",
   "compose_form.placeholder": "No que você está pensando?",
-  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração da enquete",
+  "compose_form.poll.multiple": "Múltipla escolha",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Remover opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicação",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar alterações",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
+  "compose_form.reply": "Resposta",
+  "compose_form.save_changes": "Atualização",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
-  "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
   "confirmations.cancel_follow_request.confirm": "Cancelar a solicitação",
   "confirmations.cancel_follow_request.message": "Tem certeza de que deseja cancelar seu pedido para seguir {name}?",
   "confirmations.delete.confirm": "Excluir",
@@ -172,15 +177,13 @@
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
-  "confirmations.domain_block.confirm": "Bloquear instância",
+  "confirmations.domain_block.confirm": "Servidor de blocos",
   "confirmations.domain_block.message": "Você tem certeza de que deseja bloquear tudo de {domain}? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá substituir a mensagem que está sendo criando. Tem certeza de que deseja continuar?",
   "confirmations.logout.confirm": "Sair",
   "confirmations.logout.message": "Você tem certeza de que deseja sair?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Isso ocultará toots do usuário e toots que o mencionam, mas ainda permitirá que ele veja teus toots e te siga.",
-  "confirmations.mute.message": "Você tem certeza de que deseja silenciar {name}?",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
   "confirmations.reply.confirm": "Responder",
@@ -206,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas são postagens de toda a rede social que estão ganhando tração hoje. Postagens mais recentes com mais impulsos e favoritos têm classificações mais altas.",
   "dismissable_banner.explore_tags": "Estas hashtags estão ganhando popularidade no momento entre as pessoas deste e de outros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que pessoas em {domain} seguem.",
+  "domain_block_modal.block": "Servidor de blocos.",
+  "domain_block_modal.block_account_instead": "Bloco @(nome)",
+  "domain_block_modal.they_can_interact_with_old_posts": "Pessoas deste servidor podem interagir com suas publicações antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode lhe seguir.",
+  "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+  "domain_block_modal.title": "Dominio do bloco",
+  "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+  "domain_block_modal.you_wont_see_posts": "Você não verá postagens ou notificações de usuários neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Ele permite que você se conecte e interaja com pessoas não apenas no Mastodon, mas também em diferentes aplicativos sociais.",
+  "domain_pill.activitypub_like_language": "ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "Seu identificador:",
+  "domain_pill.their_server": "Sua casa digital, onde ficam todas as suas postagens.",
+  "domain_pill.their_username": "Seu identificador exclusivo em seu servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
+  "domain_pill.username": "Nome de usuário",
+  "domain_pill.whats_in_a_handle": "O que há em uma alça?",
+  "domain_pill.who_they_are": "Como os identificadores indicam quem alguém é e onde está, você pode interagir com pessoas na web social de <button>plataformas alimentadas pelo ActivityPub</button>.",
+  "domain_pill.who_you_are": "Como seu identificador indica quem você é e onde está, as pessoas podem interagir com você nas redes sociais das <button>plataformas alimentadas pelo ActivityPub</button>.",
+  "domain_pill.your_handle": "Seu identificador:",
+  "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
+  "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
@@ -242,6 +266,7 @@
   "empty_column.list": "Nada aqui. Quando membros da lista tootarem, eles aparecerão aqui.",
   "empty_column.lists": "Nada aqui. Quando você criar listas, elas aparecerão aqui.",
   "empty_column.mutes": "Nada aqui.",
+  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui de acordo com suas configurações.",
   "empty_column.notifications": "Interaja com outros usuários para começar a conversar.",
   "empty_column.public": "Publique algo ou siga manualmente usuários de outros servidores",
   "error.unexpected_crash.explanation": "Esta página não pôde ser mostrada corretamente. Este erro provavelmente é devido a um bug em nosso código ou um problema de compatibilidade de navegador.",
@@ -272,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
+  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
+  "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
   "follow_request.authorize": "Aprovar",
   "follow_request.reject": "Recusar",
   "follow_requests.unlocked_explanation": "Apesar de seu perfil não ser trancado, {domain} exige que você revise a solicitação para te seguir destes perfis manualmente.",
+  "follow_suggestions.curated_suggestion": "Escolha da equipe",
+  "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.featured_longer": "Escolhido à mão pela equipe de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que você segue",
+  "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+  "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos em {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção em {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu recentemente.",
+  "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+  "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Similar a perfis que você seguiu recentemente",
+  "follow_suggestions.view_all": "Visualizar tudo",
+  "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
   "footer.about": "Sobre",
   "footer.directory": "Diretório de perfis",
@@ -304,13 +347,8 @@
   "hashtag.follow": "Seguir hashtag",
   "hashtag.unfollow": "Parar de seguir hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
-  "home.actions.go_to_explore": "Veja o que está acontecendo",
-  "home.actions.go_to_suggestions": "Encontre pessoas para seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "Seu feed inicial terá uma mistura de publicações das hashtags que você escolheu seguir, das pessoas que você escolheu seguir e das publicações que elas impulsionam. Se está parecendo tranquilo demais, então que tal:",
-  "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicados",
   "home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon o mais rápido possível!",
   "home.pending_critical_update.link": "Ver atualizações",
@@ -394,9 +432,15 @@
   "loading_indicator.label": "Carregando…",
   "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
   "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
-  "mute_modal.duration": "Duração",
-  "mute_modal.hide_notifications": "Ocultar notificações deste usuário?",
-  "mute_modal.indefinite": "Indefinido",
+  "mute_modal.hide_from_notifications": "Ocultar das notificações",
+  "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.indefinite": "Até que eu os ative",
+  "mute_modal.show_options": "Mostrar opções",
+  "mute_modal.they_can_mention_and_follow": "Eles podem mencionar e seguir você, mas você não os verá.",
+  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.title": "Silenciar usuário?",
+  "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
@@ -406,7 +450,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
@@ -430,20 +473,36 @@
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
   "notification.mention": "{name} te mencionou",
+  "notification.moderation-warning.learn_more": "Aprender mais",
+  "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+  "notification.moderation_warning.action_disable": "Sua conta foi desativada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas de suas publicações foram marcadas por ter conteúdo sensível.",
+  "notification.moderation_warning.action_none": "Sua conta recebeu um aviso de moderação.",
+  "notification.moderation_warning.action_sensitive": "Suas publicações serão marcadas como sensíveis a partir de agora.",
+  "notification.moderation_warning.action_silence": "Sua conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
   "notification.reblog": "{name} deu boost no teu toot",
+  "notification.relationships_severance_event": "Conexões perdidas com {name}",
+  "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
+  "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
+  "notification.relationships_severance_event.learn_more": "Saber mais",
+  "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.status": "{name} acabou de tootar",
   "notification.update": "{name} editou uma publicação",
+  "notification_requests.accept": "Aceitar",
+  "notification_requests.dismiss": "Rejeitar",
+  "notification_requests.notifications_from": "Notificações de {name}",
+  "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
   "notifications.column_settings.favourite": "Favoritos:",
-  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
-  "notifications.column_settings.filter_bar.category": "Barra de filtro rápido das notificações",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtro",
+  "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
+  "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
   "notifications.column_settings.follow": "Seguidores:",
   "notifications.column_settings.follow_request": "Seguidores pendentes:",
   "notifications.column_settings.mention": "Menções:",
@@ -469,6 +528,15 @@
   "notifications.permission_denied": "Navegador não tem permissão para ativar notificações no computador.",
   "notifications.permission_denied_alert": "Verifique a permissão do navegador para ativar notificações no computador.",
   "notifications.permission_required": "Ativar notificações no computador exige permissão do navegador.",
+  "notifications.policy.filter_new_accounts.hint": "Created within the past {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Including people who have been following you fewer than {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "Pessoas que não estão te seguindo",
+  "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+  "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+  "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que respondido em sua própria menção ou se você segue o remetente",
+  "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no computador",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
   "notifications_permission_banner.title": "Nunca perca nada",
@@ -524,14 +592,15 @@
   "poll_button.add_poll": "Adicionar enquete",
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
-  "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
-  "privacy.unlisted.short": "Não-listado",
+  "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
+  "privacy.unlisted.long": "Menos notificações e recomendações do algoritmo",
+  "privacy.unlisted.short": "Público (silencioso)",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -549,7 +618,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Enquete",
   "report.block": "Bloquear",
   "report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
   "report.categories.legal": "Jurídico",
@@ -642,10 +713,11 @@
   "status.direct": "Mencione em privado @{name}",
   "status.direct_indicator": "Menção privada",
   "status.edit": "Editar",
-  "status.edited": "Editado em {date}",
+  "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Favorita",
+  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrado",
   "status.hide": "Ocultar publicação",
@@ -666,6 +738,7 @@
   "status.reblog": "Dar boost",
   "status.reblog_private": "Dar boost para o mesmo público",
   "status.reblogged_by": "{name} deu boost",
+  "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
   "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover do Salvos",
@@ -713,10 +786,8 @@
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
   "upload_form.audio_description": "Descrever para deficientes auditivos",
   "upload_form.description": "Descrever para deficientes visuais",
-  "upload_form.description_missing": "Sem descrição",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
   "upload_modal.analyzing_picture": "Analisando imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a6d0ffee9a..70903065da 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
+  "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.",
+  "block_modal.show_less": "Mostrar menos",
+  "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
+  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.title": "Bloquear utilizador?",
+  "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.add_option": "Adicionar uma opção",
   "compose_form.poll.duration": "Duração do inquérito",
+  "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guardar alterações",
-  "compose_form.sensitive.hide": "Marcar media como sensível",
-  "compose_form.sensitive.marked": "Media marcada como sensível",
-  "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
   "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
-  "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
-  "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
-  "confirmations.block.message": "De certeza que queres bloquear {name}?",
   "confirmations.cancel_follow_request.confirm": "Retirar pedido",
   "confirmations.cancel_follow_request.message": "Tem a certeza que pretende retirar o pedido para seguir {name}?",
   "confirmations.delete.confirm": "Eliminar",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
-  "confirmations.domain_block.confirm": "Esconder tudo deste domínio",
+  "confirmations.domain_block.confirm": "Bloquear servidor",
   "confirmations.domain_block.message": "De certeza que queres bloquear completamente o domínio {domain}? Na maioria dos casos, silenciar ou bloquear alguns utilizadores é suficiente e é o recomendado. Não irás ver conteúdo daquele domínio em cronologia alguma nem nas tuas notificações. Os teus seguidores daquele domínio serão removidos.",
   "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
   "confirmations.logout.confirm": "Terminar sessão",
   "confirmations.logout.message": "Tem a certeza de que quer terminar a sessão?",
   "confirmations.mute.confirm": "Silenciar",
-  "confirmations.mute.explanation": "Isto irá esconder publicações deles ou publicações que os mencionem, mas irá permitir que vejam as suas publicações e sejam seus seguidores.",
-  "confirmations.mute.message": "De certeza que queres silenciar {name}?",
   "confirmations.redraft.confirm": "Eliminar & reescrever",
   "confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
   "confirmations.reply.confirm": "Responder",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Estas são publicações de toda a rede social que estão a ganhar popularidade atualmente. As mensagens mais recentes com mais partilhas e favoritos obtêm uma classificação mais elevada.",
   "dismissable_banner.explore_tags": "Estas #etiquetas estão presentemente a ganhar atenção entre as pessoas neste e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas na rede social que as pessoas em {domain} seguem.",
+  "domain_block_modal.block": "Bloquear servidor",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
+  "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.",
+  "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.",
+  "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
+  "domain_block_modal.title": "Bloquear domínio?",
+  "domain_block_modal.you_will_lose_followers": "Todos os seus seguidores deste servidor serão removidos.",
+  "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.",
+  "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
+  "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
+  "domain_pill.server": "Servidor",
+  "domain_pill.their_handle": "O seu identificador:",
+  "domain_pill.their_server": "A sua casa digital, onde se encontram todas as suas publicações.",
+  "domain_pill.their_username": "O seu identificador único no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+  "domain_pill.username": "Nome de utilizador",
+  "domain_pill.whats_in_a_handle": "Em que consiste um identificador?",
+  "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, pode interagir com as pessoas através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.who_you_are": "Uma vez que o seu identificador indica quem é e onde está, as pessoas podem interagir consigo através da rede social de <button>plataformas que suportam ActivityPub</button>.",
+  "domain_pill.your_handle": "O seu identificador:",
+  "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.",
+  "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
   "embed.preview": "Podes ver aqui como irá ficar:",
   "emoji_button.activity": "Actividade",
@@ -244,6 +266,7 @@
   "empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
   "empty_column.lists": "Ainda não tem qualquer lista. Quando criar uma, ela irá aparecer aqui.",
   "empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
+  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
   "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
   "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a uma compatilidade com o seu navegador, esta página não pôde ser apresentada correctamente.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filtered_notifications_banner.mentions": "{count, plural, one {menção} other {menções}}",
+  "filtered_notifications_banner.pending_requests": "Notificações de {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que talvez conheça",
+  "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
   "firehose.local": "Este servidor",
   "firehose.remote": "Outros servidores",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "follow_requests.unlocked_explanation": "Apesar de a sua não ser privada, a administração de {domain} pensa que poderá querer rever manualmente os pedidos de seguimento dessas contas.",
+  "follow_suggestions.curated_suggestion": "Escolha da equipe",
+  "follow_suggestions.dismiss": "Não mostrar novamente",
+  "follow_suggestions.featured_longer": "Escolhido a dedo pela equipa de {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as pessoas que segue",
+  "follow_suggestions.hints.featured": "Este perfil foi escolhido a dedo pela equipe {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as pessoas que você segue.",
+  "follow_suggestions.hints.most_followed": "Este perfil é um dos mais seguidos no {domain}.",
+  "follow_suggestions.hints.most_interactions": "Este perfil tem recebido recentemente muita atenção no {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Este perfil é semelhante aos perfis que você seguiu mais recentemente.",
+  "follow_suggestions.personalized_suggestion": "Sugestão personalizada",
+  "follow_suggestions.popular_suggestion": "Sugestão popular",
+  "follow_suggestions.popular_suggestion_longer": "Popular em {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
+  "follow_suggestions.view_all": "Ver tudo",
+  "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Hashtags seguidas",
   "footer.about": "Sobre",
   "footer.directory": "Diretório de perfis",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Seguir #etiqueta",
   "hashtag.unfollow": "Deixar de seguir #etiqueta",
   "hashtags.and_other": "…e {count, plural, other {mais #}}",
-  "home.actions.go_to_explore": "Veja as tendências atuais",
-  "home.actions.go_to_suggestions": "Encontrar pessoas para seguir",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
-  "home.explore_prompt.body": "A sua página inicial terá uma mistura de publicações com as hashtags que escolheu seguir, das pessoas que escolheu seguir e as publicações que elas partilham. Parece bastante sossegado por agora, talvez queira:",
-  "home.explore_prompt.title": "Esta é a sua base principal dentro do Mastodon.",
   "home.hide_announcements": "Ocultar comunicações",
   "home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon assim que possível!",
   "home.pending_critical_update.link": "Ver atualizações",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "A carregar…",
   "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
-  "mute_modal.duration": "Duração",
-  "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
-  "mute_modal.indefinite": "Indefinidamente",
+  "mute_modal.hide_from_notifications": "Ocultar das notificações",
+  "mute_modal.hide_options": "Ocultar opções",
+  "mute_modal.indefinite": "Até que eu os tire do silêncio",
+  "mute_modal.show_options": "Mostrar opções",
+  "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.",
+  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.title": "Silenciar utilizador?",
+  "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras silenciadas",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.mention": "{name} mencionou-te",
+  "notification.moderation-warning.learn_more": "Saber mais",
+  "notification.moderation_warning": "Recebeu um aviso de moderação",
+  "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
+  "notification.moderation_warning.action_disable": "A sua conta foi desativada.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algumas das suas publicações foram assinaladas como sensíveis.",
+  "notification.moderation_warning.action_none": "A sua conta recebeu um aviso de moderação.",
+  "notification.moderation_warning.action_sensitive": "As suas publicações serão, a partir de agora, assinaladas como sensíveis.",
+  "notification.moderation_warning.action_silence": "A sua conta foi limitada.",
+  "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua votação terminou",
   "notification.poll": "Uma votação em que participaste chegou ao fim",
   "notification.reblog": "{name} reforçou a tua publicação",
+  "notification.relationships_severance_event": "Perdeu as ligações com {name}",
+  "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
+  "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
+  "notification.relationships_severance_event.learn_more": "Saber mais",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueou {target}, removendo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
+  "notification_requests.accept": "Aceitar",
+  "notification_requests.dismiss": "Descartar",
+  "notification_requests.notifications_from": "Notificações de {name}",
+  "notification_requests.title": "Notificações filtradas",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
   "notifications.column_settings.admin.report": "Novas denúncias:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
-  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
   "notifications.column_settings.mention": "Menções:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
   "notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
   "notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+  "notifications.policy.filter_new_accounts.hint": "Criada nos últimos {days, plural, one {um dia} other {# dias}}",
+  "notifications.policy.filter_new_accounts_title": "Novas contas",
+  "notifications.policy.filter_not_followers_hint": "Incluindo pessoas que o seguem há menos de {days, plural, one {um dia} other {# dias}}",
+  "notifications.policy.filter_not_followers_title": "Pessoas não te seguem",
+  "notifications.policy.filter_not_following_hint": "Até que você os aprove manualmente",
+  "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
+  "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
+  "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Filtrar notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca perca nada",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover sondagem",
   "privacy.change": "Ajustar a privacidade da publicação",
-  "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos os mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas os seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
-  "privacy.unlisted.short": "Não listar",
+  "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+  "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Sondagem",
   "report.block": "Bloquear",
   "report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
   "report.categories.legal": "Legal",
@@ -644,10 +714,11 @@
   "status.direct": "Mencionar @{name} em privado",
   "status.direct_indicator": "Menção privada",
   "status.edit": "Editar",
-  "status.edited": "Editado em {date}",
+  "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
   "status.embed": "Embutir",
   "status.favourite": "Assinalar como favorito",
+  "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
   "status.filtered": "Filtrada",
   "status.hide": "Ocultar publicação",
@@ -668,6 +739,7 @@
   "status.reblog": "Partilhar",
   "status.reblog_private": "Partilhar com a visibilidade original",
   "status.reblogged_by": "{name} reforçou",
+  "status.reblogs": "{count, plural, one {partilha} other {partilhas}}",
   "status.reblogs.empty": "Ainda ninguém reforçou esta publicação. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
   "status.remove_bookmark": "Retirar dos marcadores",
@@ -715,10 +787,8 @@
   "upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
   "upload_modal.analyzing_picture": "A analizar imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 88dbfa4b8e..0aef0ebd96 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -21,6 +21,8 @@
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
   "account.cancel_follow_request": "Retrage cererea de urmărire",
+  "account.copy": "Copiază link-ul profilului",
+  "account.direct": "Menționează pe @{name} în privat",
   "account.disable_notifications": "Nu îmi mai trimite notificări când postează @{name}",
   "account.domain_blocked": "Domeniu blocat",
   "account.edit_profile": "Modifică profilul",
@@ -30,6 +32,7 @@
   "account.featured_tags.last_status_never": "Fără postări",
   "account.featured_tags.title": "Haștagurile recomandate de {name}",
   "account.follow": "Abonează-te",
+  "account.follow_back": "Urmăreşte înapoi",
   "account.followers": "Urmăritori",
   "account.followers.empty": "Acest utilizator nu are încă urmăritori.",
   "account.followers_counter": "{count, plural, one {Un abonat} few {{counter} abonați} other {{counter} de abonați}}",
@@ -38,6 +41,7 @@
   "account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
   "account.go_to_profile": "Mergi la profil",
   "account.hide_reblogs": "Ascunde distribuirile de la @{name}",
+  "account.in_memoriam": "În Memoriam.",
   "account.joined_short": "Înscris",
   "account.languages": "Schimbă limbile abonate",
   "account.link_verified_on": "Proprietatea acestui link a fost verificată pe {date}",
@@ -46,7 +50,10 @@
   "account.mention": "Menționează pe @{name}",
   "account.moved_to": "{name} a indicat că noul său cont este acum:",
   "account.mute": "Pune pe @{name} pe silențios",
+  "account.mute_notifications_short": "Amuțește notificările",
+  "account.mute_short": "Ignoră",
   "account.muted": "Pus pe silențios",
+  "account.no_bio": "Nicio descriere furnizată.",
   "account.open_original_page": "Deschide pagina originală",
   "account.posts": "Postări",
   "account.posts_with_replies": "Postări și răspunsuri",
@@ -69,6 +76,7 @@
   "admin.dashboard.retention.average": "În medie",
   "admin.dashboard.retention.cohort": "Înregistrări lunar",
   "admin.dashboard.retention.cohort_size": "Utilizatori noi",
+  "admin.impact_report.title": "Rezumatul impactului",
   "alert.rate_limited.message": "Vă rugăm să reîncercați după {retry_time, time, medium}.",
   "alert.rate_limited.title": "Debit limitat",
   "alert.unexpected.message": "A apărut o eroare neașteptată.",
@@ -76,7 +84,6 @@
   "announcement.announcement": "Anunț",
   "attachments_list.unprocessed": "(neprocesate)",
   "audio.hide": "Ascunde audio",
-  "autosuggest_hashtag.per_week": "{count} pe săptămână",
   "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
   "bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
   "bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
@@ -99,9 +106,11 @@
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
   "column.community": "Cronologie locală",
+  "column.direct": "Mențiuni private",
   "column.directory": "Explorează profiluri",
   "column.domain_blocks": "Domenii blocate",
   "column.favourites": "Favorite",
+  "column.firehose": "Fluxuri live",
   "column.follow_requests": "Cereri de abonare",
   "column.home": "Acasă",
   "column.lists": "Liste",
@@ -131,26 +140,22 @@
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
   "compose_form.lock_disclaimer.lock": "privat",
   "compose_form.placeholder": "La ce te gândești?",
-  "compose_form.poll.add_option": "Adaugă o opțiune",
   "compose_form.poll.duration": "Durata sondajului",
-  "compose_form.poll.option_placeholder": "Opțiunea {number}",
-  "compose_form.poll.remove_option": "Elimină acestă opțiune",
+  "compose_form.poll.multiple": "Alegeri multiple",
+  "compose_form.poll.option_placeholder": "Opțiune {number}",
+  "compose_form.poll.single": "Alegeți unul",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
-  "compose_form.publish": "Publică",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postare",
   "compose_form.publish_form": "Publică",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvează modificările",
-  "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
+  "compose_form.reply": "Răspundeți",
+  "compose_form.save_changes": "Actualizare",
   "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
-  "compose_form.spoiler_placeholder": "Scrie avertismentul aici",
+  "compose_form.spoiler_placeholder": "Atenționare de conținut (opțional)",
   "confirmation_modal.cancel": "Anulează",
-  "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
-  "confirmations.block.message": "Ești sigur că vrei să blochezi pe {name}?",
   "confirmations.cancel_follow_request.confirm": "Retrage cererea",
   "confirmations.cancel_follow_request.message": "Sunteți sigur că doriți să retrageți cererea dvs. de urmărire pentru {name}?",
   "confirmations.delete.confirm": "Elimină",
@@ -159,14 +164,12 @@
   "confirmations.delete_list.message": "Ești sigur că vrei să elimini definitiv această listă?",
   "confirmations.discard_edit_media.confirm": "Renunță",
   "confirmations.discard_edit_media.message": "Ai modificări nesalvate în descrierea sau previzualizarea media, renunți oricum?",
-  "confirmations.domain_block.confirm": "Blochează întregul domeniu",
   "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi tot domeniul {domain}? În cele mai multe cazuri, raportarea sau blocarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut din acest domeniu în vreun flux public sau în vreo notificare. Abonații tăi din acest domeniu vor fi eliminați.",
   "confirmations.edit.confirm": "Modifică",
+  "confirmations.edit.message": "Editarea acum va suprascrie mesajul pe care îl compuneți în prezent. Sunteți sigur că vreți să continuați?",
   "confirmations.logout.confirm": "Deconectare",
   "confirmations.logout.message": "Ești sigur că vrei să te deconectezi?",
   "confirmations.mute.confirm": "Ignoră",
-  "confirmations.mute.explanation": "Postările acestei persoane și postările în care este menționată vor fi ascunse, însă tot va putea să îți vadă postările și să se aboneze la tine.",
-  "confirmations.mute.message": "Ești sigur că vrei să ignori pe {name}?",
   "confirmations.redraft.confirm": "Șterge și scrie din nou",
   "confirmations.reply.confirm": "Răspunde",
   "confirmations.reply.message": "Dacă răspunzi acum, mesajul pe care îl scrii în acest moment va fi șters. Ești sigur că vrei să continui?",
@@ -176,6 +179,7 @@
   "conversation.mark_as_read": "Marchează ca citit",
   "conversation.open": "Vizualizează conversația",
   "conversation.with": "Cu {names}",
+  "copy_icon_button.copied": "Copiat în clipboard",
   "copypaste.copied": "Copiat",
   "copypaste.copy_to_clipboard": "Copiază în clipboard",
   "directory.federated": "Din fediversul cunoscut",
@@ -251,10 +255,16 @@
   "filter_modal.select_filter.title": "Filtrează această postare",
   "filter_modal.title.status": "Filtrează o postare",
   "firehose.all": "Toate",
+  "firehose.local": "Acest Server",
   "firehose.remote": "Alte servere",
   "follow_request.authorize": "Acceptă",
   "follow_request.reject": "Respinge",
   "follow_requests.unlocked_explanation": "Chiar dacă contul tău nu este blocat, personalul {domain} a considerat că ai putea prefera să consulți manual cererile de abonare de la aceste conturi.",
+  "follow_suggestions.dismiss": "Nu mai afișa din nou",
+  "follow_suggestions.personalized_suggestion": "Sugestie personalizată",
+  "follow_suggestions.popular_suggestion": "Sugestie populară",
+  "follow_suggestions.view_all": "Vizualizați tot",
+  "follow_suggestions.who_to_follow": "Pe cine să urmăriți",
   "followed_tags": "Hastaguri urmărite",
   "footer.about": "Despre",
   "footer.directory": "Catalogul de profiluri",
@@ -277,19 +287,20 @@
   "hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
   "hashtag.follow": "Urmărește haștagul",
   "hashtag.unfollow": "Nu mai urmări haștagul",
-  "home.actions.go_to_suggestions": "Găsește persoane de urmărit",
-  "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Afișează distribuirile",
   "home.column_settings.show_replies": "Afișează răspunsurile",
   "home.hide_announcements": "Ascunde anunțurile",
   "home.pending_critical_update.body": "Te rugăm să-ți actualizezi serverul de Mastodon cat mai curând posibil!",
   "home.pending_critical_update.link": "Vezi noutăți",
+  "home.pending_critical_update.title": "Actualizare critică de securitate disponibilă!",
   "home.show_announcements": "Afișează anunțurile",
+  "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.",
   "interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.",
   "interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.",
   "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
   "interaction_modal.login.action": "Du-mă acasă",
   "interaction_modal.login.prompt": "Adresa serverului tău acasă, de ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Nu ești încă pe Mastodon?",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
   "interaction_modal.title.follow": "Urmărește pe {name}",
@@ -354,9 +365,6 @@
   "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
   "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
   "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
-  "mute_modal.duration": "Durata",
-  "mute_modal.hide_notifications": "Ascunde notificările de la acest utilizator?",
-  "mute_modal.indefinite": "Nedeterminat",
   "navigation_bar.about": "Despre",
   "navigation_bar.advanced_interface": "Deschide în interfața web avansată",
   "navigation_bar.blocks": "Utilizatori blocați",
@@ -365,7 +373,6 @@
   "navigation_bar.compose": "Compune o nouă postare",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
-  "navigation_bar.edit_profile": "Modifică profilul",
   "navigation_bar.explore": "Explorează",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
@@ -398,9 +405,6 @@
   "notifications.column_settings.admin.report": "Raportări noi:",
   "notifications.column_settings.admin.sign_up": "Înscrieri noi:",
   "notifications.column_settings.alert": "Notificări pe desktop",
-  "notifications.column_settings.filter_bar.advanced": "Afișează toate categoriile",
-  "notifications.column_settings.filter_bar.category": "Bară de filtrare rapidă",
-  "notifications.column_settings.filter_bar.show_bar": "Arată bara de filtrare",
   "notifications.column_settings.follow": "Noi urmăritori:",
   "notifications.column_settings.follow_request": "Noi cereri de abonare:",
   "notifications.column_settings.mention": "Mențiuni:",
@@ -461,14 +465,7 @@
   "poll_button.add_poll": "Adaugă un sondaj",
   "poll_button.remove_poll": "Elimină sondajul",
   "privacy.change": "Modifică confidențialitatea postării",
-  "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
-  "privacy.direct.short": "Doar persoane menționate",
-  "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Doar abonați",
-  "privacy.public.long": "Vizibil pentru toți",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
-  "privacy.unlisted.short": "Nelistat",
   "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
   "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
@@ -571,7 +568,6 @@
   "status.direct": "Menționează @{name} în privat",
   "status.direct_indicator": "Mențiune privată",
   "status.edit": "Modifică",
-  "status.edited": "Modificat în data de {date}",
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
   "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
@@ -641,10 +637,8 @@
   "upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
   "upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
   "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
-  "upload_form.description_missing": "Nicio descriere adăugată",
   "upload_form.edit": "Modifică",
   "upload_form.thumbnail": "Schimbă miniatura",
-  "upload_form.undo": "Șterge",
   "upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
   "upload_modal.analyzing_picture": "Se analizează imaginea…",
   "upload_modal.apply": "Aplică",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a8ff90cc00..cd09a505b3 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
-  "autosuggest_hashtag.per_week": "{count} / неделю",
+  "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение. Однако, соблюдение требований не гарантировано, поскольку некоторые серверы могут работать с блокировками по-разному. Публичные записи по-прежнему могут быть видны неавторизованным пользователям.",
+  "block_modal.show_less": "Показать меньше",
+  "block_modal.show_more": "Показать больше",
+  "block_modal.they_cant_mention": "Он не может упоминать или подписываться на вас.",
+  "block_modal.they_cant_see_posts": "Он не может видеть ваши сообщения, и вы не увидите его.",
+  "block_modal.they_will_know": "Он может видеть, что он заблокирован.",
+  "block_modal.title": "Заблокировать пользователя?",
+  "block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
   "compose_form.placeholder": "О чём думаете?",
-  "compose_form.poll.add_option": "Добавить вариант",
   "compose_form.poll.duration": "Продолжительность опроса",
+  "compose_form.poll.multiple": "Несколько вариантов ответа",
   "compose_form.poll.option_placeholder": "Вариант {number}",
-  "compose_form.poll.remove_option": "Убрать этот вариант",
+  "compose_form.poll.single": "Выберите один",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
+  "compose_form.poll.type": "Стиль",
   "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
-  "compose_form.publish_loud": "{publish}!",
+  "compose_form.reply": "Ответить",
   "compose_form.save_changes": "Сохранить",
-  "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
-  "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
-  "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Текст предупреждения",
+  "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
   "confirmation_modal.cancel": "Отмена",
-  "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
-  "confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",
   "confirmations.cancel_follow_request.confirm": "Отменить запрос",
   "confirmations.cancel_follow_request.message": "Вы уверены, что хотите отозвать свой запрос на подписку {name}?",
   "confirmations.delete.confirm": "Удалить",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
   "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
-  "confirmations.domain_block.confirm": "Да, заблокировать узел",
+  "confirmations.domain_block.confirm": "Заблокировать сервер",
   "confirmations.domain_block.message": "Вы точно уверены, что хотите заблокировать {domain} полностью? В большинстве случаев нескольких блокировок и игнорирований вполне достаточно. Вы перестанете видеть публичную ленту и уведомления оттуда. Ваши подписчики из этого домена будут удалены.",
   "confirmations.edit.confirm": "Редактировать",
   "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.mute.confirm": "Игнорировать",
-  "confirmations.mute.explanation": "Это действие скроет посты данного пользователя и те, в которых он упоминается, но при этом он по-прежнему сможет подписаться и смотреть ваши посты.",
-  "confirmations.mute.message": "Вы уверены, что хотите добавить {name} в список игнорируемых?",
   "confirmations.redraft.confirm": "Удалить и исправить",
   "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
   "confirmations.reply.confirm": "Ответить",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
   "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
   "dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
+  "domain_block_modal.block": "Заблокировать сервер",
+  "domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
+  "domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
+  "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
+  "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
+  "domain_block_modal.title": "Заблокировать домен?",
+  "domain_block_modal.you_will_lose_followers": "Все ваши подписчики с этого сервера будут удалены.",
+  "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
+  "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
+  "domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Его бейдж:",
+  "domain_pill.their_server": "Цифровой дом, где находятся все записи.",
+  "domain_pill.their_username": "Уникальный идентификатор на сервере. Возможно найти пользователей с одним и тем же именем пользователя на разных серверах.",
+  "domain_pill.username": "Имя пользователя",
+  "domain_pill.whats_in_a_handle": "Что такое бейдж?",
+  "domain_pill.who_they_are": "Поскольку бейджи говорят о том, кто и где находится, вы можете взаимодействовать с людьми в социальной сети <button>платформ, работающих на платформе ActivityPub</button>.",
+  "domain_pill.who_you_are": "Поскольку ваш бейдж говорит о том, кто вы и где находитесь, люди могут взаимодействовать с вами через социальную сеть <button>платформ, работающих на платформе ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш бейдж:",
+  "domain_pill.your_server": "Сервер, где живут все ваши посты. Этот не нравится? Поменяй сервер в любое время вместе со своими подписчиками.",
+  "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. Вы можете найти пользователей с одним именем пользователя на разных серверах.",
   "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
@@ -240,10 +262,11 @@
   "empty_column.follow_requests": "Вам ещё не приходили запросы на подписку. Все новые запросы будут показаны здесь.",
   "empty_column.followed_tags": "Вы еще не подписались ни на один хэштег. Когда вы это сделаете, они появятся здесь.",
   "empty_column.hashtag": "С этим хэштегом пока ещё ничего не постили.",
-  "empty_column.home": "Ваша лента совсем пуста! Подпишитесь на других, чтобы заполнить её. {suggestions}",
+  "empty_column.home": "Ваша лента совсем пуста! Подписывайтесь на других, чтобы заполнить её.",
   "empty_column.list": "В этом списке пока ничего нет.",
   "empty_column.lists": "У вас ещё нет списков. Созданные вами списки будут показаны здесь.",
   "empty_column.mutes": "Вы ещё никого не добавляли в список игнорируемых.",
+  "empty_column.notification_requests": "Здесь ничего нет! Когда вы получите новые уведомления, они здесь появятся согласно вашим настройкам.",
   "empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
   "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту",
   "error.unexpected_crash.explanation": "Из-за несовместимого браузера или ошибки в нашем коде, эта страница не может быть корректно отображена.",
@@ -274,12 +297,25 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
+  "filtered_notifications_banner.pending_requests": "Уведомления от {count, plural, =0 {никого} one {# человека} other {# других людей, с кем вы можете быть знакомы}}",
+  "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
   "firehose.remote": "Другие серверы",
   "follow_request.authorize": "Авторизовать",
   "follow_request.reject": "Отказать",
   "follow_requests.unlocked_explanation": "Хотя ваша учетная запись не закрыта, команда {domain} подумала, что вы захотите просмотреть запросы от этих учетных записей вручную.",
+  "follow_suggestions.curated_suggestion": "Выбор администрации",
+  "follow_suggestions.dismiss": "Больше не показывать",
+  "follow_suggestions.hints.featured": "Этот профиль был вручную выбран командой {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Этот профиль популярен среди людей, на которых вы подписаны.",
+  "follow_suggestions.hints.most_followed": "Этот профиль один из самых отслеживаемых на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Этот профиль в последнее время привлекает много внимания на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Этот профиль похож на другие профили, на которые вы подписывались в последнее время.",
+  "follow_suggestions.personalized_suggestion": "Персонализированное предложение",
+  "follow_suggestions.popular_suggestion": "Популярное предложение",
+  "follow_suggestions.view_all": "Посмотреть все",
+  "follow_suggestions.who_to_follow": "На кого подписаться",
   "followed_tags": "Отслеживаемые хэштеги",
   "footer.about": "О проекте",
   "footer.directory": "Каталог профилей",
@@ -306,13 +342,8 @@
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
   "hashtags.and_other": "...и {count, plural, other {# ещё}}",
-  "home.actions.go_to_explore": "Посмотреть, что актуально",
-  "home.actions.go_to_suggestions": "Подпишитесь на людей",
-  "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
-  "home.explore_prompt.body": "В вашем доме появятся сообщения из хэштегов, на которые вы хотите подписаться, люди, которых вы выбрали подписаться, и сообщения, которые они увеличили. Сейчас выглядит спокойно, так что:",
-  "home.explore_prompt.title": "Это ваша домашняя база в Мастодоне.",
   "home.hide_announcements": "Скрыть объявления",
   "home.pending_critical_update.body": "Пожалуйста, обновите свой сервер Mastodon как можно скорее!",
   "home.pending_critical_update.link": "Посмотреть обновления",
@@ -377,7 +408,7 @@
   "lightbox.previous": "Назад",
   "limited_account_hint.action": "Все равно показать профиль",
   "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
-  "link_preview.author": "По алфавиту",
+  "link_preview.author": "Автор: {name}",
   "lists.account.add": "Добавить в список",
   "lists.account.remove": "Убрать из списка",
   "lists.delete": "Удалить список",
@@ -396,9 +427,15 @@
   "loading_indicator.label": "Загрузка…",
   "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
-  "mute_modal.duration": "Продолжительность",
-  "mute_modal.hide_notifications": "Скрыть уведомления от этого пользователя?",
-  "mute_modal.indefinite": "Не определена",
+  "mute_modal.hide_from_notifications": "Скрыть из уведомлений",
+  "mute_modal.hide_options": "Скрыть параметры",
+  "mute_modal.indefinite": "Пока я не разблокирую их",
+  "mute_modal.show_options": "Показать опции",
+  "mute_modal.they_can_mention_and_follow": "Они могут упоминать и следить за вами, но вы не будете их видеть.",
+  "mute_modal.they_wont_know": "Они не будут знать, что их заглушили.",
+  "mute_modal.title": "Заглушить пользователя?",
+  "mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
+  "mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
   "navigation_bar.about": "О проекте",
   "navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
   "navigation_bar.blocks": "Заблокированные пользователи",
@@ -408,7 +445,6 @@
   "navigation_bar.direct": "Личные упоминания",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
-  "navigation_bar.edit_profile": "Изменить профиль",
   "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранные",
   "navigation_bar.filters": "Игнорируемые слова",
@@ -435,17 +471,23 @@
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
   "notification.reblog": "{name} продвинул(а) ваш пост",
+  "notification.relationships_severance_event": "Потеряно соединение с {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
+  "notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
+  "notification.relationships_severance_event.learn_more": "Узнать больше",
+  "notification.relationships_severance_event.user_domain_block": "Вы заблокировали {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
   "notification.status": "{name} только что запостил",
   "notification.update": "{name} изменил(а) пост",
+  "notification_requests.accept": "Принять",
+  "notification_requests.dismiss": "Отклонить",
+  "notification_requests.notifications_from": "Уведомления от {name}",
+  "notification_requests.title": "Отфильтрованные уведомления",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
   "notifications.column_settings.favourite": "Избранные:",
-  "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
-  "notifications.column_settings.filter_bar.category": "Панель сортировки",
-  "notifications.column_settings.filter_bar.show_bar": "Отображать панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
@@ -471,6 +513,7 @@
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
+  "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
@@ -526,14 +569,15 @@
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
-  "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Только упомянутые",
-  "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Виден всем",
+  "privacy.direct.long": "Все упомянутые в посте",
+  "privacy.direct.short": "Определённые люди",
+  "privacy.private.long": "Только ваши подписчики",
+  "privacy.private.short": "Подписчики",
+  "privacy.public.long": "Любой, находящийся на Mastodon и вне его",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
-  "privacy.unlisted.short": "Скрытый",
+  "privacy.unlisted.additional": "Работает точно так же, как public, за исключением того, что пост не будет отображаться в прямых лентах, хэштегах, исследованиях или поиске Mastodon, даже если ваш аккаунт подписан на это на уровне всего аккаунта.",
+  "privacy.unlisted.long": "Меньше алгоритмических фанфар",
+  "privacy.unlisted.short": "Тихий публичный",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
@@ -551,7 +595,9 @@
   "relative_time.minutes": "{number} мин",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сегодня",
+  "reply_indicator.attachments": "{count, plural, one {# вложение} other {# вложения}}",
   "reply_indicator.cancel": "Отмена",
+  "reply_indicator.poll": "Опрос",
   "report.block": "Заблокировать",
   "report.block_explanation": "Вы перестанете видеть посты этого пользователя, и он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять, что вы заблокировали его/её.",
   "report.categories.legal": "Правовая информация",
@@ -644,7 +690,6 @@
   "status.direct": "Лично упоминать @{name}",
   "status.direct_indicator": "Личные упоминания",
   "status.edit": "Изменить",
-  "status.edited": "Последнее изменение: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
@@ -715,10 +760,8 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
-  "upload_form.description_missing": "Описание не добавлено",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
-  "upload_form.undo": "Отменить",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
   "upload_modal.analyzing_picture": "Обработка изображения…",
   "upload_modal.apply": "Применить",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 0967ef424b..67aad91005 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -1 +1,80 @@
-{}
+{
+  "about.blocks": "Модеровані серверы",
+  "about.contact": "Контакт:",
+  "about.disclaimer": "Mastodon є задарьнов проґрамов из удпертым кодом тай торговов значков Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Причины не ясні",
+  "about.domain_blocks.silenced.title": "Обмежено",
+  "about.domain_blocks.suspended.explanation": "Ниякі податкы из сього сервера не будут уброблені, усокочені ци поміняні, што чинит невозможнов хоть-яку інтеракцію ци зязок из хосновачами из сього сервера.",
+  "about.domain_blocks.suspended.title": "Заблоковано",
+  "about.not_available": "Ися інформація не была доступна на сюм сервері.",
+  "about.powered_by": "Децентралізована медіа основана на {mastodon}",
+  "about.rules": "Правила сервера",
+  "account.account_note_header": "Примітка",
+  "account.add_or_remove_from_list": "Дати авадь забрати из исписа",
+  "account.badges.bot": "Автоматічно",
+  "account.badges.group": "Ґрупа",
+  "account.block": "Заблоковати @{name}",
+  "account.block_domain": "Заблоковати домен {domain}",
+  "account.block_short": "Заблоковати",
+  "account.blocked": "Заблоковано",
+  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
+  "account.cancel_follow_request": "Удмінити пудписку",
+  "account.copy": "Зкопіровати удкликованя на профіл",
+  "account.disable_notifications": "Бульше не сповіщати ми коли {name} пише",
+  "account.domain_blocked": "Домен заблокованый",
+  "account.edit_profile": "Управити профіл",
+  "account.enable_notifications": "Уповістити ня, кой {name} пише",
+  "account.endorse": "Указовати на профілови",
+  "account.featured_tags.last_status_at": "Датум послідньої публикації {date}",
+  "account.featured_tags.last_status_never": "Ниє публикацій",
+  "account.featured_tags.title": "Ублюблені гештеґы {name}",
+  "account.follow": "Пудписати ся",
+  "account.follow_back": "Пудписати ся тоже",
+  "account.followers": "Пудписникы",
+  "account.followers.empty": "У сього хосновача раз ниє пудписникув.",
+  "account.following": "Слідуєте",
+  "account.follows.empty": "Сись хосновач щи никого не слідує.",
+  "account.go_to_profile": "Перейти на профіл",
+  "account.hide_reblogs": "Спрятати друленя уд @{name}",
+  "account.joined_short": "Датум прикапчованя",
+  "account.languages": "Поміняти убрані языкы",
+  "account.link_verified_on": "Властность сього удкликованя было звірено {date}",
+  "account.media": "Медіа",
+  "account.moved_to": "Хосновач {name} указав, ож новый профіл йим є:",
+  "account.mute": "Стишити {name}",
+  "account.mute_notifications_short": "Стишити голошіня",
+  "account.mute_short": "Стишити",
+  "account.muted": "Стишено",
+  "account.mutual": "Взайомно",
+  "account.no_bio": "Описа ниє.",
+  "account.open_original_page": "Удоперти ориґіналну сторунку",
+  "account.posts": "Публикації",
+  "account.posts_with_replies": "Публикації тай удповіді",
+  "account.report": "Скарговати ся на {name}",
+  "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя",
+  "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас",
+  "account.share": "Пошырити профіл хосновача {name}",
+  "account.show_reblogs": "Указати друленя уд {name}",
+  "account.unblock": "Розблоковати {name}",
+  "account.unblock_domain": "Розблоковати домен {domain}",
+  "account.unblock_short": "Розблоковати",
+  "account.unendorse": "Не указовати на профілови",
+  "account.unfollow": "Удписати ся",
+  "account.unmute_notifications_short": "Указовати голошіня",
+  "account.unmute_short": "Указовати",
+  "account_note.placeholder": "Клопкніт обы додати примітку",
+  "admin.dashboard.retention.cohort_size": "Нові хосновачі",
+  "admin.impact_report.instance_accounts": "Профілі из акаунтув, котрі ся удалят",
+  "admin.impact_report.instance_followers": "Пудписникы, котрых стратят наші хосновачі",
+  "admin.impact_report.instance_follows": "Пудписникы, котрых стратят їхні хосновачі",
+  "admin.impact_report.title": "Вплыв цілком",
+  "alert.rate_limited.message": "Попробуйте зась по {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Частота обмежена",
+  "bundle_column_error.return": "Вернути ся на головну",
+  "bundle_column_error.routing.body": "Не можеме найти сяку сторунку. Бизувні сьте, ож URL у адресному шорикови є добрый?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Заперти",
+  "bundle_modal_error.message": "Штось ся показило, закидь сьме ладовали сись компонент.",
+  "bundle_modal_error.retry": "Попробовати зась",
+  "closed_registrations.other_server_instructions": "Mastodon є децентралізованов платформов, можете си учинити профіл и на другому серверови тай комуніковати из сим."
+}
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 051ec5d6f8..99aa46bc89 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "उद्घोषणा",
   "attachments_list.unprocessed": "(अप्रकृतम्)",
   "audio.hide": "ध्वनिं प्रच्छादय",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
   "boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
   "bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
   "bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
@@ -129,26 +128,14 @@
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि पत्राणि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
   "compose_form.placeholder": "मनसि ते किमस्ति?",
-  "compose_form.poll.add_option": "मतमपरं युज्यताम्",
   "compose_form.poll.duration": "मतदान-समयावधिः",
-  "compose_form.poll.option_placeholder": "मतम् {number}",
-  "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
   "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
   "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
-  "compose_form.publish": "प्रकाशीकुरु",
   "compose_form.publish_form": "प्रकाशीकुरु",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनानि रक्ष",
-  "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
-  "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
-  "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
   "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
-  "compose_form.spoiler_placeholder": "प्रत्यादेशस्ते लिख्यताम्",
   "confirmation_modal.cancel": "नश्यताम्",
-  "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
-  "confirmations.block.message": "निश्चयेनाऽवरोधो विधेयः {name}?",
   "confirmations.cancel_follow_request.confirm": "अनुरोधनमपनय",
   "confirmations.cancel_follow_request.message": "{name} अनुसरणस्यानुरोधमपनेतुं दृढीकृतं वा?",
   "confirmations.delete.confirm": "मार्जय",
@@ -157,15 +144,12 @@
   "confirmations.delete_list.message": "सूचिरियं निश्चयेन स्थायित्वेन च मार्जितुमिच्छसि वा?",
   "confirmations.discard_edit_media.confirm": "अपास्य",
   "confirmations.discard_edit_media.message": "माध्यमवर्णनां प्रदर्शनञ्च अरक्षितानि परिवर्तनानि सन्ति, तानि अपासितुमिच्छसि वा?",
-  "confirmations.domain_block.confirm": "निषिद्धः प्रदेशः क्रियताम्",
   "confirmations.domain_block.message": "नूनं निश्चयेनैव विनष्टुमिच्छति पूर्णप्रदेशमेव {domain} ? अधिकांशसन्दर्भेऽस्थायित्वेन निषेधता निःशब्दत्वञ्च पर्याप्तं चयनीयञ्च । न तस्मात् प्रदेशात्सर्वे विषया द्रष्टुमशक्याः किस्यांश्चिदपि सर्वजनिकसमयतालिकायां वा स्वीयसूचनापटले । सर्वेऽनुसर्तारस्ते प्रदेशात् ये सन्ति ते नश्यन्ते ।",
   "confirmations.edit.confirm": "सम्पादय",
   "confirmations.edit.message": "सम्पादनमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते। निश्चयेनैवं कर्तव्यम्?",
   "confirmations.logout.confirm": "बहिर्गम्यताम्",
   "confirmations.logout.message": "निश्चयेनैव बहिर्गमनं वाञ्छितम्?",
   "confirmations.mute.confirm": "निःशब्दम्",
-  "confirmations.mute.explanation": "एतेन तेषां पत्राणि तथा च यत्र ते उल्लिखिताः तानि छाद्यन्ते, किन्त्वेवं सत्यपि ते त्वामनुसर्तुं ततश्च पत्राणि द्रष्टुं शक्नुवन्ति ।",
-  "confirmations.mute.message": "किं निश्चयेन निःशब्दं भवेत् {name} मित्रमेतत् ?",
   "confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्",
   "confirmations.reply.confirm": "उत्तरम्",
   "confirmations.reply.message": "प्रत्युत्तरमिदानीं लिख्यते तर्हि पूर्वलिखितसन्देशं विनश्य पुनः लिख्यते । निश्चयेनैवं कर्तव्यम् ?",
@@ -275,7 +259,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "प्रचलितवस्तु अनुसर",
   "hashtag.unfollow": "प्रचलितवस्तु अनुसरणं वारय",
-  "home.column_settings.basic": "मूलभूतम्",
   "home.column_settings.show_reblogs": "बुस्त् दर्शय",
   "home.column_settings.show_replies": "उत्तराणि दर्शय",
   "home.hide_announcements": "विज्ञापनानि प्रच्छादय",
@@ -346,9 +329,6 @@
   "load_pending": "{count, plural, one {# नूतनवस्तु} other {# नूतनवस्तूनि}}",
   "media_gallery.toggle_visible": "{number, plural, one {चित्रं प्रच्छादय} other {चित्राणि प्रच्छादय}}",
   "moved_to_account_banner.text": "तव एकौण्ट् {disabledAccount} अधुना निष्कृतो यतोहि {movedToAccount} अस्मिन्त्वमसार्षीः।",
-  "mute_modal.duration": "परिमाणम्",
-  "mute_modal.hide_notifications": "अस्मादुपभोक्तुर्विज्ञापनानि प्रच्छादयितुमिच्छसि वा?",
-  "mute_modal.indefinite": "अ॑परिमितम्",
   "navigation_bar.about": "विषये",
   "navigation_bar.blocks": "निषिद्धभोक्तारः",
   "navigation_bar.bookmarks": "पुटचिह्नानि",
@@ -357,7 +337,6 @@
   "navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
   "navigation_bar.discover": "आविष्कुरु",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्",
   "navigation_bar.explore": "अन्विच्छ",
   "navigation_bar.filters": "मूकीकृतानि पदानि",
   "navigation_bar.follow_requests": "अनुसरणानुरोधाः",
@@ -388,9 +367,6 @@
   "notifications.column_settings.admin.report": "नूतनावेदनानि",
   "notifications.column_settings.admin.sign_up": "नूतनपञ्जीकरणम्:",
   "notifications.column_settings.alert": "देस्क्टप्विज्ञापनानि",
-  "notifications.column_settings.filter_bar.advanced": "सर्वाणि वर्गाणि प्रदर्शय",
-  "notifications.column_settings.filter_bar.category": "द्रुतशोधकशलाका",
-  "notifications.column_settings.filter_bar.show_bar": "शोधकशालकां दर्शय",
   "notifications.column_settings.follow": "नूतनानुसारिणः:",
   "notifications.column_settings.follow_request": "नूतनानुसरणानुरोधाः:",
   "notifications.column_settings.mention": "उल्लिखितानि :",
@@ -453,14 +429,7 @@
   "poll_button.add_poll": "निर्वाचनं योजय",
   "poll_button.remove_poll": "निर्वाचनं मार्जय",
   "privacy.change": "पत्रस्य गोपनीयतां परिवर्तय",
-  "privacy.direct.long": "केवलमुल्लिखितोभोक्तृभ्यो दृश्यते",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "केवलं येऽनुसरन्ति त्वां तेभ्यो दृश्यते",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सर्वेभ्यो दृश्यते",
   "privacy.public.short": "सार्वजनिकम्",
-  "privacy.unlisted.long": "सर्वेभ्यो दृश्यते किन्तु आविष्कारविशेषताभ्योऽन्तरभूतं नास्ति",
-  "privacy.unlisted.short": "असूचीकृतम्",
   "privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
   "privacy_policy.title": "गोपनीयतानीतिः",
   "refresh": "नवीकुरु",
@@ -546,7 +515,6 @@
   "status.delete": "मार्जय",
   "status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
   "status.edit": "सम्पादय",
-  "status.edited": "सम्पादितं {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
   "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
@@ -572,7 +540,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "मार्जय",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 89e951f77d..1a5f2ef0f3 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -60,7 +60,6 @@
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
   "audio.hide": "Cua s'àudio",
-  "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
   "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Faddina de connessione",
@@ -100,38 +99,23 @@
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
   "compose_form.placeholder": "A ite ses pensende?",
-  "compose_form.poll.add_option": "Agiunghe unu sèberu",
   "compose_form.poll.duration": "Longària de su sondàgiu",
-  "compose_form.poll.option_placeholder": "Optzione {number}",
-  "compose_form.poll.remove_option": "Boga custa optzione",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish": "Pùblica",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sarva is modìficas",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
-  "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
-  "confirmations.block.message": "Seguru chi boles blocare {name}?",
   "confirmations.delete.confirm": "Cantzella",
   "confirmations.delete.message": "Seguru chi boles cantzellare custa publicatzione?",
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
-  "confirmations.domain_block.confirm": "Bloca totu su domìniu",
   "confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare {domain}? In sa parte manna de is casos, pagos blocos o silentziamentos de persones sunt sufitzientes e preferìbiles. No as a bìdere cuntenutos dae custu domìniu in peruna lìnia de tempus pùblica o in is notìficas tuas. Sa gente chi ti sighit dae cussu domìniu at a èssere bogada.",
   "confirmations.edit.confirm": "Modìfica",
   "confirmations.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
   "confirmations.mute.confirm": "A sa muda",
-  "confirmations.mute.explanation": "Custu at a cuare is publicatziones issoro e is messàgios chi ddos mèntovant, ma ant a pòdere bìdere is messàgios tuos e t'ant a pòdere sighire.",
-  "confirmations.mute.message": "Seguru chi boles pònnere a {name} a sa muda?",
   "confirmations.redraft.confirm": "Cantzella e torra a fàghere",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
@@ -211,7 +195,6 @@
   "hashtag.column_settings.tag_mode.none": "Perunu de custos",
   "hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
   "hashtag.follow": "Sighi su hashtag",
-  "home.column_settings.basic": "Bàsicu",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
@@ -277,9 +260,6 @@
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende…",
   "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
-  "mute_modal.duration": "Durada",
-  "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
-  "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Informatziones",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
@@ -287,7 +267,6 @@
   "navigation_bar.compose": "Cumpone una publicatzione noa",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
-  "navigation_bar.edit_profile": "Modìfica profilu",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -312,8 +291,6 @@
   "notifications.clear": "Lìmpia notìficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
-  "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
-  "notifications.column_settings.filter_bar.category": "Barra lestra de filtros",
   "notifications.column_settings.follow": "Sighiduras noas:",
   "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
   "notifications.column_settings.mention": "Mèntovos:",
@@ -364,12 +341,7 @@
   "poll_button.add_poll": "Agiunghe unu sondàgiu",
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
-  "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.short": "Esclùidu de sa lista",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
@@ -473,7 +445,6 @@
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.undo": "Cantzella",
   "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
   "upload_modal.analyzing_picture": "Analizende immàgine…",
   "upload_modal.apply": "Àplica",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 0378cd2926..ba62c11f71 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -74,7 +74,6 @@
   "announcement.announcement": "Annooncement",
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
-  "autosuggest_hashtag.per_week": "{count} a week",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -125,26 +124,14 @@
   "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
   "compose_form.lock_disclaimer.lock": "lockit",
   "compose_form.placeholder": "Whit's on yer mind?",
-  "compose_form.poll.add_option": "Pit in a chyce",
   "compose_form.poll.duration": "Poll lenth",
-  "compose_form.poll.option_placeholder": "Chyce {number}",
-  "compose_form.poll.remove_option": "Tak oot this chyce",
   "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
   "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save chynges",
-  "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
   "compose_form.spoiler.marked": "Tak aff the content warnin",
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
-  "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
   "confirmation_modal.cancel": "Stap",
-  "confirmations.block.block_and_report": "Dingie & Clype",
   "confirmations.block.confirm": "Dingie",
-  "confirmations.block.message": "Ye shair thit ye'r wantin tae dingie {name}?",
   "confirmations.cancel_follow_request.confirm": "Tak back yer request",
   "confirmations.cancel_follow_request.message": "Ye shair thit ye'r wantin tae tak back yer request fir tae follae {name}?",
   "confirmations.delete.confirm": "Delete",
@@ -153,13 +140,10 @@
   "confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
   "confirmations.discard_edit_media.confirm": "Fling awa",
   "confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
-  "confirmations.domain_block.confirm": "Dingie the hail domain",
   "confirmations.domain_block.message": "Ye a hunner percent shair thit ye'r wantin tae dingie the hail {domain}? In maist cases a haunfae tairgtit dingies an wheeshts are eneuch an preferit. Ye wullnae see content fae that domain in onie public timelines or in yer notes. Yer follaers fae that domain wull be taen awa.",
   "confirmations.logout.confirm": "Log oot",
   "confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
   "confirmations.mute.confirm": "Wheesht",
-  "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.",
-  "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?",
   "confirmations.redraft.confirm": "Delete an stert anew",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?",
@@ -260,7 +244,6 @@
   "hashtag.column_settings.tag_toggle": "Pit in mair hashtags fir this column",
   "hashtag.follow": "Follae hashtag",
   "hashtag.unfollow": "Unfollae hashtag",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Shaw boosts",
   "home.column_settings.show_replies": "Shaw replies",
   "home.hide_announcements": "Hide annooncements",
@@ -331,9 +314,6 @@
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
-  "mute_modal.duration": "Lenth",
-  "mute_modal.hide_notifications": "Hide notifications fae this uiser?",
-  "mute_modal.indefinite": "Indefinite",
   "navigation_bar.about": "Aboot",
   "navigation_bar.blocks": "Dingied uisers",
   "navigation_bar.bookmarks": "Buikmairks",
@@ -341,7 +321,6 @@
   "navigation_bar.compose": "Scrieve new post",
   "navigation_bar.discover": "Fin",
   "navigation_bar.domain_blocks": "Dingied domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Splore",
   "navigation_bar.filters": "Wheesht wirds",
   "navigation_bar.follow_requests": "Follae requests",
@@ -371,9 +350,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktap notes",
-  "notifications.column_settings.filter_bar.advanced": "Shaw aw caitegories",
-  "notifications.column_settings.filter_bar.category": "Quick filter baur",
-  "notifications.column_settings.filter_bar.show_bar": "Shaw filter baur",
   "notifications.column_settings.follow": "New follaers:",
   "notifications.column_settings.follow_request": "New follae requests:",
   "notifications.column_settings.mention": "Menshies:",
@@ -425,14 +401,7 @@
   "poll_button.add_poll": "Dae a poll",
   "poll_button.remove_poll": "Tak doon poll",
   "privacy.change": "Chynge post privacy",
-  "privacy.direct.long": "Ainly menshied uisers kin see this",
-  "privacy.direct.short": "Menshied fowk ainly",
-  "privacy.private.long": "Ainly follaers kin see this",
-  "privacy.private.short": "Ainly follaers",
-  "privacy.public.long": "Awbody kin see this",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
-  "privacy.unlisted.short": "No listit",
   "privacy_policy.last_updated": "Last updatit {date}",
   "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
@@ -517,7 +486,6 @@
   "status.delete": "Delete",
   "status.detailed_status": "Detailt conversation view",
   "status.edit": "Edit",
-  "status.edited": "Editit {date}",
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.filter": "Filter this post",
@@ -583,10 +551,8 @@
   "upload_error.poll": "File upload isnae allooed wi polls.",
   "upload_form.audio_description": "Describe fir fowk wi hearin loss",
   "upload_form.description": "Describe fir thaim wi visual impairments",
-  "upload_form.description_missing": "Nae description addit",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Chynge thoomnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
   "upload_modal.analyzing_picture": "Analyzin picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c2d2a41cc5..4cb81a760c 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
-  "autosuggest_hashtag.per_week": "සතියකට {count}",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -102,35 +101,24 @@
   "compose_form.encryption_warning": "මාස්ටඩන් වෙත පළ කරන දෑ අන්ත සංකේතනයෙන් ආරක්‍ෂා නොවේ. මාස්ටඩන් හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
-  "compose_form.poll.add_option": "තේරීමක් යොදන්න",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
-  "compose_form.poll.option_placeholder": "තේරීම {number}",
-  "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
-  "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
-  "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
   "confirmation_modal.cancel": "අවලංගු",
-  "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
-  "confirmations.block.message": "ඔබට {name} අවහිර කිරීමට වුවමනා ද?",
   "confirmations.delete.confirm": "මකන්න",
   "confirmations.delete.message": "ඔබට මෙම ලිපිය මැකීමට වුවමනා ද?",
   "confirmations.delete_list.confirm": "මකන්න",
   "confirmations.delete_list.message": "ඔබට මෙම ලැයිස්තුව සදහටම මැකීමට වුවමනා ද?",
   "confirmations.discard_edit_media.confirm": "ඉවත ලන්න",
   "confirmations.discard_edit_media.message": "ඔබට මාධ්‍ය විස්තරයට හෝ පෙරදසුනට නොසුරකින ලද වෙනස්කම් තිබේ, කෙසේ වෙතත් ඒවා ඉවත දමන්නද?",
-  "confirmations.domain_block.confirm": "සම්පූර්ණ වසම අවහිර කරන්න",
   "confirmations.edit.confirm": "සංස්කරණය",
   "confirmations.logout.confirm": "නික්මෙන්න",
   "confirmations.logout.message": "ඔබට නික්මෙන්න අවශ්‍ය බව විශ්වාසද?",
   "confirmations.mute.confirm": "නිශ්ශබ්ද",
-  "confirmations.mute.message": "{name} නිහඬ කිරීමට වුවමනා ද?",
   "confirmations.reply.confirm": "පිළිතුර",
   "conversation.delete": "සංවාදය මකන්න",
   "conversation.mark_as_read": "කියවූ බව යොදන්න",
@@ -209,11 +197,7 @@
   "hashtag.column_settings.tag_mode.all": "මේ සියල්ලම",
   "hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
   "hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
-  "home.actions.go_to_explore": "නැගී එන දෑ බලන්න",
-  "home.actions.go_to_suggestions": "පුද්ගලයින් සොයන්න",
-  "home.column_settings.basic": "මූලික",
   "home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
-  "home.explore_prompt.title": "මෙය ඔබගේ මාස්ටඩන් මුල් පිටුවයි.",
   "home.hide_announcements": "නිවේදන සඟවන්න",
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
@@ -260,8 +244,6 @@
   "lists.replies_policy.none": "කිසිවෙක් නැත",
   "lists.replies_policy.title": "පිළිතුරු පෙන්වන්න:",
   "lists.subheading": "ඔබගේ ලැයිස්තු",
-  "mute_modal.duration": "පරාසය",
-  "mute_modal.hide_notifications": "මෙම පුද්ගලයාගේ දැනුම්දීම් සඟවන්නද?",
   "navigation_bar.about": "පිළිබඳව",
   "navigation_bar.blocks": "අවහිර කළ අය",
   "navigation_bar.bookmarks": "පොත්යොමු",
@@ -269,7 +251,6 @@
   "navigation_bar.compose": "නව ලිපියක් ලියන්න",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
-  "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
   "navigation_bar.explore": "ගවේශනය",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
@@ -297,9 +278,6 @@
   "notifications.column_settings.admin.sign_up": "නව ලියාපදිංචි:",
   "notifications.column_settings.alert": "වැඩතල දැනුම්දීම්",
   "notifications.column_settings.favourite": "ප්‍රියතමයන්:",
-  "notifications.column_settings.filter_bar.advanced": "සියළු ප්‍රවර්ග පෙන්වන්න",
-  "notifications.column_settings.filter_bar.category": "ඉක්මන් පෙරහන් තීරුව",
-  "notifications.column_settings.filter_bar.show_bar": "පෙරහන් තීරුව පෙන්වන්න",
   "notifications.column_settings.follow": "නව අනුගාමිකයින්:",
   "notifications.column_settings.follow_request": "නව අනුගමන ඉල්ලීම්:",
   "notifications.column_settings.mention": "සැඳහුම්:",
@@ -335,11 +313,6 @@
   "poll_button.add_poll": "මත විමසුමක් අරඹන්න",
   "poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
   "privacy.change": "ලිපියේ රහස්‍යතාව සංශෝධනය",
-  "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
-  "privacy.direct.short": "සඳහන් කළ අයට පමණි",
-  "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
-  "privacy.private.short": "අනුගාමිකයින් පමණි",
-  "privacy.public.long": "සැමට දිස්වෙයි",
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
   "refresh": "නැවුම් කරන්න",
@@ -425,7 +398,6 @@
   "status.delete": "මකන්න",
   "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
   "status.edit": "සංස්කරණය",
-  "status.edited": "සංශෝධිතයි {date}",
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
   "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
@@ -481,10 +453,8 @@
   "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
   "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
   "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
-  "upload_form.description_missing": "සවිස්තරයක් නැත",
   "upload_form.edit": "සංස්කරණය",
   "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
-  "upload_form.undo": "මකන්න",
   "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
   "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
   "upload_modal.apply": "යොදන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3e41a2035a..c583b58220 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,745 +1,774 @@
 {
   "about.blocks": "Moderované servery",
   "about.contact": "Kontakt:",
-  "about.disclaimer": "Mastodon je bezplatný softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Dôvod nie je k dispozícii",
-  "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverse. Toto sú výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
-  "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ho nevyhľadáte alebo sa neprihlásite k jeho sledovaniu.",
-  "about.domain_blocks.silenced.title": "Obmedzená",
+  "about.disclaimer": "Mastodon je bezplatný open-source softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Dôvod nebol uvedený",
+  "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverze. Tu sú uvedené výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
+  "about.domain_blocks.silenced.explanation": "Vo všeobecnosti neuvidíte profily a obsah z tohto servera, pokiaľ si ich nevyhľadáte alebo sa neprihlásite k ich sledovaniu.",
+  "about.domain_blocks.silenced.title": "Obmedzený",
   "about.domain_blocks.suspended.explanation": "Žiadne údaje z tohto servera nebudú spracovávané, ukladané ani vymieňané, čo znemožní akúkoľvek interakciu alebo komunikáciu s používateľmi z tohto servera.",
-  "about.domain_blocks.suspended.title": "Vylúčená",
+  "about.domain_blocks.suspended.title": "Vylúčený",
   "about.not_available": "Tieto informácie neboli sprístupnené na tomto serveri.",
-  "about.powered_by": "Decentralizované sociálne médiá poháňané technológiou {mastodon}",
+  "about.powered_by": "Decentralizovaná sociálna sieť na základe technológie {mastodon}",
   "about.rules": "Pravidlá servera",
   "account.account_note_header": "Poznámka",
-  "account.add_or_remove_from_list": "Pridaj alebo odober zo zoznamov",
+  "account.add_or_remove_from_list": "Pridať alebo odobrať zo zoznamov",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
-  "account.block": "Blokuj @{name}",
-  "account.block_domain": "Skry všetko z {domain}",
-  "account.block_short": "Blokuj",
-  "account.blocked": "Blokovaný/á",
-  "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
-  "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
-  "account.copy": "Skopíruj odkaz na profil",
-  "account.direct": "Spomeň @{name} súkromne",
-  "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky",
-  "account.domain_blocked": "Doména skrytá",
-  "account.edit_profile": "Uprav profil",
-  "account.enable_notifications": "Oznamuj mi, keď má @{name} príspevky",
-  "account.endorse": "Zobrazuj na profile",
+  "account.block": "Blokovať @{name}",
+  "account.block_domain": "Blokovať doménu {domain}",
+  "account.block_short": "Blokovať",
+  "account.blocked": "Účet blokovaný",
+  "account.browse_more_on_origin_server": "Zobraziť viac na pôvodnom profile",
+  "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
+  "account.copy": "Skopírovať odkaz na profil",
+  "account.direct": "Súkromne označiť @{name}",
+  "account.disable_notifications": "Zrušiť upozornenia na príspevky od @{name}",
+  "account.domain_blocked": "Doména blokovaná",
+  "account.edit_profile": "Upraviť profil",
+  "account.enable_notifications": "Zapnúť upozornenia na príspevky od @{name}",
+  "account.endorse": "Zobraziť na vlastnom profile",
   "account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
   "account.featured_tags.last_status_never": "Žiadne príspevky",
-  "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}",
-  "account.follow": "Sleduj",
-  "account.follow_back": "Nasleduj späť",
+  "account.featured_tags.title": "Odporúčané hashtagy účtu {name}",
+  "account.follow": "Sledovať",
+  "account.follow_back": "Sledovať späť",
   "account.followers": "Sledovatelia",
-  "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
-  "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúcich} other {{counter} Sledujúcich}}",
-  "account.following": "Sledujem",
-  "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
-  "account.follows.empty": "Tento používateľ ešte nikoho nesleduje.",
-  "account.go_to_profile": "Prejdi na profil",
-  "account.hide_reblogs": "Skry zdieľania od @{name}",
-  "account.in_memoriam": "In Memoriam.",
-  "account.joined_short": "Pridal/a sa",
+  "account.followers.empty": "Tento účet ešte nikto nesleduje.",
+  "account.followers_counter": "{count, plural, one {{counter} sledujúci účet} few {{counter} sledujúce účty} many {{counter} sledujúcich účtov} other {{counter} sledujúcich účtov}}",
+  "account.following": "Sledovaný účet",
+  "account.following_counter": "{count, plural, one {{counter} sledovaný účet} few {{counter} sledované účty} many {{counter} sledovaných účtov} other {{counter} sledovaných účtov}}",
+  "account.follows.empty": "Tento účet ešte nikoho nesleduje.",
+  "account.go_to_profile": "Prejsť na profil",
+  "account.hide_reblogs": "Skryť zdieľania od @{name}",
+  "account.in_memoriam": "In memoriam.",
+  "account.joined_short": "Dátum registrácie",
   "account.languages": "Zmeniť odoberané jazyky",
   "account.link_verified_on": "Vlastníctvo tohto odkazu bolo skontrolované {date}",
   "account.locked_info": "Stav súkromia pre tento účet je nastavený na zamknutý. Jeho vlastník sa sám rozhoduje, kto ho môže sledovať.",
   "account.media": "Médiá",
-  "account.mention": "Spomeň @{name}",
-  "account.moved_to": "{name} uvádza, že jeho/jej nový účet je teraz:",
-  "account.mute": "Stíš @{name}",
-  "account.mute_notifications_short": "Stíš oznámenia",
-  "account.mute_short": "Stíš",
-  "account.muted": "Stíšený",
+  "account.mention": "Označiť @{name}",
+  "account.moved_to": "{name} uvádza, že má nový účet:",
+  "account.mute": "Stíšiť @{name}",
+  "account.mute_notifications_short": "Stíšiť upozornenia",
+  "account.mute_short": "Stíšiť",
+  "account.muted": "Účet stíšený",
   "account.mutual": "Spoločné",
   "account.no_bio": "Nie je uvedený žiadny popis.",
-  "account.open_original_page": "Otvor pôvodnú stránku",
+  "account.open_original_page": "Otvoriť pôvodnú stránku",
   "account.posts": "Príspevky",
   "account.posts_with_replies": "Príspevky a odpovede",
-  "account.report": "Nahlás @{name}",
-  "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti",
-  "account.requested_follow": "{name} ti poslal žiadosť na sledovanie",
-  "account.share": "Zdieľaj @{name} profil",
-  "account.show_reblogs": "Ukáž vyzdvihnutia od @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
-  "account.unblock": "Odblokuj @{name}",
-  "account.unblock_domain": "Prestaň skrývať {domain}",
-  "account.unblock_short": "Odblokuj",
-  "account.unendorse": "Nezobrazuj na profile",
-  "account.unfollow": "Prestaň nasledovať",
-  "account.unmute": "Prestaň ignorovať @{name}",
-  "account.unmute_notifications_short": "Zruš nevšímanie si obznámení",
-  "account.unmute_short": "Zruš nevšímanie",
-  "account_note.placeholder": "Klikni pre vloženie poznámky",
+  "account.report": "Nahlásiť @{name}",
+  "account.requested": "Čaká na schválenie. Žiadosť zrušíte kliknutím sem",
+  "account.requested_follow": "{name} vás chce sledovať",
+  "account.share": "Zdieľaj profil @{name}",
+  "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
+  "account.unblock": "Odblokovať @{name}",
+  "account.unblock_domain": "Odblokovať doménu {domain}",
+  "account.unblock_short": "Odblokovať",
+  "account.unendorse": "Nezobrazovať na vlastnom profile",
+  "account.unfollow": "Zrušiť sledovanie",
+  "account.unmute": "Vypnúť stíšenie @{name}",
+  "account.unmute_notifications_short": "Vypnúť stíšenie upozornení",
+  "account.unmute_short": "Zrušiť stíšenie",
+  "account_note.placeholder": "Kliknutím pridať poznámku",
   "admin.dashboard.daily_retention": "Miera udržania používateľov podľa dňa po registrácii",
   "admin.dashboard.monthly_retention": "Miera udržania používateľov podľa mesiaca po registrácii",
   "admin.dashboard.retention.average": "Priemer",
-  "admin.dashboard.retention.cohort": "Mesiac zaregistrovania sa",
-  "admin.dashboard.retention.cohort_size": "Noví užívatelia",
+  "admin.dashboard.retention.cohort": "Dátum registrácie",
+  "admin.dashboard.retention.cohort_size": "Nové účty",
   "admin.impact_report.instance_accounts": "Profily účtov, ktoré by boli odstránené",
   "admin.impact_report.instance_followers": "Sledovatelia, o ktorých by naši používatelia prišli",
   "admin.impact_report.instance_follows": "Sledovatelia, o ktorých by ich používatelia prišli",
   "admin.impact_report.title": "Zhrnutie dopadu",
-  "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Tempo obmedzené",
+  "alert.rate_limited.message": "Prosím, skúste to znova o {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Priveľa žiadostí",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
-  "audio.hide": "Skry zvuk",
-  "autosuggest_hashtag.per_week": "{count} týždenne",
-  "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
+  "audio.hide": "Skryť zvuk",
+  "block_modal.show_less": "Zobraziť menej",
+  "block_modal.show_more": "Zobraziť viac",
+  "block_modal.title": "Blokovať užívateľa?",
+  "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
   "bundle_column_error.error.title": "Ale nie!",
-  "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s Vaším internetovým pripojením alebo týmto serverom.",
+  "bundle_column_error.network.body": "Pri pokuse o načítanie tejto stránky sa vyskytla chyba. Môže to byť spôsobené dočasným problémom s vaším internetovým pripojením alebo týmto serverom.",
   "bundle_column_error.network.title": "Chyba siete",
-  "bundle_column_error.retry": "Skús to znova",
-  "bundle_column_error.return": "Prejdi späť na domovskú stránku",
-  "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istý, že zadaná adresa URL je správna?",
+  "bundle_column_error.retry": "Skúste to znova",
+  "bundle_column_error.return": "Prejdite späť na domovskú stránku",
+  "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istí, že zadaná adresa URL je správna?",
   "bundle_column_error.routing.title": "404",
-  "bundle_modal_error.close": "Zatvor",
-  "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
+  "bundle_modal_error.close": "Zatvoriť",
+  "bundle_modal_error.message": "Pri načítavaní tohto komponentu nastala chyba.",
   "bundle_modal_error.retry": "Skúsiť znova",
   "closed_registrations.other_server_instructions": "Keďže Mastodon je decentralizovaný, môžete si vytvoriť účet na inom serveri a stále komunikovať s týmto serverom.",
-  "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale majte prosím na pamäti, že nepotrebujete účet práve na {domain}, aby bolo možné používať Mastodon.",
-  "closed_registrations_modal.find_another_server": "Nájdi iný server",
+  "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale myslite na to, že na používanie Mastodonu nepotrebujete účet práve na {domain}.",
+  "closed_registrations_modal.find_another_server": "Nájsť iný server",
   "closed_registrations_modal.preamble": "Mastodon je decentralizovaný, takže bez ohľadu na to, kde si vytvoríte účet, budete môcť sledovať a komunikovať s kýmkoľvek na tomto serveri. Môžete ho dokonca hostiť sami!",
-  "closed_registrations_modal.title": "Registrácia na Mastodon",
+  "closed_registrations_modal.title": "Registrácia na Mastodone",
   "column.about": "O tomto serveri",
-  "column.blocks": "Blokovaní užívatelia",
+  "column.blocks": "Blokované účty",
   "column.bookmarks": "Záložky",
   "column.community": "Miestna časová os",
-  "column.direct": "Súkromné spomenutia",
-  "column.directory": "Prehľadávaj profily",
-  "column.domain_blocks": "Skryté domény",
+  "column.direct": "Súkromné označenia",
+  "column.directory": "Prehľadávať profily",
+  "column.domain_blocks": "Blokované domény",
   "column.favourites": "Obľúbené",
   "column.firehose": "Živé kanály",
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
-  "column.mutes": "Nevšímaní užívatelia",
-  "column.notifications": "Oznámenia",
+  "column.mutes": "Stíšené účty",
+  "column.notifications": "Upozornenia",
   "column.pins": "Pripnuté príspevky",
   "column.public": "Federovaná časová os",
   "column_back_button.label": "Späť",
   "column_header.hide_settings": "Skryť nastavenia",
-  "column_header.moveLeft_settings": "Presuň stĺpec doľava",
-  "column_header.moveRight_settings": "Presuň stĺpec doprava",
-  "column_header.pin": "Pripni",
-  "column_header.show_settings": "Ukáž nastavenia",
-  "column_header.unpin": "Odopni",
+  "column_header.moveLeft_settings": "Presunúť stĺpec doľava",
+  "column_header.moveRight_settings": "Presunúť stĺpec doprava",
+  "column_header.pin": "Pripnúť",
+  "column_header.show_settings": "Zobraziť nastavenia",
+  "column_header.unpin": "Odopnúť",
   "column_subheading.settings": "Nastavenia",
-  "community.column_settings.local_only": "Iba miestna",
+  "community.column_settings.local_only": "Iba miestne",
   "community.column_settings.media_only": "Iba médiá",
-  "community.column_settings.remote_only": "Iba odľahlé",
-  "compose.language.change": "Zmeň jazyk",
-  "compose.language.search": "Hľadaj medzi jazykmi...",
+  "community.column_settings.remote_only": "Iba vzdialené",
+  "compose.language.change": "Zmeniť jazyk",
+  "compose.language.search": "Vyhľadávať jazyky…",
   "compose.published.body": "Príspevok zverejnený.",
-  "compose.published.open": "Otvor",
+  "compose.published.open": "Otvoriť",
   "compose.saved.body": "Príspevok uložený.",
-  "compose_form.direct_message_warning_learn_more": "Zisti viac",
-  "compose_form.encryption_warning": "Príspevky na Mastodon nie sú end-to-end šifrované. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
-  "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným haštagom, lebo nieje verejne listovaný. Iba verejné príspevky môžu byť nájdené podľa haštagu.",
-  "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
+  "compose_form.direct_message_warning_learn_more": "Viac informácií",
+  "compose_form.encryption_warning": "Príspevky na Mastodone nie sú šifrované end-to-end. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
+  "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným hashtagom, lebo nie je verejný. Iba verejné príspevky môžu byť nájdené podľa hashtagu.",
+  "compose_form.lock_disclaimer": "Váš účet nie je {locked}. Ktokoľvek vás môže sledovať a vidieť vaše príspevky pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
-  "compose_form.placeholder": "Čo máš na mysli?",
-  "compose_form.poll.add_option": "Pridaj voľbu",
+  "compose_form.placeholder": "Na čo práve myslíte?",
   "compose_form.poll.duration": "Trvanie ankety",
-  "compose_form.poll.option_placeholder": "Voľba {number}",
-  "compose_form.poll.remove_option": "Odstráň túto voľbu",
-  "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
-  "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
-  "compose_form.publish": "Zverejni",
-  "compose_form.publish_form": "Zverejniť",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ulož zmeny",
-  "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
-  "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
-  "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
-  "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
-  "compose_form.spoiler.unmarked": "Text nieje ukrytý",
-  "compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
+  "compose_form.poll.multiple": "Viacero možností",
+  "compose_form.poll.option_placeholder": "Možnosť {number}",
+  "compose_form.poll.single": "Jediný výber",
+  "compose_form.poll.switch_to_multiple": "Zmeniť anketu a povoliť viaceré možnosti",
+  "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber",
+  "compose_form.poll.type": "Typ",
+  "compose_form.publish": "Uverejniť",
+  "compose_form.publish_form": "Nový príspevok",
+  "compose_form.reply": "Odpovedať",
+  "compose_form.save_changes": "Aktualizovať",
+  "compose_form.spoiler.marked": "Odstrániť varovanie o obsahu",
+  "compose_form.spoiler.unmarked": "Pridať varovanie o obsahu",
+  "compose_form.spoiler_placeholder": "Varovanie o obsahu (voliteľné)",
   "confirmation_modal.cancel": "Zruš",
-  "confirmations.block.block_and_report": "Zablokuj a nahlás",
-  "confirmations.block.confirm": "Blokuj",
-  "confirmations.block.message": "Si si istý/á, že chceš blokovať {name}?",
-  "confirmations.cancel_follow_request.confirm": "Odvolanie žiadosti",
-  "confirmations.cancel_follow_request.message": "Naozaj chcete stiahnuť svoju žiadosť o sledovanie {name}?",
-  "confirmations.delete.confirm": "Vymaž",
-  "confirmations.delete.message": "Si si istý/á, že chceš vymazať túto správu?",
-  "confirmations.delete_list.confirm": "Vymaž",
-  "confirmations.delete_list.message": "Si si istý/á, že chceš natrvalo vymazať tento zoznam?",
-  "confirmations.discard_edit_media.confirm": "Zahoď",
+  "confirmations.block.confirm": "Zablokovať",
+  "confirmations.cancel_follow_request.confirm": "Stiahnuť žiadosť",
+  "confirmations.cancel_follow_request.message": "Určite chcete stiahnuť svoju žiadosť o sledovanie {name}?",
+  "confirmations.delete.confirm": "Vymazať",
+  "confirmations.delete.message": "Určite chcete tento príspevok vymazať?",
+  "confirmations.delete_list.confirm": "Vymazať",
+  "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
+  "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
-  "confirmations.domain_block.confirm": "Skry celú doménu",
-  "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
-  "confirmations.edit.confirm": "Uprav",
-  "confirmations.edit.message": "Úpravou teraz prepíšeš správu, ktorú práve zostavuješ. Si si istý/á, že chceš pokračovať?",
-  "confirmations.logout.confirm": "Odhlás sa",
-  "confirmations.logout.message": "Si si istý/á, že sa chceš odhlásiť?",
-  "confirmations.mute.confirm": "Nevšímaj si",
-  "confirmations.mute.explanation": "Toto nastavenie skryje ich príspevky, alebo príspevky od iných v ktorých sú spomenutí, ale umožní im vidieť tvoje príspevky, aj ťa nasledovať.",
-  "confirmations.mute.message": "Naozaj si chceš nevšímať {name}?",
-  "confirmations.redraft.confirm": "Vyčisti a prepíš",
-  "confirmations.redraft.message": "Ste si istý, že chcete premazať a prepísať tento príspevok? Jeho nadobudnuté vyzdvihnutia a obľúbenia, ale i odpovede na pôvodný príspevok budú odlúčené.",
-  "confirmations.reply.confirm": "Odpovedz",
+  "confirmations.domain_block.confirm": "Blokovať server",
+  "confirmations.domain_block.message": "Určite chcete blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych účtov, čo aj odporúčame. Obsah z tejto domény neuvidíte v žiadnej verejnej časovej osi ani v upozorneniach. Vaši sledujúci pochádzajúci z tejto domény budú odstránení.",
+  "confirmations.edit.confirm": "Upraviť",
+  "confirmations.edit.message": "Úpravou prepíšete príspevok, ktorý máte rozpísaný. Určite chcete pokračovať?",
+  "confirmations.logout.confirm": "Odhlásiť sa",
+  "confirmations.logout.message": "Určite sa chcete odhlásiť?",
+  "confirmations.mute.confirm": "Stíšiť",
+  "confirmations.redraft.confirm": "Vymazať a prepísať",
+  "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
+  "confirmations.reply.confirm": "Odpovedať",
   "confirmations.reply.message": "Odpovedaním akurát teraz prepíšeš správu, ktorú máš práve rozpísanú. Si si istý/á, že chceš pokračovať?",
-  "confirmations.unfollow.confirm": "Prestaň sledovať",
-  "confirmations.unfollow.message": "Naozaj chceš prestať sledovať {name}?",
-  "conversation.delete": "Vymaž konverzáciu",
-  "conversation.mark_as_read": "Označ za prečítané",
-  "conversation.open": "Ukáž konverzáciu",
+  "confirmations.unfollow.confirm": "Prestať sledovať",
+  "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
+  "conversation.delete": "Vymazať konverzáciu",
+  "conversation.mark_as_read": "Označiť ako prečítanú",
+  "conversation.open": "Zobraziť konverzáciu",
   "conversation.with": "S {names}",
-  "copy_icon_button.copied": "Skopírovaný do schránky",
+  "copy_icon_button.copied": "Skopírované do schránky",
   "copypaste.copied": "Skopírované",
-  "copypaste.copy_to_clipboard": "Skopíruj do schránky",
-  "directory.federated": "Zo známého fedivesmíru",
+  "copypaste.copy_to_clipboard": "Skopírovať do schránky",
+  "directory.federated": "Zo známého fediverza",
   "directory.local": "Iba z {domain}",
   "directory.new_arrivals": "Nové príchody",
-  "directory.recently_active": "Nedávno aktívne",
+  "directory.recently_active": "Nedávna aktivita",
   "disabled_account_banner.account_settings": "Nastavenia účtu",
-  "disabled_account_banner.text": "Vaše konto {disabledAccount} je momentálne vypnuté.",
-  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
+  "disabled_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný.",
+  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od účtov hostených na {domain}.",
   "dismissable_banner.dismiss": "Zrušiť",
-  "dismissable_banner.explore_links": "Tieto správy sú dnes najviac zdieľané naprieč sociálnou sieťou. Novšie správy, zdieľané viacerými rôznymi ľudmi sú zoradené vyššie.",
-  "dismissable_banner.explore_statuses": "Toto sú príspevky naprieč celej sociálnej sieti, ktoré dnes naberajú na ťahu. Novšie príspevky s viacerými vyzdvihnutiami sú radené vyššie.",
-  "dismissable_banner.explore_tags": "Tieto haštagy práve teraz získavajú popularitu, medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
-  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorí sledujú {domain}, cez celú sociálnu sieť.",
-  "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
-  "embed.preview": "Tu je ako to bude vyzerať:",
+  "dismissable_banner.explore_links": "Toto sú správy zo sociálnej siete, ktoré sú dnes populárne. Novšie správy s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+  "dismissable_banner.explore_statuses": "Toto sú príspevky z celej sociálnej siete, ktoré sú dnes populárne. Novšie príspevky s viacerými ohviezdičkovaniami a zdieľaniami sú radené vyššie.",
+  "dismissable_banner.explore_tags": "Toto sú hashtagy zo sociálnej siete, ktoré sú dnes populárne. Novšie hashtagy používané viacerými ľuďmi sú radené vyššie.",
+  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od účtov na sociálnej sieti, ktoré sú sledované účtami z {domain}.",
+  "domain_block_modal.block": "Blokovať server",
+  "domain_block_modal.block_account_instead": "Namiesto toho zablokuj @{name}",
+  "domain_block_modal.title": "Blokovať doménu?",
+  "domain_pill.server": "Server",
+  "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.",
+  "domain_pill.username": "Používateľské meno",
+  "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
+  "embed.preview": "Takto bude vyzerať:",
   "emoji_button.activity": "Aktivita",
-  "emoji_button.clear": "Vyčisti",
+  "emoji_button.clear": "Vyčistiť",
   "emoji_button.custom": "Vlastné",
   "emoji_button.flags": "Vlajky",
   "emoji_button.food": "Jedlá a nápoje",
-  "emoji_button.label": "Vlož emotikony",
-  "emoji_button.nature": "Prírodné",
-  "emoji_button.not_found": "Nie emotikony!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.label": "Vložiť emotikony",
+  "emoji_button.nature": "Príroda",
+  "emoji_button.not_found": "Žiadne emotikony",
   "emoji_button.objects": "Predmety",
   "emoji_button.people": "Ľudia",
   "emoji_button.recent": "Často používané",
-  "emoji_button.search": "Hľadaj...",
+  "emoji_button.search": "Hľadať…",
   "emoji_button.search_results": "Výsledky hľadania",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
-  "empty_column.account_hides_collections": "Tento užívateľ si zvolil nesprístupniť túto informáciu",
+  "empty_column.account_hides_collections": "Tento účet sa rozhodol túto informáciu nesprístupniť",
   "empty_column.account_suspended": "Účet bol pozastavený",
-  "empty_column.account_timeline": "Nie sú tu žiadne príspevky!",
+  "empty_column.account_timeline": "Nie sú tu žiadne príspevky.",
   "empty_column.account_unavailable": "Profil nedostupný",
-  "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
-  "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
-  "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
-  "empty_column.direct": "Ešte nemáš žiadne priame zmienky. Keď nejakú pošleš alebo dostaneš, ukáže sa tu.",
-  "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
-  "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
-  "empty_column.favourited_statuses": "Zatiaľ nemáš žiadne obľúbené príspevky. Akonáhle označíš nejaký ako obľúbený, zobrazí sa tu.",
-  "empty_column.favourites": "Nikto si zatiaľ tento príspevok neobľúbil. Akonáhle tak niekto urobí, zobrazí sa tu.",
-  "empty_column.follow_requests": "Ešte nemáš žiadne požiadavky o následovanie. Keď nejaké dostaneš, budú tu zobrazené.",
-  "empty_column.followed_tags": "Ešte nenasleduješ žiadne haštagy. Keď tak urobíš, zobrazia sa tu.",
+  "empty_column.blocks": "Nemáte blokované žiadne účty.",
+  "empty_column.bookmarked_statuses": "Ešte nemáte záložku v žiadnom príspevku. Keď si ju do nejakého príspevkuk pridáte, zobrazí sa tu.",
+  "empty_column.community": "Miesta časová os je prázdna. Napíšte niečo, aby to tu ožilo!",
+  "empty_column.direct": "Ešte nemáte žiadne súkromné označenia. Keď nejaké pošlete alebo dostanete, zobrazí sa tu.",
+  "empty_column.domain_blocks": "Žiadne domény ešte nie sú blokované.",
+  "empty_column.explore_statuses": "Momentálne nie je nič populárne. Skontrolujte to zas neskôr.",
+  "empty_column.favourited_statuses": "Zatiaľ nemáte žiadne ohviezdičkované príspevky. Akonáhle nejaký ohviezdičkujete, zobrazí sa tu.",
+  "empty_column.favourites": "Zatiaľ tento príspevok nikto neohviezdičkoval. Akonáhle sa tak stane, zobrazí sa tu.",
+  "empty_column.follow_requests": "Zatiaľ nemáte žiadne žiadosti o sledovanie. Keď nejakú dostanete, zobrazí sa tu.",
+  "empty_column.followed_tags": "Zatiaľ nesledujete žiadne hashtagy. Keď tak urobíte, zobrazia sa tu.",
   "empty_column.hashtag": "Pod týmto hashtagom sa ešte nič nenachádza.",
-  "empty_column.home": "Tvoja lokálna osa je zatiaľ prázdna! Pre začiatok navštív {public}, alebo použi vyhľadávanie a nájdi tak aj iných užívateľov.",
-  "empty_column.list": "Tento zoznam je ešte prázdny. Keď ale členovia tohoto zoznamu napíšu nové správy, tak tie sa objavia priamo tu.",
-  "empty_column.lists": "Nemáš ešte žiadne zoznamy. Keď nejaký vytvoríš, bude zobrazený práve tu.",
-  "empty_column.mutes": "Ešte si nestĺmil žiadných užívateľov.",
-  "empty_column.notifications": "Ešte nemáš žiadne oznámenia. Začni komunikovať s ostatnými, aby diskusia mohla začať.",
-  "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne, alebo začni sledovať užívateľov z iných serverov, aby tu niečo pribudlo",
-  "error.unexpected_crash.explanation": "Kvôli chybe v našom kóde, alebo problému s kompatibilitou prehliadača, túto stránku nebolo možné zobraziť správne.",
-  "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači, alebo nástrojmi automatického prekladu.",
-  "error.unexpected_crash.next_steps": "Skús obnoviť stránku. Ak to nepomôže, pravdepodobne budeš stále môcť používať Mastodon cez iný prehliadač, alebo natívnu aplikáciu.",
-  "error.unexpected_crash.next_steps_addons": "Skús ich vypnúť, a obnoviť túto stránku. Ak to nepomôže, pravdepodobne budeš stále môcť Mastodon používať cez iný prehliadač, alebo natívnu aplikáciu.",
-  "errors.unexpected_crash.copy_stacktrace": "Skopíruj stacktrace do schránky",
-  "errors.unexpected_crash.report_issue": "Nahlás problém",
+  "empty_column.home": "Vaša domáca časová os je zatiaľ prázdna. Začnite sledovať ostatných a naplňte si ju.",
+  "empty_column.list": "Tento zoznam je zatiaľ prázdny. Keď ale členovia tohoto zoznamu uverejnia nové príspevky, objavia sa tu.",
+  "empty_column.lists": "Zatiaľ nemáte žiadne zoznamy. Keď nejaký vytvoríte, zobrazí sa tu.",
+  "empty_column.mutes": "Zatiaľ ste si nikoho nestíšili.",
+  "empty_column.notification_requests": "Všetko čisté! Nič tu nieje. Keď dostaneš nové oboznámenia, zobrazia sa tu podľa tvojich nastavení.",
+  "empty_column.notifications": "Zatiaľ nemáte žiadne upozornenia. Začnú vám pribúdať, keď s vami začnú interagovať ostatní.",
+  "empty_column.public": "Zatiaľ tu nič nie je. Napíšte niečo verejné alebo začnite sledovať účty z iných serverov, aby tu niečo pribudlo.",
+  "error.unexpected_crash.explanation": "Pre chybu v našom kóde alebo problém s kompatibilitou prehliadača nebolo túto stránku možné zobraziť správne.",
+  "error.unexpected_crash.explanation_addons": "Túto stránku sa nepodarilo zobraziť správne. Táto chyba je pravdepodobne spôsobená rozšírením v prehliadači alebo nástrojmi automatického prekladu.",
+  "error.unexpected_crash.next_steps": "Skúste stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť používať Mastodon cez iný prehliadač alebo natívnu aplikáciu.",
+  "error.unexpected_crash.next_steps_addons": "Skúste ich vypnúť a stránku obnoviť. Ak to nepomôže, pravdepodobne budete stále môcť Mastodon používať cez iný prehliadač alebo natívnu aplikáciu.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopírovať stacktrace do schránky",
+  "errors.unexpected_crash.report_issue": "Nahlásiť problém",
   "explore.search_results": "Výsledky hľadania",
   "explore.suggested_follows": "Ľudia",
-  "explore.title": "Objavuj",
-  "explore.trending_links": "Novinky",
+  "explore.title": "Objavovať",
+  "explore.trending_links": "Správy",
   "explore.trending_statuses": "Príspevky",
-  "explore.trending_tags": "Haštagy",
+  "explore.trending_tags": "Hashtagy",
   "filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
   "filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
   "filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
   "filter_modal.added.expired_title": "Vypršala platnosť filtra!",
   "filter_modal.added.review_and_configure": "Ak chcete skontrolovať a ďalej konfigurovať túto kategóriu filtrov, prejdite na odkaz {settings_link}.",
-  "filter_modal.added.review_and_configure_title": "Nastavenie triedenia",
-  "filter_modal.added.settings_link": "stránka s nastaveniami",
+  "filter_modal.added.review_and_configure_title": "Nastavenia filtrov",
+  "filter_modal.added.settings_link": "stránka nastavení",
   "filter_modal.added.short_explanation": "Tento príspevok bol pridaný do nasledujúcej kategórie filtrov: {title}.",
-  "filter_modal.added.title": "Triedenie pridané!",
+  "filter_modal.added.title": "Filter bol pridaný.",
   "filter_modal.select_filter.context_mismatch": "sa na tento kontext nevzťahuje",
-  "filter_modal.select_filter.expired": "vypršalo",
+  "filter_modal.select_filter.expired": "vypršal",
   "filter_modal.select_filter.prompt_new": "Nová kategória: {name}",
-  "filter_modal.select_filter.search": "Vyhľadávať alebo vytvoriť",
+  "filter_modal.select_filter.search": "Vyhľadať alebo vytvoriť",
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
-  "firehose.all": "Všetky",
+  "filtered_notifications_banner.pending_requests": "Oboznámenia od {count, plural, =0 {nikoho} one {jedného človeka} other {# ľudí}} čo môžeš poznať",
+  "filtered_notifications_banner.title": "Filtrované oznámenia",
+  "firehose.all": "Všetko",
   "firehose.local": "Tento server",
-  "firehose.remote": "Iné servery",
-  "follow_request.authorize": "Povoľ prístup",
-  "follow_request.reject": "Odmietni",
-  "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
-  "followed_tags": "Nasledované haštagy",
-  "footer.about": "O",
+  "firehose.remote": "Ostatné servery",
+  "follow_request.authorize": "Povoliť",
+  "follow_request.reject": "Zamietnuť",
+  "follow_requests.unlocked_explanation": "Aj keď váš účet nie je uzamknutý, tím domény {domain} si myslel, že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
+  "follow_suggestions.curated_suggestion": "Výber redakcie",
+  "follow_suggestions.dismiss": "Znova nezobrazovať",
+  "follow_suggestions.hints.featured": "Tento profil bol ručne zvolený tímom domény {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Tento profil je obľúbený medzi účtami, ktoré sledujete.",
+  "follow_suggestions.hints.most_followed": "Tento profil patrí na doméne {domain} medzi najsledovanejšie.",
+  "follow_suggestions.hints.most_interactions": "Tento profil má v poslednej dobe na doméne {domain} veľa interakcií.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilom, ktoré ste nedávno začali sledovať.",
+  "follow_suggestions.personalized_suggestion": "Prispôsobený návrh",
+  "follow_suggestions.popular_suggestion": "Obľúbený návrh",
+  "follow_suggestions.popular_suggestion_longer": "Populárne na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobné profilom, ktoré si nedávno nasledoval/a",
+  "follow_suggestions.view_all": "Zobraziť všetky",
+  "follow_suggestions.who_to_follow": "Koho sledovať",
+  "followed_tags": "Sledované hashtagy",
+  "footer.about": "Viac informácií",
   "footer.directory": "Adresár profilov",
   "footer.get_app": "Stiahnuť aplikáciu",
-  "footer.invite": "Pozvi ľudí",
+  "footer.invite": "Pozvať ľudí",
   "footer.keyboard_shortcuts": "Klávesové skratky",
-  "footer.privacy_policy": "Zásady súkromia",
+  "footer.privacy_policy": "Pravidlá ochrany súkromia",
   "footer.source_code": "Zobraziť zdrojový kód",
   "footer.status": "Stav",
   "generic.saved": "Uložené",
-  "getting_started.heading": "Začni tu",
+  "getting_started.heading": "Začíname",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "hashtag.column_settings.select.no_options_message": "Žiadne návrhy neboli nájdené",
-  "hashtag.column_settings.select.placeholder": "Zadaj haštagy…",
+  "hashtag.column_settings.select.placeholder": "Zadajte hashtagy…",
   "hashtag.column_settings.tag_mode.all": "Všetky tieto",
-  "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
+  "hashtag.column_settings.tag_mode.any": "Ľubovoľné z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
-  "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} sledujúci} few {{counter} sledujúci} many {{counter} sledujúcich} other {{counter} sledujúcich}}",
+  "hashtag.column_settings.tag_toggle": "Vložte dodatočné hashtagy pre tento stĺpec",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} prispievateľ} few {{counter} prispievatelia} many {{counter} prispievateľov} other {{counter} prispievateľov}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}} dnes",
-  "hashtag.follow": "Sleduj haštag",
-  "hashtag.unfollow": "Nesleduj haštag",
-  "hashtags.and_other": "…a {count, plural, one {} few {# ďalšie} many {# ďalších}other {# ďalších}}",
-  "home.actions.go_to_explore": "Pozrieť, čo je trendy",
-  "home.actions.go_to_suggestions": "Nájdi ľudí na sledovanie",
-  "home.column_settings.basic": "Základné",
-  "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
-  "home.column_settings.show_replies": "Ukáž odpovede",
-  "home.explore_prompt.body": "Váš domovský informačný kanál bude obsahovať mix príspevkov z mriežok, ktoré ste sa rozhodli sledovať, ľudí, ktorých ste sa rozhodli sledovať, a príspevkov, ktoré preferujú. Ak sa vám to zdá príliš málo, možno budete chcieť:",
-  "home.explore_prompt.title": "Toto je tvoja domovina v rámci Mastodonu.",
-  "home.hide_announcements": "Skry oznámenia",
-  "home.pending_critical_update.body": "Prosím aktualizuj si svoj Mastodon server, ako náhle to bude možné!",
-  "home.pending_critical_update.link": "Pozri aktualizácie",
-  "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia!",
-  "home.show_announcements": "Ukáž oznámenia",
-  "interaction_modal.description.favourite": "S účtom na Mastodone si môžeš tento príspevok obľúbiť, aby si dal/a autorovi vedieť, že ho oceňuješ, a uložiť si ho na neskôr.",
-  "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
-  "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
-  "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
+  "hashtag.follow": "Sledovať hashtag",
+  "hashtag.unfollow": "Prestať sledovať hashtag",
+  "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
+  "home.column_settings.show_reblogs": "Zobraziť zdieľania",
+  "home.column_settings.show_replies": "Zobraziť odpovede",
+  "home.hide_announcements": "Skryť oznámenia",
+  "home.pending_critical_update.body": "Prosíme, aktualizujte si svoj Mastodon server, hneď ako to bude možné.",
+  "home.pending_critical_update.link": "Zobraziť aktualizácie",
+  "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
+  "home.show_announcements": "Zobraziť oznámenia",
+  "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
+  "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
+  "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
+  "interaction_modal.description.reply": "S účtom na Mastodone môžete na tento príspevok odpovedať.",
   "interaction_modal.login.action": "Prejsť domov",
-  "interaction_modal.login.prompt": "Doména tvojho domovského servera, napr. mastodon.social",
-  "interaction_modal.no_account_yet": "Niesi na Mastodone?",
+  "interaction_modal.login.prompt": "Doména vášho domovského servera, napr. mastodon.social",
+  "interaction_modal.no_account_yet": "Nie ste na Mastodone?",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.sign_in": "Nie si prihláseý/á na tomto serveri. Kde je tvoj účet hostovaný?",
-  "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno! (napr. @Mastodon@mastodon.social)",
-  "interaction_modal.title.favourite": "Obľúb si {name} ov/in príspevok",
-  "interaction_modal.title.follow": "Nasleduj {name}",
-  "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
-  "interaction_modal.title.reply": "Odpovedz na {name}ov/in príspevok",
-  "intervals.full.days": "{number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
-  "intervals.full.hours": "{number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodín}}",
-  "intervals.full.minutes": "{number, plural, one {# minúta} few {# minút} many {# minút} other {# minút}}",
-  "keyboard_shortcuts.back": "dostať sa naspäť",
-  "keyboard_shortcuts.blocked": "otvor zoznam blokovaných užívateľov",
-  "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
-  "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
-  "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
+  "interaction_modal.sign_in": "Na tomto serveri nie ste prihlásený. Kde je váš účet hostený?",
+  "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno (napr. @Mastodon@mastodon.social).",
+  "interaction_modal.title.favourite": "Ohviezdičkovať príspevok od {name}",
+  "interaction_modal.title.follow": "Sledovať {name}",
+  "interaction_modal.title.reblog": "Zdieľať príspevok od {name}",
+  "interaction_modal.title.reply": "Odpovedať na príspevok od {name}",
+  "intervals.full.days": "{number, plural, one {# deň} few {# dni} many {# dní} other {# dní}}",
+  "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodín} other {# hodín}}",
+  "intervals.full.minutes": "{number, plural, one {# minúta} few {# minúty} many {# minút} other {# minút}}",
+  "keyboard_shortcuts.back": "Ísť späť",
+  "keyboard_shortcuts.blocked": "Otvoriť zoznam blokovaných užívateľov",
+  "keyboard_shortcuts.boost": "Zdieľať príspevok",
+  "keyboard_shortcuts.column": "Prejsť na stĺpec",
+  "keyboard_shortcuts.compose": "Prejsť na textové pole",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "posunúť sa dole v zozname",
-  "keyboard_shortcuts.enter": "Otvor príspevok",
-  "keyboard_shortcuts.favourite": "Obľúb si príspevok",
-  "keyboard_shortcuts.favourites": "Otvor zoznam obľúbených",
-  "keyboard_shortcuts.federated": "otvor federovanú časovú os",
+  "keyboard_shortcuts.direct": "Otvoriť stĺpec súkromných označení",
+  "keyboard_shortcuts.down": "Posunúť sa dole v zozname",
+  "keyboard_shortcuts.enter": "Otvoriť príspevok",
+  "keyboard_shortcuts.favourite": "Ohviezdičkovať príspevok",
+  "keyboard_shortcuts.favourites": "Otvoriť zoznam ohviezdičkovaných",
+  "keyboard_shortcuts.federated": "Otvoriť federovanú časovú os",
   "keyboard_shortcuts.heading": "Klávesové skratky",
-  "keyboard_shortcuts.home": "otvor domácu časovú os",
-  "keyboard_shortcuts.hotkey": "Klávesa",
-  "keyboard_shortcuts.legend": "zobraz túto legendu",
-  "keyboard_shortcuts.local": "otvor miestnu časovú os",
-  "keyboard_shortcuts.mention": "spomeň autora",
-  "keyboard_shortcuts.muted": "otvor zoznam stíšených užívateľov",
-  "keyboard_shortcuts.my_profile": "otvor svoj profil",
-  "keyboard_shortcuts.notifications": "Otvor panel oznámení",
-  "keyboard_shortcuts.open_media": "na otvorenie médií",
-  "keyboard_shortcuts.pinned": "otvor zoznam pripnutých príspevkov",
-  "keyboard_shortcuts.profile": "otvor autorov profil",
-  "keyboard_shortcuts.reply": "odpovedať",
-  "keyboard_shortcuts.requests": "otvor zoznam žiadostí o sledovanie",
-  "keyboard_shortcuts.search": "zameraj sa na vyhľadávanie",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "otvor panel ''začíname''",
-  "keyboard_shortcuts.toggle_hidden": "ukáž/skry text za CW",
-  "keyboard_shortcuts.toggle_sensitivity": "pre zobrazenie/skrytie médií",
-  "keyboard_shortcuts.toot": "začni úplne nový príspevok",
-  "keyboard_shortcuts.unfocus": "nesústreď sa na písaciu plochu, alebo hľadanie",
-  "keyboard_shortcuts.up": "posuň sa vyššie v zozname",
-  "lightbox.close": "Zatvor",
+  "keyboard_shortcuts.home": "Otvoriť domácu časovú os",
+  "keyboard_shortcuts.hotkey": "Kláves",
+  "keyboard_shortcuts.legend": "Zobraziť túto legendu",
+  "keyboard_shortcuts.local": "Otvoriť miestnu časovú os",
+  "keyboard_shortcuts.mention": "Označiť autora",
+  "keyboard_shortcuts.muted": "Otvoriť zoznam stíšených užívateľov",
+  "keyboard_shortcuts.my_profile": "Otvoriť svoj profil",
+  "keyboard_shortcuts.notifications": "Otvoriť panel upozornení",
+  "keyboard_shortcuts.open_media": "Otvoriť médiá",
+  "keyboard_shortcuts.pinned": "Otvoriť zoznam pripnutých príspevkov",
+  "keyboard_shortcuts.profile": "Otvoriť autorov profil",
+  "keyboard_shortcuts.reply": "Odpovedať na príspevok",
+  "keyboard_shortcuts.requests": "Otvoriť zoznam žiadostí o sledovanie",
+  "keyboard_shortcuts.search": "Prejsť na vyhľadávacie pole",
+  "keyboard_shortcuts.spoilers": "Zobraziť/skryť pole varovania o obsahu",
+  "keyboard_shortcuts.start": "Otvoriť panel „Začíname“",
+  "keyboard_shortcuts.toggle_hidden": "Zobraziť/skryť text za varovaním o obsahu",
+  "keyboard_shortcuts.toggle_sensitivity": "Zobraziť/skryť médiá",
+  "keyboard_shortcuts.toot": "Vytvoriť nový príspevok",
+  "keyboard_shortcuts.unfocus": "Odísť z textového poľa",
+  "keyboard_shortcuts.up": "Posunúť sa vyššie v zozname",
+  "lightbox.close": "Zatvoriť",
   "lightbox.compress": "Zmenšiť náhľad obrázku",
   "lightbox.expand": "Rozšíriť náhľad obrázku",
-  "lightbox.next": "Ďalšie",
-  "lightbox.previous": "Predchádzajúci",
-  "limited_account_hint.action": "Ukáž profil aj tak",
-  "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
-  "link_preview.author": "Podľa {name}",
-  "lists.account.add": "Pridaj do zoznamu",
-  "lists.account.remove": "Odober zo zoznamu",
-  "lists.delete": "Vymaž list",
-  "lists.edit": "Uprav zoznam",
-  "lists.edit.submit": "Zmeň názov",
+  "lightbox.next": "Ďalej",
+  "lightbox.previous": "Späť",
+  "limited_account_hint.action": "Aj tak zobraziť profil",
+  "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
+  "link_preview.author": "Autor: {name}",
+  "lists.account.add": "Pridať do zoznamu",
+  "lists.account.remove": "Odstrániť zo zoznamu",
+  "lists.delete": "Vymazať zoznam",
+  "lists.edit": "Upraviť zoznam",
+  "lists.edit.submit": "Zmeniť názov",
   "lists.exclusive": "Skryť tieto príspevky z domovskej stránky",
-  "lists.new.create": "Pridaj zoznam",
+  "lists.new.create": "Pridať zoznam",
   "lists.new.title_placeholder": "Názov nového zoznamu",
-  "lists.replies_policy.followed": "Akýkoľvek nasledovaný užívateľ",
-  "lists.replies_policy.list": "Členovia na zozname",
-  "lists.replies_policy.none": "Nikto",
-  "lists.replies_policy.title": "Ukáž odpovede na:",
-  "lists.search": "Vyhľadávaj medzi užívateľmi, ktorých sleduješ",
-  "lists.subheading": "Tvoje zoznamy",
-  "load_pending": "{count, plural, one {# nová položka} other {# nových položiek}}",
-  "loading_indicator.label": "Načítam…",
-  "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
-  "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
-  "mute_modal.duration": "Trvanie",
-  "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
-  "mute_modal.indefinite": "Bez obmedzenia",
+  "lists.replies_policy.followed": "Akémukoľvek sledovanému účtu",
+  "lists.replies_policy.list": "Členom zoznamu",
+  "lists.replies_policy.none": "Nikomu",
+  "lists.replies_policy.title": "Zobraziť odpovede:",
+  "lists.search": "Vyhľadávať medzi účtami, ktoré sledujete",
+  "lists.subheading": "Vaše zoznamy",
+  "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položiek} other {# nových položiek}}",
+  "loading_indicator.label": "Načítavanie…",
+  "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
+  "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Ukryť z upozornení",
+  "mute_modal.hide_options": "Skryť možnosti",
+  "mute_modal.show_options": "Zobraziť možnosti",
+  "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",
-  "navigation_bar.advanced_interface": "Otvor v pokročilom webovom rozhraní",
-  "navigation_bar.blocks": "Blokovaní užívatelia",
+  "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
+  "navigation_bar.blocks": "Blokované účty",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Miestna časová os",
-  "navigation_bar.compose": "Napíš nový príspevok",
-  "navigation_bar.direct": "Súkromné spomenutia",
-  "navigation_bar.discover": "Objavuj",
-  "navigation_bar.domain_blocks": "Skryté domény",
-  "navigation_bar.edit_profile": "Uprav profil",
-  "navigation_bar.explore": "Objavuj",
-  "navigation_bar.favourites": "Obľúbené",
+  "navigation_bar.compose": "Vytvoriť nový príspevok",
+  "navigation_bar.direct": "Súkromné označenia",
+  "navigation_bar.discover": "Objavovanie",
+  "navigation_bar.domain_blocks": "Blokované domény",
+  "navigation_bar.explore": "Objavovať",
+  "navigation_bar.favourites": "Ohviezdičkované",
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
-  "navigation_bar.followed_tags": "Nasledované haštagy",
-  "navigation_bar.follows_and_followers": "Sledovania a následovatelia",
+  "navigation_bar.followed_tags": "Sledované hashtagy",
+  "navigation_bar.follows_and_followers": "Sledovania a sledovatelia",
   "navigation_bar.lists": "Zoznamy",
-  "navigation_bar.logout": "Odhlás sa",
-  "navigation_bar.mutes": "Stíšení užívatelia",
-  "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky, sú z východiska otvárané v klasickom webovom rozhraní.",
+  "navigation_bar.logout": "Odhlásiť sa",
+  "navigation_bar.mutes": "Stíšené účty",
+  "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
   "navigation_bar.personal": "Osobné",
   "navigation_bar.pins": "Pripnuté príspevky",
   "navigation_bar.preferences": "Nastavenia",
   "navigation_bar.public_timeline": "Federovaná časová os",
-  "navigation_bar.search": "Hľadaj",
-  "navigation_bar.security": "Zabezbečenie",
-  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
-  "notification.admin.report": "{name} nahlásil/a {target}",
-  "notification.admin.sign_up": "{name} sa zaregistroval/a",
-  "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
-  "notification.follow": "{name} ťa začal/a nasledovať",
-  "notification.follow_request": "{name} ťa žiada nasledovať",
-  "notification.mention": "{name} ťa spomenul/a",
-  "notification.own_poll": "Tvoja anketa sa skončila",
-  "notification.poll": "Anketa v ktorej si hlasoval/a sa skončila",
-  "notification.reblog": "{name} zdieľal/a tvoj príspevok",
-  "notification.status": "{name} práve uverejnil/a",
-  "notification.update": "{name} upravil/a príspevok",
-  "notifications.clear": "Vyčisti oznámenia",
-  "notifications.clear_confirmation": "Naozaj chceš nenávratne odstrániť všetky tvoje oznámenia?",
+  "navigation_bar.search": "Hľadať",
+  "navigation_bar.security": "Zabezpečenie",
+  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
+  "notification.admin.report": "Účet {name} nahlásil {target}",
+  "notification.admin.sign_up": "Nová registráciu účtu {name}",
+  "notification.favourite": "{name} hviezdičkuje váš príspevok",
+  "notification.follow": "{name} vás sleduje",
+  "notification.follow_request": "{name} vás žiada sledovať",
+  "notification.mention": "{name} vás spomína",
+  "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
+  "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
+  "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
+  "notification.own_poll": "Vaša anketa sa skončila",
+  "notification.poll": "Anketa, v ktorej ste hlasovali, sa skončila",
+  "notification.reblog": "{name} zdieľa váš príspevok",
+  "notification.relationships_severance_event": "Stratené prepojenia s {name}",
+  "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
+  "notification.relationships_severance_event.learn_more": "Zisti viac",
+  "notification.status": "{name} uverejňuje niečo nové",
+  "notification.update": "{name} upravuje príspevok",
+  "notification_requests.accept": "Prijať",
+  "notification_requests.dismiss": "Zamietnuť",
+  "notification_requests.notifications_from": "Oboznámenia od {name}",
+  "notification_requests.title": "Filtrované oboznámenia",
+  "notifications.clear": "Vyčistiť upozornenia",
+  "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
   "notifications.column_settings.admin.report": "Nové hlásenia:",
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
-  "notifications.column_settings.alert": "Oznámenia na ploche",
-  "notifications.column_settings.favourite": "Obľúbené:",
-  "notifications.column_settings.filter_bar.advanced": "Zobraz všetky kategórie",
-  "notifications.column_settings.filter_bar.category": "Rýchle triedenie",
-  "notifications.column_settings.filter_bar.show_bar": "Ukáž filtrovací panel",
-  "notifications.column_settings.follow": "Noví sledujúci:",
-  "notifications.column_settings.follow_request": "Nové žiadosti o následovanie:",
-  "notifications.column_settings.mention": "Zmienenia:",
-  "notifications.column_settings.poll": "Výsledky ankiet:",
-  "notifications.column_settings.push": "Push notifikácie",
-  "notifications.column_settings.reblog": "Vyzdvihnutia:",
-  "notifications.column_settings.show": "Ukáž v stĺpci",
-  "notifications.column_settings.sound": "Prehraj zvuk",
+  "notifications.column_settings.alert": "Upozornenia na ploche",
+  "notifications.column_settings.favourite": "Ohviezdičkované:",
+  "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
+  "notifications.column_settings.follow": "Nové sledovania od:",
+  "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
+  "notifications.column_settings.mention": "Označenia:",
+  "notifications.column_settings.poll": "Výsledky ankety:",
+  "notifications.column_settings.push": "Upozornenia push",
+  "notifications.column_settings.reblog": "Zdieľania:",
+  "notifications.column_settings.show": "Zobraziť v stĺpci",
+  "notifications.column_settings.sound": "Prehrať zvuk",
   "notifications.column_settings.status": "Nové príspevky:",
-  "notifications.column_settings.unread_notifications.category": "Neprečítané oznámenia",
-  "notifications.column_settings.unread_notifications.highlight": "Zdôrazni neprečítané oznámenia",
+  "notifications.column_settings.unread_notifications.category": "Neprečítané upozornenia",
+  "notifications.column_settings.unread_notifications.highlight": "Zvýrazniť neprečítané upozornenia",
   "notifications.column_settings.update": "Úpravy:",
   "notifications.filter.all": "Všetky",
-  "notifications.filter.boosts": "Vyzdvihnutia",
-  "notifications.filter.favourites": "Obľúbené",
+  "notifications.filter.boosts": "Zdieľania",
+  "notifications.filter.favourites": "Ohviezdičkovania",
   "notifications.filter.follows": "Sledovania",
-  "notifications.filter.mentions": "Iba spomenutia",
+  "notifications.filter.mentions": "Označenia",
   "notifications.filter.polls": "Výsledky ankiet",
-  "notifications.filter.statuses": "Aktualizácie od ľudí, ktorých nasleduješ",
-  "notifications.grant_permission": "Udeľ povolenie.",
-  "notifications.group": "{count} Oznámení",
-  "notifications.mark_as_read": "Označ každé oznámenie za prečítané",
-  "notifications.permission_denied": "Oznámenia na ploche sú nedostupné, kvôli predtým zamietnutej požiadavke prehliadača",
-  "notifications.permission_denied_alert": "Oznámenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
-  "notifications.permission_required": "Oznámenia na ploche sú nedostupné, pretože potrebné povolenia neboli udelené.",
-  "notifications_permission_banner.enable": "Povoliť oznámenia na ploche",
+  "notifications.filter.statuses": "Novinky od ľudí, ktorých sledujete",
+  "notifications.grant_permission": "Udeliť povolenie.",
+  "notifications.group": "{count} upozornení",
+  "notifications.mark_as_read": "Označiť všetky upozornenia ako prečítané",
+  "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
+  "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
+  "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+  "notifications.policy.filter_new_accounts_title": "Nové účty",
+  "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
+  "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
+  "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
+  "notifications.policy.title": "Filtrovať oznámenia od…",
+  "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
-  "notifications_permission_banner.title": "Nikdy nezmeškaj jedinú vec",
-  "onboarding.action.back": "Vziať ma späť",
-  "onboarding.actions.back": "Vziať ma späť",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
-  "onboarding.compose.template": "Nazdar #Mastodon!",
+  "notifications_permission_banner.title": "Nenechajte si nič ujsť",
+  "onboarding.action.back": "Ísť späť",
+  "onboarding.actions.back": "Ísť späť",
+  "onboarding.actions.go_to_explore": "Prejsť na populárne",
+  "onboarding.actions.go_to_home": "Prejsť na domovský kanál",
+  "onboarding.compose.template": "Ahoj, #Mastodon!",
   "onboarding.follows.empty": "Žiaľ, momentálne sa nedajú zobraziť žiadne výsledky. Môžete skúsiť použiť vyhľadávanie alebo navštíviť stránku objavovania a nájsť ľudí, ktorých chcete sledovať, alebo to skúste znova neskôr.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.profile.discoverable": "Urob môj profil objaviteľný",
-  "onboarding.profile.display_name": "Zobrazované meno",
-  "onboarding.profile.display_name_hint": "Tvoje plné meno, alebo tvoje zábavné meno…",
-  "onboarding.profile.lead": "Toto môžeš vždy dokončiť neskôr v nastaveniach, kde je dostupných ešte viac volieb na prispôsobenie.",
-  "onboarding.profile.note": "O tebe",
-  "onboarding.profile.note_hint": "Môžeš @spomenúť iných ľudí, alebo #haštagy…",
-  "onboarding.profile.save_and_continue": "Ulož a pokračuj",
+  "onboarding.follows.lead": "Váš domovský kanál je váš hlavný spôsob objavovania Mastodonu. Čím viac ľudí sledujete, tým bude aktívnejší a zaujímavejší. Tu je pár tipov na začiatok:",
+  "onboarding.follows.title": "Prispôsobte si svoj domovský kanál",
+  "onboarding.profile.discoverable": "Nastavte svoj profil ako objaviteľný",
+  "onboarding.profile.discoverable_hint": "Keď si na Mastodone zapnete objaviteľnosť, vaše príspevky sa môžu zobrazovať vo výsledkoch vyhľadávania a v populárnych. Váš profil môže byť navyše navrhovaný ľuďom, s ktorými máte podobné záujmy.",
+  "onboarding.profile.display_name": "Používateľské meno",
+  "onboarding.profile.display_name_hint": "Vaše celé meno alebo pokojne aj vtipná prezývka…",
+  "onboarding.profile.lead": "Vždy si to môžete doplniť neskôr v nastaveniach, kde nájdete aj ďalšie možnosti prispôsobenia.",
+  "onboarding.profile.note": "Niečo o vás",
+  "onboarding.profile.note_hint": "Môžete @označiť iných ľudí alebo #hashtagy…",
+  "onboarding.profile.save_and_continue": "Uložiť a pokračovať",
   "onboarding.profile.title": "Nastavenie profilu",
-  "onboarding.profile.upload_avatar": "Nahraj profilový obrázok",
-  "onboarding.profile.upload_header": "Nahraj profilové záhlavie",
-  "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
-  "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
+  "onboarding.profile.upload_avatar": "Nahrať profilový obrázok",
+  "onboarding.profile.upload_header": "Nahrať obrázok záhlavia profilu",
+  "onboarding.share.lead": "Dajte ostatným vedieť, ako vás môžu na Mastodone nájsť.",
+  "onboarding.share.message": "Na #Mastodon⁠e som {username}. Príď ma sledovať na {url}!",
   "onboarding.share.next_steps": "Ďalšie možné kroky:",
-  "onboarding.share.title": "Zdieľaj svoj profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.share.title": "Zdieľajte svoj profil",
+  "onboarding.start.lead": "Teraz ste súčasťou Mastodonu, jedinečnej decentralizovanej sociálnej platformy, kde o všetkom rozhodujete vy, nie algoritmus. Poďme sa pozrieť, ako môžete začať:",
+  "onboarding.start.skip": "Nepotrebujete pomoc so začiatkom?",
   "onboarding.start.title": "Zvládli ste to!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
-  "onboarding.steps.publish_status.title": "Vytvor svoj prvý príspevok",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.follow_people.body": "Mastodon je vybudovaný okolo sledovania zaujímavých ľudí.",
+  "onboarding.steps.follow_people.title": "Prispôsobte si svoj domovský kanál",
+  "onboarding.steps.publish_status.body": "Predstavte sa svetu textom, fotkami, videami či anketami {emoji}",
+  "onboarding.steps.publish_status.title": "Vytvorte svoj prvý príspevok",
+  "onboarding.steps.setup_profile.body": "Plnší profil vám pomôže mať viac interakcií.",
+  "onboarding.steps.setup_profile.title": "Upravte si profil",
+  "onboarding.steps.share_profile.body": "Dajte svojej partii vedieť, ako vás môžu na Mastodone nájsť.",
+  "onboarding.steps.share_profile.title": "Zdieľajte svoj profil na Mastodone",
   "onboarding.tips.2fa": "<strong>Vedeli ste?</strong> Svoj účet môžete zabezpečiť nastavením dvojfaktorového overenia v nastaveniach účtu. Funguje to s akoukoľvek aplikáciou TOTP podľa vášho výberu, nie je potrebné žiadne telefónne číslo!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Vedeli ste?</strong> Keďže Mastodon je decentralizovaný, niektoré profily, s ktorými sa stretnete, budú na iných serveroch, ako je váš. Aj napriek tomu s nimi môžete bezproblémovo komunikovať! Ich server je v druhej časti ich používateľského mena!",
-  "onboarding.tips.migration": "<strong>Vedeli ste?</strong> Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostovať svoj vlastný server!",
-  "onboarding.tips.verification": "<strong>Vedeli ste?</strong> Svoj účet môžete overiť umiestnením odkazu na svoj profil Mastodon na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
+  "onboarding.tips.migration": "<strong>Vedeli ste?</strong> Ak máte pocit, že doména {domain} pre vás v budúcnosti nebude skvelou voľbou, môžete prejsť na iný server Mastodon bez straty svojich sledovateľov. Môžete dokonca hostiť svoj vlastný server!",
+  "onboarding.tips.verification": "<strong>Vedeli ste?</strong> Svoj účet môžete overiť umiestnením odkazu na svoj profil na Mastodone na svoju vlastnú webovú lokalitu a pridaním webovej lokality do svojho profilu. Nie sú potrebné žiadne poplatky ani doklady!",
   "password_confirmation.exceeds_maxlength": "Potvrdené heslo presahuje maximálnu dĺžku hesla",
   "password_confirmation.mismatching": "Zadané heslá sa nezhodujú",
   "picture_in_picture.restore": "Vrátiť späť",
   "poll.closed": "Uzatvorená",
   "poll.refresh": "Obnoviť",
-  "poll.reveal": "Pozri výsledky",
-  "poll.total_people": "{count, plural, one {# človek} few {# ľudia} other {# ľudí}}",
-  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasov}}",
-  "poll.vote": "Hlasuj",
-  "poll.voted": "Hlasoval/a si za túto voľbu",
-  "poll.votes": "{votes, plural, one {# hlas} few {# hlasov} many {# hlasov} other {# hlasy}}",
-  "poll_button.add_poll": "Pridaj anketu",
-  "poll_button.remove_poll": "Odstráň anketu",
-  "privacy.change": "Uprav súkromie príspevku",
-  "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Iba spomenutým ľudom",
-  "privacy.private.long": "Pošli iba následovateľom",
-  "privacy.private.short": "Iba pre sledujúcich",
-  "privacy.public.long": "Viditeľné pre všetkých",
+  "poll.reveal": "Zobraziť výsledky",
+  "poll.total_people": "{count, plural, one {# človek} few {# ľudia} many {# ľudí} other {# ľudí}}",
+  "poll.total_votes": "{count, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+  "poll.vote": "Hlasovať",
+  "poll.voted": "Hlasovali ste za túto voľbu",
+  "poll.votes": "{votes, plural, one {# hlas} few {# hlasy} many {# hlasov} other {# hlasov}}",
+  "poll_button.add_poll": "Pridať anketu",
+  "poll_button.remove_poll": "Odstrániť anketu",
+  "privacy.change": "Zmeniť nastavenia súkromia príspevku",
+  "privacy.direct.long": "Všetci spomenutí v príspevku",
+  "privacy.direct.short": "Konkrétni ľudia",
+  "privacy.private.long": "Iba vaši sledovatelia",
+  "privacy.private.short": "Sledovatelia",
+  "privacy.public.long": "Ktokoľvek na Mastodone aj mimo neho",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
-  "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
+  "privacy.unlisted.additional": "Presne ako verejné, s tým rozdielom, že sa príspevok nezobrazí v živých kanáloch, hashtagoch, objavovaní či vo vyhľadávaní na Mastodone, aj keď máte pre účet objaviteľnosť zapnutú.",
+  "privacy.unlisted.long": "Menej algoritmických výmyslov",
+  "privacy.unlisted.short": "Tiché verejné",
   "privacy_policy.last_updated": "Posledná úprava {date}",
-  "privacy_policy.title": "Zásady súkromia",
+  "privacy_policy.title": "Pravidlá ochrany súkromia",
   "recommended": "Odporúčané",
   "refresh": "Obnoviť",
-  "regeneration_indicator.label": "Načítava sa…",
-  "regeneration_indicator.sublabel": "Tvoja domovská nástenka sa pripravuje!",
-  "relative_time.days": "{number}dní",
-  "relative_time.full.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dni}}",
-  "relative_time.full.hours": "Pred {number, plural, one {# hodinou} few {# hodinami} many {# hodinami} other {# hodinami}}",
-  "relative_time.full.just_now": "práve teraz",
-  "relative_time.full.minutes": "Pred {number, plural, one {# minútou} few {# minútami} many {# minútami} other {# minútami}}",
-  "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} few {# sekundami} many {# sekundami} other {# sekundami}}",
-  "relative_time.hours": "{number}hod",
-  "relative_time.just_now": "teraz",
-  "relative_time.minutes": "{number}min",
-  "relative_time.seconds": "{number}sek",
-  "relative_time.today": "dnes",
+  "regeneration_indicator.label": "Načítavanie…",
+  "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
+  "relative_time.days": "{number} dní",
+  "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
+  "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}",
+  "relative_time.full.just_now": "Práve teraz",
+  "relative_time.full.minutes": "Pred {number, plural, one {# minútou} other {# minútami}}",
+  "relative_time.full.seconds": "Pred {number, plural, one {# sekundou} other {# sekundami}}",
+  "relative_time.hours": "{number} hod",
+  "relative_time.just_now": "Teraz",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} sek",
+  "relative_time.today": "Dnes",
+  "reply_indicator.attachments": "{count, plural, one {# príloha} few {# prílohy} other {# príloh}}",
   "reply_indicator.cancel": "Zrušiť",
-  "report.block": "Blokuj",
+  "reply_indicator.poll": "Anketa",
+  "report.block": "Blokovať",
   "report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
-  "report.categories.legal": "Právne ujednania",
+  "report.categories.legal": "Právne",
   "report.categories.other": "Ostatné",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
-  "report.category.subtitle": "Vyberte si najlepšiu voľbu",
-  "report.category.title": "Povedzte nám, čo sa deje s týmto {type}",
-  "report.category.title_account": "profilom",
-  "report.category.title_status": "príspevkom",
+  "report.category.subtitle": "Vyberte najlepšiu voľbu",
+  "report.category.title": "Povedzte nám, čo je zlé na tomto {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "príspevku",
   "report.close": "Hotovo",
   "report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
-  "report.forward": "Posuň ku {target}",
-  "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
-  "report.mute": "Nevšímaj si",
-  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že sú stlmené.",
+  "report.forward": "Preposlať na {target}",
+  "report.forward_hint": "Tento účet je z iného serveru. Chcete poslať anonymnú kópiu hlásenia aj tam?",
+  "report.mute": "Stíšiť",
+  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že ste ich stíšili.",
   "report.next": "Ďalej",
   "report.placeholder": "Ďalšie komentáre",
   "report.reasons.dislike": "Nepáči sa mi",
-  "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
-  "report.reasons.legal": "Je to nelegálne",
+  "report.reasons.dislike_description": "Nie je to niečo, čo chcete vidieť",
+  "report.reasons.legal": "Je nelegálny",
   "report.reasons.legal_description": "Domnievate sa, že porušuje zákony vašej krajiny alebo krajiny servera",
-  "report.reasons.other": "Je to niečo iné",
+  "report.reasons.other": "Ide o niečo iné",
   "report.reasons.other_description": "Tento problém nepatrí do iných kategórií",
   "report.reasons.spam": "Je to spam",
   "report.reasons.spam_description": "Škodlivé odkazy, falošné zapojenie alebo opakované odpovede",
   "report.reasons.violation": "Porušuje pravidlá servera",
   "report.reasons.violation_description": "Ste si vedomí, že porušuje špecifické pravidlá",
-  "report.rules.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
-  "report.rules.title": "Ktoré pravidlá sa porušujú?",
-  "report.statuses.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
+  "report.rules.subtitle": "Vyberte všetky príslušné možnosti",
+  "report.rules.title": "Ktoré pravidlá sú porušované?",
+  "report.statuses.subtitle": "Vyberte všetky príslušné možnosti",
   "report.statuses.title": "Sú k dispozícii príspevky podporujúce toto hlásenie?",
-  "report.submit": "Odošli",
-  "report.target": "Nahlás {target}",
-  "report.thanks.take_action": "Tu sú tvoje možnosti kontrolovať, čo vidíš na Mastodone:",
-  "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžeš podniknúť kroky voči @{name}:",
-  "report.thanks.title": "Nechceš to vidieť?",
-  "report.thanks.title_actionable": "Vďaka za nahlásenie, pozrieme sa na to.",
-  "report.unfollow": "Nesleduj @{name}",
-  "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, zrušte jeho sledovanie.",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
-  "report_notification.categories.legal": "Právne ujednania",
+  "report.submit": "Odoslať",
+  "report.target": "Nahlásiť {target}",
+  "report.thanks.take_action": "Tu sú vaše možnosti kontrolovať to, čo vidíte na Mastodone:",
+  "report.thanks.take_action_actionable": "Kým to vyhodnotíme, môžete podniknúť kroky voči @{name}:",
+  "report.thanks.title": "Nechcete to vidieť?",
+  "report.thanks.title_actionable": "Ďakujeme za nahlásenie, pozrieme sa na to.",
+  "report.unfollow": "Prestať sledovať @{name}",
+  "report.unfollow_explanation": "Tento účet sledujete. Ak už nechcete vidieť jeho príspevky vo svojom domovskom kanáli, prestaňte ho sledovať.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} príspevok} few {{count} príspevky} other {{count} príspevkov}} ako príloha",
+  "report_notification.categories.legal": "Právne",
   "report_notification.categories.other": "Ostatné",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušenie pravidla",
-  "report_notification.open": "Otvor hlásenie",
+  "report_notification.open": "Otvoriť hlásenie",
   "search.no_recent_searches": "Žiadne nedávne vyhľadávania",
-  "search.placeholder": "Hľadaj",
+  "search.placeholder": "Hľadať",
   "search.quick_action.account_search": "Profily zodpovedajúce {x}",
-  "search.quick_action.go_to_account": "Prejdi na profil {x}",
-  "search.quick_action.go_to_hashtag": "Choď na haštag {x}",
-  "search.quick_action.open_url": "Otvor URL v rámci Mastodonu",
+  "search.quick_action.go_to_account": "Prejsť na profil {x}",
+  "search.quick_action.go_to_hashtag": "Prejsť na hashtag {x}",
+  "search.quick_action.open_url": "Otvoriť URL v rámci Mastodonu",
   "search.quick_action.status_search": "Príspevky zodpovedajúce {x}",
-  "search.search_or_paste": "Hľadaj, alebo vlož URL adresu",
+  "search.search_or_paste": "Hľadať alebo vložiť adresu URL",
   "search_popout.full_text_search_disabled_message": "Nie je k dispozícii v doméne {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Dostupné iba keď si prihlásený/á.",
-  "search_popout.language_code": "ISO kód jazyka",
+  "search_popout.full_text_search_logged_out_message": "Dostupné iba po prihlásení.",
+  "search_popout.language_code": "Kód jazyka ISO",
   "search_popout.options": "Možnosti vyhľadávania",
   "search_popout.quick_actions": "Rýchle akcie",
   "search_popout.recent": "Nedávne vyhľadávania",
-  "search_popout.specific_date": "presný dátum",
-  "search_popout.user": "užívateľ",
+  "search_popout.specific_date": "Presný dátum",
+  "search_popout.user": "Účet",
   "search_results.accounts": "Profily",
   "search_results.all": "Všetky",
-  "search_results.hashtags": "Haštagy",
-  "search_results.nothing_found": "Pre tieto výrazy nemožno nič nájsť",
-  "search_results.see_all": "Ukáž všetky",
+  "search_results.hashtags": "Hashtagy",
+  "search_results.nothing_found": "Pre tieto výrazy nebolo možné nič nájsť",
+  "search_results.see_all": "Zobraziť všetky",
   "search_results.statuses": "Príspevky",
-  "search_results.title": "Hľadaj {q}",
-  "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (Aktívni používatelia za mesiac)",
-  "server_banner.active_users": "aktívni užívatelia",
-  "server_banner.administered_by": "Správcom je:",
+  "search_results.title": "Hľadať {q}",
+  "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (aktívni používatelia za mesiac)",
+  "server_banner.active_users": "Aktívne účty",
+  "server_banner.administered_by": "Správa servera:",
   "server_banner.introduction": "{domain} je súčasťou decentralizovanej sociálnej siete využívajúcej technológiu {mastodon}.",
-  "server_banner.learn_more": "Zisti viac",
-  "server_banner.server_stats": "Serverové štatistiky:",
-  "sign_in_banner.create_account": "Vytvor účet",
-  "sign_in_banner.sign_in": "Prihlás sa",
-  "sign_in_banner.sso_redirect": "Prihlás sa, alebo zaregistruj",
-  "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo haštagy, obľúbené veci, zdieľať ich a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
-  "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
-  "status.admin_domain": "Otvor rozhranie na moderovanie domény {domain}",
-  "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
-  "status.block": "Blokuj @{name}",
-  "status.bookmark": "Záložka",
-  "status.cancel_reblog_private": "Nezdieľaj",
-  "status.cannot_reblog": "Tento príspevok nemôže byť zdieľaný",
-  "status.copy": "Skopíruj odkaz na príspevok",
-  "status.delete": "Zmazať",
+  "server_banner.learn_more": "Viac informácií",
+  "server_banner.server_stats": "Štatistiky servera:",
+  "sign_in_banner.create_account": "Vytvoriť účet",
+  "sign_in_banner.sign_in": "Prihlásiť sa",
+  "sign_in_banner.sso_redirect": "Prihlásenie alebo registrácia",
+  "sign_in_banner.text": "Prihláste sa, aby ste mohli sledovať profily alebo hashtagy, hviezdičkovať, zdieľať a odpovedať na príspevky. Môžete tiež komunikovať zo svojho účtu na inom serveri.",
+  "status.admin_account": "Moderovať @{name}",
+  "status.admin_domain": "Moderovať {domain}",
+  "status.admin_status": "Moderovať príspevok",
+  "status.block": "Blokovať @{name}",
+  "status.bookmark": "Pridať záložku",
+  "status.cancel_reblog_private": "Zrušiť zdieľanie",
+  "status.cannot_reblog": "Tento príspevok nie je možné zdieľať",
+  "status.copy": "Kopírovať odkaz na príspevok",
+  "status.delete": "Vymazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",
-  "status.direct": "Spomeň @{name} v súkromí",
-  "status.direct_indicator": "Súkromné spomenutie",
-  "status.edit": "Uprav",
-  "status.edited": "Upravené {date}",
-  "status.edited_x_times": "Upravený {count, plural, one {{count} krát} other {{count} krát}}",
+  "status.direct": "Súkromne označiť @{name}",
+  "status.direct_indicator": "Súkromné označenie",
+  "status.edit": "Upraviť",
+  "status.edited": "Naposledy upravený {date}",
+  "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
   "status.embed": "Vložiť",
-  "status.favourite": "Páči sa mi",
+  "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.filtered": "Filtrované",
-  "status.hide": "Skry príspevok",
-  "status.history.created": "{name} vytvoril/a {date}",
-  "status.history.edited": "{name} upravil/a {date}",
-  "status.load_more": "Ukáž viac",
-  "status.media.open": "Klikni pre otvorenie",
-  "status.media.show": "Kliknutím zobrazíš",
+  "status.hide": "Skryť príspevok",
+  "status.history.created": "Vytvorené účtom {name} {date}",
+  "status.history.edited": "Upravené účtom {name} {date}",
+  "status.load_more": "Načitať viac",
+  "status.media.open": "Otvoriť kliknutím",
+  "status.media.show": "Zobraziť kliknutím",
   "status.media_hidden": "Skryté médiá",
-  "status.mention": "Spomeň @{name}",
+  "status.mention": "Označiť @{name}",
   "status.more": "Viac",
-  "status.mute": "Nevšímaj si @{name}",
-  "status.mute_conversation": "Nevšímaj si konverzáciu",
-  "status.open": "Otvor tento príspevok",
-  "status.pin": "Pripni na profil",
+  "status.mute": "Stíšiť @{name}",
+  "status.mute_conversation": "Stíšiť konverzáciu",
+  "status.open": "Rozbaliť príspevok",
+  "status.pin": "Pripnúť na profil",
   "status.pinned": "Pripnutý príspevok",
   "status.read_more": "Čítaj ďalej",
-  "status.reblog": "Vyzdvihni",
-  "status.reblog_private": "Vyzdvihni k pôvodnému publiku",
-  "status.reblogged_by": "{name} vyzdvihli",
-  "status.reblogs.empty": "Nikto ešte nevyzdvihol tento príspevok. Keď tak niekto urobí, bude to zobrazené práve tu.",
-  "status.redraft": "Vymaž a prepíš",
-  "status.remove_bookmark": "Odstráň záložku",
+  "status.reblog": "Zdieľať",
+  "status.reblog_private": "Zdieľať pôvodnému publiku",
+  "status.reblogged_by": "{name} zdieľa",
+  "status.reblogs.empty": "Nikto ešte tento príspevok nezdieľal. Keď tak niekto urobí, zobrazí sa to tu.",
+  "status.redraft": "Vymazať a prepísať",
+  "status.remove_bookmark": "Odstrániť záložku",
   "status.replied_to": "Odpoveď na {name}",
   "status.reply": "Odpovedať",
-  "status.replyAll": "Odpovedz na diskusiu",
-  "status.report": "Nahlás @{name}",
-  "status.sensitive_warning": "Chúlostivý obsah",
-  "status.share": "Zdieľaj",
-  "status.show_filter_reason": "Ukáž aj tak",
-  "status.show_less": "Zobraz menej",
-  "status.show_less_all": "Všetkým ukáž menej",
-  "status.show_more": "Ukáž viac",
-  "status.show_more_all": "Všetkým ukáž viac",
-  "status.show_original": "Ukáž pôvodný",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.replyAll": "Odpovedať vo vlákne",
+  "status.report": "Nahlásiť @{name}",
+  "status.sensitive_warning": "Citlivý obsah",
+  "status.share": "Zdieľať",
+  "status.show_filter_reason": "Aj tak zobraziť",
+  "status.show_less": "Zobraziť menej",
+  "status.show_less_all": "Všetkým zobraziť menej",
+  "status.show_more": "Zobraziť viac",
+  "status.show_more_all": "Všetkým zobraziť viac",
+  "status.show_original": "Zobraziť originál",
+  "status.title.with_attachments": "Účet {user} nahral {attachmentCount, plural, one {prílohu} few {{attachmentCount} prílohy} many {{attachmentCount} príloh} other {{attachmentCount} príloh}}",
   "status.translate": "Preložiť",
   "status.translated_from_with": "Preložené z {lang} pomocou {provider}",
   "status.uncached_media_warning": "Náhľad nie je k dispozícii",
-  "status.unmute_conversation": "Prestaň si nevšímať konverzáciu",
-  "status.unpin": "Odopni z profilu",
+  "status.unmute_conversation": "Zrušiť stíšenie konverzácie",
+  "status.unpin": "Odopnúť z profilu",
   "subscribed_languages.lead": "Po zmene sa na vašej domovskej stránke a časovej osi zoznamu zobrazia iba príspevky vo vybraných jazykoch. Ak chcete dostávať príspevky vo všetkých jazykoch, vyberte možnosť žiadne.",
-  "subscribed_languages.save": "Ulož zmeny",
+  "subscribed_languages.save": "Uložiť zmeny",
   "subscribed_languages.target": "Zmeniť prihlásené jazyky pre {target}",
   "tabs_bar.home": "Domov",
-  "tabs_bar.notifications": "Oznámenia",
-  "time_remaining.days": "Ostáva {number, plural, one {# deň} few {# dní} many {# dní} other {# dní}}",
-  "time_remaining.hours": "Ostáva {number, plural, one {# hodina} few {# hodín} many {# hodín} other {# hodiny}}",
-  "time_remaining.minutes": "Ostáva {number, plural, one {# minúta} few {# minút} many {# minút} other {# minúty}}",
+  "tabs_bar.notifications": "Upozornenia",
+  "time_remaining.days": "Ostáva{number, plural, one { # deň} few {jú # dni} many { # dní} other { # dní}}",
+  "time_remaining.hours": "Ostáva{number, plural, one { # hodina} few {jú # hodiny} many { # hodín} other { # hodín}}",
+  "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",
   "time_remaining.moments": "Ostáva už iba chviľka",
-  "time_remaining.seconds": "Ostáva {number, plural, one {# sekunda} few {# sekúnd} many {# sekúnd} other {# sekúnd}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazí.",
+  "time_remaining.seconds": "Ostáva{number, plural, one { # sekunda} few {jú # sekundy} many { # sekúnd} other { # sekúnd}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazia.",
   "timeline_hint.resources.followers": "Sledujúci",
-  "timeline_hint.resources.follows": "Nasleduje",
+  "timeline_hint.resources.follows": "Sledovaní",
   "timeline_hint.resources.statuses": "Staršie príspevky",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} ľudia} many {{counter} ľudí} other {{counter} ľudí}} za posledn{days, plural, one {ý deň} few {é {days} dni} many {ých {days} dní} other {ých {days} dní}}",
   "trends.trending_now": "Teraz populárne",
-  "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
-  "units.short.billion": "{count}mld.",
-  "units.short.million": "{count}mil.",
-  "units.short.thousand": "{count}tis.",
-  "upload_area.title": "Pretiahni a pusť pre nahratie",
-  "upload_button.label": "Pridaj médiálny súbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "ui.beforeunload": "Po opustení Mastodonu prídete o to, čo máte rozpísané.",
+  "units.short.billion": "{count} mld.",
+  "units.short.million": "{count} mil.",
+  "units.short.thousand": "{count} tis.",
+  "upload_area.title": "Nahráte potiahnutím a pustením",
+  "upload_button.label": "Pridať obrázky, video alebo zvukový súbor",
   "upload_error.limit": "Limit pre nahrávanie súborov bol prekročený.",
-  "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
-  "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
-  "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.description_missing": "Nepridaný žiadny popis",
-  "upload_form.edit": "Uprav",
+  "upload_error.poll": "Nahrávanie súborov nie je pri anketách možné.",
+  "upload_form.audio_description": "Popis pre sluchovo postihnutých ľudí",
+  "upload_form.description": "Popis pre zrakovo postihnutých ľudí",
+  "upload_form.edit": "Upraviť",
   "upload_form.thumbnail": "Zmeniť miniatúru",
-  "upload_form.undo": "Vymaž",
-  "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
-  "upload_modal.analyzing_picture": "Analyzujem obrázok…",
-  "upload_modal.apply": "Použi",
-  "upload_modal.applying": "Nastavovanie…",
-  "upload_modal.choose_image": "Vyber obrázok",
-  "upload_modal.description_placeholder": "Rýchla hnedá líška skáče ponad lenivého psa",
-  "upload_modal.detect_text": "Rozpoznaj text z obrázka",
-  "upload_modal.edit_media": "Uprav médiá",
-  "upload_modal.hint": "Klikni, alebo potiahni okruh ukážky pre zvolenie z ktorého východzieho bodu bude vždy v dohľadne na všetkých náhľadoch.",
-  "upload_modal.preparing_ocr": "Pripravujem OCR…",
+  "upload_form.video_description": "Popís pre ľudí so zrakovým alebo sluchovým postihnutím",
+  "upload_modal.analyzing_picture": "Prebieha analýza obrázka…",
+  "upload_modal.apply": "Použiť",
+  "upload_modal.applying": "Ukladanie…",
+  "upload_modal.choose_image": "Vybrať obrázok",
+  "upload_modal.description_placeholder": "Kde bolo, tam bolo, bol raz jeden Mastodon",
+  "upload_modal.detect_text": "Rozpoznať text z obrázka",
+  "upload_modal.edit_media": "Upraviť médiá",
+  "upload_modal.hint": "Kliknite alebo potiahnite kruh na ukážke, a tak vyberte bod, ktorý bude viditeľný na všetkých náhľadoch.",
+  "upload_modal.preparing_ocr": "Pripravujem rozpoznávanie…",
   "upload_modal.preview_label": "Náhľad ({ratio})",
-  "upload_progress.label": "Nahráva sa...",
+  "upload_progress.label": "Nahráva sa…",
   "upload_progress.processing": "Spracovávanie…",
   "username.taken": "Používateľské meno je obsadené. Skúste iné",
-  "video.close": "Zavri video",
-  "video.download": "Stiahni súbor",
-  "video.exit_fullscreen": "Vypni zobrazenie na celú obrazovku",
-  "video.expand": "Zväčši video",
-  "video.fullscreen": "Zobraz na celú obrazovku",
-  "video.hide": "Skry video",
-  "video.mute": "Stlm zvuk",
-  "video.pause": "Pauza",
-  "video.play": "Prehraj",
-  "video.unmute": "Zapni zvuk"
+  "video.close": "Zatvoriť video",
+  "video.download": "Stiahnuť súbor",
+  "video.exit_fullscreen": "Ukončiť režim celej obrazovky",
+  "video.expand": "Zväčšiť video",
+  "video.fullscreen": "Zobraziť na celú obrazovku",
+  "video.hide": "Skryť video",
+  "video.mute": "Stlmiť zvuk",
+  "video.pause": "Pozastaviť",
+  "video.play": "Prehrať",
+  "video.unmute": "Zapnúť zvuk"
 }
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b3998b9110..459d05ce3e 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
-  "autosuggest_hashtag.per_week": "{count} na teden",
+  "block_modal.remote_users_caveat": "Od strežnika {domain} bomo zahtevali, da spoštuje vašo odločitev. Izpolnjevanje zahteve ni zagotovljeno, ker nekateri strežniki blokiranja obravnavajo drugače. Javne objave bodo morda še vedno vidne neprijavljenim uporabnikom.",
+  "block_modal.show_less": "Pokaži manj",
+  "block_modal.show_more": "Pokaži več",
+  "block_modal.they_cant_mention": "Ne morejo vas omenjati ali vam slediti.",
+  "block_modal.they_cant_see_posts": "Ne vidijo vaših objav, vi pa ne njihovih.",
+  "block_modal.they_will_know": "Ne morejo videti, da so blokirani.",
+  "block_modal.title": "Blokiraj uporabnika?",
+  "block_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljate?",
-  "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbira {number}",
-  "compose_form.poll.remove_option": "Odstrani to izbiro",
+  "compose_form.poll.multiple": "Več možnosti",
+  "compose_form.poll.option_placeholder": "Možnost {number}",
+  "compose_form.poll.single": "Izberite eno možnost",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
+  "compose_form.poll.type": "Slog",
   "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Shrani spremembe",
-  "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
+  "compose_form.reply": "Odgovori",
+  "compose_form.save_changes": "Posodobi",
   "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
-  "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
+  "compose_form.spoiler_placeholder": "Opozorilo o vsebini (ni obvezno)",
   "confirmation_modal.cancel": "Prekliči",
-  "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
   "confirmations.cancel_follow_request.confirm": "Umakni zahtevo",
   "confirmations.cancel_follow_request.message": "Ali ste prepričani, da želite umakniti svojo zahtevo, da bi sledili {name}?",
   "confirmations.delete.confirm": "Izbriši",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
   "confirmations.discard_edit_media.confirm": "Opusti",
   "confirmations.discard_edit_media.message": "Imate ne shranjene spremembe za medijski opis ali predogled; jih želite kljub temu opustiti?",
-  "confirmations.domain_block.confirm": "Blokiraj celotno domeno",
+  "confirmations.domain_block.confirm": "Blokiraj strežnik",
   "confirmations.domain_block.message": "Ali ste res, res prepričani, da želite blokirati celotno {domain}? V večini primerov je nekaj ciljnih blokiranj ali utišanj dovolj in boljše. Vsebino iz te domene ne boste videli v javnih časovnicah ali obvestilih. Vaši sledilci iz te domene bodo odstranjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Urejanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
   "confirmations.logout.confirm": "Odjava",
   "confirmations.logout.message": "Ali ste prepričani, da se želite odjaviti?",
   "confirmations.mute.confirm": "Utišanje",
-  "confirmations.mute.explanation": "S tem boste skrili objave pred njimi in objave, ki jih omenjajo, še vedno pa bodo lahko videli vaše objave in vam sledili.",
-  "confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.reply.confirm": "Odgovori",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Te objave s tega in drugih strežnikov v decentraliziranem omrežju pridobivajo ravno zdaj veliko pozornosti na tem strežniku.",
   "dismissable_banner.explore_tags": "Ravno zdaj dobivajo ti ključniki veliko pozoronosti med osebami na tem in drugih strežnikih decentraliziranega omrežja.",
   "dismissable_banner.public_timeline": "To so najnovejše javne objave oseb z družabnega omrežja, ki jim sledijo osebe na {domain}.",
+  "domain_block_modal.block": "Blokiraj strežnik",
+  "domain_block_modal.block_account_instead": "Namesto tega blokiraj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Osebe s tega strežnika se lahko odzivajo na vaše stare objave.",
+  "domain_block_modal.they_cant_follow": "Nihče s tega strežnika vam ne more slediti.",
+  "domain_block_modal.they_wont_know": "Ne bodo vedeli, da so blokirani.",
+  "domain_block_modal.title": "Blokiraj domeno?",
+  "domain_block_modal.you_will_lose_followers": "Vsi vaši sledilci s tega strežnika bodo odstranjeni.",
+  "domain_block_modal.you_wont_see_posts": "Objav ali obvestil uporabnikov s tega strežnika ne boste videli.",
+  "domain_pill.activitypub_lets_connect": "Omogoča vam povezovanje in interakcijo z ljudmi, ki niso samo na Mastodonu, ampak tudi na drugih družabnih platformah.",
+  "domain_pill.activitypub_like_language": "Protokol ActivityPub je kot jezik, s katerim se Mastodon pogovarja z drugimi družabnimi omrežji.",
+  "domain_pill.server": "Strežnik",
+  "domain_pill.their_handle": "Njihova ročica:",
+  "domain_pill.their_server": "Njihovo digitalno domovanje, kjer bivajo vse njihove objave.",
+  "domain_pill.their_username": "Njihov edinstveni identifikator na njihovem strežniku. Uporabnike z istim uporabniškim imenom lahko najdete na različnih strežnikih.",
+  "domain_pill.username": "Uporabniško ime",
+  "domain_pill.whats_in_a_handle": "Kaj je v ročici?",
+  "domain_pill.who_they_are": "Ker ročice povedo, kdo je kdo in kje so, ste lahko z osebami v interakciji prek družabnega spleta <button>platform, ki jih poganja ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ker ročice povedo, kdo ste in kje ste, ste lahko z osebami v interakciji prek družabnega spleta <button>platform, ki jih poganja ActivityPub</button>.",
+  "domain_pill.your_handle": "Vaša ročica:",
+  "domain_pill.your_server": "Vaše digitalno domovanje, kjer bivajo vse vaše objave. Vam ta ni všeč? Prenesite ga med strežniki kadar koli in z njim tudi svoje sledilce.",
+  "domain_pill.your_username": "Vaš edinstveni identifikator na tem strežniku. Uporabnike z istim uporabniškim imenom je možno najti na različnih strežnikih.",
   "embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
   "embed.preview": "Tako bo izgledalo:",
   "emoji_button.activity": "Dejavnost",
@@ -244,6 +266,7 @@
   "empty_column.list": "Na tem seznamu ni ničesar. Ko bodo člani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
   "empty_column.lists": "Nimate seznamov. Ko ga boste ustvarili, se bo prikazal tukaj.",
   "empty_column.mutes": "Niste utišali še nobenega uporabnika.",
+  "empty_column.notification_requests": "Vse prebrano! Tu ni ničesar več. Ko prejmete nova obvestila, se bodo pojavila tu glede na vaše nastavitve.",
   "empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
   "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
   "error.unexpected_crash.explanation": "Zaradi hrošča v naši kodi ali težave z združljivostjo brskalnika te strani ni mogoče ustrezno prikazati.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Uporabite obstoječo kategorijo ali ustvarite novo",
   "filter_modal.select_filter.title": "Filtriraj to objavo",
   "filter_modal.title.status": "Filtrirajte objavo",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omemba} two {omembi} few {omembe} other {omemb}}",
+  "filtered_notifications_banner.pending_requests": "Obvestila od {count, plural, =0 {nikogar, ki bi ga} one {# človeka, ki bi ga} two {# ljudi, ki bi ju} few {# ljudi, ki bi jih} other {# ljudi, ki bi jih}} lahko poznali",
+  "filtered_notifications_banner.title": "Filtrirana obvestila",
   "firehose.all": "Vse",
   "firehose.local": "Ta strežnik",
   "firehose.remote": "Drugi strežniki",
   "follow_request.authorize": "Overi",
   "follow_request.reject": "Zavrni",
   "follow_requests.unlocked_explanation": "Čeprav vaš račun ni zaklenjen, zaposleni pri {domain} menijo, da bi morda želeli pregledati zahteve za sledenje teh računov ročno.",
+  "follow_suggestions.curated_suggestion": "Izbor osebja",
+  "follow_suggestions.dismiss": "Ne pokaži več",
+  "follow_suggestions.featured_longer": "Osebno izbrala ekipa {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Priljubljeno med osebami, ki jim sledite",
+  "follow_suggestions.hints.featured": "Ta profil so izbrali skrbniki strežnika {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ta profil je priljubljen med osebami, ki jim sledite.",
+  "follow_suggestions.hints.most_followed": "Ta profil na strežniku {domain} je en izmed najbolj sledenih.",
+  "follow_suggestions.hints.most_interactions": "Ta profil na strežniku {domain} je nedavno prejel veliko pozornosti.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ta profil je podoben profilom, ki ste jim nedavno začeli slediti.",
+  "follow_suggestions.personalized_suggestion": "Osebno prilagojen predlog",
+  "follow_suggestions.popular_suggestion": "Priljubljen predlog",
+  "follow_suggestions.popular_suggestion_longer": "Priljubljeno na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Podobno profilom, ki ste jim pred kratkim sledili",
+  "follow_suggestions.view_all": "Pokaži vse",
+  "follow_suggestions.who_to_follow": "Komu slediti",
   "followed_tags": "Sledeni ključniki",
   "footer.about": "O Mastodonu",
   "footer.directory": "Imenik profilov",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Sledi ključniku",
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "…in še {count, plural, other {#}}",
-  "home.actions.go_to_explore": "Poglejte, kaj je v trendu",
-  "home.actions.go_to_suggestions": "Poiščite osebe, ki jim želite slediti",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
-  "home.explore_prompt.body": "Vaš domači vir bo vseboval mešanico objav ključnikov, ki ste jih izbrali za sledenje, oseb, ki ste jih izbrali za sledenje, in objav, ki jih ti izpostavljajo. Če se vam to zdi preveč tiho, morda želite:",
-  "home.explore_prompt.title": "To je vaš dom v okviru Mastodona.",
   "home.hide_announcements": "Skrij obvestila",
   "home.pending_critical_update.body": "Čim prej posodobite svoj strežnik Mastodon!",
   "home.pending_critical_update.link": "Glejte posodobitve",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Nalaganje …",
   "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
   "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Ali želite skriti obvestila tega uporabnika?",
-  "mute_modal.indefinite": "Nedoločeno",
+  "mute_modal.hide_from_notifications": "Skrijte se pred obvestili",
+  "mute_modal.hide_options": "Skrij možnosti",
+  "mute_modal.indefinite": "Dokler jim ne povrnem glasu",
+  "mute_modal.show_options": "Pokaži možnosti",
+  "mute_modal.they_can_mention_and_follow": "Lahko vas omenijo ali vam sledijo, vi pa jih ne morete videti.",
+  "mute_modal.they_wont_know": "Ne bodo vedeli, da so utišani.",
+  "mute_modal.title": "Utišaj uporabnika?",
+  "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
+  "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Zasebne omembe",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
@@ -432,11 +473,28 @@
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
   "notification.mention": "{name} vas je omenil/a",
+  "notification.moderation-warning.learn_more": "Več o tem",
+  "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
+  "notification.moderation_warning.action_disable": "Vaš račun je bil onemogočen.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nekatere vaše objave so bile označene kot občutljive.",
+  "notification.moderation_warning.action_none": "Vaš račun je prejel opozorilo moderatorjev.",
+  "notification.moderation_warning.action_sensitive": "Vaše objave bodo odslej označene kot občutljive.",
+  "notification.moderation_warning.action_silence": "Vaš račun je bil omejen.",
+  "notification.moderation_warning.action_suspend": "Vaš račun je bil suspendiran.",
   "notification.own_poll": "Vaša anketa je zaključena",
   "notification.poll": "Anketa, v kateri ste sodelovali, je zaključena",
   "notification.reblog": "{name} je izpostavila/a vašo objavo",
+  "notification.relationships_severance_event": "Povezave z {name} prekinjene",
+  "notification.relationships_severance_event.account_suspension": "Skrbnik na {from} je suspendiral račun {target}, kar pomeni, da od računa ne morete več prejemati posodobitev ali imeti z njim interakcij.",
+  "notification.relationships_severance_event.domain_block": "Skrbnik na {from} je blokiral domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
+  "notification.relationships_severance_event.learn_more": "Več o tem",
+  "notification.relationships_severance_event.user_domain_block": "Blokirali ste domeno {target}, vključno z vašimi sledilci ({followersCount}) in {followingCount, plural, one {# računom, ki mu sledite} two {# računoma, ki jima sledite} few {# računi, ki jim sledite} other {# računi, ki jim sledite}}.",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
+  "notification_requests.accept": "Sprejmi",
+  "notification_requests.dismiss": "Zavrni",
+  "notification_requests.notifications_from": "Obvestila od {name}",
+  "notification_requests.title": "Filtrirana obvestila",
   "notifications.clear": "Počisti obvestila",
   "notifications.clear_confirmation": "Ali ste prepričani, da želite trajno izbrisati vsa svoja obvestila?",
   "notifications.column_settings.admin.report": "Nove prijave:",
@@ -445,7 +503,6 @@
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
-  "notifications.column_settings.filter_bar.show_bar": "Pokaži vrstico s filtri",
   "notifications.column_settings.follow": "Novi sledilci:",
   "notifications.column_settings.follow_request": "Nove prošnje za sledenje:",
   "notifications.column_settings.mention": "Omembe:",
@@ -471,6 +528,15 @@
   "notifications.permission_denied": "Namizna obvestila niso na voljo zaradi poprej zavrnjene zahteve dovoljenja brskalnika.",
   "notifications.permission_denied_alert": "Namiznih obvestil ni mogoče omogočiti, ker je bilo dovoljenje brskalnika že prej zavrnjeno",
   "notifications.permission_required": "Namizna obvestila niso na voljo, ker zahtevano dovoljenje ni bilo podeljeno.",
+  "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
+  "notifications.policy.filter_new_accounts_title": "Novi računi",
+  "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
+  "notifications.policy.filter_not_followers_title": "Ljudje, ki vam ne sledijo",
+  "notifications.policy.filter_not_following_hint": "Dokler jih ročno ne odobrite",
+  "notifications.policy.filter_not_following_title": "Ljudje, ki jim ne sledite",
+  "notifications.policy.filter_private_mentions_hint": "Filtrirano, razen če je odgovor na vašo lastno omembo ali če sledite pošiljatelju",
+  "notifications.policy.filter_private_mentions_title": "Neželene zasebne omembe",
+  "notifications.policy.title": "Filtriraj obvestila od …",
   "notifications_permission_banner.enable": "Omogoči obvestila na namizju",
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
@@ -526,14 +592,15 @@
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Spremeni zasebnost objave",
-  "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Samo omenjeni",
-  "privacy.private.long": "Vidno samo sledilcem",
-  "privacy.private.short": "Samo sledilci",
-  "privacy.public.long": "Vidno vsem",
+  "privacy.direct.long": "Vsem omenjenim v objavi",
+  "privacy.direct.short": "Določenim ljudem",
+  "privacy.private.long": "Samo vašim sledilcem",
+  "privacy.private.short": "Sledilcem",
+  "privacy.public.long": "Vsem, ki so ali niso na Mastodonu",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
-  "privacy.unlisted.short": "Ni prikazano",
+  "privacy.unlisted.additional": "Učinek je enak kot pri javni objavi, le da se ta ne bo prikazala v živih virih, med ključniki, raziskovanjem ali iskanjem, četudi ste to vključili na ravni računa.",
+  "privacy.unlisted.long": "Manj vsebine po izboru algoritma",
+  "privacy.unlisted.short": "Tiho javno",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
@@ -551,7 +618,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "danes",
+  "reply_indicator.attachments": "{count, plural, one {# priloga} two {# prilogi} few {# priloge} other {# prilog}}",
   "reply_indicator.cancel": "Prekliči",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokiraj",
   "report.block_explanation": "Njihovih objav ne boste videli. Oni ne bodo videli vaših objav, niti vam ne morejo slediti. Lahko bodo ugotovili, da so blokirani.",
   "report.categories.legal": "Pravno obvestilo",
@@ -644,10 +713,11 @@
   "status.direct": "Zasebno omeni @{name}",
   "status.direct_indicator": "Zasebna omemba",
   "status.edit": "Uredi",
-  "status.edited": "Urejeno {date}",
+  "status.edited": "Zadnje urejanje {date}",
   "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
   "status.embed": "Vdelaj",
   "status.favourite": "Priljubljen_a",
+  "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",
   "status.filtered": "Filtrirano",
   "status.hide": "Skrij objavo",
@@ -668,6 +738,7 @@
   "status.reblog": "Izpostavi",
   "status.reblog_private": "Izpostavi z izvirno vidljivostjo",
   "status.reblogged_by": "{name} je izpostavil/a",
+  "status.reblogs": "{count, plural, one {izpostavitev} two {izpostavitvi} few {izpostavitve} other {izpostavitev}}",
   "status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
   "status.redraft": "Izbriši in preoblikuj",
   "status.remove_bookmark": "Odstrani zaznamek",
@@ -715,10 +786,8 @@
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.description_missing": "Noben opis ni dodan",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Spremeni sličico",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
   "upload_modal.analyzing_picture": "Analiziranje slike …",
   "upload_modal.apply": "Uveljavi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index f45266c845..b496f8e203 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Lajmërim",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
-  "autosuggest_hashtag.per_week": "{count} për javë",
+  "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
+  "block_modal.show_less": "Shfaq më pak",
+  "block_modal.show_more": "Shfaq më tepër",
+  "block_modal.they_cant_mention": "S’mund t’u përmendin, ose t’ju ndjekin.",
+  "block_modal.they_cant_see_posts": "S’mund të shohin postimet tuaja dhe as ju të tyret.",
+  "block_modal.they_will_know": "Mund të shohin se janë bllokuar.",
+  "block_modal.title": "Të bllokohet përdoruesi?",
+  "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
-  "compose_form.poll.add_option": "Shtoni një zgjedhje",
   "compose_form.poll.duration": "Kohëzgjatje pyetësori",
-  "compose_form.poll.option_placeholder": "Zgjedhja {number}",
-  "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
+  "compose_form.poll.multiple": "Shumë zgjedhje",
+  "compose_form.poll.option_placeholder": "Mundësia {number}",
+  "compose_form.poll.single": "Zgjidhni një",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
-  "compose_form.publish": "Botoje",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postim",
   "compose_form.publish_form": "Publikoje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ruaji ndryshimet",
-  "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
+  "compose_form.reply": "Përgjigjuni",
+  "compose_form.save_changes": "Përditësoje",
   "compose_form.spoiler.marked": "Hiq sinjalizim lënde",
   "compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
-  "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
+  "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
-  "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
-  "confirmations.block.message": "Jeni i sigurt se doni të bllokohet {name}?",
   "confirmations.cancel_follow_request.confirm": "Tërhiqeni mbrapsht kërkesën",
   "confirmations.cancel_follow_request.message": "Jeni i sigurt se doni të tërhiqni mbrapsht kërkesën tuaj për ndjekje të {name}?",
   "confirmations.delete.confirm": "Fshije",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
   "confirmations.discard_edit_media.confirm": "Hidhe tej",
   "confirmations.discard_edit_media.message": "Keni ndryshime të paruajtura te përshkrimi ose paraparja e medias, të hidhen tej, sido qoftë?",
-  "confirmations.domain_block.confirm": "Bllokoje krejt përkatësinë",
+  "confirmations.domain_block.confirm": "Bllokoje shërbyesin",
   "confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
   "confirmations.edit.confirm": "Përpunojeni",
   "confirmations.edit.message": "Përpunimi tani do të sjellë mbishkrim të mesazhit që po hartoni aktualisht. Jeni i sigurt se doni të vazhdohet?",
   "confirmations.logout.confirm": "Dilni",
   "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
   "confirmations.mute.confirm": "Heshtoje",
-  "confirmations.mute.explanation": "Kjo do t’u fshehë postimet dhe përmendje postimesh, por ende do t’u lejojë të shohin postimet tuaja dhe t’ju ndjekin.",
-  "confirmations.mute.message": "Jeni i sigurt se doni të heshtohet {name}?",
   "confirmations.redraft.confirm": "Fshijeni & rihartojeni",
   "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Të parapëlqyerit dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
   "confirmations.reply.confirm": "Përgjigjuni",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Këto janë postime nga rrjeti shoqëror që po tërheqin vëmendjen tani. Postimet më të reja me më përforcime dhe më të parapëlqyera nga njerëzit renditen më sipër.",
   "dismissable_banner.explore_tags": "Këta hashtag-ë po tërheqin vëmendjen mes personave në këtë shërbyes dhe të tjerë të tillë të rrjetit të decentralizuar mu tani.",
   "dismissable_banner.public_timeline": "Këto janë postimet më të reja publike prej personash në rrjetin shoqëror që ndjekin njerëzit në {domain}.",
+  "domain_block_modal.block": "Bllokoje shërbyesin",
+  "domain_block_modal.block_account_instead": "Blloko @{name} në vend të kësaj",
+  "domain_block_modal.they_can_interact_with_old_posts": "Persona nga ky shërbyes mund të ndërveprojnë me postimet tuaja të vjetra.",
+  "domain_block_modal.they_cant_follow": "S’mund t’ju ndjekë askush nga ky shërbyes.",
+  "domain_block_modal.they_wont_know": "S’do ta dinë se janë bllokuar.",
+  "domain_block_modal.title": "Të bllokohet përkatësia?",
+  "domain_block_modal.you_will_lose_followers": "Krejt ndjekësit tuaj nga ky shërbyes do të hiqen.",
+  "domain_block_modal.you_wont_see_posts": "S’do të shihni postime, apo njoftime nga përdorues në këtë shërbyes.",
+  "domain_pill.activitypub_lets_connect": "Ju lejon të lidheni dhe ndërveproni me persona jo thjesht në Mastodon, por edhe nëpër aplikacione të ndryshme shoqërore.",
+  "domain_pill.activitypub_like_language": "ActivityPub është si gjuha me të cilën Mastodon-i komunikon me rrjete të tjerë shoqërorë.",
+  "domain_pill.server": "Shërbyes",
+  "domain_pill.their_handle": "Targa e tij:",
+  "domain_pill.their_server": "Shtëpia e tij dixhitale, ku rrinë krejt postimet prej tij.",
+  "domain_pill.their_username": "Identifikuesi i tij unik në shërbyesin e vet. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
+  "domain_pill.username": "Emër përdoruesi",
+  "domain_pill.whats_in_a_handle": "Ç’është një targë?",
+  "domain_pill.who_they_are": "Nga targat thonë se cili është dikush dhe se ku gjendet, ju mund të ndërveproni me persona nëpër web-in shoqëror të <button>platformave të ngritura mbi ActivityPub</button>.",
+  "domain_pill.who_you_are": "Ngaqë targa juaj thotë se cili jeni dhe se ku gjendeni, njerëzit mund të ndërveprojnë me ju nëpër web-in shoqëror të <button>platformave të bazuara në ActivityPub</button>.",
+  "domain_pill.your_handle": "Targa juaj:",
+  "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.",
+  "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
   "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
   "embed.preview": "Ja si do të duket:",
   "emoji_button.activity": "Veprimtari",
@@ -244,6 +266,7 @@
   "empty_column.list": "Në këtë listë ende s’ka gjë. Kur anëtarë të kësaj liste postojnë gjendje të reja, ato do të shfaqen këtu.",
   "empty_column.lists": "Ende s’keni ndonjë listë. Kur të krijoni një të tillë, do të duket këtu.",
   "empty_column.mutes": "S’keni heshtuar ende ndonjë përdorues.",
+  "empty_column.notification_requests": "Gjithçka si duhet! S’ka ç’bëhet këtu. Kur merrni njoftime të reja, do të shfaqen këtu, në përputhje me rregullimet tuaja.",
   "empty_column.notifications": "Ende s’keni ndonjë njoftim. Ndërveproni me të tjerët që të nisë biseda.",
   "empty_column.public": "S’ka gjë këtu! Shkruani diçka publikisht, ose ndiqni dorazi përdorues prej instancash të tjera, që kjo të mbushet",
   "error.unexpected_crash.explanation": "Për shkak të një të mete në kodin tonë ose të një problemi përputhshmërie të shfletuesit, kjo faqe s’mund të shfaqet saktë.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
+  "filtered_notifications_banner.mentions": "{count, plural, one {përmendje} other {përmendje}}",
+  "filtered_notifications_banner.pending_requests": "Njoftime prej {count, plural, =0 {askujt} one {një personi} other {# vetësh}} që mund të njihni",
+  "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
   "firehose.local": "Këtë shërbyes",
   "firehose.remote": "Shërbyes të tjerë",
   "follow_request.authorize": "Autorizoje",
   "follow_request.reject": "Hidhe tej",
   "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
+  "follow_suggestions.curated_suggestion": "Zgjedhur nga ekipi",
+  "follow_suggestions.dismiss": "Mos shfaq më",
+  "follow_suggestions.featured_longer": "Zgjedhur enkas nga ekipi {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popullore mes personash që ndiqni",
+  "follow_suggestions.hints.featured": "Ky profil është zgjedhur nga ekipi {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ky profil është popullor mes personave që ndiqni.",
+  "follow_suggestions.hints.most_followed": "Ky profil është një nga më të ndjekur në {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ky profil ka tërhequr mjaft vëmendjen së fundi në {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ky profil është i ngjashëm me profile që keni ndjekur tani afër.",
+  "follow_suggestions.personalized_suggestion": "Sugjerim i personalizuar",
+  "follow_suggestions.popular_suggestion": "Sugjerim popullor",
+  "follow_suggestions.popular_suggestion_longer": "Popullore në {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "I ngjashëm me profile që keni zënë të ndiqni së fundi",
+  "follow_suggestions.view_all": "Shihni krejt",
+  "follow_suggestions.who_to_follow": "Cilët të ndiqen",
   "followed_tags": "Hashtag-ë të ndjekur",
   "footer.about": "Mbi",
   "footer.directory": "Drejtori profilesh",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Ndiqe hashtag-un",
   "hashtag.unfollow": "Hiqe ndjekjen e hashtag-ut",
   "hashtags.and_other": "…dhe {count, plural, one {}other {# më tepër}}",
-  "home.actions.go_to_explore": "Shihni ç’është në modë",
-  "home.actions.go_to_suggestions": "Gjeni persona për ndjekje",
-  "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
-  "home.explore_prompt.body": "Prurja juaj bazë do të ketë një përzierje postimesh nga hashtag-ë që keni zgjedhur të ndiqni, persona që keni zgjedhur të ndiqni dhe postime që ata përforcojnë. Nëse kjo duket si shumë qetësi, mund të doni të:",
-  "home.explore_prompt.title": "Kjo është baza juaj brenda Mastodon-it.",
   "home.hide_announcements": "Fshihi lajmërimet",
   "home.pending_critical_update.body": "Ju lutemi, përditësoni sa më shpejt të jetë e mundur shërbyesin tuaj Mastodon!",
   "home.pending_critical_update.link": "Shihni përditësime",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Po ngarkohet…",
   "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
   "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
-  "mute_modal.duration": "Kohëzgjatje",
-  "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?",
-  "mute_modal.indefinite": "E pacaktuar",
+  "mute_modal.hide_from_notifications": "Fshihe prej njoftimeve",
+  "mute_modal.hide_options": "Fshihi mundësitë",
+  "mute_modal.indefinite": "Deri sa t’u heq heshtimin",
+  "mute_modal.show_options": "Shfaq mundësi",
+  "mute_modal.they_can_mention_and_follow": "Mund t’ju përmendin dhe ndjekin, por s’do t’i shihni.",
+  "mute_modal.they_wont_know": "S’do ta dinë se janë heshtuar.",
+  "mute_modal.title": "Të heshtohet përdoruesi?",
+  "mute_modal.you_wont_see_mentions": "S’do të shihni postime ku përmenden.",
+  "mute_modal.you_wont_see_posts": "Ata munden ende të shohin postimet tuaja, por ju s’do të shihni të tyret.",
   "navigation_bar.about": "Mbi",
   "navigation_bar.advanced_interface": "Hape në ndërfaqe web të thelluar",
   "navigation_bar.blocks": "Përdorues të bllokuar",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Përmendje private",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
-  "navigation_bar.edit_profile": "Përpunoni profilin",
   "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} zuri t’ju ndjekë",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.mention": "{name} ju ka përmendur",
+  "notification.moderation-warning.learn_more": "Mësoni më tepër",
+  "notification.moderation_warning": "Ju është dhënë një sinjalizim moderimi",
+  "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
+  "notification.moderation_warning.action_disable": "Llogaria juaj është çaktivizuar.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Disa prej postimeve tuaja u është vënë shenjë si me spec.",
+  "notification.moderation_warning.action_none": "Llogaria juaj ka marrë një sinjalizim moderimi.",
+  "notification.moderation_warning.action_sensitive": "Postimeve tuaja do t’u vihet shenjë si me spec, nga tani e tutje.",
+  "notification.moderation_warning.action_silence": "Llogaria juaj është kufizuar.",
+  "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
+  "notification.relationships_severance_event": "Lidhje të humbura me {name}",
+  "notification.relationships_severance_event.account_suspension": "Një përgjegjës nga {from} ka pezulluar {target}, që do të thotë se s’mund të merrni më përditësime prej tij, apo të ndërveproni me të.",
+  "notification.relationships_severance_event.domain_block": "Një përgjegjës nga {from} ka bllokuar {target}, përfshi {followersCount} të ndjekësve tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
+  "notification.relationships_severance_event.learn_more": "Mësoni më tepër",
+  "notification.relationships_severance_event.user_domain_block": "Keni bllokuar {target}, duke hequr {followersCount} nga ndjekësit tuaj dhe {followingCount, plural, one {# llogari} other {# llogari}} që ndiqni.",
   "notification.status": "{name} sapo postoi",
   "notification.update": "{name} përpunoi një postim",
+  "notification_requests.accept": "Pranoje",
+  "notification_requests.dismiss": "Hidhe tej",
+  "notification_requests.notifications_from": "Njoftime prej {name}",
+  "notification_requests.title": "Njoftime të filtruar",
   "notifications.clear": "Spastroji njoftimet",
   "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
   "notifications.column_settings.admin.report": "Raportime të reja:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
-  "notifications.column_settings.filter_bar.show_bar": "Shfaq shtyllë filtrash",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
   "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
   "notifications.column_settings.mention": "Përmendje:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "S’merren dot njoftime në desktop, ngaqë më herët shfletuesit i janë mohuar lejet për këtë",
   "notifications.permission_denied_alert": "S’mund të aktivizohen njoftimet në desktop, ngaqë lejet e shfletuesit për këtë janë mohuar më herët",
   "notifications.permission_required": "S’merren dot njoftime desktop, ngaqë s’është akorduar leja përkatëse.",
+  "notifications.policy.filter_new_accounts.hint": "Krijuar brenda {days, plural, one {një dite} other {# ditësh}} të shkuara",
+  "notifications.policy.filter_new_accounts_title": "Llogari të reja",
+  "notifications.policy.filter_not_followers_hint": "Përfshi persona që ju kanë ndjekur brenda më pak se {days, plural, one {një dite} other {# ditësh}}",
+  "notifications.policy.filter_not_followers_title": "Persona që s’ju ndjekin",
+  "notifications.policy.filter_not_following_hint": "Deri sa t’i miratoni dorazi",
+  "notifications.policy.filter_not_following_title": "Persona që s’i ndiqni",
+  "notifications.policy.filter_private_mentions_hint": "Filtruar, hiq rastin nëse gjendet te përgjigje ndaj përmendjes tuaj, ose nëse dërguesin e ndiqni",
+  "notifications.policy.filter_private_mentions_title": "Përmendje private të pakërkuara",
+  "notifications.policy.title": "Filtroni njoftime nga…",
   "notifications_permission_banner.enable": "Aktivizo njoftime në desktop",
   "notifications_permission_banner.how_to_control": "Për të marrë njoftime, kur Mastodon-i s’është i hapur, aktivizoni njoftime në desktop. Përmes butoni {icon} më sipër, mund të kontrolloni me përpikëri cilat lloje ndërveprimesh prodhojnë njoftime në desktop, pasi të jenë aktivizuar.",
   "notifications_permission_banner.title": "Mos t’ju shpëtojë gjë",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Shtoni një pyetësor",
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
-  "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "Vetëm për personat e përmendur",
-  "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekës",
-  "privacy.public.long": "I dukshëm për të tërë",
+  "privacy.direct.long": "Gjithkënd i përmendur te postimi",
+  "privacy.direct.short": "Persona të veçantë",
+  "privacy.private.long": "Vetëm ndjekësit tuaj",
+  "privacy.private.short": "Ndjekës",
+  "privacy.public.long": "Cilido që hyn e del në Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
-  "privacy.unlisted.short": "Jo në lista",
+  "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
+  "privacy.unlisted.long": "Më pak fanfara algoritmike",
+  "privacy.unlisted.short": "Publik i qetë",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
   "recommended": "E rekomanduar",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
+  "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
   "reply_indicator.cancel": "Anuloje",
+  "reply_indicator.poll": "Pyetësor",
   "report.block": "Bllokoje",
   "report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
   "report.categories.legal": "Ligjore",
@@ -644,10 +714,11 @@
   "status.direct": "Përmendje private për @{name}",
   "status.direct_indicator": "Përmendje private",
   "status.edit": "Përpunojeni",
-  "status.edited": "Përpunuar më {date}",
+  "status.edited": "Përpunuar së fundi më {date}",
   "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
   "status.embed": "Trupëzim",
   "status.favourite": "I vini shenjë si të parapëlqyer",
+  "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
   "status.filter": "Filtroje këtë postim",
   "status.filtered": "I filtruar",
   "status.hide": "Fshihe postimin",
@@ -668,6 +739,7 @@
   "status.reblog": "Përforcojeni",
   "status.reblog_private": "Përforcim për publikun origjinal",
   "status.reblogged_by": "{name} përforcoi",
+  "status.reblogs": "{count, plural, one {përforcim} other {përforcime}}",
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
   "status.remove_bookmark": "Hiqe faqerojtësin",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
   "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
-  "upload_form.description_missing": "S’u shtua përshkrim",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
-  "upload_form.undo": "Fshije",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
   "upload_modal.analyzing_picture": "Po analizohet fotoja…",
   "upload_modal.apply": "Aplikoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 77c262e957..67b706fa13 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -13,14 +13,14 @@
   "about.rules": "Pravila servera",
   "account.account_note_header": "Napomena",
   "account.add_or_remove_from_list": "Dodaj ili ukloni sa lista",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatizovano",
   "account.badges.group": "Grupa",
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Blokiraj domen {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokiran",
   "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
-  "account.cancel_follow_request": "Povuci zahtev za praćenje",
+  "account.cancel_follow_request": "Otkaži praćenje",
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno pomeni @{name}",
   "account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
@@ -89,7 +89,14 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} nedeljno",
+  "block_modal.remote_users_caveat": "Zamolićemo server {domain} da poštuje vašu odluku. Međutim, usklađenost nije zagarantovana jer neki serveri mogu drugačije da obrađuju blokove. Javne objave mogu i dalje biti vidljive korisnicima koji nisu prijavljeni.",
+  "block_modal.show_less": "Prikaži manje",
+  "block_modal.show_more": "Prikaži više",
+  "block_modal.they_cant_mention": "Ne mogu da vas pominju ili prate.",
+  "block_modal.they_cant_see_posts": "Ne mogu da vide vaše objave, a vi nećete videti njihove.",
+  "block_modal.they_will_know": "Mogu da vide da su blokirani.",
+  "block_modal.title": "Blokirati korisnika?",
+  "block_modal.you_wont_see_mentions": "Nećete videti objave koje ih pominju.",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "O čemu razmišljate?",
-  "compose_form.poll.add_option": "Dodajte izbor",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbor {number}",
-  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
+  "compose_form.poll.multiple": "Višestruki izbor",
+  "compose_form.poll.option_placeholder": "Opcija {number}",
+  "compose_form.poll.single": "Odaberite jedno",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Objavi",
-  "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sačuvaj promene",
-  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
+  "compose_form.publish_form": "Nova objava",
+  "compose_form.reply": "Odgovori",
+  "compose_form.save_changes": "Ažuriraj",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
-  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
+  "compose_form.spoiler_placeholder": "Upozorenje o sadržaju (opciono)",
   "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
-  "confirmations.block.message": "Da li ste sigurni da želite da blokirate korisnika {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtev",
   "confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
   "confirmations.delete.confirm": "Izbriši",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaci",
   "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
-  "confirmations.domain_block.confirm": "Blokiraj ceo domen",
+  "confirmations.domain_block.confirm": "Blokiraj server",
   "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
   "confirmations.edit.confirm": "Uredi",
   "confirmations.edit.message": "Uređivanjem će se obrisati poruka koju trenutno sastavljate. Da li ste sigurni da želite da nastavite?",
   "confirmations.logout.confirm": "Odjava",
   "confirmations.logout.message": "Da li ste sigurni da želite da se odjavite?",
   "confirmations.mute.confirm": "Ignoriši",
-  "confirmations.mute.explanation": "Ovo će sakriti objave korisnika i objave koje ga pominju, ali će mu i dalje biti dozvoljeno da vidi Vaše objave i da Vas prati.",
-  "confirmations.mute.message": "Da li stvarno želite da ignorišete korisnika {name}?",
   "confirmations.redraft.confirm": "Izbriši i prepravi",
   "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
   "confirmations.reply.confirm": "Odgovori",
@@ -204,10 +205,31 @@
   "disabled_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen.",
   "dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.",
   "dismissable_banner.dismiss": "Odbaci",
-  "dismissable_banner.explore_links": "O ovim vestima trenutno razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_links": "Ovo su vesti koje se danas najviše dele na društvenoj mreži. Novije vesti koje je objavilo više različitih ljudi su bolje rangirane.",
   "dismissable_banner.explore_statuses": "Ovo su objave širom društvenog veba koje danas postaju sve popularnije. Novije objave sa više podržavanja i omiljene su rangirane više.",
-  "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_tags": "Ovo su heš oznake koje danas postaju sve popularnije na društvenoj mreži. Heš oznake koje koristi više različitih ljudi su rangirane više.",
   "dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi sa društvenog veba koje ljudi na {domain}-u prate.",
+  "domain_block_modal.block": "Blokiraj server",
+  "domain_block_modal.block_account_instead": "Umesto toga, blokiraj @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Ljudi sa ovog servera mogu da imaju interakciju sa vašim starim objavama.",
+  "domain_block_modal.they_cant_follow": "Niko sa ovog servera ne može da vas prati.",
+  "domain_block_modal.they_wont_know": "Neće znati da su blokirani.",
+  "domain_block_modal.title": "Blokirati domen?",
+  "domain_block_modal.you_will_lose_followers": "Svi vaši pratioci sa ovog servera će biti uklonjeni.",
+  "domain_block_modal.you_wont_see_posts": "Nećete videti objave ili obaveštenja korisnika na ovom serveru.",
+  "domain_pill.activitypub_lets_connect": "Omogućuje vam da se povežete i komunicirate sa ljudima ne samo na Mastodon-u, već i u različitim društvenim aplikacijama.",
+  "domain_pill.activitypub_like_language": "ActivityPub je kao jezik kojim Mastodon govori sa drugim društvenim mrežama.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Njegov regulator:",
+  "domain_pill.their_server": "Njihov digitalni dom, gde žive sve njihove objave.",
+  "domain_pill.their_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
+  "domain_pill.username": "Korisničko ime",
+  "domain_pill.whats_in_a_handle": "Šta je regulator?",
+  "domain_pill.who_they_are": "Pošto regulatori govore ko je neko i gde se nalazi, možete da komunicirate sa ljudima širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
+  "domain_pill.who_you_are": "Pošto vaši regulatori govori ko ste i gde ste, ljudi mogu da komuniciraju sa vama širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
+  "domain_pill.your_handle": "Vaš regulator:",
+  "domain_pill.your_server": "Vaš digitalni dom, gde žive sve vaše objave. Ne sviđa vam se ovaj? Prenesite servere u bilo koje vreme i dovedite i svoje pratioce.",
+  "domain_pill.your_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
   "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
   "embed.preview": "Evo kako će to izgledati:",
   "emoji_button.activity": "Aktivnosti",
@@ -240,10 +262,11 @@
   "empty_column.follow_requests": "Još uvek nemate nijedan zahtev za praćenje. Kada primite zahtev, on će se pojaviti ovde.",
   "empty_column.followed_tags": "Još uvek niste zapratili nijednu heš oznaku. Kada to uradite, one će se pojaviti ovde.",
   "empty_column.hashtag": "Još uvek nema ničega u ovoj heš oznaci.",
-  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili. {suggestions}",
+  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili.",
   "empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
   "empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, ona će se pojaviti ovde.",
   "empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
+  "empty_column.notification_requests": "Sve je čisto! Ovde nema ničega. Kada dobijete nova obaveštenja, ona će se pojaviti ovde u skladu sa vašim podešavanjima.",
   "empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
   "empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
   "error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
   "filter_modal.select_filter.title": "Filtriraj ovu objavu",
   "filter_modal.title.status": "Filtriraj objavu",
+  "filtered_notifications_banner.mentions": "{count, plural, one {pominjanje} few {pominjanja} other {pominjanja}}",
+  "filtered_notifications_banner.pending_requests": "Obaveštenja od {count, plural, =0 {nikoga koga možda poznajete} one {# osobe koju možda poznajete} few {# osobe koje možda poznajete} other {# osoba koje možda poznajete}}",
+  "filtered_notifications_banner.title": "Filtrirana obaveštenja",
   "firehose.all": "Sve",
   "firehose.local": "Ovaj server",
   "firehose.remote": "Ostali serveri",
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
   "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
+  "follow_suggestions.curated_suggestion": "Izbor osoblja",
+  "follow_suggestions.dismiss": "Ne prikazuj ponovo",
+  "follow_suggestions.featured_longer": "Ručno odabrao tim {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Popularno među ljudima koje pratite",
+  "follow_suggestions.hints.featured": "Ovaj profil je ručno izabrao tim {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Ovaj profil je popularan među ljudima koje pratite.",
+  "follow_suggestions.hints.most_followed": "Ovaj profil je jedan od najpraćenijih na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Ovaj profil je nedavno dobio veliku pažnju na {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Ovaj profil je sličan profilima koje ste nedavno zapratili.",
+  "follow_suggestions.personalized_suggestion": "Personalizovani predlog",
+  "follow_suggestions.popular_suggestion": "Popularni predlog",
+  "follow_suggestions.popular_suggestion_longer": "Popularno na {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Slično profilima koje ste nedavno zapratili",
+  "follow_suggestions.view_all": "Prikaži sve",
+  "follow_suggestions.who_to_follow": "Koga pratiti",
   "followed_tags": "Praćene heš oznake",
   "footer.about": "Osnovni podaci",
   "footer.directory": "Direktorijum profila",
@@ -306,15 +347,10 @@
   "hashtag.follow": "Zaprati heš oznaku",
   "hashtag.unfollow": "Otprati heš oznaku",
   "hashtags.and_other": "…i {count, plural, one {još #} few {još #}other {još #}}",
-  "home.actions.go_to_explore": "Pogledate šta je u trendu",
-  "home.actions.go_to_suggestions": "Pronađete ljude koje biste pratili",
-  "home.column_settings.basic": "Osnovna",
   "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
-  "home.explore_prompt.body": "Vaša početna stranica će imati mešavinu objava od heš oznaka koje ste izabrali da pratite, ljudi koje ste izabrali da pratite i objava koje su podržali. Ako izgleda previše tiho, možda ćete želeti da:",
-  "home.explore_prompt.title": "Ovo je vaša matična baza u Mastodon-u.",
   "home.hide_announcements": "Sakrij najave",
-  "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
+  "home.pending_critical_update.body": "Ažurirajte svoj Mastodon server što je pre moguće!",
   "home.pending_critical_update.link": "Pogledajte ažuriranja",
   "home.pending_critical_update.title": "Dostupno je kritično bezbednosno ažuriranje!",
   "home.show_announcements": "Prijaži najave",
@@ -328,7 +364,7 @@
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
   "interaction_modal.sign_in": "Niste prijavljeni na ovaj server. Gde je hostovan vaš nalog?",
-  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
+  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
   "interaction_modal.title.follow": "Zaprati {name}",
   "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Učitavanje…",
   "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
-  "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakriti obaveštenja od ovog korisnika?",
-  "mute_modal.indefinite": "Neodređeno",
+  "mute_modal.hide_from_notifications": "Sakrij iz obaveštenja",
+  "mute_modal.hide_options": "Sakrij opcije",
+  "mute_modal.indefinite": "Dok ih ne uklonim iz ignorisanih",
+  "mute_modal.show_options": "Prikaži opcije",
+  "mute_modal.they_can_mention_and_follow": "Mogu da vas pominju i prate, ali ih nećete videti.",
+  "mute_modal.they_wont_know": "Neće znati da su ignorisani.",
+  "mute_modal.title": "Ignorisati korisnika?",
+  "mute_modal.you_wont_see_mentions": "Nećete videti objave koje ga pominju.",
+  "mute_modal.you_wont_see_posts": "I dalje može da vidi vaše objave, ali vi nećete videti njegove.",
   "navigation_bar.about": "Osnovni podaci",
   "navigation_bar.advanced_interface": "Otvori u naprednom veb okruženju",
   "navigation_bar.blocks": "Blokirani korisnici",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Privatna pominjanja",
   "navigation_bar.discover": "Otkrij",
   "navigation_bar.domain_blocks": "Blokirani domeni",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Omiljeno",
   "navigation_bar.filters": "Ignorisane reči",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} vas je zapratio",
   "notification.follow_request": "{name} je zatražio da vas prati",
   "notification.mention": "{name} vas je pomenuo",
+  "notification.moderation-warning.learn_more": "Saznajte više",
+  "notification.moderation_warning": "Dobili ste moderatorsko upozorenje",
+  "notification.moderation_warning.action_delete_statuses": "Neke od vaših objava su uklonjene.",
+  "notification.moderation_warning.action_disable": "Vaš nalog je onemogućen.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Neke od vaših objava su obeležene kao osetljive.",
+  "notification.moderation_warning.action_none": "Vaš nalog je dobio moderatorsko upozorenje.",
+  "notification.moderation_warning.action_sensitive": "Vaše objave će ubuduće biti označene kao osetljive.",
+  "notification.moderation_warning.action_silence": "Vaš nalog je ograničen.",
+  "notification.moderation_warning.action_suspend": "Vaš nalog je suspendovan.",
   "notification.own_poll": "Vaša anketa je završena",
   "notification.poll": "Završena je anketa u kojoj ste glasali",
   "notification.reblog": "{name} je podržao vašu objavu",
+  "notification.relationships_severance_event": "Izgubljena veza sa {name}",
+  "notification.relationships_severance_event.account_suspension": "Administrator sa {from} je suspendovao {target}, što znači da više ne možete da primate ažuriranja od njih niti da komunicirate sa njima.",
+  "notification.relationships_severance_event.domain_block": "Administrator sa {from} je blokirao {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
+  "notification.relationships_severance_event.learn_more": "Saznajte više",
+  "notification.relationships_severance_event.user_domain_block": "Blokirači ste {target}, uključujući vaše pratioce: {followersCount} i {followingCount, plural, one {# nalog} few {# naloga} other {# naloga}} koje pratite.",
   "notification.status": "{name} je upravo objavio",
   "notification.update": "{name} je uredio objavu",
+  "notification_requests.accept": "Prihvati",
+  "notification_requests.dismiss": "Odbaci",
+  "notification_requests.notifications_from": "Obaveštenja od {name}",
+  "notification_requests.title": "Filtrirana obaveštenja",
   "notifications.clear": "Obriši obaveštenja",
   "notifications.clear_confirmation": "Da li ste sigurni da želite trajno da obrišete sva vaša obaveštenja?",
   "notifications.column_settings.admin.report": "Nove prijave:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Omiljeno:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
   "notifications.column_settings.filter_bar.category": "Traka za brzo filtriranje",
-  "notifications.column_settings.filter_bar.show_bar": "Prikaži traku sa filterima",
   "notifications.column_settings.follow": "Novi pratioci:",
   "notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
   "notifications.column_settings.mention": "Pominjanja:",
@@ -471,19 +529,28 @@
   "notifications.permission_denied": "Obaveštenja na radnoj površini nisu dostupna zbog prethodno odbijenog zahteva za dozvolu pregledača",
   "notifications.permission_denied_alert": "Obaveštenja na radnoj površini ne mogu biti omogućena, jer je dozvola pregledača ranije bila odbijena",
   "notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
+  "notifications.policy.filter_new_accounts.hint": "Kreirano {days, plural, one {u poslednjeg # dana} few {u poslednja # dana} other {u poslednjih # dana}}",
+  "notifications.policy.filter_new_accounts_title": "Novi nalozi",
+  "notifications.policy.filter_not_followers_hint": "Uključujući ljude koji su vas pratili manje od {days, plural, one {# dana} few {# dana} other {# dana}}",
+  "notifications.policy.filter_not_followers_title": "Ljudi koji vas ne prate",
+  "notifications.policy.filter_not_following_hint": "Dok ih ručno ne odobrite",
+  "notifications.policy.filter_not_following_title": "Ljudi koje ne pratite",
+  "notifications.policy.filter_private_mentions_hint": "Filtrirano osim ako je odgovor na vaše pominjanje ili ako pratite pošiljaoca",
+  "notifications.policy.filter_private_mentions_title": "Neželjena privatna pominjanja",
+  "notifications.policy.title": "Filtriraj obaveštenja od…",
   "notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
   "notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
   "notifications_permission_banner.title": "Nikada ništa ne propustite",
   "onboarding.action.back": "Vrati me nazad",
   "onboarding.actions.back": "Vrati me nazad",
-  "onboarding.actions.go_to_explore": "Pogledaj šta je u trendu",
-  "onboarding.actions.go_to_home": "Idi na početnu stranicu",
+  "onboarding.actions.go_to_explore": "Odvedi me u trending",
+  "onboarding.actions.go_to_home": "Odvedi me na početnu stranicu",
   "onboarding.compose.template": "Zdravo #Mastodon!",
   "onboarding.follows.empty": "Nažalost, trenutno se ne mogu prikazati rezultati. Možete pokušati sa korišćenjem pretrage ili pregledanjem stranice za istraživanje da biste pronašli ljude koje ćete pratiti ili pokušajte ponovo kasnije.",
-  "onboarding.follows.lead": "Vi sami birate svoju početnu stranicu. Što više ljudi pratite, to će biti aktivnije i zanimljivije. Ovi profili mogu biti dobra polazna tačka—uvek možete da ih prestanete pratiti kasnije!",
+  "onboarding.follows.lead": "Vaša početna stranica je primarni način da doživite Mastodon. Što više ljudi budete pratili, to će biti aktivnije i zanimljivije. Da biste započeli, evo nekoliko predloga:",
   "onboarding.follows.title": "Personalizujte svoju početnu stranicu",
   "onboarding.profile.discoverable": "Neka se moj profil može otkriti drugima",
-  "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
+  "onboarding.profile.discoverable_hint": "Kada omogućite mogućnost otkrivanja na Mastodon-u, vaše objave se mogu pojaviti u rezultatima pretrage i u trendu, a vaš profil može biti predložen ljudima sa sličnim interesovanjima.",
   "onboarding.profile.display_name": "Ime za prikaz",
   "onboarding.profile.display_name_hint": "Vaše puno ime ili nadimak…",
   "onboarding.profile.lead": "Ovo možete uvek dovršiti kasnije u podešavanjima, gde je dostupno još više opcija prilagođavanja.",
@@ -497,17 +564,17 @@
   "onboarding.share.message": "Ja sam {username} na #Mastodon-u! Pratite me na {url}",
   "onboarding.share.next_steps": "Mogući sledeći koraci:",
   "onboarding.share.title": "Podelite svoj profil",
-  "onboarding.start.lead": "Vaš novi Mastodon nalog je spreman. Evo kako to možete iskoristiti na najbolji način:",
-  "onboarding.start.skip": "Želite da preskočite?",
+  "onboarding.start.lead": "Sada ste deo Mastodon-a, jedinstvene, decentralizovane platforme društvenih medija na kojoj vi – a ne algoritam – birate svoje iskustvo. Hajde da počnemo na ovoj novoj društvenoj granici:",
+  "onboarding.start.skip": "Ne treba vam pomoć za početak?",
   "onboarding.start.title": "Uspeli ste!",
-  "onboarding.steps.follow_people.body": "Vi sami birate svoju početnu stranicu. Hajde da ga ispunimo zanimljivim ljudima.",
+  "onboarding.steps.follow_people.body": "Praćenje zanimljivih ljudi je ono o čemu se radi u Mastodon-u.",
   "onboarding.steps.follow_people.title": "Personalizujte svoju početnu stranicu",
-  "onboarding.steps.publish_status.body": "Reci zdravo svetu.",
+  "onboarding.steps.publish_status.body": "Pozdravite svet tekstom, slikama, video snimcima ili anketama {emoji}",
   "onboarding.steps.publish_status.title": "Napišite svoju prvu objavu",
-  "onboarding.steps.setup_profile.body": "Veća je verovatnoća da će drugi komunicirati sa vama sa popunjenim profilom.",
-  "onboarding.steps.setup_profile.title": "Prilagodite svoj profil",
+  "onboarding.steps.setup_profile.body": "Pojačajte svoje interakcije tako što ćete imati sveobuhvatan profil.",
+  "onboarding.steps.setup_profile.title": "Personalizujte svoj profil",
   "onboarding.steps.share_profile.body": "Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u!",
-  "onboarding.steps.share_profile.title": "Podelite svoj profil",
+  "onboarding.steps.share_profile.title": "Podelite svoj Mastodon profil",
   "onboarding.tips.2fa": "<strong>Da li ste znali?</strong> Možete da zaštitite svoj nalog podešavanjem dvostruke potvrde identiteta u podešavanjima naloga. Radi sa bilo kojom TOTP aplikacijom po vašem izboru, nije potreban broj telefona!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Da li ste znali?</strong> Pošto je Mastodon decentralizovan, neki profili na koje naiđete biće smešteni na serverima različitim od vašeg. A ipak možete da komunicirate sa njima besprekorno! Njihov server je u drugoj polovini njihovog korisničkog imena!",
   "onboarding.tips.migration": "<strong>Da li ste znali?</strong> Ako smatrate da {domain} nije odličan izbor servera za vas u budućnosti, možete da pređete na drugi Mastodon server bez gubitka pratilaca. Možete čak i da hostujete sopstveni server!",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Promeni privatnost objave",
-  "privacy.direct.long": "Vidljivo samo pomenutim korisnicima",
-  "privacy.direct.short": "Samo pomenute osobe",
-  "privacy.private.long": "Vidljivo samo pratiocima",
-  "privacy.private.short": "Samo pratioci",
-  "privacy.public.long": "Vidljivo za sve",
+  "privacy.direct.long": "Svi pomenuti u objavi",
+  "privacy.direct.short": "Određeni ljudi",
+  "privacy.private.long": "Samo vaši pratioci",
+  "privacy.private.short": "Pratioci",
+  "privacy.public.long": "Bilo ko na Mastodon-u i van njega",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz funkcija otkrivanja",
-  "privacy.unlisted.short": "Neizlistano",
+  "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
+  "privacy.unlisted.long": "Manje algoritamskih fanfara",
+  "privacy.unlisted.short": "Tiha javnost",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "danas",
+  "reply_indicator.attachments": "{count, plural, one {# prilog} few {# priloga} other {# priloga}}",
   "reply_indicator.cancel": "Otkaži",
+  "reply_indicator.poll": "Anketa",
   "report.block": "Blokiraj",
   "report.block_explanation": "Nećete videti objave korisnika. Ni on neće videti Vaše objave niti će moći da Vas prati. Takođe će moći da sazna da je blokiran.",
   "report.categories.legal": "Pravni",
@@ -644,10 +714,11 @@
   "status.direct": "Privatno pomeni @{name}",
   "status.direct_indicator": "Privatno pominjanje",
   "status.edit": "Uredi",
-  "status.edited": "Uređeno {date}",
+  "status.edited": "Poslednje uređivanje {date}",
   "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
   "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
+  "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
   "status.filter": "Filtriraj ovu objavu",
   "status.filtered": "Filtrirano",
   "status.hide": "Sakrij objavu",
@@ -668,6 +739,7 @@
   "status.reblog": "Podrži",
   "status.reblog_private": "Podrži sa originalnom vidljivošću",
   "status.reblogged_by": "{name} je podržao/la",
+  "status.reblogs": "{count, plural, one {# podržavanje} few {# podržavanja} other {# podržavanja}}",
   "status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
   "status.redraft": "Izbriši i preoblikuj",
   "status.remove_bookmark": "Ukloni obeleživač",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Otpremanje datoteka nije dozvoljeno kod anketa.",
   "upload_form.audio_description": "Dodajte opis za osobe sa oštećenim sluhom",
   "upload_form.description": "Dodajte opis za osobe sa oštećenim vidom",
-  "upload_form.description_missing": "Nema dodatog opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promeni sličicu",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiziranje slike…",
   "upload_modal.apply": "Primeni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 85e7567bf4..9898a10a3e 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Најава",
   "attachments_list.unprocessed": "(необрађено)",
   "audio.hide": "Сакриј аудио",
-  "autosuggest_hashtag.per_week": "{count} недељно",
+  "block_modal.remote_users_caveat": "Замолићемо сервер {domain} да поштује вашу одлуку. Међутим, усклађеност није загарантована јер неки сервери могу другачије да обрађују блокове. Јавне објаве могу и даље бити видљиве корисницима који нису пријављени.",
+  "block_modal.show_less": "Прикажи мање",
+  "block_modal.show_more": "Прикажи више",
+  "block_modal.they_cant_mention": "Не могу да вас помињу или прате.",
+  "block_modal.they_cant_see_posts": "Не могу да виде ваше објаве, а ви нећете видети њихове.",
+  "block_modal.they_will_know": "Могу да виде да су блокирани.",
+  "block_modal.title": "Блокирати корисника?",
+  "block_modal.you_wont_see_mentions": "Нећете видети објаве које их помињу.",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "О чему размишљате?",
-  "compose_form.poll.add_option": "Додајте избор",
   "compose_form.poll.duration": "Трајање анкете",
-  "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Уклони овај избор",
+  "compose_form.poll.multiple": "Вишеструки избор",
+  "compose_form.poll.option_placeholder": "Опција {number}",
+  "compose_form.poll.single": "Одаберите једно",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
+  "compose_form.poll.type": "Стил",
   "compose_form.publish": "Објави",
   "compose_form.publish_form": "Нова објава",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сачувај промене",
-  "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+  "compose_form.reply": "Одговори",
+  "compose_form.save_changes": "Ажурирај",
   "compose_form.spoiler.marked": "Уклони упозорење о садржају",
   "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
-  "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+  "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
-  "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
-  "confirmations.block.message": "Да ли сте сигурни да желите да блокирате корисника {name}?",
   "confirmations.cancel_follow_request.confirm": "Повуци захтев",
   "confirmations.cancel_follow_request.message": "Да ли сте сигурни да желите да повучете захтев да пратите {name}?",
   "confirmations.delete.confirm": "Избриши",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Да ли сте сигурни да желите да трајно избришете ову листу?",
   "confirmations.discard_edit_media.confirm": "Одбаци",
   "confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
-  "confirmations.domain_block.confirm": "Блокирај цео домен",
+  "confirmations.domain_block.confirm": "Блокирај сервер",
   "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
   "confirmations.edit.confirm": "Уреди",
   "confirmations.edit.message": "Уређивањем ће се обрисати порука коју тренутно састављате. Да ли сте сигурни да желите да наставите?",
   "confirmations.logout.confirm": "Одјава",
   "confirmations.logout.message": "Да ли сте сигурни да желите да се одјавите?",
   "confirmations.mute.confirm": "Игнориши",
-  "confirmations.mute.explanation": "Ово ће сакрити објаве корисника и објаве које га помињу, али ће му и даље бити дозвољено да види Ваше објаве и да Вас прати.",
-  "confirmations.mute.message": "Да ли стварно желите да игноришете корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.reply.confirm": "Одговори",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ово су објаве широм друштвеног веба које данас постају све популарније. Новије објаве са више подржавања и омиљене су рангиране више.",
   "dismissable_banner.explore_tags": "Ово су хеш ознаке које данас постају све популарније на друштвеној мрежи. Хеш ознаке које користи више различитих људи су рангиране више.",
   "dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи са друштвеног веба које људи на {domain}-у прате.",
+  "domain_block_modal.block": "Блокирај сервер",
+  "domain_block_modal.block_account_instead": "Уместо тога, блокирај @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Људи са овог сервера могу да имају интеракцију са вашим старим објавама.",
+  "domain_block_modal.they_cant_follow": "Нико са овог сервера не може да вас прати.",
+  "domain_block_modal.they_wont_know": "Неће знати да су блокирани.",
+  "domain_block_modal.title": "Блокирати домен?",
+  "domain_block_modal.you_will_lose_followers": "Сви ваши пратиоци са овог сервера ће бити уклоњени.",
+  "domain_block_modal.you_wont_see_posts": "Нећете видети објаве или обавештења корисника на овом серверу.",
+  "domain_pill.activitypub_lets_connect": "Омогућује вам да се повежете и комуницирате са људима не само на Mastodon-у, већ и у различитим друштвеним апликацијама.",
+  "domain_pill.activitypub_like_language": "ActivityPub је као језик којим Mastodon говори са другим друштвеним мрежама.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Његов регулатор:",
+  "domain_pill.their_server": "Њихов дигитални дом, где живе све њихове објаве.",
+  "domain_pill.their_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
+  "domain_pill.username": "Корисничко име",
+  "domain_pill.whats_in_a_handle": "Шта је регулатор?",
+  "domain_pill.who_they_are": "Пошто регулатори говоре ко је неко и где се налази, можете да комуницирате са људима широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
+  "domain_pill.who_you_are": "Пошто ваши регулатори говори ко сте и где сте, људи могу да комуницирају са вама широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваш регулатор:",
+  "domain_pill.your_server": "Ваш дигитални дом, где живе све ваше објаве. Не свиђа вам се овај? Пренесите сервере у било које време и доведите и своје пратиоце.",
+  "domain_pill.your_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
   "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
   "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активности",
@@ -244,6 +266,7 @@
   "empty_column.list": "У овој листи још нема ничега. Када чланови ове листе објаве нешто ново, појавиће се овде.",
   "empty_column.lists": "Још увек немате ниједну листу. Када направите једну, она ће се појавити овде.",
   "empty_column.mutes": "Још увек не игноришете ниједног корисника.",
+  "empty_column.notification_requests": "Све је чисто! Овде нема ничега. Када добијете нова обавештења, она ће се појавити овде у складу са вашим подешавањима.",
   "empty_column.notifications": "Још увек немате никаква обавештења. Када други људи буду у интеракцији са вама, видећете то овде.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно или ручно пратите кориснике са других сервера да бисте ово попунили",
   "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Користите постојећу категорију или креирајте нову",
   "filter_modal.select_filter.title": "Филтрирај ову објаву",
   "filter_modal.title.status": "Филтрирај објаву",
+  "filtered_notifications_banner.mentions": "{count, plural, one {помињање} few {помињања} other {помињања}}",
+  "filtered_notifications_banner.pending_requests": "Обавештења од {count, plural, =0 {никога кога можда познајете} one {# особе коју можда познајете} few {# особе које можда познајете} other {# особа које можда познајете}}",
+  "filtered_notifications_banner.title": "Филтрирана обавештења",
   "firehose.all": "Све",
   "firehose.local": "Овај сервер",
   "firehose.remote": "Остали сервери",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
+  "follow_suggestions.curated_suggestion": "Избор особља",
+  "follow_suggestions.dismiss": "Не приказуј поново",
+  "follow_suggestions.featured_longer": "Ручно одабрао тим {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Популарно међу људима које пратите",
+  "follow_suggestions.hints.featured": "Овај профил је ручно изабрао тим {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Овај профил је популаран међу људима које пратите.",
+  "follow_suggestions.hints.most_followed": "Овај профил је један од најпраћенијих на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Овај профил је недавно добио велику пажњу на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Овај профил је сличан профилима које сте недавно запратили.",
+  "follow_suggestions.personalized_suggestion": "Персонализовани предлог",
+  "follow_suggestions.popular_suggestion": "Популарни предлог",
+  "follow_suggestions.popular_suggestion_longer": "Популарно на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Слично профилима које сте недавно запратили",
+  "follow_suggestions.view_all": "Прикажи све",
+  "follow_suggestions.who_to_follow": "Кога пратити",
   "followed_tags": "Праћене хеш ознаке",
   "footer.about": "Основни подаци",
   "footer.directory": "Директоријум профила",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Запрати хеш ознаку",
   "hashtag.unfollow": "Отпрати хеш ознаку",
   "hashtags.and_other": "…и {count, plural, one {још #} few {још #}other {још #}}",
-  "home.actions.go_to_explore": "Погледате шта је у тренду",
-  "home.actions.go_to_suggestions": "Пронађете људе које бисте пратили",
-  "home.column_settings.basic": "Основна",
   "home.column_settings.show_reblogs": "Прикажи подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
-  "home.explore_prompt.body": "Ваша почетна страница ће имати мешавину објава од хеш ознака које сте изабрали да пратите, људи које сте изабрали да пратите и објава које су подржали. Ако изгледа превише тихо, можда ћете желети да:",
-  "home.explore_prompt.title": "Ово је ваша матична база у Mastodon-у.",
   "home.hide_announcements": "Сакриј најаве",
   "home.pending_critical_update.body": "Ажурирајте свој Mastodon сервер што је пре могуће!",
   "home.pending_critical_update.link": "Погледајте ажурирања",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Учитавање…",
   "media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
   "moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
-  "mute_modal.duration": "Трајање",
-  "mute_modal.hide_notifications": "Сакрити обавештења од овог корисника?",
-  "mute_modal.indefinite": "Неодређено",
+  "mute_modal.hide_from_notifications": "Сакриј из обавештења",
+  "mute_modal.hide_options": "Сакриј опције",
+  "mute_modal.indefinite": "Док их не уклоним из игнорисаних",
+  "mute_modal.show_options": "Прикажи опције",
+  "mute_modal.they_can_mention_and_follow": "Могу да вас помињу и прате, али их нећете видети.",
+  "mute_modal.they_wont_know": "Неће знати да су игнорисани.",
+  "mute_modal.title": "Игнорисати корисника?",
+  "mute_modal.you_wont_see_mentions": "Нећете видети објаве које га помињу.",
+  "mute_modal.you_wont_see_posts": "И даље може да види ваше објаве, али ви нећете видети његове.",
   "navigation_bar.about": "Основни подаци",
   "navigation_bar.advanced_interface": "Отвори у напредном веб окружењу",
   "navigation_bar.blocks": "Блокирани корисници",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Приватна помињања",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Блокирани домени",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.explore": "Истражи",
   "navigation_bar.favourites": "Омиљено",
   "navigation_bar.filters": "Игнорисане речи",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} вас је запратио",
   "notification.follow_request": "{name} је затражио да вас прати",
   "notification.mention": "{name} вас је поменуо",
+  "notification.moderation-warning.learn_more": "Сазнајте више",
+  "notification.moderation_warning": "Добили сте модераторско упозорење",
+  "notification.moderation_warning.action_delete_statuses": "Неке од ваших објава су уклоњене.",
+  "notification.moderation_warning.action_disable": "Ваш налог је онемогућен.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Неке од ваших објава су обележене као осетљиве.",
+  "notification.moderation_warning.action_none": "Ваш налог је добио модераторско упозорење.",
+  "notification.moderation_warning.action_sensitive": "Ваше објаве ће убудуће бити означене као осетљиве.",
+  "notification.moderation_warning.action_silence": "Ваш налог је ограничен.",
+  "notification.moderation_warning.action_suspend": "Ваш налог је суспендован.",
   "notification.own_poll": "Ваша анкета је завршена",
   "notification.poll": "Завршена је анкета у којој сте гласали",
   "notification.reblog": "{name} је подржао вашу објаву",
+  "notification.relationships_severance_event": "Изгубљена веза са {name}",
+  "notification.relationships_severance_event.account_suspension": "Администратор са {from} је суспендовао {target}, што значи да више не можете да примате ажурирања од њих нити да комуницирате са њима.",
+  "notification.relationships_severance_event.domain_block": "Администратор са {from} је блокирао {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
+  "notification.relationships_severance_event.learn_more": "Сазнајте више",
+  "notification.relationships_severance_event.user_domain_block": "Блокирачи сте {target}, укључујући ваше пратиоце: {followersCount} и {followingCount, plural, one {# налог} few {# налогa} other {# налога}} које пратите.",
   "notification.status": "{name} је управо објавио",
   "notification.update": "{name} је уредио објаву",
+  "notification_requests.accept": "Прихвати",
+  "notification_requests.dismiss": "Одбаци",
+  "notification_requests.notifications_from": "Обавештења од {name}",
+  "notification_requests.title": "Филтрирана обавештења",
   "notifications.clear": "Обриши обавештења",
   "notifications.clear_confirmation": "Да ли сте сигурни да желите трајно да обришете сва ваша обавештења?",
   "notifications.column_settings.admin.report": "Нове пријаве:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Омиљено:",
   "notifications.column_settings.filter_bar.advanced": "Прикажи све категорије",
   "notifications.column_settings.filter_bar.category": "Трака за брзо филтрирање",
-  "notifications.column_settings.filter_bar.show_bar": "Прикажи траку са филтерима",
   "notifications.column_settings.follow": "Нови пратиоци:",
   "notifications.column_settings.follow_request": "Нови захтеви за праћење:",
   "notifications.column_settings.mention": "Помињања:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Обавештења на радној површини нису доступна због претходно одбијеног захтева за дозволу прегледача",
   "notifications.permission_denied_alert": "Обавештења на радној површини не могу бити омогућена, јер је дозвола прегледача раније била одбијена",
   "notifications.permission_required": "Обавештења на радној површини нису доступна јер потребна дозвола није додељена.",
+  "notifications.policy.filter_new_accounts.hint": "Креирано {days, plural, one {у последњег # дана} few {у последња # дана} other {у последњих # дана}}",
+  "notifications.policy.filter_new_accounts_title": "Нови налози",
+  "notifications.policy.filter_not_followers_hint": "Укључујући људе који су вас пратили мање од {days, plural, one {# дана} few {# дана} other {# дана}}",
+  "notifications.policy.filter_not_followers_title": "Људи који вас не прате",
+  "notifications.policy.filter_not_following_hint": "Док их ручно не одобрите",
+  "notifications.policy.filter_not_following_title": "Људи које не пратите",
+  "notifications.policy.filter_private_mentions_hint": "Филтрирано осим ако је одговор на ваше помињање или ако пратите пошиљаоца",
+  "notifications.policy.filter_private_mentions_title": "Нежељена приватна помињања",
+  "notifications.policy.title": "Филтрирај обавештења од…",
   "notifications_permission_banner.enable": "Омогућити обавештења на радној површини",
   "notifications_permission_banner.how_to_control": "Да бисте примали обавештења када Mastodon није отворен, омогућите обавештења на радној површини. Kада су обавештења на радној површини омогућена врсте интеракција које она генеришу могу се подешавати помоћу дугмета {icon}.",
   "notifications_permission_banner.title": "Никада ништа не пропустите",
@@ -505,7 +572,7 @@
   "onboarding.steps.publish_status.body": "Поздравите свет текстом, сликама, видео снимцима или анкетама {emoji}",
   "onboarding.steps.publish_status.title": "Напишите своју прву објаву",
   "onboarding.steps.setup_profile.body": "Појачајте своје интеракције тако што ћете имати свеобухватан профил.",
-  "onboarding.steps.setup_profile.title": "Персонализујтее свој профил",
+  "onboarding.steps.setup_profile.title": "Персонализујте свој профил",
   "onboarding.steps.share_profile.body": "Нека ваши пријатељи знају како да вас пронађу на Mastodon-у!",
   "onboarding.steps.share_profile.title": "Поделите свој Mastodon профил",
   "onboarding.tips.2fa": "<strong>Да ли сте знали?</strong> Можете да заштитите свој налог подешавањем двоструке потврде идентитета у подешавањима налога. Ради са било којом TOTP апликацијом по вашем избору, није потребан број телефона!",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Додај анкету",
   "poll_button.remove_poll": "Уклони анкету",
   "privacy.change": "Промени приватност објаве",
-  "privacy.direct.long": "Видљиво само поменутим корисницима",
-  "privacy.direct.short": "Само поменуте особе",
-  "privacy.private.long": "Видљиво само пратиоцима",
-  "privacy.private.short": "Само пратиоци",
-  "privacy.public.long": "Видљиво за све",
+  "privacy.direct.long": "Сви поменути у објави",
+  "privacy.direct.short": "Одређени људи",
+  "privacy.private.long": "Само ваши пратиоци",
+  "privacy.private.short": "Пратиоци",
+  "privacy.public.long": "Било ко на Mastodon-у и ван њега",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Видљиво свима, али искључено из функција откривања",
-  "privacy.unlisted.short": "Неизлистано",
+  "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
+  "privacy.unlisted.long": "Мање алгоритамских фанфара",
+  "privacy.unlisted.short": "Тиха јавност",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
   "recommended": "Препоручено",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} мин.",
   "relative_time.seconds": "{number} сек.",
   "relative_time.today": "данас",
+  "reply_indicator.attachments": "{count, plural, one {# прилог} few {# прилога} other {# прилога}}",
   "reply_indicator.cancel": "Откажи",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокирај",
   "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети Ваше објаве нити ће моћи да Вас прати. Такође ће моћи да сазна да је блокиран.",
   "report.categories.legal": "Правни",
@@ -644,10 +714,11 @@
   "status.direct": "Приватно помени @{name}",
   "status.direct_indicator": "Приватно помињање",
   "status.edit": "Уреди",
-  "status.edited": "Уређено {date}",
+  "status.edited": "Последње уређивање {date}",
   "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
   "status.embed": "Угради",
   "status.favourite": "Омиљено",
+  "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
   "status.filter": "Филтрирај ову објаву",
   "status.filtered": "Филтрирано",
   "status.hide": "Сакриј објаву",
@@ -668,6 +739,7 @@
   "status.reblog": "Подржи",
   "status.reblog_private": "Подржи са оригиналном видљивошћу",
   "status.reblogged_by": "{name} је подржао/ла",
+  "status.reblogs": "{count, plural, one {# подржавање} few {# подржавања} other {# подржавања}}",
   "status.reblogs.empty": "Још увек нико није подржао ову објаву. Када буде подржана, појавиће се овде.",
   "status.redraft": "Избриши и преобликуј",
   "status.remove_bookmark": "Уклони обележивач",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
   "upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
   "upload_form.description": "Додајте опис за особе са оштећеним видом",
-  "upload_form.description_missing": "Нема додатог описа",
   "upload_form.edit": "Уреди",
   "upload_form.thumbnail": "Промени сличицу",
-  "upload_form.undo": "Избриши",
   "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
   "upload_modal.analyzing_picture": "Анализирање слике…",
   "upload_modal.apply": "Примени",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d3ca776bd9..ba3a6b2f51 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
-  "autosuggest_hashtag.per_week": "{count} per vecka",
+  "block_modal.remote_users_caveat": "Vi kommer att be servern {domain} att respektera ditt beslut. Dock garanteras inte efterlevnad eftersom vissa servrar kan hantera blockeringar på olika sätt. Offentliga inlägg kan fortfarande vara synliga för icke-inloggade användare.",
+  "block_modal.show_less": "Visa mindre",
+  "block_modal.show_more": "Visa mer",
+  "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.",
+  "block_modal.they_cant_see_posts": "De kan inte se dina inlägg och du kan inte se deras.",
+  "block_modal.they_will_know": "De kan se att de är blockerade.",
+  "block_modal.title": "Blockera användare?",
+  "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
-  "compose_form.poll.add_option": "Lägg till ett val",
   "compose_form.poll.duration": "Varaktighet för omröstning",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Ta bort detta val",
+  "compose_form.poll.multiple": "Flera val",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
+  "compose_form.poll.single": "Välj en",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Publicera",
   "compose_form.publish_form": "Publicera",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spara ändringar",
-  "compose_form.sensitive.hide": "Markera media som känsligt",
-  "compose_form.sensitive.marked": "Media har markerats som känsligt",
-  "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppdatera",
   "compose_form.spoiler.marked": "Texten är dold bakom en varning",
   "compose_form.spoiler.unmarked": "Texten är inte dold",
-  "compose_form.spoiler_placeholder": "Skriv din varning här",
+  "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
-  "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
-  "confirmations.block.message": "Är du säker på att du vill blockera {name}?",
   "confirmations.cancel_follow_request.confirm": "Återkalla förfrågan",
   "confirmations.cancel_follow_request.message": "Är du säker på att du vill återkalla din begäran om att följa {name}?",
   "confirmations.delete.confirm": "Radera",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
-  "confirmations.domain_block.confirm": "Dölj hela domänen",
+  "confirmations.domain_block.confirm": "Blockera server",
   "confirmations.domain_block.message": "Är du verkligen, verkligen säker på att du vill blockera hela {domain}? I de flesta fall är några riktade blockeringar eller nedtystade konton tillräckligt och att föredra. Du kommer inte se innehåll från den domänen i den allmänna tidslinjen eller i dina aviseringar. Dina följare från den domänen komer att tas bort.",
   "confirmations.edit.confirm": "Redigera",
   "confirmations.edit.message": "Om du svarar nu kommer det att ersätta meddelandet du håller på att skapa. Är du säker på att du vill fortsätta?",
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
   "confirmations.mute.confirm": "Tysta",
-  "confirmations.mute.explanation": "Detta kommer dölja inlägg från hen och inlägg som nämner hen, men hen tillåts fortfarande se dina inlägg och följa dig.",
-  "confirmations.mute.message": "Är du säker på att du vill tysta {name}?",
   "confirmations.redraft.confirm": "Radera & gör om",
   "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
   "confirmations.reply.confirm": "Svara",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Dessa inlägg, från denna och andra servrar i det decentraliserade nätverket, pratas det om just nu på denna server.",
   "dismissable_banner.explore_tags": "Dessa hashtaggar pratas det om just nu bland folk på denna och andra servrar i det decentraliserade nätverket.",
   "dismissable_banner.public_timeline": "De här är de aktuella publika inlägg från personer på det sociala nätet som personer i {domain} följer.",
+  "domain_block_modal.block": "Blockera server",
+  "domain_block_modal.block_account_instead": "Blockera @{name} istället",
+  "domain_block_modal.they_can_interact_with_old_posts": "Personer från denna server kan interagera med dina gamla inlägg.",
+  "domain_block_modal.they_cant_follow": "Ingen från denna server kan följa dig.",
+  "domain_block_modal.they_wont_know": "De kommer inte veta att de har blockerats.",
+  "domain_block_modal.title": "Blockera domän?",
+  "domain_block_modal.you_will_lose_followers": "Alla dina följare från denna server kommer att tas bort.",
+  "domain_block_modal.you_wont_see_posts": "Du kommer inte att se inlägg eller meddelanden från användare på den här servern.",
+  "domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
+  "domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Deras handtag:",
+  "domain_pill.their_server": "Deras digitala hem, där alla deras tjänster bor.",
+  "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
+  "domain_pill.username": "Användarnamn",
+  "domain_pill.whats_in_a_handle": "Vad finns i ett handtag?",
+  "domain_pill.who_they_are": "Eftersom handtag säger vem någon är och var de är, kan du interagera med människor på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
+  "domain_pill.who_you_are": "Eftersom handtag säger vem någon är och var de är, kan människor interagera med dig på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
+  "domain_pill.your_handle": "Ditt handtag:",
+  "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
+  "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "embed.instructions": "Bädda in detta inlägg på din webbplats genom att kopiera koden nedan.",
   "embed.preview": "Så här kommer det att se ut:",
   "emoji_button.activity": "Aktivitet",
@@ -244,6 +266,7 @@
   "empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
   "empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
   "empty_column.mutes": "Du har ännu inte tystat några användare.",
+  "empty_column.notification_requests": "Allt klart! Det finns inget mer här. När du får nya meddelanden visas de här enligt dina inställningar.",
   "empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
   "empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
   "error.unexpected_crash.explanation": "På grund av en bugg i vår kod eller kompatiblitetsproblem i webbläsaren kan den här sidan inte visas korrekt.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filtered_notifications_banner.mentions": "{count, plural, one {omnämning} other {omnämnanden}}",
+  "filtered_notifications_banner.pending_requests": "Aviseringar från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
+  "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
   "firehose.local": "Denna server",
   "firehose.remote": "Andra servrar",
   "follow_request.authorize": "Godkänn",
   "follow_request.reject": "Avvisa",
-  "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain} personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "follow_requests.unlocked_explanation": "Även om ditt konto inte är låst tror {domain}-personalen att du kanske vill granska dessa följares förfrågningar manuellt.",
+  "follow_suggestions.curated_suggestion": "Utvald av personalen",
+  "follow_suggestions.dismiss": "Visa inte igen",
+  "follow_suggestions.featured_longer": "Handplockad av {domain}-teamet",
+  "follow_suggestions.friends_of_friends_longer": "Populärt bland personer du följer",
+  "follow_suggestions.hints.featured": "Denna profil är handplockad av {domain}-teamet.",
+  "follow_suggestions.hints.friends_of_friends": "Denna profil är populär bland de personer du följer.",
+  "follow_suggestions.hints.most_followed": "Denna profil är en av de mest följda på {domain}.",
+  "follow_suggestions.hints.most_interactions": "Denna profil har nyligen fått mycket uppmärksamhet på {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Denna profil liknar de profiler som du nyligen har följt.",
+  "follow_suggestions.personalized_suggestion": "Personligt förslag",
+  "follow_suggestions.popular_suggestion": "Populärt förslag",
+  "follow_suggestions.popular_suggestion_longer": "Populärt på {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Liknar profiler du nyligen följde",
+  "follow_suggestions.view_all": "Visa alla",
+  "follow_suggestions.who_to_follow": "Rekommenderade profiler",
   "followed_tags": "Följda hashtags",
   "footer.about": "Om",
   "footer.directory": "Profilkatalog",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Följ hashtagg",
   "hashtag.unfollow": "Avfölj hashtagg",
   "hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
-  "home.actions.go_to_explore": "Se vad som trendar",
-  "home.actions.go_to_suggestions": "Hitta personer att följa",
-  "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
-  "home.explore_prompt.body": "Din hemflöde kommer att ha en blandning av inlägg från taggar du har valt att följa, de människor som du har valt att följa och de inlägg som de boostar. Om det känns för tyst kanske du vill:",
-  "home.explore_prompt.title": "Detta är din hembas inom Mastodon.",
   "home.hide_announcements": "Dölj notiser",
   "home.pending_critical_update.body": "Uppdatera din Mastodon-server så snart som möjligt!",
   "home.pending_critical_update.link": "Se uppdateringar",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Laddar…",
   "media_gallery.toggle_visible": "Växla synlighet",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
-  "mute_modal.duration": "Varaktighet",
-  "mute_modal.hide_notifications": "Dölj aviseringar från denna användare?",
-  "mute_modal.indefinite": "Obestämt",
+  "mute_modal.hide_from_notifications": "Dölj från aviseringslistan",
+  "mute_modal.hide_options": "Dölj alternativ",
+  "mute_modal.indefinite": "Tills jag avtystar dem",
+  "mute_modal.show_options": "Visa alternativ",
+  "mute_modal.they_can_mention_and_follow": "De kan nämna och följa dig, men du ser dem inte.",
+  "mute_modal.they_wont_know": "De vet inte att de har blivit tysta.",
+  "mute_modal.title": "Tysta användare?",
+  "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
+  "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
   "navigation_bar.blocks": "Blockerade användare",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Privata nämningar",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
-  "navigation_bar.edit_profile": "Redigera profil",
   "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.mention": "{name} nämnde dig",
+  "notification.moderation-warning.learn_more": "Läs mer",
+  "notification.moderation_warning": "Du har fått en moderationsvarning",
+  "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
+  "notification.moderation_warning.action_disable": "Ditt konto har inaktiverats.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Några av dina inlägg har markerats som känsliga.",
+  "notification.moderation_warning.action_none": "Ditt konto har mottagit en modereringsvarning.",
+  "notification.moderation_warning.action_sensitive": "Dina inlägg kommer markeras som känsliga från och med nu.",
+  "notification.moderation_warning.action_silence": "Ditt konto har begränsats.",
+  "notification.moderation_warning.action_suspend": "Ditt konto har stängts av.",
   "notification.own_poll": "Din röstning har avslutats",
   "notification.poll": "En omröstning du röstat i har avslutats",
   "notification.reblog": "{name} boostade ditt inlägg",
+  "notification.relationships_severance_event": "Förlorade kontakter med {name}",
+  "notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
+  "notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
+  "notification.relationships_severance_event.learn_more": "Läs mer",
+  "notification.relationships_severance_event.user_domain_block": "Du har blockerat {target} och tar därmed bort {followersCount} av dina följare samt {followingCount, plural, one {# konto} other {# konton}} du följer.",
   "notification.status": "{name} publicerade just ett inlägg",
   "notification.update": "{name} redigerade ett inlägg",
+  "notification_requests.accept": "Godkänn",
+  "notification_requests.dismiss": "Avfärda",
+  "notification_requests.notifications_from": "Aviseringar från {name}",
+  "notification_requests.title": "Filtrerade meddelanden",
   "notifications.clear": "Rensa aviseringar",
   "notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
   "notifications.column_settings.admin.report": "Nya rapporter:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
-  "notifications.column_settings.filter_bar.show_bar": "Visa filterfält",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
   "notifications.column_settings.mention": "Omnämningar:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Skrivbordsaviseringar är otillgängliga på grund av tidigare nekade förfrågningar om behörighet i webbläsaren",
   "notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
   "notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
+  "notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
+  "notifications.policy.filter_new_accounts_title": "Nya konton",
+  "notifications.policy.filter_not_followers_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
+  "notifications.policy.filter_not_followers_title": "Personer som inte följer dig",
+  "notifications.policy.filter_not_following_hint": "Tills du manuellt godkänner dem",
+  "notifications.policy.filter_not_following_title": "Personer du inte följer",
+  "notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
+  "notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
+  "notifications.policy.title": "Filtrera ut aviseringar från…",
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
@@ -490,7 +557,9 @@
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "Du kan @nämna andra personer eller #hashtags…",
   "onboarding.profile.save_and_continue": "Spara och fortsätt",
+  "onboarding.profile.title": "Konfiguration av profil",
   "onboarding.profile.upload_avatar": "Ladda upp profilbild",
+  "onboarding.profile.upload_header": "Ladda upp profilbanner",
   "onboarding.share.lead": "Låt folk veta hur de kan hitta dig på Mastodon!",
   "onboarding.share.message": "Jag är {username} på #Mastodon! Följ mig på {url}",
   "onboarding.share.next_steps": "Möjliga nästa steg:",
@@ -524,14 +593,15 @@
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
-  "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Endast omnämnda personer",
-  "privacy.private.long": "Endast synligt för följare",
-  "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Synlig för alla",
-  "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
-  "privacy.unlisted.short": "Olistad",
+  "privacy.direct.long": "Alla som nämns i inlägget",
+  "privacy.direct.short": "Särskilda personer",
+  "privacy.private.long": "Endast dina följare",
+  "privacy.private.short": "Följare",
+  "privacy.public.long": "Alla på och utanför Mastodon",
+  "privacy.public.short": "Offentlig",
+  "privacy.unlisted.additional": "Detta fungerar precis som offentlig, förutom att inlägget inte visas i liveflöden eller hashtaggar, utforska eller Mastodon-sökning, även om du har valt detta för hela kontot.",
+  "privacy.unlisted.long": "Mindre beaktat av algoritmen",
+  "privacy.unlisted.short": "Offentlig (begränsad)",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
@@ -549,7 +619,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
+  "reply_indicator.attachments": "{count, plural, one {# bilaga} other {# bilagor}}",
   "reply_indicator.cancel": "Ångra",
+  "reply_indicator.poll": "Omröstning",
   "report.block": "Blockera",
   "report.block_explanation": "Du kommer inte se hens inlägg. Hen kommer inte kunna se dina inlägg eller följa dig. Hen kommer kunna se att hen är blockerad.",
   "report.categories.legal": "Juridisk",
@@ -642,10 +714,11 @@
   "status.direct": "Nämn @{name} privat",
   "status.direct_indicator": "Privat nämning",
   "status.edit": "Redigera",
-  "status.edited": "Ändrad {date}",
+  "status.edited": "Senast ändrad {date}",
   "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
   "status.embed": "Bädda in",
   "status.favourite": "Favoritmarkera",
+  "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
   "status.filter": "Filtrera detta inlägg",
   "status.filtered": "Filtrerat",
   "status.hide": "Dölj inlägg",
@@ -666,6 +739,7 @@
   "status.reblog": "Boosta",
   "status.reblog_private": "Boosta med ursprunglig synlighet",
   "status.reblogged_by": "{name} boostade",
+  "status.reblogs": "{count, plural, one {# röst} other {# röster}}",
   "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
   "status.redraft": "Radera & gör om",
   "status.remove_bookmark": "Ta bort bokmärke",
@@ -713,10 +787,8 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
-  "upload_form.description_missing": "Beskrivning saknas",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
-  "upload_form.undo": "Radera",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
   "upload_modal.analyzing_picture": "Analyserar bild…",
   "upload_modal.apply": "Verkställ",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index abbdf9b7da..43cfc78d5b 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -34,7 +34,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -93,8 +92,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 5290e13ff4..ac0984293a 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -66,7 +66,6 @@
   "announcement.announcement": "அறிவிப்பு",
   "attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
   "audio.hide": "ஆடியோவை மறை",
-  "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
   "bundle_column_error.error.title": "அடடே!",
   "bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
@@ -120,39 +119,24 @@
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
   "compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
   "compose_form.placeholder": "உங்கள் மனதில் என்ன இருக்கிறது?",
-  "compose_form.poll.add_option": "தேர்வை சேர்",
   "compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு",
-  "compose_form.poll.option_placeholder": "தேர்வு எண் {number}",
-  "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
   "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
   "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
-  "compose_form.publish": "வெளியிடு",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "மாற்றங்களை சேமி",
-  "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
-  "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
-  "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
   "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
   "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
-  "compose_form.spoiler_placeholder": "உங்கள் எச்சரிக்கையை இங்கு எழுதவும்",
   "confirmation_modal.cancel": "ரத்து",
-  "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
-  "confirmations.block.message": "{name}-ஐ நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா?",
   "confirmations.delete.confirm": "நீக்கு",
   "confirmations.delete.message": "இப்பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
   "confirmations.delete_list.confirm": "நீக்கு",
   "confirmations.delete_list.message": "இப்பட்டியலை நிரந்தரமாக நீக்க நிச்சயம் விரும்புகிறீர்களா?",
   "confirmations.discard_edit_media.confirm": "நிராகரி",
   "confirmations.discard_edit_media.message": "சேமிக்கப்படாத மாற்றங்கள் ஊடக விளக்கம் அல்லது முன்னோட்டத்தில் உள்ளது. அவற்றை நிராகரிக்கவா?",
-  "confirmations.domain_block.confirm": "முழு களத்தையும் மறை",
   "confirmations.domain_block.message": "நீங்கள் முழு {domain} களத்தையும் நிச்சயமாக, நிச்சயமாகத் தடுக்க விரும்புகிறீர்களா? பெரும்பாலும் சில குறிப்பிட்ட பயனர்களைத் தடுப்பதே போதுமானது. முழு களத்தையும் தடுத்தால், அதிலிருந்து வரும் எந்தப் பதிவையும் உங்களால் காண முடியாது, மேலும் அப்பதிவுகள் குறித்த அறிவிப்புகளும் உங்களுக்கு வராது. அந்தக் களத்தில் இருக்கும் பின்தொடர்பவர்கள் உங்கள் பக்கத்திலிருந்து நீக்கப்படுவார்கள்.",
   "confirmations.logout.confirm": "வெளியேறு",
   "confirmations.logout.message": "நிச்சயமாக நீங்கள் வெளியேற விரும்புகிறீர்களா?",
   "confirmations.mute.confirm": "அமைதியாக்கு",
-  "confirmations.mute.explanation": "இந்தத் தேர்வு அவர்களின் பதிவுகளையும், அவர்களைக் குறிப்பிடும் பதிவுகளையும் மறைத்துவிடும். ஆனால், அவர்களால் உங்களைப் பின்தொடர்ந்து உங்கள் பதிவுகளைக் காண முடியும்.",
-  "confirmations.mute.message": "{name}-ஐ நிச்சயமாக நீங்கள் அமைதியாக்க விரும்புகிறீர்களா?",
   "confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்",
   "confirmations.reply.confirm": "மறுமொழி",
   "confirmations.reply.message": "ஏற்கனவே ஒரு பதிவு எழுதப்பட்டுக்கொண்டிருக்கிறது. இப்பொழுது பதில் எழுத முனைந்தால் அது அழிக்கப்படும். பரவாயில்லையா?",
@@ -222,7 +206,6 @@
   "hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
   "hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
   "hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
-  "home.column_settings.basic": "அடிப்படையானவை",
   "home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
   "home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
   "home.hide_announcements": "அறிவிப்புகளை மறை",
@@ -276,14 +259,12 @@
   "lists.subheading": "உங்கள் பட்டியல்கள்",
   "load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
   "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
-  "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
-  "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
   "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
@@ -305,8 +286,6 @@
   "notifications.clear": "அறிவிப்புகளை அழிக்கவும்",
   "notifications.clear_confirmation": "உங்கள் எல்லா அறிவிப்புகளையும் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?",
   "notifications.column_settings.alert": "டெஸ்க்டாப் அறிவிப்புகள்",
-  "notifications.column_settings.filter_bar.advanced": "எல்லா வகைகளையும் காட்டு",
-  "notifications.column_settings.filter_bar.category": "விரைவு வடிகட்டி பட்டை",
   "notifications.column_settings.follow": "புதிய பின்பற்றுபவர்கள்:",
   "notifications.column_settings.follow_request": "புதிய பின்தொடர் கோரிக்கைகள்:",
   "notifications.column_settings.mention": "குறிப்பிடுகிறது:",
@@ -344,12 +323,7 @@
   "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
   "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
   "privacy.change": "நிலை தனியுரிமை",
-  "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "பொது",
-  "privacy.unlisted.short": "பட்டியலிடப்படாத",
   "refresh": "புதுப்பி",
   "regeneration_indicator.label": "சுமையேற்றம்…",
   "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
@@ -432,7 +406,6 @@
   "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
   "upload_form.edit": "தொகு",
   "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
-  "upload_form.undo": "நீக்கு",
   "upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
   "upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
   "upload_modal.apply": "உபயோகி",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 7c1956d95b..825cfb93bd 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -2,25 +2,24 @@
   "about.blocks": "Siū kuán-tsè ê su-hāu-khì",
   "about.contact": "Liân-lo̍k:",
   "about.disclaimer": "Ling-khí-tshiūnn sī tsi̍t-ê khai-guân nńg-thé，i ê siong-phiau sī Mastodon gGmbH.",
-  "account.badges.bot": "Bot",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.badges.bot": "Tsū-tōng-ê",
+  "account.cancel_follow_request": "Mài-koh tui-tsong",
   "account.media": "Mûi-thé",
   "account.mention": "Thê-khí @{name}",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account_note.placeholder": "Click to add a note",
-  "column.pins": "Pinned toot",
-  "community.column_settings.media_only": "Media only",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish_form": "Publish",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "account.posts": "Huah-siann",
+  "account.posts_with_replies": "Huah-siann kah huê-ìng",
+  "account.requested": "Tán-thāi phue-tsún",
+  "account.statuses_counter": "{count, plural, one {{counter} Huah-siann} other {{counter} Huah-siann}}",
+  "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
+  "column.pins": "Tah thâu-tsîng ê huah-siann",
+  "community.column_settings.media_only": "Kan-na muî-thé",
+  "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.",
+  "compose_form.hashtag_warning": "Tsit-ê huah-siann in-uī m̄-sī kong-khai ê, sóo-í buē tī jīm-hô tsú-tê piau-tshiam hián-sī. Kan-na kong-khai ê huah-siann ē-tàng hōo tsú-tê piau-tshiam tshâ-tshuē.",
+  "compose_form.placeholder": "Lí teh siūnn siánn?",
+  "compose_form.publish_form": "Huah--tshut-khì",
+  "compose_form.spoiler.marked": "Î-tû luē-iông kíng-kò",
+  "compose_form.spoiler.unmarked": "Tsing-ka luē-iông kíng-kò",
+  "confirmations.delete.message": "Lí kám bueh thâi-tiāu tsi̍t-ē huah-siann?",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -46,7 +45,7 @@
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.open_media": "Khui muî-thé",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
@@ -79,8 +78,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3c231871fa..284102c381 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -64,27 +64,18 @@
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
   "compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
-  "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
   "compose_form.poll.duration": "ఎన్నిక వ్యవధి",
-  "compose_form.poll.option_placeholder": "ఎంపిక {number}",
-  "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
-  "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
   "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
   "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
-  "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
   "confirmation_modal.cancel": "రద్దు చెయ్యి",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
-  "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
   "confirmations.delete.confirm": "తొలగించు",
   "confirmations.delete.message": "మీరు ఖచ్చితంగా ఈ స్టేటస్ ని తొలగించాలనుకుంటున్నారా?",
   "confirmations.delete_list.confirm": "తొలగించు",
   "confirmations.delete_list.message": "మీరు ఖచ్చితంగా ఈ జాబితాను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
-  "confirmations.domain_block.confirm": "మొత్తం డొమైన్ను దాచు",
   "confirmations.domain_block.message": "మీరు నిజంగా నిజంగా మొత్తం {domain} ని బ్లాక్ చేయాలనుకుంటున్నారా? చాలా సందర్భాలలో కొన్ని లక్ష్యంగా ఉన్న బ్లాక్స్ లేదా మ్యూట్స్ సరిపోతాయి మరియు ఉత్తమమైనవి. మీరు ఆ డొమైన్ నుండి కంటెంట్ను ఏ ప్రజా కాలక్రమాలలో లేదా మీ నోటిఫికేషన్లలో చూడలేరు. ఆ డొమైన్ నుండి మీ అనుచరులు తీసివేయబడతారు.",
   "confirmations.mute.confirm": "మ్యూట్ చేయి",
-  "confirmations.mute.message": "{name}ను మీరు ఖచ్చితంగా మ్యూట్ చేయాలనుకుంటున్నారా?",
   "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
   "confirmations.reply.confirm": "ప్రత్యుత్తరమివ్వు",
   "confirmations.reply.message": "ఇప్పుడే ప్రత్యుత్తరం ఇస్తే మీరు ప్రస్తుతం వ్రాస్తున్న సందేశం తిరగరాయబడుతుంది. మీరు ఖచ్చితంగా కొనసాగించాలనుకుంటున్నారా?",
@@ -133,7 +124,6 @@
   "hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
   "hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
   "hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
-  "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
   "keyboard_shortcuts.back": "వెనక్కి తిరిగి వెళ్ళడానికి",
@@ -180,13 +170,11 @@
   "lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
   "lists.subheading": "మీ జాబితాలు",
   "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
-  "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
-  "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.lists": "జాబితాలు",
@@ -205,8 +193,6 @@
   "notifications.clear": "ప్రకటనలను తుడిచివేయు",
   "notifications.clear_confirmation": "మీరు మీ అన్ని నోటిఫికేషన్లను శాశ్వతంగా తొలగించాలనుకుంటున్నారా?",
   "notifications.column_settings.alert": "డెస్క్టాప్ నోటిఫికేషన్లు",
-  "notifications.column_settings.filter_bar.advanced": "అన్ని విభాగాలను చూపించు",
-  "notifications.column_settings.filter_bar.category": "క్విక్ ఫిల్టర్ బార్",
   "notifications.column_settings.follow": "క్రొత్త అనుచరులు:",
   "notifications.column_settings.mention": "ప్రస్తావనలు:",
   "notifications.column_settings.poll": "ఎన్నిక ఫలితాలు:",
@@ -240,12 +226,7 @@
   "poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
-  "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ప్రజా",
-  "privacy.unlisted.short": "జాబితా చేయబడనిది",
   "regeneration_indicator.label": "లోడ్ అవుతోంది…",
   "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.just_now": "ఇప్పుడు",
@@ -308,7 +289,6 @@
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
-  "upload_form.undo": "తొలగించు",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
   "video.close": "వీడియోని మూసివేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b108e581a4..7c6b2ade4e 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "เซิร์ฟเวอร์ที่มีการควบคุม",
+  "about.blocks": "เซิร์ฟเวอร์ที่มีการกลั่นกรอง",
   "about.contact": "ติดต่อ:",
   "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
   "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
@@ -89,7 +89,14 @@
   "announcement.announcement": "ประกาศ",
   "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
   "audio.hide": "ซ่อนเสียง",
-  "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
+  "block_modal.remote_users_caveat": "เราจะขอให้เซิร์ฟเวอร์ {domain} เคารพการตัดสินใจของคุณ อย่างไรก็ตาม ไม่รับประกันการปฏิบัติตามข้อกำหนดเนื่องจากเซิร์ฟเวอร์บางแห่งอาจจัดการการปิดกั้นแตกต่างกัน โพสต์สาธารณะอาจยังคงปรากฏแก่ผู้ใช้ที่ไม่ได้เข้าสู่ระบบ",
+  "block_modal.show_less": "แสดงน้อยลง",
+  "block_modal.show_more": "แสดงเพิ่มเติม",
+  "block_modal.they_cant_mention": "เขาไม่สามารถกล่าวถึงหรือติดตามคุณ",
+  "block_modal.they_cant_see_posts": "เขาไม่สามารถเห็นโพสต์ของคุณและคุณจะไม่เห็นโพสต์ของเขา",
+  "block_modal.they_will_know": "เขาสามารถเห็นว่ามีการปิดกั้นเขา",
+  "block_modal.title": "ปิดกั้นผู้ใช้?",
+  "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
-  "compose_form.poll.add_option": "เพิ่มตัวเลือก",
   "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
+  "compose_form.poll.multiple": "หลายตัวเลือก",
   "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
-  "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
+  "compose_form.poll.single": "เลือกอย่างใดอย่างหนึ่ง",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
-  "compose_form.publish": "เผยแพร่",
+  "compose_form.poll.type": "ลักษณะ",
+  "compose_form.publish": "โพสต์",
   "compose_form.publish_form": "โพสต์ใหม่",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
-  "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
+  "compose_form.reply": "ตอบกลับ",
+  "compose_form.save_changes": "อัปเดต",
   "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
-  "compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
+  "compose_form.spoiler_placeholder": "คำเตือนเนื้อหา (ไม่จำเป็น)",
   "confirmation_modal.cancel": "ยกเลิก",
-  "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
-  "confirmations.block.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดกั้น {name}?",
   "confirmations.cancel_follow_request.confirm": "ถอนคำขอ",
   "confirmations.cancel_follow_request.message": "คุณแน่ใจหรือไม่ว่าต้องการถอนคำขอเพื่อติดตาม {name} ของคุณ?",
   "confirmations.delete.confirm": "ลบ",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?",
   "confirmations.discard_edit_media.confirm": "ละทิ้ง",
   "confirmations.discard_edit_media.message": "คุณมีการเปลี่ยนแปลงคำอธิบายหรือตัวอย่างสื่อที่ยังไม่ได้บันทึก ละทิ้งการเปลี่ยนแปลงเหล่านั้นต่อไป?",
-  "confirmations.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
+  "confirmations.domain_block.confirm": "ปิดกั้นเซิร์ฟเวอร์",
   "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.edit.confirm": "แก้ไข",
   "confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
   "confirmations.mute.confirm": "ซ่อน",
-  "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังคงอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
-  "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการซ่อน {name}?",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.reply.confirm": "ตอบกลับ",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "นี่คือโพสต์จากทั่วทั้งเว็บสังคมที่กำลังได้รับความสนใจวันนี้ โพสต์ที่ใหม่กว่าที่มีการดันและรายการโปรดมากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.explore_tags": "นี่คือแฮชแท็กที่กำลังได้รับความสนใจในเว็บสังคมวันนี้ แฮชแท็กที่มีการใช้โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเว็บสังคมที่ผู้คนใน {domain} ติดตาม",
+  "domain_block_modal.block": "ปิดกั้นเซิร์ฟเวอร์",
+  "domain_block_modal.block_account_instead": "ปิดกั้น @{name} แทน",
+  "domain_block_modal.they_can_interact_with_old_posts": "ผู้คนจากเซิร์ฟเวอร์นี้สามารถโต้ตอบกับโพสต์เก่า ๆ ของคุณ",
+  "domain_block_modal.they_cant_follow": "ไม่มีใครจากเซิร์ฟเวอร์นี้สามารถติดตามคุณ",
+  "domain_block_modal.they_wont_know": "เขาจะไม่ทราบว่ามีการปิดกั้นเขา",
+  "domain_block_modal.title": "ปิดกั้นโดเมน?",
+  "domain_block_modal.you_will_lose_followers": "จะเอาผู้ติดตามทั้งหมดของคุณจากเซิร์ฟเวอร์นี้ออก",
+  "domain_block_modal.you_wont_see_posts": "คุณจะไม่เห็นโพสต์หรือการแจ้งเตือนจากผู้ใช้ในเซิร์ฟเวอร์นี้",
+  "domain_pill.activitypub_lets_connect": "โปรโตคอลช่วยให้คุณเชื่อมต่อและโต้ตอบกับผู้คนไม่ใช่แค่ใน Mastodon แต่ทั่วทั้งแอปสังคมต่าง ๆ เช่นกัน",
+  "domain_pill.activitypub_like_language": "ActivityPub เป็นเหมือนภาษาที่ Mastodon พูดกับเครือข่ายสังคมอื่น ๆ",
+  "domain_pill.server": "เซิร์ฟเวอร์",
+  "domain_pill.their_handle": "นามของเขา:",
+  "domain_pill.their_server": "บ้านดิจิทัลของเขา ที่ซึ่งโพสต์ทั้งหมดของเขาอาศัยอยู่",
+  "domain_pill.their_username": "ตัวระบุที่ไม่ซ้ำกันของเขาในเซิร์ฟเวอร์ของเขา เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
+  "domain_pill.username": "ชื่อผู้ใช้",
+  "domain_pill.whats_in_a_handle": "ในนามมีอะไรอยู่?",
+  "domain_pill.who_they_are": "เนื่องจากนามบอกว่าใครสักคนคือใครและเขาอยู่ที่ไหน คุณสามารถโต้ตอบกับผู้คนทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
+  "domain_pill.who_you_are": "เนื่องจากนามของคุณบอกว่าคุณคือใครและคุณอยู่ที่ไหน ผู้คนสามารถโต้ตอบกับคุณทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
+  "domain_pill.your_handle": "นามของคุณ:",
+  "domain_pill.your_server": "บ้านดิจิทัลของคุณ ที่ซึ่งโพสต์ทั้งหมดของคุณอาศัยอยู่ ไม่ชอบเซิร์ฟเวอร์นี้? ถ่ายโอนเซิร์ฟเวอร์เมื่อใดก็ได้และนำผู้ติดตามของคุณไปด้วยเช่นกัน",
+  "domain_pill.your_username": "ตัวระบุที่ไม่ซ้ำกันของคุณในเซิร์ฟเวอร์นี้ เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
   "embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
   "embed.preview": "นี่คือลักษณะของการฝังที่จะปรากฏ:",
   "emoji_button.activity": "กิจกรรม",
@@ -244,6 +266,7 @@
   "empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์โพสต์ใหม่ โพสต์จะปรากฏที่นี่",
   "empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
   "empty_column.mutes": "คุณยังไม่ได้ซ่อนผู้ใช้ใด ๆ",
+  "empty_column.notification_requests": "โล่งทั้งหมด! ไม่มีสิ่งใดที่นี่ เมื่อคุณได้รับการแจ้งเตือนใหม่ การแจ้งเตือนจะปรากฏที่นี่ตามการตั้งค่าของคุณ",
   "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ เมื่อผู้คนอื่น ๆ โต้ตอบกับคุณ คุณจะเห็นการแจ้งเตือนที่นี่",
   "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมเส้นเวลาให้เต็ม",
   "error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
+  "filtered_notifications_banner.mentions": "{count, plural, other {การกล่าวถึง}}",
+  "filtered_notifications_banner.pending_requests": "การแจ้งเตือนจาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
+  "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
   "firehose.local": "เซิร์ฟเวอร์นี้",
   "firehose.remote": "เซิร์ฟเวอร์อื่น ๆ",
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
+  "follow_suggestions.curated_suggestion": "คัดสรรโดยพนักงาน",
+  "follow_suggestions.dismiss": "ไม่ต้องแสดงอีก",
+  "follow_suggestions.featured_longer": "คัดสรรโดยทีม {domain}",
+  "follow_suggestions.friends_of_friends_longer": "เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
+  "follow_suggestions.hints.featured": "โปรไฟล์นี้ได้รับการคัดสรรโดยทีม {domain}",
+  "follow_suggestions.hints.friends_of_friends": "โปรไฟล์นี้เป็นที่นิยมในหมู่ผู้คนที่คุณติดตาม",
+  "follow_suggestions.hints.most_followed": "โปรไฟล์นี้เป็นหนึ่งในโปรไฟล์ที่ได้รับการติดตามมากที่สุดใน {domain}",
+  "follow_suggestions.hints.most_interactions": "โปรไฟล์นี้เพิ่งได้รับความสนใจอย่างมากใน {domain}",
+  "follow_suggestions.hints.similar_to_recently_followed": "โปรไฟล์นี้คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
+  "follow_suggestions.personalized_suggestion": "ข้อเสนอแนะเฉพาะบุคคล",
+  "follow_suggestions.popular_suggestion": "ข้อเสนอแนะยอดนิยม",
+  "follow_suggestions.popular_suggestion_longer": "เป็นที่นิยมใน {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "คล้ายกับโปรไฟล์ที่คุณได้ติดตามล่าสุด",
+  "follow_suggestions.view_all": "ดูทั้งหมด",
+  "follow_suggestions.who_to_follow": "ติดตามใครดี",
   "followed_tags": "แฮชแท็กที่ติดตาม",
   "footer.about": "เกี่ยวกับ",
   "footer.directory": "ไดเรกทอรีโปรไฟล์",
@@ -306,15 +347,10 @@
   "hashtag.follow": "ติดตามแฮชแท็ก",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
-  "home.actions.go_to_explore": "ดูสิ่งที่กำลังนิยม",
-  "home.actions.go_to_suggestions": "ค้นหาผู้คนที่จะติดตาม",
-  "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
-  "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
-  "home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
   "home.hide_announcements": "ซ่อนประกาศ",
-  "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะทำได้!",
+  "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะเป็นไปได้!",
   "home.pending_critical_update.link": "ดูการอัปเดต",
   "home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
   "home.show_announcements": "แสดงประกาศ",
@@ -376,7 +412,7 @@
   "lightbox.next": "ถัดไป",
   "lightbox.previous": "ก่อนหน้า",
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
-  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของ {domain}",
+  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "กำลังโหลด…",
   "media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
   "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
-  "mute_modal.duration": "ระยะเวลา",
-  "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
-  "mute_modal.indefinite": "ไม่มีกำหนด",
+  "mute_modal.hide_from_notifications": "ซ่อนจากการแจ้งเตือน",
+  "mute_modal.hide_options": "ซ่อนตัวเลือก",
+  "mute_modal.indefinite": "จนกว่าฉันจะเลิกซ่อนเขา",
+  "mute_modal.show_options": "แสดงตัวเลือก",
+  "mute_modal.they_can_mention_and_follow": "เขาสามารถกล่าวถึงและติดตามคุณ แต่คุณจะไม่เห็นเขา",
+  "mute_modal.they_wont_know": "เขาจะไม่ทราบว่ามีการซ่อนเขา",
+  "mute_modal.title": "ซ่อนผู้ใช้?",
+  "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
+  "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
   "navigation_bar.about": "เกี่ยวกับ",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
-  "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
   "notification.mention": "{name} ได้กล่าวถึงคุณ",
+  "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
+  "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
+  "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",
+  "notification.moderation_warning.action_disable": "ปิดใช้งานบัญชีของคุณแล้ว",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนแล้ว",
+  "notification.moderation_warning.action_none": "บัญชีของคุณได้รับคำเตือนการกลั่นกรอง",
+  "notification.moderation_warning.action_sensitive": "จะทำเครื่องหมายโพสต์ของคุณว่าละเอียดอ่อนนับจากนี้ไป",
+  "notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
+  "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
+  "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
+  "notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
+  "notification.relationships_severance_event.domain_block": "ผู้ดูแลจาก {from} ได้ปิดกั้น {target} รวมถึง {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตาม",
+  "notification.relationships_severance_event.learn_more": "เรียนรู้เพิ่มเติม",
+  "notification.relationships_severance_event.user_domain_block": "คุณได้ปิดกั้น {target} เอา {followersCount} ผู้ติดตามของคุณและ {followingCount, plural, other {# บัญชี}}ที่คุณติดตามออก",
   "notification.status": "{name} เพิ่งโพสต์",
   "notification.update": "{name} ได้แก้ไขโพสต์",
+  "notification_requests.accept": "ยอมรับ",
+  "notification_requests.dismiss": "ปิด",
+  "notification_requests.notifications_from": "การแจ้งเตือนจาก {name}",
+  "notification_requests.title": "การแจ้งเตือนที่กรองอยู่",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
   "notifications.column_settings.admin.report": "รายงานใหม่:",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "รายการโปรด:",
   "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
   "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
-  "notifications.column_settings.filter_bar.show_bar": "แสดงแถบตัวกรอง",
   "notifications.column_settings.follow": "ผู้ติดตามใหม่:",
   "notifications.column_settings.follow_request": "คำขอติดตามใหม่:",
   "notifications.column_settings.mention": "การกล่าวถึง:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากมีการปฏิเสธคำขอสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
+  "notifications.policy.filter_new_accounts.hint": "สร้างขึ้นภายใน {days, plural, other {# วัน}}ที่ผ่านมา",
+  "notifications.policy.filter_new_accounts_title": "บัญชีใหม่",
+  "notifications.policy.filter_not_followers_hint": "รวมถึงผู้คนที่ได้ติดตามคุณน้อยกว่า {days, plural, other {# วัน}}",
+  "notifications.policy.filter_not_followers_title": "ผู้คนที่ไม่ได้ติดตามคุณ",
+  "notifications.policy.filter_not_following_hint": "จนกว่าคุณจะอนุมัติเขาด้วยตนเอง",
+  "notifications.policy.filter_not_following_title": "ผู้คนที่คุณไม่ได้ติดตาม",
+  "notifications.policy.filter_private_mentions_hint": "กรองไว้เว้นแต่การกล่าวถึงแบบส่วนตัวอยู่ในการตอบกลับการกล่าวถึงของคุณเองหรือหากคุณติดตามผู้ส่ง",
+  "notifications.policy.filter_private_mentions_title": "การกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์",
+  "notifications.policy.title": "กรองการแจ้งเตือนจาก…",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
   "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
   "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
-  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
-  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
-  "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "ปรากฏแก่ทั้งหมด",
+  "privacy.direct.long": "ทุกคนที่กล่าวถึงในโพสต์",
+  "privacy.direct.short": "ผู้คนที่เฉพาะเจาะจง",
+  "privacy.private.long": "เฉพาะผู้ติดตามของคุณเท่านั้น",
+  "privacy.private.short": "ผู้ติดตาม",
+  "privacy.public.long": "ใครก็ตามที่อยู่ในและนอก Mastodon",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
-  "privacy.unlisted.short": "ไม่อยู่ในรายการ",
+  "privacy.unlisted.additional": "สิ่งนี้ทำงานเหมือนกับสาธารณะทุกประการ ยกเว้นโพสต์จะไม่ปรากฏในฟีดสดหรือแฮชแท็ก, การสำรวจ หรือการค้นหา Mastodon แม้ว่าคุณได้เลือกรับทั่วทั้งบัญชีก็ตาม",
+  "privacy.unlisted.long": "การประโคมอัลกอริทึมที่น้อยลง",
+  "privacy.unlisted.short": "สาธารณะแบบเงียบ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} นาที",
   "relative_time.seconds": "{number} วินาที",
   "relative_time.today": "วันนี้",
+  "reply_indicator.attachments": "{count, plural, other {# ไฟล์แนบ}}",
   "reply_indicator.cancel": "ยกเลิก",
+  "reply_indicator.poll": "การสำรวจความคิดเห็น",
   "report.block": "ปิดกั้น",
   "report.block_explanation": "คุณจะไม่เห็นโพสต์ของเขา เขาจะไม่สามารถเห็นโพสต์ของคุณหรือติดตามคุณ เขาจะสามารถบอกได้ว่ามีการปิดกั้นเขา",
   "report.categories.legal": "กฎหมาย",
@@ -631,9 +701,9 @@
   "sign_in_banner.sign_in": "เข้าสู่ระบบ",
   "sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
   "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แชร์ และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
-  "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
-  "status.admin_domain": "เปิดส่วนติดต่อการควบคุมสำหรับ {domain}",
-  "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
+  "status.admin_account": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ @{name}",
+  "status.admin_domain": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ {domain}",
+  "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการกลั่นกรอง",
   "status.block": "ปิดกั้น @{name}",
   "status.bookmark": "เพิ่มที่คั่นหน้า",
   "status.cancel_reblog_private": "เลิกดัน",
@@ -644,10 +714,11 @@
   "status.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "status.direct_indicator": "การกล่าวถึงแบบส่วนตัว",
   "status.edit": "แก้ไข",
-  "status.edited": "แก้ไขเมื่อ {date}",
+  "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
   "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
+  "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",
   "status.filtered": "กรองอยู่",
   "status.hide": "ซ่อนโพสต์",
@@ -668,6 +739,7 @@
   "status.reblog": "ดัน",
   "status.reblog_private": "ดันด้วยการมองเห็นดั้งเดิม",
   "status.reblogged_by": "{name} ได้ดัน",
+  "status.reblogs": "{count, plural, other {การดัน}}",
   "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
   "status.redraft": "ลบแล้วร่างใหม่",
   "status.remove_bookmark": "เอาที่คั่นหน้าออก",
@@ -715,10 +787,8 @@
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
   "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
-  "upload_form.description_missing": "ไม่ได้เพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
-  "upload_form.undo": "ลบ",
   "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
new file mode 100644
index 0000000000..80d412a20b
--- /dev/null
+++ b/app/javascript/mastodon/locales/tok.json
@@ -0,0 +1,405 @@
+{
+  "about.blocks": "ma lawa",
+  "about.contact": "toki:",
+  "about.domain_blocks.no_reason_available": "mi sona ala e tan",
+  "about.domain_blocks.preamble": "ilo Masoton li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:",
+  "about.domain_blocks.silenced.explanation": "sina lukin ala e toki e jan tan ma ni. taso, sina wile la, sina ken ni.",
+  "about.domain_blocks.silenced.title": "ken lili lukin",
+  "about.domain_blocks.suspended.title": "weka",
+  "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
+  "about.rules": "lawa kulupu",
+  "account.account_note_header": "sona awen",
+  "account.add_or_remove_from_list": "o ante e lipu jan",
+  "account.badges.bot": "ilo nanpa li lawa e ni",
+  "account.badges.group": "kulupu",
+  "account.block": "o weka e @{name}",
+  "account.block_domain": "o weka e ma {domain}",
+  "account.block_short": "o weka e jan tawa mi",
+  "account.blocked": "jan li weka tawa mi",
+  "account.browse_more_on_origin_server": "sina tawa ma tan pi jan ni la sina ken lukin e mute",
+  "account.cancel_follow_request": "o pini kute",
+  "account.copy": "o pali same e linja pi lipu jan",
+  "account.direct": "len la o mu e @{name}",
+  "account.disable_notifications": "@{name} li toki la o mu ala e mi",
+  "account.domain_blocked": "ma ni li weka tawa sina",
+  "account.edit_profile": "o ante e lipu mi",
+  "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
+  "account.endorse": "lipu jan la o suli e ni",
+  "account.featured_tags.last_status_at": "sitelen pini pi jan ni li lon tenpo {date}",
+  "account.featured_tags.last_status_never": "toki ala li lon",
+  "account.follow": "o kute",
+  "account.follow_back": "jan ni li kute e sina. o kute",
+  "account.followers": "jan kute",
+  "account.followers.empty": "jan ala li kute e jan ni",
+  "account.following": "sina kute e jan ni",
+  "account.follows.empty": "jan ni li kute e jan ala",
+  "account.go_to_profile": "o tawa lipu jan",
+  "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
+  "account.in_memoriam": "jan ni li moli. pona o tawa ona.",
+  "account.joined_short": "li kama",
+  "account.languages": "sina wile lukin e sitelen pi toki seme",
+  "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
+  "account.media": "sitelen",
+  "account.mention": "o toki e jan @{name}",
+  "account.moved_to": "lipu jan sin pi jan {name} li ni:",
+  "account.mute": "o len e @{name}",
+  "account.mute_notifications_short": "o kute ala e mu tan jan ni",
+  "account.mute_short": "o kute ala",
+  "account.muted": "sina len e jan ni",
+  "account.no_bio": "lipu li weka",
+  "account.open_original_page": "o open e lipu open",
+  "account.posts": "toki suli",
+  "account.posts_with_replies": "toki ale",
+  "account.report": "jan @{name} la o toki tawa lawa",
+  "account.requested": "jan ni o ken e kute sina. sina pini wile kute la o luka e ni",
+  "account.requested_follow": "{name} li wile kute e sina",
+  "account.share": "o pana e lipu jan @{name}",
+  "account.show_reblogs": "o lukin e pana toki tan @{name}",
+  "account.unblock": "o weka ala e jan {name}",
+  "account.unblock_domain": "o weka ala e ma {domain}",
+  "account.unblock_short": "o pini weka",
+  "account.unendorse": "lipu jan la o suli ala e ni",
+  "account.unfollow": "o pini kute",
+  "account.unmute": "o len ala e @{name}",
+  "account.unmute_notifications_short": "o kute e mu tan jan ni",
+  "account.unmute_short": "o len ala",
+  "admin.dashboard.retention.average": "sama",
+  "admin.dashboard.retention.cohort": "tenpo mun open",
+  "admin.dashboard.retention.cohort_size": "jan sin",
+  "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
+  "alert.unexpected.message": "pakala li lon",
+  "alert.unexpected.title": "pakala a!",
+  "announcement.announcement": "toki suli",
+  "audio.hide": "o len e kalama",
+  "block_modal.show_less": "o lili e lukin",
+  "block_modal.show_more": "o mute e lukin",
+  "block_modal.they_cant_mention": "ona li ken ala toki e sina li ken ala alasa e sina",
+  "block_modal.title": "o weka ala weka e jan",
+  "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
+  "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
+  "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
+  "bundle_column_error.error.title": "ike a!",
+  "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
+  "bundle_column_error.retry": "o ni sin",
+  "bundle_column_error.return": "o tawa tomo",
+  "bundle_column_error.routing.body": "ilo li sona ala e lipu wile. sina pana ala pana e nasin pona tawa lipu?",
+  "bundle_column_error.routing.title": "pakala nanpa 404",
+  "bundle_modal_error.close": "o pini",
+  "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
+  "bundle_modal_error.retry": "o ni sin",
+  "closed_registrations_modal.find_another_server": "o alasa e ma ante",
+  "column.about": "sona",
+  "column.blocks": "kulupu pi jan weka",
+  "column.bookmarks": "awen toki",
+  "column.community": "linja tenpo pi ma ni",
+  "column.favourites": "ijo pona",
+  "column.firehose": "toki pi tenpo ni",
+  "column.follow_requests": "wile alasa pi jan ante",
+  "column.home": "lipu open",
+  "column.lists": "kulupu lipu",
+  "column.mutes": "jan len",
+  "column.pins": "toki sewi",
+  "column_back_button.label": "o tawa monsi",
+  "column_header.hide_settings": "o len e lawa",
+  "column_header.pin": "o sewi",
+  "column_header.show_settings": "o lukin e lawa",
+  "column_header.unpin": "o sewi ala",
+  "column_subheading.settings": "ken ilo",
+  "community.column_settings.local_only": "toki tan ni taso",
+  "community.column_settings.media_only": "sitelen taso",
+  "community.column_settings.remote_only": "toki tan ante taso",
+  "compose.language.change": "o ante e nasin toki",
+  "compose.language.search": "o alasa e nasin toki...",
+  "compose.published.body": "toki li pana.",
+  "compose.published.open": "o lukin",
+  "compose.saved.body": "ilo li awen e ijo pana sina.",
+  "compose_form.direct_message_warning_learn_more": "o kama sona e ijo ante",
+  "compose_form.encryption_warning": "toki li len ala lon ilo Masoton ꞏ o pana ala e sona suli len lon ilo Masoton",
+  "compose_form.placeholder": "sina wile toki e seme?",
+  "compose_form.poll.duration": "tenpo pana",
+  "compose_form.poll.multiple": "pana mute",
+  "compose_form.poll.option_placeholder": "ken nanpa {number}",
+  "compose_form.poll.single": "pana pi wan taso",
+  "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
+  "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
+  "compose_form.poll.type": "nasin",
+  "compose_form.publish": "o toki",
+  "compose_form.publish_form": "o open toki sin",
+  "compose_form.reply": "o toki lon ijo ni",
+  "compose_form.save_changes": "o sin e ni",
+  "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
+  "confirmation_modal.cancel": "o pini",
+  "confirmations.block.confirm": "o weka",
+  "confirmations.cancel_follow_request.confirm": "o weka e wile sina",
+  "confirmations.cancel_follow_request.message": "sina awen ala awen wile weka e wile kute sina lon {name}?",
+  "confirmations.delete.confirm": "o weka",
+  "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
+  "confirmations.delete_list.confirm": "o weka",
+  "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
+  "confirmations.discard_edit_media.confirm": "o weka",
+  "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
+  "confirmations.domain_block.message": "sina wile ala a wile a len e ma {domain} ꞏ ken suli la len jan taso li pona ꞏ len pi ma ni la sina ken ala lukin e ijo pi ma ni lon lipu toki ale anu lukin toki ꞏ len ni la jan kute sina pi ma ni li weka",
+  "confirmations.edit.confirm": "o ante",
+  "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
+  "confirmations.logout.confirm": "o weka",
+  "confirmations.logout.message": "sina wile ala wile weka",
+  "confirmations.mute.confirm": "o len",
+  "confirmations.redraft.confirm": "o weka o pali sin e toki",
+  "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
+  "confirmations.reply.confirm": "toki lon toki ni",
+  "confirmations.reply.message": "sina toki lon toki ni la toki pali sina li weka. sina wile ala wile e ni?",
+  "confirmations.unfollow.confirm": "o pini kute",
+  "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+  "conversation.delete": "o weka e toki ni",
+  "conversation.mark_as_read": "ni o sin ala",
+  "conversation.open": "o lukin e toki",
+  "conversation.with": "lon {names}",
+  "copy_icon_button.copied": "toki li awen lon ilo sina",
+  "copypaste.copy_to_clipboard": "o awen lon ilo sina",
+  "directory.local": "tan {domain} taso",
+  "directory.new_arrivals": "jan pi kama sin",
+  "directory.recently_active": "jan lon tenpo poka",
+  "disabled_account_banner.account_settings": "wile pi lipu jan",
+  "disabled_account_banner.text": "sina ken ala kepeken e lipu jan sina pi nimi {disabledAccount}.",
+  "dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
+  "dismissable_banner.dismiss": "o weka",
+  "dismissable_banner.explore_links": "ni li toki pi ijo sin ꞏ jan mute li pana e ni lon tenpo suno ni ꞏ sin la jan mute li pana la ni li kama suli",
+  "dismissable_banner.explore_statuses": "suni ni la jan mute li lukin e toki ni. jan mute li wawa e toki li suli e toki la toki ni li lon sewi. toki li sin la toki ni li lon sewi.",
+  "dismissable_banner.explore_tags": "suni ni la jan mute li lukin e toki pi toki ni. jan mute li kepeken toki la toki ni li lon sewi.",
+  "dismissable_banner.public_timeline": "toki ni li sin. jan li pali e toki ni la jan ante mute pi ma {domain} li kute e jan ni.",
+  "domain_block_modal.block": "o weka e ma",
+  "domain_block_modal.you_will_lose_followers": "ma ni la jan alasa ale sina li weka",
+  "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
+  "embed.preview": "ni li jo e sitelen ni:",
+  "emoji_button.activity": "musi",
+  "emoji_button.flags": "len ma",
+  "emoji_button.food": "moku",
+  "emoji_button.label": "o pana e sitelen pilin",
+  "emoji_button.nature": "soweli en kasi",
+  "emoji_button.not_found": "sitelen pilin ala li lon",
+  "emoji_button.objects": "ijo",
+  "emoji_button.people": "jan",
+  "emoji_button.search": "o alasa...",
+  "emoji_button.search_results": "ijo pi alasa ni",
+  "emoji_button.symbols": "sitelen",
+  "emoji_button.travel": "ma en tawa",
+  "empty_column.account_hides_collections": "jan ni li wile len e sona ni",
+  "empty_column.account_timeline": "toki ala li lon!",
+  "empty_column.account_unavailable": "ken ala lukin e lipu jan",
+  "empty_column.blocks": "jan ala li weka tawa sina.",
+  "empty_column.direct": "jan ala li toki len e sina. jan li toki len e sina la sina ken lukin e ni lon ni.",
+  "empty_column.domain_blocks": "ma ala li weka tawa sina.",
+  "empty_column.favourited_statuses": "sina suli ala e toki. sina suli e toki la sina ken lukin e toki ni lon ni.",
+  "empty_column.favourites": "jan ala li suli e toki ni. jan li suli e toki ni la sina ken lukin e ona lon ni.",
+  "empty_column.follow_requests": "jan ala li toki pi wile kute tawa sina. jan li toki pi wile kute tawa sina la sina ken lukin e toki ni lon ni.",
+  "empty_column.followed_tags": "sina alasa ala e toki ꞏ sina alasa e toki la toki li lon ni",
+  "empty_column.hashtag": "ala li lon toki ni",
+  "empty_column.home": "ala a li lon lipu open sina! sina wile lon e ijo lon ni la o kute e jan pi toki suli.",
+  "empty_column.list": "ala li lon kulupu lipu ni. jan pi kulupu lipu ni li toki sin la toki ni li lon ni.",
+  "empty_column.lists": "sina jo ala e kulupu lipu. sina pali sin e kulupu lipu la ona li lon ni.",
+  "empty_column.mutes": "jan ala li len tawa sina.",
+  "error.unexpected_crash.explanation": "ilo li ken ala pana e lipu ni. ni li ken tan pakala mi tan pakala pi ilo sina.",
+  "errors.unexpected_crash.report_issue": "o toki e pakala tawa lawa",
+  "explore.search_results": "ijo pi alasa ni",
+  "explore.suggested_follows": "jan",
+  "explore.title": "o alasa",
+  "explore.trending_links": "sin",
+  "explore.trending_statuses": "toki",
+  "filter_modal.added.settings_link": "lipu lawa",
+  "filter_modal.select_filter.expired": "tenpo pini",
+  "filter_modal.select_filter.search": "o alasa anu pali",
+  "firehose.all": "ale",
+  "firehose.local": "kulupu ni",
+  "firehose.remote": "kulupu ante",
+  "follow_request.authorize": "o ken",
+  "follow_request.reject": "o ala",
+  "follow_suggestions.hints.friends_of_friends": "jan kute sina li lukin mute e toki pi jan ni.",
+  "follow_suggestions.hints.most_followed": "jan mute lon ma {domain} li kute e jan ni.",
+  "follow_suggestions.hints.most_interactions": "tenpo poka la jan mute pi ma {domain} li lukin mute e toki pi jan ni.",
+  "follow_suggestions.hints.similar_to_recently_followed": "sina kute e jan lon tenpo poka la jan ni li sama ona.",
+  "follow_suggestions.view_all": "o lukin e ale",
+  "follow_suggestions.who_to_follow": "sina o kute e ni",
+  "footer.about": "sona",
+  "footer.directory": "lipu jan",
+  "footer.get_app": "o jo e ilo",
+  "footer.privacy_policy": "lawa len",
+  "footer.source_code": "o lukin e toki ilo",
+  "footer.status": "lon",
+  "generic.saved": "ni li awen",
+  "hashtag.column_header.tag_mode.all": "en {additional}",
+  "hashtag.column_header.tag_mode.any": "anu {additional}",
+  "hashtag.column_header.tag_mode.none": "en {additional} ala",
+  "hashtag.column_settings.tag_mode.all": "ale ni",
+  "hashtag.column_settings.tag_mode.any": "wan ni",
+  "hashtag.column_settings.tag_mode.none": "ala ni",
+  "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "interaction_modal.login.action": "o lon tomo",
+  "interaction_modal.on_another_server": "lon ma ante",
+  "interaction_modal.on_this_server": "lon ma ni",
+  "interaction_modal.title.favourite": "o suli e toki {name}",
+  "interaction_modal.title.follow": "o kute e {name}",
+  "interaction_modal.title.reblog": "o wawa e toki {name}",
+  "interaction_modal.title.reply": "o toki lon toki pi jan {name}",
+  "intervals.full.days": "{number, plural, other {suni #}}",
+  "keyboard_shortcuts.blocked": "o lukin e lipu sina pi jan weka",
+  "keyboard_shortcuts.boost": "o pana sin e toki",
+  "keyboard_shortcuts.down": "o tawa anpa lon lipu",
+  "keyboard_shortcuts.enter": "o lukin e toki",
+  "keyboard_shortcuts.favourite": "o sitelen pona e toki",
+  "keyboard_shortcuts.favourites": "o lukin e lipu sina pi toki suli",
+  "keyboard_shortcuts.muted": "o lukin e lipu sina pi jan len",
+  "keyboard_shortcuts.my_profile": "o lukin e lipu sina",
+  "keyboard_shortcuts.open_media": "o lukin e sitelen",
+  "keyboard_shortcuts.pinned": "o lukin pi lipu sina pi toki sewi",
+  "keyboard_shortcuts.toggle_sensitivity": "o ante e ken lukin",
+  "keyboard_shortcuts.toot": "o toki",
+  "keyboard_shortcuts.up": "o tawa sewi lon lipu",
+  "lightbox.close": "o pini",
+  "lightbox.compress": "o lili e sitelen",
+  "lightbox.expand": "o suli e sitelen",
+  "lightbox.next": "sinpin",
+  "lightbox.previous": "monsi",
+  "link_preview.author": "tan {name}",
+  "lists.account.add": "o pana tawa kulupu lipu",
+  "lists.account.remove": "o weka tan kulupu lipu",
+  "lists.delete": "o weka e kulupu lipu",
+  "lists.edit": "o ante e kulupu lipu",
+  "lists.edit.submit": "o ante e nimi",
+  "lists.exclusive": "o len e toki lon lipu open",
+  "lists.new.create": "o sin e kulupu lipu",
+  "lists.replies_policy.followed": "jan kute ale",
+  "lists.replies_policy.list": "jan pi kulupu ni taso",
+  "lists.replies_policy.none": "jan ala",
+  "lists.subheading": "kulupu lipu sina",
+  "load_pending": "{count, plural, other {ijo sin #}}",
+  "loading_indicator.label": "ni li kama…",
+  "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
+  "navigation_bar.about": "sona",
+  "navigation_bar.blocks": "jan weka",
+  "navigation_bar.compose": "o pali e toki sin",
+  "navigation_bar.favourites": "ijo pona",
+  "navigation_bar.filters": "nimi len",
+  "navigation_bar.lists": "kulupu lipu",
+  "navigation_bar.mutes": "sina wile ala kute e jan ni",
+  "navigation_bar.pins": "toki sewi",
+  "navigation_bar.preferences": "wile sina",
+  "navigation_bar.search": "o alasa",
+  "notification.admin.report": "jan {name} li toki e jan {target} tawa lawa",
+  "notification.admin.sign_up": "{name} li kama",
+  "notification.favourite": "toki sina li pona tawa {name}",
+  "notification.follow": " {name} li kute e sina",
+  "notification.follow_request": "{name} li wile kute e sina",
+  "notification.mention": "jan {name} li toki e sina",
+  "notification.poll": "sina pana lon pana la pana ni li pini",
+  "notification.reblog": "{name} li wawa e toki sina",
+  "notification.status": "{name} li toki",
+  "notification.update": "{name} li ante e toki",
+  "notifications.column_settings.favourite": "ijo pona:",
+  "notifications.column_settings.follow": "jan kute sin",
+  "notifications.column_settings.poll": "pana lon pana ni:",
+  "notifications.column_settings.reblog": "wawa:",
+  "notifications.column_settings.update": "ante toki:",
+  "notifications.filter.all": "ale",
+  "notifications.filter.favourites": "ijo pona",
+  "notifications.filter.polls": "pana lon pana ni",
+  "onboarding.compose.template": "toki a, #Mastodon o!",
+  "onboarding.profile.display_name": "nimi tawa jan ante",
+  "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
+  "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
+  "onboarding.start.title": "sina o kama pona a!",
+  "onboarding.tips.migration": "<strong>sina sona ala sona e ni?</strong> tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
+  "poll.total_people": "{count, plural, other {jan #}}",
+  "poll.total_votes": "{count, plural, other {pana #}}",
+  "poll.vote": "o pana",
+  "poll.voted": "sina pana e ni",
+  "poll.votes": "{votes, plural, other {pana #}}",
+  "privacy.direct.long": "jan ale lon toki",
+  "privacy.public.short": "tawa ale",
+  "relative_time.full.just_now": "tenpo ni",
+  "relative_time.just_now": "tenpo ni",
+  "relative_time.today": "tenpo suno ni",
+  "report.block": "o weka e jan",
+  "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
+  "report.categories.other": "ante",
+  "report.categories.spam": "ike tan toki mute",
+  "report.category.title": "ike seme li lon {type} ni",
+  "report.category.title_account": "lipu",
+  "report.category.title_status": "toki",
+  "report.close": "o pini",
+  "report.mute": "o kute ala e ona",
+  "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
+  "report.next": "awen",
+  "report.reasons.dislike": "ni li ike tawa mi",
+  "report.reasons.legal": "ni li ike tawa lawa",
+  "report.reasons.other": "ni li ike tan ante",
+  "report.reasons.spam": "ni li ike tan toki mute",
+  "report.thanks.title": "sina wile ala lukin e ni anu seme?",
+  "report.unfollow": "o pini kute e {name}",
+  "report_notification.categories.legal": "ike tawa nasin lawa",
+  "search.placeholder": "o alasa",
+  "search.quick_action.go_to_account": "o tawa lipu jan {x}",
+  "search_popout.language_code": "nimi toki kepeken nasin ISO",
+  "search_results.all": "ale",
+  "search_results.see_all": "ale",
+  "search_results.statuses": "toki",
+  "search_results.title": "o alasa e {q}",
+  "status.block": "o weka e @{name}",
+  "status.cancel_reblog_private": "o pini e pana",
+  "status.delete": "o weka",
+  "status.edit": "o ante",
+  "status.embed": "ni o lon insa pi lipu ante",
+  "status.favourite": "o sitelen pona",
+  "status.hide": "o len",
+  "status.history.created": "{name} li pali e ni lon {date}",
+  "status.history.edited": "{name} li ante lon {date}",
+  "status.load_more": "o kama e ijo ante",
+  "status.media.open": "o open",
+  "status.media.show": "o lukin",
+  "status.media_hidden": "sitelen li len",
+  "status.mute": "o len e @{name}",
+  "status.mute_conversation": "o kute ala e ijo pi toki ni",
+  "status.pin": "o sewi lon lipu sina",
+  "status.pinned": "toki sewi",
+  "status.reblog": "o wawa",
+  "status.share": "o pana tawa ante",
+  "status.show_less": "o lili e ni",
+  "status.show_less_all": "o lili e ale",
+  "status.show_more": "o suli e ni",
+  "status.show_more_all": "o suli e ale",
+  "status.show_original": "o lukin e mama",
+  "status.translate": "o ante pi nasin toki",
+  "status.translated_from_with": "toki li ante tan {lang} kepeken {provider}",
+  "status.uncached_media_warning": "lukin lili li weka",
+  "status.unmute_conversation": "o ken kute e ijo pi toki ni",
+  "status.unpin": "o sewi ala lon lipu sina",
+  "subscribed_languages.save": "o awen e ante",
+  "tabs_bar.home": "lipu open",
+  "timeline_hint.resources.followers": "jan kute",
+  "timeline_hint.resources.follows": "jan lukin",
+  "timeline_hint.resources.statuses": "ijo pi tenpo suli",
+  "trends.trending_now": "jan mute li toki",
+  "units.short.million": "{count}AAA",
+  "upload_button.label": "o pana e sitelen anu kalama",
+  "upload_error.limit": "ilo li ken ala e suli pi ijo ni.",
+  "upload_form.audio_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili",
+  "upload_form.description": "o toki e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_form.edit": "o ante",
+  "upload_form.thumbnail": "o ante e sitelen lili",
+  "upload_form.video_description": "o toki e ijo kute tawa jan pi kute ala, tawa jan pi kute lili, e ijo lukin tawa jan pi lukin ala, tawa jan pi lukin lili",
+  "upload_modal.choose_image": "o wile e sitelen",
+  "upload_modal.description_placeholder": "mi pu jaki tan soweli",
+  "upload_modal.detect_text": "ilo o alasa e nimi tan sitelen",
+  "upload_modal.edit_media": "o ante e sitelen",
+  "upload_modal.preparing_ocr": "ilo li open e alasa nimi lon sitelen…",
+  "upload_progress.label": "ilo li kama jo e ijo sina...",
+  "upload_progress.processing": "ilo li pali…",
+  "username.taken": "jan ante li kepeken e nimi ni. sina o kepeken e nimi sin",
+  "video.close": "o weka e ni",
+  "video.download": "o jo e ni",
+  "video.exit_fullscreen": "o weka tan sitelen suli",
+  "video.expand": "o suli e ni",
+  "video.hide": "o len e sitelen",
+  "video.mute": "o kalama ala",
+  "video.pause": "o lape e ni",
+  "video.unmute": "o kalama"
+}
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e85db817b9..6c01106593 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Duyuru",
   "attachments_list.unprocessed": "(işlenmemiş)",
   "audio.hide": "Sesi gizle",
-  "autosuggest_hashtag.per_week": "Haftada {count}",
+  "block_modal.remote_users_caveat": "{domain} sunucusundan kararınıza saygı duymasını isteyeceğiz. Ancak, Uymaları garanti değildir çünkü bazı sunucular engellemeyi farklı şekilde yapıyorlar. Herkese açık gönderiler giriş yapmamış kullanıcılara görüntülenmeye devam edebilir.",
+  "block_modal.show_less": "Daha az göster",
+  "block_modal.show_more": "Daha fazla göster",
+  "block_modal.they_cant_mention": "Sizden bahsedemez veya sizi takip edemezler.",
+  "block_modal.they_cant_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
+  "block_modal.they_will_know": "Engellendiklerini görebiliyorlar.",
+  "block_modal.title": "Kullanıcıyı engelle?",
+  "block_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
   "compose_form.placeholder": "Aklında ne var?",
-  "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
-  "compose_form.poll.option_placeholder": "{number}.seçenek",
-  "compose_form.poll.remove_option": "Bu seçeneği kaldır",
+  "compose_form.poll.multiple": "Çoktan seçmeli",
+  "compose_form.poll.option_placeholder": "Seçenek {number}",
+  "compose_form.poll.single": "Birini seç",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Gönder",
   "compose_form.publish_form": "Gönder",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Değişiklikleri kaydet",
-  "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
+  "compose_form.reply": "Yanıtla",
+  "compose_form.save_changes": "Güncelle",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "Uyarınızı buraya yazın",
+  "compose_form.spoiler_placeholder": "İçerik uyarısı (isteğe bağlı)",
   "confirmation_modal.cancel": "İptal",
-  "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
-  "confirmations.block.message": "{name} adlı kullanıcıyı engellemek istediğinden emin misin?",
   "confirmations.cancel_follow_request.confirm": "İsteği geri çek",
   "confirmations.cancel_follow_request.message": "{name} kişisini takip etme isteğini geri çekmek istediğinden emin misin?",
   "confirmations.delete.confirm": "Sil",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinden emin misin?",
   "confirmations.discard_edit_media.confirm": "Vazgeç",
   "confirmations.discard_edit_media.message": "Medya açıklaması veya ön izlemede kaydedilmemiş değişiklikleriniz var, yine de vazgeçmek istiyor musunuz?",
-  "confirmations.domain_block.confirm": "Alanın tamamını engelle",
+  "confirmations.domain_block.confirm": "Sunucuyu engelle",
   "confirmations.domain_block.message": "{domain} alanının tamamını engellemek istediğinden gerçekten emin misin? Genellikle hedeflenen birkaç engelleme veya sessize alma yeterlidir ve tercih edilir. Bu alan adından gelen içeriği herhangi bir genel zaman çizelgesinde veya bildirimlerinde görmezsin. Bu alan adındaki takipçilerin kaldırılır.",
   "confirmations.edit.confirm": "Düzenle",
   "confirmations.edit.message": "Şimdi düzenlersen şu an oluşturduğun iletinin üzerine yazılır. Devam etmek istediğine emin misin?",
   "confirmations.logout.confirm": "Oturumu kapat",
   "confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
   "confirmations.mute.confirm": "Sessize al",
-  "confirmations.mute.explanation": "Bu, onlardan gelen ve bahseden gönderileri gizler. Ancak yine de gönderilerini görmelerine ve seni takip etmelerine izin verilir.",
-  "confirmations.mute.message": "{name} kullanıcısını sessize almak istediğinden emin misin?",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
   "confirmations.redraft.message": "Bu gönderiyi silip taslak haline getirmek istediğinize emin misiniz? Mevcut favoriler ve boostlar silinecek ve gönderiye verilen yanıtlar başıboş kalacak.",
   "confirmations.reply.confirm": "Yanıtla",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Bunlar, sosyal ağ genelinde bugün ilgi gören gönderiler. Daha çok yinelenen ve favorilenen yeni gönderiler daha üst sıralarda yer alır.",
   "dismissable_banner.explore_tags": "Bu etiketler, merkeziyetsiz ağda bulunan bu ve diğer sunuculardaki insanların şimdilerde ilgisini çekiyor.",
   "dismissable_banner.public_timeline": "Bunlar, {domain} üzerindeki insanların, sosyal ağ da takip ettiği insanlarca gönderilen en son ve herkese açık gönderilerdir.",
+  "domain_block_modal.block": "Sunucuyu engelle",
+  "domain_block_modal.block_account_instead": "Bunun yerine {name} hesabını engelle",
+  "domain_block_modal.they_can_interact_with_old_posts": "Bu sunucudan kişiler eski gönderilerinizle etkileşebilirler.",
+  "domain_block_modal.they_cant_follow": "Bu sunucudan hiç kimse sizi takip edemez.",
+  "domain_block_modal.they_wont_know": "Engellendiklerini bilmeyecekler.",
+  "domain_block_modal.title": "Alan adını engelle?",
+  "domain_block_modal.you_will_lose_followers": "Bu sunucudaki tüm takipçileriniz kaldırılacaktır.",
+  "domain_block_modal.you_wont_see_posts": "Bu sunucudaki kullanıcılardan gelen gönderileri veya bildirimleri göremezsiniz.",
+  "domain_pill.activitypub_lets_connect": "Sadece Mastodon üzerindeki değil, diğer sosyal uygulamalardaki kişilerle de bağlantı kurmanıza ve etkileşmenize olanak sağlar.",
+  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon'un diğer sosyal ağlarla konuşmak için kullandığı dil gibidir.",
+  "domain_pill.server": "Sunucu",
+  "domain_pill.their_handle": "Tanıtıcıları:",
+  "domain_pill.their_server": "Dijital evleri, tüm gönderilerinin yaşadığı yerdir.",
+  "domain_pill.their_username": "Sunucularındaki tekil tanımlayıcıları. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
+  "domain_pill.username": "Kullanıcı adı",
+  "domain_pill.whats_in_a_handle": "Tanıtıcı nedir?",
+  "domain_pill.who_they_are": "Tanıtıcılar bir kişinin kim olduğunu ve nerede olduğunu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlarla etkileşime geçebilirsiniz.",
+  "domain_pill.who_you_are": "Tanıtıcınız kim olduğunuzu ve nerede olduğunuzu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlar sizinle etkileşime geçebilir.",
+  "domain_pill.your_handle": "Tanıtıcınız:",
+  "domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
+  "domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
   "embed.instructions": "Aşağıdaki kodu kopyalayarak bu durumu sitenize gömün.",
   "embed.preview": "İşte nasıl görüneceği:",
   "emoji_button.activity": "Aktivite",
@@ -217,7 +239,7 @@
   "emoji_button.food": "Yiyecek ve İçecek",
   "emoji_button.label": "İfade ekle",
   "emoji_button.nature": "Doğa",
-  "emoji_button.not_found": "İfade yok!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Eşleşen emoji yok",
   "emoji_button.objects": "Nesneler",
   "emoji_button.people": "Kullanıcılar",
   "emoji_button.recent": "Sık kullanılan",
@@ -244,6 +266,7 @@
   "empty_column.list": "Henüz bu listede bir şey yok. Bu listenin üyeleri bir şey paylaşığında burada gözükecek.",
   "empty_column.lists": "Henüz listen yok. Liste oluşturduğunda burada görünür.",
   "empty_column.mutes": "Henüz bir kullanıcıyı sessize almadınız.",
+  "empty_column.notification_requests": "Hepsi tamam! Burada yeni bir şey yok. Yeni bildirim aldığınızda, ayarlarınıza göre burada görüntülenecekler.",
   "empty_column.notifications": "Henüz bildiriminiz yok. Sohbete başlamak için başkalarıyla etkileşim kurun.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
   "error.unexpected_crash.explanation": "Bizim kodumuzdaki bir hatadan ya da tarayıcı uyumluluk sorunundan dolayı, bu sayfa düzgün görüntülenemedi.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
+  "filtered_notifications_banner.mentions": "{count, plural, one {bahsetme} other {bahsetme}}",
+  "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}} bildirim",
+  "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
   "firehose.local": "Bu sunucu",
   "firehose.remote": "Diğer sunucular",
   "follow_request.authorize": "İzin Ver",
   "follow_request.reject": "Reddet",
   "follow_requests.unlocked_explanation": "Hesabınız kilitli olmasa da, {domain} personeli bu hesaplardan gelen takip isteklerini gözden geçirmek isteyebileceğinizi düşündü.",
+  "follow_suggestions.curated_suggestion": "Çalışanların seçtikleri",
+  "follow_suggestions.dismiss": "Tekrar gösterme",
+  "follow_suggestions.featured_longer": "{domain} takımı tarafından elle seçildi",
+  "follow_suggestions.friends_of_friends_longer": "Takip ettiğiniz kişiler arasında popüler",
+  "follow_suggestions.hints.featured": "Bu profil {domain} ekibi tarafından elle seçilmiştir.",
+  "follow_suggestions.hints.friends_of_friends": "Bu profil takip ettiğiniz insanlar arasında popülerdir.",
+  "follow_suggestions.hints.most_followed": "Bu, {domain} sunucusunda en fazla izlenen profildir.",
+  "follow_suggestions.hints.most_interactions": "Bu, {domain} sunucusunda son zamanlarda oldukça fazla dikkat çeken bir profildir.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Bu profil, son zamanlarda takip ettiğiniz profillere benziyor.",
+  "follow_suggestions.personalized_suggestion": "Kişiselleşmiş öneriler",
+  "follow_suggestions.popular_suggestion": "Popüler öneriler",
+  "follow_suggestions.popular_suggestion_longer": "{domain} üzerinde popüler",
+  "follow_suggestions.similar_to_recently_followed_longer": "Yakın zamanda takip ettiğiniz hesaplara benziyor",
+  "follow_suggestions.view_all": "Tümünü gör",
+  "follow_suggestions.who_to_follow": "Takip edebileceklerin",
   "followed_tags": "Takip edilen etiketler",
   "footer.about": "Hakkında",
   "footer.directory": "Profil dizini",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Etiketi takip et",
   "hashtag.unfollow": "Etiketi takibi bırak",
   "hashtags.and_other": "…ve {count, plural, one {}other {# fazlası}}",
-  "home.actions.go_to_explore": "Öne çıkanları gör",
-  "home.actions.go_to_suggestions": "Takip edecek kişileri bulun",
-  "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
-  "home.explore_prompt.body": "Ana sayfa akışınızda, takip etmeyi seçtiğiniz ETİKETlerden, takip etmeyi seçtiğiniz kişilerden ve öne çıkardıkları gönderilerden oluşan bir karışım bulunur. Şu anda oldukça sessiz görünüyor, gör ve takip et :",
-  "home.explore_prompt.title": "Burası Mastodon'daki Anasayfanız.",
   "home.hide_announcements": "Duyuruları gizle",
   "home.pending_critical_update.body": "Lütfen Mastodon sunucunuzu en kısa sürede güncelleyin!",
   "home.pending_critical_update.link": "Güncellemelerini görün",
@@ -344,7 +380,7 @@
   "keyboard_shortcuts.description": "Açıklama",
   "keyboard_shortcuts.direct": "özel değinmeler sütununu açmak için",
   "keyboard_shortcuts.down": "Listede aşağıya inmek için",
-  "keyboard_shortcuts.enter": "gönderiyi aç",
+  "keyboard_shortcuts.enter": "Gönderiyi açınız",
   "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
   "keyboard_shortcuts.favourites": "Gözde listeni aç",
   "keyboard_shortcuts.federated": "Federe akışı aç",
@@ -353,7 +389,7 @@
   "keyboard_shortcuts.hotkey": "Kısayol tuşu",
   "keyboard_shortcuts.legend": "Bu efsaneyi görüntülemek için",
   "keyboard_shortcuts.local": "Yerel akışı aç",
-  "keyboard_shortcuts.mention": "Yazandan bahsetmek için",
+  "keyboard_shortcuts.mention": "Yazana değinmek için",
   "keyboard_shortcuts.muted": "Sessize alınmış kullanıcı listesini açmak için",
   "keyboard_shortcuts.my_profile": "Profilinizi açmak için",
   "keyboard_shortcuts.notifications": "Bildirimler sütununu açmak için",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Yükleniyor…",
   "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
   "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
-  "mute_modal.duration": "Süre",
-  "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
-  "mute_modal.indefinite": "Belirsiz",
+  "mute_modal.hide_from_notifications": "Bildirimlerde gizle",
+  "mute_modal.hide_options": "Seçenekleri gizle",
+  "mute_modal.indefinite": "Ben sessizliklerini kaldırana kadar",
+  "mute_modal.show_options": "Seçenekleri göster",
+  "mute_modal.they_can_mention_and_follow": "Sizden bahsedebilir ve sizi takip edebilirler, ancak siz onları göremezsiniz.",
+  "mute_modal.they_wont_know": "Susturulduklarını bilmeyecekler.",
+  "mute_modal.title": "Kullanıcıyı sustur?",
+  "mute_modal.you_wont_see_mentions": "Onlardan bahseden gönderiler göremezsiniz.",
+  "mute_modal.you_wont_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
   "navigation_bar.about": "Hakkında",
   "navigation_bar.advanced_interface": "Gelişmiş web arayüzünde aç",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Özel değinmeler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
-  "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} seni takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
   "notification.mention": "{name} senden bahsetti",
+  "notification.moderation-warning.learn_more": "Daha fazlası",
+  "notification.moderation_warning": "Hesabınız bir denetim uyarısı aldı",
+  "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
+  "notification.moderation_warning.action_disable": "Hesabınız devre dışı bırakıldı.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Bazı gönderileriniz hassas olarak işaretlendi.",
+  "notification.moderation_warning.action_none": "Hesabınız bir denetim uyarısı aldı.",
+  "notification.moderation_warning.action_sensitive": "Gönderileriniz artık hassas olarak işaretlenecek.",
+  "notification.moderation_warning.action_silence": "Hesabınız sınırlandırıldı.",
+  "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
+  "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
+  "notification.relationships_severance_event.account_suspension": "{from} yöneticisi, {target} askıya aldı, bunun anlamı onlardan artık güncelleme alamayacak veya etkileşemeyeceksiniz demektir.",
+  "notification.relationships_severance_event.domain_block": "{from} yöneticisi {target} engelledi, {followersCount} takipçiniz ve takip ettiğiniz {followingCount, plural, one {# hesap} other {# hesap}} buna dahil.",
+  "notification.relationships_severance_event.learn_more": "Daha fazlası",
+  "notification.relationships_severance_event.user_domain_block": "{target} engellediniz, takipçilerinizden {followersCount} ve takip eden {followingCount, plural, one {# hesap} other {# hesap}} kaldırılıyor.",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
+  "notification_requests.accept": "Onayla",
+  "notification_requests.dismiss": "Yoksay",
+  "notification_requests.notifications_from": "{name} bildirimleri",
+  "notification_requests.title": "Filtrelenmiş bildirimler",
   "notifications.clear": "Bildirimleri temizle",
   "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?",
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
@@ -444,11 +503,10 @@
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
-  "notifications.column_settings.filter_bar.category": "Hızlı süzgeç çubuğu",
-  "notifications.column_settings.filter_bar.show_bar": "Süzgeç çubuğunu göster",
+  "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
-  "notifications.column_settings.mention": "Değinmeler:",
+  "notifications.column_settings.mention": "Bahsetmeler:",
   "notifications.column_settings.poll": "Anket sonuçları:",
   "notifications.column_settings.push": "Anlık bildirimler",
   "notifications.column_settings.reblog": "Yeniden paylaşanlar:",
@@ -462,7 +520,7 @@
   "notifications.filter.boosts": "Yeniden paylaşımlar",
   "notifications.filter.favourites": "Favorilerin",
   "notifications.filter.follows": "Takip edilenler",
-  "notifications.filter.mentions": "Değinmeler",
+  "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
   "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
   "notifications.grant_permission": "İzin ver.",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Daha önce reddedilen tarayıcı izinleri isteği nedeniyle masaüstü bildirimleri kullanılamıyor",
   "notifications.permission_denied_alert": "Tarayıcı izni daha önce reddedildiğinden, masaüstü bildirimleri etkinleştirilemez",
   "notifications.permission_required": "Masaüstü bildirimleri, gereksinim duyulan izin verilmediği için mevcut değil.",
+  "notifications.policy.filter_new_accounts.hint": "Son {days, plural, one {bir gün} other {# gün}}de oluşturuldu",
+  "notifications.policy.filter_new_accounts_title": "Yeni hesaplar",
+  "notifications.policy.filter_not_followers_hint": "Sizi {days, plural, one {bir gün} other {# gün}}den azdır takip eden kişileri de içeriyor",
+  "notifications.policy.filter_not_followers_title": "Seni takip etmeyen kullanıcılar",
+  "notifications.policy.filter_not_following_hint": "Onları manuel olarak onaylayana kadar",
+  "notifications.policy.filter_not_following_title": "Takip etmediğin kullanıcılar",
+  "notifications.policy.filter_private_mentions_hint": "Kendi değinmenize yanıt veya takip ettiğiniz kullanıcıdan değilse filtrelenir",
+  "notifications.policy.filter_private_mentions_title": "İstenmeyen özel değinmeler",
+  "notifications.policy.title": "Şundan bildirimleri filtrele…",
   "notifications_permission_banner.enable": "Masaüstü bildirimlerini etkinleştir",
   "notifications_permission_banner.how_to_control": "Mastodon açık olmadığında bildirim almak için masaüstü bildirimlerini etkinleştirin. Etkinleştirildikten sonra yukarıdaki {icon} düğmesini kullanarak hangi etkileşim türlerinin masaüstü bildirimleri oluşturduğunu tam olarak kontrol edebilirsiniz.",
   "notifications_permission_banner.title": "Hiçbir şeyi kaçırmayın",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
-  "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Sadece bahsedilen kişiler",
-  "privacy.private.long": "Sadece takipçiler için görünür",
-  "privacy.private.short": "Sadece takipçiler",
-  "privacy.public.long": "Herkese açık",
+  "privacy.direct.long": "Gönderide değinilen herkes",
+  "privacy.direct.short": "Belirli kişiler",
+  "privacy.private.long": "Sadece takipçileriniz",
+  "privacy.private.short": "Takipçiler",
+  "privacy.public.long": "Mastodon'da olan olmayan herkes",
   "privacy.public.short": "Herkese açık",
-  "privacy.unlisted.long": "Keşfet harici herkese açık",
-  "privacy.unlisted.short": "Listelenmemiş",
+  "privacy.unlisted.additional": "Bu neredeyse herkese açık gibi çalışır, tek farkı gönderi canlı akışlarda veya etiketlerde, keşfette, veya Mastodon aramasında gözükmez, hesap çapında öyle seçmiş olsanız bile.",
+  "privacy.unlisted.long": "Daha az algoritmik tantana",
+  "privacy.unlisted.short": "Sessizce herkese açık",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
+  "reply_indicator.attachments": "{count, plural, one {# ek} other {# ek}}",
   "reply_indicator.cancel": "İptal",
+  "reply_indicator.poll": "Anket",
   "report.block": "Engelle",
   "report.block_explanation": "Gönderilerini göremeyeceksiniz. Gönderilerinizi göremezler veya sizi takip edemezler. Engelli olduklarını anlayabilecekler.",
   "report.categories.legal": "Yasal",
@@ -644,10 +714,11 @@
   "status.direct": "@{name} kullanıcısına özelden değin",
   "status.direct_indicator": "Özel değinme",
   "status.edit": "Düzenle",
-  "status.edited": "{date} tarihinde düzenlenmiş",
+  "status.edited": "Son düzenleme {date}",
   "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
   "status.embed": "Gömülü",
   "status.favourite": "Favori",
+  "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
   "status.filter": "Bu gönderiyi süzgeçle",
   "status.filtered": "Süzgeçlenmiş",
   "status.hide": "Gönderiyi gizle",
@@ -668,6 +739,7 @@
   "status.reblog": "Yeniden paylaş",
   "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
   "status.reblogged_by": "{name} yeniden paylaştı",
+  "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
   "status.reblogs.empty": "Henüz hiç kimse bu Gönderiyi Yeniden Paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
   "status.redraft": "Sil,Düzenle ve Yeniden paylaş",
   "status.remove_bookmark": "Yer işaretini kaldır",
@@ -715,15 +787,13 @@
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
   "upload_form.description": "Görme engelliler için açıklama",
-  "upload_form.description_missing": "Açıklama eklenmedi",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
-  "upload_form.undo": "Sil",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
-  "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
+  "upload_modal.analyzing_picture": "Görsel analiz ediliyor…",
   "upload_modal.apply": "Uygula",
   "upload_modal.applying": "Uygulanıyor…",
-  "upload_modal.choose_image": "Resim seç",
+  "upload_modal.choose_image": "Görsel seç",
   "upload_modal.description_placeholder": "Pijamalı hasta yağız şoföre çabucak güvendi",
   "upload_modal.detect_text": "Resimdeki metni algıla",
   "upload_modal.edit_media": "Medyayı düzenle",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 47fe60bd25..9a402472d9 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Игълан",
   "attachments_list.unprocessed": "(чимал)",
   "audio.hide": "Аудионы яшерү",
-  "autosuggest_hashtag.per_week": "{count} атнага",
   "boost_modal.combo": "Сез баса аласыз {combo} киләсе тапкыр моны сагыну өчен",
   "bundle_column_error.copy_stacktrace": "Күчереп алу хата турында Отчет",
   "bundle_column_error.error.body": "Соралган бит күрсәтелә алмый. Бу безнең кодтагы хата яки браузерга туры килү проблемасы аркасында булырга мөмкин.",
@@ -128,26 +127,14 @@
   "compose_form.lock_disclaimer": "Сезнең хисап түгел {locked}. Апуәрбер теләгән кеше сезнең язма өчен иярә ала.",
   "compose_form.lock_disclaimer.lock": "бикле",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Сайлау өстәгез",
   "compose_form.poll.duration": "Сораштыру озынлыгы",
-  "compose_form.poll.option_placeholder": "Сайлау {number}",
-  "compose_form.poll.remove_option": "бетерү",
   "compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез",
   "compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез",
-  "compose_form.publish": "Бастыру",
   "compose_form.publish_form": "Бастыру",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Үзгәрешләрне саклау",
-  "compose_form.sensitive.hide": "{count, plural, one {Медианы сизгер итеп билгеләгез} other {Медианы сизгер итеп билгеләгез}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Ташучы сизгер дип язылган} other {Ташучы сизгер дип язылган}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медиа сизгер буларак билгеле түгел} other {Медиа сизгер буларак билгеле түгел}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Кисәтүегезне монда языгыз",
   "confirmation_modal.cancel": "Баш тарту",
-  "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
   "confirmations.block.confirm": "Блоклау",
-  "confirmations.block.message": "Сез {name} кулланучыны блокларга телисезме?",
   "confirmations.cancel_follow_request.confirm": "Сорауны баш тарту",
   "confirmations.cancel_follow_request.message": "Сез абонемент соравыгызны кире кайтарырга телисез {name}?",
   "confirmations.delete.confirm": "Бетерү",
@@ -156,14 +143,11 @@
   "confirmations.delete_list.message": "Сез бу исемлекне мәңгегә бетерергә телисезме?",
   "confirmations.discard_edit_media.confirm": "Баш тарту",
   "confirmations.discard_edit_media.message": "Сезнең медиа тасвирламасында яки алдан карау өчен сакланмаган үзгәрешләр бармы? ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Сез чыннан да барысын да блокларга телисез {domain}? Күпчелек очракта берничә максатлы блоклар яки тавышсызлар җитәрлек һәм өстенлекле. Сез бу доменнан эчтәлекне җәмәгать срокларында яки хәбәрләрегездә күрмәячәксез. Бу доменнан сезнең шәкертләр бетереләчәк.",
   "confirmations.edit.confirm": "Үзгәртү",
   "confirmations.logout.confirm": "Чыгу",
   "confirmations.logout.message": "Сез чыгарга телисезме?",
   "confirmations.mute.confirm": "Тавышсыз",
-  "confirmations.mute.explanation": "Бу алардан ураза тотуны һәм алар турында искә алуны яшерәчәк, ләкин бу аларга уразаларыгызны күрергә һәм язылырга мөмкинлек бирәчәк.",
-  "confirmations.mute.message": "Сез тавышны сүндерергә телисез {name}?",
   "confirmations.redraft.confirm": "Бетерү & эшкәртү",
   "confirmations.reply.confirm": "Җавап бирү",
   "confirmations.reply.message": "Тһеавап хәзер сез ясаган хәбәрне яңадан язуга китерәчәк. Сез дәвам итәсегез киләме?",
@@ -247,7 +231,6 @@
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "Хэштегка язылу",
   "hashtag.unfollow": "Хэштегка язылу юк",
-  "home.column_settings.basic": "Төп",
   "home.column_settings.show_reblogs": "Табышмаклау",
   "home.column_settings.show_replies": "Җаваплар күрсәтү",
   "home.hide_announcements": "Игъланнарны яшерү",
@@ -313,8 +296,6 @@
   "lists.replies_policy.none": "Һичкем",
   "lists.subheading": "Исемлегегегезләр",
   "load_pending": "{count, plural, one {# яңа элемент} other {# яңа элемент}}",
-  "mute_modal.duration": "Дәвамлык",
-  "mute_modal.indefinite": "Билгесез",
   "navigation_bar.about": "Проект турында",
   "navigation_bar.blocks": "Блокланган кулланучылар",
   "navigation_bar.bookmarks": "Кыстыргычлар",
@@ -322,7 +303,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Хосусый искә алулар",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Профильны үзгәртү",
   "navigation_bar.explore": "Күзәтү",
   "navigation_bar.lists": "Исемлекләр",
   "navigation_bar.logout": "Чыгу",
@@ -376,9 +356,6 @@
   "poll_button.add_poll": "Сораштыруны өстәү",
   "poll_button.remove_poll": "Сораштыруны бетерү",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Һәркемгә ачык",
   "privacy.public.short": "Һәркемгә ачык",
   "privacy_policy.last_updated": "Соңгы яңарту {date}",
   "privacy_policy.title": "Хосусыйлык Сәясәте",
@@ -441,7 +418,6 @@
   "status.delete": "Бетерү",
   "status.direct_indicator": "Хосусый искә алу",
   "status.edit": "Үзгәртү",
-  "status.edited": "{date} көнне төзәтте",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Веб-биткә кертү",
   "status.filtered": "Сөзелгән",
@@ -473,14 +449,12 @@
   "time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}} калды",
   "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
-  "units.short.billion": "{count}Млрд",
-  "units.short.million": "{count}Млн",
-  "units.short.thousand": "{count}М",
+  "units.short.billion": "{count} млрд",
+  "units.short.million": "{count} млн",
+  "units.short.thousand": "{count} мең",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Тасвирлама өстәлмәде",
   "upload_form.edit": "Үзгәртү",
-  "upload_form.undo": "Бетерү",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
   "upload_modal.apply": "Куллан",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 6bb5ba0ebf..4120d4483b 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -17,7 +17,6 @@
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -76,8 +75,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5ec0da599b..3a7f63206d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "audio.hide": "Сховати аудіо",
-  "autosuggest_hashtag.per_week": "{count} на тиждень",
+  "block_modal.remote_users_caveat": "Ми попросимо сервер {domain} поважати ваше рішення. Однак дотримання вимог не гарантується, оскільки деякі сервери можуть обробляти блоки по-різному. Загальнодоступні дописи все ще можуть бути видимими для користувачів, які не увійшли в систему.",
+  "block_modal.show_less": "Згорнути",
+  "block_modal.show_more": "Розгорнути",
+  "block_modal.they_cant_mention": "Вони не можуть згадувати та стежити за вами.",
+  "block_modal.they_cant_see_posts": "Вони не можуть бачити ваших дописів, а ви бачитимете їхні.",
+  "block_modal.they_will_know": "Вони можуть бачити, що вони заблоковані.",
+  "block_modal.title": "Заблокувати користувача?",
+  "block_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
-  "compose_form.poll.add_option": "Додати варіант",
   "compose_form.poll.duration": "Тривалість опитування",
+  "compose_form.poll.multiple": "Кілька варіантів",
   "compose_form.poll.option_placeholder": "Варіант {number}",
-  "compose_form.poll.remove_option": "Видалити цей варіант",
+  "compose_form.poll.single": "Виберіть варіант",
   "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
+  "compose_form.poll.type": "Стиль",
   "compose_form.publish": "Опублікувати",
   "compose_form.publish_form": "Новий допис",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Зберегти зміни",
-  "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
+  "compose_form.reply": "Відповісти",
+  "compose_form.save_changes": "Оновити",
   "compose_form.spoiler.marked": "Прибрати попередження про вміст",
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
-  "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
+  "compose_form.spoiler_placeholder": "Попередження про вміст (необов'язково)",
   "confirmation_modal.cancel": "Скасувати",
-  "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
-  "confirmations.block.message": "Ви впевнені, що хочете заблокувати {name}?",
   "confirmations.cancel_follow_request.confirm": "Відкликати запит",
   "confirmations.cancel_follow_request.message": "Ви дійсно бажаєте відкликати запит на стеження за {name}?",
   "confirmations.delete.confirm": "Видалити",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
   "confirmations.discard_edit_media.confirm": "Відкинути",
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
-  "confirmations.domain_block.confirm": "Заблокувати весь домен",
+  "confirmations.domain_block.confirm": "Блокувати сервер",
   "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.edit.confirm": "Змінити",
   "confirmations.edit.message": "Редагування перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
   "confirmations.mute.confirm": "Приховати",
-  "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.",
-  "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
   "confirmations.reply.confirm": "Відповісти",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Ці дописи з цього та інших серверів децентралізованої мережі зараз набирають популярності на цьому сервері. Новіші дописи з частішим поширенням та додаванням до вподобаного мають вищий рейтинг.",
   "dismissable_banner.explore_tags": "Ці хештеги зараз набирають популярності серед людей на цьому та інших серверах децентралізованої мережі. Хештеги, які використовуються більшою кількістю людей, мають вищий рейтинг.",
   "dismissable_banner.public_timeline": "Це найновіші загальнодоступні дописи від людей в соціальній мережі, на які підписані люди в {domain}.",
+  "domain_block_modal.block": "Блокувати сервер",
+  "domain_block_modal.block_account_instead": "Блокувати @{name} натомість",
+  "domain_block_modal.they_can_interact_with_old_posts": "Люди з цього сервера можуть взаємодіяти зі своїми старими дописами.",
+  "domain_block_modal.they_cant_follow": "Ніхто з цього сервера не може слідкувати за вами.",
+  "domain_block_modal.they_wont_know": "Вони не знають, що їх заблоковано.",
+  "domain_block_modal.title": "Заблокувати домен?",
+  "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
+  "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
+  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних додатках.",
+  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Мастодонт розмовляє з іншими соціальними мережами.",
+  "domain_pill.server": "Сервер",
+  "domain_pill.their_handle": "Їхня адреса:",
+  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні пости.",
+  "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
+  "domain_pill.username": "Ім'я користувача",
+  "domain_pill.whats_in_a_handle": "Що є в адресі?",
+  "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі <button>ActivityPub</button>.",
+  "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі <button>ActivityPub</button>.",
+  "domain_pill.your_handle": "Ваша адреса:",
+  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші публікації. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
+  "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
   "emoji_button.activity": "Діяльність",
@@ -244,6 +266,7 @@
   "empty_column.list": "Цей список порожній. Коли його учасники додадуть нові дописи, вони з'являться тут.",
   "empty_column.lists": "У вас ще немає списків. Коли ви їх створите, вони з'являться тут.",
   "empty_column.mutes": "Ви ще не приховали жодного користувача.",
+  "empty_column.notification_requests": "Усе чисто! Тут нічого немає. Коли ви отримаєте нові сповіщення, вони з'являться тут відповідно до ваших налаштувань.",
   "empty_column.notifications": "У вас ще немає сповіщень. Коли інші люди почнуть взаємодіяти з вами, ви побачите їх тут.",
   "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших серверів, щоб заповнити стрічку",
   "error.unexpected_crash.explanation": "Через помилку у нашому коді або несумісність браузера, ця сторінка не може бути зображена коректно.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "Сповіщення від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
+  "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
   "firehose.local": "Цей сервер",
   "firehose.remote": "Інші сервери",
   "follow_request.authorize": "Авторизувати",
   "follow_request.reject": "Відмовити",
   "follow_requests.unlocked_explanation": "Хоча ваш обліковий запис не заблоковано, персонал {domain} припускає, що, можливо, ви хотіли б переглянути ці запити на підписку.",
+  "follow_suggestions.curated_suggestion": "Відібрано командою",
+  "follow_suggestions.dismiss": "Більше не показувати",
+  "follow_suggestions.featured_longer": "Вибрано командою {domain} вручну",
+  "follow_suggestions.friends_of_friends_longer": "Популярні серед людей, за якими ви слідкуєте",
+  "follow_suggestions.hints.featured": "Цей профіль був обраний командою {domain}.",
+  "follow_suggestions.hints.friends_of_friends": "Цей профіль популярний серед тих людей, на яких ви підписані.",
+  "follow_suggestions.hints.most_followed": "За цим профілем один з найпопулярніших на {domain}.",
+  "follow_suggestions.hints.most_interactions": "Нещодавно цей профіль отримав багато уваги на {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Цей профіль схожий на профілі, за якими ви стежили останнім часом.",
+  "follow_suggestions.personalized_suggestion": "Персоналізована пропозиція",
+  "follow_suggestions.popular_suggestion": "Популярна пропозиція",
+  "follow_suggestions.popular_suggestion_longer": "Популярно на {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Схожі на профілі, за якими ви нещодавно стежили",
+  "follow_suggestions.view_all": "Переглянути все",
+  "follow_suggestions.who_to_follow": "На кого підписатися",
   "followed_tags": "Відстежувані хештеґи",
   "footer.about": "Про проєкт",
   "footer.directory": "Каталог профілів",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Стежити за хештегом",
   "hashtag.unfollow": "Не стежити за хештегом",
   "hashtags.and_other": "…і {count, plural, other {ще #}}",
-  "home.actions.go_to_explore": "Переглянути тенденції",
-  "home.actions.go_to_suggestions": "Знайти людей, аби підписатися",
-  "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
-  "home.explore_prompt.body": "Ваша домашня стрічка буде сумішшю дописів з обраних для стеження хештегів, людей і поширених ними дописів. Якщо цього замало, ви також можете:",
-  "home.explore_prompt.title": "Це ваша домашня база у Mastodon.",
   "home.hide_announcements": "Приховати оголошення",
   "home.pending_critical_update.body": "Якнайшвидше оновіть свій сервер Mastodon!",
   "home.pending_critical_update.link": "Переглянути оновлення",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Завантаження…",
   "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
   "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
-  "mute_modal.duration": "Тривалість",
-  "mute_modal.hide_notifications": "Сховати сповіщення цього користувача?",
-  "mute_modal.indefinite": "Невизначений строк",
+  "mute_modal.hide_from_notifications": "Сховати зі сповіщень",
+  "mute_modal.hide_options": "Сховати опції",
+  "mute_modal.indefinite": "Доки я не перестану ігнорувати їх",
+  "mute_modal.show_options": "Показати опції",
+  "mute_modal.they_can_mention_and_follow": "Вони зможуть згадувати та стежити за вами, але ви їх не бачитимете.",
+  "mute_modal.they_wont_know": "Вони не знатимуть, що їх ігнорують.",
+  "mute_modal.title": "Ігнорувати користувача?",
+  "mute_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
+  "mute_modal.you_wont_see_posts": "Вони все ще можуть бачити ваші дописи, але ви не бачитимете їхніх.",
   "navigation_bar.about": "Про застосунок",
   "navigation_bar.advanced_interface": "Відкрити в розширеному вебінтерфейсі",
   "navigation_bar.blocks": "Заблоковані користувачі",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Особисті згадки",
   "navigation_bar.discover": "Дослідити",
   "navigation_bar.domain_blocks": "Заблоковані домени",
-  "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Уподобане",
   "navigation_bar.filters": "Приховані слова",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} підписалися на вас",
   "notification.follow_request": "{name} відправили запит на підписку",
   "notification.mention": "{name} згадали вас",
+  "notification.moderation-warning.learn_more": "Дізнатися більше",
+  "notification.moderation_warning": "Ви отримали попередження модерації",
+  "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було видалено.",
+  "notification.moderation_warning.action_disable": "Ваш обліковий запис було вимкнено.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Деякі з ваших дописів були позначені як чутливі.",
+  "notification.moderation_warning.action_none": "Ваш обліковий запис отримав попередження модерації.",
+  "notification.moderation_warning.action_sensitive": "Відтепер ваші дописи будуть позначені як чутливі.",
+  "notification.moderation_warning.action_silence": "Ваш обліковий запис було обмежено.",
+  "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, у якому ви голосували, скінчилося",
   "notification.reblog": "{name} поширює ваш допис",
+  "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
+  "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
+  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {{followingCount, plural, one {# account} other {# accounts}}, на які ви підписані.",
+  "notification.relationships_severance_event.learn_more": "Дізнатися більше",
+  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# account} other {# accounts}}, за якими ви стежите.",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
+  "notification_requests.accept": "Прийняти",
+  "notification_requests.dismiss": "Відхилити",
+  "notification_requests.notifications_from": "Сповіщення від {name}",
+  "notification_requests.title": "Відфільтровані сповіщення",
   "notifications.clear": "Очистити сповіщення",
   "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
   "notifications.column_settings.admin.report": "Нові скарги:",
@@ -444,8 +503,7 @@
   "notifications.column_settings.alert": "Сповіщення стільниці",
   "notifications.column_settings.favourite": "Уподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
-  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтру",
-  "notifications.column_settings.filter_bar.show_bar": "Показати панель фільтра",
+  "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
   "notifications.column_settings.mention": "Згадки:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Сповіщення стільниці недоступні через раніше відхилений запит дозволів для браузера",
   "notifications.permission_denied_alert": "Сповіщення не можна ввімкнути оскільки у дозволі вже було відмовлено раніше",
   "notifications.permission_required": "Сповіщення на стільниці не доступні, оскільки необхідний дозвіл не надано.",
+  "notifications.policy.filter_new_accounts.hint": "Створено впродовж {days, plural, one {одного} few {# днів} many {# днів} other {# дня}}",
+  "notifications.policy.filter_new_accounts_title": "Нові облікові записи",
+  "notifications.policy.filter_not_followers_hint": "Включаючи людей, які стежать за вами менше {days, plural, one {one day} other {# days}}",
+  "notifications.policy.filter_not_followers_title": "Люди не підписані на вас",
+  "notifications.policy.filter_not_following_hint": "Доки ви не схвалюєте їх вручну",
+  "notifications.policy.filter_not_following_title": "Люди, на яких ви не підписані",
+  "notifications.policy.filter_private_mentions_hint": "Відфільтровується, якщо це не відповідь на вашу власну згадку або якщо ви відстежуєте відправника",
+  "notifications.policy.filter_private_mentions_title": "Небажані приватні згадки",
+  "notifications.policy.title": "Відфільтрувати сповіщення від…",
   "notifications_permission_banner.enable": "Увімкнути сповіщення стільниці",
   "notifications_permission_banner.how_to_control": "Щоб отримувати сповіщення, коли Mastodon не відкрито, увімкніть сповіщення стільниці. Ви можете контролювати, які типи взаємодій створюють сповіщення через кнопку {icon} вгорі після їхнього увімкнення.",
   "notifications_permission_banner.title": "Не проґавте нічого",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
-  "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Лише згадані люди",
-  "privacy.private.long": "Показати тільки підписникам",
-  "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Видимий для всіх",
+  "privacy.direct.long": "Усі згадані в дописі",
+  "privacy.direct.short": "Певні люди",
+  "privacy.private.long": "Лише ваші підписники",
+  "privacy.private.short": "Підписники",
+  "privacy.public.long": "Усі з Mastodon",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
-  "privacy.unlisted.short": "Прихований",
+  "privacy.unlisted.additional": "Має таку ж поведінку, як у людей, але повідомлення не з'являтимуться у стрічках або хештегах, оглядах, або пошуку Mastodon, навіть якщо ви використовуєте облікові записи.",
+  "privacy.unlisted.long": "Менше взаємодій з алгоритмами",
+  "privacy.unlisted.short": "Без додавання до стрічки",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
   "recommended": "Рекомендовано",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number}х",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "сьогодні",
+  "reply_indicator.attachments": "{count, plural, one {# вкладення} few {# вкладення} many {# вкладень} other {# вкладення}}",
   "reply_indicator.cancel": "Скасувати",
+  "reply_indicator.poll": "Опитування",
   "report.block": "Заблокувати",
   "report.block_explanation": "Ви не будете бачити дописи цього користувача, а вони не зможуть бачити ваші дописи або підписуватися на вас. Вони будуть бачити, що ви їх заблокували.",
   "report.categories.legal": "Правові положення",
@@ -644,10 +714,11 @@
   "status.direct": "Особиста згадка @{name}",
   "status.direct_indicator": "Особиста згадка",
   "status.edit": "Редагувати",
-  "status.edited": "Відредаговано {date}",
+  "status.edited": "Востаннє змінено {date}",
   "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
   "status.embed": "Вбудувати",
   "status.favourite": "Уподобане",
+  "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
   "status.filter": "Фільтрувати цей допис",
   "status.filtered": "Відфільтровано",
   "status.hide": "Сховати допис",
@@ -668,6 +739,7 @@
   "status.reblog": "Поширити",
   "status.reblog_private": "Поширити для початкової аудиторії",
   "status.reblogged_by": "{name} поширює",
+  "status.reblogs": "{count, plural, one {поширення} few {поширення} many {поширень} other {поширення}}",
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
   "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
-  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
-  "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
   "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 563b2dedf8..37f156c28f 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -72,7 +72,6 @@
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
   "alert.unexpected.title": "ا رے!",
   "announcement.announcement": "اعلان",
-  "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
   "bundle_column_error.error.title": "اوف، نہیں!",
   "bundle_column_error.network.title": "نیٹ ورک کی خرابی",
@@ -115,37 +114,22 @@
   "compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
   "compose_form.lock_disclaimer.lock": "مقفل",
   "compose_form.placeholder": "آپ کیا سوچ رہے ہیں؟",
-  "compose_form.poll.add_option": "انتخاب شامل کریں",
   "compose_form.poll.duration": "مدتِ رائے",
-  "compose_form.poll.option_placeholder": "انتخاب {number}",
-  "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
   "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
   "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
-  "compose_form.publish": "اشاعت کردہ",
   "compose_form.publish_form": "اشاعت کریں",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
-  "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
-  "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
-  "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "اپنی وارننگ یہاں لکھیں",
   "confirmation_modal.cancel": "منسوخ",
-  "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
-  "confirmations.block.message": "کیا واقعی آپ {name} کو بلاک کرنا چاہتے ہیں؟",
   "confirmations.delete.confirm": "ڈیلیٹ",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "ڈیلیٹ",
   "confirmations.delete_list.message": "کیا آپ واقعی اس فہرست کو مستقل طور پر ڈیلیٹ کرنا چاہتے ہیں؟",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "کیا آپ واقعی، واقعی یقین رکھتے ہیں کہ آپ پورے {domain} کو بلاک کرنا چاہتے ہیں؟ زیادہ تر معاملات میں چند ٹارگٹیڈ بلاکس یا خاموش کرنا کافی اور افضل ہیں۔ آپ اس ڈومین کا مواد کسی بھی عوامی ٹائم لائنز یا اپنی اطلاعات میں نہیں دیکھیں گے۔ اس ڈومین سے آپ کے پیروکاروں کو ہٹا دیا جائے گا۔",
   "confirmations.logout.confirm": "لاگ آؤٹ",
   "confirmations.logout.message": "کیا واقعی آپ لاگ آؤٹ ہونا چاہتے ہیں؟",
   "confirmations.mute.confirm": "خاموش",
-  "confirmations.mute.explanation": "یہ ان سے پوسٹس اور ان کا تذکرہ کرنے والی پوسٹس کو چھپائے گا، لیکن یہ پھر بھی انہیں آپ کی پوسٹس دیکھنے اور آپ کی پیروی کرنے کی اجازت دے گا۔",
-  "confirmations.mute.message": "کیا واقعی آپ {name} کو خاموش کرنا چاہتے ہیں؟",
   "confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں",
   "confirmations.reply.confirm": "جواب دیں",
   "confirmations.reply.message": "ابھی جواب دینے سے وہ پیغام اوور رائٹ ہو جائے گا جو آپ فی الحال لکھ رہے ہیں۔ کیا آپ واقعی آگے بڑھنا چاہتے ہیں؟",
@@ -200,7 +184,6 @@
   "hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
   "hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
   "hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
-  "home.column_settings.basic": "بنیادی",
   "home.column_settings.show_reblogs": "افزائشات دکھائیں",
   "home.column_settings.show_replies": "جوابات دکھائیں",
   "intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
@@ -235,14 +218,12 @@
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
-  "mute_modal.indefinite": "غیر معینہ",
   "navigation_bar.blocks": "مسدود صارفین",
   "navigation_bar.bookmarks": "بُک مارکس",
   "navigation_bar.community_timeline": "مقامی ٹائم لائن",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
   "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
@@ -265,7 +246,6 @@
   "notifications.clear": "اطلاعات ہٹائیں",
   "notifications.clear_confirmation": "کیا آپ واقعی اپنی تمام اطلاعات کو صاف کرنا چاہتے ہیں؟",
   "notifications.column_settings.alert": "ڈیسک ٹاپ اطلاعات",
-  "notifications.column_settings.filter_bar.advanced": "تمام زمرے دکھائیں",
   "notifications.column_settings.status": "New toots:",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
@@ -281,10 +261,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8eeee42a5e..77892914a4 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "E'lonlar",
   "attachments_list.unprocessed": "(qayta ishlanmagan)",
   "audio.hide": "Audioni yashirish",
-  "autosuggest_hashtag.per_week": "{count} haftasiga",
   "boost_modal.combo": "Keyingi safar buni oʻtkazib yuborish uchun {combo} tugmasini bosishingiz mumkin",
   "bundle_column_error.copy_stacktrace": "Xato hisobotini nusxalash",
   "bundle_column_error.error.body": "Soʻralgan sahifani koʻrsatib boʻlmadi. Buning sababi bizning kodimizdagi xato yoki brauzer mosligi muammosi bo'lishi mumkin.",
@@ -126,26 +125,14 @@
   "compose_form.lock_disclaimer": "Hisobingiz {locked}. Faqat obunachilarga moʻljallangan postlaringizni koʻrish uchun har kim sizni kuzatishi mumkin.",
   "compose_form.lock_disclaimer.lock": "yopilgan",
   "compose_form.placeholder": "Xalolizda nima?",
-  "compose_form.poll.add_option": "Tanlov qo'shing",
   "compose_form.poll.duration": "So‘rov muddati",
-  "compose_form.poll.option_placeholder": "Tanlov {number}",
-  "compose_form.poll.remove_option": "Olib tashlash",
   "compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish",
   "compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish",
-  "compose_form.publish": "Nashr qilish",
   "compose_form.publish_form": "Nashr qilish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "O‘zgarishlarni saqlash",
-  "compose_form.sensitive.hide": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
   "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
-  "compose_form.spoiler_placeholder": "Sharhingizni bu erga yozing",
   "confirmation_modal.cancel": "Bekor qilish",
-  "confirmations.block.block_and_report": "Bloklash va hisobot berish",
   "confirmations.block.confirm": "Bloklash",
-  "confirmations.block.message": "Haqiqatan ham {name}ni bloklamoqchimisiz?",
   "confirmations.cancel_follow_request.confirm": "Bekor qilish",
   "confirmations.cancel_follow_request.message": "Haqiqatan ham {name}ga obuna boʻlish soʻrovingizni qaytarib olmoqchimisiz?",
   "confirmations.delete.confirm": "Oʻchirish",
@@ -154,13 +141,10 @@
   "confirmations.delete_list.message": "Haqiqatan ham bu roʻyxatni butunlay oʻchirib tashlamoqchimisiz?",
   "confirmations.discard_edit_media.confirm": "Bekor qilish",
   "confirmations.discard_edit_media.message": "Sizda media tavsifi yoki oldindan ko‘rishda saqlanmagan o‘zgarishlar bor, ular baribir bekor qilinsinmi?",
-  "confirmations.domain_block.confirm": "Butun domenni bloklash",
   "confirmations.domain_block.message": "Haqiqatan ham, {domain} ni butunlay bloklamoqchimisiz? Ko'pgina hollarda bir nechta maqsadli bloklar yoki ovozni o'chirish etarli va afzaldir. Siz oʻsha domendagi kontentni hech qanday umumiy vaqt jadvallarida yoki bildirishnomalaringizda koʻrmaysiz. Bu domendagi obunachilaringiz olib tashlanadi.",
   "confirmations.logout.confirm": "Chiqish",
   "confirmations.logout.message": "Chiqishingizga aminmisiz?",
   "confirmations.mute.confirm": "Ovozsiz",
-  "confirmations.mute.explanation": "Bu ulardagi postlar va ular haqida eslatib o'tilgan postlarni yashiradi, ammo bu ularga sizning postlaringizni ko'rish va sizni kuzatish imkonini beradi.",
-  "confirmations.mute.message": "Haqiqatan ham {name} ovozini o‘chirib qo‘ymoqchimisiz?",
   "confirmations.redraft.confirm": "O'chirish va qayta loyihalash",
   "confirmations.reply.confirm": "Javob berish",
   "confirmations.reply.message": "Hozir javob bersangiz, hozir yozayotgan xabaringiz ustidan yoziladi. Davom etishni xohlaysizmi?",
@@ -266,7 +250,6 @@
   "hashtag.column_settings.tag_toggle": "Ushbu ustun uchun qo'shimcha teglarni qo'shing",
   "hashtag.follow": "Hashtagni kuzatish",
   "hashtag.unfollow": "Hashtagni kuzatishni to'xtatish",
-  "home.column_settings.basic": "Asos",
   "home.column_settings.show_reblogs": "Boostlarni ko'rish",
   "home.column_settings.show_replies": "Javoblarni ko'rish",
   "home.hide_announcements": "E'lonlarni yashirish",
@@ -326,9 +309,6 @@
   "load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}",
   "media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}",
   "moved_to_account_banner.text": "{movedToAccount} hisobiga koʻchganingiz uchun {disabledAccount} hisobingiz hozirda oʻchirib qoʻyilgan.",
-  "mute_modal.duration": "Davomiyligi",
-  "mute_modal.hide_notifications": "Bu foydalanuvchidan bildirishnomalar berkitilsinmi?",
-  "mute_modal.indefinite": "Cheksiz",
   "navigation_bar.about": "Haqida",
   "navigation_bar.blocks": "Bloklangan foydalanuvchilar",
   "navigation_bar.bookmarks": "Xatcho‘plar",
@@ -336,7 +316,6 @@
   "navigation_bar.compose": "Yangi post yozing",
   "navigation_bar.discover": "Kashf qilish",
   "navigation_bar.domain_blocks": "Bloklangan domenlar",
-  "navigation_bar.edit_profile": "Profilni tahrirlash",
   "navigation_bar.explore": "O‘rganish",
   "navigation_bar.filters": "E'tiborga olinmagan so'zlar",
   "navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
@@ -368,8 +347,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9de043bb20..102f1c3b4b 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "Có gì mới?",
   "attachments_list.unprocessed": "(chưa xử lí)",
   "audio.hide": "Ẩn âm thanh",
-  "autosuggest_hashtag.per_week": "{count} mỗi tuần",
+  "block_modal.remote_users_caveat": "Chúng tôi sẽ yêu cầu {domain} tôn trọng quyết định của bạn. Tuy nhiên, việc tuân thủ không được đảm bảo vì một số máy chủ có thể xử lý việc chặn theo cách khác nhau. Các tút công khai vẫn có thể hiển thị đối với người dùng chưa đăng nhập.",
+  "block_modal.show_less": "Thu gọn",
+  "block_modal.show_more": "Hiện thêm",
+  "block_modal.they_cant_mention": "Họ không thể nhắc đến hay theo dõi bạn.",
+  "block_modal.they_cant_see_posts": "Bạn và họ sẽ không nhìn thấy tút của nhau.",
+  "block_modal.they_will_know": "Họ sẽ biết đã bị bạn chặn.",
+  "block_modal.title": "Chặn người này?",
+  "block_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
-  "compose_form.poll.add_option": "Thêm lựa chọn",
   "compose_form.poll.duration": "Hết hạn vào",
+  "compose_form.poll.multiple": "Nhiều lựa chọn",
   "compose_form.poll.option_placeholder": "Lựa chọn {number}",
-  "compose_form.poll.remove_option": "Xóa lựa chọn này",
+  "compose_form.poll.single": "Chọn một",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
+  "compose_form.poll.type": "Loại",
   "compose_form.publish": "Đăng",
   "compose_form.publish_form": "Đăng",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lưu thay đổi",
-  "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
+  "compose_form.reply": "Trả lời",
+  "compose_form.save_changes": "Cập nhật",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
-  "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
+  "compose_form.spoiler_placeholder": "Nội dung ẩn (tùy chọn)",
   "confirmation_modal.cancel": "Hủy bỏ",
-  "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
-  "confirmations.block.message": "Bạn có thật sự muốn chặn {name}?",
   "confirmations.cancel_follow_request.confirm": "Thu hồi yêu cầu",
   "confirmations.cancel_follow_request.message": "Bạn có chắc muốn thu hồi yêu cầu theo dõi của bạn với {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
   "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi đối với phần mô tả hoặc bản xem trước của media, vẫn bỏ luôn?",
-  "confirmations.domain_block.confirm": "Ẩn toàn bộ máy chủ",
+  "confirmations.domain_block.confirm": "Chặn máy chủ",
   "confirmations.domain_block.message": "Bạn thật sự muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
   "confirmations.edit.confirm": "Sửa",
   "confirmations.edit.message": "Nội dung tút cũ sẽ bị ghi đè, bạn có tiếp tục?",
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có thật sự muốn thoát?",
   "confirmations.mute.confirm": "Ẩn",
-  "confirmations.mute.explanation": "Điều này sẽ khiến tút của họ và những tút có nhắc đến họ bị ẩn, tuy nhiên họ vẫn có thể xem tút của bạn và theo dõi bạn.",
-  "confirmations.mute.message": "Bạn thật sự muốn ẩn {name}?",
   "confirmations.redraft.confirm": "Xóa & viết lại",
   "confirmations.redraft.message": "Bạn thật sự muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt thích và đăng lại của tút, cũng như những trả lời sẽ không còn nội dung gốc.",
   "confirmations.reply.confirm": "Trả lời",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "Đây là những tút đang phổ biến trong mạng liên hợp của máy chủ này.",
   "dismissable_banner.explore_tags": "Đây là những hashtag đang được sử dụng nhiều trong mạng liên hợp của máy chủ này.",
   "dismissable_banner.public_timeline": "Đây là những tút công khai gần đây trong mạng liên hợp của máy chủ {domain}.",
+  "domain_block_modal.block": "Chặn máy chủ",
+  "domain_block_modal.block_account_instead": "Chỉ chặn {name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "Thành viên máy chủ này có thể tương tác với các tút cũ của bạn.",
+  "domain_block_modal.they_cant_follow": "Không ai trên máy chủ này có thể theo dõi bạn.",
+  "domain_block_modal.they_wont_know": "Họ sẽ không biết đã bị bạn chặn.",
+  "domain_block_modal.title": "Chặn máy chủ?",
+  "domain_block_modal.you_will_lose_followers": "Những người theo dõi bạn ở máy chủ này sẽ bị xóa.",
+  "domain_block_modal.you_wont_see_posts": "Bạn sẽ không thấy tút hoặc thông báo từ thành viên máy chủ này.",
+  "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người không chỉ trên Mastodon mà còn trên các ứng dụng xã hội khác.",
+  "domain_pill.activitypub_like_language": "ActivityPub giống như ngôn ngữ Mastodon giao tiếp với các mạng xã hội khác.",
+  "domain_pill.server": "Máy chủ",
+  "domain_pill.their_handle": "Địa chỉ Mastodon:",
+  "domain_pill.their_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của ai đó.",
+  "domain_pill.their_username": "Danh tính duy nhất của họ trên máy chủ này. Có thể có tên người dùng giống nhau trên các máy chủ khác.",
+  "domain_pill.username": "Tên người dùng",
+  "domain_pill.whats_in_a_handle": "Địa chỉ Mastodon là gì?",
+  "domain_pill.who_they_are": "Vì địa chỉ Mastodon cho biết một người là ai và họ ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có <button>hỗ trợ ActivityPub</button>.",
+  "domain_pill.who_you_are": "Vì địa chỉ Mastodon cho biết bạn là ai và bạn ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng có <button>hỗ trợ ActivityPub</button>.",
+  "domain_pill.your_handle": "Địa chỉ Mastodon của bạn:",
+  "domain_pill.your_server": "Ngôi nhà kỹ thuật số, nơi lưu giữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và mang theo người theo dõi của bạn.",
+  "domain_pill.your_username": "Danh tính duy nhất của bạn trên máy chủ này. Có thể có tên người dùng giống bạn trên các máy chủ khác.",
   "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
   "embed.preview": "Nó sẽ hiển thị như vầy:",
   "emoji_button.activity": "Hoạt động",
@@ -244,6 +266,7 @@
   "empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
   "empty_column.lists": "Bạn chưa tạo danh sách nào.",
   "empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
+  "empty_column.notification_requests": "Sạch sẽ! Không còn gì ở đây. Khi bạn nhận được thông báo mới, chúng sẽ xuất hiện ở đây theo cài đặt của bạn.",
   "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử theo dõi hoặc nhắn riêng cho ai đó.",
   "empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu theo dõi những người khác",
   "error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
+  "filtered_notifications_banner.mentions": "{count, plural, other {lượt nhắc}}",
+  "filtered_notifications_banner.pending_requests": "Thông báo từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
+  "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",
   "firehose.local": "Máy chủ này",
   "firehose.remote": "Máy chủ khác",
-  "follow_request.authorize": "Cho phép",
+  "follow_request.authorize": "Chấp nhận",
   "follow_request.reject": "Từ chối",
   "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu theo dõi từ những người khác.",
+  "follow_suggestions.curated_suggestion": "Gợi ý từ máy chủ",
+  "follow_suggestions.dismiss": "Không hiện lại",
+  "follow_suggestions.featured_longer": "Tuyển chọn bởi {domain}",
+  "follow_suggestions.friends_of_friends_longer": "Nổi tiếng với những người mà bạn theo dõi",
+  "follow_suggestions.hints.featured": "Người này được đội ngũ {domain} đề xuất.",
+  "follow_suggestions.hints.friends_of_friends": "Người này nổi tiếng với những người bạn theo dõi.",
+  "follow_suggestions.hints.most_followed": "Người này được theo dõi nhiều nhất trên {domain}.",
+  "follow_suggestions.hints.most_interactions": "Người này đang thu hút sự chú ý trên {domain}.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Người này có nét giống những người mà bạn theo dõi gần đây.",
+  "follow_suggestions.personalized_suggestion": "Gợi ý cá nhân hóa",
+  "follow_suggestions.popular_suggestion": "Những người nổi tiếng",
+  "follow_suggestions.popular_suggestion_longer": "Nổi tiếng trên {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Tương tự những người mà bạn theo dõi gần đây",
+  "follow_suggestions.view_all": "Xem tất cả",
+  "follow_suggestions.who_to_follow": "Gợi ý theo dõi",
   "followed_tags": "Hashtag theo dõi",
   "footer.about": "Giới thiệu",
   "footer.directory": "Cộng đồng",
@@ -306,13 +347,8 @@
   "hashtag.follow": "Theo dõi hashtag",
   "hashtag.unfollow": "Bỏ theo dõi hashtag",
   "hashtags.and_other": "…và {count, plural, other {# nữa}}",
-  "home.actions.go_to_explore": "Khám phá xu hướng",
-  "home.actions.go_to_suggestions": "Tìm người theo dõi",
-  "home.column_settings.basic": "Tùy chỉnh",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
-  "home.explore_prompt.body": "Bảng tin của bạn sẽ bao gồm các tút có hashtag bạn theo dõi, những người bạn theo dõi và các tút mà họ đăng lại. Lúc này có vẻ hơi trống, sao bạn không:",
-  "home.explore_prompt.title": "Đây là ngôi nhà Mastodon của bạn.",
   "home.hide_announcements": "Ẩn thông báo máy chủ",
   "home.pending_critical_update.body": "Vui lòng cập nhật máy chủ Mastodon của bạn càng sớm càng tốt!",
   "home.pending_critical_update.link": "Xem bản cập nhật",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "Đang tải…",
   "media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
   "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
-  "mute_modal.duration": "Thời hạn",
-  "mute_modal.hide_notifications": "Ẩn thông báo từ người này?",
-  "mute_modal.indefinite": "Vĩnh viễn",
+  "mute_modal.hide_from_notifications": "Ẩn thông báo",
+  "mute_modal.hide_options": "Tùy chọn ẩn",
+  "mute_modal.indefinite": "Cho tới khi bỏ ẩn",
+  "mute_modal.show_options": "Hiển thị tùy chọn",
+  "mute_modal.they_can_mention_and_follow": "Họ có thể nhắc đến và theo dõi bạn, nhưng bạn không thấy họ.",
+  "mute_modal.they_wont_know": "Họ sẽ không biết đã bị bạn ẩn.",
+  "mute_modal.title": "Ẩn người này?",
+  "mute_modal.you_wont_see_mentions": "Bạn sẽ không nhìn thấy tút có nhắc đến họ.",
+  "mute_modal.you_wont_see_posts": "Bạn sẽ không nhìn thấy tút của họ.",
   "navigation_bar.about": "Giới thiệu",
   "navigation_bar.advanced_interface": "Dùng bố cục nhiều cột",
   "navigation_bar.blocks": "Người đã chặn",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.edit_profile": "Sửa hồ sơ",
   "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Lượt thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
   "notification.mention": "{name} nhắc đến bạn",
+  "notification.moderation-warning.learn_more": "Tìm hiểu",
+  "notification.moderation_warning": "Bạn vừa nhận một cảnh báo kiểm duyệt",
+  "notification.moderation_warning.action_delete_statuses": "Một vài tút của bạn bị gỡ.",
+  "notification.moderation_warning.action_disable": "Tài khoản của bạn đã bị vô hiệu hóa.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Vài tút bạn bị đánh dấu nhạy cảm.",
+  "notification.moderation_warning.action_none": "Bạn đã nhận một cảnh báo kiểm duyệt.",
+  "notification.moderation_warning.action_sensitive": "Tút của bạn sẽ bị đánh dấu nhạy cảm kể từ bây giờ.",
+  "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
+  "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
   "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
+  "notification.relationships_severance_event": "Mất kết nối với {name}",
+  "notification.relationships_severance_event.account_suspension": "Quản trị viên {from} đã vô hiệu hóa {target}, điều này có nghĩa là bạn không còn có thể nhận được cập nhật từ họ hoặc tương tác với họ nữa.",
+  "notification.relationships_severance_event.domain_block": "Quản trị viên {from} đã chặn {target}, bao gồm {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} mà bạn theo dõi.",
+  "notification.relationships_severance_event.learn_more": "Tìm hiểu thêm",
+  "notification.relationships_severance_event.user_domain_block": "Bạn đã chặn {target}, xóa {followersCount} người theo dõi bạn và {followingCount, plural, other {# người}} theo dõi bạn.",
   "notification.status": "{name} đăng tút mới",
   "notification.update": "{name} đã sửa tút",
+  "notification_requests.accept": "Chấp nhận",
+  "notification_requests.dismiss": "Bỏ qua",
+  "notification_requests.notifications_from": "Thông báo từ {name}",
+  "notification_requests.title": "Thông báo đã lọc",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
   "notifications.column_settings.admin.report": "Báo cáo mới:",
@@ -444,8 +503,7 @@
   "notifications.column_settings.alert": "Báo trên máy tính",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
-  "notifications.column_settings.filter_bar.category": "Phân loại",
-  "notifications.column_settings.filter_bar.show_bar": "Hiện bộ lọc",
+  "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
   "notifications.column_settings.follow": "Người theo dõi:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
   "notifications.column_settings.mention": "Lượt nhắc đến:",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "Trình duyệt không cho phép hiển thị thông báo trên màn hình.",
   "notifications.permission_denied_alert": "Không thể bật thông báo trên màn hình bởi vì trình duyệt đã cấm trước đó",
   "notifications.permission_required": "Không hiện thông báo trên màn hình bởi vì chưa cho phép.",
+  "notifications.policy.filter_new_accounts.hint": "Đã tạo trong vòng {days, plural, other {# ngày}}",
+  "notifications.policy.filter_new_accounts_title": "Tài khoản mới",
+  "notifications.policy.filter_not_followers_hint": "Bao gồm những người đã theo dõi bạn ít hơn {days, plural, other {# ngày}}",
+  "notifications.policy.filter_not_followers_title": "Những người không theo dõi bạn",
+  "notifications.policy.filter_not_following_hint": "Cho tới khi bạn duyệt họ",
+  "notifications.policy.filter_not_following_title": "Những người bạn không theo dõi",
+  "notifications.policy.filter_private_mentions_hint": "Được lọc trừ khi nó trả lời lượt nhắc từ bạn hoặc nếu bạn theo dõi người gửi",
+  "notifications.policy.filter_private_mentions_title": "Lượt nhắc riêng tư không được yêu cầu",
+  "notifications.policy.title": "Lọc ra thông báo từ…",
   "notifications_permission_banner.enable": "Cho phép thông báo trên màn hình",
   "notifications_permission_banner.how_to_control": "Hãy bật thông báo trên màn hình để không bỏ lỡ những thông báo từ Mastodon. Một khi đã bật, bạn có thể lựa chọn từng loại thông báo khác nhau thông qua {icon} nút bên dưới.",
   "notifications_permission_banner.title": "Không bỏ lỡ điều thú vị nào",
@@ -526,13 +593,14 @@
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Chọn kiểu tút",
-  "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
-  "privacy.direct.short": "Nhắn riêng",
-  "privacy.private.long": "Dành riêng cho người theo dõi",
-  "privacy.private.short": "Chỉ người theo dõi",
-  "privacy.public.long": "Hiển thị với mọi người",
+  "privacy.direct.long": "Những người được nhắc trong tút",
+  "privacy.direct.short": "Người cụ thể",
+  "privacy.private.long": "Chỉ người theo dõi",
+  "privacy.private.short": "Người theo dõi",
+  "privacy.public.long": "Bất cứ ai",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
+  "privacy.unlisted.additional": "Giống hệt như công khai, ngoại trừ tút sẽ không xuất hiện trong bảng tin hoặc hashtag, khám phá hoặc tìm kiếm Mastodon, ngay cả khi bạn chọn cho phép trong cài đặt tài khoản.",
+  "privacy.unlisted.long": "Ít hướng thuật toán hơn",
   "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} phút",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hôm nay",
+  "reply_indicator.attachments": "{count, plural, other {# tập tin đính kèm}}",
   "reply_indicator.cancel": "Hủy bỏ",
+  "reply_indicator.poll": "Bình chọn",
   "report.block": "Chặn",
   "report.block_explanation": "Bạn sẽ không còn thấy tút của người này. Họ sẽ không thể thấy tút của bạn hoặc theo dõi bạn. Họ biết là bạn đã chặn họ.",
   "report.categories.legal": "Phạm pháp",
@@ -644,10 +714,11 @@
   "status.direct": "Nhắn riêng @{name}",
   "status.direct_indicator": "Nhắn riêng",
   "status.edit": "Sửa",
-  "status.edited": "Đã sửa {date}",
+  "status.edited": "Sửa lần cuối {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
   "status.embed": "Nhúng",
   "status.favourite": "Thích",
+  "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",
   "status.filtered": "Bộ lọc",
   "status.hide": "Ẩn tút",
@@ -668,6 +739,7 @@
   "status.reblog": "Đăng lại",
   "status.reblog_private": "Đăng lại (Riêng tư)",
   "status.reblogged_by": "{name} đăng lại",
+  "status.reblogs": "{count, plural, other {đăng lại}}",
   "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
@@ -715,10 +787,8 @@
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
   "upload_form.audio_description": "Mô tả cho người mất thính giác",
   "upload_form.description": "Mô tả cho người khiếm thị",
-  "upload_form.description_missing": "Chưa thêm mô tả",
   "upload_form.edit": "Biên tập",
   "upload_form.thumbnail": "Đổi ảnh thumbnail",
-  "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
   "upload_modal.apply": "Áp dụng",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 008a9636db..1d3a22108c 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -22,7 +22,6 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
-  "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
@@ -44,18 +43,14 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
   "compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?",
-  "compose_form.poll.option_placeholder": "ⴰⵙⵜⵜⴰⵢ {number}",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ⵙⵔ",
   "confirmations.block.confirm": "ⴳⴷⵍ",
-  "confirmations.block.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴳⴷⵍⴷ {name}?",
   "confirmations.delete.confirm": "ⴽⴽⵙ",
   "confirmations.delete.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⵜⴰⵥⵕⵉⴳⵜ ⴰ?",
   "confirmations.delete_list.confirm": "ⴽⴽⵙ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.logout.confirm": "ⴼⴼⵖ",
   "confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?",
   "confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ",
@@ -129,7 +124,6 @@
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
@@ -161,8 +155,6 @@
   "poll_button.add_poll": "ⵔⵏⵓ ⵢⴰⵏ ⵢⵉⴷⵣ",
   "poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
   "regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
   "relative_time.days": "{number}ⴰⵙ",
@@ -211,7 +203,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "ⵙⵏⴼⵍ",
-  "upload_form.undo": "ⴽⴽⵙ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
   "upload_progress.label": "Uploading…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 720e4331b3..ab6fe0bd70 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -21,7 +21,7 @@
   "account.blocked": "已屏蔽",
   "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
   "account.cancel_follow_request": "撤回关注请求",
-  "account.copy": "复制资料卡链接",
+  "account.copy": "复制个人资料链接",
   "account.direct": "私下提及 @{name}",
   "account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
   "account.domain_blocked": "域名已屏蔽",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "关闭通知",
   "account.mute_short": "隐藏",
   "account.muted": "已隐藏",
-  "account.mutual": "互粉好友",
+  "account.mutual": "互相关注",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
@@ -89,7 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "autosuggest_hashtag.per_week": "每星期 {count} 条",
+  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，无法保证对方一定遵从，因为某些服务器可能会以不同的方式处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
+  "block_modal.show_less": "显示更少",
+  "block_modal.show_more": "显示更多",
+  "block_modal.they_cant_mention": "他们不能提及或关注你。",
+  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
+  "block_modal.they_will_know": "他们可以看到他们被屏蔽。",
+  "block_modal.title": "屏蔽用户？",
+  "block_modal.you_wont_see_mentions": "你不会看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "你的账户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
   "compose_form.lock_disclaimer.lock": "开启保护",
   "compose_form.placeholder": "想写什么？",
-  "compose_form.poll.add_option": "添加选项",
   "compose_form.poll.duration": "投票期限",
+  "compose_form.poll.multiple": "多选",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "移除此选项",
+  "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
+  "compose_form.poll.type": "样式",
   "compose_form.publish": "发布",
   "compose_form.publish_form": "发布",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "保存更改",
-  "compose_form.sensitive.hide": "标记媒体为敏感内容",
-  "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
-  "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
+  "compose_form.reply": "回复",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
-  "compose_form.spoiler_placeholder": "写下你的警告",
+  "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
-  "confirmations.block.message": "确定要屏蔽 {name} 吗？",
   "confirmations.cancel_follow_request.confirm": "撤回请求",
   "confirmations.cancel_follow_request.message": "确定撤回关注 {name} 的请求吗？",
   "confirmations.delete.confirm": "删除",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "确定永久删除这个列表吗？",
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
-  "confirmations.domain_block.confirm": "屏蔽整个域名",
+  "confirmations.domain_block.confirm": "屏蔽服务器",
   "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，对几个特定的用户进行屏蔽或禁用对他们的消息提醒就足够了。屏蔽后，来自该域名的内容将不再出现在你任何的公共时间轴或通知列表里，你来自该域名下的关注者也将被移除。",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
   "confirmations.mute.confirm": "隐藏",
-  "confirmations.mute.explanation": "他们的嘟文以及提到他们的嘟文都会隐藏，但他们仍然可以看到你的嘟文，也可以关注你。",
-  "confirmations.mute.message": "你确定要隐藏 {name} 吗？",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
   "confirmations.reply.confirm": "回复",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "这些是目前在社交网络上引起关注的嘟文。嘟文的喜欢和转嘟次数越多，排名越高。",
   "dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。",
   "dismissable_banner.public_timeline": "这些是在 {domain} 上关注的人们最新发布的公开嘟文。",
+  "domain_block_modal.block": "屏蔽服务器",
+  "domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
+  "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
+  "domain_block_modal.they_wont_know": "他们不会知道自己被屏蔽。",
+  "domain_block_modal.title": "屏蔽该域名？",
+  "domain_block_modal.you_will_lose_followers": "该服务器上你的所有关注者都会被删除。",
+  "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
+  "domain_pill.activitypub_lets_connect": "它让你不仅能与Mastodon上的人交流互动，还能与其它不同社交应用上的人联系。",
+  "domain_pill.activitypub_like_language": "ActivityPub就像Mastodon与其它社交网络交流时使用的语言。",
+  "domain_pill.server": "服务器",
+  "domain_pill.their_handle": "它们的代号：",
+  "domain_pill.their_server": "它们的数字家园，它们的所有嘟文都存放在那里。",
+  "domain_pill.their_username": "它们在它们的服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
+  "domain_pill.username": "用户名",
+  "domain_pill.whats_in_a_handle": "代号里都有什么？",
+  "domain_pill.who_they_are": "代号可以告诉你一个人是谁和在哪里，所以你可以在社交网络上与<button>由ActivityPub驱动的不同平台</button>的人们互动。",
+  "domain_pill.who_you_are": "你的代号可以告诉别人你是谁和你在哪里，这样社交网络上来自<button>由ActivityPub驱动的不同平台</button>的人们就可以与你互动。",
+  "domain_pill.your_handle": "你的代号：",
+  "domain_pill.your_server": "你的数字家园，你的所有嘟文都存放在这里。不喜欢这个服务器吗？随时带上你的关注者一起迁移到其它服务器。",
+  "domain_pill.your_username": "你在这个服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
   "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
   "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
@@ -244,6 +266,7 @@
   "empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
   "empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
   "empty_column.mutes": "你没有隐藏任何用户。",
+  "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据您的设置显示在这里。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
   "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
+  "filtered_notifications_banner.mentions": "{count, plural, other {提及}}",
+  "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}的通知",
+  "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
   "firehose.remote": "其他服务器",
   "follow_request.authorize": "同意",
   "follow_request.reject": "拒绝",
   "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
+  "follow_suggestions.curated_suggestion": "站务人员精选",
+  "follow_suggestions.dismiss": "不再显示",
+  "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
+  "follow_suggestions.friends_of_friends_longer": "在你关注的人中很受欢迎",
+  "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
+  "follow_suggestions.hints.friends_of_friends": "该用户在您关注的人中很受欢迎。",
+  "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
+  "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 上获得了很多关注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "该用户与您最近关注的用户类似。",
+  "follow_suggestions.personalized_suggestion": "个性化建议",
+  "follow_suggestions.popular_suggestion": "热门建议",
+  "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
+  "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
+  "follow_suggestions.view_all": "查看全部",
+  "follow_suggestions.who_to_follow": "推荐关注",
   "followed_tags": "关注的话题标签",
   "footer.about": "关于",
   "footer.directory": "用户目录",
@@ -306,13 +347,8 @@
   "hashtag.follow": "关注话题标签",
   "hashtag.unfollow": "取消关注话题标签",
   "hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
-  "home.actions.go_to_explore": "查看热门话题",
-  "home.actions.go_to_suggestions": "寻找要关注的人",
-  "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
-  "home.explore_prompt.body": "你的主页动态会推送一系列关注的话题标签和用户，以及转发的嘟文。如果你觉得过于清净，不妨试一下：",
-  "home.explore_prompt.title": "这是你在 Mastodon 的主页。",
   "home.hide_announcements": "隐藏公告",
   "home.pending_critical_update.body": "请尽快更新您的 Mastodon 服务器！",
   "home.pending_critical_update.link": "查看更新",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "加载中…",
   "media_gallery.toggle_visible": "{number, plural, other {隐藏图像}}",
   "moved_to_account_banner.text": "您的账号 {disabledAccount} 已禁用，因为您已迁移到 {movedToAccount}。",
-  "mute_modal.duration": "持续时长",
-  "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
-  "mute_modal.indefinite": "无期限",
+  "mute_modal.hide_from_notifications": "从通知中隐藏",
+  "mute_modal.hide_options": "隐藏选项",
+  "mute_modal.indefinite": "直到我取消隐藏他们",
+  "mute_modal.show_options": "显示选项",
+  "mute_modal.they_can_mention_and_follow": "他们可以提及和关注你，但是你看不到他们。",
+  "mute_modal.they_wont_know": "它们不会知道自己已被隐藏。",
+  "mute_modal.title": "隐藏用户？",
+  "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
+  "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
   "navigation_bar.about": "关于",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "私下提及",
   "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
-  "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "忽略的关键词",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} 开始关注你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.mention": "{name} 提及了你",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "你收到了一条管理警告",
+  "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
+  "notification.moderation_warning.action_disable": "你的账号已被禁用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
+  "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
+  "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
+  "notification.moderation_warning.action_silence": "你的账号已被限制。",
+  "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
   "notification.reblog": "{name} 转发了你的嘟文",
+  "notification.relationships_severance_event": "与 {name} 的联系已断开",
+  "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
+  "notification.relationships_severance_event.domain_block": "一名来自 {from} 的管理员已经屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "你已经屏蔽了 {target}，移除了你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "拒绝",
+  "notification_requests.notifications_from": "来自 {name} 的通知",
+  "notification_requests.title": "通知（已过滤）",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
   "notifications.column_settings.admin.report": "新举报：",
@@ -444,8 +503,7 @@
   "notifications.column_settings.alert": "桌面通知",
   "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
-  "notifications.column_settings.filter_bar.category": "快速过滤栏",
-  "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
+  "notifications.column_settings.filter_bar.category": "快速筛选栏",
   "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
   "notifications.column_settings.mention": "提及：",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
   "notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
   "notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
+  "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
+  "notifications.policy.filter_new_accounts_title": "新账户",
+  "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
+  "notifications.policy.filter_not_followers_title": "未关注你的人",
+  "notifications.policy.filter_not_following_hint": "直到你手动批准",
+  "notifications.policy.filter_not_following_title": "你没有关注的人",
+  "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
+  "notifications.policy.filter_private_mentions_title": "不请自来的提及",
+  "notifications.policy.title": "通知过滤范围",
   "notifications_permission_banner.enable": "启用桌面通知",
   "notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
   "notifications_permission_banner.title": "精彩不容错过",
@@ -526,14 +593,15 @@
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
-  "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "仅提到的人",
-  "privacy.private.long": "仅对关注者可见",
-  "privacy.private.short": "仅关注者可见",
-  "privacy.public.long": "所有人可见",
+  "privacy.direct.long": "帖子中提到的每个人",
+  "privacy.direct.short": "具体的人",
+  "privacy.private.long": "仅限您的关注者",
+  "privacy.private.short": "关注者",
+  "privacy.public.long": "所有 Mastodon 内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.long": "所有人可见，但不在探索功能出现",
-  "privacy.unlisted.short": "不公开",
+  "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
+  "privacy.unlisted.long": "减少算法影响",
+  "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
   "recommended": "推荐",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} 分钟前",
   "relative_time.seconds": "{number} 秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "屏蔽",
   "report.block_explanation": "你将无法看到他们的嘟文。他们也将无法看到你的嘟文或关注你。他们将能够判断出他们被屏蔽了。",
   "report.categories.legal": "法律义务",
@@ -644,10 +714,11 @@
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私下提及",
   "status.edit": "编辑",
-  "status.edited": "编辑于 {date}",
+  "status.edited": "最近编辑于 {date}",
   "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "喜欢",
+  "status.favourites": "{count, plural, other {次喜欢}}",
   "status.filter": "过滤此嘟文",
   "status.filtered": "已过滤",
   "status.hide": "隐藏嘟文",
@@ -668,6 +739,7 @@
   "status.reblog": "转嘟",
   "status.reblog_private": "转嘟（可见者不变）",
   "status.reblogged_by": "{name} 转嘟了",
+  "status.reblogs": "{count, plural, other {次转嘟}}",
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
@@ -715,10 +787,8 @@
   "upload_error.poll": "投票中不允许上传文件。",
   "upload_form.audio_description": "为听障人士添加文字描述",
   "upload_form.description": "为视觉障碍人士添加文字说明",
-  "upload_form.description_missing": "未添加描述",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
-  "upload_form.undo": "删除",
   "upload_form.video_description": "为听障人士和视障人士添加文字描述",
   "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index cd0845b6e2..eaa5dabe93 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,7 +89,14 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "每週 {count} 次",
+  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重你的決定。然而，由於部份伺服器可能以不同方式處理封鎖，因此無法保證一定會成功。公開帖文仍然有機會被未登入的使用者看見。",
+  "block_modal.show_less": "顯示更少",
+  "block_modal.show_more": "顯示更多",
+  "block_modal.they_cant_mention": "對方無法提及和追蹤你。",
+  "block_modal.they_cant_see_posts": "你們無法看到對方的帖文。",
+  "block_modal.they_will_know": "對方會看到自己被封鎖。",
+  "block_modal.title": "封鎖使用者？",
+  "block_modal.you_wont_see_mentions": "你將不會看到提及對方的帖文。",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
   "compose_form.placeholder": "你在想甚麼？",
-  "compose_form.poll.add_option": "新增選擇",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選擇",
-  "compose_form.poll.remove_option": "移除此選擇",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
+  "compose_form.poll.type": "風格",
   "compose_form.publish": "發佈",
   "compose_form.publish_form": "發佈",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "標記媒體為敏感內容",
-  "compose_form.sensitive.marked": "媒體被標示為敏感",
-  "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "文字被警告隱藏",
   "compose_form.spoiler.unmarked": "文字沒有被隱藏",
-  "compose_form.spoiler_placeholder": "敏感警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.block.message": "你確定要封鎖{name}嗎？",
   "confirmations.cancel_follow_request.confirm": "撤回請求",
   "confirmations.cancel_follow_request.message": "您確定要撤回追蹤 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
-  "confirmations.domain_block.confirm": "封鎖整個網站",
+  "confirmations.domain_block.confirm": "封鎖伺服器",
   "confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，封鎖或靜音幾個特定目標就已經有效，也是比較建議的做法。若然封鎖全站，你將不會再在這裏看到該站的內容和通知。來自該站的關注者亦會被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "現在編輯將會覆蓋你目前正在撰寫的訊息。你確定要繼續嗎？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
-  "confirmations.mute.explanation": "這將會隱藏來自他們的貼文與通知，但是他們還是可以查閱你的貼文與關注你。",
-  "confirmations.mute.message": "你確定要將{name}靜音嗎？",
   "confirmations.redraft.confirm": "刪除並編輯",
   "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
   "confirmations.reply.confirm": "回覆",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "這些是今天在社交網絡上受到關注的帖文。新的帖文如果有較多轉推和最愛會排得更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被本站以及去中心化網路上的人們熱烈討論。",
   "dismissable_banner.public_timeline": "這些是 {domain} 使用者追蹤的社交網絡上最新的公開帖文。",
+  "domain_block_modal.block": "封鎖伺服器",
+  "domain_block_modal.block_account_instead": "封鎖 @{name} 即可",
+  "domain_block_modal.they_can_interact_with_old_posts": "此伺服器的人們可與你的舊帖文互動。",
+  "domain_block_modal.they_cant_follow": "此伺服器的人無法追蹤你。",
+  "domain_block_modal.they_wont_know": "對方不會知道自己被封鎖。",
+  "domain_block_modal.title": "封鎖網域？",
+  "domain_block_modal.you_will_lose_followers": "你在此伺服器的所有追蹤者都將會被移除。",
+  "domain_block_modal.you_wont_see_posts": "你將看不到此伺服器使用者的帖文和通知。",
+  "domain_pill.activitypub_lets_connect": "這讓你不僅能在 Mastodon 上，也能在其他社交應用程式中與人交流互動。",
+  "domain_pill.activitypub_like_language": "ActivityPub 就像 Mastodon 與其他社交網絡溝通所用的語言。",
+  "domain_pill.server": "伺服器",
+  "domain_pill.their_handle": "他們的帳號：",
+  "domain_pill.their_server": "他們的數碼家園，所有帖文的棲息地。",
+  "domain_pill.their_username": "在他們的伺服器上的獨特識別碼。不同伺服器上的使用者有可能擁有相同的使用者名稱。",
+  "domain_pill.username": "使用者名稱",
+  "domain_pill.whats_in_a_handle": "帳號是甚麼？",
+  "domain_pill.who_they_are": "帳號代表了使用者的身份和所在之處，因此你能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與他人互動交流。",
+  "domain_pill.who_you_are": "你的帳號代表了你的身份和所在之處，因此人們能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與你互動交流。",
+  "domain_pill.your_handle": "你的帳號：",
+  "domain_pill.your_server": "你的數碼家園，你所有帖文的棲息地。不喜歡這裏嗎？隨時搬家到其他伺服器，把你的追蹤者也帶來。",
+  "domain_pill.your_username": "你在這台伺服器的獨特識別碼。可以在不同伺服器上找到相同使用者名稱的人。",
   "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。",
   "embed.preview": "看上去會是這樣：",
   "emoji_button.activity": "活動",
@@ -244,6 +266,7 @@
   "empty_column.list": "這個列表暫時未有內容。",
   "empty_column.lists": "你還沒有建立任何名單。這裡將會顯示你所建立的名單。",
   "empty_column.mutes": "你尚未靜音任何使用者。",
+  "empty_column.notification_requests": "沒有新通知了！當有新通知時，會根據設定顯示在這裏。",
   "empty_column.notifications": "你沒有任何通知紀錄，快向其他用戶搭訕吧。",
   "empty_column.public": "跨站時間軸暫時沒有內容！快寫一些公共的文章，或者關注另一些服務站的用戶吧！你和本站、友站的交流，將決定這裏出現的內容。",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，故無法正常顯示頁面。",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "使用既有類別，或創建一個新類別",
   "filter_modal.select_filter.title": "過濾此帖文",
   "filter_modal.title.status": "過濾一則帖文",
+  "filtered_notifications_banner.mentions": "{count, plural, one {則提及} other {則提及}}",
+  "filtered_notifications_banner.pending_requests": "來自 {count, plural, =0 {0 位} other {# 位}}你可能認識的人的通知",
+  "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本伺服器",
   "firehose.remote": "其他伺服器",
   "follow_request.authorize": "批准",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即使您的帳號未上鎖，{domain} 的工作人員認為您可能會想手動審核來自這些帳號的追蹤請求。",
+  "follow_suggestions.curated_suggestion": "編輯精選",
+  "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.featured_longer": "{domain} 團隊精選",
+  "follow_suggestions.friends_of_friends_longer": "受你的追蹤對象歡迎",
+  "follow_suggestions.hints.featured": "這個人檔案是由 {domain} 團隊精挑細選。",
+  "follow_suggestions.hints.friends_of_friends": "這個人檔案在你追蹤的人當中很受歡迎。",
+  "follow_suggestions.hints.most_followed": "這個人檔案是在 {domain} 上最多追蹤之一。",
+  "follow_suggestions.hints.most_interactions": "這個人檔案最近在 {domain} 上備受關注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "這個人檔案與你最近追蹤的類似。",
+  "follow_suggestions.personalized_suggestion": "個人化推薦",
+  "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.popular_suggestion_longer": "{domain} 熱門",
+  "follow_suggestions.similar_to_recently_followed_longer": "與你最近追蹤的帳號相似",
+  "follow_suggestions.view_all": "查看所有",
+  "follow_suggestions.who_to_follow": "追蹤對象",
   "followed_tags": "已追蹤標籤",
   "footer.about": "關於",
   "footer.directory": "個人檔案目錄",
@@ -306,13 +347,8 @@
   "hashtag.follow": "追蹤主題標籤",
   "hashtag.unfollow": "取消追蹤主題標籤",
   "hashtags.and_other": "…及{count, plural, other {其他 # 個}}",
-  "home.actions.go_to_explore": "即時熱門話題",
-  "home.actions.go_to_suggestions": "尋找追蹤對象",
-  "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
-  "home.explore_prompt.body": "你的首頁時間軸將顯示來自你追蹤的標籤、使用者及他們轉推的帖文。如果時間軸感覺太安靜，你可以考慮：",
-  "home.explore_prompt.title": "這是你在 Mastodon 中的主頁。",
   "home.hide_announcements": "隱藏公告",
   "home.pending_critical_update.body": "請盡快更新你的 Mastodon 伺服器！",
   "home.pending_critical_update.link": "查看更新",
@@ -396,9 +432,15 @@
   "loading_indicator.label": "載入中…",
   "media_gallery.toggle_visible": "隱藏圖片",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
-  "mute_modal.duration": "時間",
-  "mute_modal.hide_notifications": "需要隱藏這使用者的通知嗎？",
-  "mute_modal.indefinite": "沒期限",
+  "mute_modal.hide_from_notifications": "隱藏通知",
+  "mute_modal.hide_options": "隱藏選項",
+  "mute_modal.indefinite": "直至我將對方解除靜音",
+  "mute_modal.show_options": "顯示選項",
+  "mute_modal.they_can_mention_and_follow": "對方能提及和追蹤你，但你將看不到對方。",
+  "mute_modal.they_wont_know": "對方不會知道自己被靜音。",
+  "mute_modal.title": "將使用者靜音？",
+  "mute_modal.you_wont_see_mentions": "你將看不到提及他們的帖文。",
+  "mute_modal.you_wont_see_posts": "他們仍能看到你的帖文，但你將看不到他們的。",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "在進階網頁介面打開",
   "navigation_bar.blocks": "封鎖名單",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "私人提及",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
-  "navigation_bar.edit_profile": "修改個人資料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
@@ -432,11 +473,28 @@
   "notification.follow": "{name} 開始追蹤你",
   "notification.follow_request": "{name} 要求追蹤你",
   "notification.mention": "{name} 提及你",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning.action_delete_statuses": "你的部份帖文已被刪除。",
+  "notification.moderation_warning.action_disable": "你的帳號已被停用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "你某些帖文已被標記為敏感內容。",
+  "notification.moderation_warning.action_none": "你的帳號收到一則審核警告。",
+  "notification.moderation_warning.action_sensitive": "從現在起，你的帖文將被標記為敏感內容。",
+  "notification.moderation_warning.action_silence": "你的帳號已受到限制。",
+  "notification.moderation_warning.action_suspend": "你的帳號已被停權。",
   "notification.own_poll": "你的投票已結束",
   "notification.poll": "你參與過的一個投票已經結束",
   "notification.reblog": "{name} 轉推你的文章",
+  "notification.relationships_severance_event": "失去與 {name} 的連結",
+  "notification.relationships_severance_event.account_suspension": "{from} 的管理員已將 {target} 停權，這表示你無法再收到他們的更新或與他們互動。",
+  "notification.relationships_severance_event.domain_block": "{from} 的管理員已封鎖 {target}，包括你的 {followersCount} 位追蹤者和 {followingCount, plural, other {# 個你追蹤的帳號}}。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "你已封鎖 {target}，並移除了你的 {followersCount} 位追蹤者和你追蹤的 {followingCount, plural, other {# 個帳號}}。",
   "notification.status": "{name} 剛發表了文章",
   "notification.update": "{name} 編輯了帖文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "忽略",
+  "notification_requests.notifications_from": "來自 {name} 的通知",
+  "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清空通知紀錄",
   "notifications.clear_confirmation": "你確定要清空通知紀錄嗎？",
   "notifications.column_settings.admin.report": "新舉報：",
@@ -444,8 +502,7 @@
   "notifications.column_settings.alert": "顯示桌面通知",
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
-  "notifications.column_settings.filter_bar.category": "快速過濾欄",
-  "notifications.column_settings.filter_bar.show_bar": "顯示篩選欄",
+  "notifications.column_settings.filter_bar.category": "快速篩選欄",
   "notifications.column_settings.follow": "新追蹤者：",
   "notifications.column_settings.follow_request": "新的追蹤請求：",
   "notifications.column_settings.mention": "提及你：",
@@ -471,6 +528,15 @@
   "notifications.permission_denied": "本站不能發送桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
   "notifications.permission_denied_alert": "無法啟用桌面通知，因為瀏覽器先前拒絕了本站的桌面通知權限請求",
   "notifications.permission_required": "由於瀏覽器未有授予桌面通知權限，本站暫未能發送桌面通知。",
+  "notifications.policy.filter_new_accounts.hint": "在過去 {days, plural, other {# 天}}內建立",
+  "notifications.policy.filter_new_accounts_title": "新帳號",
+  "notifications.policy.filter_not_followers_hint": "包括追蹤你不到 {days, plural, other {# 天}}的人",
+  "notifications.policy.filter_not_followers_title": "未追蹤你的人",
+  "notifications.policy.filter_not_following_hint": "直至你手動核准他們",
+  "notifications.policy.filter_not_following_title": "你未追蹤的人",
+  "notifications.policy.filter_private_mentions_hint": "除非回覆你的提及或來自你追蹤的人，否則將被過濾",
+  "notifications.policy.filter_private_mentions_title": "未經請求的私人提及",
+  "notifications.policy.title": "過濾來自以下的通知…",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "只要啟用桌面通知，便可在 Mastodon 網站沒有打開時收到通知。在已經啟用桌面通知的時候，你可以透過上面的 {icon} 按鈕準確控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不放過任何事情",
@@ -526,14 +592,15 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整私隱設定",
-  "privacy.direct.long": "只有提及的使用者能看到",
-  "privacy.direct.short": "僅限提及的人",
-  "privacy.private.long": "只有你的關注者能看到",
-  "privacy.private.short": "僅限追隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "帖文提及的人",
+  "privacy.direct.short": "特定的人",
+  "privacy.private.long": "只有你的追蹤者",
+  "privacy.private.short": "追蹤者",
+  "privacy.public.long": "Mastodon 內外的任何人",
   "privacy.public.short": "公共",
-  "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
-  "privacy.unlisted.short": "公開",
+  "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
+  "privacy.unlisted.long": "較少用演算法宣傳",
+  "privacy.unlisted.short": "半公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
   "recommended": "推薦",
@@ -551,7 +618,9 @@
   "relative_time.minutes": "{number}分鐘前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, one {# 附件} other {# 附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
   "report.categories.legal": "法律",
@@ -644,10 +713,11 @@
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私人提及",
   "status.edit": "編輯",
-  "status.edited": "編輯於 {date}",
+  "status.edited": "最後編輯於 {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "嵌入",
   "status.favourite": "最愛",
+  "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
   "status.filter": "篩選此帖文",
   "status.filtered": "已過濾",
   "status.hide": "隱藏帖文",
@@ -668,6 +738,7 @@
   "status.reblog": "轉推",
   "status.reblog_private": "轉推到原讀者",
   "status.reblogged_by": "{name} 轉推",
+  "status.reblogs": "{count, plural, one {則轉推} other {則轉推}}",
   "status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。",
   "status.redraft": "刪除並編輯",
   "status.remove_bookmark": "移除書籤",
@@ -715,10 +786,8 @@
   "upload_error.poll": "不允許在投票上傳檔案。",
   "upload_form.audio_description": "簡單描述內容給聽障人士",
   "upload_form.description": "為視覺障礙人士添加文字說明",
-  "upload_form.description_missing": "沒有加入描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "簡單描述給聽障或視障人士",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 9983936953..f00d62c076 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -6,7 +6,7 @@
   "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
   "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
   "about.domain_blocks.silenced.title": "已受限",
-  "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法與此伺服器上的使用者互動或交流。",
+  "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法和此伺服器上的使用者互動與交流。",
   "about.domain_blocks.suspended.title": "已停權",
   "about.not_available": "無法於本伺服器上使用此資訊。",
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
@@ -48,7 +48,7 @@
   "account.locked_info": "此帳號的隱私狀態設定為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
   "account.media": "媒體",
   "account.mention": "提及 @{name}",
-  "account.moved_to": "{name} 現在的新帳號為：",
+  "account.moved_to": "{name} 目前的新帳號為：",
   "account.mute": "靜音 @{name}",
   "account.mute_notifications_short": "靜音推播通知",
   "account.mute_short": "靜音",
@@ -59,7 +59,7 @@
   "account.posts": "嘟文",
   "account.posts_with_replies": "嘟文與回覆",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等待核准。按一下以取消跟隨請求",
+  "account.requested": "正在等候審核。按一下以取消跟隨請求",
   "account.requested_follow": "{name} 要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示來自 @{name} 的嘟文",
@@ -70,7 +70,7 @@
   "account.unendorse": "取消於個人檔案推薦對方",
   "account.unfollow": "取消跟隨",
   "account.unmute": "解除靜音 @{name}",
-  "account.unmute_notifications_short": "取消靜音推播通知",
+  "account.unmute_notifications_short": "解除靜音推播通知",
   "account.unmute_short": "解除靜音",
   "account_note.placeholder": "按此新增備註",
   "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
@@ -84,12 +84,19 @@
   "admin.impact_report.title": "影響總結",
   "alert.rate_limited.message": "請於 {retry_time, time, medium} 後重試。",
   "alert.rate_limited.title": "已限速",
-  "alert.unexpected.message": "發生了非預期的錯誤。",
+  "alert.unexpected.message": "發生非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "{count} / 週",
+  "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器皆會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看見您的公開嘟文。",
+  "block_modal.show_less": "減少顯示",
+  "block_modal.show_more": "顯示更多",
+  "block_modal.they_cant_mention": "他們無法提及或跟隨您。",
+  "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的。",
+  "block_modal.they_will_know": "他們能見到他們已被封鎖。",
+  "block_modal.title": "是否封鎖該使用者？",
+  "block_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -146,26 +153,22 @@
   "compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成只對跟隨者顯示的嘟文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
   "compose_form.placeholder": "正在想些什麼嗎？",
-  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選項",
-  "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
-  "compose_form.publish": "嘟出去",
+  "compose_form.poll.type": "投票方式",
+  "compose_form.publish": "發嘟",
   "compose_form.publish_form": "嘟出去",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
-  "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
-  "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除內容警告",
   "compose_form.spoiler.unmarked": "新增內容警告",
-  "compose_form.spoiler_placeholder": "請於此處填寫內容警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
-  "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
-  "confirmations.block.message": "您確定要封鎖 {name} 嗎？",
   "confirmations.cancel_follow_request.confirm": "收回跟隨請求",
   "confirmations.cancel_follow_request.message": "您確定要收回跟隨 {name} 的請求嗎？",
   "confirmations.delete.confirm": "刪除",
@@ -174,15 +177,13 @@
   "confirmations.delete_list.message": "您確定要永久刪除此列表嗎？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您於媒體描述或預覽區塊有未儲存的變更。是否要捨棄這些變更？",
-  "confirmations.domain_block.confirm": "封鎖整個網域",
+  "confirmations.domain_block.confirm": "封鎖伺服器",
   "confirmations.domain_block.message": "您真的非常確定要封鎖整個 {domain} 網域嗎？大部分情況下，封鎖或靜音少數特定的帳號就能滿足需求了。您將不能在任何公開的時間軸及通知中看到來自此網域的內容。您來自該網域的跟隨者也將被移除。",
   "confirmations.edit.confirm": "編輯",
   "confirmations.edit.message": "編輯嘟文將覆蓋掉您目前正在撰寫之嘟文內容。您是否仍要繼續？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.mute.confirm": "靜音",
-  "confirmations.mute.explanation": "此操作將隱藏來自他們的嘟文與通知，但是他們還是可以查閱您的嘟文與跟隨您。",
-  "confirmations.mute.message": "您確定要靜音 {name} 嗎？",
   "confirmations.redraft.confirm": "刪除並重新編輯",
   "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
   "confirmations.reply.confirm": "回覆",
@@ -208,6 +209,27 @@
   "dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
   "dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
+  "domain_block_modal.block": "封鎖伺服器",
+  "domain_block_modal.block_account_instead": "改為封鎖 @{name}",
+  "domain_block_modal.they_can_interact_with_old_posts": "來自此伺服器之使用者能與您以往的嘟文互動。",
+  "domain_block_modal.they_cant_follow": "來自此伺服器之使用者將無法跟隨您。",
+  "domain_block_modal.they_wont_know": "他們不會知道他們已被封鎖。",
+  "domain_block_modal.title": "是否封鎖該網域？",
+  "domain_block_modal.you_will_lose_followers": "所有您來自此伺服器之跟隨者將被移除。",
+  "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或通知。",
+  "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
+  "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
+  "domain_pill.server": "伺服器",
+  "domain_pill.their_handle": "他們的帳號：",
+  "domain_pill.their_server": "他們數位世界的家，他們所有的嘟文都在這裡。",
+  "domain_pill.their_username": "他們於他們的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
+  "domain_pill.username": "使用者名稱",
+  "domain_pill.whats_in_a_handle": "什麼是帳號 (@handle) ？",
+  "domain_pill.who_they_are": "由於帳號 (@handle) 能說明某人是誰以及他們來自何方，您能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與人們互動。",
+  "domain_pill.who_you_are": "由於帳號 (@handle) 能說明您是誰以及您來自何方，人們能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與您互動。",
+  "domain_pill.your_handle": "您的帳號：",
+  "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
+  "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
   "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
@@ -215,7 +237,7 @@
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物 & 飲料",
-  "emoji_button.label": "插入表情符號",
+  "emoji_button.label": "插入 emoji 表情符號",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "啊就沒這表情符號吼！！ (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "物件",
@@ -230,7 +252,7 @@
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人檔案",
   "empty_column.blocks": "您還沒有封鎖任何使用者。",
-  "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
+  "empty_column.bookmarked_statuses": "您還沒有新增任何書籤。當您新增書籤時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有收到任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未封鎖任何網域。",
@@ -241,9 +263,10 @@
   "empty_column.followed_tags": "您還沒有跟隨任何主題標籤。當您跟隨主題標籤時，它們將於此顯示。",
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
   "empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
-  "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出了新的嘟文時，它們將顯示於此。",
-  "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
+  "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
+  "empty_column.lists": "您還沒有新增任何列表。當您新增列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
+  "empty_column.notification_requests": "清空啦！已經沒有任何通知。當您收到新通知時，它們將依照您的設定於此顯示。",
   "empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
@@ -274,12 +297,30 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
+  "filtered_notifications_banner.mentions": "{count, plural, other {# 則提及}}",
+  "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}} 之通知",
+  "filtered_notifications_banner.title": "已過濾之通知",
   "firehose.all": "全部",
   "firehose.local": "本站",
   "firehose.remote": "聯邦宇宙",
   "follow_request.authorize": "授權",
   "follow_request.reject": "拒絕",
   "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定，{domain} 的管理員認為您可能想要自己審核這些帳號的跟隨請求。",
+  "follow_suggestions.curated_suggestion": "精選內容",
+  "follow_suggestions.dismiss": "不再顯示",
+  "follow_suggestions.featured_longer": "{domain} 團隊精選",
+  "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
+  "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
+  "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
+  "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
+  "follow_suggestions.hints.most_interactions": "這個個人檔案最近於 {domain} 受到非常多關注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "這個個人檔案與您最近跟隨之帳號類似。",
+  "follow_suggestions.personalized_suggestion": "個人化推薦",
+  "follow_suggestions.popular_suggestion": "熱門推薦",
+  "follow_suggestions.popular_suggestion_longer": "{domain} 上的人氣王",
+  "follow_suggestions.similar_to_recently_followed_longer": "與您近日跟隨相近之帳號",
+  "follow_suggestions.view_all": "檢視全部",
+  "follow_suggestions.who_to_follow": "推薦跟隨帳號",
   "followed_tags": "已跟隨主題標籤",
   "footer.about": "關於",
   "footer.directory": "個人檔案目錄",
@@ -303,25 +344,20 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} 名} other {{counter} 名}}參與者",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
   "hashtag.counter_by_uses_today": "本日有 {count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
-  "hashtag.follow": "追蹤主題標籤",
-  "hashtag.unfollow": "取消追蹤主題標籤",
+  "hashtag.follow": "跟隨主題標籤",
+  "hashtag.unfollow": "取消跟隨主題標籤",
   "hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
-  "home.actions.go_to_explore": "看看發生什麼新鮮事",
-  "home.actions.go_to_suggestions": "尋找一些人來跟隨",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
-  "home.explore_prompt.body": "您的首頁時間軸將由您所跟隨之主題標籤、帳號以及其轉嘟所組成。若目前流速有點慢，您可以考慮以下幾點：",
-  "home.explore_prompt.title": "這是您於 Mastodon 的基地",
   "home.hide_announcements": "隱藏公告",
   "home.pending_critical_update.body": "請立即升級您的 Mastodon 伺服器！",
   "home.pending_critical_update.link": "檢視更新內容",
   "home.pending_critical_update.title": "有可取得的重要安全性更新！",
   "home.show_announcements": "顯示公告",
-  "interaction_modal.description.favourite": "在 Mastodon 上有個帳號的話，您可以將此嘟文加入最愛以讓作者知道您欣賞它且將它儲存下來。",
-  "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
-  "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以轉嘟此嘟文以分享給您的跟隨者們。",
-  "interaction_modal.description.reply": "在 Mastodon 上有個帳號的話，您可以回覆此嘟文。",
+  "interaction_modal.description.favourite": "若於 Mastodon 上有個帳號，您可以將此嘟文加入最愛使作者知道您欣賞它且將它儲存下來。",
+  "interaction_modal.description.follow": "若於 Mastodon 上有個帳號，您可以跟隨 {name} 以於首頁時間軸接收他們的嘟文。",
+  "interaction_modal.description.reblog": "若於 Mastodon 上有個帳號，您可以轉嘟此嘟文以分享給您的跟隨者們。",
+  "interaction_modal.description.reply": "若於 Mastodon 上有個帳號，您可以回覆此嘟文。",
   "interaction_modal.login.action": "返回首頁",
   "interaction_modal.login.prompt": "您帳號所屬伺服器之網域，例如：mastodon.social",
   "interaction_modal.no_account_yet": "還沒有 Mastodon 帳號嗎？",
@@ -343,7 +379,7 @@
   "keyboard_shortcuts.compose": "將游標移至文字撰寫區塊",
   "keyboard_shortcuts.description": "說明",
   "keyboard_shortcuts.direct": "開啟私訊對話欄",
-  "keyboard_shortcuts.down": "往下移動",
+  "keyboard_shortcuts.down": "向下移動",
   "keyboard_shortcuts.enter": "檢視嘟文",
   "keyboard_shortcuts.favourite": "加到最愛",
   "keyboard_shortcuts.favourites": "開啟最愛列表",
@@ -369,7 +405,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "顯示或隱藏媒體",
   "keyboard_shortcuts.toot": "發個新嘟文",
   "keyboard_shortcuts.unfocus": "跳離文字撰寫區塊或搜尋框",
-  "keyboard_shortcuts.up": "往上移動",
+  "keyboard_shortcuts.up": "向上移動",
   "lightbox.close": "關閉",
   "lightbox.compress": "折疊圖片檢視框",
   "lightbox.expand": "展開圖片檢視框",
@@ -390,15 +426,21 @@
   "lists.replies_policy.list": "列表成員",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆：",
-  "lists.search": "搜尋您跟隨的使用者",
+  "lists.search": "搜尋您跟隨之使用者",
   "lists.subheading": "您的列表",
   "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
   "loading_indicator.label": "正在載入...",
   "media_gallery.toggle_visible": "切換可見性",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
-  "mute_modal.duration": "持續時間",
-  "mute_modal.hide_notifications": "是否隱藏來自這位使用者的通知？",
-  "mute_modal.indefinite": "無期限",
+  "mute_modal.hide_from_notifications": "於通知中隱藏",
+  "mute_modal.hide_options": "隱藏選項",
+  "mute_modal.indefinite": "直到我解除靜音他們",
+  "mute_modal.show_options": "顯示選項",
+  "mute_modal.they_can_mention_and_follow": "他們仍可提及或跟隨您，但您不會見到他們。",
+  "mute_modal.they_wont_know": "他們不會知道他們已被靜音。",
+  "mute_modal.title": "是否靜音該使用者？",
+  "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
+  "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
   "navigation_bar.about": "關於",
   "navigation_bar.advanced_interface": "以進階網頁介面開啟",
   "navigation_bar.blocks": "已封鎖的使用者",
@@ -408,7 +450,6 @@
   "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "已封鎖網域",
-  "navigation_bar.edit_profile": "編輯個人檔案",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
@@ -432,11 +473,29 @@
   "notification.follow": "{name} 已跟隨您",
   "notification.follow_request": "{name} 要求跟隨您",
   "notification.mention": "{name} 已提到您",
+  "notification.moderation-warning.learn_more": "了解更多",
+  "notification.moderation_warning": "您已收到管理員警告",
+  "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
+  "notification.moderation_warning.action_disable": "您的帳號已被停用。",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
+  "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
+  "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將會被標記為敏感內容。",
+  "notification.moderation_warning.action_silence": "您的帳號已被限制。",
+  "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
+  "notification.relationships_severance_event": "與 {name} 失去連結",
+  "notification.relationships_severance_event.account_suspension": "{from} 之管理員已將 {target} 停權，意味著您將不再收到來自他們的更新或與之互動。",
+  "notification.relationships_severance_event.domain_block": "{from} 之管理員已將 {target} 封鎖，包含 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
+  "notification.relationships_severance_event.user_domain_block": "您已將 {target} 封鎖，將移除 {followersCount} 名您的跟隨者及 {followingCount, plural, other {#}} 名您跟隨的帳號。",
   "notification.status": "{name} 剛剛嘟文",
   "notification.update": "{name} 已編輯嘟文",
+  "notification_requests.accept": "接受",
+  "notification_requests.dismiss": "關閉",
+  "notification_requests.notifications_from": "來自 {name} 之通知",
+  "notification_requests.title": "已過濾之通知",
   "notifications.clear": "清除通知",
   "notifications.clear_confirmation": "您確定要永久清除您的通知嗎？",
   "notifications.column_settings.admin.report": "新檢舉報告：",
@@ -445,7 +504,6 @@
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
   "notifications.column_settings.filter_bar.category": "快速過濾器",
-  "notifications.column_settings.filter_bar.show_bar": "顯示過濾器",
   "notifications.column_settings.follow": "新的跟隨者：",
   "notifications.column_settings.follow_request": "新的跟隨請求：",
   "notifications.column_settings.mention": "提及：",
@@ -471,6 +529,15 @@
   "notifications.permission_denied": "由於之前已拒絕瀏覽器請求，因此無法使用桌面通知",
   "notifications.permission_denied_alert": "由於之前瀏覽器權限被拒絕，無法啟用桌面通知",
   "notifications.permission_required": "由於尚未授予所需的權限，因此無法使用桌面通知。",
+  "notifications.policy.filter_new_accounts.hint": "新增於過去 {days, plural, other {# 日}}",
+  "notifications.policy.filter_new_accounts_title": "新帳號",
+  "notifications.policy.filter_not_followers_hint": "包含最近 {days, plural, other {# 日}} 內跟隨您之使用者",
+  "notifications.policy.filter_not_followers_title": "未跟隨您之使用者",
+  "notifications.policy.filter_not_following_hint": "直至您手動核准他們",
+  "notifications.policy.filter_not_following_title": "您未跟隨之使用者",
+  "notifications.policy.filter_private_mentions_hint": "過濾通知，除非嘟文包含於您的提及，或您跟隨該發嘟帳號",
+  "notifications.policy.filter_private_mentions_title": "不請自來的私訊",
+  "notifications.policy.title": "過濾通知來自...",
   "notifications_permission_banner.enable": "啟用桌面通知",
   "notifications_permission_banner.how_to_control": "啟用桌面通知以於 Mastodon 沒有開啟的時候接收通知。啟用桌面通知後，您可以透過上面的 {icon} 按鈕準確的控制哪些類型的互動會產生桌面通知。",
   "notifications_permission_banner.title": "不要錯過任何東西！",
@@ -480,10 +547,10 @@
   "onboarding.actions.go_to_home": "前往您的首頁時間軸",
   "onboarding.compose.template": "哈囉 #Mastodon！",
   "onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
-  "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
+  "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
   "onboarding.profile.discoverable": "使我的個人檔案可以被找到",
-  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會出現於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
+  "onboarding.profile.discoverable_hint": "當您於 Mastodon 上選擇加入可發現性時，您的嘟文可能會顯示於搜尋結果與趨勢中。您的個人檔案可能會被推薦給與您志趣相投的人。",
   "onboarding.profile.display_name": "顯示名稱",
   "onboarding.profile.display_name_hint": "完整名稱或暱稱...",
   "onboarding.profile.lead": "您隨時可以稍候於設定中完成此操作，將有更多自訂選項可使用。",
@@ -502,7 +569,7 @@
   "onboarding.start.title": "噹噹！完成啦！",
   "onboarding.steps.follow_people.body": "Mastodon 的趣味就是跟隨些有趣的人們！",
   "onboarding.steps.follow_people.title": "客製化您的首頁時間軸",
-  "onboarding.steps.publish_status.body": "向新世界打聲招呼吧。",
+  "onboarding.steps.publish_status.body": "透過文字、照片、影片或投票 {emoji} 向新世界打聲招呼吧。",
   "onboarding.steps.publish_status.title": "撰寫您第一則嘟文",
   "onboarding.steps.setup_profile.body": "若您完整填寫個人檔案，其他人比較願意與您互動。",
   "onboarding.steps.setup_profile.title": "客製化您的個人檔案",
@@ -523,16 +590,17 @@
   "poll.vote": "投票",
   "poll.voted": "您已對此問題投票",
   "poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
-  "poll_button.add_poll": "建立投票",
+  "poll_button.add_poll": "新增投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
-  "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "僅限提及者",
-  "privacy.private.long": "只有跟隨您的使用者能看到",
-  "privacy.private.short": "僅限跟隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "此嘟文提及之所有人",
+  "privacy.direct.short": "指定使用者",
+  "privacy.private.long": "只有跟隨您之使用者能看到",
+  "privacy.private.short": "跟隨者",
+  "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
+  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+  "privacy.unlisted.long": "悄然無聲",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
@@ -551,7 +619,9 @@
   "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
   "report.categories.legal": "合法性",
@@ -644,10 +714,11 @@
   "status.direct": "私訊 @{name}",
   "status.direct_indicator": "私訊",
   "status.edit": "編輯",
-  "status.edited": "編輯於 {date}",
+  "status.edited": "上次編輯於 {date}",
   "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "內嵌嘟文",
   "status.favourite": "最愛",
+  "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",
   "status.filtered": "已過濾",
   "status.hide": "隱藏嘟文",
@@ -662,16 +733,17 @@
   "status.mute": "靜音 @{name}",
   "status.mute_conversation": "靜音對話",
   "status.open": "展開此嘟文",
-  "status.pin": "釘選到個人檔案頁面",
+  "status.pin": "釘選至個人檔案頁面",
   "status.pinned": "釘選嘟文",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
   "status.reblog_private": "依照原嘟可見性轉嘟",
   "status.reblogged_by": "{name} 已轉嘟",
+  "status.reblogs": "{count, plural, other {# 則轉嘟}}",
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
-  "status.replied_to": "回覆給 {name}",
+  "status.replied_to": "回覆 {name}",
   "status.reply": "回覆",
   "status.replyAll": "回覆討論串",
   "status.report": "檢舉 @{name}",
@@ -710,15 +782,13 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "拖放來上傳",
-  "upload_button.label": "上傳圖片、影片、或者音樂檔案",
+  "upload_button.label": "上傳圖片、影片、或者音訊檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
-  "upload_form.description_missing": "沒有任何描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts
index a04ebe6291..fc6b2d4682 100644
--- a/app/javascript/mastodon/models/account.ts
+++ b/app/javascript/mastodon/models/account.ts
@@ -6,7 +6,9 @@ import escapeTextContentForBrowser from 'escape-html';
 import type {
   ApiAccountFieldJSON,
   ApiAccountRoleJSON,
+  ApiAccountOtherSettingsJSON,
   ApiAccountJSON,
+  ApiServerFeaturesJSON,
 } from 'mastodon/api_types/accounts';
 import type { ApiCustomEmojiJSON } from 'mastodon/api_types/custom_emoji';
 import emojify from 'mastodon/features/emoji/emoji';
@@ -43,6 +45,35 @@ const AccountRoleFactory = ImmutableRecord<AccountRoleShape>({
   name: '',
 });
 
+// AccountOtherSettings
+export type AccountOtherSettingsShape = ApiAccountOtherSettingsJSON;
+export type AccountOtherSettings = RecordOf<AccountOtherSettingsShape>;
+
+const AccountOtherSettingsFactory = ImmutableRecord<AccountOtherSettingsShape>({
+  noindex: false,
+  hide_network: false,
+  hide_followers_count: false,
+  hide_following_count: false,
+  hide_statuses_count: false,
+  translatable_private: false,
+  link_preview: true,
+  allow_quote: true,
+  emoji_reaction_policy: 'allow',
+  subscription_policy: 'allow',
+});
+
+// ServerFeatures
+export type AccountServerFeaturesShape = ApiServerFeaturesJSON;
+export type AccountServerFeatures = RecordOf<AccountServerFeaturesShape>;
+
+const AccountServerFeaturesFactory =
+  ImmutableRecord<AccountServerFeaturesShape>({
+    circle: false,
+    emoji_reaction: false,
+    quote: false,
+    status_reference: false,
+  });
+
 // Account
 export interface AccountShape
   extends Required<
@@ -70,6 +101,8 @@ export const accountDefaultValues: AccountShape = {
   indexable: false,
   display_name: '',
   display_name_html: '',
+  server_features: AccountServerFeaturesFactory(),
+  emoji_reaction_available_server: false,
   emojis: List<CustomEmoji>(),
   fields: List<AccountField>(),
   group: false,
@@ -95,6 +128,8 @@ export const accountDefaultValues: AccountShape = {
   limited: false,
   moved: null,
   hide_collections: false,
+  other_settings: AccountOtherSettingsFactory(),
+  subscribable: true,
 };
 
 const AccountFactory = ImmutableRecord<AccountShape>(accountDefaultValues);
diff --git a/app/javascript/mastodon/models/custom_emoji.ts b/app/javascript/mastodon/models/custom_emoji.ts
index 76479f3aeb..96ab4bc612 100644
--- a/app/javascript/mastodon/models/custom_emoji.ts
+++ b/app/javascript/mastodon/models/custom_emoji.ts
@@ -12,4 +12,9 @@ export const CustomEmojiFactory = Record<CustomEmojiShape>({
   url: '',
   category: '',
   visible_in_picker: false,
+  width: 32,
+  height: 32,
+  sensitive: false,
+  aliases: [],
+  license: '',
 });
diff --git a/app/javascript/mastodon/models/status.ts b/app/javascript/mastodon/models/status.ts
new file mode 100644
index 0000000000..7907fc34f8
--- /dev/null
+++ b/app/javascript/mastodon/models/status.ts
@@ -0,0 +1,4 @@
+export type { StatusVisibility } from 'mastodon/api_types/statuses';
+
+// Temporary until we type it correctly
+export type Status = Immutable.Map<string, unknown>;
diff --git a/app/javascript/mastodon/reducers/accounts.ts b/app/javascript/mastodon/reducers/accounts.ts
index e6f07340c0..5a9cc7220c 100644
--- a/app/javascript/mastodon/reducers/accounts.ts
+++ b/app/javascript/mastodon/reducers/accounts.ts
@@ -59,25 +59,19 @@ export const accountsReducer: Reducer<typeof initialState> = (
     return normalizeAccounts(state, action.payload.accounts);
   else if (followAccountSuccess.match(action)) {
     return state
-      .update(
-        action.payload.relationship.id,
-        (account) => account?.update('followers_count', (n) => n + 1),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => n + 1),
       )
-      .update(
-        getCurrentUser(),
-        (account) => account?.update('following_count', (n) => n + 1),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => n + 1),
       );
   } else if (unfollowAccountSuccess.match(action))
     return state
-      .update(
-        action.payload.relationship.id,
-        (account) =>
-          account?.update('followers_count', (n) => Math.max(0, n - 1)),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => Math.max(0, n - 1)),
       )
-      .update(
-        getCurrentUser(),
-        (account) =>
-          account?.update('following_count', (n) => Math.max(0, n - 1)),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => Math.max(0, n - 1)),
       );
   else return state;
 };
diff --git a/app/javascript/mastodon/reducers/antenna_adder.js b/app/javascript/mastodon/reducers/antenna_adder.js
new file mode 100644
index 0000000000..aae4a43a0f
--- /dev/null
+++ b/app/javascript/mastodon/reducers/antenna_adder.js
@@ -0,0 +1,58 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  ANTENNA_ADDER_RESET,
+  ANTENNA_ADDER_SETUP,
+  ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST,
+  ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS,
+  ANTENNA_ADDER_ANTENNAS_FETCH_FAIL,
+  ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST,
+  ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS,
+  ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL,
+  ANTENNA_EDITOR_ADD_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_SUCCESS,
+  ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS,
+} from '../actions/antennas';
+
+const initialState = ImmutableMap({
+  accountId: null,
+
+  antennas: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+});
+
+export default function antennaAdderReducer(state = initialState, action) {
+  switch(action.type) {
+  case ANTENNA_ADDER_RESET:
+    return initialState;
+  case ANTENNA_ADDER_SETUP:
+    return state.withMutations(map => {
+      map.set('accountId', action.account.get('id'));
+    });
+  case ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST:
+  case ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_REQUEST:
+    return state.setIn(['antennas', 'isLoading'], true);
+  case ANTENNA_ADDER_ANTENNAS_FETCH_FAIL:
+  case ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_FAIL:
+    return state.setIn(['antennas', 'isLoading'], false);
+  case ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS:
+  case ANTENNA_ADDER_EXCLUDE_ANTENNAS_FETCH_SUCCESS:
+    return state.update('antennas', antennas => antennas.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.antennas.map(item => item.id)));
+    }));
+  case ANTENNA_EDITOR_ADD_SUCCESS:
+  case ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS:
+    return state.updateIn(['antennas', 'items'], antenna => antenna.unshift(action.antennaId));
+  case ANTENNA_EDITOR_REMOVE_SUCCESS:
+  case ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS:
+    return state.updateIn(['antennas', 'items'], antenna => antenna.filterNot(item => item === action.antennaId));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/antenna_editor.js b/app/javascript/mastodon/reducers/antenna_editor.js
new file mode 100644
index 0000000000..c647d108b2
--- /dev/null
+++ b/app/javascript/mastodon/reducers/antenna_editor.js
@@ -0,0 +1,116 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  ANTENNA_CREATE_REQUEST,
+  ANTENNA_CREATE_FAIL,
+  ANTENNA_CREATE_SUCCESS,
+  ANTENNA_UPDATE_REQUEST,
+  ANTENNA_UPDATE_FAIL,
+  ANTENNA_UPDATE_SUCCESS,
+  ANTENNA_EDITOR_RESET,
+  ANTENNA_EDITOR_SETUP,
+  ANTENNA_EDITOR_TITLE_CHANGE,
+  ANTENNA_ACCOUNTS_FETCH_REQUEST,
+  ANTENNA_ACCOUNTS_FETCH_SUCCESS,
+  ANTENNA_ACCOUNTS_FETCH_FAIL,
+  ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST,
+  ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS,
+  ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL,
+  ANTENNA_EDITOR_SUGGESTIONS_READY,
+  ANTENNA_EDITOR_SUGGESTIONS_CLEAR,
+  ANTENNA_EDITOR_SUGGESTIONS_CHANGE,
+  ANTENNA_EDITOR_ADD_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_SUCCESS,
+  ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS,
+} from '../actions/antennas';
+
+const initialState = ImmutableMap({
+  antennaId: null,
+  isSubmitting: false,
+  isChanged: false,
+  title: '',
+  accountsCount: 0,
+
+  accounts: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+
+  suggestions: ImmutableMap({
+    value: '',
+    items: ImmutableList(),
+  }),
+});
+
+export default function antennaEditorReducer(state = initialState, action) {
+  switch(action.type) {
+  case ANTENNA_EDITOR_RESET:
+    return initialState;
+  case ANTENNA_EDITOR_SETUP:
+    return state.withMutations(map => {
+      map.set('antennaId', action.antenna.get('id'));
+      map.set('title', action.antenna.get('title'));
+      map.set('accountsCount', action.antenna.get('accounts_count'));
+      map.set('isSubmitting', false);
+    });
+  case ANTENNA_EDITOR_TITLE_CHANGE:
+    return state.withMutations(map => {
+      map.set('title', action.value);
+      map.set('isChanged', true);
+    });
+  case ANTENNA_CREATE_REQUEST:
+  case ANTENNA_UPDATE_REQUEST:
+    return state.withMutations(map => {
+      map.set('isSubmitting', true);
+      map.set('isChanged', false);
+    });
+  case ANTENNA_CREATE_FAIL:
+  case ANTENNA_UPDATE_FAIL:
+    return state.set('isSubmitting', false);
+  case ANTENNA_CREATE_SUCCESS:
+  case ANTENNA_UPDATE_SUCCESS:
+    return state.withMutations(map => {
+      map.set('isSubmitting', false);
+      map.set('antennaId', action.antenna.id);
+    });
+  case ANTENNA_ACCOUNTS_FETCH_REQUEST:
+    return state.setIn(['accounts', 'isLoading'], true);
+  case ANTENNA_ACCOUNTS_FETCH_FAIL:
+    return state.setIn(['accounts', 'isLoading'], false);
+  case ANTENNA_ACCOUNTS_FETCH_SUCCESS:
+    return state.update('accounts', accounts => accounts.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.accounts.map(item => item.id)));
+    }));
+  case ANTENNA_EXCLUDE_ACCOUNTS_FETCH_REQUEST:
+    return state.setIn(['accounts', 'isLoading'], true);
+  case ANTENNA_EXCLUDE_ACCOUNTS_FETCH_FAIL:
+    return state.setIn(['accounts', 'isLoading'], false);
+  case ANTENNA_EXCLUDE_ACCOUNTS_FETCH_SUCCESS:
+    return state.update('accounts', accounts => accounts.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.accounts.map(item => item.id)));
+    }));
+  case ANTENNA_EDITOR_SUGGESTIONS_CHANGE:
+    return state.setIn(['suggestions', 'value'], action.value);
+  case ANTENNA_EDITOR_SUGGESTIONS_READY:
+    return state.setIn(['suggestions', 'items'], ImmutableList(action.accounts.map(item => item.id)));
+  case ANTENNA_EDITOR_SUGGESTIONS_CLEAR:
+    return state.update('suggestions', suggestions => suggestions.withMutations(map => {
+      map.set('items', ImmutableList());
+      map.set('value', '');
+    }));
+  case ANTENNA_EDITOR_ADD_SUCCESS:
+  case ANTENNA_EDITOR_ADD_EXCLUDE_SUCCESS:
+    return state.updateIn(['accounts', 'items'], antenna => antenna.unshift(action.accountId));
+  case ANTENNA_EDITOR_REMOVE_SUCCESS:
+  case ANTENNA_EDITOR_REMOVE_EXCLUDE_SUCCESS:
+    return state.updateIn(['accounts', 'items'], antenna => antenna.filterNot(item => item === action.accountId));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/antennas.js b/app/javascript/mastodon/reducers/antennas.js
new file mode 100644
index 0000000000..7ef16f8dd2
--- /dev/null
+++ b/app/javascript/mastodon/reducers/antennas.js
@@ -0,0 +1,106 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+import {
+  ANTENNA_FETCH_SUCCESS,
+  ANTENNA_FETCH_FAIL,
+  ANTENNAS_FETCH_SUCCESS,
+  ANTENNA_CREATE_SUCCESS,
+  ANTENNA_UPDATE_SUCCESS,
+  ANTENNA_DELETE_SUCCESS,
+  ANTENNA_EDITOR_ADD_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_SUCCESS,
+  ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS,
+  ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS,
+  ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS,
+  ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS,
+  ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS,
+  ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS,
+  ANTENNA_EDITOR_ADD_TAG_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_TAG_SUCCESS,
+  ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS,
+  ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS,
+  ANTENNA_EDITOR_FETCH_TAGS_SUCCESS,
+} from '../actions/antennas';
+
+const initialState = ImmutableMap();
+
+const normalizeAntenna = (state, antenna) => {
+  const old = state.get(antenna.id);
+  if (old === false) {
+    return state;
+  }
+  
+  let s = state.set(antenna.id, fromJS(antenna));
+  if (old) {
+    s = s.setIn([antenna.id, 'domains'], old.get('domains'));
+    s = s.setIn([antenna.id, 'exclude_domains'], old.get('exclude_domains'));
+    s = s.setIn([antenna.id, 'keywords'], old.get('keywords'));
+    s = s.setIn([antenna.id, 'exclude_keywords'], old.get('exclude_keywords'));
+    s = s.setIn([antenna.id, 'accounts_count'], old.get('accounts_count'));
+    s = s.setIn([antenna.id, 'domains_count'], old.get('domains_count'));
+    s = s.setIn([antenna.id, 'keywords_count'], old.get('keywords_count'));
+  }
+  return s;
+};
+
+const normalizeAntennas = (state, antennas) => {
+  antennas.forEach(antenna => {
+    state = normalizeAntenna(state, antenna);
+  });
+
+  return state;
+};
+
+export default function antennas(state = initialState, action) {
+  switch(action.type) {
+  case ANTENNA_FETCH_SUCCESS:
+  case ANTENNA_CREATE_SUCCESS:
+  case ANTENNA_UPDATE_SUCCESS:
+    return normalizeAntenna(state, action.antenna);
+  case ANTENNAS_FETCH_SUCCESS:
+    return normalizeAntennas(state, action.antennas);
+  case ANTENNA_DELETE_SUCCESS:
+  case ANTENNA_FETCH_FAIL:
+    return state.set(action.id, false);
+  case ANTENNA_EDITOR_ADD_SUCCESS:
+    return state.setIn([action.antennaId, 'accounts_count'], state.getIn([action.antennaId, 'accounts_count']) + 1);
+  case ANTENNA_EDITOR_REMOVE_SUCCESS:
+    return state.setIn([action.antennaId, 'accounts_count'], state.getIn([action.antennaId, 'accounts_count']) - 1);
+  case ANTENNA_EDITOR_ADD_DOMAIN_SUCCESS:
+    return state.setIn([action.antennaId, 'domains_count'], state.getIn([action.antennaId, 'domains_count']) + 1).updateIn([action.antennaId, 'domains', 'domains'], domains => (ImmutableList(domains || [])).push(action.domain));
+  case ANTENNA_EDITOR_REMOVE_DOMAIN_SUCCESS:
+    return state.setIn([action.antennaId, 'domains_count'], state.getIn([action.antennaId, 'domains_count']) - 1).updateIn([action.antennaId, 'domains', 'domains'], domains => (ImmutableList(domains || [])).filterNot(domain => domain === action.domain));
+  case ANTENNA_EDITOR_ADD_EXCLUDE_DOMAIN_SUCCESS:
+    return state.updateIn([action.antennaId, 'domains', 'exclude_domains'], domains => (ImmutableList(domains || [])).push(action.domain));
+  case ANTENNA_EDITOR_REMOVE_EXCLUDE_DOMAIN_SUCCESS:
+    return state.updateIn([action.antennaId, 'domains', 'exclude_domains'], domains => (ImmutableList(domains || [])).filterNot(domain => domain === action.domain));
+  case ANTENNA_EDITOR_FETCH_DOMAINS_SUCCESS:
+    return state.setIn([action.id, 'domains'], ImmutableMap({ domains: ImmutableList(action.domains.domains), exclude_domains: ImmutableList(action.domains.exclude_domains) }));
+  case ANTENNA_EDITOR_ADD_KEYWORD_SUCCESS:
+    return state.setIn([action.antennaId, 'keywords_count'], state.getIn([action.antennaId, 'keywords_count']) + 1).updateIn([action.antennaId, 'keywords', 'keywords'], keywords => (ImmutableList(keywords || [])).push(action.keyword));
+  case ANTENNA_EDITOR_REMOVE_KEYWORD_SUCCESS:
+    return state.setIn([action.antennaId, 'keywords_count'], state.getIn([action.antennaId, 'keywords_count']) - 1).updateIn([action.antennaId, 'keywords', 'keywords'], keywords => (ImmutableList(keywords || [])).filterNot(keyword => keyword === action.keyword));
+  case ANTENNA_EDITOR_ADD_EXCLUDE_KEYWORD_SUCCESS:
+    return state.updateIn([action.antennaId, 'keywords', 'exclude_keywords'], keywords => (ImmutableList(keywords || [])).push(action.keyword));
+  case ANTENNA_EDITOR_REMOVE_EXCLUDE_KEYWORD_SUCCESS:
+    return state.updateIn([action.antennaId, 'keywords', 'exclude_keywords'], keywords => (ImmutableList(keywords || [])).filterNot(keyword => keyword === action.keyword));
+  case ANTENNA_EDITOR_FETCH_KEYWORDS_SUCCESS:
+    return state.setIn([action.id, 'keywords'], ImmutableMap({ keywords: ImmutableList(action.keywords.keywords), exclude_keywords: ImmutableList(action.keywords.exclude_keywords) }));
+  case ANTENNA_EDITOR_ADD_TAG_SUCCESS:
+    return state.setIn([action.antennaId, 'tags_count'], state.getIn([action.antennaId, 'tags_count']) + 1).updateIn([action.antennaId, 'tags', 'tags'], tags => (ImmutableList(tags || [])).push(action.tag));
+  case ANTENNA_EDITOR_REMOVE_TAG_SUCCESS:
+    return state.setIn([action.antennaId, 'tags_count'], state.getIn([action.antennaId, 'tags_count']) - 1).updateIn([action.antennaId, 'tags', 'tags'], tags => (ImmutableList(tags || [])).filterNot(tag => tag === action.tag));
+  case ANTENNA_EDITOR_ADD_EXCLUDE_TAG_SUCCESS:
+    return state.updateIn([action.antennaId, 'tags', 'exclude_tags'], tags => (ImmutableList(tags || [])).push(action.tag));
+  case ANTENNA_EDITOR_REMOVE_EXCLUDE_TAG_SUCCESS:
+    return state.updateIn([action.antennaId, 'tags', 'exclude_tags'], tags => (ImmutableList(tags || [])).filterNot(tag => tag === action.tag));
+  case ANTENNA_EDITOR_FETCH_TAGS_SUCCESS:
+    return state.setIn([action.id, 'tags'], ImmutableMap({ tags: ImmutableList(action.tags.tags), exclude_tags: ImmutableList(action.tags.exclude_tags) }));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/blocks.js b/app/javascript/mastodon/reducers/blocks.js
deleted file mode 100644
index 1b65071634..0000000000
--- a/app/javascript/mastodon/reducers/blocks.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BLOCKS_INIT_MODAL,
-} from '../actions/blocks';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account_id: null,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BLOCKS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account_id'], action.account.get('id'));
-    });
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/bookmark_categories.js b/app/javascript/mastodon/reducers/bookmark_categories.js
new file mode 100644
index 0000000000..f39e1b4437
--- /dev/null
+++ b/app/javascript/mastodon/reducers/bookmark_categories.js
@@ -0,0 +1,127 @@
+import { Map as ImmutableMap, fromJS, OrderedSet as ImmutableOrderedSet } from 'immutable';
+
+import {
+  BOOKMARK_CATEGORY_FETCH_SUCCESS,
+  BOOKMARK_CATEGORY_FETCH_FAIL,
+  BOOKMARK_CATEGORIES_FETCH_SUCCESS,
+  BOOKMARK_CATEGORY_CREATE_SUCCESS,
+  BOOKMARK_CATEGORY_UPDATE_SUCCESS,
+  BOOKMARK_CATEGORY_DELETE_SUCCESS,
+  BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST,
+  BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS,
+  BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL,
+  BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST,
+  BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS,
+  BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL,
+  BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS,
+  BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS,
+} from '../actions/bookmark_categories';
+import {
+  UNBOOKMARK_SUCCESS,
+} from '../actions/interactions';
+
+const initialState = ImmutableMap();
+
+const normalizeBookmarkCategory = (state, category) => {
+  const old = state.get(category.id);
+  state = state.set(category.id, fromJS(category));
+  if (old) {
+    state = state.setIn([category.id, 'items'], old.get('items'));
+  }
+  return state;
+};
+
+const normalizeBookmarkCategories = (state, bookmarkCategories) => {
+  bookmarkCategories.forEach(bookmarkCategory => {
+    state = normalizeBookmarkCategory(state, bookmarkCategory);
+  });
+
+  return state;
+};
+
+const normalizeBookmarkCategoryStatuses = (state, bookmarkCategoryId, statuses, next) => {
+  return state.update(bookmarkCategoryId, listMap => listMap.withMutations(map => {
+    map.set('next', next);
+    map.set('loaded', true);
+    map.set('isLoading', false);
+    map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
+  }));
+};
+
+const appendToBookmarkCategoryStatuses = (state, bookmarkCategoryId, statuses, next) => {
+  return appendToBookmarkCategoryStatusesById(state, bookmarkCategoryId, statuses.map(item => item.id), next);
+};
+
+const appendToBookmarkCategoryStatusesById = (state, bookmarkCategoryId, statuses, next) => {
+  return state.update(bookmarkCategoryId, listMap => listMap.withMutations(map => {
+    if (typeof next !== 'undefined') {
+      map.set('next', next);
+    }
+    map.set('isLoading', false);
+    if (map.get('items')) {
+      map.set('items', map.get('items').union(statuses));
+    }
+  }));
+};
+
+const prependToBookmarkCategoryStatusesById = (state, bookmarkCategoryId, statuses) => {
+  return state.update(bookmarkCategoryId, listMap => listMap.withMutations(map => {
+    map.set('isLoading', false);
+    if (map.get('items')) {
+      map.update('items', list => ImmutableOrderedSet([statuses]).union(list));
+    }
+  }));
+};
+
+const removeStatusFromBookmarkCategoryById = (state, bookmarkCategoryId, status) => {
+  if (state.getIn([bookmarkCategoryId, 'items'])) {
+    return state.updateIn([bookmarkCategoryId, 'items'], items => items.delete(status));
+  }
+  return state;
+};
+
+const removeStatusFromAllBookmarkCategories = (state, status) => {
+  return removeStatusFromAllBookmarkCategoriesById(state, status.get('id'));
+};
+
+const removeStatusFromAllBookmarkCategoriesById = (state, status) => {
+  state.toList().forEach((bookmarkCategory) => {
+    if (state.getIn([bookmarkCategory.get('id'), 'items'])) {
+      state = state.updateIn([bookmarkCategory.get('id'), 'items'], items => items.delete(status));
+    }
+  });
+  return state;
+};
+
+export default function bookmarkCategories(state = initialState, action) {
+  switch(action.type) {
+  case BOOKMARK_CATEGORY_FETCH_SUCCESS:
+  case BOOKMARK_CATEGORY_CREATE_SUCCESS:
+    return normalizeBookmarkCategory(state, action.bookmarkCategory);
+  case BOOKMARK_CATEGORY_UPDATE_SUCCESS:
+    return state.setIn([action.bookmarkCategory.id, 'title'], action.bookmarkCategory.title);
+  case BOOKMARK_CATEGORIES_FETCH_SUCCESS:
+    return normalizeBookmarkCategories(state, action.bookmarkCategories);
+  case BOOKMARK_CATEGORY_DELETE_SUCCESS:
+  case BOOKMARK_CATEGORY_FETCH_FAIL:
+    return state.set(action.id, false);
+  case BOOKMARK_CATEGORY_STATUSES_FETCH_REQUEST:
+  case BOOKMARK_CATEGORY_STATUSES_EXPAND_REQUEST:
+    return state.setIn([action.id, 'isLoading'], true);
+  case BOOKMARK_CATEGORY_STATUSES_FETCH_FAIL:
+  case BOOKMARK_CATEGORY_STATUSES_EXPAND_FAIL:
+    return state.setIn([action.id, 'isLoading'], false);
+  case BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS:
+    return normalizeBookmarkCategoryStatuses(state, action.id, action.statuses, action.next);
+  case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS:
+    return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next);
+  case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
+    return prependToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId);
+  case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
+    return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId);
+  case UNBOOKMARK_SUCCESS:
+    return removeStatusFromAllBookmarkCategories(state, action.status);
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/bookmark_category_adder.js b/app/javascript/mastodon/reducers/bookmark_category_adder.js
new file mode 100644
index 0000000000..c47ecb3b40
--- /dev/null
+++ b/app/javascript/mastodon/reducers/bookmark_category_adder.js
@@ -0,0 +1,53 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  BOOKMARK_CATEGORY_ADDER_RESET,
+  BOOKMARK_CATEGORY_ADDER_SETUP,
+  BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST,
+  BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS,
+  BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL,
+  BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS,
+  BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS,
+} from '../actions/bookmark_categories';
+import {
+  UNBOOKMARK_SUCCESS,
+} from '../actions/interactions';
+
+const initialState = ImmutableMap({
+  statusId: null,
+
+  bookmarkCategories: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+});
+
+export default function bookmarkCategoryAdderReducer(state = initialState, action) {
+  switch(action.type) {
+  case BOOKMARK_CATEGORY_ADDER_RESET:
+    return initialState;
+  case BOOKMARK_CATEGORY_ADDER_SETUP:
+    return state.withMutations(map => {
+      map.set('statusId', action.status.get('id'));
+    });
+  case BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_REQUEST:
+    return state.setIn(['bookmarkCategories', 'isLoading'], true);
+  case BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_FAIL:
+    return state.setIn(['bookmarkCategories', 'isLoading'], false);
+  case BOOKMARK_CATEGORY_ADDER_BOOKMARK_CATEGORIES_FETCH_SUCCESS:
+    return state.update('bookmarkCategories', bookmarkCategories => bookmarkCategories.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.bookmarkCategories.map(item => item.id)));
+    }));
+  case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
+    return state.updateIn(['bookmarkCategories', 'items'], bookmarkCategory => bookmarkCategory.unshift(action.bookmarkCategoryId));
+  case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
+    return state.updateIn(['bookmarkCategories', 'items'], bookmarkCategory => bookmarkCategory.filterNot(item => item === action.bookmarkCategoryId));
+  case UNBOOKMARK_SUCCESS:
+    return action.status.get('id') === state.get('statusId') ? state.setIn(['bookmarkCategories', 'items'], ImmutableList()) : state;
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/bookmark_category_editor.js b/app/javascript/mastodon/reducers/bookmark_category_editor.js
new file mode 100644
index 0000000000..2c1c55c6d1
--- /dev/null
+++ b/app/javascript/mastodon/reducers/bookmark_category_editor.js
@@ -0,0 +1,67 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  BOOKMARK_CATEGORY_CREATE_REQUEST,
+  BOOKMARK_CATEGORY_CREATE_FAIL,
+  BOOKMARK_CATEGORY_CREATE_SUCCESS,
+  BOOKMARK_CATEGORY_UPDATE_REQUEST,
+  BOOKMARK_CATEGORY_UPDATE_FAIL,
+  BOOKMARK_CATEGORY_UPDATE_SUCCESS,
+  BOOKMARK_CATEGORY_EDITOR_RESET,
+  BOOKMARK_CATEGORY_EDITOR_SETUP,
+  BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE,
+} from '../actions/bookmark_categories';
+
+const initialState = ImmutableMap({
+  bookmarkCategoryId: null,
+  isSubmitting: false,
+  isChanged: false,
+  title: '',
+  isExclusive: false,
+
+  statuses: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+
+  suggestions: ImmutableMap({
+    value: '',
+    items: ImmutableList(),
+  }),
+});
+
+export default function bookmarkCategoryEditorReducer(state = initialState, action) {
+  switch(action.type) {
+  case BOOKMARK_CATEGORY_EDITOR_RESET:
+    return initialState;
+  case BOOKMARK_CATEGORY_EDITOR_SETUP:
+    return state.withMutations(map => {
+      map.set('bookmarkCategoryId', action.bookmarkCategory.get('id'));
+      map.set('title', action.bookmarkCategory.get('title'));
+      map.set('isSubmitting', false);
+    });
+  case BOOKMARK_CATEGORY_EDITOR_TITLE_CHANGE:
+    return state.withMutations(map => {
+      map.set('title', action.value);
+      map.set('isChanged', true);
+    });
+  case BOOKMARK_CATEGORY_CREATE_REQUEST:
+  case BOOKMARK_CATEGORY_UPDATE_REQUEST:
+    return state.withMutations(map => {
+      map.set('isSubmitting', true);
+      map.set('isChanged', false);
+    });
+  case BOOKMARK_CATEGORY_CREATE_FAIL:
+  case BOOKMARK_CATEGORY_UPDATE_FAIL:
+    return state.set('isSubmitting', false);
+  case BOOKMARK_CATEGORY_CREATE_SUCCESS:
+  case BOOKMARK_CATEGORY_UPDATE_SUCCESS:
+    return state.withMutations(map => {
+      map.set('isSubmitting', false);
+      map.set('bookmarkCategoryId', action.bookmarkCategory.id);
+    });
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/boosts.js b/app/javascript/mastodon/reducers/boosts.js
deleted file mode 100644
index d0d825057c..0000000000
--- a/app/javascript/mastodon/reducers/boosts.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  BOOSTS_INIT_MODAL,
-  BOOSTS_CHANGE_PRIVACY,
-} from 'mastodon/actions/boosts';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    privacy: 'public',
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case BOOSTS_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'privacy'], action.privacy);
-    });
-  case BOOSTS_CHANGE_PRIVACY:
-    return state.setIn(['new', 'privacy'], action.privacy);
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/circle_adder.js b/app/javascript/mastodon/reducers/circle_adder.js
new file mode 100644
index 0000000000..f09db160e6
--- /dev/null
+++ b/app/javascript/mastodon/reducers/circle_adder.js
@@ -0,0 +1,48 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  CIRCLE_ADDER_RESET,
+  CIRCLE_ADDER_SETUP,
+  CIRCLE_ADDER_CIRCLES_FETCH_REQUEST,
+  CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS,
+  CIRCLE_ADDER_CIRCLES_FETCH_FAIL,
+  CIRCLE_EDITOR_ADD_SUCCESS,
+  CIRCLE_EDITOR_REMOVE_SUCCESS,
+} from '../actions/circles';
+
+const initialState = ImmutableMap({
+  accountId: null,
+
+  circles: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+});
+
+export default function circleAdderReducer(state = initialState, action) {
+  switch(action.type) {
+  case CIRCLE_ADDER_RESET:
+    return initialState;
+  case CIRCLE_ADDER_SETUP:
+    return state.withMutations(map => {
+      map.set('accountId', action.account.get('id'));
+    });
+  case CIRCLE_ADDER_CIRCLES_FETCH_REQUEST:
+    return state.setIn(['circles', 'isLoading'], true);
+  case CIRCLE_ADDER_CIRCLES_FETCH_FAIL:
+    return state.setIn(['circles', 'isLoading'], false);
+  case CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS:
+    return state.update('circles', circles => circles.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.circles.map(item => item.id)));
+    }));
+  case CIRCLE_EDITOR_ADD_SUCCESS:
+    return state.updateIn(['circles', 'items'], circle => circle.unshift(action.circleId));
+  case CIRCLE_EDITOR_REMOVE_SUCCESS:
+    return state.updateIn(['circles', 'items'], circle => circle.filterNot(item => item === action.circleId));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/circle_editor.js b/app/javascript/mastodon/reducers/circle_editor.js
new file mode 100644
index 0000000000..b991b8d417
--- /dev/null
+++ b/app/javascript/mastodon/reducers/circle_editor.js
@@ -0,0 +1,99 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+import {
+  CIRCLE_CREATE_REQUEST,
+  CIRCLE_CREATE_FAIL,
+  CIRCLE_CREATE_SUCCESS,
+  CIRCLE_UPDATE_REQUEST,
+  CIRCLE_UPDATE_FAIL,
+  CIRCLE_UPDATE_SUCCESS,
+  CIRCLE_EDITOR_RESET,
+  CIRCLE_EDITOR_SETUP,
+  CIRCLE_EDITOR_TITLE_CHANGE,
+  CIRCLE_ACCOUNTS_FETCH_REQUEST,
+  CIRCLE_ACCOUNTS_FETCH_SUCCESS,
+  CIRCLE_ACCOUNTS_FETCH_FAIL,
+  CIRCLE_EDITOR_SUGGESTIONS_READY,
+  CIRCLE_EDITOR_SUGGESTIONS_CLEAR,
+  CIRCLE_EDITOR_SUGGESTIONS_CHANGE,
+  CIRCLE_EDITOR_ADD_SUCCESS,
+  CIRCLE_EDITOR_REMOVE_SUCCESS,
+} from '../actions/circles';
+
+const initialState = ImmutableMap({
+  circleId: null,
+  isSubmitting: false,
+  isChanged: false,
+  title: '',
+  isExclusive: false,
+
+  accounts: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+
+  suggestions: ImmutableMap({
+    value: '',
+    items: ImmutableList(),
+  }),
+});
+
+export default function circleEditorReducer(state = initialState, action) {
+  switch(action.type) {
+  case CIRCLE_EDITOR_RESET:
+    return initialState;
+  case CIRCLE_EDITOR_SETUP:
+    return state.withMutations(map => {
+      map.set('circleId', action.circle.get('id'));
+      map.set('title', action.circle.get('title'));
+      map.set('isExclusive', action.circle.get('is_exclusive'));
+      map.set('isSubmitting', false);
+    });
+  case CIRCLE_EDITOR_TITLE_CHANGE:
+    return state.withMutations(map => {
+      map.set('title', action.value);
+      map.set('isChanged', true);
+    });
+  case CIRCLE_CREATE_REQUEST:
+  case CIRCLE_UPDATE_REQUEST:
+    return state.withMutations(map => {
+      map.set('isSubmitting', true);
+      map.set('isChanged', false);
+    });
+  case CIRCLE_CREATE_FAIL:
+  case CIRCLE_UPDATE_FAIL:
+    return state.set('isSubmitting', false);
+  case CIRCLE_CREATE_SUCCESS:
+  case CIRCLE_UPDATE_SUCCESS:
+    return state.withMutations(map => {
+      map.set('isSubmitting', false);
+      map.set('circleId', action.circle.id);
+    });
+  case CIRCLE_ACCOUNTS_FETCH_REQUEST:
+    return state.setIn(['accounts', 'isLoading'], true);
+  case CIRCLE_ACCOUNTS_FETCH_FAIL:
+    return state.setIn(['accounts', 'isLoading'], false);
+  case CIRCLE_ACCOUNTS_FETCH_SUCCESS:
+    return state.update('accounts', accounts => accounts.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.accounts.map(item => item.id)));
+    }));
+  case CIRCLE_EDITOR_SUGGESTIONS_CHANGE:
+    return state.setIn(['suggestions', 'value'], action.value);
+  case CIRCLE_EDITOR_SUGGESTIONS_READY:
+    return state.setIn(['suggestions', 'items'], ImmutableList(action.accounts.map(item => item.id)));
+  case CIRCLE_EDITOR_SUGGESTIONS_CLEAR:
+    return state.update('suggestions', suggestions => suggestions.withMutations(map => {
+      map.set('items', ImmutableList());
+      map.set('value', '');
+    }));
+  case CIRCLE_EDITOR_ADD_SUCCESS:
+    return state.updateIn(['accounts', 'items'], circle => circle.unshift(action.accountId));
+  case CIRCLE_EDITOR_REMOVE_SUCCESS:
+    return state.updateIn(['accounts', 'items'], circle => circle.filterNot(item => item === action.accountId));
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/circles.js b/app/javascript/mastodon/reducers/circles.js
new file mode 100644
index 0000000000..6b27712a49
--- /dev/null
+++ b/app/javascript/mastodon/reducers/circles.js
@@ -0,0 +1,105 @@
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
+
+import {
+  CIRCLE_FETCH_SUCCESS,
+  CIRCLE_FETCH_FAIL,
+  CIRCLES_FETCH_SUCCESS,
+  CIRCLE_CREATE_SUCCESS,
+  CIRCLE_UPDATE_SUCCESS,
+  CIRCLE_DELETE_SUCCESS,
+  CIRCLE_STATUSES_FETCH_REQUEST,
+  CIRCLE_STATUSES_FETCH_SUCCESS,
+  CIRCLE_STATUSES_FETCH_FAIL,
+  CIRCLE_STATUSES_EXPAND_REQUEST,
+  CIRCLE_STATUSES_EXPAND_SUCCESS,
+  CIRCLE_STATUSES_EXPAND_FAIL,
+} from '../actions/circles';
+import {
+  COMPOSE_WITH_CIRCLE_SUCCESS,
+} from '../actions/compose';
+
+const initialState = ImmutableMap();
+
+const normalizeCircle = (state, circle) => {
+  const old = state.get(circle.id);
+  if (old === false) {
+    return state;
+  }
+
+  state = state.set(circle.id, fromJS(circle));
+  if (old) {
+    state = state.setIn([circle.id, 'items'], old.get('items'));
+  }
+  return state.setIn([circle.id, 'isLoading'], false).setIn([circle.id, 'isLoaded'], true);
+};
+
+const normalizeCircles = (state, circles) => {
+  circles.forEach(circle => {
+    state = normalizeCircle(state, circle);
+  });
+
+  return state;
+};
+
+const normalizeCircleStatuses = (state, circleId, statuses, next) => {
+  return state.update(circleId, listMap => listMap.withMutations(map => {
+    map.set('next', next);
+    map.set('loaded', true);
+    map.set('isLoading', false);
+    map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
+  }));
+};
+
+const appendToCircleStatuses = (state, circleId, statuses, next) => {
+  return appendToCircleStatusesById(state, circleId, statuses.map(item => item.id), next);
+};
+
+const appendToCircleStatusesById = (state, circleId, statuses, next) => {
+  return state.update(circleId, listMap => listMap.withMutations(map => {
+    if (typeof next !== 'undefined') {
+      map.set('next', next);
+    }
+    map.set('isLoading', false);
+    if (map.get('items')) {
+      map.set('items', map.get('items').union(statuses));
+    }
+  }));
+};
+
+const prependToCircleStatusById = (state, circleId, statusId) => {
+  if (!state.get(circleId)) return state;
+
+  return state.updateIn([circleId], circle => circle.withMutations(map => {
+    if (map.get('items')) {
+      map.update('items', list => ImmutableOrderedSet([statusId]).union(list));
+    }
+  }));
+};
+
+export default function circles(state = initialState, action) {
+  switch(action.type) {
+  case CIRCLE_FETCH_SUCCESS:
+  case CIRCLE_CREATE_SUCCESS:
+  case CIRCLE_UPDATE_SUCCESS:
+    return normalizeCircle(state, action.circle);
+  case CIRCLES_FETCH_SUCCESS:
+    return normalizeCircles(state, action.circles);
+  case CIRCLE_DELETE_SUCCESS:
+  case CIRCLE_FETCH_FAIL:
+    return state.set(action.id, false);
+  case CIRCLE_STATUSES_FETCH_REQUEST:
+  case CIRCLE_STATUSES_EXPAND_REQUEST:
+    return state.setIn([action.id, 'isLoading'], true);
+  case CIRCLE_STATUSES_FETCH_FAIL:
+  case CIRCLE_STATUSES_EXPAND_FAIL:
+    return state.setIn([action.id, 'isLoading'], false);
+  case CIRCLE_STATUSES_FETCH_SUCCESS:
+    return normalizeCircleStatuses(state, action.id, action.statuses, action.next);
+  case CIRCLE_STATUSES_EXPAND_SUCCESS:
+    return appendToCircleStatuses(state, action.id, action.statuses, action.next);
+  case COMPOSE_WITH_CIRCLE_SUCCESS:
+    return prependToCircleStatusById(state, action.circleId, action.status.id);
+  default:
+    return state;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index e6b2509f66..d9c333c4ce 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -30,30 +30,35 @@ import {
   COMPOSE_SENSITIVITY_CHANGE,
   COMPOSE_SPOILERNESS_CHANGE,
   COMPOSE_SPOILER_TEXT_CHANGE,
+  COMPOSE_MARKDOWN_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LANGUAGE_CHANGE,
   COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
+  COMPOSE_EXPIRATION_INSERT,
+  COMPOSE_FEATURED_TAG_INSERT,
+  COMPOSE_REFERENCE_INSERT,
   COMPOSE_UPLOAD_CHANGE_REQUEST,
   COMPOSE_UPLOAD_CHANGE_SUCCESS,
   COMPOSE_UPLOAD_CHANGE_FAIL,
   COMPOSE_RESET,
   COMPOSE_POLL_ADD,
   COMPOSE_POLL_REMOVE,
-  COMPOSE_POLL_OPTION_ADD,
   COMPOSE_POLL_OPTION_CHANGE,
-  COMPOSE_POLL_OPTION_REMOVE,
   COMPOSE_POLL_SETTINGS_CHANGE,
+  COMPOSE_CIRCLE_CHANGE,
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
   COMPOSE_CHANGE_MEDIA_FOCUS,
+  COMPOSE_CHANGE_MEDIA_ORDER,
   COMPOSE_SET_STATUS,
+  COMPOSE_SEARCHABILITY_CHANGE,
   COMPOSE_FOCUS,
 } from '../actions/compose';
 import { REDRAFT } from '../actions/statuses';
 import { STORE_HYDRATE } from '../actions/store';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { me } from '../initial_state';
+import { enabledVisibilites, me } from '../initial_state';
 import { unescapeHTML } from '../utils/html';
 import { uuid } from '../uuid';
 
@@ -62,13 +67,17 @@ const initialState = ImmutableMap({
   sensitive: false,
   spoiler: false,
   spoiler_text: '',
+  markdown: false,
   privacy: null,
+  circle_id: null,
+  searchability: null,
   id: null,
   text: '',
   focusDate: null,
   caretPosition: null,
   preselectDate: null,
   in_reply_to: null,
+  reply_to_limited: false,
   is_composing: false,
   is_submitting: false,
   is_changing_upload: false,
@@ -82,6 +91,8 @@ const initialState = ImmutableMap({
   suggestion_token: null,
   suggestions: ImmutableList(),
   default_privacy: 'public',
+  stay_privacy: false,
+  default_searchability: 'private',
   default_sensitive: false,
   default_language: 'en',
   resetFileKey: Math.floor((Math.random() * 0x10000)),
@@ -94,6 +105,7 @@ const initialState = ImmutableMap({
     focusY: 0,
     dirty: false,
   }),
+  posted_on_this_session: false,
 });
 
 const initialPoll = ImmutableMap({
@@ -103,6 +115,10 @@ const initialPoll = ImmutableMap({
 });
 
 function statusToTextMentions(state, status) {
+  if (status.get('visibility_ex') === 'limited') {
+    return '';
+  }
+
   let set = ImmutableOrderedSet([]);
 
   if (status.getIn(['account', 'id']) !== me) {
@@ -114,19 +130,37 @@ function statusToTextMentions(state, status) {
 
 function clearAll(state) {
   return state.withMutations(map => {
-    map.set('id', null);
     map.set('text', '');
     map.set('spoiler', false);
     map.set('spoiler_text', '');
+    map.set('markdown', false);
     map.set('is_submitting', false);
     map.set('is_changing_upload', false);
+    if (!state.get('stay_privacy') || state.get('in_reply_to') || !state.get('posted_on_this_session') || state.get('id')) {
+      map.set('privacy', state.get('default_privacy'));
+      map.set('circle_id', null);
+    }
+    if (state.get('stay_privacy') && !state.get('in_reply_to')) {
+      map.set('default_privacy', state.get('privacy'));
+    }
+    if (!state.get('in_reply_to')) {
+      map.set('posted_on_this_session', true);
+    }
+    map.set('reply_to_limited', false);
+    map.set('limited_scope', null);
+    map.set('id', null);
     map.set('in_reply_to', null);
-    map.set('privacy', state.get('default_privacy'));
+    if (state.get('default_searchability') === 'public_unlisted' && !enabledVisibilites.includes('public_unlisted')) {
+      map.set('searchability', 'public');
+    } else {
+      map.set('searchability', state.get('default_searchability'));
+    }
     map.set('sensitive', state.get('default_sensitive'));
     map.set('language', state.get('default_language'));
     map.update('media_attachments', list => list.clear());
     map.set('poll', null);
     map.set('idempotencyKey', uuid());
+    normalizePrivacy(map);
   });
 }
 
@@ -207,6 +241,22 @@ const sortHashtagsByUse = (state, tags) => {
   return sorted;
 };
 
+const normalizePrivacy = (map, last) => {
+  if (!enabledVisibilites) {
+    return;
+  }
+
+  const current = map.get('privacy');
+  const invalid = !enabledVisibilites.includes(current);
+
+  if (invalid) {
+    if (enabledVisibilites.length > 0) {
+      const index = last ? enabledVisibilites.length - 1 : 0;
+      map.set('privacy', enabledVisibilites[index]);
+    }
+  }
+};
+
 const insertEmoji = (state, position, emojiData, needsSpace) => {
   const oldText = state.get('text');
   const emoji = needsSpace ? ' ' + emojiData.native : emojiData.native;
@@ -219,8 +269,57 @@ const insertEmoji = (state, position, emojiData, needsSpace) => {
   });
 };
 
+const insertExpiration = (state, position, data) => {
+  const oldText = state.get('text');
+
+  return state.merge({
+    text: `${oldText.slice(0, position)} ${data} ${oldText.slice(position)}`,
+    focusDate: new Date(),
+    caretPosition: position + data.length + 2,
+    idempotencyKey: uuid(),
+  });
+};
+
+const insertFeaturedTag = insertExpiration;
+
+const insertReference = (state, url, attributeType) => {
+  const oldText = state.get('text');
+  const attribute = attributeType || 'BT';
+
+  if (oldText.indexOf(`${attribute} ${url}`) >= 0) {
+    return state;
+  }
+
+  let newLine = '\n\n';
+  if (oldText.length === 0) newLine = '';
+  else if (oldText[oldText.length - 1] === '\n') {
+    if (oldText.length === 1 || oldText[oldText.length - 2] === '\n') {
+      newLine = '';
+    } else {
+      newLine = '\n';
+    }
+  }
+
+  if (oldText.length > 0) {
+    const lastLine = oldText.slice(oldText.lastIndexOf('\n') + 1, oldText.length - 1);
+    if (lastLine.startsWith(`${attribute} `)) {
+      newLine = '\n';
+    }
+  }
+
+  const referenceText = `${newLine}${attribute} ${url}`;
+  const text = `${oldText}${referenceText}`;
+
+  return state.merge({
+    text,
+    focusDate: new Date(),
+    caretPosition: text.length - referenceText.length,
+    idempotencyKey: uuid(),
+  });
+};
+
 const privacyPreference = (a, b) => {
-  const order = ['public', 'unlisted', 'private', 'direct'];
+  const order = ['public', 'public_unlisted', 'unlisted', 'login', 'private', 'direct'];
   return order[Math.max(order.indexOf(a), order.indexOf(b), 0)];
 };
 
@@ -282,6 +381,18 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const updatePoll = (state, index, value, maxOptions) => state.updateIn(['poll', 'options'], options => {
+  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+
+  if (tmp.size === 0) {
+    return tmp.push('').push('');
+  } else if (tmp.size < maxOptions) {
+    return tmp.push('');
+  }
+
+  return tmp;
+});
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -305,8 +416,8 @@ export default function compose(state = initialState, action) {
       map.set('spoiler', !state.get('spoiler'));
       map.set('idempotencyKey', uuid());
 
-      if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
-        map.set('sensitive', true);
+      if (state.get('media_attachments').size >= 1 && !state.get('default_sensitive')) {
+        map.set('sensitive', !state.get('spoiler'));
       }
     });
   case COMPOSE_SPOILER_TEXT_CHANGE:
@@ -314,10 +425,19 @@ export default function compose(state = initialState, action) {
     return state
       .set('spoiler_text', action.text)
       .set('idempotencyKey', uuid());
+  case COMPOSE_MARKDOWN_CHANGE:
+    return state.withMutations(map => {
+      map.set('markdown', !state.get('markdown'));
+      map.set('idempotencyKey', uuid());
+    });
   case COMPOSE_VISIBILITY_CHANGE:
     return state
       .set('privacy', action.value)
       .set('idempotencyKey', uuid());
+  case COMPOSE_SEARCHABILITY_CHANGE:
+    return state
+      .set('searchability', action.value)
+      .set('idempotencyKey', uuid());
   case COMPOSE_CHANGE:
     return state
       .set('text', action.text)
@@ -329,7 +449,14 @@ export default function compose(state = initialState, action) {
       map.set('id', null);
       map.set('in_reply_to', action.status.get('id'));
       map.set('text', statusToTextMentions(state, action.status));
-      map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
+      map.set('reply_to_limited', action.status.get('visibility_ex') === 'limited');
+      if (action.status.get('visibility_ex') === 'limited') {
+        map.set('privacy', 'reply');
+      } else {
+        map.set('privacy', privacyPreference(action.status.get('visibility_ex'), state.get('default_privacy')));
+      }
+      map.set('limited_scope', null);
+      map.set('searchability', privacyPreference(action.status.get('searchability'), state.get('default_searchability')));
       map.set('focusDate', new Date());
       map.set('caretPosition', null);
       map.set('preselectDate', new Date());
@@ -354,6 +481,8 @@ export default function compose(state = initialState, action) {
         map.set('spoiler', false);
         map.set('spoiler_text', '');
       }
+
+      normalizePrivacy(map);
     });
   case COMPOSE_SUBMIT_REQUEST:
     return state.set('is_submitting', true);
@@ -419,6 +548,7 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
       map.set('privacy', 'direct');
+      normalizePrivacy(map, true);
       map.set('focusDate', new Date());
       map.set('caretPosition', null);
       map.set('idempotencyKey', uuid());
@@ -437,7 +567,11 @@ export default function compose(state = initialState, action) {
     return state.set('tagHistory', fromJS(action.tags));
   case TIMELINE_DELETE:
     if (action.id === state.get('in_reply_to')) {
-      return state.set('in_reply_to', null);
+      if (state.get('privacy') === 'reply') {
+        return state.set('in_reply_to', null).set('privacy', 'circle');
+      } else {
+        return state.set('in_reply_to', null);
+      }
     } else if (action.id === state.get('id')) {
       return state.set('id', null);
     } else {
@@ -445,6 +579,12 @@ export default function compose(state = initialState, action) {
     }
   case COMPOSE_EMOJI_INSERT:
     return insertEmoji(state, action.position, action.emoji, action.needsSpace);
+  case COMPOSE_EXPIRATION_INSERT:
+    return insertExpiration(state, action.position, action.data);
+  case COMPOSE_FEATURED_TAG_INSERT:
+    return insertFeaturedTag(state, action.position, action.data);
+  case COMPOSE_REFERENCE_INSERT:
+    return insertReference(state, action.url, action.attributeType);
   case COMPOSE_UPLOAD_CHANGE_SUCCESS:
     return state
       .set('is_changing_upload', false)
@@ -460,13 +600,17 @@ export default function compose(state = initialState, action) {
     return state.withMutations(map => {
       map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
-      map.set('privacy', action.status.get('visibility'));
+      map.set('privacy', action.status.get('visibility_ex'));
+      normalizePrivacy(map);
+      map.set('reply_to_limited', action.status.get('limited_scope') === 'reply');
+      map.set('limited_scope', null);
       map.set('media_attachments', action.status.get('media_attachments').map((media) => media.set('unattached', true)));
       map.set('focusDate', new Date());
       map.set('caretPosition', null);
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
+      map.set('markdown', action.status.get('markdown'));
       map.set('id', null);
 
       if (action.status.get('spoiler_text').length > 0) {
@@ -490,19 +634,26 @@ export default function compose(state = initialState, action) {
       map.set('id', action.status.get('id'));
       map.set('text', action.text);
       map.set('in_reply_to', action.status.get('in_reply_to_id'));
-      map.set('privacy', action.status.get('visibility'));
+      if (action.status.get('visibility_ex') !== 'limited') {
+        map.set('privacy', action.status.get('visibility_ex'));
+      } else {
+        map.set('privacy', action.status.get('limited_scope') || 'circle');
+      }
+      map.set('reply_to_limited', action.status.get('limited_scope') === 'reply');
+      map.set('limited_scope', action.status.get('limited_scope'));
       map.set('media_attachments', action.status.get('media_attachments'));
       map.set('focusDate', new Date());
       map.set('caretPosition', null);
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
+      map.set('markdown', action.status.get('markdown'));
 
       if (action.spoiler_text.length > 0) {
         map.set('spoiler', true);
         map.set('spoiler_text', action.spoiler_text);
       } else {
-        map.set('spoiler', false);
+        map.set('spoiler', action.status.get('sensitive'));
         map.set('spoiler_text', '');
       }
 
@@ -518,18 +669,24 @@ export default function compose(state = initialState, action) {
     return state.set('poll', initialPoll);
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
-  case COMPOSE_POLL_OPTION_ADD:
-    return state.updateIn(['poll', 'options'], options => options.push(action.title));
   case COMPOSE_POLL_OPTION_CHANGE:
-    return state.setIn(['poll', 'options', action.index], action.title);
-  case COMPOSE_POLL_OPTION_REMOVE:
-    return state.updateIn(['poll', 'options'], options => options.delete(action.index));
+    return updatePoll(state, action.index, action.title, action.maxOptions);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
+  case COMPOSE_CIRCLE_CHANGE:
+    return state.set('circle_id', action.circleId);
   case COMPOSE_LANGUAGE_CHANGE:
     return state.set('language', action.language);
   case COMPOSE_FOCUS:
     return state.set('focusDate', new Date()).update('text', text => text.length > 0 ? text : action.defaultText);
+  case COMPOSE_CHANGE_MEDIA_ORDER:
+    return state.update('media_attachments', list => {
+      const indexA = list.findIndex(x => x.get('id') === action.a);
+      const moveItem = list.get(indexA);
+      const indexB = list.findIndex(x => x.get('id') === action.b);
+
+      return list.splice(indexA, 1).splice(indexB, 0, moveItem);
+    });
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/contexts.js b/app/javascript/mastodon/reducers/contexts.js
index f7d7419a4e..d3adeac2d3 100644
--- a/app/javascript/mastodon/reducers/contexts.js
+++ b/app/javascript/mastodon/reducers/contexts.js
@@ -11,33 +11,38 @@ import { compareId } from '../compare_id';
 const initialState = ImmutableMap({
   inReplyTos: ImmutableMap(),
   replies: ImmutableMap(),
+  references: ImmutableMap(),
 });
 
-const normalizeContext = (immutableState, id, ancestors, descendants) => immutableState.withMutations(state => {
+const normalizeContext = (immutableState, id, ancestors, descendants, references) => immutableState.withMutations(state => {
   state.update('inReplyTos', immutableAncestors => immutableAncestors.withMutations(inReplyTos => {
     state.update('replies', immutableDescendants => immutableDescendants.withMutations(replies => {
-      function addReply({ id, in_reply_to_id }) {
-        if (in_reply_to_id && !inReplyTos.has(id)) {
+      state.update('references', immutableReferences => immutableReferences.withMutations(referencePosts => {
+        function addReply({ id, in_reply_to_id }) {
+          if (in_reply_to_id && !inReplyTos.has(id)) {
 
-          replies.update(in_reply_to_id, ImmutableList(), siblings => {
-            const index = siblings.findLastIndex(sibling => compareId(sibling, id) < 0);
-            return siblings.insert(index + 1, id);
-          });
+            replies.update(in_reply_to_id, ImmutableList(), siblings => {
+              const index = siblings.findLastIndex(sibling => compareId(sibling, id) < 0);
+              return siblings.insert(index + 1, id);
+            });
 
-          inReplyTos.set(id, in_reply_to_id);
+            inReplyTos.set(id, in_reply_to_id);
+          }
         }
-      }
 
-      // We know in_reply_to_id of statuses but `id` itself.
-      // So we assume that the status of the id replies to last ancestors.
+        // We know in_reply_to_id of statuses but `id` itself.
+        // So we assume that the status of the id replies to last ancestors.
 
-      ancestors.forEach(addReply);
+        ancestors.forEach(addReply);
 
-      if (ancestors[0]) {
-        addReply({ id, in_reply_to_id: ancestors[ancestors.length - 1].id });
-      }
+        if (ancestors[0]) {
+          addReply({ id, in_reply_to_id: ancestors[ancestors.length - 1].id });
+        }
 
-      descendants.forEach(addReply);
+        descendants.forEach(addReply);
+
+        referencePosts.set(id, ImmutableList(references.map((r) => r.id)));
+      }));
     }));
   }));
 });
@@ -96,7 +101,7 @@ export default function replies(state = initialState, action) {
   case muteAccountSuccess.type:
     return filterContexts(state, action.payload.relationship, action.payload.statuses);
   case CONTEXT_FETCH_SUCCESS:
-    return normalizeContext(state, action.id, action.ancestors, action.descendants);
+    return normalizeContext(state, action.id, action.ancestors, action.descendants, action.references);
   case TIMELINE_DELETE:
     return deleteFromContexts(state, [action.id]);
   case TIMELINE_UPDATE:
diff --git a/app/javascript/mastodon/reducers/filters.js b/app/javascript/mastodon/reducers/filters.js
index 566ad0c6ca..8816f3f81b 100644
--- a/app/javascript/mastodon/reducers/filters.js
+++ b/app/javascript/mastodon/reducers/filters.js
@@ -9,8 +9,10 @@ const normalizeFilter = (state, filter) => {
     title: filter.title,
     context: filter.context,
     filter_action: filter.filter_action,
+    filter_action_ex: filter.filter_action_ex,
     keywords: filter.keywords,
     expires_at: filter.expires_at ? Date.parse(filter.expires_at) : null,
+    with_quote: filter.with_quote,
   });
 
   if (is(state.get(filter.id), normalizedFilter)) {
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index ecef633873..003ab99ab4 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -7,8 +7,15 @@ import { accountsReducer } from './accounts';
 import accounts_map from './accounts_map';
 import alerts from './alerts';
 import announcements from './announcements';
-import blocks from './blocks';
-import boosts from './boosts';
+import antennaAdder from './antenna_adder';
+import antennaEditor from './antenna_editor';
+import antennas from './antennas';
+import bookmark_categories from './bookmark_categories';
+import bookmarkCategoryAdder from './bookmark_category_adder';
+import bookmarkCategoryEditor from './bookmark_category_editor';
+import circleAdder from './circle_adder';
+import circleEditor from './circle_editor';
+import circles from './circles';
 import compose from './compose';
 import contexts from './contexts';
 import conversations from './conversations';
@@ -22,15 +29,17 @@ import history from './history';
 import listAdder from './list_adder';
 import listEditor from './list_editor';
 import lists from './lists';
-import markers from './markers';
+import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
-import mutes from './mutes';
+import { notificationPolicyReducer } from './notification_policy';
+import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
-import picture_in_picture from './picture_in_picture';
+import { pictureInPictureReducer } from './picture_in_picture';
 import polls from './polls';
 import push_notifications from './push_notifications';
+import reaction_deck from './reaction_deck';
 import { relationshipsReducer } from './relationships';
 import search from './search';
 import server from './server';
@@ -60,9 +69,6 @@ const reducers = {
   relationships: relationshipsReducer,
   settings,
   push_notifications,
-  mutes,
-  blocks,
-  boosts,
   server,
   contexts,
   compose,
@@ -74,16 +80,28 @@ const reducers = {
   lists,
   listEditor,
   listAdder,
+  antennas,
+  antennaEditor,
+  antennaAdder,
+  circles,
+  circleEditor,
+  circleAdder,
+  bookmark_categories,
+  bookmarkCategoryEditor,
+  bookmarkCategoryAdder,
   filters,
   conversations,
   suggestions,
   polls,
   trends,
-  markers,
-  picture_in_picture,
+  markers: markersReducer,
+  picture_in_picture: pictureInPictureReducer,
   history,
   tags,
   followed_tags,
+  reaction_deck,
+  notificationPolicy: notificationPolicyReducer,
+  notificationRequests: notificationRequestsReducer,
 };
 
 // We want the root state to be an ImmutableRecord, which is an object with a defined list of keys,
diff --git a/app/javascript/mastodon/reducers/list_adder.js b/app/javascript/mastodon/reducers/list_adder.js
index 0f61273aa6..d5ac91e9fd 100644
--- a/app/javascript/mastodon/reducers/list_adder.js
+++ b/app/javascript/mastodon/reducers/list_adder.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_adder, circle_adder, bookmark_category_adder
+
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 import {
diff --git a/app/javascript/mastodon/reducers/list_editor.js b/app/javascript/mastodon/reducers/list_editor.js
index d3fd62adec..f0bb8886ec 100644
--- a/app/javascript/mastodon/reducers/list_editor.js
+++ b/app/javascript/mastodon/reducers/list_editor.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antenna_editor, circle_editor, bookmark_category_editor
+
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 import {
diff --git a/app/javascript/mastodon/reducers/lists.js b/app/javascript/mastodon/reducers/lists.js
index 2a797772b3..e196fe9b70 100644
--- a/app/javascript/mastodon/reducers/lists.js
+++ b/app/javascript/mastodon/reducers/lists.js
@@ -1,3 +1,5 @@
+// Kmyblue tracking marker: copied antennas, circles, bookmark_categories
+
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import {
diff --git a/app/javascript/mastodon/reducers/markers.js b/app/javascript/mastodon/reducers/markers.js
deleted file mode 100644
index c7c5d99f61..0000000000
--- a/app/javascript/mastodon/reducers/markers.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Map as ImmutableMap } from 'immutable';
-
-import {
-  MARKERS_SUBMIT_SUCCESS,
-} from '../actions/markers';
-
-
-const initialState = ImmutableMap({
-  home: '0',
-  notifications: '0',
-});
-
-export default function markers(state = initialState, action) {
-  switch(action.type) {
-  case MARKERS_SUBMIT_SUCCESS:
-    if (action.home) {
-      state = state.set('home', action.home);
-    }
-    if (action.notifications) {
-      state = state.set('notifications', action.notifications);
-    }
-    return state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/markers.ts b/app/javascript/mastodon/reducers/markers.ts
new file mode 100644
index 0000000000..ec85d0f173
--- /dev/null
+++ b/app/javascript/mastodon/reducers/markers.ts
@@ -0,0 +1,18 @@
+import { createReducer } from '@reduxjs/toolkit';
+
+import { submitMarkersAction } from 'mastodon/actions/markers';
+
+const initialState = {
+  home: '0',
+  notifications: '0',
+};
+
+export const markersReducer = createReducer(initialState, (builder) => {
+  builder.addCase(
+    submitMarkersAction.fulfilled,
+    (state, { payload: { home, notifications } }) => {
+      if (home) state.home = home;
+      if (notifications) state.notifications = notifications;
+    },
+  );
+});
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
deleted file mode 100644
index a9eb61ff83..0000000000
--- a/app/javascript/mastodon/reducers/mutes.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Immutable from 'immutable';
-
-import {
-  MUTES_INIT_MODAL,
-  MUTES_TOGGLE_HIDE_NOTIFICATIONS,
-  MUTES_CHANGE_DURATION,
-} from '../actions/mutes';
-
-const initialState = Immutable.Map({
-  new: Immutable.Map({
-    account: null,
-    notifications: true,
-    duration: 0,
-  }),
-});
-
-export default function mutes(state = initialState, action) {
-  switch (action.type) {
-  case MUTES_INIT_MODAL:
-    return state.withMutations((state) => {
-      state.setIn(['new', 'account'], action.account);
-      state.setIn(['new', 'notifications'], true);
-    });
-  case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
-    return state.updateIn(['new', 'notifications'], (old) => !old);
-  case MUTES_CHANGE_DURATION:
-    return state.setIn(['new', 'duration'], Number(action.duration));
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/notification_policy.js b/app/javascript/mastodon/reducers/notification_policy.js
new file mode 100644
index 0000000000..8edb4d12a1
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_policy.js
@@ -0,0 +1,12 @@
+import { fromJS } from 'immutable';
+
+import { NOTIFICATION_POLICY_FETCH_SUCCESS } from 'mastodon/actions/notifications';
+
+export const notificationPolicyReducer = (state = null, action) => {
+  switch(action.type) {
+  case NOTIFICATION_POLICY_FETCH_SUCCESS:
+    return fromJS(action.policy);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
new file mode 100644
index 0000000000..4247062a58
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_requests.js
@@ -0,0 +1,96 @@
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+import {
+  NOTIFICATION_REQUESTS_EXPAND_REQUEST,
+  NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
+  NOTIFICATION_REQUESTS_EXPAND_FAIL,
+  NOTIFICATION_REQUESTS_FETCH_REQUEST,
+  NOTIFICATION_REQUESTS_FETCH_SUCCESS,
+  NOTIFICATION_REQUESTS_FETCH_FAIL,
+  NOTIFICATION_REQUEST_FETCH_REQUEST,
+  NOTIFICATION_REQUEST_FETCH_SUCCESS,
+  NOTIFICATION_REQUEST_FETCH_FAIL,
+  NOTIFICATION_REQUEST_ACCEPT_REQUEST,
+  NOTIFICATION_REQUEST_DISMISS_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
+  NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
+} from 'mastodon/actions/notifications';
+
+import { notificationToMap } from './notifications';
+
+const initialState = ImmutableMap({
+  items: ImmutableList(),
+  isLoading: false,
+  next: null,
+  current: ImmutableMap({
+    isLoading: false,
+    item: null,
+    removed: false,
+    notifications: ImmutableMap({
+      items: ImmutableList(),
+      isLoading: false,
+      next: null,
+    }),
+  }),
+});
+
+const normalizeRequest = request => fromJS({
+  ...request,
+  account: request.account.id,
+});
+
+const removeRequest = (state, id) => {
+  if (state.getIn(['current', 'item', 'id']) === id) {
+    state = state.setIn(['current', 'removed'], true);
+  }
+
+  return state.update('items', list => list.filterNot(item => item.get('id') === id));
+};
+
+export const notificationRequestsReducer = (state = initialState, action) => {
+  switch(action.type) {
+  case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
+      map.set('isLoading', false);
+      map.update('next', next => next ?? action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
+    return state.withMutations(map => {
+      map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
+      map.set('isLoading', false);
+      map.set('next', action.next);
+    });
+  case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
+  case NOTIFICATION_REQUESTS_FETCH_REQUEST:
+    return state.set('isLoading', true);
+  case NOTIFICATION_REQUESTS_EXPAND_FAIL:
+  case NOTIFICATION_REQUESTS_FETCH_FAIL:
+    return state.set('isLoading', false);
+  case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
+  case NOTIFICATION_REQUEST_DISMISS_REQUEST:
+    return removeRequest(state, action.id);
+  case NOTIFICATION_REQUEST_FETCH_REQUEST:
+    return state.set('current', initialState.get('current').set('isLoading', true));
+  case NOTIFICATION_REQUEST_FETCH_SUCCESS:
+    return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
+  case NOTIFICATION_REQUEST_FETCH_FAIL:
+    return state.update('current', map => map.set('isLoading', false));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
+    return state.setIn(['current', 'notifications', 'isLoading'], true);
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
+    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
+  case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
+  case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
+    return state.setIn(['current', 'notifications', 'isLoading'], false);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 2ca301b19a..14a3269127 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -13,7 +13,7 @@ import {
   unfocusApp,
 } from '../actions/app';
 import {
-  MARKERS_FETCH_SUCCESS,
+  fetchMarkers,
 } from '../actions/markers';
 import {
   notificationsUpdate,
@@ -48,13 +48,17 @@ const initialState = ImmutableMap({
   browserPermission: 'default',
 });
 
-const notificationToMap = notification => ImmutableMap({
+export const notificationToMap = notification => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
   created_at: notification.created_at,
+  emoji_reaction: ImmutableMap(notification.emoji_reaction),
   status: notification.status ? notification.status.id : null,
+  list: notification.list ? ImmutableMap(notification.list) : null,
   report: notification.report ? fromJS(notification.report) : null,
+  event: notification.event ? fromJS(notification.event) : null,
+  moderation_warning: notification.moderation_warning ? fromJS(notification.moderation_warning) : null,
 });
 
 const normalizeNotification = (state, notification, usePendingItems) => {
@@ -254,8 +258,8 @@ const recountUnread = (state, last_read_id) => {
 
 export default function notifications(state = initialState, action) {
   switch(action.type) {
-  case MARKERS_FETCH_SUCCESS:
-    return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
+  case fetchMarkers.fulfilled.type:
+    return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state;
   case NOTIFICATIONS_MOUNT:
     return updateMounted(state);
   case NOTIFICATIONS_UNMOUNT:
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.js b/app/javascript/mastodon/reducers/picture_in_picture.js
deleted file mode 100644
index 6824ad9303..0000000000
--- a/app/javascript/mastodon/reducers/picture_in_picture.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture';
-
-import { TIMELINE_DELETE } from '../actions/timelines';
-
-const initialState = {
-  statusId: null,
-  accountId: null,
-  type: null,
-  src: null,
-  muted: false,
-  volume: 0,
-  currentTime: 0,
-};
-
-export default function pictureInPicture(state = initialState, action) {
-  switch(action.type) {
-  case PICTURE_IN_PICTURE_DEPLOY:
-    return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
-  case PICTURE_IN_PICTURE_REMOVE:
-    return { ...initialState };
-  case TIMELINE_DELETE:
-    return (state.statusId === action.id) ? { ...initialState } : state;
-  default:
-    return state;
-  }
-}
diff --git a/app/javascript/mastodon/reducers/picture_in_picture.ts b/app/javascript/mastodon/reducers/picture_in_picture.ts
new file mode 100644
index 0000000000..0feddcb706
--- /dev/null
+++ b/app/javascript/mastodon/reducers/picture_in_picture.ts
@@ -0,0 +1,56 @@
+import type { Reducer } from '@reduxjs/toolkit';
+
+import {
+  deployPictureInPictureAction,
+  removePictureInPicture,
+} from 'mastodon/actions/picture_in_picture';
+
+import { TIMELINE_DELETE } from '../actions/timelines';
+
+export interface PIPMediaProps {
+  src: string;
+  muted: boolean;
+  volume: number;
+  currentTime: number;
+  poster: string;
+  backgroundColor: string;
+  foregroundColor: string;
+  accentColor: string;
+}
+
+interface PIPStateWithValue extends Partial<PIPMediaProps> {
+  statusId: string;
+  accountId: string;
+  type: 'audio' | 'video';
+}
+
+interface PIPStateEmpty extends Partial<PIPMediaProps> {
+  type: null;
+}
+
+type PIPState = PIPStateWithValue | PIPStateEmpty;
+
+const initialState = {
+  type: null,
+  muted: false,
+  volume: 0,
+  currentTime: 0,
+};
+
+export const pictureInPictureReducer: Reducer<PIPState> = (
+  state = initialState,
+  action,
+) => {
+  if (deployPictureInPictureAction.match(action))
+    return {
+      statusId: action.payload.statusId,
+      accountId: action.payload.accountId,
+      type: action.payload.playerType,
+      ...action.payload.props,
+    };
+  else if (removePictureInPicture.match(action)) return initialState;
+  else if (action.type === TIMELINE_DELETE)
+    if (state.type && state.statusId === action.id) return initialState;
+
+  return state;
+};
diff --git a/app/javascript/mastodon/reducers/reaction_deck.js b/app/javascript/mastodon/reducers/reaction_deck.js
new file mode 100644
index 0000000000..12b4e8ef21
--- /dev/null
+++ b/app/javascript/mastodon/reducers/reaction_deck.js
@@ -0,0 +1,13 @@
+import { List as ImmutableList, fromJS as ConvertToImmutable } from 'immutable';
+
+import { REACTION_DECK_FETCH_SUCCESS, REACTION_DECK_UPDATE_SUCCESS } from '../actions/reaction_deck';
+
+const initialState = ImmutableList([]);
+
+export default function reaction_deck(state = initialState, action) {
+  if(action.type === REACTION_DECK_FETCH_SUCCESS || action.type === REACTION_DECK_UPDATE_SUCCESS) {
+    state = ConvertToImmutable(action.emojis);
+  }
+
+  return state;
+}
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 72835eb917..2a6665bfb6 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -50,6 +50,7 @@ export default function search(state = initialState, action) {
     return state.set('hidden', true);
   case SEARCH_FETCH_REQUEST:
     return state.withMutations(map => {
+      map.set('results', ImmutableMap());
       map.set('isLoading', true);
       map.set('submitted', true);
       map.set('type', action.searchType);
@@ -70,7 +71,7 @@ export default function search(state = initialState, action) {
       map.set('isLoading', false);
     });
   case SEARCH_EXPAND_REQUEST:
-    return state.set('type', action.searchType).set('isLoading', true);
+    return state.set('type', action.searchType); // .set('isLoading', true); // original Mastodon bug
   case SEARCH_EXPAND_SUCCESS:
     const results = action.searchType === 'hashtags' ? ImmutableOrderedSet(fromJS(action.results.hashtags)) : action.results[action.searchType].map(item => item.id);
     return state.updateIn(['results', action.searchType], list => list.union(results)).set('isLoading', false);
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index a605ecbb8b..e5548fca63 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -1,5 +1,9 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
+import { ANTENNA_DELETE_SUCCESS, ANTENNA_FETCH_FAIL } from 'mastodon/actions/antennas';
+import { BOOKMARK_CATEGORY_DELETE_SUCCESS, BOOKMARK_CATEGORY_FETCH_FAIL } from 'mastodon/actions/bookmark_categories';
+import { CIRCLE_DELETE_SUCCESS, CIRCLE_FETCH_FAIL } from 'mastodon/actions/circles';
+
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
 import { EMOJI_USE } from '../actions/emojis';
 import { LANGUAGE_USE } from '../actions/languages';
@@ -38,7 +42,10 @@ const initialState = ImmutableMap({
       mention: false,
       poll: false,
       status: false,
+      list_status: false,
       update: false,
+      emoji_reaction: false,
+      status_reference: false,
       'admin.sign_up': false,
       'admin.report': false,
     }),
@@ -60,7 +67,10 @@ const initialState = ImmutableMap({
       mention: true,
       poll: true,
       status: true,
+      list_status: true,
       update: true,
+      emoji_reaction: true,
+      status_reference: true,
       'admin.sign_up': true,
       'admin.report': true,
     }),
@@ -73,7 +83,10 @@ const initialState = ImmutableMap({
       mention: true,
       poll: true,
       status: true,
+      list_status: true,
       update: true,
+      emoji_reaction: true,
+      status_reference: true,
       'admin.sign_up': true,
       'admin.report': true,
     }),
@@ -104,7 +117,7 @@ const initialState = ImmutableMap({
   dismissed_banners: ImmutableMap({
     'public_timeline': false,
     'community_timeline': false,
-    'home.explore_prompt': false,
+    'home/follow-suggestions': false,
     'explore/links': false,
     'explore/statuses': false,
     'explore/tags': false,
@@ -151,6 +164,12 @@ const updateFrequentLanguages = (state, language) => state.update('frequentlyUse
 
 const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
 
+const filterDeadBookmarkCategoryColumns = (state, bookmarkCategoryId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'BOOKMARKS_EX' && column.get('params').get('id') === bookmarkCategoryId));
+
+const filterDeadAntennaColumns = (state, antennaId) => state.update('columns', columns => columns.filterNot(column => (column.get('id') === 'ANTENNA' || column.get('id') === 'ANTENNA_TIMELINE') && column.get('params').get('id') === antennaId));
+
+const filterDeadCircleColumns = (state, circleId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'CIRCLE' && column.get('params').get('id') === circleId));
+
 export default function settings(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -182,6 +201,18 @@ export default function settings(state = initialState, action) {
     return action.error.response.status === 404 ? filterDeadListColumns(state, action.id) : state;
   case LIST_DELETE_SUCCESS:
     return filterDeadListColumns(state, action.id);
+  case BOOKMARK_CATEGORY_FETCH_FAIL:
+    return action.error.response.status === 404 ? filterDeadBookmarkCategoryColumns(state, action.id) : state;
+  case BOOKMARK_CATEGORY_DELETE_SUCCESS:
+    return filterDeadBookmarkCategoryColumns(state, action.id);
+  case ANTENNA_FETCH_FAIL:
+    return action.error.response.status === 404 ? filterDeadAntennaColumns(state, action.id) : state;
+  case ANTENNA_DELETE_SUCCESS:
+    return filterDeadAntennaColumns(state, action.id);
+  case CIRCLE_FETCH_FAIL:
+    return action.error.response.status === 404 ? filterDeadCircleColumns(state, action.id) : state;
+  case CIRCLE_DELETE_SUCCESS:
+    return filterDeadCircleColumns(state, action.id);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index 6cb6a937bb..e9a6117d86 100644
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -4,6 +4,9 @@ import {
   blockAccountSuccess,
   muteAccountSuccess,
 } from '../actions/accounts';
+import {
+  BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS,
+} from '../actions/bookmark_categories';
 import {
   BOOKMARKED_STATUSES_FETCH_REQUEST,
   BOOKMARKED_STATUSES_FETCH_SUCCESS,
@@ -12,6 +15,14 @@ import {
   BOOKMARKED_STATUSES_EXPAND_SUCCESS,
   BOOKMARKED_STATUSES_EXPAND_FAIL,
 } from '../actions/bookmarks';
+import {
+  EMOJI_REACTED_STATUSES_FETCH_REQUEST,
+  EMOJI_REACTED_STATUSES_FETCH_SUCCESS,
+  EMOJI_REACTED_STATUSES_FETCH_FAIL,
+  EMOJI_REACTED_STATUSES_EXPAND_REQUEST,
+  EMOJI_REACTED_STATUSES_EXPAND_SUCCESS,
+  EMOJI_REACTED_STATUSES_EXPAND_FAIL,
+} from '../actions/emoji_reactions';
 import {
   FAVOURITED_STATUSES_FETCH_REQUEST,
   FAVOURITED_STATUSES_FETCH_SUCCESS,
@@ -23,6 +34,8 @@ import {
 import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
+  EMOJIREACT_SUCCESS,
+  UNEMOJIREACT_SUCCESS,
   BOOKMARK_SUCCESS,
   UNBOOKMARK_SUCCESS,
   PIN_SUCCESS,
@@ -48,6 +61,11 @@ const initialState = ImmutableMap({
     loaded: false,
     items: ImmutableOrderedSet(),
   }),
+  emoji_reactions: ImmutableMap({
+    next: null,
+    loaded: false,
+    items: ImmutableOrderedSet(),
+  }),
   bookmarks: ImmutableMap({
     next: null,
     loaded: false,
@@ -83,11 +101,15 @@ const appendToList = (state, listType, statuses, next) => {
 };
 
 const prependOneToList = (state, listType, status) => {
+  return prependOneToListById(state, listType, status.get('id'));
+};
+
+const prependOneToListById = (state, listType, statusId) => {
   return state.updateIn([listType, 'items'], (list) => {
-    if (list.includes(status.get('id'))) {
+    if (list.includes(statusId)) {
       return list;
     } else {
-      return ImmutableOrderedSet([status.get('id')]).union(list);
+      return ImmutableOrderedSet([statusId]).union(list);
     }
   });
 };
@@ -108,6 +130,16 @@ export default function statusLists(state = initialState, action) {
     return normalizeList(state, 'favourites', action.statuses, action.next);
   case FAVOURITED_STATUSES_EXPAND_SUCCESS:
     return appendToList(state, 'favourites', action.statuses, action.next);
+  case EMOJI_REACTED_STATUSES_FETCH_REQUEST:
+  case EMOJI_REACTED_STATUSES_EXPAND_REQUEST:
+    return state.setIn(['emoji_reactions', 'isLoading'], true);
+  case EMOJI_REACTED_STATUSES_FETCH_FAIL:
+  case EMOJI_REACTED_STATUSES_EXPAND_FAIL:
+    return state.setIn(['emoji_reactions', 'isLoading'], false);
+  case EMOJI_REACTED_STATUSES_FETCH_SUCCESS:
+    return normalizeList(state, 'emoji_reactions', action.statuses, action.next);
+  case EMOJI_REACTED_STATUSES_EXPAND_SUCCESS:
+    return appendToList(state, 'emoji_reactions', action.statuses, action.next);
   case BOOKMARKED_STATUSES_FETCH_REQUEST:
   case BOOKMARKED_STATUSES_EXPAND_REQUEST:
     return state.setIn(['bookmarks', 'isLoading'], true);
@@ -132,8 +164,14 @@ export default function statusLists(state = initialState, action) {
     return prependOneToList(state, 'favourites', action.status);
   case UNFAVOURITE_SUCCESS:
     return removeOneFromList(state, 'favourites', action.status);
+  case EMOJIREACT_SUCCESS:
+    return prependOneToList(state, 'emoji_reactions', action.status);
+  case UNEMOJIREACT_SUCCESS:
+    return removeOneFromList(state, 'emoji_reactions', action.status);
   case BOOKMARK_SUCCESS:
     return prependOneToList(state, 'bookmarks', action.status);
+  case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
+    return prependOneToListById(state, 'bookmarks', action.statusId);
   case UNBOOKMARK_SUCCESS:
     return removeOneFromList(state, 'bookmarks', action.status);
   case PINNED_STATUSES_FETCH_SUCCESS:
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 683fe848f7..458df42f08 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -1,5 +1,11 @@
-import { Map as ImmutableMap, fromJS } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
+import { me } from 'mastodon/initial_state';
+
+import {
+  BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST,
+  BOOKMARK_CATEGORY_EDITOR_ADD_FAIL,
+} from '../actions/bookmark_categories';
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
@@ -26,6 +32,7 @@ import {
   STATUS_TRANSLATE_UNDO,
   STATUS_FETCH_REQUEST,
   STATUS_FETCH_FAIL,
+  STATUS_EMOJI_REACTION_UPDATE,
 } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
 
@@ -42,6 +49,33 @@ const deleteStatus = (state, id, references) => {
   return state.delete(id);
 };
 
+const updateStatusEmojiReaction = (state, emoji_reaction) => {
+  emoji_reaction.me = emoji_reaction.account_ids ? emoji_reaction.account_ids.indexOf(me) >= 0 : false;
+
+  const status = state.get(emoji_reaction.status_id);
+  if (!status) return state;
+
+  let emoji_reactions = Array.from(status.get('emoji_reactions') || []);
+
+  if (emoji_reaction.count > 0) {
+    const old_emoji = emoji_reactions.find((er) => er.get('name') === emoji_reaction.name);
+    if (old_emoji) {
+      const index = emoji_reactions.indexOf(old_emoji);
+      emoji_reactions[index] = old_emoji.merge({ account_ids: ImmutableList(emoji_reaction.account_ids), count: emoji_reaction.count, me: emoji_reaction.me });
+    } else {
+      emoji_reactions.push(ImmutableMap(emoji_reaction));
+    }
+  } else {
+    emoji_reactions = emoji_reactions.filter((er) => er.get('name') !== emoji_reaction.name);
+  }
+
+  const emoji_reactions_count = emoji_reactions.map((er) => Array.from(er.get('account_ids') || [])).reduce((prev, current) => prev + current.length, 0);
+
+  return state
+    .setIn([emoji_reaction.status_id, 'emoji_reactions'], ImmutableList(emoji_reactions))
+    .setIn([emoji_reaction.status_id, 'emoji_reactions_count'], emoji_reactions_count);
+};
+
 const statusTranslateSuccess = (state, id, translation) => {
   return state.withMutations(map => {
     map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))));
@@ -87,6 +121,10 @@ export default function statuses(state = initialState, action) {
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
   case BOOKMARK_FAIL:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
+  case BOOKMARK_CATEGORY_EDITOR_ADD_REQUEST:
+    return state.get(action.statusId) === undefined ? state : state.setIn([action.statusId, 'bookmarked'], true);
+  case BOOKMARK_CATEGORY_EDITOR_ADD_FAIL:
+    return state.get(action.statusId) === undefined ? state : state.setIn([action.statusId, 'bookmarked'], false);
   case UNBOOKMARK_REQUEST:
     return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
   case UNBOOKMARK_FAIL:
@@ -127,6 +165,8 @@ export default function statuses(state = initialState, action) {
     return statusTranslateSuccess(state, action.id, action.translation);
   case STATUS_TRANSLATE_UNDO:
     return statusTranslateUndo(state, action.id);
+  case STATUS_EMOJI_REACTION_UPDATE:
+    return updateStatusEmojiReaction(state, action.emoji_reaction);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
index 0f224ff4b9..5b9d983dea 100644
--- a/app/javascript/mastodon/reducers/suggestions.js
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -28,12 +28,12 @@ export default function suggestionsReducer(state = initialState, action) {
   case SUGGESTIONS_FETCH_FAIL:
     return state.set('isLoading', false);
   case SUGGESTIONS_DISMISS:
-    return state.update('items', list => list.filterNot(x => x.account === action.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.id));
   case blockAccountSuccess.type:
   case muteAccountSuccess.type:
-    return state.update('items', list => list.filterNot(x => x.account === action.payload.relationship.id));
+    return state.update('items', list => list.filterNot(x => x.get('account') === action.payload.relationship.id));
   case blockDomainSuccess.type:
-    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.account)));
+    return state.update('items', list => list.filterNot(x => action.payload.accounts.includes(x.get('account'))));
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 43dedd6e6d..4c9ab98a82 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -17,6 +17,9 @@ import {
   TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
+  TIMELINE_INSERT,
+  TIMELINE_GAP,
+  TIMELINE_SUGGESTIONS,
 } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -32,6 +35,8 @@ const initialTimeline = ImmutableMap({
   items: ImmutableList(),
 });
 
+const isPlaceholder = value => value === TIMELINE_GAP || value === TIMELINE_SUGGESTIONS;
+
 const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
   // This method is pretty tricky because:
   // - existing items in the timeline might be out of order
@@ -63,20 +68,20 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         // First, find the furthest (if properly sorted, oldest) item in the timeline that is
         // newer than the oldest fetched one, as it's most likely that it delimits the gap.
         // Start the gap *after* that item.
-        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+        const lastIndex = oldIds.findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.last()) >= 0) + 1;
 
         // Then, try to find the furthest (if properly sorted, oldest) item in the timeline that
         // is newer than the most recent fetched one, as it delimits a section comprised of only
         // items older or within `newIds` (or that were deleted from the server, so should be removed
         // anyway).
         // Stop the gap *after* that item.
-        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0) + 1;
+        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => !isPlaceholder(id) && compareId(id, newIds.first()) > 0) + 1;
 
         let insertedIds = ImmutableOrderedSet(newIds).withMutations(insertedIds => {
           // It is possible, though unlikely, that the slice we are replacing contains items older
           // than the elements we got from the API. Get them and add them back at the back of the
           // slice.
-          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => id !== null && compareId(id, newIds.last()) < 0);
+          const olderIds = oldIds.slice(firstIndex, lastIndex).filter(id => !isPlaceholder(id) && compareId(id, newIds.last()) < 0);
           insertedIds.union(olderIds);
 
           // Make sure we aren't inserting duplicates
@@ -84,8 +89,8 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
         }).toList();
 
         // Finally, insert a gap marker if the data is marked as partial by the server
-        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== null)) {
-          insertedIds = insertedIds.unshift(null);
+        if (isPartial && (firstIndex === 0 || oldIds.get(firstIndex - 1) !== TIMELINE_GAP)) {
+          insertedIds = insertedIds.unshift(TIMELINE_GAP);
         }
 
         return oldIds.take(firstIndex).concat(
@@ -178,7 +183,7 @@ const reconnectTimeline = (state, usePendingItems) => {
   }
 
   return state.withMutations(mMap => {
-    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items);
+    mMap.update(usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items);
     mMap.set('online', true);
   });
 };
@@ -213,7 +218,7 @@ export default function timelines(state = initialState, action) {
     return state.update(
       action.timeline,
       initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
+      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(TIMELINE_GAP) : items),
     );
   case TIMELINE_MARK_AS_PARTIAL:
     return state.update(
@@ -221,6 +226,18 @@ export default function timelines(state = initialState, action) {
       initialTimeline,
       map => map.set('isPartial', true).set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('unread', 0),
     );
+  case TIMELINE_INSERT:
+    return state.update(
+      action.timeline,
+      initialTimeline,
+      map => map.update('items', ImmutableList(), list => {
+        if (!list.includes(action.key)) {
+          return list.insert(action.index, action.key);
+        }
+
+        return list;
+      })
+    );
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 2f17fed5fd..ead2dd60b2 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -57,6 +57,19 @@ import {
   FAVOURITES_EXPAND_REQUEST,
   FAVOURITES_EXPAND_SUCCESS,
   FAVOURITES_EXPAND_FAIL,
+  EMOJI_REACTIONS_FETCH_REQUEST,
+  EMOJI_REACTIONS_FETCH_SUCCESS,
+  EMOJI_REACTIONS_FETCH_FAIL,
+  EMOJI_REACTIONS_EXPAND_REQUEST,
+  EMOJI_REACTIONS_EXPAND_SUCCESS,
+  EMOJI_REACTIONS_EXPAND_FAIL,
+  STATUS_REFERENCES_FETCH_SUCCESS,
+  MENTIONED_USERS_FETCH_REQUEST,
+  MENTIONED_USERS_FETCH_SUCCESS,
+  MENTIONED_USERS_FETCH_FAIL,
+  MENTIONED_USERS_EXPAND_REQUEST,
+  MENTIONED_USERS_EXPAND_SUCCESS,
+  MENTIONED_USERS_EXPAND_FAIL,
 } from '../actions/interactions';
 import {
   MUTES_FETCH_REQUEST,
@@ -79,6 +92,9 @@ const initialState = ImmutableMap({
   following: initialListState,
   reblogged_by: initialListState,
   favourited_by: initialListState,
+  emoji_reactioned_by: initialListState,
+  referred_by: initialListState,
+  mentioned_users: initialListState,
   follow_requests: initialListState,
   blocks: initialListState,
   mutes: initialListState,
@@ -93,12 +109,33 @@ const normalizeList = (state, path, accounts, next) => {
   }));
 };
 
+const normalizeEmojiReactionList = (state, path, rows, next) => {
+  return state.setIn(path, ImmutableMap({
+    next,
+    items: ImmutableList(rows.map(normalizeEmojiReactionRow)),
+    isLoading: false,
+  }));
+};
+
 const appendToList = (state, path, accounts, next) => {
   return state.updateIn(path, map => {
     return map.set('next', next).set('isLoading', false).update('items', list => list.concat(accounts.map(item => item.id)));
   });
 };
 
+const appendToEmojiReactionList = (state, path, rows, next) => {
+  return state.updateIn(path, map => {
+    return map.set('next', next).set('isLoading', false).update('items', list => list.concat(rows.map(normalizeEmojiReactionRow)));
+  });
+};
+
+const normalizeEmojiReactionRow = (row) => {
+  const accountId = row.account ? row.account.id : 0;
+  delete row.account;
+  row.account_id = accountId;
+  return row;
+};
+
 const normalizeFollowRequest = (state, notification) => {
   return state.updateIn(['follow_requests', 'items'], list => {
     return list.filterNot(item => item === notification.account.id).unshift(notification.account.id);
@@ -159,6 +196,28 @@ export default function userLists(state = initialState, action) {
   case FAVOURITES_FETCH_FAIL:
   case FAVOURITES_EXPAND_FAIL:
     return state.setIn(['favourited_by', action.id, 'isLoading'], false);
+  case EMOJI_REACTIONS_FETCH_REQUEST:
+  case EMOJI_REACTIONS_EXPAND_REQUEST:
+    return state.setIn(['emoji_reactioned_by', action.id, 'isLoading'], true);
+  case EMOJI_REACTIONS_FETCH_FAIL:
+  case EMOJI_REACTIONS_EXPAND_FAIL:
+    return state.setIn(['emoji_reactioned_by', action.id, 'isLoading'], false);
+  case EMOJI_REACTIONS_FETCH_SUCCESS:
+    return normalizeEmojiReactionList(state, ['emoji_reactioned_by', action.id], action.accounts, action.next);
+  case EMOJI_REACTIONS_EXPAND_SUCCESS:
+    return appendToEmojiReactionList(state, ['emoji_reactioned_by', action.id], action.accounts, action.next);
+  case STATUS_REFERENCES_FETCH_SUCCESS:
+    return state.setIn(['referred_by', action.id], ImmutableList(action.statuses.map(item => item.id)));
+  case MENTIONED_USERS_FETCH_SUCCESS:
+    return normalizeList(state, ['mentioned_users', action.id], action.accounts, action.next);
+  case MENTIONED_USERS_EXPAND_SUCCESS:
+    return appendToList(state, ['mentioned_users', action.id], action.accounts, action.next);
+  case MENTIONED_USERS_FETCH_REQUEST:
+  case MENTIONED_USERS_EXPAND_REQUEST:
+    return state.setIn(['mentioned_users', action.id, 'isLoading'], true);
+  case MENTIONED_USERS_FETCH_FAIL:
+  case MENTIONED_USERS_EXPAND_FAIL:
+    return state.setIn(['mentioned_users', action.id, 'isLoading'], false);
   case notificationsUpdate.type:
     return action.payload.notification.type === 'follow_request' ? normalizeFollowRequest(state, action.payload.notification) : state;
   case FOLLOW_REQUESTS_FETCH_SUCCESS:
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index b1c60403e9..ca4b640f53 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -3,7 +3,7 @@ import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 
 import { toServerSideType } from 'mastodon/utils/filters';
 
-import { me } from '../initial_state';
+import { me, isHideItem } from '../initial_state';
 
 export { makeGetAccount } from "./accounts";
 
@@ -21,38 +21,58 @@ export const makeGetStatus = () => {
     [
       (state, { id }) => state.getIn(['statuses', id]),
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
+      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'quote_id'])]),
+      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'quote_id'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
       getFilters,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filters) => {
+    (statusBase, statusReblog, statusQuote, statusReblogQuote, accountBase, accountReblog, filters) => {
       if (!statusBase || statusBase.get('isLoading')) {
         return null;
       }
 
       if (statusReblog) {
         statusReblog = statusReblog.set('account', accountReblog);
+        statusQuote = statusReblogQuote;
       } else {
         statusReblog = null;
       }
 
+      if (isHideItem('blocking_quote') && (statusReblog || statusBase).getIn(['quote', 'quote_muted'])) {
+        return null;
+      }
+
       let filtered = false;
+      let filterAction = 'warn';
       if ((accountReblog || accountBase).get('id') !== me && filters) {
         let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
-        if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
+        const quoteFilterResults = statusQuote?.get('filtered');
+        if (quoteFilterResults) {
+          const filterWithQuote = quoteFilterResults.some((result) => filters.getIn([result.get('filter'), 'with_quote']));
+          if (filterWithQuote) {
+            filterResults = filterResults.concat(quoteFilterResults);
+          }
+        }
+
+        if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
           return null;
         }
         filterResults = filterResults.filter(result => filters.has(result.get('filter')));
         if (!filterResults.isEmpty()) {
           filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
+          filterAction = filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'warn') ? 'warn' : 'half_warn';
         }
       }
 
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
+        map.set('quote', statusQuote);
         map.set('account', accountBase);
         map.set('matched_filters', filtered);
+        map.set('filter_action', filterAction);
+        map.set('filter_action_ex', filterAction);
       });
     },
   );
@@ -60,7 +80,7 @@ export const makeGetStatus = () => {
 
 export const makeGetPictureInPicture = () => {
   return createSelector([
-    (state, { id }) => state.get('picture_in_picture').statusId === id,
+    (state, { id }) => state.picture_in_picture.statusId === id,
     (state) => state.getIn(['meta', 'layout']) !== 'mobile',
   ], (inUse, available) => ImmutableMap({
     inUse: inUse && available,
@@ -115,3 +135,11 @@ export const getAccountHidden = createSelector([
 export const getStatusList = createSelector([
   (state, type) => state.getIn(['status_lists', type, 'items']),
 ], (items) => items.toList());
+
+export const getBookmarkCategoryStatusList = createSelector([
+  (state, bookmarkCategoryId) => state.getIn(['bookmark_categories', bookmarkCategoryId, 'items']),
+], (items) => items ? items.toList() : ImmutableList());
+
+export const getCircleStatusList = createSelector([
+  (state, circleId) => state.getIn(['circles', circleId, 'items']),
+], (items) => items ? items.toList() : ImmutableList());
diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index e11aa78178..e77cec34ed 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -1,16 +1,27 @@
-import { isAction } from '@reduxjs/toolkit';
+import {
+  isAction,
+  isAsyncThunkAction,
+  isRejectedWithValue,
+} from '@reduxjs/toolkit';
 import type { Action, Middleware } from '@reduxjs/toolkit';
 
 import type { RootState } from '..';
 import { showAlertForError } from '../../actions/alerts';
+import type { AsyncThunkRejectValue } from '../typed_functions';
 
 const defaultFailSuffix = 'FAIL';
 const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
 
-interface ActionWithMaybeAlertParams extends Action {
-  skipAlert?: boolean;
-  skipNotFound?: boolean;
-  error?: unknown;
+interface ActionWithMaybeAlertParams extends Action, AsyncThunkRejectValue {}
+
+interface RejectedAction extends Action {
+  payload: AsyncThunkRejectValue;
+}
+
+function isRejectedActionWithPayload(
+  action: unknown,
+): action is RejectedAction {
+  return isAsyncThunkAction(action) && isRejectedWithValue(action);
 }
 
 function isActionWithmaybeAlertParams(
@@ -19,11 +30,16 @@ function isActionWithmaybeAlertParams(
   return isAction(action);
 }
 
-export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
+// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+export const errorsMiddleware: Middleware<{}, RootState> =
   ({ dispatch }) =>
   (next) =>
   (action) => {
-    if (
+    if (isRejectedActionWithPayload(action) && !action.payload.skipAlert) {
+      dispatch(
+        showAlertForError(action.payload.error, action.payload.skipNotFound),
+      );
+    } else if (
       isActionWithmaybeAlertParams(action) &&
       !action.skipAlert &&
       action.type.match(isFailedAction)
diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts
index d259be899b..c74d3ce472 100644
--- a/app/javascript/mastodon/store/middlewares/loading_bar.ts
+++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts
@@ -75,9 +75,9 @@ export const loadingBarMiddleware = (
       }
 
       if (isPending) {
-        dispatch(showLoading());
+        dispatch(showLoading() as UnknownAction);
       } else if (isFulfilled || isRejected) {
-        dispatch(hideLoading());
+        dispatch(hideLoading() as UnknownAction);
       }
 
       return next(action);
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 51839f427a..720ee163e9 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
 };
 
 export const soundsMiddleware = (): Middleware<
-  Record<string, never>,
+  // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+  {},
   RootState
 > => {
   const soundCache: Record<string, HTMLAudioElement> = {};
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 46a10b8b47..b66d7545c5 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,15 +1,20 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
-import type { TypedUseSelectorHook } from 'react-redux';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
 import type { AppDispatch, RootState } from './store';
 
-export const useAppDispatch: () => AppDispatch = useDispatch;
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
+export const useAppSelector = useSelector.withTypes<RootState>();
+
+export interface AsyncThunkRejectValue {
+  skipAlert?: boolean;
+  skipNotFound?: boolean;
+  error?: unknown;
+}
 
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
-  rejectValue: string;
+  rejectValue: AsyncThunkRejectValue;
 }>();
diff --git a/app/javascript/mastodon/stream.js b/app/javascript/mastodon/stream.js
index ff3af5fd88..de67b2d301 100644
--- a/app/javascript/mastodon/stream.js
+++ b/app/javascript/mastodon/stream.js
@@ -107,6 +107,8 @@ const sharedCallbacks = {
         return channelName === streamChannelName && params.tag === streamIdentifier;
       } else if (channelName === 'list') {
         return channelName === streamChannelName && params.list === streamIdentifier;
+      } else if (channelName === 'antenna') {
+        return channelName === streamChannelName && params.antenna === streamIdentifier;
       }
 
       return false;
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 6895895569..69d57b95a0 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -40,7 +40,7 @@ function render(
   ui: React.ReactElement,
   { locale = 'en', signedIn = true, ...renderOptions } = {},
 ) {
-  const Wrapper = (props: { children: React.ReactElement }) => {
+  const Wrapper = (props: { children: React.ReactNode }) => {
     return (
       <MemoryRouter>
         <IntlProvider locale={locale}>
diff --git a/app/javascript/mastodon/utils/__tests__/html-test.s b/app/javascript/mastodon/utils/__tests__/html-test.ts
similarity index 67%
rename from app/javascript/mastodon/utils/__tests__/html-test.s
rename to app/javascript/mastodon/utils/__tests__/html-test.ts
index d948cf4c5d..99bfdcb801 100644
--- a/app/javascript/mastodon/utils/__tests__/html-test.s
+++ b/app/javascript/mastodon/utils/__tests__/html-test.ts
@@ -3,7 +3,9 @@ import * as html from '../html';
 describe('html', () => {
   describe('unescapeHTML', () => {
     it('returns unescaped HTML', () => {
-      const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br>&lt;br&gt;');
+      const output = html.unescapeHTML(
+        '<p>lorem</p><p>ipsum</p><br>&lt;br&gt;',
+      );
       expect(output).toEqual('lorem\n\nipsum\n<br>');
     });
   });
diff --git a/app/javascript/mastodon/utils/__tests__/numbers.ts b/app/javascript/mastodon/utils/__tests__/numbers.ts
new file mode 100644
index 0000000000..d1d1444e8a
--- /dev/null
+++ b/app/javascript/mastodon/utils/__tests__/numbers.ts
@@ -0,0 +1,24 @@
+import { DECIMAL_UNITS, toShortNumber } from '../numbers';
+
+interface TableRow {
+  input: number;
+  base: number;
+  unit: number;
+  digits: number;
+}
+
+describe.each`
+  input             | base         | unit                      | digits
+  ${10_000_000}     | ${10}        | ${DECIMAL_UNITS.MILLION}  | ${0}
+  ${2_789_123}      | ${2.789123}  | ${DECIMAL_UNITS.MILLION}  | ${1}
+  ${12_345_789}     | ${12.345789} | ${DECIMAL_UNITS.MILLION}  | ${0}
+  ${10_000_000_000} | ${10}        | ${DECIMAL_UNITS.BILLION}  | ${0}
+  ${12}             | ${12}        | ${DECIMAL_UNITS.ONE}      | ${0}
+  ${123}            | ${123}       | ${DECIMAL_UNITS.ONE}      | ${0}
+  ${1234}           | ${1.234}     | ${DECIMAL_UNITS.THOUSAND} | ${1}
+  ${6666}           | ${6.666}     | ${DECIMAL_UNITS.THOUSAND} | ${1}
+`('toShortNumber', ({ input, base, unit, digits }: TableRow) => {
+  test(`correctly formats ${input}`, () => {
+    expect(toShortNumber(input)).toEqual([base, unit, digits]);
+  });
+});
diff --git a/app/javascript/mastodon/utils/filters.ts b/app/javascript/mastodon/utils/filters.ts
index d299e80c40..5d334fe509 100644
--- a/app/javascript/mastodon/utils/filters.ts
+++ b/app/javascript/mastodon/utils/filters.ts
@@ -5,9 +5,10 @@ export const toServerSideType = (columnType: string) => {
     case 'public':
     case 'thread':
     case 'account':
+    case 'explore':
       return columnType;
     default:
-      if (columnType.includes('list:')) {
+      if (columnType.includes('list:') || columnType.includes('antenna:')) {
         return 'home';
       } else {
         return 'public'; // community, account, hashtag
diff --git a/app/javascript/mastodon/utils/log_out.ts b/app/javascript/mastodon/utils/log_out.ts
index 3a4cc8ecb1..b08a61a6a2 100644
--- a/app/javascript/mastodon/utils/log_out.ts
+++ b/app/javascript/mastodon/utils/log_out.ts
@@ -1,5 +1,3 @@
-import Rails from '@rails/ujs';
-
 export const logOut = () => {
   const form = document.createElement('form');
 
@@ -9,13 +7,18 @@ export const logOut = () => {
   methodInput.setAttribute('type', 'hidden');
   form.appendChild(methodInput);
 
-  const csrfToken = Rails.csrfToken();
-  const csrfParam = Rails.csrfParam();
+  const csrfToken = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-token]',
+  );
+
+  const csrfParam = document.querySelector<HTMLMetaElement>(
+    'meta[name=csrf-param]',
+  );
 
   if (csrfParam && csrfToken) {
     const csrfInput = document.createElement('input');
-    csrfInput.setAttribute('name', csrfParam);
-    csrfInput.setAttribute('value', csrfToken);
+    csrfInput.setAttribute('name', csrfParam.content);
+    csrfInput.setAttribute('value', csrfToken.content);
     csrfInput.setAttribute('type', 'hidden');
     form.appendChild(csrfInput);
   }
diff --git a/app/javascript/mastodon/utils/mentions.ts b/app/javascript/mastodon/utils/mentions.ts
new file mode 100644
index 0000000000..0fbf28a3cf
--- /dev/null
+++ b/app/javascript/mastodon/utils/mentions.ts
@@ -0,0 +1,29 @@
+const MENTION_SEPARATORS = '_\\u00b7\\u200c';
+const ALPHA = '\\p{L}\\p{M}';
+const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
+
+const buildMentionPatternRegex = () => {
+  try {
+    return new RegExp(
+      `(?:^|[^\\/\\)\\w])@(([${WORD}_][${WORD}${MENTION_SEPARATORS}]*[${ALPHA}${MENTION_SEPARATORS}][${WORD}${MENTION_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))`,
+      'iu',
+    );
+  } catch {
+    return /(?:^|[^/)\w])#(\w*[a-zA-Z·]\w*)/i;
+  }
+};
+
+const buildMentionRegex = () => {
+  try {
+    return new RegExp(
+      `^(([${WORD}_][${WORD}${MENTION_SEPARATORS}]*[${ALPHA}${MENTION_SEPARATORS}][${WORD}${MENTION_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))$`,
+      'iu',
+    );
+  } catch {
+    return /^(\w*[a-zA-Z·]\w*)$/i;
+  }
+};
+
+export const MENTION_PATTERN_REGEX = buildMentionPatternRegex();
+
+export const MENTION_REGEX = buildMentionRegex();
diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts
index 0a73061f69..0c11c268dd 100644
--- a/app/javascript/mastodon/utils/numbers.ts
+++ b/app/javascript/mastodon/utils/numbers.ts
@@ -69,3 +69,11 @@ export function pluralReady(
 export function roundTo10(num: number): number {
   return Math.round(num * 0.1) / 0.1;
 }
+
+export function toCappedNumber(num: number, max = 99): string {
+  if (num > max) {
+    return `${max}+`;
+  } else {
+    return num.toString();
+  }
+}
diff --git a/app/javascript/mastodon/uuid.ts b/app/javascript/mastodon/uuid.ts
index 4d0a8a8036..0b4d55beb6 100644
--- a/app/javascript/mastodon/uuid.ts
+++ b/app/javascript/mastodon/uuid.ts
@@ -4,5 +4,6 @@ export function uuid(a?: string): string {
         (a as unknown as number) ^
         ((Math.random() * 16) >> ((a as unknown as number) / 4))
       ).toString(16)
-    : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+    : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+      ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
 }
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
new file mode 100644
index 0000000000..78ce147272
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M96-144v-72h768v72H96Zm48-120v-264h96v264h-96Zm192 0v-456h96v456h-96Zm192 0v-336h96v336h-96Zm192 0v-552h96v552h-96Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
new file mode 100644
index 0000000000..78ce147272
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M96-144v-72h768v72H96Zm48-120v-264h96v264h-96Zm192 0v-456h96v456h-96Zm192 0v-336h96v336h-96Zm192 0v-552h96v552h-96Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close-fill.svg b/app/javascript/material-icons/400-20px/close-fill.svg
new file mode 100644
index 0000000000..46d8afd7e1
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m291-240-51-51 189-189-189-189 51-51 189 189 189-189 51 51-189 189 189 189-51 51-189-189-189 189Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/close.svg b/app/javascript/material-icons/400-20px/close.svg
new file mode 100644
index 0000000000..46d8afd7e1
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m291-240-51-51 189-189-189-189 51-51 189 189 189-189 51 51-189 189 189 189-51 51-189-189-189 189Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood-fill.svg b/app/javascript/material-icons/400-20px/mood-fill.svg
new file mode 100644
index 0000000000..ef72aeef6e
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M612-516q25 0 42.5-17.5T672-576q0-25-17.5-42.5T612-636q-25 0-42.5 17.5T552-576q0 25 17.5 42.5T612-516Zm-264 0q25 0 42.5-17.5T408-576q0-25-17.5-42.5T348-636q-25 0-42.5 17.5T288-576q0 25 17.5 42.5T348-516Zm132 228q62 0 114.5-29t75.5-86H290q23 57 75.5 86T480-288Zm.276 192Q401-96 331-126q-70-30-122.5-82.5T126-330.958q-30-69.959-30-149.5Q96-560 126-629.5t82.5-122Q261-804 330.958-834q69.959-30 149.5-30Q560-864 629.5-834t122 82.5Q804-699 834-629.276q30 69.725 30 149Q864-401 834-331q-30 70-82.5 122.5T629.276-126q-69.725 30-149 30Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/mood.svg b/app/javascript/material-icons/400-20px/mood.svg
new file mode 100644
index 0000000000..abb44c4663
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M612-516q25 0 42.5-17.5T672-576q0-25-17.5-42.5T612-636q-25 0-42.5 17.5T552-576q0 25 17.5 42.5T612-516Zm-264 0q25 0 42.5-17.5T408-576q0-25-17.5-42.5T348-636q-25 0-42.5 17.5T288-576q0 25 17.5 42.5T348-516Zm132 228q60 0 110.5-31t79.5-84H290q29 53 79.5 84T480-288Zm.276 192Q401-96 331-126q-70-30-122.5-82.5T126-330.958q-30-69.959-30-149.5Q96-560 126-629.5t82.5-122Q261-804 330.958-834q69.959-30 149.5-30Q560-864 629.5-834t122 82.5Q804-699 834-629.276q30 69.725 30 149Q864-401 834-331q-30 70-82.5 122.5T629.276-126q-69.725 30-149 30ZM480-480Zm0 312q130 0 221-91t91-221q0-130-91-221t-221-91q-130 0-221 91t-91 221q0 130 91 221t221 91Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library-fill.svg b/app/javascript/material-icons/400-20px/photo_library-fill.svg
new file mode 100644
index 0000000000..5f5e39fbf9
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M360-384h384L618-552l-90 120-66-88-102 136Zm-48 144q-29.7 0-50.85-21.15Q240-282.3 240-312v-480q0-29.7 21.15-50.85Q282.3-864 312-864h480q29.7 0 50.85 21.15Q864-821.7 864-792v480q0 29.7-21.15 50.85Q821.7-240 792-240H312ZM168-96q-29.7 0-50.85-21.15Q96-138.3 96-168v-552h72v552h552v72H168Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/photo_library.svg b/app/javascript/material-icons/400-20px/photo_library.svg
new file mode 100644
index 0000000000..5804edb01c
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/photo_library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="M360-384h384L618-552l-90 120-66-88-102 136Zm-48 144q-29.7 0-50.85-21.15Q240-282.3 240-312v-480q0-29.7 21.15-50.85Q282.3-864 312-864h480q29.7 0 50.85 21.15Q864-821.7 864-792v480q0 29.7-21.15 50.85Q821.7-240 792-240H312Zm0-72h480v-480H312v480ZM168-96q-29.7 0-50.85-21.15Q96-138.3 96-168v-552h72v552h552v72H168Zm144-696v480-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/settings-fill.svg b/app/javascript/material-icons/400-20px/settings-fill.svg
new file mode 100644
index 0000000000..f5de77821d
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm77-240q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/settings.svg b/app/javascript/material-icons/400-20px/settings.svg
new file mode 100644
index 0000000000..472569ab6a
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m403-96-22-114q-23-9-44.5-21T296-259l-110 37-77-133 87-76q-2-12-3-24t-1-25q0-13 1-25t3-24l-87-76 77-133 110 37q19-16 40.5-28t44.5-21l22-114h154l22 114q23 9 44.5 21t40.5 28l110-37 77 133-87 76q2 12 3 24t1 25q0 13-1 25t-3 24l87 76-77 133-110-37q-19 16-40.5 28T579-210L557-96H403Zm59-72h36l19-99q38-7 71-26t57-48l96 32 18-30-76-67q6-17 9.5-35.5T696-480q0-20-3.5-38.5T683-554l76-67-18-30-96 32q-24-29-57-48t-71-26l-19-99h-36l-19 99q-38 7-71 26t-57 48l-96-32-18 30 76 67q-6 17-9.5 35.5T264-480q0 20 3.5 38.5T277-406l-76 67 18 30 96-32q24 29 57 48t71 26l19 99Zm18-168q60 0 102-42t42-102q0-60-42-102t-102-42q-60 0-102 42t-42 102q0 60 42 102t102 42Zm0-144Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning-fill.svg b/app/javascript/material-icons/400-20px/warning-fill.svg
new file mode 100644
index 0000000000..85dd926d39
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m48-144 432-720 432 720H48Zm431.789-120Q495-264 505.5-274.289q10.5-10.29 10.5-25.5Q516-315 505.711-325.5q-10.29-10.5-25.5-10.5Q465-336 454.5-325.711q-10.5 10.29-10.5 25.5Q444-285 454.289-274.5q10.29 10.5 25.5 10.5ZM444-384h72v-192h-72v192Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-20px/warning.svg b/app/javascript/material-icons/400-20px/warning.svg
new file mode 100644
index 0000000000..d7d45a3211
--- /dev/null
+++ b/app/javascript/material-icons/400-20px/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 -960 960 960" width="20"><path d="m48-144 432-720 432 720H48Zm127-72h610L480-724 175-216Zm304.789-48Q495-264 505.5-274.289q10.5-10.29 10.5-25.5Q516-315 505.711-325.5q-10.29-10.5-25.5-10.5Q465-336 454.5-325.711q-10.5 10.29-10.5 25.5Q444-285 454.289-274.5q10.29 10.5 25.5 10.5ZM444-384h72v-192h-72v192Zm36-86Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/badge-fill.svg b/app/javascript/material-icons/400-24px/badge-fill.svg
new file mode 100644
index 0000000000..2f7175b7f1
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-80q-33 0-56.5-23.5T80-160v-440q0-33 23.5-56.5T160-680h200v-120q0-33 23.5-56.5T440-880h80q33 0 56.5 23.5T600-800v120h200q33 0 56.5 23.5T880-600v440q0 33-23.5 56.5T800-80H160Zm80-160h240v-18q0-17-9.5-31.5T444-312q-20-9-40.5-13.5T360-330q-23 0-43.5 4.5T276-312q-17 8-26.5 22.5T240-258v18Zm320-60h160v-60H560v60Zm-200-60q25 0 42.5-17.5T420-420q0-25-17.5-42.5T360-480q-25 0-42.5 17.5T300-420q0 25 17.5 42.5T360-360Zm200-60h160v-60H560v60ZM440-600h80v-200h-80v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/badge.svg b/app/javascript/material-icons/400-24px/badge.svg
new file mode 100644
index 0000000000..d413363a4c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/badge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-80q-33 0-56.5-23.5T80-160v-440q0-33 23.5-56.5T160-680h200v-120q0-33 23.5-56.5T440-880h80q33 0 56.5 23.5T600-800v120h200q33 0 56.5 23.5T880-600v440q0 33-23.5 56.5T800-80H160Zm0-80h640v-440H600q0 33-23.5 56.5T520-520h-80q-33 0-56.5-23.5T360-600H160v440Zm80-80h240v-18q0-17-9.5-31.5T444-312q-20-9-40.5-13.5T360-330q-23 0-43.5 4.5T276-312q-17 8-26.5 22.5T240-258v18Zm320-60h160v-60H560v60Zm-200-60q25 0 42.5-17.5T420-420q0-25-17.5-42.5T360-480q-25 0-42.5 17.5T300-420q0 25 17.5 42.5T360-360Zm200-60h160v-60H560v60ZM440-600h80v-200h-80v200Zm40 220Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
new file mode 100644
index 0000000000..63215a3e09
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
new file mode 100644
index 0000000000..63215a3e09
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud-fill.svg b/app/javascript/material-icons/400-24px/cloud-fill.svg
new file mode 100644
index 0000000000..d049a74c01
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q25-92 100-149t170-57q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H260Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cloud.svg b/app/javascript/material-icons/400-24px/cloud.svg
new file mode 100644
index 0000000000..a36bddda91
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cloud.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q25-92 100-149t170-57q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H260Zm0-80h480q42 0 71-29t29-71q0-42-29-71t-71-29h-60v-80q0-83-58.5-141.5T480-720q-83 0-141.5 58.5T280-520h-20q-58 0-99 41t-41 99q0 58 41 99t99 41Zm220-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/compare_arrows-fill.svg b/app/javascript/material-icons/400-24px/compare_arrows-fill.svg
new file mode 100644
index 0000000000..a4b9d9f918
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/compare_arrows-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m320-160-56-57 103-103H80v-80h287L264-503l56-57 200 200-200 200Zm320-240L440-600l200-200 56 57-103 103h287v80H593l103 103-56 57Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/compare_arrows.svg b/app/javascript/material-icons/400-24px/compare_arrows.svg
new file mode 100644
index 0000000000..a4b9d9f918
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/compare_arrows.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m320-160-56-57 103-103H80v-80h287L264-503l56-57 200 200-200 200Zm320-240L440-600l200-200 56 57-103 103h287v80H593l103 103-56 57Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/dangerous-fill.svg b/app/javascript/material-icons/400-24px/dangerous-fill.svg
new file mode 100644
index 0000000000..8120409141
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/dangerous-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M330-120 120-330v-300l210-210h300l210 210v300L630-120H330Zm36-190 114-114 114 114 56-56-114-114 114-114-56-56-114 114-114-114-56 56 114 114-114 114 56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/dangerous.svg b/app/javascript/material-icons/400-24px/dangerous.svg
new file mode 100644
index 0000000000..18d93fbc54
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/dangerous.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M330-120 120-330v-300l210-210h300l210 210v300L630-120H330Zm36-190 114-114 114 114 56-56-114-114 114-114-56-56-114 114-114-114-56 56 114 114-114 114 56 56Zm-2 110h232l164-164v-232L596-760H364L200-596v232l164 164Zm116-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/dns-fill.svg b/app/javascript/material-icons/400-24px/dns-fill.svg
new file mode 100644
index 0000000000..50eab76ef2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/dns-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M300-720q-25 0-42.5 17.5T240-660q0 25 17.5 42.5T300-600q25 0 42.5-17.5T360-660q0-25-17.5-42.5T300-720Zm0 400q-25 0-42.5 17.5T240-260q0 25 17.5 42.5T300-200q25 0 42.5-17.5T360-260q0-25-17.5-42.5T300-320ZM160-840h640q17 0 28.5 11.5T840-800v280q0 17-11.5 28.5T800-480H160q-17 0-28.5-11.5T120-520v-280q0-17 11.5-28.5T160-840Zm0 400h640q17 0 28.5 11.5T840-400v280q0 17-11.5 28.5T800-80H160q-17 0-28.5-11.5T120-120v-280q0-17 11.5-28.5T160-440Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/dns.svg b/app/javascript/material-icons/400-24px/dns.svg
new file mode 100644
index 0000000000..c386420774
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/dns.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M300-720q-25 0-42.5 17.5T240-660q0 25 17.5 42.5T300-600q25 0 42.5-17.5T360-660q0-25-17.5-42.5T300-720Zm0 400q-25 0-42.5 17.5T240-260q0 25 17.5 42.5T300-200q25 0 42.5-17.5T360-260q0-25-17.5-42.5T300-320ZM160-840h640q17 0 28.5 11.5T840-800v280q0 17-11.5 28.5T800-480H160q-17 0-28.5-11.5T120-520v-280q0-17 11.5-28.5T160-840Zm40 80v200h560v-200H200Zm-40 320h640q17 0 28.5 11.5T840-400v280q0 17-11.5 28.5T800-80H160q-17 0-28.5-11.5T120-120v-280q0-17 11.5-28.5T160-440Zm40 80v200h560v-200H200Zm0-400v200-200Zm0 400v200-200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/domain_disabled-fill.svg b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
new file mode 100644
index 0000000000..2f16593d38
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m880-194-80-80v-326H474l-74-74v-86h-86l-80-80h246v160h400v486ZM820-28l-94-92H80v-648l-52-52 56-56L876-84l-56 56ZM160-200h80v-80h-80v80Zm0-160h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 320h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 160h166l-80-80h-86v80Zm240-240h-80v-80h80v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/domain_disabled.svg b/app/javascript/material-icons/400-24px/domain_disabled.svg
new file mode 100644
index 0000000000..2f16593d38
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/domain_disabled.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m880-194-80-80v-326H474l-74-74v-86h-86l-80-80h246v160h400v486ZM820-28l-94-92H80v-648l-52-52 56-56L876-84l-56 56ZM160-200h80v-80h-80v80Zm0-160h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 320h80v-80h-80v80Zm0-160h80v-80h-80v80Zm160 160h166l-80-80h-86v80Zm240-240h-80v-80h80v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/explore-fill.svg b/app/javascript/material-icons/400-24px/explore-fill.svg
new file mode 100644
index 0000000000..febe0a63b4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m260-260 300-140 140-300-300 140-140 300Zm220-180q-17 0-28.5-11.5T440-480q0-17 11.5-28.5T480-520q17 0 28.5 11.5T520-480q0 17-11.5 28.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/explore.svg b/app/javascript/material-icons/400-24px/explore.svg
new file mode 100644
index 0000000000..547a999421
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/explore.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m260-260 300-140 140-300-300 140-140 300Zm220-180q-17 0-28.5-11.5T440-480q0-17 11.5-28.5T480-520q17 0 28.5 11.5T520-480q0 17-11.5 28.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote-fill.svg b/app/javascript/material-icons/400-24px/format_quote-fill.svg
new file mode 100644
index 0000000000..f4afa3ed17
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m228-240 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T458-480L320-240h-92Zm360 0 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480L680-240h-92Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote.svg b/app/javascript/material-icons/400-24px/format_quote.svg
new file mode 100644
index 0000000000..c354385ea9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m228-240 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T458-480L320-240h-92Zm360 0 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480L680-240h-92ZM320-500q25 0 42.5-17.5T380-560q0-25-17.5-42.5T320-620q-25 0-42.5 17.5T260-560q0 25 17.5 42.5T320-500Zm360 0q25 0 42.5-17.5T740-560q0-25-17.5-42.5T680-620q-25 0-42.5 17.5T620-560q0 25 17.5 42.5T680-500Zm0-60Zm-360 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/gavel-fill.svg b/app/javascript/material-icons/400-24px/gavel-fill.svg
new file mode 100644
index 0000000000..9699b8480a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-120v-80h480v80H160Zm226-194L160-540l84-86 228 226-86 86Zm254-254L414-796l86-84 226 226-86 86Zm184 408L302-682l56-56 522 522-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/gavel.svg b/app/javascript/material-icons/400-24px/gavel.svg
new file mode 100644
index 0000000000..9699b8480a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/gavel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-120v-80h480v80H160Zm226-194L160-540l84-86 228 226-86 86Zm254-254L414-796l86-84 226 226-86 86Zm184 408L302-682l56-56 522 522-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe-fill.svg b/app/javascript/material-icons/400-24px/globe-fill.svg
new file mode 100644
index 0000000000..c931f53c74
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-7-.5-14.5T799-507q-5 29-27 48t-52 19h-80q-33 0-56.5-23.5T560-520v-40H400v-80q0-33 23.5-56.5T480-720h40q0-23 12.5-40.5T563-789q-20-5-40.5-8t-42.5-3q-134 0-227 93t-93 227h200q66 0 113 47t47 113v40H400v110q20 5 39.5 7.5T480-160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/globe.svg b/app/javascript/material-icons/400-24px/globe.svg
new file mode 100644
index 0000000000..c931f53c74
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/globe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-7-.5-14.5T799-507q-5 29-27 48t-52 19h-80q-33 0-56.5-23.5T560-520v-40H400v-80q0-33 23.5-56.5T480-720h40q0-23 12.5-40.5T563-789q-20-5-40.5-8t-42.5-3q-134 0-227 93t-93 227h200q66 0 113 47t47 113v40H400v110q20 5 39.5 7.5T480-160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/heart_broken-fill.svg b/app/javascript/material-icons/400-24px/heart_broken-fill.svg
new file mode 100644
index 0000000000..75ff3932cd
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/heart_broken-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M481-83Q347-218 267.5-301t-121-138q-41.5-55-54-94T80-620q0-92 64-156t156-64q45 0 87 16.5t75 47.5l-62 216h120l-34 335 114-375H480l71-212q25-14 52.5-21t56.5-7q92 0 156 64t64 156q0 48-13 88t-55 95.5q-42 55.5-121 138T481-83Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/heart_broken.svg b/app/javascript/material-icons/400-24px/heart_broken.svg
new file mode 100644
index 0000000000..2ce7de57f1
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/heart_broken.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M481-83Q347-218 267.5-301t-121-138q-41.5-55-54-94T80-620q0-92 64-156t156-64q45 0 87 16.5t75 47.5l-62 216h120l-34 335 114-375H480l71-212q25-14 52.5-21t56.5-7q92 0 156 64t64 156q0 48-13 88t-55 95.5q-42 55.5-121 138T481-83Zm-71-186 21-211H294l75-263q-16-8-33.5-12.5T300-760q-58 0-99 41t-41 99q0 31 11.5 62t40 70.5q28.5 39.5 77 92T410-269Zm188-48q111-113 156.5-180T800-620q0-58-41-99t-99-41q-11 0-22 1.5t-22 5.5l-24 73h116L598-317Zm110-363ZM294-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/history-fill.svg b/app/javascript/material-icons/400-24px/history-fill.svg
new file mode 100644
index 0000000000..2d8124b474
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/history.svg b/app/javascript/material-icons/400-24px/history.svg
new file mode 100644
index 0000000000..2d8124b474
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/history.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2-fill.svg b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
new file mode 100644
index 0000000000..10ec85da04
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm-40-600h640v-120H160v120Zm200 280h240v-80H360v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/inventory_2.svg b/app/javascript/material-icons/400-24px/inventory_2.svg
new file mode 100644
index 0000000000..d00fb1a632
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/inventory_2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-80q-33 0-56.5-23.5T120-160v-451q-18-11-29-28.5T80-680v-120q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v120q0 23-11 40.5T840-611v451q0 33-23.5 56.5T760-80H200Zm0-520v440h560v-440H200Zm-40-80h640v-120H160v120Zm200 280h240v-80H360v80Zm120 20Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/key-fill.svg b/app/javascript/material-icons/400-24px/key-fill.svg
new file mode 100644
index 0000000000..6a054ed6b0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/key-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-360q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Zm0 120q-100 0-170-70T40-480q0-100 70-170t170-70q81 0 141.5 46T506-560h335l79 79-140 160-100-79-80 80-80-80h-14q-25 72-87 116t-139 44Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/key.svg b/app/javascript/material-icons/400-24px/key.svg
new file mode 100644
index 0000000000..8d4104d59c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-400q-33 0-56.5-23.5T200-480q0-33 23.5-56.5T280-560q33 0 56.5 23.5T360-480q0 33-23.5 56.5T280-400Zm0 160q-100 0-170-70T40-480q0-100 70-170t170-70q67 0 121.5 33t86.5 87h352l120 120-180 180-80-60-80 60-85-60h-47q-32 54-86.5 87T280-240Zm0-80q56 0 98.5-34t56.5-86h125l58 41 82-61 71 55 75-75-40-40H435q-14-52-56.5-86T280-640q-66 0-113 47t-47 113q0 66 47 113t113 47Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/link_off-fill.svg b/app/javascript/material-icons/400-24px/link_off-fill.svg
new file mode 100644
index 0000000000..618e775347
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/link_off.svg b/app/javascript/material-icons/400-24px/link_off.svg
new file mode 100644
index 0000000000..618e775347
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/markdown-fill.svg b/app/javascript/material-icons/400-24px/markdown-fill.svg
new file mode 100644
index 0000000000..18a0670518
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/markdown-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m640-360 120-120-42-43-48 48v-125h-60v125l-48-48-42 43 120 120ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm60-200h60v-180h40v120h60v-120h40v180h60v-200q0-17-11.5-28.5T440-600H260q-17 0-28.5 11.5T220-560v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/markdown.svg b/app/javascript/material-icons/400-24px/markdown.svg
new file mode 100644
index 0000000000..3396c2f99a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/markdown.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m640-360 120-120-42-43-48 48v-125h-60v125l-48-48-42 43 120 120ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm0-80h640v-480H160v480Zm0 0v-480 480Zm60-120h60v-180h40v120h60v-120h40v180h60v-200q0-17-11.5-28.5T440-600H260q-17 0-28.5 11.5T220-560v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood-fill.svg b/app/javascript/material-icons/400-24px/mood-fill.svg
new file mode 100644
index 0000000000..9480d0fb92
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
new file mode 100644
index 0000000000..46cafa7680
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_before-fill.svg b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
new file mode 100644
index 0000000000..53783746ae
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_before.svg b/app/javascript/material-icons/400-24px/navigate_before.svg
new file mode 100644
index 0000000000..53783746ae
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_before.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next-fill.svg b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
new file mode 100644
index 0000000000..4100467365
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/navigate_next.svg b/app/javascript/material-icons/400-24px/navigate_next.svg
new file mode 100644
index 0000000000..4100467365
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/navigate_next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/no_encryption-fill.svg b/app/javascript/material-icons/400-24px/no_encryption-fill.svg
new file mode 100644
index 0000000000..3cb538005d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/no_encryption-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M800-274 434-640h166v-80q0-50-34.5-85T481-840q-50 0-84 35t-34 85v9l-73-73q22-61 74-98.5T481-920q83 0 141 58.5T680-720v80h40q33 0 56.5 23.5T800-560v286Zm20 246-62-62q-9 5-18.5 7.5T720-80H240q-33 0-56.5-23.5T160-160v-400q0-26 14.5-46.5T212-636L28-820l56-56L876-84l-56 56ZM425-423q-11 12-17 26.5t-6 30.5q0 33 23.5 56.5T482-286q16 0 30.5-6t26.5-17L425-423Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/no_encryption.svg b/app/javascript/material-icons/400-24px/no_encryption.svg
new file mode 100644
index 0000000000..4287d630cb
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/no_encryption.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m800-274-80-80v-206H514l-80-80h166v-80q0-50-34.5-85T481-840q-50 0-84 34.5T363-720v9l-73-73q22-61 75-98.5T481-920q83 0 141 58.5T680-720v80h40q33 0 56.5 23.5T800-560v286Zm20 246-62-62q-11 5-20 7.5T720-80H240q-33 0-56.5-23.5T160-160v-400q0-25 14.5-46t37.5-30L28-820l56-56L876-84l-56 56ZM686-160 539-309q-11 11-25.5 17t-31.5 6q-33 0-56.5-23.5T402-366q0-17 6-31.5t17-25.5L286-560h-46v400h446ZM486-360Zm131-97Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove-fill.svg b/app/javascript/material-icons/400-24px/person_remove-fill.svg
new file mode 100644
index 0000000000..239c7a49dc
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M640-520v-80h240v80H640Zm-280 40q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_remove.svg b/app/javascript/material-icons/400-24px/person_remove.svg
new file mode 100644
index 0000000000..725da3649b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_remove.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M640-520v-80h240v80H640Zm-280 40q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm80-80h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0-80Zm0 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library-fill.svg b/app/javascript/material-icons/400-24px/photo_library-fill.svg
new file mode 100644
index 0000000000..e68aec8321
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library.svg b/app/javascript/material-icons/400-24px/photo_library.svg
new file mode 100644
index 0000000000..3b22224b83
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320Zm0-80h480v-480H320v480ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Zm160-720v480-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time-fill.svg b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
new file mode 100644
index 0000000000..aed5740db3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time.svg b/app/javascript/material-icons/400-24px/quiet_time.svg
new file mode 100644
index 0000000000..552da6658d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Zm0-80q88 0 163-44t118-121q-86-8-163-43.5T504-425q-61-61-97-138t-43-163q-77 43-120.5 118.5T200-444q0 135 94.5 229.5T524-120Zm-20-305Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/shield-fill.svg b/app/javascript/material-icons/400-24px/shield-fill.svg
new file mode 100644
index 0000000000..833fc0ebba
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/shield-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/shield.svg b/app/javascript/material-icons/400-24px/shield.svg
new file mode 100644
index 0000000000..e313e5a64e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/shield.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-84q104-33 172-132t68-220v-189l-240-90-240 90v189q0 121 68 220t172 132Zm0-316Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star-fill.svg b/app/javascript/material-icons/400-24px/star-fill.svg
index cb2231e634..84e8230ab7 100644
--- a/app/javascript/material-icons/400-24px/star-fill.svg
+++ b/app/javascript/material-icons/400-24px/star-fill.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m233-80 65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m233-120 65-281L80-590l288-25 112-265 112 265 288 25-218 189 65 281-247-149-247 149Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star.svg b/app/javascript/material-icons/400-24px/star.svg
index 1736e085d0..6a72ecc226 100644
--- a/app/javascript/material-icons/400-24px/star.svg
+++ b/app/javascript/material-icons/400-24px/star.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m354-247 126-76 126 77-33-144 111-96-146-13-58-136-58 135-146 13 111 97-33 143ZM233-80l65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Zm247-350Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m354-287 126-76 126 77-33-144 111-96-146-13-58-136-58 135-146 13 111 97-33 143ZM233-120l65-281L80-590l288-25 112-265 112 265 288 25-218 189 65 281-247-149-247 149Zm247-350Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/sticky_note-fill.svg b/app/javascript/material-icons/400-24px/sticky_note-fill.svg
new file mode 100644
index 0000000000..a40f02260e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/sticky_note-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v440L640-120H200Zm240-200h80v-240h120v-80H320v80h120v240Zm160 120 160-160h-80q-33 0-56.5 23.5T600-280v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/sticky_note.svg b/app/javascript/material-icons/400-24px/sticky_note.svg
new file mode 100644
index 0000000000..ac988c1e48
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/sticky_note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M640-120H200q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v440L640-120Zm-40-80v-80q0-33 23.5-56.5T680-360h80v-400H200v560h400ZM440-320h80v-240h120v-80H320v80h120v240Zm160 120Zm-400 0v-560 560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/timer-fill.svg b/app/javascript/material-icons/400-24px/timer-fill.svg
new file mode 100644
index 0000000000..4d3d88f199
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/timer-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-840v-80h240v80H360Zm80 440h80v-240h-80v240Zm40 320q-74 0-139.5-28.5T226-186q-49-49-77.5-114.5T120-440q0-74 28.5-139.5T226-694q49-49 114.5-77.5T480-800q62 0 119 20t107 58l56-56 56 56-56 56q38 50 58 107t20 119q0 74-28.5 139.5T734-186q-49 49-114.5 77.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/timer.svg b/app/javascript/material-icons/400-24px/timer.svg
new file mode 100644
index 0000000000..910fb08046
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/timer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-840v-80h240v80H360Zm80 440h80v-240h-80v240Zm40 320q-74 0-139.5-28.5T226-186q-49-49-77.5-114.5T120-440q0-74 28.5-139.5T226-694q49-49 114.5-77.5T480-800q62 0 119 20t107 58l56-56 56 56-56 56q38 50 58 107t20 119q0 74-28.5 139.5T734-186q-49 49-114.5 77.5T480-80Zm0-80q116 0 198-82t82-198q0-116-82-198t-198-82q-116 0-198 82t-82 198q0 116 82 198t198 82Zm0-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/title-fill.svg b/app/javascript/material-icons/400-24px/title-fill.svg
new file mode 100644
index 0000000000..94e4621612
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/title-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M420-160v-520H200v-120h560v120H540v520H420Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/title.svg b/app/javascript/material-icons/400-24px/title.svg
new file mode 100644
index 0000000000..94e4621612
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/title.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M420-160v-520H200v-120h560v120H540v520H420Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate-fill.svg b/app/javascript/material-icons/400-24px/translate-fill.svg
new file mode 100644
index 0000000000..ecaaf37f1e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate.svg b/app/javascript/material-icons/400-24px/translate.svg
new file mode 100644
index 0000000000..ecaaf37f1e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning-fill.svg b/app/javascript/material-icons/400-24px/warning-fill.svg
new file mode 100644
index 0000000000..c3727d3f57
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm440-120q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning.svg b/app/javascript/material-icons/400-24px/warning.svg
new file mode 100644
index 0000000000..238299e606
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm138-80h604L480-720 178-200Zm302-40q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Zm40-100Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/wifi-fill.svg b/app/javascript/material-icons/400-24px/wifi-fill.svg
new file mode 100644
index 0000000000..8275784824
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/wifi-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM254-346l-84-86q59-59 138.5-93.5T480-560q92 0 171.5 35T790-430l-84 84q-44-44-102-69t-124-25q-66 0-124 25t-102 69ZM84-516 0-600q92-94 215-147t265-53q142 0 265 53t215 147l-84 84q-77-77-178.5-120.5T480-680q-116 0-217.5 43.5T84-516Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/wifi.svg b/app/javascript/material-icons/400-24px/wifi.svg
new file mode 100644
index 0000000000..8275784824
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/wifi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-120q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM254-346l-84-86q59-59 138.5-93.5T480-560q92 0 171.5 35T790-430l-84 84q-44-44-102-69t-124-25q-66 0-124 25t-102 69ZM84-516 0-600q92-94 215-147t265-53q142 0 265 53t215 147l-84 84q-77-77-178.5-120.5T480-680q-116 0-217.5 43.5T84-516Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
deleted file mode 100644
index d3bfc4ea90..0000000000
--- a/app/javascript/packs/admin.jsx
+++ /dev/null
@@ -1,248 +0,0 @@
-import './public-path';
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-
-import Rails from '@rails/ujs';
-
-import ready from '../mastodon/ready';
-
-const setAnnouncementEndsAttributes = (target) => {
-  const valid = target?.value && target?.validity?.valid;
-  const element = document.querySelector('input[type="datetime-local"]#announcement_ends_at');
-  if (valid) {
-    element.classList.remove('optional');
-    element.required = true;
-    element.min = target.value;
-  } else {
-    element.classList.add('optional');
-    element.removeAttribute('required');
-    element.removeAttribute('min');
-  }
-};
-
-Rails.delegate(document, 'input[type="datetime-local"]#announcement_starts_at', 'change', ({ target }) => {
-  setAnnouncementEndsAttributes(target);
-});
-
-const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
-
-const showSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  selectAllMatchingElement.classList.add('active');
-};
-
-const hideSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  const hiddenField = document.querySelector('#select_all_matching');
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  selectAllMatchingElement.classList.remove('active');
-  selectedMsg.classList.remove('active');
-  notSelectedMsg.classList.add('active');
-  hiddenField.value = '0';
-};
-
-Rails.delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  [].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
-    content.checked = target.checked;
-  });
-
-  if (selectAllMatchingElement) {
-    if (target.checked) {
-      showSelectAll();
-    } else {
-      hideSelectAll();
-    }
-  }
-});
-
-Rails.delegate(document, '.batch-table__select-all button', 'click', () => {
-  const hiddenField = document.querySelector('#select_all_matching');
-  const active = hiddenField.value === '1';
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  if (active) {
-    hiddenField.value = '0';
-    selectedMsg.classList.remove('active');
-    notSelectedMsg.classList.add('active');
-  } else {
-    hiddenField.value = '1';
-    notSelectedMsg.classList.remove('active');
-    selectedMsg.classList.add('active');
-  }
-});
-
-Rails.delegate(document, batchCheckboxClassName, 'change', () => {
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-
-    if (selectAllMatchingElement) {
-      if (checkAllElement.checked) {
-        showSelectAll();
-      } else {
-        hideSelectAll();
-      }
-    }
-  }
-});
-
-Rails.delegate(document, '.media-spoiler-show-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('button.media-spoiler'), (element) => {
-    element.click();
-  });
-});
-
-Rails.delegate(document, '.media-spoiler-hide-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('.spoiler-button.spoiler-button--visible button'), (element) => {
-    element.click();
-  });
-});
-
-Rails.delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
-  target.form.submit();
-});
-
-const onDomainBlockSeverityChange = (target) => {
-  const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
-  const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
-
-  if (rejectMediaDiv) {
-    rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-
-  if (rejectReportsDiv) {
-    rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-};
-
-Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
-
-const onEnableBootstrapTimelineAccountsChange = (target) => {
-  const bootstrapTimelineAccountsField = document.querySelector('#form_admin_settings_bootstrap_timeline_accounts');
-
-  if (bootstrapTimelineAccountsField) {
-    bootstrapTimelineAccountsField.disabled = !target.checked;
-    if (target.checked) {
-      bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.remove('disabled');
-    } else {
-      bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.add('disabled');
-    }
-  }
-};
-
-Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
-
-const onChangeRegistrationMode = (target) => {
-  const enabled = target.value === 'approved';
-
-  [].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
-    input.disabled = !enabled;
-    if (enabled) {
-      let element = input;
-      do {
-        element.classList.remove('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    } else {
-      let element = input;
-      do {
-        element.classList.add('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    }
-  });
-};
-
-const convertUTCDateTimeToLocal = (value) => {
-  const date = new Date(value + 'Z');
-  const twoChars = (x) => (x.toString().padStart(2, '0'));
-  return `${date.getFullYear()}-${twoChars(date.getMonth()+1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
-};
-
-const convertLocalDatetimeToUTC = (value) => {
-  const re = /^([0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})/;
-  const match = re.exec(value);
-  const date = new Date(match[1], match[2] - 1, match[3], match[4], match[5]);
-  const fullISO8601 = date.toISOString();
-  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
-};
-
-Rails.delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
-
-ready(() => {
-  const domainBlockSeverityInput = document.getElementById('domain_block_severity');
-  if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
-
-  const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
-  if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
-
-  const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
-  if (registrationMode) onChangeRegistrationMode(registrationMode);
-
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-  }
-
-  document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
-    const domain = document.querySelector('input[type="text"]#by_domain')?.value;
-
-    if (domain) {
-      const url = new URL(event.target.href);
-      url.searchParams.set('_domain', domain);
-      e.target.href = url;
-    }
-  });
-
-  [].forEach.call(document.querySelectorAll('input[type="datetime-local"]'), element => {
-    if (element.value) {
-      element.value = convertUTCDateTimeToLocal(element.value);
-    }
-    if (element.placeholder) {
-      element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
-    }
-  });
-
-  Rails.delegate(document, 'form', 'submit', ({ target }) => {
-    [].forEach.call(target.querySelectorAll('input[type="datetime-local"]'), element => {
-      if (element.value && element.validity.valid) {
-        element.value = convertLocalDatetimeToUTC(element.value);
-      }
-    });
-  });
-
-  const announcementStartsAt = document.querySelector('input[type="datetime-local"]#announcement_starts_at');
-  if (announcementStartsAt) {
-    setAnnouncementEndsAttributes(announcementStartsAt);
-  }
-
-  [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
-    const componentName  = element.getAttribute('data-admin-component');
-    const componentProps = JSON.parse(element.getAttribute('data-props'));
-
-    import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
-      return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
-        const root = createRoot(element);
-
-        root.render (
-          <AdminComponent>
-            <Component {...componentProps} />
-          </AdminComponent>,
-        );
-      });
-    }).catch(error => {
-      console.error(error);
-    });
-  });
-});
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
deleted file mode 100644
index 5edc355370..0000000000
--- a/app/javascript/packs/public.jsx
+++ /dev/null
@@ -1,286 +0,0 @@
-import { createRoot }  from 'react-dom/client';
-
-import './public-path';
-
-import { IntlMessageFormat }  from 'intl-messageformat';
-import { defineMessages } from 'react-intl';
-
-import Rails from '@rails/ujs';
-import axios from 'axios';
-import { throttle } from 'lodash';
-
-import { start } from '../mastodon/common';
-import { timeAgoString }  from '../mastodon/components/relative_timestamp';
-import emojify  from '../mastodon/features/emoji/emoji';
-import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
-import { loadLocale, getLocale } from '../mastodon/locales';
-import { loadPolyfills } from '../mastodon/polyfills';
-import ready from '../mastodon/ready';
-
-import 'cocoon-js-vanilla';
-
-start();
-
-const messages = defineMessages({
-  usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
-  passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },
-  passwordDoesNotMatch: { id: 'password_confirmation.mismatching', defaultMessage: 'Password confirmation does not match' },
-});
-
-window.addEventListener('message', e => {
-  const data = e.data || {};
-
-  if (!window.parent || data.type !== 'setHeight') {
-    return;
-  }
-
-  ready(() => {
-    window.parent.postMessage({
-      type: 'setHeight',
-      id: data.id,
-      height: document.getElementsByTagName('html')[0].scrollHeight,
-    }, '*');
-  });
-});
-
-function loaded() {
-  const { messages: localeData } = getLocale();
-
-  const locale = document.documentElement.lang;
-
-  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-  });
-
-  const dateFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric',
-    timeFormat: false,
-  });
-
-  const timeFormat = new Intl.DateTimeFormat(locale, {
-    timeStyle: 'short',
-    hour12: false,
-  });
-
-  const formatMessage = ({ id, defaultMessage }, values) => {
-    const messageFormat = new IntlMessageFormat(localeData[id] || defaultMessage, locale);
-    return messageFormat.format(values);
-  };
-
-  [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
-    content.innerHTML = emojify(content.innerHTML);
-  });
-
-  [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const formattedDate = dateTimeFormat.format(datetime);
-
-    content.title = formattedDate;
-    content.textContent = formattedDate;
-  });
-
-  const isToday = date => {
-    const today = new Date();
-
-    return date.getDate() === today.getDate() &&
-      date.getMonth() === today.getMonth() &&
-      date.getFullYear() === today.getFullYear();
-  };
-  const todayFormat = new IntlMessageFormat(localeData['relative_format.today'] || 'Today at {time}', locale);
-
-  [].forEach.call(document.querySelectorAll('time.relative-formatted'), (content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-
-    let formattedContent;
-
-    if (isToday(datetime)) {
-      const formattedTime = timeFormat.format(datetime);
-
-      formattedContent = todayFormat.format({ time: formattedTime });
-    } else {
-      formattedContent = dateFormat.format(datetime);
-    }
-
-    content.title = formattedContent;
-    content.textContent = formattedContent;
-  });
-
-  [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const now      = new Date();
-
-    const timeGiven = content.getAttribute('datetime').includes('T');
-    content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime);
-    content.textContent = timeAgoString({
-      formatMessage,
-      formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
-    }, datetime, now, now.getFullYear(), timeGiven);
-  });
-
-  const reactComponents = document.querySelectorAll('[data-component]');
-
-  if (reactComponents.length > 0) {
-    import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
-      .then(({ default: MediaContainer }) => {
-        [].forEach.call(reactComponents, (component) => {
-          [].forEach.call(component.children, (child) => {
-            component.removeChild(child);
-          });
-        });
-
-        const content = document.createElement('div');
-
-        const root = createRoot(content);
-        root.render(<MediaContainer locale={locale} components={reactComponents} />);
-        document.body.appendChild(content);
-      })
-      .catch(error => {
-        console.error(error);
-      });
-  }
-
-  Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(({ target }) => {
-    if (target.value && target.value.length > 0) {
-      axios.get('/api/v1/accounts/lookup', { params: { acct: target.value } }).then(() => {
-        target.setCustomValidity(formatMessage(messages.usernameTaken));
-      }).catch(() => {
-        target.setCustomValidity('');
-      });
-    } else {
-      target.setCustomValidity('');
-    }
-  }, 500, { leading: false, trailing: true }));
-
-  Rails.delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
-    const password = document.getElementById('user_password');
-    const confirmation = document.getElementById('user_password_confirmation');
-    if (!confirmation) return;
-
-    if (confirmation.value && confirmation.value.length > password.maxLength) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordExceedsLength));
-    } else if (password.value && password.value !== confirmation.value) {
-      confirmation.setCustomValidity(formatMessage(messages.passwordDoesNotMatch));
-    } else {
-      confirmation.setCustomValidity('');
-    }
-  });
-
-  Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
-    const statusEl = this.parentNode.parentNode;
-
-    if (statusEl.dataset.spoiler === 'expanded') {
-      statusEl.dataset.spoiler = 'folded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_more'] || 'Show more', locale)).format();
-    } else {
-      statusEl.dataset.spoiler = 'expanded';
-      this.textContent = (new IntlMessageFormat(localeData['status.show_less'] || 'Show less', locale)).format();
-    }
-
-    return false;
-  });
-
-  [].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
-    const statusEl = spoilerLink.parentNode.parentNode;
-    const message = (statusEl.dataset.spoiler === 'expanded') ? (localeData['status.show_less'] || 'Show less') : (localeData['status.show_more'] || 'Show more');
-    spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
-  });
-}
-
-Rails.delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
-  const avatar = document.getElementById(target.id + '-preview');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
-
-  avatar.src = url;
-});
-
-Rails.delegate(document, '.input-copy input', 'click', ({ target }) => {
-  target.focus();
-  target.select();
-  target.setSelectionRange(0, target.value.length);
-});
-
-Rails.delegate(document, '.input-copy button', 'click', ({ target }) => {
-  const input = target.parentNode.querySelector('.input-copy__wrapper input');
-
-  const oldReadOnly = input.readonly;
-
-  input.readonly = false;
-  input.focus();
-  input.select();
-  input.setSelectionRange(0, input.value.length);
-
-  try {
-    if (document.execCommand('copy')) {
-      input.blur();
-      target.parentNode.classList.add('copied');
-
-      setTimeout(() => {
-        target.parentNode.classList.remove('copied');
-      }, 700);
-    }
-  } catch (err) {
-    console.error(err);
-  }
-
-  input.readonly = oldReadOnly;
-});
-
-const toggleSidebar = () => {
-  const sidebar = document.querySelector('.sidebar ul');
-  const toggleButton = document.querySelector('.sidebar__toggle__icon');
-
-  if (sidebar.classList.contains('visible')) {
-    document.body.style.overflow = null;
-    toggleButton.setAttribute('aria-expanded', 'false');
-  } else {
-    document.body.style.overflow = 'hidden';
-    toggleButton.setAttribute('aria-expanded', 'true');
-  }
-
-  toggleButton.classList.toggle('active');
-  sidebar.classList.toggle('visible');
-};
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
-  toggleSidebar();
-});
-
-Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
-  if (e.key === ' ' || e.key === 'Enter') {
-    e.preventDefault();
-    toggleSidebar();
-  }
-});
-
-Rails.delegate(document, '.custom-emoji', 'mouseover', ({ target }) => target.src = target.getAttribute('data-original'));
-Rails.delegate(document, '.custom-emoji', 'mouseout', ({ target }) => target.src = target.getAttribute('data-static'));
-
-// Empty the honeypot fields in JS in case something like an extension
-// automatically filled them.
-Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
-  ['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
-    const field = document.getElementById(id);
-    if (field) {
-      field.value = '';
-    }
-  });
-});
-
-function main() {
-  ready(loaded);
-}
-
-loadPolyfills()
-  .then(loadLocale)
-  .then(main)
-  .then(loadKeyboardExtensions)
-  .catch(error => {
-    console.error(error);
-  });
diff --git a/app/javascript/packs/sign_up.js b/app/javascript/packs/sign_up.js
deleted file mode 100644
index cf9c837773..0000000000
--- a/app/javascript/packs/sign_up.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import './public-path';
-import axios from 'axios';
-
-import ready from '../mastodon/ready';
-
-ready(() => {
-  setInterval(() => {
-    axios.get('/api/v1/emails/check_confirmation').then((response) => {
-      if (response.data) {
-        window.location = '/start';
-      }
-    }).catch(error => {
-      console.error(error);
-    });
-  }, 5000);
-
-  document.querySelectorAll('.timer-button').forEach(button => {
-    let counter = 30;
-
-    const container = document.createElement('span');
-
-    const updateCounter = () => {
-      container.innerText = ` (${counter})`;
-    };
-
-    updateCounter();
-
-    const countdown = setInterval(() => {
-      counter--;
-
-      if (counter === 0) {
-        button.disabled = false;
-        button.removeChild(container);
-        clearInterval(countdown);
-      } else {
-        updateCounter();
-      }
-    }, 1000);
-
-    button.appendChild(container);
-  });
-});
diff --git a/app/javascript/packs/two_factor_authentication.js b/app/javascript/packs/two_factor_authentication.js
deleted file mode 100644
index e77965c757..0000000000
--- a/app/javascript/packs/two_factor_authentication.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import * as WebAuthnJSON from '@github/webauthn-json';
-import axios from 'axios';
-
-import ready from '../mastodon/ready';
-import 'regenerator-runtime/runtime';
-
-function getCSRFToken() {
-  var CSRFSelector = document.querySelector('meta[name="csrf-token"]');
-  if (CSRFSelector) {
-    return CSRFSelector.getAttribute('content');
-  } else {
-    return null;
-  }
-}
-
-function hideFlashMessages() {
-  Array.from(document.getElementsByClassName('flash-message')).forEach(function(flashMessage) {
-    flashMessage.classList.add('hidden');
-  });
-}
-
-function callback(url, body) {
-  axios.post(url, JSON.stringify(body), {
-    headers: {
-      'Content-Type': 'application/json',
-      'Accept': 'application/json',
-      'X-CSRF-Token': getCSRFToken(),
-    },
-    credentials: 'same-origin',
-  }).then(function(response) {
-    window.location.replace(response.data.redirect_path);
-  }).catch(function(error) {
-    if (error.response.status === 422) {
-      const errorMessage = document.getElementById('security-key-error-message');
-      errorMessage.classList.remove('hidden');
-      console.error(error.response.data.error);
-    } else {
-      console.error(error);
-    }
-  });
-}
-
-ready(() => {
-  if (!WebAuthnJSON.supported()) {
-    const unsupported_browser_message = document.getElementById('unsupported-browser-message');
-    if (unsupported_browser_message) {
-      unsupported_browser_message.classList.remove('hidden');
-      document.querySelector('.btn.js-webauthn').disabled = true;
-    }
-  }
-
-
-  const webAuthnCredentialRegistrationForm = document.getElementById('new_webauthn_credential');
-  if (webAuthnCredentialRegistrationForm) {
-    webAuthnCredentialRegistrationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      var nickname = event.target.querySelector('input[name="new_webauthn_credential[nickname]"]');
-      if (nickname.value) {
-        axios.get('/settings/security_keys/options')
-          .then((response) => {
-            const credentialOptions = response.data;
-
-            WebAuthnJSON.create({ 'publicKey': credentialOptions }).then((credential) => {
-              var params = { 'credential': credential, 'nickname': nickname.value };
-              callback('/settings/security_keys', params);
-            }).catch((error) => {
-              const errorMessage = document.getElementById('security-key-error-message');
-              errorMessage.classList.remove('hidden');
-              console.error(error);
-            });
-          }).catch((error) => {
-            console.error(error.response.data.error);
-          });
-      } else {
-        nickname.focus();
-      }
-    });
-  }
-
-  const webAuthnCredentialAuthenticationForm = document.getElementById('webauthn-form');
-  if (webAuthnCredentialAuthenticationForm) {
-    webAuthnCredentialAuthenticationForm.addEventListener('submit', (event) => {
-      event.preventDefault();
-
-      axios.get('sessions/security_key_options')
-        .then((response) => {
-          const credentialOptions = response.data;
-
-          WebAuthnJSON.get({ 'publicKey': credentialOptions }).then((credential) => {
-            var params = { 'user': { 'credential': credential } };
-            callback('sign_in', params);
-          }).catch((error) => {
-            const errorMessage = document.getElementById('security-key-error-message');
-            errorMessage.classList.remove('hidden');
-            console.error(error);
-          });
-        }).catch((error) => {
-          console.error(error.response.data.error);
-        });
-    });
-
-    const otpAuthenticationForm = document.getElementById('otp-authentication-form');
-
-    const linkToOtp = document.getElementById('link-to-otp');
-    linkToOtp.addEventListener('click', () => {
-      webAuthnCredentialAuthenticationForm.classList.add('hidden');
-      otpAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-
-    const linkToWebAuthn = document.getElementById('link-to-webauthn');
-    linkToWebAuthn.addEventListener('click', () => {
-      otpAuthenticationForm.classList.add('hidden');
-      webAuthnCredentialAuthenticationForm.classList.remove('hidden');
-      hideFlashMessages();
-    });
-  }
-});
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 1c2386f02d..ae607f484a 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,20 +1,7 @@
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload {
-      &-description {
-        input {
-          &::placeholder {
-            opacity: 1;
-          }
-        }
-      }
-    }
-  }
-}
-
 .status__content a,
-.link-footer a,
 .reply-indicator__content a,
+.edit-indicator__content a,
+.link-footer a,
 .status__content__read-more-button,
 .status__content__translate-button {
   text-decoration: underline;
@@ -42,7 +29,9 @@
   }
 }
 
-.status__content a {
+.status__content a,
+.reply-indicator__content a,
+.edit-indicator__content a {
   color: $highlight-text-color;
 }
 
@@ -50,24 +39,10 @@
   color: $darker-text-color;
 }
 
-.compose-form__poll-wrapper .button.button-secondary,
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder,
-.report-dialog-modal__textarea::placeholder,
-.language-dropdown__dropdown__results__item__common-name,
-.compose-form .icon-button {
+.report-dialog-modal__textarea::placeholder {
   color: $inverted-text-color;
 }
 
-.text-icon-button.active {
-  color: $ui-highlight-color;
-}
-
-.language-dropdown__dropdown__results__item.active {
-  background: $ui-highlight-color;
-  font-weight: 500;
-}
-
 .link-button:disabled {
   cursor: not-allowed;
 
diff --git a/app/javascript/styles/contrast/variables.scss b/app/javascript/styles/contrast/variables.scss
index e38d24b271..2ab7723739 100644
--- a/app/javascript/styles/contrast/variables.scss
+++ b/app/javascript/styles/contrast/variables.scss
@@ -6,6 +6,9 @@ $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
 $classic-highlight-color: #6364ff;
 
+$emoji-reaction-color: #42485a !default;
+$emoji-reaction-selected-color: #617ed5 !default;
+
 $ui-base-color: $classic-base-color !default;
 $ui-primary-color: $classic-primary-color !default;
 $ui-secondary-color: $classic-secondary-color !default;
diff --git a/app/javascript/styles/fonts/inter.scss b/app/javascript/styles/fonts/inter.scss
new file mode 100644
index 0000000000..bb4899b701
--- /dev/null
+++ b/app/javascript/styles/fonts/inter.scss
@@ -0,0 +1,8 @@
+@font-face {
+  font-family: Inter;
+  src: url('../fonts/inter/inter-variable-font-slnt-wght.woff2')
+    format('woff2-variations');
+  font-weight: 100 900;
+  font-style: normal;
+  mso-generic-font-family: swiss; /* stylelint-disable-line property-no-unknown -- Proprietary property for Outlook on Windows. */
+}
diff --git a/app/javascript/styles/full-dark.scss b/app/javascript/styles/full-dark.scss
new file mode 100644
index 0000000000..105964ba6f
--- /dev/null
+++ b/app/javascript/styles/full-dark.scss
@@ -0,0 +1,3 @@
+@import 'full-dark/variables';
+@import 'application';
+@import 'full-dark/diff';
diff --git a/app/javascript/styles/full-dark/diff.scss b/app/javascript/styles/full-dark/diff.scss
new file mode 100644
index 0000000000..9483e7ecb6
--- /dev/null
+++ b/app/javascript/styles/full-dark/diff.scss
@@ -0,0 +1,38 @@
+input[type='text']:not(#cw-spoiler-input),
+input[type='search'],
+input[type='number'],
+textarea[id='upload-modal__description'],
+input:not([type]) {
+  background: $ui-base-color !important;
+  color: $primary-text-color !important;
+
+  &.setting-text {
+    border-color: $darker-text-color;
+  }
+}
+
+.column-content-select__control,
+.button.button-secondary {
+  border-color: $darker-text-color !important;
+}
+
+.column-content-select__control,
+.column-content-select__menu {
+  background: $ui-base-color !important;
+}
+
+.column-content-select__single-value {
+  color: $classic-secondary-color !important;
+}
+
+.compose-form__warning,
+.modal-root__modal {
+  background: lighten($classic-base-color, 12%);
+}
+
+.boost-modal__action-bar,
+.confirmation-modal__action-bar,
+.mute-modal__action-bar,
+.block-modal__action-bar {
+  background: lighten($classic-base-color, 2%);
+}
diff --git a/app/javascript/styles/full-dark/variables.scss b/app/javascript/styles/full-dark/variables.scss
new file mode 100644
index 0000000000..6cedec7df9
--- /dev/null
+++ b/app/javascript/styles/full-dark/variables.scss
@@ -0,0 +1,11 @@
+$classic-base-color: #282c37; // Midnight Express
+$classic-secondary-color: #d9e1e8; // Pattens Blue
+
+// Variables for defaults in UI
+$simple-background-color: $classic-base-color !default;
+
+// Tell UI to use selected colors
+$ui-base-lighter-color: #969fbc !default; // Lighter darkest
+
+// For texts on inverted backgrounds
+$inverted-text-color: $classic-secondary-color !default;
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 92d00cae8b..e5d0c05f81 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -1,574 +1,965 @@
-@import 'mastodon/variables';
-@import 'fonts/roboto';
+@import 'fonts/inter';
 
-table,
-td,
-div {
-  box-sizing: border-box;
-}
-
-html,
 body {
-  width: 100% !important;
-  min-width: 100%;
+  accent-color: #6364ff;
+  word-break: break-word;
   margin: 0;
+  background-color: #f3f2f5;
   padding: 0;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-
-.email-body {
-  td,
-  div,
-  a,
-  span {
-    line-height: inherit;
-  }
-}
-
-a {
-  &,
-  &:visited,
-  span {
-    text-decoration: none;
-    color: $ui-highlight-color;
-  }
-
-  #outlook & {
-    padding: 0;
-  }
-}
-
-img {
-  outline: none;
-  border: 0;
-  text-decoration: none;
-  -ms-interpolation-mode: bicubic;
-  clear: both;
-  line-height: 100%;
-}
-
-table {
-  border-spacing: 0;
-  mso-table-lspace: 0;
-  mso-table-rspace: 0;
-}
-
-td {
-  vertical-align: top;
-}
-
-.auto-dir {
-  p {
-    unicode-bidi: plaintext;
-  }
-
-  a {
-    unicode-bidi: isolate;
-  }
-}
-
-.email-table,
-.content-section,
-.column,
-.column-cell {
-  width: 100%;
-  min-width: 100%;
-}
-
-.email-body {
-  font-size: 0 !important;
-  line-height: 100%;
-  text-align: center;
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.email-start {
-  padding-top: 32px;
-}
-
-.email-end {
-  padding-bottom: 32px;
-}
-
-.email-body,
-html,
-body {
-  background-color: lighten($ui-base-color, 4%);
-}
-
-.email-container,
-.email-row,
-.col-0,
-.col-1,
-.col-2,
-.col-3,
-.col-4,
-.col-5,
-.col-6 {
-  font-size: 0;
-  display: inline-block;
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-  vertical-align: top;
-}
-
-.content-cell {
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-}
-
-.column-cell {
-  padding-top: 16px;
-  padding-bottom: 16px;
-  vertical-align: top;
-
-  &.button-cell {
-    padding-top: 0;
-  }
-}
-
-.email-container {
-  max-width: 632px;
-  margin: 0 auto;
-  text-align: center;
-}
-
-.email-row {
-  display: block;
-  max-width: 600px !important;
-  margin: 0 auto;
-  text-align: center;
-  clear: both;
-}
-
-.col-0 {
-  max-width: 50px;
-}
-
-.col-1 {
-  max-width: 100px;
-}
-
-.col-2 {
-  max-width: 200px;
-}
-
-.col-3 {
-  max-width: 300px;
-}
-
-.col-4 {
-  max-width: 400px;
-}
-
-.col-5 {
-  max-width: 500px;
-}
-
-.col-6 {
-  max-width: 600px;
-}
-
-.column-cell,
-.column-cell td,
-p {
-  font-family: Helvetica, Arial, sans-serif;
-
-  @media only screen {
-    font-family: $font-sans-serif, sans-serif !important;
-  }
-}
-
-.email-body .column-cell,
-.column-cell,
-p {
-  font-size: 15px;
-  line-height: 23px;
-  color: $ui-primary-color;
-  mso-line-height-rule: exactly;
-  text-rendering: optimizelegibility;
-}
-
-p {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 16px;
-
-  &.small {
-    font-size: 13px;
-  }
-
-  &.lead {
-    font-size: 19px;
-    line-height: 27px;
-  }
+  -webkit-text-size-adjust: none;
+  text-size-adjust: none;
 }
 
+p,
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
-  color: $ui-secondary-color;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 20px;
-  margin-bottom: 8px;
+  margin: 0;
+  background-color: transparent;
   padding: 0;
-  font-weight: 500;
+  border: none;
+  font-family: Inter, 'Lucida Grande', sans-serif;
 }
 
-h1 {
-  font-size: 26px;
-  line-height: 36px;
+img {
+  max-width: 100%;
+  height: auto;
+  border: none;
+  text-indent: 0;
+  vertical-align: middle;
+  color: inherit;
+  font-family: inherit;
 }
 
-h2 {
-  font-size: 23px;
-  line-height: 30px;
+table {
+  border: none;
 }
 
-h3 {
-  font-size: 19px;
-  line-height: 25px;
+table + p {
+  margin-top: 16px;
 }
 
-h5 {
-  font-size: 16px;
-  line-height: 21px;
-  font-weight: 700;
-  color: lighten($ui-base-color, 34%);
+.email {
+  min-width: 280px;
+  font-family: Inter, 'Lucida Grande', sans-serif;
+  word-break: break-word;
+  color: #17063b;
+  background-color: #f3f2f5;
 }
 
-.input-cell {
-  h5 {
-    margin-top: 4px;
-  }
-}
-
-.input {
-  td {
-    background: darken($ui-base-color, 8%);
-    border-radius: 4px;
-    padding: 16px;
-    line-height: 20px;
-    mso-line-height-rule: exactly;
-    text-align: center;
-    font-weight: 500;
-    font-size: 17px;
-  }
-}
-
-.content-cell,
-.blank-cell {
+.email-container {
+  max-width: 740px;
+  margin: 0 auto;
   width: 100%;
+}
+
+// Outer email card
+.email-card-table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+.email-card-td {
+  overflow: hidden;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 4%);
+  background-color: #fff;
+}
+
+// Inner email card
+.email-inner-card-table {
+  border-collapse: separate;
+  width: 100%;
+  border-radius: 12px;
+}
+
+.email-inner-card-td-without-padding,
+.email-inner-card-td {
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 8%);
+  background-color: #fff;
+  border: 1px solid #dfdee3;
+}
+
+.email-inner-card-td {
+  padding: 24px;
+}
+
+// Account
+.email-account-banner-table {
+  background-color: #f3f2f5;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+}
+
+.email-account-banner-td {
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+  height: 140px;
+  vertical-align: bottom;
+  background-position: center !important;
+  background-size: cover !important;
+}
+
+.email-account-banner-inner-td {
+  padding: 24px 24px 0;
+  mso-padding-alt: 24px;
+}
+
+.email-account-banner-overlap-div {
+  max-height: 42px;
+}
+
+.email-account-banner-icon-table {
+  width: auto;
+  margin: 0;
+  overflow: hidden;
+  border-radius: 8px;
+  border-collapse: separate;
+  background-color: #fff;
+  border: 2px solid #fff;
+
+  img {
+    display: block;
+    max-width: 100%;
+    border: none;
+    border-radius: 6px;
+  }
+}
+
+.email-account-body-td {
+  padding: 56px 24px 24px;
+  mso-padding-alt: 24px;
+}
+
+.email-account-name {
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  color: #17063b;
+}
+
+.email-account-handle {
+  font-size: 14px;
+  line-height: 20px;
+  color: #746a89;
+}
+
+.email-account-stats-table {
+  td {
+    padding-right: 16px;
+    font-size: 14px;
+    line-height: 20px;
+    color: #746a89;
+  }
+
+  b {
+    font-weight: 600;
+    color: #17063b;
+  }
+
+  span {
+    white-space: nowrap;
+  }
+}
+
+// Utility classes
+.email-w-full {
+  width: 100%;
+}
+
+.email-prose {
+  p {
+    color: #17063b;
+    font-size: 14px;
+    line-height: 20px;
+
+    &:not(:last-child) {
+      margin-bottom: 16px;
+    }
+
+    a:not([class]) {
+      color: #6364ff;
+      text-decoration: none;
+
+      &:hover {
+        color: #563acc !important;
+      }
+    }
+  }
+}
+
+.email-dir-rtl {
+  direction: rtl;
+
+  [dir='rtl'] & {
+    direction: ltr;
+  }
+}
+
+.email-dir-ltr {
+  direction: ltr;
+}
+
+.email-padding-24 {
+  padding: 24px;
+}
+
+.email-padding-top-24 {
+  padding-top: 24px;
+}
+
+.email-padding-top-16 {
+  padding-top: 16px;
+}
+
+.email-padding-top-0 {
+  padding-top: 0;
+}
+
+.email-border-top {
+  border-top: 1px solid #dfdee3;
+}
+
+.email-border-bottom {
+  border-bottom: 1px solid #dfdee3;
+}
+
+.email-desktop-flex {
   font-size: 0;
-  text-align: center;
+  max-width: 740px;
+  margin-left: auto;
+  margin-right: auto;
+
+  &.email-dir-rtl > .email-desktop-column {
+    direction: ltr;
+
+    [dir='rtl'] & {
+      direction: rtl;
+    }
+  }
+}
+
+.email-desktop-column {
+  display: inline-block;
+  width: 100%;
+  max-width: none;
+  text-align: start;
   vertical-align: top;
+  font-size: 16px;
+}
+
+// Header
+.email-header-td {
+  padding: 16px 32px;
+  background-color: #1b001f;
+  background-image: url('../images/mailer-new/common/header-bg-start.png');
+  background-position: left top;
+  background-repeat: repeat;
+}
+
+.email-header-logo-table {
+  width: auto;
+  margin: 0;
+}
+
+.email-header-logo-td {
+  padding: 16px 0;
+  font-size: 0;
+
+  img {
+    color: #fff;
+    font-size: 16px;
+    font-weight: bold;
+    max-height: 40px;
+  }
+}
+
+.email-header-logo-a {
+  display: inline-block;
+
+  img {
+    display: inline-block;
+    color: #fff;
+  }
+}
+
+.email-header-logo-div {
+  max-height: 0;
+}
+
+.email-header-logo-p {
+  word-break: break-all;
+  padding-left: 40px;
+  padding-top: 26px;
+  font-size: 11px;
+  line-height: 13px;
+  color: #8d808f;
+  text-align: left;
+}
+
+.email-header-logo-span {
+  display: block;
+  text-align: right;
+}
+
+.email-header-heading-td {
+  padding: 16px 0;
+}
+
+.email-header-heading-img-td {
+  width: 56px;
+  text-align: left;
+  vertical-align: top;
+
+  img {
+    width: 56px;
+    height: 56px;
+    border-radius: 12px;
+  }
+}
+
+.email-header-heading-txt-td {
+  vertical-align: middle;
   padding-left: 16px;
   padding-right: 16px;
-}
-
-.content-cell {
-  background-color: darken($ui-base-color, 4%);
-
-  &.darker {
-    background-color: darken($ui-base-color, 8%);
-  }
-}
-
-.hero {
-  background-color: $ui-base-color;
-  padding-top: 20px;
-}
-
-.hero-with-button {
-  padding-bottom: 16px;
 
   h1 {
-    margin-bottom: 4px;
+    margin-bottom: 5px;
+    color: #fff;
+    font-size: 24px;
+    line-height: 28px;
+    font-weight: 600;
   }
 
-  p.lead {
-    margin-bottom: 32px;
+  p {
+    color: #a399a5;
+    font-size: 18px;
+    line-height: 21.6px;
+    font-weight: 500;
+  }
+
+  &:only-child {
+    padding-left: 0;
+    padding-right: 0;
   }
 }
 
-.header {
-  border-radius: 5px 5px 0 0;
-  background-color: darken($ui-base-color, 8%);
+.email-header-card-table {
+  width: 100%;
+  border-collapse: separate;
+  overflow: hidden;
+  border-radius: 12px;
+  background-color: #fff;
+  border: 2px solid #fff;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 8%);
+}
 
-  .column-cell {
-    text-align: center;
-    padding-top: 20px;
+.email-header-card {
+  position: relative;
+  max-height: 100px;
+}
+
+.email-header-card-banner-td {
+  border-radius: 12px 12px 0 0;
+  height: 80px;
+  background-color: #f3f2f5 !important;
+  background-position: center !important;
+  background-size: cover !important;
+}
+
+.email-header-card-body-td {
+  padding: 12px;
+
+  .email-btn-table {
+    width: 100%;
+    max-width: 212px;
+  }
+}
+
+.email-header-card-instance {
+  margin-bottom: 4px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  color: #17063b;
+  font-size: 14px;
+  line-height: 20px;
+  font-weight: 600;
+
+  &:only-of-type {
+    margin-bottom: 12px;
+  }
+}
+
+.email-header-card-description {
+  margin-bottom: 12px;
+  color: #746a89;
+  font-size: 12px;
+  line-height: 16px;
+  max-height: 32px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+// To make the design work with images off
+// we create an empty div that overlaps with
+// the rest of the content with a dark background.
+.email-header-after-div {
+  max-height: 0;
+}
+
+.email-header-after-inside-div {
+  height: 30px;
+  background-color: #1b001f;
+}
+
+// Body content
+.email-body-td {
+  background-image: url('../images/mailer-new/common/header-bg-end.png');
+  background-position: left top;
+  background-repeat: no-repeat;
+}
+
+.email-body-padding-td {
+  padding: 0 32px 32px;
+  mso-padding-alt: 32px;
+}
+
+.email-body-columns-td {
+  border-top: 1px solid #dfdee3;
+  padding: 32px 24px 8px;
+}
+
+.email-body-huge-padding-td {
+  padding: 110px 32px 32px;
+  mso-padding-alt: 32px;
+}
+
+.email-body-padding-td {
+  & > p {
+    font-size: 14px;
+    line-height: 20px;
+    color: #17063b;
+
+    a {
+      color: #6364ff;
+      text-decoration: none;
+
+      &:hover {
+        color: #563acc !important;
+      }
+    }
+  }
+}
+
+// Texts
+.email-h2 {
+  margin-bottom: 4px;
+  color: #17063b;
+  font-size: 18px;
+  font-weight: 600;
+  line-height: 28px;
+}
+
+.email-h-sub {
+  margin-bottom: 16px;
+  color: #746a89;
+  font-size: 14px;
+  line-height: 16px;
+}
+
+.email-p {
+  margin-bottom: 16px;
+  color: #746a89;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+}
+
+// Footer
+.email-footer-td {
+  padding: 28px 32px 32px;
+  text-align: center;
+}
+
+.email-footer-logo-a {
+  display: inline-block;
+}
+
+.email-footer-p {
+  color: #9b94ab;
+  text-align: center;
+  font-size: 12px;
+  line-height: 20px;
+
+  a {
+    color: #9b94ab;
+    text-decoration: underline;
+  }
+
+  &:first-child {
+    margin-bottom: 12px;
+  }
+}
+
+// Button
+.email-btn-table {
+  margin: 0;
+  max-width: 100%;
+  border-collapse: separate;
+  border-radius: 8px;
+  background-color: #6364ff;
+}
+
+.email-btn-td {
+  height: 40px;
+  text-align: center;
+  mso-padding-alt: 0 35px;
+}
+
+.email-btn-a {
+  display: block;
+  border-radius: 8px;
+  padding-left: 35px;
+  padding-right: 35px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  text-align: center;
+  font-family: Inter, 'Lucida Grande', sans-serif;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+  color: #fff;
+  text-decoration: none;
+  transition: background-color 0.3s ease-in-out;
+}
+
+// Status
+.email-status-header-img {
+  vertical-align: top;
+  width: 48px;
+
+  img {
+    width: 48px;
+    height: 48px;
+    border-radius: 8px;
+    overflow: hidden;
+  }
+}
+
+.email-status-header-text {
+  padding-left: 16px;
+  padding-right: 16px;
+  vertical-align: middle;
+}
+
+.email-status-header-name {
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  color: #17063b;
+}
+
+.email-status-header-handle {
+  font-size: 14px;
+  line-height: 20px;
+  color: #746a89;
+}
+
+.email-status-content {
+  padding-top: 24px;
+}
+
+.email-status-spoiler {
+  color: #746a89;
+  font-style: italic;
+  margin-bottom: 8px;
+}
+
+.email-status-prose {
+  p {
+    font-size: 14px;
+    line-height: 20px;
+    color: #17063b;
+  }
+
+  a {
+    color: #6364ff;
+    text-decoration: none;
+
+    &:hover {
+      color: #563acc !important;
+    }
+  }
+}
+
+.email-status-media {
+  margin-top: 16px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #17063b;
+
+  img {
+    border-radius: 8px;
+  }
+
+  a {
+    color: #6364ff;
+    text-decoration: none;
+
+    &:hover {
+      color: #563acc !important;
+    }
+  }
+}
+
+.email-status-footer {
+  margin-top: 16px;
+  font-size: 12px;
+  line-height: 16px;
+  color: #746a89;
+
+  a {
+    color: #746a89;
+  }
+
+  a:hover {
+    color: #746a89 !important;
+    text-decoration: underline !important;
+  }
+}
+
+// Purple frame for emphasis
+.email-frame-table {
+  background-color: #efefff;
+  border-radius: 8px;
+}
+
+.email-frame-td {
+  padding: 16px;
+}
+
+.email-frame-wrapper-td {
+  padding-bottom: 16px;
+}
+
+.email-frame-td > p {
+  text-align: center;
+  font-size: 16px;
+  line-height: 24px;
+}
+
+// Checklist item
+.email-checklist-wrapper-td {
+  padding: 4px 0;
+}
+
+.email-checklist-table {
+  border-radius: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #efefff;
+  background-color: #fff;
+}
+
+.email-checklist-checked {
+  border-color: #c4e6d7;
+  background-color: #eaf6f1;
+}
+
+.email-checklist-td {
+  padding: 16px 16px 6px;
+}
+
+.email-checklist-icons-td {
+  width: 84px;
+  vertical-align: top;
+}
+
+.email-checklist-icons-checkbox-td {
+  width: 20px;
+  vertical-align: middle;
+
+  img {
+    max-width: 100%;
+    width: 20px;
+  }
+}
+
+.email-checklist-icons-step-td {
+  width: 64px;
+  text-align: center;
+  vertical-align: middle;
+
+  img {
+    max-width: 100%;
+    width: 40px;
+  }
+}
+
+.email-checklist-text-td {
+  h3 {
+    margin: 0 0 4px;
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 16.8px;
+
+    .email-checklist-checked & {
+      color: #746a89;
+      text-decoration: line-through;
+    }
+  }
+
+  p {
+    margin: 0 0 12px;
+    color: #746a89;
+    font-size: 14px;
+    line-height: 16.8px;
+  }
+
+  .email-btn-table {
+    width: 100px;
+  }
+
+  .email-btn-td {
+    mso-padding-alt: 10px;
+  }
+
+  .email-btn-a {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+
+  div + div {
+    margin-inline-start: auto;
+    margin-bottom: 12px;
+  }
+}
+
+// Welcome email
+.email-welcome-apps-btns {
+  font-size: 12px;
+  line-height: 44px;
+}
+
+.email-column-td {
+  padding: 0 8px;
+  vertical-align: top;
+}
+
+.email-link-with-arrow {
+  color: #6364ff;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 16.8px;
+
+  &:hover {
+    color: #563acc !important;
+  }
+
+  span {
+    font-size: 12px;
+    font-weight: 400;
+  }
+}
+
+.email-column-action-td {
+  padding: 24px 0;
+  color: #6364ff;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 16.8px;
+  text-align: center;
+}
+
+// Follow and hashtags
+.email-mini-wrapper-td {
+  padding: 4px 0;
+
+  table {
+    table-layout: fixed;
+  }
+}
+
+.email-mini-td {
+  border-radius: 12px;
+  border: 1px solid #e8e6eb;
+  background-color: #fff;
+  padding: 15px 16px;
+}
+
+.email-mini-follow-img-td {
+  width: 40px;
+  vertical-align: top;
+
+  img {
+    border-radius: 8px;
+  }
+}
+
+.email-mini-follow-text-td {
+  padding-left: 8px;
+  padding-right: 16px;
+  vertical-align: top;
+
+  h3 {
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+  }
+
+  p {
+    color: #746a89;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px;
+  }
+}
+
+.email-mini-follow-btn-td {
+  width: 68px;
+  vertical-align: top;
+
+  .email-btn-table {
+    width: 100%;
+  }
+
+  .email-btn-td {
+    mso-padding-alt: 10px;
+  }
+
+  .email-btn-a {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+
+.email-mini-hashtag-td {
+  height: 40px;
+
+  td {
+    vertical-align: middle;
+  }
+
+  h3 {
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+  }
+
+  p {
+    color: #746a89;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px;
+    word-break: break-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+.email-mini-hashtag-img-td {
+  width: 40px;
+  height: 20px;
+  white-space: nowrap;
+  text-indent: -2px;
+  font-size: 0;
+
+  & + td {
+    padding-left: 8px;
+  }
+}
+
+.email-mini-hashtag-img-span {
+  display: inline-block;
+  max-width: 12px;
+  font-size: 12px;
+
+  img {
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    max-width: none;
+    border: 2px solid #fff;
+    vertical-align: middle;
+  }
+}
+
+// Extra content on light purple background
+.email-extra-wave {
+  height: 42px;
+  background-image: url('../images/mailer-new/welcome/purple-extra-soft-wave.png');
+  background-position: bottom center;
+  background-repeat: no-repeat;
+}
+
+.email-extra-td {
+  padding: 32px 32px 24px;
+  background-color: #f0f0ff;
+  background-image: url('../images/mailer-new/welcome/purple-extra-soft-spacer.png'); // Using an image to maintain the color even in forced dark modes
+
+  .email-column-td {
+    padding-top: 8px;
     padding-bottom: 8px;
   }
 }
 
-.content-start {
-  padding-top: 32px;
+// Feature card
+.email-feature-wrapper-td {
+  padding: 8px 0;
 }
 
-.content-end {
-  border-radius: 0 0 5px 5px;
-  padding-top: 16px;
+.email-feature-td {
+  padding: 24px;
+  background-color: #fff;
+  border: 1px solid #e8e6eb;
+  border-radius: 12px;
 }
 
-.footer {
-  .column-cell,
-  p {
-    color: lighten($ui-base-color, 34%);
+// Responsive
+/* stylelint-disable-next-line media-feature-range-notation -- Basic media queries have better support across email clients. */
+@media only screen and (min-width: 740px) {
+  .email-desktop-p-8 {
+    padding: 32px !important;
   }
 
-  p {
-    margin-bottom: 0;
-    font-size: 13px;
-
-    &.small {
-      margin-bottom: 0;
-    }
+  .email-desktop-rounded-16px {
+    border-radius: 16px !important;
   }
 
-  a {
-    color: lighten($ui-base-color, 34%);
-    text-decoration: underline;
+  .email-header-td {
+    border-radius: 16px 16px 0 0 !important;
   }
 
-  img {
-    opacity: 0.3;
-  }
-}
-
-.logo {
-  position: relative;
-  left: -4px;
-}
-
-.button {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-
-  td {
-    line-height: 20px;
-    mso-line-height-rule: exactly;
-    border-radius: 4px;
-    text-align: center;
-    font-weight: 500;
-    font-size: 17px;
-    padding: 0 !important;
-
-    a,
-    a span {
-      color: $primary-text-color;
-      display: block !important;
-      text-align: center !important;
-      vertical-align: top !important;
-      line-height: inherit !important;
-    }
-
-    a {
-      padding: 10px 22px !important;
-      line-height: 26px !important;
-      font-weight: 500 !important;
-    }
-  }
-
-  &.button-small {
-    td {
-      border-radius: 4px;
-      font-size: 14px;
-      padding: 8px 16px;
-
-      a {
-        padding: 5px 16px !important;
-        line-height: 26px !important;
-      }
-    }
-  }
-}
-
-.button-default {
-  background-color: darken($ui-base-color, 8%);
-}
-
-.button-primary {
-  background-color: darken($ui-highlight-color, 3%);
-}
-
-.text-center {
-  text-align: center;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.padded {
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.padded-bottom {
-  padding-bottom: 32px;
-}
-
-.margin-bottom {
-  margin-bottom: 20px;
-}
-
-.hero-icon {
-  width: 64px;
-
-  td {
-    text-align: center;
-    vertical-align: middle;
-    line-height: 100%;
-    mso-line-height-rule: exactly;
-    padding: 16px;
-    border-radius: 80px;
-    background: $success-green;
-  }
-
-  &.warning-icon td {
-    background: $gold-star;
-  }
-
-  &.alert-icon td {
-    background: $error-red;
-  }
-
-  img {
-    max-width: 32px;
-    width: 32px;
-    height: 32px;
-    display: block;
-    line-height: 100%;
-  }
-}
-
-.hr {
-  width: 100%;
-
-  td {
-    font-size: 0;
-    line-height: 1px;
-    mso-line-height-rule: exactly;
-    min-height: 1px;
-    overflow: hidden;
-    height: 2px;
-    background-color: transparent !important;
-    border-top: 1px solid lighten($ui-base-color, 8%);
-  }
-}
-
-.status {
-  padding-bottom: 32px;
-
-  &--highlighted {
-    border: 1px solid lighten($ui-base-color, 8%);
-    border-radius: 4px;
-    padding-bottom: 16px;
-    margin-bottom: 16px;
-  }
-
-  .status-header {
-    td {
-      font-size: 14px;
-      padding-bottom: 15px;
-    }
-
-    bdi {
-      color: $white;
-      font-size: 16px;
-      display: block;
-      font-weight: 500;
-    }
-
-    td:first-child {
-      padding-right: 10px;
-    }
-
-    img {
-      width: 48px;
-      height: 48px;
-      border-radius: 4px;
-    }
-  }
-
-  p {
-    font-size: 19px;
-    margin-bottom: 20px;
-
-    &.status-footer {
-      color: lighten($ui-base-color, 26%);
-      font-size: 14px;
-      margin-bottom: 0;
-
-      a {
-        color: lighten($ui-base-color, 26%);
-      }
-    }
-  }
-}
-
-.border-top {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-}
-
-ul {
-  padding-left: 15px;
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 16px;
-
-  li {
-    margin-bottom: 16px;
-    color: lighten($ui-base-color, 26%);
-
-    span {
-      color: $ui-primary-color;
-    }
-  }
-}
-
-ul.rules-list {
-  padding-top: 0;
-}
-
-@media only screen and (device-width >= 768px) and (device-width <= 1024px) and (orientation: landscape) {
-  body {
-    min-height: 1024px !important;
-  }
-}
-
-@media (width <= 697px) {
-  .email-container,
-  .col-1,
-  .col-2,
-  .col-3,
-  .col-4,
-  .col-5,
-  .col-6 {
-    width: 100% !important;
-    max-width: none !important;
-  }
-
-  .email-start {
-    padding-top: 16px !important;
-  }
-
-  .email-end {
-    padding-bottom: 16px !important;
-  }
-
-  .padded {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
+  .email-desktop-flex {
+    display: flex;
+  }
+
+  .email-header-left {
+    padding-right: 32px;
+  }
+
+  .email-header-right {
+    width: 240px;
+    margin-inline-start: auto;
+  }
+
+  .email-desktop-column {
+    max-width: 346px !important;
+  }
+
+  .email-desktop-text-right {
+    text-align: right;
   }
 }
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3a27c974ad..07e9d9868b 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -21,25 +21,6 @@ html {
 }
 
 // Change default background colors of columns
-.column > .scrollable,
-.getting-started,
-.column-inline-form,
-.regeneration-indicator {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.error-column {
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column > .scrollable.about {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-}
-
-.about__meta,
-.about__section__title,
 .interaction-modal {
   background: $white;
   border: 1px solid lighten($ui-base-color, 8%);
@@ -53,37 +34,10 @@ html {
   background: lighten($ui-base-color, 12%);
 }
 
-.filter-form {
-  background: $white;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.column-back-button,
-.column-header {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    border-top: 0;
-  }
-
-  &--slim-button {
-    top: -50px;
-    right: 0;
-  }
-}
-
-.column-header__back-button,
-.column-header__button,
-.column-header__button.active,
 .account__header {
   background: $white;
 }
 
-.column-header {
-  border-bottom: 0;
-}
-
 .column-header__button.active {
   color: $ui-highlight-color;
 
@@ -91,7 +45,6 @@ html {
   &:active,
   &:focus {
     color: $ui-highlight-color;
-    background: $white;
   }
 }
 
@@ -117,25 +70,6 @@ html {
   }
 }
 
-.column-subheading {
-  background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-}
-
-.getting-started,
-.scrollable {
-  .column-link {
-    background: $white;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: $ui-base-color;
-    }
-  }
-}
-
 .getting-started .navigation-bar {
   border-top: 1px solid lighten($ui-base-color, 8%);
   border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -145,11 +79,8 @@ html {
   }
 }
 
-.compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
-.compose-form .spoiler-input__input,
-.compose-form__poll-wrapper select,
 .search__input,
+.search__popout,
 .setting-text,
 .report-dialog-modal__textarea,
 .audio-player {
@@ -172,86 +103,6 @@ html {
   border-bottom: 0;
 }
 
-.compose-form__poll-wrapper select {
-  background: $simple-background-color
-    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
-    no-repeat right 8px center / auto 16px;
-}
-
-.compose-form__poll-wrapper,
-.compose-form__poll-wrapper .poll__footer {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
-.notification__filter-bar {
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.compose-form .compose-form__buttons-wrapper {
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
-.drawer__header,
-.drawer__inner {
-  background: $white;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
-.drawer__inner__mastodon {
-  background: $white
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
-    no-repeat bottom / 100% auto;
-}
-
-// Change the colors used in compose-form
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload__actions .icon-button,
-    .compose-form__upload__warning .icon-button {
-      color: lighten($white, 7%);
-
-      &:active,
-      &:focus,
-      &:hover {
-        color: $white;
-      }
-    }
-  }
-
-  .compose-form__buttons-wrapper {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: lighten($ui-base-color, 4%);
-    }
-  }
-}
-
-.emoji-mart-bar {
-  border-color: lighten($ui-base-color, 4%);
-
-  &:first-child {
-    background: darken($ui-base-color, 6%);
-  }
-}
-
-.emoji-mart-search input {
-  background: rgba($ui-base-color, 0.3);
-  border-color: $ui-base-color;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -261,11 +112,6 @@ html {
   background: lighten($white, 4%);
 }
 
-.detailed-status,
-.detailed-status__action-bar {
-  background: $white;
-}
-
 // Change the background colors of status__content__spoiler-link
 .reply-indicator__content .status__content__spoiler-link,
 .status__content .status__content__spoiler-link {
@@ -277,52 +123,11 @@ html {
   }
 }
 
-// Change the background colors of media and video spoilers
-.media-spoiler,
-.video-player__spoiler {
-  background: $ui-base-color;
-}
-
-.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
-  color: $white;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }
 
-// Change the colors used in the dropdown menu
-.dropdown-menu {
-  background: $white;
-
-  &__arrow::before {
-    background-color: $white;
-  }
-
-  &__item {
-    color: $darker-text-color;
-
-    &--dangerous {
-      color: $error-value-color;
-    }
-
-    a,
-    button {
-      background: $white;
-    }
-  }
-}
-
 // Change the text colors on inverted background
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:hover,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
 .actions-modal ul li:not(:empty) a.active,
 .actions-modal ul li:not(:empty) a.active button,
 .actions-modal ul li:not(:empty) a:active,
@@ -331,7 +136,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.language-dropdown__dropdown__results__item.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
@@ -339,19 +143,6 @@ html {
   color: $white;
 }
 
-.language-dropdown__dropdown__results__item
-  .language-dropdown__dropdown__results__item__common-name {
-  color: lighten($ui-base-color, 8%);
-}
-
-.language-dropdown__dropdown__results__item.active
-  .language-dropdown__dropdown__results__item__common-name {
-  color: darken($ui-base-color, 12%);
-}
-
-.dropdown-menu__separator,
-.dropdown-menu__item.edited-timestamp__history__item,
-.dropdown-menu__container__header,
 .compare-history-modal .report-modal__target,
 .report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
@@ -385,10 +176,7 @@ html {
 
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
-.reactions-bar__item:active,
-.language-dropdown__dropdown__results__item:hover,
-.language-dropdown__dropdown__results__item:focus,
-.language-dropdown__dropdown__results__item:active {
+.reactions-bar__item:active {
   background-color: $ui-base-color;
 }
 
@@ -476,11 +264,11 @@ html {
 }
 
 .react-toggle-track {
-  background: $ui-secondary-color;
+  background: $ui-primary-color;
 }
 
 .react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
-  background: darken($ui-secondary-color, 10%);
+  background: lighten($ui-primary-color, 10%);
 }
 
 .react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
@@ -631,11 +419,6 @@ html {
   }
 }
 
-.reply-indicator {
-  background: transparent;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
 .status__content,
 .reply-indicator__content {
   a {
@@ -657,7 +440,8 @@ html {
 .directory__tag > div,
 .card > a,
 .page-header,
-.compose-form .compose-form__warning {
+.compose-form,
+.compose-form__warning {
   box-shadow: none;
 }
 
@@ -675,3 +459,47 @@ html {
     background-color: rgba($ui-highlight-color, 0.15);
   }
 }
+
+.compose-form__actions .icon-button.active,
+.dropdown-button.active,
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:focus,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item.active,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.language-dropdown__dropdown__results__item:focus
+  .language-dropdown__dropdown__results__item__common-name,
+.language-dropdown__dropdown__results__item.active
+  .language-dropdown__dropdown__results__item__common-name {
+  color: $white;
+}
+
+.compose-form .spoiler-input__input {
+  color: lighten($ui-highlight-color, 8%);
+}
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form__highlightable,
+.search__input,
+.search__popout,
+.emoji-mart-search input,
+.language-dropdown__dropdown .emoji-mart-search input,
+.poll__option input[type='text'] {
+  background: darken($ui-base-color, 10%);
+}
+
+.inline-follow-suggestions {
+  background-color: rgba($ui-highlight-color, 0.1);
+  border-bottom-color: rgba($ui-highlight-color, 0.3);
+}
+
+.inline-follow-suggestions__body__scrollable__card {
+  background: $white;
+}
+
+.inline-follow-suggestions__body__scroll-button__icon {
+  color: $white;
+}
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index ac8a831215..e0437c9523 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -5,7 +5,7 @@ $white: #ffffff;
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #858afa;
+$classic-highlight-color: #6364ff;
 
 $blurple-600: #563acc; // Iris
 $blurple-500: #6364ff; // Brand purple
@@ -13,6 +13,9 @@ $blurple-300: #858afa; // Faded Blue
 $grey-600: #4e4c5a; // Trout
 $grey-100: #dadaf3; // Topaz
 
+$emoji-reaction-color: #dfe5f5 !default;
+$emoji-reaction-selected-color: #9ac1f2 !default;
+
 // Differences
 $success-green: lighten(#3c754d, 8%);
 
@@ -34,7 +37,7 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
+$highlight-text-color: $ui-highlight-color !default;
 $dark-text-color: #444b5d;
 $action-button-color: #606984;
 
@@ -55,3 +58,12 @@ $account-background-color: $white !default;
 }
 
 $emojis-requiring-inversion: 'chains';
+
+.theme-mastodon-light {
+  --dropdown-border-color: #d9e1e8;
+  --dropdown-background-color: #fff;
+  --background-border-color: #d9e1e8;
+  --background-color: #fff;
+  --background-color-tint: rgba(255, 255, 255, 90%);
+  --background-filter: blur(10px);
+}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index dcfab6bd01..d7f8586dd2 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -15,13 +15,14 @@
   outline: 0;
   box-sizing: border-box;
   width: 100%;
-  border: 0;
   box-shadow: none;
   font-family: inherit;
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  font-size: 17px;
+  line-height: normal;
   margin: 0;
 }
 
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 0f02563b48..42f1fda0f9 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -26,7 +26,7 @@ $fluid-breakpoint: $maximum-width + 20px;
 
   li {
     position: relative;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     padding: 1em 1.75em;
     padding-inline-start: 3em;
     font-weight: 500;
@@ -53,4 +53,24 @@ $fluid-breakpoint: $maximum-width + 20px;
       border-bottom: 0;
     }
   }
+
+  &__hint {
+    font-size: 14px;
+    font-weight: 400;
+    color: $darker-text-color;
+  }
+
+  .capability-icon {
+    svg {
+      transform: translateY(4px);
+    }
+
+    &.enabled {
+      color: green;
+    }
+
+    &.disabled {
+      color: red;
+    }
+  }
 }
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 80d6c13cef..0ed434939f 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -190,7 +190,8 @@
 .information-badge,
 .simple_form .overridden,
 .simple_form .recommended,
-.simple_form .not_recommended {
+.simple_form .not_recommended,
+.simple_form .kmyblue {
   display: inline-block;
   padding: 4px 6px;
   cursor: default;
@@ -254,6 +255,12 @@
   border-color: rgba(lighten($error-red, 12%), 0.5);
 }
 
+.simple_form .kmyblue {
+  color: lighten($kmyblue, 12%);
+  background-color: rgba(lighten($kmyblue, 12%), 0.1);
+  border-color: rgba(lighten($kmyblue, 12%), 0.5);
+}
+
 .account__header__fields {
   max-width: 100vw;
   padding: 0;
@@ -400,3 +407,14 @@
     color: $gold-star;
   }
 }
+
+.batch-table__row--attention .media-attachments-table {
+  .image {
+    max-width: 80%;
+    max-height: 200px;
+  }
+
+  .detailed-status__meta {
+    margin-top: 8px;
+  }
+}
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index a65f35e7b1..ddb601c399 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -10,6 +10,13 @@ $content-width: 840px;
   width: 100%;
   min-height: 100vh;
 
+  .icon {
+    width: 16px;
+    height: 16px;
+    vertical-align: middle;
+    margin: 0 2px;
+  }
+
   .sidebar-wrapper {
     min-height: 100vh;
     overflow: hidden;
@@ -324,6 +331,23 @@ $content-width: 840px;
       padding-bottom: 0;
       margin-bottom: 0;
       border-bottom: 0;
+
+      .comment {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-top: 4px;
+
+        &.private-comment {
+          display: block;
+          color: $darker-text-color;
+        }
+
+        &.public-comment {
+          display: block;
+          color: $secondary-text-color;
+        }
+      }
     }
 
     & > p {
@@ -622,16 +646,6 @@ body,
   input.button {
     margin: 0 5px 5px 0;
   }
-
-  .media-spoiler-toggle-buttons {
-    margin-inline-start: auto;
-
-    .button {
-      overflow: visible;
-      margin: 0 0 5px 5px;
-      float: right;
-    }
-  }
 }
 
 .back-link {
@@ -1054,6 +1068,7 @@ a.name-tag,
     display: flex;
     justify-content: space-between;
     margin-bottom: 0;
+    word-break: break-word;
   }
 
   &__permissions {
@@ -1061,6 +1076,13 @@ a.name-tag,
     margin-bottom: 10px;
   }
 
+  .listname {
+    color: $dark-text-color;
+    font-weight: bold;
+    font-size: 14px;
+    margin-left: 16px;
+  }
+
   .expiration {
     font-size: 13px;
   }
@@ -1314,6 +1336,9 @@ a.sparkline {
 
     &__label {
       padding: 15px;
+      display: flex;
+      gap: 8px;
+      align-items: center;
     }
 
     &__rules {
@@ -1324,6 +1349,9 @@ a.sparkline {
   &__rule {
     cursor: pointer;
     padding: 15px;
+    display: flex;
+    gap: 8px;
+    align-items: center;
   }
 }
 
@@ -1364,8 +1392,21 @@ a.sparkline {
 }
 
 .account-card {
-  background: $ui-base-color;
   border-radius: 4px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  position: relative;
+
+  &__warning-badge {
+    position: absolute;
+    padding: 4px 10px;
+    top: 10px;
+    inset-inline-start: 10px;
+    border-radius: 4px;
+    background:
+      url('../images/warning-stripes.svg') repeat-y left,
+      url('../images/warning-stripes.svg') repeat-y right,
+      var(--background-color);
+  }
 
   &__permalink {
     color: inherit;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 6714b24268..2e7d5e5e9c 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 7%);
+  background: var(--background-color);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 7f0f15f113..f32eaaf6d6 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -106,17 +106,17 @@
   }
 
   &.button-secondary {
-    color: $ui-button-secondary-color;
+    color: $highlight-text-color;
     background: transparent;
     padding: 6px 17px;
-    border: 1px solid $ui-button-secondary-border-color;
+    border: 1px solid $highlight-text-color;
 
     &:active,
     &:focus,
     &:hover {
-      border-color: $ui-button-secondary-focus-background-color;
-      color: $ui-button-secondary-focus-color;
-      background-color: $ui-button-secondary-focus-background-color;
+      border-color: lighten($highlight-text-color, 4%);
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
       text-decoration: none;
     }
 
@@ -368,46 +368,155 @@ body > [data-popper-placement] {
   }
 }
 
-.compose-form {
-  padding: 15px;
+.autosuggest-textarea {
+  &__textarea {
+    background: transparent;
+    min-height: 100px;
+    padding-bottom: 0;
+    resize: none;
+    scrollbar-color: initial;
 
-  &__sensitive-button {
-    padding: 10px;
-    padding-top: 0;
-    font-size: 14px;
-    font-weight: 500;
-
-    &.active {
-      color: $highlight-text-color;
-    }
-
-    input[type='checkbox'] {
-      appearance: none;
-      display: inline-block;
-      position: relative;
-      border: 1px solid $ui-primary-color;
-      box-sizing: border-box;
-      width: 18px;
-      height: 18px;
-      flex: 0 0 auto;
-      margin-inline-end: 10px;
-      top: -1px;
-      border-radius: 4px;
-      vertical-align: middle;
-      cursor: inherit;
-
-      &:checked {
-        border-color: $highlight-text-color;
-        background: $highlight-text-color
-          url("data:image/svg+xml;utf8,<svg width='18' height='18' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M4.5 8.5L8 12l6-6' stroke='white' stroke-width='1.5'/></svg>")
-          center center no-repeat;
-      }
+    &::-webkit-scrollbar {
+      all: unset;
     }
   }
 
-  .compose-form__warning {
+  &__suggestions {
+    box-shadow: var(--dropdown-shadow);
+    background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 14%);
+    border-radius: 0 0 4px 4px;
+    color: $secondary-text-color;
+    font-size: 14px;
+    padding: 0;
+
+    &__item {
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      height: 48px;
+      cursor: pointer;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: $secondary-text-color;
+
+      &:last-child {
+        border-radius: 0 0 4px 4px;
+      }
+
+      &:hover,
+      &:focus,
+      &:active,
+      &.selected {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
+      }
+    }
+  }
+}
+
+.autosuggest-account,
+.autosuggest-emoji,
+.autosuggest-hashtag {
+  flex: 1 0 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  padding: 8px 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.autosuggest-account {
+  .display-name {
+    font-weight: 400;
+    display: flex;
+    flex-direction: column;
+    flex: 1 0 0;
+  }
+
+  .display-name__account {
+    display: block;
+    line-height: 16px;
+    font-size: 12px;
+    color: $dark-text-color;
+  }
+}
+
+.autosuggest-hashtag {
+  justify-content: space-between;
+
+  &__name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__uses {
+    flex: 0 0 auto;
+    text-align: end;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-emoji {
+  &__name {
+    flex: 1 0 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-account .account__avatar,
+.autosuggest-emoji img {
+  display: block;
+  width: 24px;
+  height: 24px;
+  flex: 0 0 auto;
+}
+
+.compose-form {
+  display: flex;
+  flex-direction: column;
+  gap: 32px;
+
+  .layout-multiple-columns &,
+  .column & {
+    padding: 15px;
+  }
+
+  &__highlightable {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    flex: 0 1 auto;
+    border-radius: 4px;
+    border: 1px solid lighten($ui-base-color, 8%);
+    transition: border-color 300ms linear;
+    min-height: 0;
+    position: relative;
+    background: $ui-base-color;
+    overflow-y: auto;
+
+    &.active {
+      transition: none;
+      border-color: $ui-highlight-color;
+    }
+  }
+
+  &__warning {
     color: $inverted-text-color;
-    margin-bottom: 10px;
     background: $ui-primary-color;
     box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
     padding: 8px 10px;
@@ -439,32 +548,31 @@ body > [data-popper-placement] {
     }
   }
 
-  .emoji-picker-dropdown {
-    position: absolute;
-    top: 0;
-    inset-inline-end: 0;
-  }
-
   .compose-form__autosuggest-wrapper {
     position: relative;
   }
 
-  .autosuggest-textarea,
-  .autosuggest-input,
   .spoiler-input {
-    position: relative;
-    width: 100%;
-  }
+    display: flex;
+    align-items: stretch;
 
-  .spoiler-input {
-    height: 0;
-    transform-origin: bottom;
-    opacity: 0;
+    &__border {
+      background: url('../images/warning-stripes.svg') repeat-y;
+      width: 5px;
+      flex: 0 0 auto;
 
-    &.spoiler-input--visible {
-      height: 36px;
-      margin-bottom: 11px;
-      opacity: 1;
+      &:first-child {
+        border-start-start-radius: 4px;
+      }
+
+      &:last-child {
+        border-start-end-radius: 4px;
+      }
+    }
+
+    .autosuggest-input {
+      flex: 1 1 auto;
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
     }
   }
 
@@ -474,269 +582,311 @@ body > [data-popper-placement] {
     box-sizing: border-box;
     width: 100%;
     margin: 0;
-    color: $inverted-text-color;
-    background: $simple-background-color;
-    padding: 10px;
+    color: $secondary-text-color;
+    background: $ui-base-color;
     font-family: inherit;
     font-size: 14px;
-    resize: vertical;
+    padding: 12px;
+    line-height: normal;
     border: 0;
     outline: 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
-
-    @media screen and (width <= 600px) {
-      font-size: 16px;
-    }
   }
 
   .spoiler-input__input {
-    border-radius: 4px;
+    padding: 12px 12px - 5px;
+    background: mix($ui-base-color, $ui-highlight-color, 85%);
+    color: $highlight-text-color;
   }
 
-  .autosuggest-textarea__textarea {
-    min-height: 100px;
-    border-radius: 4px 4px 0 0;
-    padding-bottom: 0;
-    padding-right: 10px + 22px; // Cannot use inline-end because of dir=auto
-    resize: none;
-    scrollbar-color: initial;
-
-    &::-webkit-scrollbar {
-      all: unset;
-    }
-
-    @media screen and (width <= 600px) {
-      height: 100px !important; // Prevent auto-resize textarea
-      resize: vertical;
-    }
-  }
-
-  .autosuggest-textarea__suggestions-wrapper {
-    position: relative;
-    height: 0;
-  }
-
-  .autosuggest-textarea__suggestions {
-    box-sizing: border-box;
-    display: none;
-    position: absolute;
-    top: 100%;
-    width: 100%;
-    z-index: 99;
-    box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
-    background: $ui-secondary-color;
-    border-radius: 0 0 4px 4px;
-    color: $inverted-text-color;
-    font-size: 14px;
-    padding: 6px;
-
-    &.autosuggest-textarea__suggestions--visible {
-      display: block;
-    }
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    padding: 10px;
-    cursor: pointer;
-    border-radius: 4px;
-
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: darken($ui-secondary-color, 10%);
-    }
-  }
-
-  .autosuggest-account,
-  .autosuggest-emoji,
-  .autosuggest-hashtag {
+  &__dropdowns {
     display: flex;
-    flex-direction: row;
     align-items: center;
-    justify-content: flex-start;
-    line-height: 18px;
-    font-size: 14px;
-  }
+    gap: 8px;
 
-  .autosuggest-hashtag {
-    justify-content: space-between;
+    &__second {
+      margin-top: -8px;
+    }
 
-    &__name {
-      flex: 1 1 auto;
+    & > div {
       overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    strong {
-      font-weight: 500;
-    }
-
-    &__uses {
-      flex: 0 0 auto;
-      text-align: end;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .autosuggest-account-icon,
-  .autosuggest-emoji img {
-    display: block;
-    margin-inline-end: 8px;
-    width: 16px;
-    height: 16px;
-  }
-
-  .autosuggest-account .display-name__account {
-    color: $lighter-text-color;
-  }
-
-  .compose-form__modifiers {
-    color: $inverted-text-color;
-    font-family: inherit;
-    font-size: 14px;
-    background: $simple-background-color;
-
-    .compose-form__upload-wrapper {
-      overflow: hidden;
-    }
-
-    .compose-form__uploads-wrapper {
       display: flex;
-      flex-direction: row;
-      padding: 5px;
-      flex-wrap: wrap;
+    }
+  }
+
+  &__uploads {
+    display: flex;
+    gap: 8px;
+    padding: 0 12px;
+    flex-wrap: wrap;
+    align-self: stretch;
+    align-items: flex-start;
+    align-content: flex-start;
+    justify-content: center;
+  }
+
+  &__upload {
+    flex: 1 1 0;
+    min-width: calc(50% - 8px);
+
+    &__actions {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      padding: 8px;
     }
 
-    .compose-form__upload {
-      flex: 1 1 0;
-      min-width: 40%;
-      margin: 5px;
-
-      &__actions {
-        background: linear-gradient(
-          180deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-      }
-
-      .icon-button {
-        flex: 0 1 auto;
-        color: $secondary-text-color;
-        font-size: 14px;
-        font-weight: 500;
-        padding: 10px;
-        font-family: inherit;
-
-        .icon {
-          width: 15px;
-          height: 15px;
-        }
-
-        &:hover,
-        &:focus,
-        &:active {
-          color: lighten($secondary-text-color, 7%);
-        }
-      }
-
-      &__warning {
-        position: absolute;
-        z-index: 2;
-        bottom: 0;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        box-sizing: border-box;
-        background: linear-gradient(
-          0deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-      }
+    &__preview {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 6px;
+      z-index: -1;
+      top: 0;
+      inset-inline-start: 0;
     }
 
-    .compose-form__upload-thumbnail {
-      border-radius: 4px;
-      background-color: $base-shadow-color;
+    &__thumbnail {
+      width: 100%;
+      height: 144px;
+      border-radius: 6px;
       background-position: center;
       background-size: cover;
       background-repeat: no-repeat;
-      height: 140px;
-      width: 100%;
       overflow: hidden;
     }
+
+    .icon-button {
+      flex: 0 0 auto;
+      color: $white;
+      background: rgba(0, 0, 0, 75%);
+      border-radius: 6px;
+      font-size: 12px;
+      line-height: 16px;
+      font-weight: 500;
+      padding: 4px 8px;
+      font-family: inherit;
+
+      .icon {
+        width: 15px;
+        height: 15px;
+      }
+    }
+
+    .icon-button.compose-form__upload__delete {
+      padding: 2px;
+      border-radius: 50%;
+
+      .icon {
+        width: 20px;
+        height: 20px;
+      }
+    }
+
+    &__warning {
+      position: absolute;
+      z-index: 2;
+      bottom: 0;
+      inset-inline-start: 0;
+      inset-inline-end: 0;
+      padding: 8px;
+
+      .icon-button.active {
+        color: #ffbe2e;
+        background: rgba(0, 0, 0, 75%);
+      }
+    }
   }
 
-  .compose-form__buttons-wrapper {
-    padding: 10px;
-    background: darken($simple-background-color, 8%);
-    border-radius: 0 0 4px 4px;
+  &__footer {
     display: flex;
-    justify-content: space-between;
-    flex: 0 0 auto;
+    flex-direction: column;
+    gap: 12px;
+    padding: 12px;
+    padding-top: 0;
+  }
 
-    .compose-form__buttons {
+  &__submit {
+    display: flex;
+    align-items: center;
+    flex: 1 1 auto;
+    max-width: 100%;
+    overflow: hidden;
+  }
+
+  &__buttons {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    flex: 1 1 auto;
+
+    & > div {
       display: flex;
-      gap: 2px;
 
-      .icon-button {
-        height: 100%;
-      }
-
-      .compose-form__upload-button-icon {
-        line-height: 27px;
-      }
-
-      .compose-form__sensitive-button {
-        display: none;
-
-        &.compose-form__sensitive-button--visible {
-          display: block;
-        }
-
-        .compose-form__sensitive-button__icon {
-          line-height: 27px;
-        }
+      .searchability .icon-button {
+        height: 27px;
       }
     }
 
-    .icon-button,
-    .text-icon-button {
-      box-sizing: content-box;
-      padding: 0 3px;
+    .icon-button {
+      padding: 2px;
     }
 
-    .character-counter__wrapper {
-      align-self: center;
-      margin-inline-end: 4px;
+    .icon-button .icon {
+      width: 20px;
+      height: 20px;
     }
   }
 
-  .compose-form__publish {
+  &__actions {
     display: flex;
-    justify-content: flex-end;
-    min-width: 0;
+    align-items: center;
     flex: 0 0 auto;
+    gap: 12px;
+    flex-wrap: wrap;
 
-    .compose-form__publish-button-wrapper {
-      padding-top: 15px;
+    .button {
+      display: block; // Otherwise text-ellipsis doesn't work
+      font-size: 14px;
+      line-height: normal;
+      font-weight: 700;
+      flex: 1 1 auto;
+      padding: 5px 12px;
+      border-radius: 4px;
     }
+
+    .icon-button {
+      box-sizing: content-box;
+      color: $highlight-text-color;
+
+      &:hover,
+      &:focus,
+      &:active {
+        color: $highlight-text-color;
+      }
+
+      &.disabled {
+        color: $highlight-text-color;
+        opacity: 0.5;
+      }
+
+      &.active {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+      }
+    }
+  }
+
+  &__poll {
+    display: flex;
+    flex-direction: column;
+    align-self: stretch;
+    gap: 8px;
+
+    .poll__option {
+      padding: 0 12px;
+      gap: 8px;
+
+      &.empty:not(:focus-within) {
+        opacity: 0.5;
+      }
+    }
+
+    .poll__input {
+      width: 17px;
+      height: 17px;
+      border-color: $darker-text-color;
+    }
+
+    &__footer {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      padding-inline-start: 37px;
+      padding-inline-end: 40px;
+
+      &__sep {
+        width: 1px;
+        height: 22px;
+        background: lighten($ui-base-color, 8%);
+        flex: 0 0 auto;
+      }
+    }
+
+    &__select {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+      flex: 1 1 auto;
+      min-width: 0;
+
+      &__label {
+        flex: 0 0 auto;
+        font-size: 11px;
+        font-weight: 500;
+        line-height: 16px;
+        letter-spacing: 0.5px;
+        color: $darker-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      &__value {
+        flex: 0 0 auto;
+        appearance: none;
+        background: transparent;
+        border: none;
+        padding: 0;
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 20px;
+        letter-spacing: 0.1px;
+        color: $highlight-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+  }
+}
+
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  background: transparent;
+  color: $highlight-text-color;
+  border-radius: 6px;
+  border: 1px solid $highlight-text-color;
+  padding: 4px 8px;
+  font-size: 13px;
+  line-height: normal;
+  font-weight: 400;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  .icon {
+    width: 15px;
+    height: 15px;
+    flex: 0 0 auto;
+  }
+
+  &__label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 auto;
+  }
+
+  &.active {
+    background: $ui-highlight-color;
+    border-color: $ui-highlight-color;
+    color: $primary-text-color;
   }
 }
 
@@ -744,11 +894,14 @@ body > [data-popper-placement] {
   cursor: default;
   font-family: $font-sans-serif, sans-serif;
   font-size: 14px;
-  font-weight: 600;
-  color: $lighter-text-color;
+  font-weight: 400;
+  line-height: normal;
+  color: $darker-text-color;
+  flex: 1 0 auto;
+  text-align: end;
 
   &.character-counter--over {
-    color: $warning-red;
+    color: $error-red;
   }
 }
 
@@ -786,49 +939,15 @@ body > [data-popper-placement] {
   vertical-align: middle;
   object-fit: contain;
   margin: -0.2ex 0.15em 0.2ex;
-  width: 16px;
-  height: 16px;
+  min-width: 20px;
+  max-width: min(10em, 100%);
+  height: 20px;
 
   img {
     width: auto;
   }
 }
 
-.reply-indicator {
-  border-radius: 4px;
-  margin-bottom: 10px;
-  background: $ui-primary-color;
-  padding: 10px;
-  min-height: 23px;
-  overflow-y: auto;
-  flex: 0 2 auto;
-}
-
-.reply-indicator__header {
-  margin-bottom: 5px;
-  overflow: hidden;
-}
-
-.reply-indicator__cancel {
-  float: right;
-  line-height: 24px;
-}
-
-.reply-indicator__display-name {
-  color: $inverted-text-color;
-  display: block;
-  max-width: 100%;
-  line-height: 24px;
-  overflow: hidden;
-  padding-inline-end: 25px;
-  text-decoration: none;
-}
-
-.reply-indicator__display-avatar {
-  float: left;
-  margin-inline-end: 5px;
-}
-
 .status__content--with-action {
   cursor: pointer;
 }
@@ -838,14 +957,15 @@ body > [data-popper-placement] {
 }
 
 .status__content,
+.edit-indicator__content,
 .reply-indicator__content {
   position: relative;
-  font-size: 15px;
-  line-height: 22px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 15px;
+  line-height: 22px;
   padding-top: 2px;
   color: $primary-text-color;
 
@@ -862,7 +982,8 @@ body > [data-popper-placement] {
   }
 
   .emojione {
-    width: 20px;
+    min-width: 20px;
+    max-width: min(10em, 100%);
     height: 20px;
     margin: -3px 0 0;
   }
@@ -930,12 +1051,181 @@ body > [data-popper-placement] {
   }
 }
 
+.reply-indicator {
+  display: grid;
+  grid-template-columns: 46px minmax(0, 1fr);
+  grid-template-rows: 46px max-content;
+  gap: 0 10px;
+
+  .detailed-status__display-name {
+    margin-bottom: 4px;
+  }
+
+  .detailed-status__display-avatar {
+    grid-column-start: 1;
+    grid-row-start: 1;
+    grid-row-end: span 1;
+  }
+
+  &__main {
+    grid-column-start: 2;
+    grid-row-start: 1;
+    grid-row-end: span 2;
+  }
+
+  .display-name {
+    font-size: 14px;
+    line-height: 16px;
+
+    &__account {
+      display: none;
+    }
+  }
+
+  &__line {
+    grid-column-start: 1;
+    grid-row-start: 2;
+    grid-row-end: span 1;
+    position: relative;
+
+    &::before {
+      display: block;
+      content: '';
+      position: absolute;
+      inset-inline-start: 50%;
+      top: 4px;
+      transform: translateX(-50%);
+      background: lighten($ui-base-color, 8%);
+      width: 2px;
+      height: calc(100% + 32px - 8px); // Account for gap to next element
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    padding: 0;
+    max-height: 4 * 20px;
+    overflow: hidden;
+    color: $darker-text-color;
+  }
+
+  &__attachments {
+    margin-top: 4px;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator {
+  border-radius: 4px 4px 0 0;
+  background: lighten($ui-base-color, 4%);
+  padding: 12px;
+  overflow-y: auto;
+  flex: 0 0 auto;
+  border-bottom: 0.5px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &__cancel {
+    display: flex;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &__display-name {
+    display: flex;
+    gap: 4px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__content {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    padding-top: 0 !important;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    max-height: 4 * 20px;
+    overflow: hidden;
+
+    a {
+      color: $highlight-text-color;
+    }
+  }
+
+  &__attachments {
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    opacity: 0.75;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator__content,
+.reply-indicator__content {
+  .emojione {
+    width: 18px;
+    height: 18px;
+    margin: -3px 0 0;
+  }
+}
+
 .announcements__item__content {
   word-wrap: break-word;
   overflow-y: auto;
 
   .emojione {
-    width: 20px;
+    min-width: 20px;
+    max-width: min(10em, 100%);
     height: 20px;
     margin: -3px 0 0;
   }
@@ -1036,7 +1326,7 @@ body > [data-popper-placement] {
   box-sizing: border-box;
   width: 100%;
   clear: both;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &__button {
     display: inline;
@@ -1057,19 +1347,14 @@ body > [data-popper-placement] {
 .focusable {
   &:focus {
     outline: 0;
-    background: lighten($ui-base-color, 4%);
-
-    .detailed-status,
-    .detailed-status__action-bar {
-      background: lighten($ui-base-color, 8%);
-    }
+    background: rgba($ui-highlight-color, 0.05);
   }
 }
 
 .status {
   padding: 16px;
   min-height: 54px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
 
   @keyframes fade {
@@ -1136,6 +1421,7 @@ body > [data-popper-placement] {
 
     .status__content,
     .status__action-bar,
+    .status__emoji-reactions-bar,
     .media-gallery,
     .video-player,
     .audio-player,
@@ -1313,10 +1599,10 @@ body > [data-popper-placement] {
 }
 
 .status__wrapper-direct {
-  background: mix($ui-base-color, $ui-highlight-color, 95%);
+  background: rgba($ui-highlight-color, 0.05);
 
   &:focus {
-    background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
+    background: rgba($ui-highlight-color, 0.05);
   }
 
   .status__prepend {
@@ -1324,12 +1610,59 @@ body > [data-popper-placement] {
   }
 }
 
+.status__emoji-reactions-bar {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px 8px;
+  margin: 12px 0 2px 4px;
+
+  .emoji-reactions-bar__button {
+    background: $emoji-reaction-color;
+    border: 0;
+    cursor: pointer;
+    display: flex;
+    justify-items: center;
+    align-items: center;
+    height: 28px;
+
+    &.toggled {
+      background: $emoji-reaction-selected-color;
+    }
+
+    > .emoji {
+      display: block;
+      height: 24px;
+      transition: transform 0.2s ease;
+
+      &:hover {
+        transform: scale(1.44);
+      }
+
+      img {
+        margin-top: 0;
+        margin-bottom: 0;
+        height: 24px;
+      }
+    }
+
+    .count {
+      display: block;
+      margin: 0 2px;
+      color: $ui-secondary-color;
+    }
+  }
+}
+
 .status__action-bar {
   display: flex;
   justify-content: space-between;
   align-items: center;
   gap: 18px;
   margin-top: 16px;
+
+  &__button__blank {
+    width: 24px;
+  }
 }
 
 .detailed-status__action-bar-dropdown {
@@ -1341,9 +1674,8 @@ body > [data-popper-placement] {
 }
 
 .detailed-status {
-  background: lighten($ui-base-color, 4%);
   padding: 16px;
-  border-top: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
 
   &--flex {
     display: flex;
@@ -1362,7 +1694,8 @@ body > [data-popper-placement] {
     line-height: 24px;
 
     .emojione {
-      width: 24px;
+      min-width: 24px;
+      max-width: min(10em, 100%);
       height: 24px;
       margin: -1px 0 0;
     }
@@ -1383,6 +1716,11 @@ body > [data-popper-placement] {
     padding: 0;
     margin-bottom: 16px;
   }
+
+  &__button__blank {
+    width: 24px;
+    flex: 1 1 auto;
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
@@ -1390,23 +1728,43 @@ body > [data-popper-placement] {
 }
 
 .detailed-status__meta {
-  margin-top: 16px;
+  margin-top: 24px;
   color: $dark-text-color;
   font-size: 14px;
   line-height: 18px;
 
+  &__line {
+    border-bottom: 1px solid var(--background-border-color);
+    padding: 8px 0;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 8px;
+
+    &:first-child {
+      padding-top: 0;
+    }
+
+    &:last-child {
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+  }
+
   .icon {
-    width: 15px;
-    height: 15px;
-    position: relative;
-    top: 0.145em;
+    width: 18px;
+    height: 18px;
+  }
+
+  .animated-number {
+    color: $secondary-text-color;
+    font-weight: 500;
   }
 }
 
 .detailed-status__action-bar {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 10px 0;
@@ -1444,33 +1802,11 @@ body > [data-popper-placement] {
   color: inherit;
   text-decoration: none;
   gap: 6px;
-  position: relative;
-  top: 0.145em;
-
-  .icon {
-    top: 0;
-  }
-}
-
-.detailed-status__favorites,
-.detailed-status__reblogs {
-  font-weight: 500;
-  font-size: 12px;
-  line-height: 18px;
-}
-
-.reply-indicator__content {
-  color: $inverted-text-color;
-  font-size: 14px;
-
-  a {
-    color: $lighter-text-color;
-  }
 }
 
 .domain {
   padding: 10px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .domain__domain-name {
     flex: 1 1 auto;
@@ -1494,7 +1830,7 @@ body > [data-popper-placement] {
 
 .account {
   padding: 16px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   .account__display-name {
     flex: 1 1 auto;
@@ -1527,6 +1863,118 @@ body > [data-popper-placement] {
     }
   }
 
+  &__domain-pill {
+    display: inline-flex;
+    background: rgba($highlight-text-color, 0.2);
+    border-radius: 4px;
+    border: 0;
+    color: $highlight-text-color;
+    font-weight: 500;
+    font-size: 12px;
+    line-height: 16px;
+    padding: 4px 8px;
+
+    &.active {
+      color: $white;
+      background: $ui-highlight-color;
+    }
+
+    &__popout {
+      background: var(--dropdown-background-color);
+      backdrop-filter: var(--background-filter);
+      border: 1px solid var(--dropdown-border-color);
+      box-shadow: var(--dropdown-shadow);
+      max-width: 320px;
+      padding: 16px;
+      border-radius: 8px;
+      display: flex;
+      flex-direction: column;
+      gap: 24px;
+      font-size: 14px;
+      line-height: 20px;
+      color: $darker-text-color;
+
+      .link-button {
+        display: inline;
+        font-size: inherit;
+        line-height: inherit;
+      }
+
+      &__header {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          background: $ui-highlight-color;
+          color: $white;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 50%;
+          flex-shrink: 0;
+        }
+
+        h3 {
+          font-size: 17px;
+          line-height: 22px;
+          color: $primary-text-color;
+        }
+      }
+
+      &__handle {
+        border: 2px dashed $highlight-text-color;
+        background: rgba($highlight-text-color, 0.1);
+        padding: 12px 8px;
+        color: $highlight-text-color;
+        border-radius: 4px;
+
+        &__label {
+          font-size: 11px;
+          line-height: 16px;
+          font-weight: 500;
+        }
+
+        &__handle {
+          user-select: all;
+        }
+      }
+
+      &__parts {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        font-size: 12px;
+        line-height: 16px;
+
+        & > div {
+          display: flex;
+          align-items: flex-start;
+          gap: 12px;
+        }
+
+        &__icon {
+          width: 40px;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+          color: $highlight-text-color;
+        }
+
+        h6 {
+          font-size: 14px;
+          line-height: 20px;
+          font-weight: 500;
+          color: $primary-text-color;
+        }
+      }
+    }
+  }
+
   &__note {
     font-size: 14px;
     font-weight: 400;
@@ -1637,7 +2085,22 @@ a .account__avatar {
   white-space: nowrap;
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
+}
+
+.account__relationship,
+.explore__suggestions__card {
+  .icon-button {
+    border: 1px solid var(--background-border-color);
+    border-radius: 4px;
+    box-sizing: content-box;
+    padding: 5px;
+
+    .icon {
+      width: 24px;
+      height: 24px;
+    }
+  }
 }
 
 .account-authorize {
@@ -1678,7 +2141,6 @@ a .account__avatar {
 }
 
 .status__display-name,
-.reply-indicator__display-name,
 .detailed-status__display-name,
 a.account__display-name {
   &:hover .display-name strong {
@@ -1722,6 +2184,11 @@ a.account__display-name {
 .status__avatar {
   width: 46px;
   height: 46px;
+
+  &.status__avatar__compact {
+    width: 24px;
+    height: 24px;
+  }
 }
 
 .muted {
@@ -1753,7 +2220,7 @@ a.account__display-name {
 
 .notification__report {
   padding: 16px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   gap: 10px;
 
@@ -1788,6 +2255,45 @@ a.account__display-name {
   }
 }
 
+.notification__relationships-severance-event,
+.notification__moderation-warning {
+  display: flex;
+  gap: 16px;
+  color: $secondary-text-color;
+  text-decoration: none;
+  align-items: flex-start;
+  padding: 16px 32px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:hover {
+    color: $primary-text-color;
+  }
+
+  .icon {
+    padding: 2px;
+    color: $highlight-text-color;
+  }
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 8px;
+    flex-grow: 1;
+    font-size: 16px;
+    line-height: 24px;
+
+    strong {
+      font-weight: 700;
+    }
+
+    .link-button {
+      font-size: inherit;
+      line-height: inherit;
+    }
+  }
+}
+
 .notification__message {
   padding: 16px;
   padding-bottom: 0;
@@ -1829,18 +2335,23 @@ a.account__display-name {
   &.activate {
     & > .icon {
       animation: spring-rotate-in 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 
   &.deactivate {
     & > .icon {
       animation: spring-rotate-out 1s linear;
-      transform-origin: 50% 55%;
+      transform-origin: 50% 52%;
     }
   }
 }
 
+.notification__warning-text {
+  padding: 16px 16px 16px 48px;
+  color: $darker-text-color;
+}
+
 .notification__display-name {
   color: inherit;
   font-weight: 500;
@@ -1936,57 +2447,45 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 15px;
   display: flex;
   align-items: center;
   flex-shrink: 0;
   cursor: default;
   gap: 10px;
-  color: $darker-text-color;
 
-  strong {
-    color: $secondary-text-color;
+  .column > & {
+    padding: 15px;
   }
 
-  a {
-    color: inherit;
-    text-decoration: none;
-  }
+  .account {
+    border-bottom: 0;
+    padding: 0;
+    flex: 1 1 auto;
+    min-width: 0;
 
-  .navigation-bar__actions {
-    position: relative;
+    &__display-name {
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0.15px;
+      font-weight: 500;
 
-    .compose__action-bar .icon-button {
-      pointer-events: auto;
-      transform: scale(1, 1) translate(0, 0);
-      opacity: 1;
-
-      .icon {
-        width: 24px;
-        height: 24px;
+      .display-name__account {
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.1px;
       }
     }
   }
-}
 
-.navigation-bar__profile {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  line-height: 20px;
-}
+  .icon-button {
+    padding: 8px;
+    color: $secondary-text-color;
+  }
 
-.navigation-bar__profile-account {
-  display: inline;
-  font-weight: 500;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.navigation-bar__profile-edit {
-  display: inline;
-  color: inherit;
-  text-decoration: none;
+  .icon-button .icon {
+    width: 24px;
+    height: 24px;
+  }
 }
 
 .dropdown-animation {
@@ -2024,6 +2523,7 @@ a.account__display-name {
 
 .dropdown-menu {
   background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
   border: 1px solid var(--dropdown-border-color);
   padding: 4px;
   border-radius: 4px;
@@ -2046,6 +2546,10 @@ a.account__display-name {
       outline: 1px dotted;
     }
 
+    &:hover {
+      text-decoration: underline;
+    }
+
     .icon {
       width: 15px;
       height: 15px;
@@ -2112,7 +2616,7 @@ a.account__display-name {
     font: inherit;
     display: block;
     width: 100%;
-    padding: 10px 14px;
+    padding: 8px 10px;
     border: 0;
     margin: 0;
     background: transparent;
@@ -2164,6 +2668,7 @@ a.account__display-name {
   &__panels {
     display: flex;
     justify-content: center;
+    gap: 16px;
     width: 100%;
     height: 100%;
     min-height: 100vh;
@@ -2196,7 +2701,6 @@ a.account__display-name {
       flex-direction: column;
 
       @media screen and (min-width: $no-gap-breakpoint) {
-        padding: 0 10px;
         max-width: 600px;
       }
     }
@@ -2204,6 +2708,7 @@ a.account__display-name {
 }
 
 $ui-header-height: 55px;
+$ui-header-logo-wordmark-width: 99px;
 
 .ui__header {
   display: none;
@@ -2214,10 +2719,15 @@ $ui-header-height: 55px;
   z-index: 3;
   justify-content: space-between;
   align-items: center;
+  backdrop-filter: var(--background-filter);
 
   &__logo {
     display: inline-flex;
     padding: 15px;
+    flex-grow: 1;
+    flex-shrink: 1;
+    overflow: hidden;
+    container: header-logo / inline-size;
 
     .logo {
       height: $ui-header-height - 30px;
@@ -2228,7 +2738,7 @@ $ui-header-height: 55px;
       display: none;
     }
 
-    @media screen and (width >= 320px) {
+    @container header-logo (min-width: #{$ui-header-logo-wordmark-width}) {
       .logo--wordmark {
         display: block;
       }
@@ -2237,14 +2747,25 @@ $ui-header-height: 55px;
         display: none;
       }
     }
+
+    @media screen and (width < 330px) {
+      .logo--wordmark {
+        display: none;
+      }
+
+      .logo--icon {
+        display: none;
+      }
+    }
   }
 
   &__links {
     display: flex;
     align-items: center;
-    gap: 10px;
-    padding: 0 10px;
+    gap: 8px;
+    padding: 0 9px;
     overflow: hidden;
+    flex-shrink: 0;
 
     .button {
       flex: 0 0 auto;
@@ -2262,7 +2783,8 @@ $ui-header-height: 55px;
 }
 
 .tabs-bar__wrapper {
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
+  backdrop-filter: var(--background-filter);
   position: sticky;
   top: $ui-header-height;
   z-index: 2;
@@ -2298,8 +2820,15 @@ $ui-header-height: 55px;
   flex-direction: column;
 
   > .scrollable {
-    background: $ui-base-color;
+    border: 1px solid var(--background-border-color);
+    border-top: 0;
     border-radius: 0 0 4px 4px;
+
+    &.about,
+    &.privacy-policy {
+      border-top: 1px solid var(--background-border-color);
+      border-radius: 4px;
+    }
   }
 }
 
@@ -2329,7 +2858,6 @@ $ui-header-height: 55px;
   font-size: 16px;
   align-items: center;
   justify-content: center;
-  border-bottom: 2px solid transparent;
 }
 
 .column,
@@ -2446,6 +2974,7 @@ $ui-header-height: 55px;
 
   .columns-area__panels {
     min-height: calc(100vh - $ui-header-height);
+    gap: 0;
   }
 
   .columns-area__panels__pane--navigational {
@@ -2457,8 +2986,7 @@ $ui-header-height: 55px;
 
     .navigation-panel {
       margin: 0;
-      background: $ui-base-color;
-      border-inline-start: 1px solid lighten($ui-base-color, 8%);
+      border-inline-start: 1px solid var(--background-border-color);
       height: 100vh;
     }
 
@@ -2469,22 +2997,40 @@ $ui-header-height: 55px;
       display: none;
     }
 
+    .navigation-panel__legal {
+      margin-bottom: 100px;
+    }
+
     .column-link__icon {
       font-size: 18px;
     }
   }
 
-  .layout-single-column .ui__header {
-    display: flex;
-    background: $ui-base-color;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
-  }
+  .layout-single-column {
+    .ui__header {
+      display: flex;
+      background: var(--background-color);
+      border-bottom: 1px solid var(--background-border-color);
+    }
 
-  .column-header,
-  .column-back-button,
-  .scrollable,
-  .error-column {
-    border-radius: 0 !important;
+    .column > .scrollable,
+    .tabs-bar__wrapper .column-header,
+    .tabs-bar__wrapper .column-back-button {
+      border-left: 0;
+      border-right: 0;
+    }
+
+    .column-header,
+    .column-back-button,
+    .scrollable,
+    .error-column {
+      border-radius: 0 !important;
+    }
+
+    .column-header,
+    .column-back-button {
+      border-top: 0;
+    }
   }
 }
 
@@ -2516,6 +3062,75 @@ $ui-header-height: 55px;
   display: none;
 }
 
+.explore__suggestions__card {
+  padding: 12px 16px;
+  gap: 8px;
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  &__source {
+    padding-inline-start: 60px;
+    font-size: 13px;
+    line-height: 16px;
+    color: $dark-text-color;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  &__body {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+
+    &__main {
+      flex: 1 1 auto;
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      min-width: 0;
+
+      &__name-button {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        &__name {
+          display: block;
+          color: inherit;
+          text-decoration: none;
+          flex: 1 1 auto;
+          min-width: 0;
+        }
+
+        .button {
+          min-width: 80px;
+        }
+
+        .display-name {
+          font-size: 15px;
+          line-height: 20px;
+          color: $secondary-text-color;
+
+          strong {
+            font-weight: 700;
+          }
+
+          &__account {
+            color: $darker-text-color;
+            display: block;
+          }
+        }
+      }
+    }
+  }
+}
+
 @media screen and (max-width: $no-gap-breakpoint - 1px) {
   .columns-area__panels__pane--compositional {
     display: none;
@@ -2535,7 +3150,7 @@ $ui-header-height: 55px;
     inset-inline-start: 9px;
     top: -13px;
     background: $ui-highlight-color;
-    border: 2px solid lighten($ui-base-color, 8%);
+    border: 2px solid var(--background-color);
     padding: 1px 6px;
     border-radius: 6px;
     font-size: 10px;
@@ -2557,7 +3172,7 @@ $ui-header-height: 55px;
 }
 
 .column-link--transparent .icon-with-badge__badge {
-  border-color: darken($ui-base-color, 8%);
+  border-color: var(--background-color);
 }
 
 .column-title {
@@ -2845,21 +3460,6 @@ $ui-header-height: 55px;
   }
 }
 
-.compose-form__highlightable {
-  display: flex;
-  flex-direction: column;
-  flex: 0 1 auto;
-  border-radius: 4px;
-  transition: box-shadow 300ms linear;
-  min-height: 0;
-  position: relative;
-
-  &.active {
-    transition: none;
-    box-shadow: 0 0 0 6px rgba(lighten($highlight-text-color, 8%), 0.7);
-  }
-}
-
 .compose-panel {
   width: 285px;
   margin-top: 10px;
@@ -2888,32 +3488,9 @@ $ui-header-height: 55px;
     }
   }
 
-  .navigation-bar {
-    flex: 0 1 48px;
-  }
-
   .compose-form {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 310px;
-    padding-bottom: 71px;
-    margin-bottom: -71px;
-  }
-
-  .compose-form__autosuggest-wrapper {
-    overflow-y: auto;
-    background-color: $white;
-    border-radius: 4px 4px 0 0;
-    flex: 0 1 auto;
-  }
-
-  .autosuggest-textarea__textarea {
-    overflow-y: hidden;
-  }
-
-  .compose-form__upload-thumbnail {
-    height: 80px;
+    flex: 1 1 auto;
+    min-height: 0;
   }
 }
 
@@ -2933,6 +3510,10 @@ $ui-header-height: 55px;
     height: 30px;
     width: auto;
   }
+
+  &__logo {
+    margin-bottom: 12px;
+  }
 }
 
 .navigation-panel,
@@ -2941,7 +3522,7 @@ $ui-header-height: 55px;
     flex: 0 0 auto;
     border: 0;
     background: transparent;
-    border-top: 1px solid lighten($ui-base-color, 4%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 
@@ -2958,13 +3539,14 @@ $ui-header-height: 55px;
   overflow: hidden;
   display: flex;
   border-radius: 4px;
+  border: 1px solid var(--background-border-color);
 }
 
 .drawer__inner {
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: $ui-base-color;
+  background: var(--background-color);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -2973,15 +3555,11 @@ $ui-header-height: 55px;
   overflow-y: auto;
   width: 100%;
   height: 100%;
-
-  &.darker {
-    background: $ui-base-color;
-  }
 }
 
 .drawer__inner__mastodon {
-  background: $ui-base-color
-    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
+  background: var(--background-color)
+    url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color(darken($ui-base-color, 4%))}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
   min-height: 47px;
@@ -3002,24 +3580,20 @@ $ui-header-height: 55px;
   }
 }
 
-.pseudo-drawer {
-  background: lighten($ui-base-color, 13%);
-  font-size: 13px;
-  text-align: start;
-}
-
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
   border-radius: 4px;
   overflow: hidden;
 
-  a:hover {
-    background: lighten($ui-base-color, 3%);
+  a:hover,
+  a:focus,
+  a:active {
+    color: $primary-text-color;
   }
 }
 
@@ -3064,22 +3638,22 @@ $ui-header-height: 55px;
 .column-back-button {
   box-sizing: border-box;
   width: 100%;
-  background: $ui-base-color;
+  background: transparent;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   color: $highlight-text-color;
   cursor: pointer;
   flex: 0 0 auto;
   font-size: 16px;
   line-height: inherit;
-  border: 0;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   text-align: unset;
-  padding: 15px;
+  padding: 13px;
   margin: 0;
   z-index: 3;
   outline: 0;
   display: flex;
   align-items: center;
+  gap: 5px;
 
   &:hover {
     text-decoration: underline;
@@ -3089,30 +3663,27 @@ $ui-header-height: 55px;
 .column-header__back-button {
   display: flex;
   align-items: center;
-  background: $ui-base-color;
+  gap: 5px;
+  background: transparent;
   border: 0;
   font-family: inherit;
   color: $highlight-text-color;
   cursor: pointer;
   white-space: nowrap;
   font-size: 16px;
-  padding: 0 5px 0 0;
+  padding: 13px;
   z-index: 3;
 
   &:hover {
     text-decoration: underline;
   }
 
-  &:last-child {
-    padding: 0 15px 0 0;
+  &.compact {
+    padding-inline-end: 5px;
+    flex: 0 0 auto;
   }
 }
 
-.column-back-button__icon {
-  display: inline-block;
-  margin-inline-end: 5px;
-}
-
 .react-toggle {
   display: inline-block;
   position: relative;
@@ -3148,7 +3719,7 @@ $ui-header-height: 55px;
   height: 20px;
   padding: 0;
   border-radius: 10px;
-  background-color: #626982;
+  background-color: $ui-primary-color;
 }
 
 .react-toggle--focus {
@@ -3171,7 +3742,7 @@ $ui-header-height: 55px;
   width: 16px;
   height: 16px;
   border-radius: 50%;
-  background-color: $primary-text-color;
+  background-color: $ui-button-color;
   box-sizing: border-box;
   transition: all 0.25s ease;
   transition-property: border-color, left;
@@ -3182,6 +3753,15 @@ $ui-header-height: 55px;
   border-color: $ui-highlight-color;
 }
 
+.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
+  background: darken($ui-primary-color, 5%);
+}
+
+.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled)
+  .react-toggle-track {
+  background: lighten($ui-highlight-color, 5%);
+}
+
 .switch-to-advanced {
   color: $light-text-color;
   background-color: $ui-base-color;
@@ -3199,8 +3779,6 @@ $ui-header-height: 55px;
 }
 
 .column-link {
-  background: lighten($ui-base-color, 8%);
-  color: $primary-text-color;
   display: flex;
   align-items: center;
   gap: 5px;
@@ -3210,12 +3788,20 @@ $ui-header-height: 55px;
   overflow: hidden;
   white-space: nowrap;
   border: 0;
+  background: transparent;
+  color: $secondary-text-color;
   border-left: 4px solid transparent;
+  position: relative;
+  z-index: 0;
 
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 11%);
+    color: $primary-text-color;
+  }
+
+  &.active {
+    color: $highlight-text-color;
   }
 
   &:focus {
@@ -3227,22 +3813,6 @@ $ui-header-height: 55px;
     border-radius: 0;
   }
 
-  &--transparent {
-    background: transparent;
-    color: $ui-secondary-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      background: transparent;
-      color: $primary-text-color;
-    }
-
-    &.active {
-      color: $highlight-text-color;
-    }
-  }
-
   &--logo {
     background: transparent;
     padding: 10px;
@@ -3255,7 +3825,13 @@ $ui-header-height: 55px;
   }
 }
 
-.column-link__badge {
+.column-link__icon {
+  display: inline-block;
+  margin-inline-end: 5px;
+}
+
+.column-link__badge,
+.column-link__command {
   display: inline-block;
   border-radius: 4px;
   font-size: 12px;
@@ -3266,9 +3842,15 @@ $ui-header-height: 55px;
   margin: -6px 10px;
 }
 
+.column-link__command {
+  position: absolute;
+  right: 0;
+  z-index: 1;
+}
+
 .column-subheading {
-  background: $ui-base-color;
-  color: $dark-text-color;
+  background: var(--surface-background-color);
+  color: $darker-text-color;
   padding: 8px 20px;
   font-size: 12px;
   font-weight: 500;
@@ -3276,12 +3858,6 @@ $ui-header-height: 55px;
   cursor: default;
 }
 
-.getting-started__wrapper,
-.getting-started,
-.flex-spacer {
-  background: $ui-base-color;
-}
-
 .getting-started__wrapper {
   flex: 0 0 auto;
 }
@@ -3293,6 +3869,8 @@ $ui-header-height: 55px;
 .getting-started {
   color: $dark-text-color;
   overflow: auto;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   &__trends {
     flex: 0 1 auto;
@@ -3301,7 +3879,7 @@ $ui-header-height: 55px;
     margin-top: 10px;
 
     h4 {
-      border-bottom: 1px solid lighten($ui-base-color, 8%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 12px;
       text-transform: uppercase;
@@ -3414,6 +3992,42 @@ $ui-header-height: 55px;
   }
 }
 
+.circle-item {
+  display: flex;
+
+  .column-link {
+    flex: 1;
+  }
+
+  .icon-button {
+    align-self: center;
+    margin: 0 8px;
+  }
+}
+
+button.icon-button i.fa-retweet {
+  background-position: 0 0;
+  height: 19px;
+  transition: background-position 0.9s steps(10);
+  transition-duration: 0s;
+  vertical-align: middle;
+  width: 22px;
+
+  &::before {
+    display: none !important;
+  }
+}
+
+button.icon-button.active i.fa-retweet {
+  transition-duration: 0.9s;
+  background-position: 0 100%;
+}
+
+.reduce-motion button.icon-button i.fa-retweet,
+.reduce-motion button.icon-button.active i.fa-retweet {
+  transition: none;
+}
+
 .status-card {
   display: flex;
   align-items: center;
@@ -3423,7 +4037,7 @@ $ui-header-height: 55px;
   margin-top: 14px;
   text-decoration: none;
   overflow: hidden;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 8px;
 
   &__actions {
@@ -3606,6 +4220,7 @@ a.status-card {
   margin: 0;
   width: 100%;
   height: 100%;
+  max-height: 286px;
   object-fit: cover;
   background-size: cover;
   background-position: center center;
@@ -3680,7 +4295,7 @@ a.status-card {
 }
 
 .load-gap {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 }
 
 .timeline-hint {
@@ -3713,7 +4328,8 @@ a.status-card {
   font-size: 16px;
   font-weight: 500;
   color: $dark-text-color;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex: 1 1 auto;
@@ -3783,14 +4399,17 @@ a.status-card {
   .announcements {
     z-index: 1;
     position: relative;
+
+    .announcements__pagination > * {
+      vertical-align: middle;
+    }
   }
 }
 
 .column-header {
   display: flex;
   font-size: 16px;
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px 4px 0 0;
   flex: 0 0 auto;
   cursor: pointer;
@@ -3798,7 +4417,7 @@ a.status-card {
   z-index: 2;
   outline: 0;
 
-  & > button {
+  &__title {
     display: flex;
     align-items: center;
     gap: 5px;
@@ -3820,8 +4439,18 @@ a.status-card {
     }
   }
 
-  & > .column-header__back-button {
+  .column-header__back-button + &__title {
+    padding-inline-start: 0;
+  }
+
+  .column-header__back-button {
+    flex: 1;
     color: $highlight-text-color;
+
+    &.compact {
+      flex: 0 0 auto;
+      color: $primary-text-color;
+    }
   }
 
   &.active {
@@ -3835,6 +4464,18 @@ a.status-card {
   &:active {
     outline: 0;
   }
+
+  &__advanced-buttons {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px;
+    padding-top: 0;
+
+    &:first-child {
+      padding-top: 16px;
+    }
+  }
 }
 
 .column-header__buttons {
@@ -3854,9 +4495,9 @@ a.status-card {
   display: flex;
   justify-content: center;
   align-items: center;
-  background: $ui-base-color;
   border: 0;
   color: $darker-text-color;
+  background: transparent;
   cursor: pointer;
   font-size: 16px;
   padding: 0 15px;
@@ -3875,11 +4516,14 @@ a.status-card {
 
   &.active {
     color: $primary-text-color;
-    background: lighten($ui-base-color, 4%);
 
     &:hover {
       color: $primary-text-color;
     }
+
+    .icon {
+      transform: rotate(60deg);
+    }
   }
 
   &:disabled {
@@ -3888,11 +4532,14 @@ a.status-card {
   }
 }
 
+.no-reduce-motion .column-header__button .icon {
+  transition: transform 150ms ease-in-out;
+}
+
 .column-header__collapsible {
   max-height: 70vh;
   overflow: hidden;
   overflow-y: auto;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
   color: $darker-text-color;
   transition:
     max-height 150ms ease-in-out,
@@ -3914,14 +4561,14 @@ a.status-card {
     height: 0;
     background: transparent;
     border: 0;
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid var(--background-border-color);
     margin: 10px 0;
   }
 }
 
 .column-header__collapsible-inner {
-  background: $ui-base-color;
-  padding: 15px;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 }
 
 .column-header__setting-btn {
@@ -3943,20 +4590,8 @@ a.status-card {
 }
 
 .column-header__setting-arrows {
-  float: right;
-
-  .column-header__setting-btn {
-    padding: 5px;
-
-    &:first-child {
-      padding-inline-end: 7px;
-    }
-
-    &:last-child {
-      padding-inline-start: 7px;
-      margin-inline-start: 5px;
-    }
-  }
+  display: flex;
+  align-items: center;
 }
 
 .text-btn {
@@ -4110,35 +4745,6 @@ a.status-card {
   z-index: 100;
 }
 
-.media-spoiler {
-  background: $base-overlay-background;
-  color: $darker-text-color;
-  border: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-  border-radius: 4px;
-  appearance: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    padding: 0;
-    color: lighten($darker-text-color, 8%);
-  }
-}
-
-.media-spoiler__warning {
-  display: block;
-  font-size: 14px;
-}
-
-.media-spoiler__trigger {
-  display: block;
-  font-size: 11px;
-  font-weight: 700;
-}
-
 .spoiler-button {
   top: 0;
   inset-inline-start: 0;
@@ -4208,9 +4814,8 @@ a.status-card {
 }
 
 .account--panel {
-  background: lighten($ui-base-color, 4%);
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-top: 1px solid var(--background-border-color);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: row;
   padding: 10px 0;
@@ -4222,24 +4827,64 @@ a.status-card {
   text-align: center;
 }
 
-.column-settings__outer {
-  background: lighten($ui-base-color, 8%);
-  padding: 15px;
+.detailed-status__button .emoji-button {
+  padding: 0;
 }
 
-.column-settings__section {
-  color: $darker-text-color;
-  cursor: default;
-  display: block;
-  font-weight: 500;
-  margin-bottom: 10px;
-}
+.column-settings {
+  display: flex;
+  flex-direction: column;
 
-.column-settings__row--with-margin {
-  margin-bottom: 15px;
+  &__section {
+    // FIXME: Legacy
+    color: $darker-text-color;
+    cursor: default;
+    display: block;
+    font-weight: 500;
+  }
+
+  .column-header__links {
+    margin: 0;
+  }
+
+  section {
+    padding: 16px;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    &.similar-row {
+      padding-top: 0;
+    }
+  }
+
+  h3 {
+    font-size: 16px;
+    line-height: 24px;
+    letter-spacing: 0.5px;
+    font-weight: 500;
+    color: $primary-text-color;
+    margin-bottom: 16px;
+  }
+
+  &__row {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .app-form__toggle {
+    &__toggle > div {
+      border: 0;
+    }
+  }
 }
 
 .column-settings__hashtags {
+  margin-top: 15px;
+
   .column-settings__row {
     margin-bottom: 15px;
   }
@@ -4347,6 +4992,108 @@ a.status-card {
   .text-btn:not(.column-header__permission-btn) {
     margin-bottom: 15px;
   }
+
+  &__antenna {
+    margin-left: 12px;
+  }
+}
+
+.column-content-select {
+  &__control {
+    @include search-input;
+
+    &::placeholder {
+      color: lighten($darker-text-color, 4%);
+    }
+
+    &::-moz-focus-inner {
+      border: 0;
+    }
+
+    &::-moz-focus-inner,
+    &:focus,
+    &:active {
+      outline: 0 !important;
+    }
+
+    &:focus {
+      background: lighten($ui-base-color, 4%);
+    }
+
+    @media screen and (width <= 600px) {
+      font-size: 16px;
+    }
+  }
+
+  &__placeholder {
+    color: $dark-text-color;
+    padding-inline-start: 2px;
+    font-size: 12px;
+  }
+
+  &__value-container {
+    padding-inline-start: 6px;
+  }
+
+  &__multi-value {
+    background: lighten($ui-base-color, 8%);
+
+    &__remove {
+      cursor: pointer;
+
+      &:hover,
+      &:active,
+      &:focus {
+        background: lighten($ui-base-color, 12%);
+        color: lighten($darker-text-color, 4%);
+      }
+    }
+  }
+
+  &__multi-value__label,
+  &__input,
+  &__input-container {
+    color: $darker-text-color;
+  }
+
+  &__clear-indicator,
+  &__dropdown-indicator {
+    cursor: pointer;
+    transition: none;
+    color: $dark-text-color;
+
+    &:hover,
+    &:active,
+    &:focus {
+      color: lighten($dark-text-color, 4%);
+    }
+  }
+
+  &__indicator-separator {
+    background-color: lighten($ui-base-color, 8%);
+  }
+
+  &__menu {
+    @include search-popout;
+
+    padding: 0;
+    background: $ui-secondary-color;
+  }
+
+  &__menu-list {
+    padding: 6px;
+  }
+
+  &__option {
+    color: $inverted-text-color;
+    border-radius: 4px;
+    font-size: 14px;
+
+    &--is-focused,
+    &--is-selected {
+      background: darken($ui-secondary-color, 10%);
+    }
+  }
 }
 
 .relationship-tag {
@@ -4363,16 +5110,13 @@ a.status-card {
 }
 
 .setting-toggle {
-  display: block;
-  line-height: 24px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 
 .setting-toggle__label {
   color: $darker-text-color;
-  display: inline-block;
-  margin-bottom: 14px;
-  margin-inline-start: 8px;
-  vertical-align: middle;
 }
 
 .limited-account-hint {
@@ -4387,7 +5131,6 @@ a.status-card {
 .empty-column-indicator,
 .follow_requests-unlocked_explanation {
   color: $dark-text-color;
-  background: $ui-base-color;
   text-align: center;
   padding: 20px;
   font-size: 15px;
@@ -4413,15 +5156,15 @@ a.status-card {
 }
 
 .follow_requests-unlocked_explanation {
-  background: darken($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  background: var(--surface-background-color);
+  border-bottom: 1px solid var(--background-border-color);
   contain: initial;
   flex-grow: 0;
 }
 
 .error-column {
   padding: 20px;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   display: flex;
   flex: 1 1 auto;
@@ -4496,50 +5239,15 @@ a.status-card {
   animation: heartbeat 1.5s ease-in-out infinite both;
 }
 
-@keyframes shake-bottom {
-  0%,
-  100% {
-    transform: rotate(0deg);
-    transform-origin: 50% 100%;
-  }
-
-  10% {
-    transform: rotate(2deg);
-  }
-
-  20%,
-  40%,
-  60% {
-    transform: rotate(-4deg);
-  }
-
-  30%,
-  50%,
-  70% {
-    transform: rotate(4deg);
-  }
-
-  80% {
-    transform: rotate(-2deg);
-  }
-
-  90% {
-    transform: rotate(2deg);
-  }
-}
-
-.no-reduce-motion .shake-bottom {
-  transform-origin: 50% 100%;
-  animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
-}
-
 .emoji-picker-dropdown__menu {
-  background: $simple-background-color;
   position: relative;
-  box-shadow: var(--dropdown-shadow);
-  border-radius: 4px;
   margin-top: 5px;
   z-index: 2;
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  box-shadow: var(--dropdown-shadow);
+  border-radius: 5px;
 
   .emoji-mart-scroll {
     transition: opacity 200ms ease;
@@ -4560,11 +5268,12 @@ a.status-card {
 .emoji-picker-dropdown__modifiers__menu {
   position: absolute;
   z-index: 4;
-  top: -4px;
-  inset-inline-start: -8px;
-  background: $simple-background-color;
+  top: -5px;
+  inset-inline-start: -9px;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
   border-radius: 4px;
-  box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+  box-shadow: var(--dropdown-shadow);
   overflow: hidden;
 
   button {
@@ -4577,7 +5286,7 @@ a.status-card {
     &:hover,
     &:focus,
     &:active {
-      background: rgba($ui-secondary-color, 0.4);
+      background: var(--dropdown-border-color);
     }
   }
 
@@ -4646,15 +5355,17 @@ a.status-card {
 }
 
 .upload-progress {
-  padding: 10px;
-  color: $lighter-text-color;
+  color: $darker-text-color;
   overflow: hidden;
   display: flex;
-  gap: 10px;
+  gap: 8px;
+  align-items: center;
+  padding: 0 12px;
 
   .icon {
     width: 24px;
     height: 24px;
+    color: $ui-highlight-color;
   }
 
   span {
@@ -4673,7 +5384,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($simple-background-color, 8%);
+  background: var(--background-color);
   position: relative;
   margin-top: 5px;
 }
@@ -4727,12 +5438,17 @@ a.status-card {
   filter: none;
 }
 
-.privacy-dropdown__dropdown {
-  background: $simple-background-color;
+.privacy-dropdown__dropdown,
+.language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
+  background: var(--dropdown-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
+  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -4747,34 +5463,48 @@ a.status-card {
   flex-grow: 0;
 }
 
-.modal-root__container .privacy-dropdown__dropdown {
+.modal-root__container .privacy-dropdown__dropdown,
+.modal-root__container .ezpiration-dropdown__dropdown {
   pointer-events: auto;
   z-index: 9999;
 }
 
 .privacy-dropdown__option {
-  color: $inverted-text-color;
-  padding: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  padding: 8px 12px;
   cursor: pointer;
   display: flex;
+  align-items: center;
+  gap: 12px;
+  border-radius: 4px;
+  color: $primary-text-color;
 
   &:hover,
+  &:active {
+    background: var(--dropdown-border-color);
+  }
+
+  &:focus,
   &.active {
     background: $ui-highlight-color;
     color: $primary-text-color;
     outline: 0;
 
-    .privacy-dropdown__option__content {
+    .privacy-dropdown__option__content,
+    .privacy-dropdown__option__content strong,
+    .privacy-dropdown__option__additional {
       color: $primary-text-color;
-
-      strong {
-        color: $primary-text-color;
-      }
     }
   }
 
-  &.active:hover {
-    background: lighten($ui-highlight-color, 4%);
+  &__additional {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: $darker-text-color;
+    cursor: help;
   }
 }
 
@@ -4782,17 +5512,16 @@ a.status-card {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-inline-end: 10px;
 }
 
 .privacy-dropdown__option__content {
   flex: 1 1 auto;
-  color: $lighter-text-color;
+  color: $darker-text-color;
 
   strong {
+    color: $primary-text-color;
     font-weight: 500;
     display: block;
-    color: $inverted-text-color;
 
     @each $lang in $cjk-langs {
       &:lang(#{$lang}) {
@@ -4802,66 +5531,100 @@ a.status-card {
   }
 }
 
+.privacy-dropdown.active {
+  .privacy-dropdown__value {
+    background: $simple-background-color;
+    border-radius: 4px 4px 0 0;
+  }
+
+  &.top .privacy-dropdown__value {
+    border-radius: 0 0 4px 4px;
+  }
+
+  .privacy-dropdown__dropdown {
+    display: block;
+    box-shadow: var(--dropdown-shadow);
+  }
+}
+
+.privacy-dropdown .privacy-dropdown__value.searchability {
+  position: relative;
+}
+
 .language-dropdown {
   &__dropdown {
-    background: $simple-background-color;
-    box-shadow: var(--dropdown-shadow);
-    border-radius: 4px;
-    overflow: hidden;
-    z-index: 2;
-
-    &.top {
-      transform-origin: 50% 100%;
-    }
-
-    &.bottom {
-      transform-origin: 50% 0;
-    }
+    padding: 0;
 
     .emoji-mart-search {
-      padding-inline-end: 10px;
+      padding: 10px;
+      background: var(--dropdown-background-color);
+
+      input {
+        padding: 8px 12px;
+        background: $ui-base-color;
+        border: 1px solid lighten($ui-base-color, 8%);
+        color: $darker-text-color;
+
+        @media screen and (width <= 600px) {
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 0.5px;
+        }
+      }
     }
 
     .emoji-mart-search-icon {
-      inset-inline-end: 10px + 5px;
+      inset-inline-end: 15px;
+      opacity: 1;
+      color: $darker-text-color;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+
+      &:disabled {
+        opacity: 0.38;
+      }
     }
 
     .emoji-mart-scroll {
       padding: 0 10px 10px;
+      background: var(--dropdown-background-color);
     }
 
     &__results {
       &__item {
         cursor: pointer;
-        color: $inverted-text-color;
+        color: $primary-text-color;
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.25px;
         font-weight: 500;
-        padding: 10px;
+        padding: 8px 12px;
         border-radius: 4px;
-        display: flex;
-        gap: 6px;
-        align-items: center;
-
-        &:focus,
-        &:active,
-        &:hover {
-          background: $ui-secondary-color;
-        }
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
 
         &__common-name {
           color: $darker-text-color;
+          font-weight: 400;
         }
 
+        &:active,
+        &:hover {
+          background: var(--dropdown-border-color);
+        }
+
+        &:focus,
         &.active {
           background: $ui-highlight-color;
           color: $primary-text-color;
           outline: 0;
 
           .language-dropdown__dropdown__results__item__common-name {
-            color: $secondary-text-color;
-          }
-
-          &:hover {
-            background: lighten($ui-highlight-color, 4%);
+            color: $primary-text-color;
           }
         }
       }
@@ -4870,9 +5633,13 @@ a.status-card {
 }
 
 .search {
-  margin-bottom: 10px;
+  margin-bottom: 32px;
   position: relative;
 
+  .layout-multiple-columns & {
+    margin-bottom: 10px;
+  }
+
   &__popout {
     box-sizing: border-box;
     display: none;
@@ -4881,6 +5648,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -4889,7 +5657,7 @@ a.status-card {
 
     h4 {
       text-transform: uppercase;
-      color: $dark-text-color;
+      color: $darker-text-color;
       font-weight: 500;
       padding: 0 10px;
       margin-bottom: 10px;
@@ -4897,6 +5665,7 @@ a.status-card {
 
     .icon-button {
       padding: 0;
+      color: $darker-text-color;
     }
 
     .icon {
@@ -4912,7 +5681,7 @@ a.status-card {
       }
 
       &__message {
-        color: $dark-text-color;
+        color: $darker-text-color;
         padding: 0 10px;
       }
 
@@ -4968,6 +5737,10 @@ a.status-card {
   }
 
   &.active {
+    .search__input {
+      border-radius: 4px 4px 0 0;
+    }
+
     .search__popout {
       display: block;
     }
@@ -4978,14 +5751,9 @@ a.status-card {
   @include search-input;
 
   display: block;
-  padding: 15px;
-  padding-inline-end: 30px;
-  line-height: 18px;
-  font-size: 16px;
-
-  &::placeholder {
-    color: lighten($darker-text-color, 4%);
-  }
+  padding: 12px 16px;
+  padding-inline-start: 16px + 15px + 8px;
+  line-height: normal;
 
   &::-moz-focus-inner {
     border: 0;
@@ -4996,10 +5764,6 @@ a.status-card {
   &:active {
     outline: 0 !important;
   }
-
-  &:focus {
-    background: lighten($ui-base-color, 4%);
-  }
 }
 
 .search__icon {
@@ -5014,21 +5778,21 @@ a.status-card {
 
   .icon {
     position: absolute;
-    top: 13px;
-    inset-inline-end: 10px;
+    top: 12px + 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
     transition-property: transform, opacity;
-    width: 24px;
-    height: 24px;
-    color: $secondary-text-color;
+    width: 20px;
+    height: 20px;
+    color: $darker-text-color;
     cursor: default;
     pointer-events: none;
+    margin-inline-start: 16px - 2px;
 
     &.active {
       pointer-events: auto;
-      opacity: 0.3;
+      opacity: 1;
     }
   }
 
@@ -5043,42 +5807,24 @@ a.status-card {
 
   .icon-times-circle {
     transform: rotate(0deg);
-    color: $action-button-color;
     cursor: pointer;
 
     &.active {
       transform: rotate(90deg);
-      opacity: 1;
-    }
-
-    &:hover {
-      color: lighten($action-button-color, 7%);
     }
   }
 }
 
-.search-results__header {
-  color: $dark-text-color;
-  background: lighten($ui-base-color, 2%);
-  padding: 15px;
-  font-weight: 500;
-  font-size: 16px;
-  cursor: default;
-  display: flex;
-  align-items: center;
-  gap: 5px;
-}
-
 .search-results__section {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
 
   &:last-child {
     border-bottom: 0;
   }
 
   &__header {
-    background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
+    background: var(--surface-background-color);
     padding: 15px;
     font-weight: 500;
     font-size: 14px;
@@ -5113,20 +5859,6 @@ a.status-card {
   }
 }
 
-.search-results__hashtag {
-  display: block;
-  padding: 10px;
-  color: $secondary-text-color;
-  text-decoration: none;
-
-  &:hover,
-  &:active,
-  &:focus {
-    color: lighten($secondary-text-color, 4%);
-    text-decoration: underline;
-  }
-}
-
 .search-results__info {
   padding: 20px;
   color: $darker-text-color;
@@ -5154,6 +5886,8 @@ a.status-card {
   inset-inline-start: 0;
   width: 100%;
   height: 100%;
+  max-width: 100vw;
+  max-height: 100vh;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -5169,6 +5903,10 @@ a.status-card {
   pointer-events: auto;
   user-select: text;
   display: flex;
+
+  @media screen and (width <= 630px) {
+    margin-top: auto;
+  }
 }
 
 .video-modal .video-player {
@@ -5500,6 +6238,154 @@ a.status-card {
   margin-inline-start: 10px;
 }
 
+.safety-action-modal {
+  width: 600px;
+  flex-direction: column;
+
+  &__top,
+  &__bottom {
+    display: flex;
+    gap: 8px;
+    padding: 24px;
+    flex-direction: column;
+    background: var(--modal-background-color);
+    backdrop-filter: var(--background-filter);
+    border: 1px solid var(--modal-border-color);
+  }
+
+  &__top {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    gap: 16px;
+  }
+
+  &__bottom {
+    border-radius: 0 0 16px 16px;
+    border-top: 0;
+
+    @media screen and (max-width: $no-gap-breakpoint) {
+      border-radius: 0;
+      border-bottom: 0;
+      padding-bottom: 32px;
+    }
+  }
+
+  &__header {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    font-size: 14px;
+    line-height: 20px;
+    color: $darker-text-color;
+
+    &__icon {
+      border-radius: 64px;
+      background: $ui-highlight-color;
+      color: $white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+
+    h1 {
+      font-size: 22px;
+      line-height: 28px;
+      color: $primary-text-color;
+    }
+  }
+
+  &__bullet-points {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    font-size: 16px;
+    line-height: 24px;
+
+    & > div {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+    }
+
+    &__icon {
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+
+  &__field-group {
+    display: flex;
+    flex-direction: column;
+
+    label {
+      display: flex;
+      gap: 16px;
+      align-items: center;
+      font-size: 16px;
+      line-height: 24px;
+      height: 32px;
+      padding: 0 12px;
+    }
+  }
+
+  &__caveats {
+    font-size: 14px;
+    padding: 0 12px;
+
+    strong {
+      font-weight: 500;
+    }
+  }
+
+  &__bottom {
+    padding-top: 0;
+
+    &__collapsible {
+      display: none;
+      flex-direction: column;
+      gap: 16px;
+    }
+
+    &.active {
+      background: var(--modal-background-variant-color);
+      padding-top: 24px;
+
+      .safety-action-modal__bottom__collapsible {
+        display: flex;
+      }
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    justify-content: flex-end;
+
+    .link-button {
+      padding: 10px 12px;
+      font-weight: 600;
+    }
+  }
+}
+
 .boost-modal,
 .confirmation-modal,
 .report-modal,
@@ -5544,6 +6430,10 @@ a.status-card {
     padding-inline-end: 10px;
   }
 
+  .icon {
+    vertical-align: middle;
+  }
+
   .button {
     flex: 0 0 auto;
   }
@@ -5655,6 +6545,11 @@ a.status-card {
     }
   }
 
+  .dialog-option {
+    align-items: center;
+    gap: 12px;
+  }
+
   .dialog-option .poll__input {
     border-color: $inverted-text-color;
     color: $ui-secondary-color;
@@ -5663,8 +6558,8 @@ a.status-card {
     justify-content: center;
 
     svg {
-      width: 8px;
-      height: auto;
+      width: 15px;
+      height: 15px;
     }
 
     &:active,
@@ -5794,6 +6689,7 @@ a.status-card {
 .report-modal__comment {
   box-sizing: border-box;
   width: 50%;
+  min-width: 50%;
 
   @media screen and (width <= 480px) {
     width: 100%;
@@ -5862,6 +6758,14 @@ a.status-card {
     min-height: 100px;
     max-height: 50vh;
     border: 0;
+
+    @media screen and (height <= 600px) {
+      max-height: 20vh;
+    }
+
+    @media screen and (max-width: $no-columns-breakpoint) {
+      max-height: 20vh;
+    }
   }
 
   .setting-toggle {
@@ -6052,7 +6956,8 @@ a.status-card {
     line-height: 24px;
 
     .emojione {
-      width: 24px;
+      min-width: 24px;
+      max-width: min(10em, 100%);
       height: 24px;
       margin: -1px 0 0;
     }
@@ -6094,6 +6999,7 @@ a.status-card {
   gap: 2px;
 }
 
+.media-gallery__alt__label,
 .media-gallery__gifv__label {
   display: flex;
   align-items: center;
@@ -6118,7 +7024,7 @@ a.status-card {
 .attachment-list {
   display: flex;
   font-size: 14px;
-  border: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
   border-radius: 4px;
   margin-top: 16px;
   overflow: hidden;
@@ -6128,7 +7034,7 @@ a.status-card {
     color: $dark-text-color;
     padding: 8px 18px;
     cursor: default;
-    border-inline-end: 1px solid lighten($ui-base-color, 8%);
+    border-inline-end: 1px solid var(--background-border-color);
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -6170,6 +7076,7 @@ a.status-card {
 
     .icon {
       color: $dark-text-color;
+      vertical-align: middle;
     }
   }
 }
@@ -6183,10 +7090,31 @@ a.status-card {
   position: relative;
   width: 100%;
   min-height: 64px;
+  max-height: 60vh;
   display: grid;
   grid-template-columns: 50% 50%;
   grid-template-rows: 50% 50%;
   gap: 2px;
+
+  &--row3 {
+    grid-template-rows: 34% 33% 33%;
+  }
+
+  &--row4 {
+    grid-template-rows: 25% 25% 25% 25%;
+  }
+
+  &--column3 {
+    grid-template-columns: 33% 34% 33%;
+  }
+
+  &--column4 {
+    grid-template-columns: 25% 25% 25% 25%;
+  }
+
+  &__compact {
+    max-height: 24vh;
+  }
 }
 
 .media-gallery__item {
@@ -6279,7 +7207,7 @@ a.status-card {
   overflow: hidden;
   box-sizing: border-box;
   position: relative;
-  background: darken($ui-base-color, 8%);
+  background: var(--background-color);
   border-radius: 8px;
   padding-bottom: 44px;
   width: 100%;
@@ -6675,7 +7603,6 @@ a.status-card {
 
 .scrollable .account-card {
   margin: 10px;
-  background: lighten($ui-base-color, 8%);
 }
 
 .scrollable .account-card__title__avatar {
@@ -6686,11 +7613,7 @@ a.status-card {
 }
 
 .scrollable .account-card__bio::after {
-  background: linear-gradient(
-    to left,
-    lighten($ui-base-color, 8%),
-    transparent
-  );
+  background: linear-gradient(to left, var(--background-color), transparent);
 }
 
 .account-gallery__container {
@@ -6719,8 +7642,8 @@ a.status-card {
 
 .notification__filter-bar,
 .account__section-headline {
-  background: $ui-base-color;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   cursor: default;
   display: flex;
   flex-shrink: 0;
@@ -6753,43 +7676,54 @@ a.status-card {
         content: '';
         position: absolute;
         bottom: -1px;
-        left: 0;
-        width: 100%;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 40px;
         height: 3px;
-        border-radius: 4px;
+        border-radius: 4px 4px 0 0;
         background: $highlight-text-color;
       }
     }
   }
+
+  .scrollable & {
+    border-left: 0;
+    border-right: 0;
+  }
 }
 
 .filter-form {
-  background: $ui-base-color;
+  border-bottom: 1px solid var(--background-border-color);
 
   &__column {
-    padding: 10px 15px;
-    padding-bottom: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    padding: 15px;
   }
 
   .radio-button {
-    display: block;
+    display: flex;
   }
 }
 
 .column-settings__row .radio-button {
-  display: block;
+  display: flex;
 }
 
-.radio-button {
+.radio-button,
+.check-box {
   font-size: 14px;
   position: relative;
-  display: inline-block;
-  padding: 6px 0;
+  display: inline-flex;
+  align-items: center;
   line-height: 18px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   cursor: pointer;
+  gap: 10px;
+  color: $secondary-text-color;
 
   input[type='radio'],
   input[type='checkbox'] {
@@ -6797,21 +7731,53 @@ a.status-card {
   }
 
   &__input {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     position: relative;
-    border: 1px solid $ui-primary-color;
+    border: 2px solid $secondary-text-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
+    width: 20px;
+    height: 20px;
     flex: 0 0 auto;
-    margin-inline-end: 10px;
-    top: -1px;
     border-radius: 50%;
-    vertical-align: middle;
 
     &.checked {
-      border-color: lighten($ui-highlight-color, 4%);
-      background: lighten($ui-highlight-color, 4%);
+      border-color: $ui-highlight-color;
+
+      &::before {
+        position: absolute;
+        left: 2px;
+        top: 2px;
+        content: '';
+        display: block;
+        border-radius: 50%;
+        width: 12px;
+        height: 12px;
+        background: $ui-highlight-color;
+      }
+    }
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.check-box {
+  &__input {
+    width: 18px;
+    height: 18px;
+    border-radius: 2px;
+
+    &.checked {
+      background: $ui-highlight-color;
+      color: $white;
+
+      &::before {
+        display: none;
+      }
     }
   }
 }
@@ -6860,90 +7826,6 @@ noscript {
   }
 }
 
-@media screen and (width <= 630px) and (height <= 400px) {
-  $duration: 400ms;
-  $delay: 100ms;
-
-  .search {
-    will-change: margin-top;
-    transition: margin-top $duration $delay;
-  }
-
-  .navigation-bar {
-    will-change: padding-bottom;
-    transition: padding-bottom $duration $delay;
-  }
-
-  .navigation-bar {
-    & > a:first-child {
-      will-change: margin-top, margin-inline-start, margin-inline-end, width;
-      transition:
-        margin-top $duration $delay,
-        margin-inline-start $duration ($duration + $delay),
-        margin-inline-end $duration ($duration + $delay);
-    }
-
-    & > .navigation-bar__profile-edit {
-      will-change: margin-top;
-      transition: margin-top $duration $delay;
-    }
-
-    .navigation-bar__actions {
-      & > .icon-button.close {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay,
-          transform $duration $delay;
-      }
-
-      & > .compose__action-bar .icon-button {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay + $duration * 0.5,
-          transform $duration $delay;
-      }
-    }
-  }
-
-  .is-composing {
-    .search {
-      margin-top: -50px;
-    }
-
-    .navigation-bar {
-      padding-bottom: 0;
-
-      & > a:first-child {
-        margin: -100px 10px 0 -50px;
-      }
-
-      .navigation-bar__profile {
-        padding-top: 2px;
-      }
-
-      .navigation-bar__profile-edit {
-        position: absolute;
-        margin-top: -60px;
-      }
-
-      .navigation-bar__actions {
-        .icon-button.close {
-          pointer-events: auto;
-          opacity: 1;
-          transform: scale(1, 1) translate(0, 0);
-          bottom: 5px;
-        }
-
-        .compose__action-bar .icon-button {
-          pointer-events: none;
-          opacity: 0;
-          transform: scale(0, 1) translate(100%, 0);
-        }
-      }
-    }
-  }
-}
-
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -7011,7 +7893,7 @@ noscript {
 .follow-request-banner,
 .account-memorial-banner {
   padding: 20px;
-  background: lighten($ui-base-color, 4%);
+  background: var(--surface-background-color);
   display: flex;
   align-items: center;
   flex-direction: column;
@@ -7054,7 +7936,8 @@ noscript {
   justify-content: flex-start;
   gap: 15px;
   align-items: center;
-  background: lighten($ui-base-color, 4%);
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
 
   label {
     flex: 1 1 auto;
@@ -7155,7 +8038,7 @@ noscript {
 
   .list {
     padding: 10px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   .list__wrapper {
@@ -7171,6 +8054,133 @@ noscript {
   }
 }
 
+.antenna-list-detail {
+  font-size: 12px;
+  margin-left: 24px;
+
+  .group {
+    margin-right: 16px;
+
+    i.fa {
+      color: $light-text-color;
+      margin-right: 4px;
+      font-size: 10px;
+    }
+  }
+}
+
+.antenna-setting {
+  margin: 8px 16px 32px;
+
+  h2 {
+    font-size: 20px;
+    margin: 40px 0 16px;
+    font-weight: bold;
+  }
+
+  h3 {
+    font-size: 16px;
+    margin: 40px 0 16px;
+    font-weight: bold;
+  }
+
+  .alert {
+    color: $warning-red;
+    margin: 16px 0;
+    font-size: 14px;
+  }
+}
+
+.setting-radio-panel {
+  display: flex;
+  margin-top: 24px;
+
+  .setting-radio-panel__item {
+    font-size: 16px;
+    text-align: center;
+    flex: 1;
+    height: 40px;
+    line-height: 40px;
+    margin: 16px 0;
+    background: lighten($ui-base-color, 4%);
+    color: $darker-text-color;
+    border: 0;
+
+    &__active {
+      color: $primary-text-color;
+      background: $ui-primary-color;
+    }
+  }
+}
+
+.setting-text-list {
+  .add-text-form {
+    display: flex;
+    gap: 8px;
+
+    label {
+      flex: 1 1 auto;
+
+      input {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.setting-text-list-item {
+  display: flex;
+  font-size: 14px;
+  margin: 8px 0;
+
+  i.fa {
+    color: $darker-text-color;
+  }
+
+  .label {
+    flex: 1;
+    margin: 0 8px;
+  }
+}
+
+.reaction_deck_container {
+  &__row {
+    display: flex;
+    height: 32px;
+    margin: 8px 16px 12px 4px;
+
+    .handle {
+      font-size: 24px;
+    }
+
+    .reaction_deck__emoji {
+      flex: 1;
+    }
+  }
+}
+
+.reaction_deck__emoji {
+  &__wrapper {
+    display: flex;
+
+    .emojione {
+      min-width: 24px;
+      height: 24px;
+    }
+
+    .emoji-button {
+      margin-left: 20px;
+      margin-right: 24px;
+      padding: 0;
+    }
+
+    &__content {
+      display: flex;
+      flex: 1;
+    }
+  }
+}
+
 .focal-point {
   position: relative;
   cursor: move;
@@ -7299,7 +8309,7 @@ noscript {
     height: 145px;
     position: relative;
     background: darken($ui-base-color, 4%);
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     img {
       object-fit: cover;
@@ -7313,7 +8323,7 @@ noscript {
   &__bar {
     position: relative;
     padding: 0 20px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
 
     .avatar {
       display: block;
@@ -7321,8 +8331,8 @@ noscript {
       width: 94px;
 
       .account__avatar {
-        background: darken($ui-base-color, 8%);
-        border: 2px solid $ui-base-color;
+        background: var(--background-color);
+        border: 2px solid var(--background-border-color);
       }
     }
   }
@@ -7357,10 +8367,7 @@ noscript {
       .button {
         flex-shrink: 1;
         white-space: nowrap;
-
-        @media screen and (max-width: $no-gap-breakpoint) {
-          min-width: 0;
-        }
+        min-width: 80px;
       }
 
       .icon-button {
@@ -7379,8 +8386,13 @@ noscript {
         }
       }
 
-      @container account-header (max-width: 372px) {
-        .optional {
+      .optional {
+        @container account-header (max-width: 372px) {
+          display: none;
+        }
+
+        // Fallback for older browsers with no container queries support
+        @media screen and (max-width: 372px + 55px) {
           display: none;
         }
       }
@@ -7391,7 +8403,8 @@ noscript {
       margin-bottom: 16px;
 
       .emojione {
-        width: 22px;
+        min-width: 22px;
+        max-width: min(10em, 100%);
         height: 22px;
       }
 
@@ -7399,14 +8412,17 @@ noscript {
         font-size: 17px;
         line-height: 22px;
         color: $primary-text-color;
-        font-weight: 700;
+        font-weight: 600;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
 
         small {
-          display: block;
-          font-size: 15px;
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          font-size: 14px;
+          line-height: 20px;
           color: $darker-text-color;
           font-weight: 400;
           overflow: hidden;
@@ -7415,6 +8431,11 @@ noscript {
           span {
             user-select: all;
           }
+
+          .icon-lock {
+            height: 18px;
+            width: 18px;
+          }
         }
       }
     }
@@ -7433,13 +8454,12 @@ noscript {
       margin: 0;
       margin-top: 16px;
       border-radius: 4px;
-      background: darken($ui-base-color, 4%);
-      border: 0;
+      border: 1px solid var(--background-border-color);
 
       dl {
         display: block;
         padding: 11px 16px;
-        border-bottom-color: lighten($ui-base-color, 4%);
+        border-bottom-color: var(--background-border-color);
       }
 
       dd,
@@ -7614,7 +8634,7 @@ noscript {
     display: flex;
     align-items: center;
     padding: 15px;
-    border-bottom: 1px solid lighten($ui-base-color, 8%);
+    border-bottom: 1px solid var(--background-border-color);
     gap: 15px;
 
     &:last-child {
@@ -7732,7 +8752,7 @@ noscript {
 
 .conversation {
   display: flex;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 5px;
   padding-bottom: 0;
 
@@ -8016,6 +9036,13 @@ noscript {
 .status__wrapper {
   position: relative;
 
+  &.status__wrapper__compact {
+    border-radius: 4px;
+    border: 1px solid $ui-primary-color;
+    margin-block-start: 16px;
+    cursor: pointer;
+  }
+
   &.unread {
     &::before {
       content: '';
@@ -8087,7 +9114,7 @@ noscript {
 
 .picture-in-picture-placeholder {
   box-sizing: border-box;
-  border: 2px dashed lighten($ui-base-color, 8%);
+  border: 2px dashed var(--background-border-color);
   background: $base-shadow-color;
   display: flex;
   flex-direction: column;
@@ -8115,7 +9142,7 @@ noscript {
 
 .notifications-permission-banner {
   padding: 30px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -8139,6 +9166,12 @@ noscript {
     color: $darker-text-color;
     margin-bottom: 15px;
     text-align: center;
+
+    .icon {
+      width: 20px;
+      height: 20px;
+      vertical-align: middle;
+    }
   }
 }
 
@@ -8156,7 +9189,7 @@ noscript {
   .search__input {
     border: 1px solid lighten($ui-base-color, 8%);
     padding: 10px;
-    padding-inline-end: 28px;
+    padding-inline-end: 30px;
   }
 
   .search__popout {
@@ -8174,7 +9207,8 @@ noscript {
   flex: 1 1 auto;
   display: flex;
   flex-direction: column;
-  background: $ui-base-color;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
 }
@@ -8185,7 +9219,7 @@ noscript {
   color: $primary-text-color;
   text-decoration: none;
   padding: 15px;
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   gap: 15px;
 
   &:last-child {
@@ -8367,22 +9401,37 @@ noscript {
   }
 }
 
+.safety-action-modal,
 .interaction-modal {
-  max-width: 90vw;
+  max-width: 100vw;
   width: 600px;
-  background: var(--modal-background-color);
-  border: 1px solid var(--modal-border-color);
-  border-radius: 8px;
+  overflow-y: auto;
+}
+
+.interaction-modal {
   overflow: visible;
   position: relative;
   display: block;
-  padding: 40px;
+  border-radius: 16px;
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  padding: 24px;
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    border-radius: 16px 16px 0 0;
+    border-bottom: 0;
+    padding-bottom: 32px;
+  }
 
   h3 {
     font-size: 22px;
     line-height: 33px;
     font-weight: 700;
-    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
   }
 
   p {
@@ -8403,7 +9452,9 @@ noscript {
 
   &__icon {
     color: $highlight-text-color;
-    margin: 0 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 
   &__lead {
@@ -8436,6 +9487,7 @@ noscript {
         border: 0;
         padding: 15px - 4px 15px - 6px;
         flex: 1 1 auto;
+        min-width: 0;
 
         &::placeholder {
           color: lighten($darker-text-color, 4%);
@@ -8564,7 +9616,6 @@ noscript {
 }
 
 .privacy-policy {
-  background: $ui-base-color;
   padding: 20px;
 
   @media screen and (min-width: $no-gap-breakpoint) {
@@ -8898,11 +9949,14 @@ noscript {
 
 .link-footer {
   flex: 0 0 auto;
-  padding: 10px;
   padding-top: 20px;
   z-index: 1;
   font-size: 13px;
 
+  .column & {
+    padding: 15px;
+  }
+
   p {
     color: $dark-text-color;
     margin-bottom: 20px;
@@ -8930,6 +9984,7 @@ noscript {
 
 .about {
   padding: 20px;
+  border-top: 1px solid var(--background-border-color);
 
   @media screen and (min-width: $no-gap-breakpoint) {
     border-radius: 4px;
@@ -8976,7 +10031,7 @@ noscript {
   }
 
   &__meta {
-    background: lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
     display: flex;
     margin-bottom: 30px;
@@ -8992,7 +10047,7 @@ noscript {
       width: 0;
       border: 0;
       border-style: solid;
-      border-color: lighten($ui-base-color, 8%);
+      border-color: var(--background-border-color);
       border-left-width: 1px;
       min-height: calc(100% - 60px);
       flex: 0 0 auto;
@@ -9100,7 +10155,7 @@ noscript {
       line-height: 22px;
       padding: 20px;
       border-radius: 4px;
-      background: lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       color: $highlight-text-color;
       cursor: pointer;
     }
@@ -9110,7 +10165,7 @@ noscript {
     }
 
     &__body {
-      border: 1px solid lighten($ui-base-color, 4%);
+      border: 1px solid var(--background-border-color);
       border-top: 0;
       padding: 20px;
       font-size: 15px;
@@ -9120,18 +10175,17 @@ noscript {
 
   &__domain-blocks {
     margin-top: 30px;
-    background: darken($ui-base-color, 4%);
-    border: 1px solid lighten($ui-base-color, 4%);
+    border: 1px solid var(--background-border-color);
     border-radius: 4px;
 
     &__domain {
-      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      border-bottom: 1px solid var(--background-border-color);
       padding: 10px;
       font-size: 15px;
       color: $darker-text-color;
 
       &:nth-child(2n) {
-        background: darken($ui-base-color, 2%);
+        background: darken($ui-base-color, 4%);
       }
 
       &:last-child {
@@ -9153,12 +10207,6 @@ noscript {
         overflow: hidden;
         text-overflow: ellipsis;
       }
-
-      p {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
     }
   }
 }
@@ -9227,7 +10275,7 @@ noscript {
 }
 
 .hashtag-header {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid var(--background-border-color);
   padding: 15px;
   font-size: 17px;
   line-height: 22px;
@@ -9260,18 +10308,24 @@ noscript {
   margin-top: 16px;
   display: flex;
   flex-wrap: wrap;
-  font-size: 14px;
-  line-height: 18px;
-  gap: 4px;
+  font-size: 12px;
+  line-height: 16px;
+  gap: 6px;
   color: $darker-text-color;
 
   a {
     display: inline-flex;
     color: inherit;
     text-decoration: none;
+    padding: 4px 12px;
+    background: $ui-base-color;
+    border-radius: 4px;
+    font-weight: 500;
 
-    &:hover span {
-      text-decoration: underline;
+    &:hover,
+    &:focus,
+    &:active {
+      background: lighten($ui-base-color, 4%);
     }
   }
 
@@ -9282,3 +10336,321 @@ noscript {
     padding: 0;
   }
 }
+
+.inline-follow-suggestions {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 16px 0;
+  padding-bottom: 0;
+  border-bottom: 1px solid var(--background-border-color);
+  background: rgba($ui-highlight-color, 0.05);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 16px;
+
+    h3 {
+      font-size: 15px;
+      line-height: 22px;
+      font-weight: 500;
+    }
+
+    &__actions {
+      display: flex;
+      align-items: center;
+      gap: 24px;
+    }
+
+    .link-button {
+      font-size: 13px;
+      font-weight: 500;
+    }
+  }
+
+  &__body {
+    position: relative;
+
+    &__scroll-button {
+      position: absolute;
+      height: 100%;
+      background: transparent;
+      border: none;
+      cursor: pointer;
+      top: 0;
+      color: $primary-text-color;
+      opacity: 0.5;
+
+      &.left {
+        left: 0;
+      }
+
+      &.right {
+        right: 0;
+      }
+
+      &__icon {
+        border-radius: 50%;
+        background: $ui-highlight-color;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        aspect-ratio: 1;
+        padding: 8px;
+
+        .icon {
+          width: 24px;
+          height: 24px;
+        }
+      }
+
+      &:hover,
+      &:focus,
+      &:active {
+        opacity: 1;
+
+        .inline-follow-suggestions__body__scroll-button__icon {
+          background: lighten($ui-highlight-color, 4%);
+        }
+      }
+    }
+
+    &__scrollable {
+      display: flex;
+      flex-wrap: nowrap;
+      gap: 16px;
+      padding: 16px;
+      scroll-snap-type: x mandatory;
+      scroll-padding: 16px;
+      scroll-behavior: smooth;
+      overflow-x: scroll;
+
+      &__card {
+        background: var(--background-color);
+        border: 1px solid var(--background-border-color);
+        border-radius: 4px;
+        display: flex;
+        flex-direction: column;
+        gap: 12px;
+        align-items: center;
+        padding: 12px;
+        scroll-snap-align: start;
+        flex: 0 0 auto;
+        width: 200px;
+        box-sizing: border-box;
+        position: relative;
+
+        a {
+          text-decoration: none;
+        }
+
+        & > .icon-button {
+          position: absolute;
+          inset-inline-end: 8px;
+          top: 8px;
+          opacity: 0.75;
+        }
+
+        &__avatar {
+          height: 48px;
+          display: flex;
+
+          a {
+            display: flex;
+            text-decoration: none;
+          }
+        }
+
+        .account__avatar {
+          flex-shrink: 0;
+          align-self: flex-end;
+          border: 1px solid var(--background-border-color);
+          background-color: $ui-base-color;
+        }
+
+        &__text-stack {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+          max-width: 100%;
+
+          a {
+            max-width: 100%;
+          }
+
+          &__source {
+            display: inline-flex;
+            align-items: center;
+            color: $dark-text-color;
+            gap: 4px;
+            overflow: hidden;
+            white-space: nowrap;
+            cursor: help;
+
+            > span {
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+
+            .icon {
+              width: 16px;
+              height: 16px;
+            }
+          }
+        }
+
+        .display-name {
+          display: flex;
+          flex-direction: column;
+          gap: 4px;
+          align-items: center;
+
+          & > * {
+            max-width: 100%;
+          }
+
+          &__html {
+            font-size: 15px;
+            font-weight: 500;
+            color: $secondary-text-color;
+          }
+
+          &__account {
+            font-size: 14px;
+            color: $darker-text-color;
+          }
+        }
+
+        .verified-badge {
+          font-size: 14px;
+          max-width: 100%;
+        }
+
+        .button {
+          display: block;
+          width: 100%;
+        }
+      }
+    }
+  }
+}
+
+.filtered-notifications-banner {
+  display: flex;
+  align-items: center;
+  border: 1px solid var(--background-border-color);
+  border-top: 0;
+  padding: 24px 32px;
+  gap: 16px;
+  color: $darker-text-color;
+  text-decoration: none;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $secondary-text-color;
+  }
+
+  .icon {
+    width: 24px;
+    height: 24px;
+    padding: 2px;
+  }
+
+  &__text {
+    flex: 1 1 auto;
+    font-style: 14px;
+    line-height: 20px;
+
+    strong {
+      font-size: 16px;
+      line-height: 24px;
+      display: block;
+    }
+  }
+
+  &__badge {
+    display: flex;
+    align-items: center;
+    border-radius: 999px;
+    background: var(--background-border-color);
+    color: $darker-text-color;
+    padding: 4px;
+    padding-inline-end: 8px;
+    gap: 6px;
+    font-weight: 500;
+    font-size: 11px;
+    line-height: 16px;
+    word-break: keep-all;
+
+    &__badge {
+      background: $ui-button-background-color;
+      color: $white;
+      border-radius: 100px;
+      padding: 2px 8px;
+    }
+  }
+}
+
+.notification-request {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 15px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__link {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex: 1 1 auto;
+    text-decoration: none;
+    color: inherit;
+    overflow: hidden;
+
+    .account__avatar {
+      flex-shrink: 0;
+    }
+  }
+
+  &__name {
+    flex: 1 1 auto;
+    color: $darker-text-color;
+    font-style: 14px;
+    line-height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &__display-name {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      font-size: 16px;
+      letter-spacing: 0.5px;
+      line-height: 24px;
+      color: $secondary-text-color;
+    }
+
+    .filtered-notifications-banner__badge {
+      background: $ui-button-background-color;
+      border-radius: 4px;
+      padding: 1px 6px;
+      color: $white;
+    }
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .icon-button {
+      border-radius: 4px;
+      border: 1px solid var(--background-border-color);
+      padding: 5px;
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 3d646da239..8a472d75b1 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -40,13 +40,12 @@
   .compose-form {
     width: 400px;
     margin: 0 auto;
-    padding: 20px 0;
-    margin-top: 40px;
+    padding: 10px 0;
+    padding-bottom: 20px;
     box-sizing: border-box;
 
     @media screen and (width <= 400px) {
       width: 100%;
-      margin-top: 0;
       padding: 20px;
     }
   }
@@ -56,13 +55,15 @@
   width: 400px;
   margin: 0 auto;
   display: flex;
-  font-size: 13px;
-  line-height: 18px;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+  line-height: 20px;
   box-sizing: border-box;
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   @media screen and (width <= 440px) {
     width: 100%;
@@ -71,9 +72,9 @@
   }
 
   .avatar {
-    width: 40px;
-    height: 40px;
-    margin-inline-end: 10px;
+    width: 48px;
+    height: 48px;
+    flex: 0 0 auto;
 
     img {
       width: 100%;
@@ -87,13 +88,14 @@
   .name {
     flex: 1 1 auto;
     color: $secondary-text-color;
-    width: calc(100% - 90px);
 
     .username {
       display: block;
-      font-weight: 500;
+      font-size: 16px;
+      line-height: 24px;
       text-overflow: ellipsis;
       overflow: hidden;
+      color: $primary-text-color;
     }
   }
 
@@ -101,6 +103,62 @@
     display: block;
     font-size: 32px;
     line-height: 40px;
-    margin-inline-start: 10px;
+    flex: 0 0 auto;
+  }
+}
+
+.redirect {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  font-size: 14px;
+  line-height: 18px;
+
+  &__logo {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 30px;
+
+    img {
+      height: 48px;
+    }
+  }
+
+  &__message {
+    text-align: center;
+
+    h1 {
+      font-size: 17px;
+      line-height: 22px;
+      font-weight: 700;
+      margin-bottom: 30px;
+    }
+
+    p {
+      margin-bottom: 30px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    a {
+      color: $highlight-text-color;
+      font-weight: 500;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__link {
+    margin-top: 15px;
   }
 }
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index c7247c3a57..dd371feb15 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -1,7 +1,6 @@
 .emoji-mart {
   font-size: 13px;
   display: inline-block;
-  color: $inverted-text-color;
 
   &,
   * {
@@ -15,20 +14,8 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid darken($ui-secondary-color, 8%);
-
   &:first-child {
-    border-bottom-width: 1px;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-    background: $ui-secondary-color;
-  }
-
-  &:last-child {
-    border-top-width: 1px;
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    display: none;
+    background: var(--dropdown-border-color);
   }
 }
 
@@ -36,7 +23,6 @@
   display: flex;
   justify-content: space-between;
   padding: 0 6px;
-  color: $lighter-text-color;
   line-height: 0;
 }
 
@@ -50,9 +36,10 @@
   cursor: pointer;
   background: transparent;
   border: 0;
+  color: $darker-text-color;
 
   &:hover {
-    color: darken($lighter-text-color, 4%);
+    color: lighten($darker-text-color, 4%);
   }
 }
 
@@ -60,7 +47,7 @@
   color: $highlight-text-color;
 
   &:hover {
-    color: darken($highlight-text-color, 4%);
+    color: lighten($highlight-text-color, 4%);
   }
 
   .emoji-mart-anchor-bar {
@@ -95,7 +82,6 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: $simple-background-color;
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -107,7 +93,6 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: $simple-background-color;
   position: relative;
 
   input {
@@ -118,19 +103,20 @@
     font-family: inherit;
     display: block;
     width: 100%;
-    background: rgba($ui-secondary-color, 0.3);
-    color: $inverted-text-color;
-    border: 1px solid $ui-secondary-color;
+    background: $ui-base-color;
+    color: $darker-text-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 4px;
 
     &::-moz-focus-inner {
       border: 0;
     }
 
-    &::-moz-focus-inner,
-    &:focus,
-    &:active {
-      outline: 0 !important;
+    &:active,
+    &:focus {
+      outline: none !important;
+      border-width: 1px !important;
+      border-color: $ui-button-background-color;
     }
 
     &::-webkit-search-cancel-button {
@@ -155,17 +141,21 @@
   &:disabled {
     cursor: default;
     pointer-events: none;
-    opacity: 0.3;
   }
 
   svg {
-    fill: $action-button-color;
+    fill: $darker-text-color;
   }
 }
 
 .emoji-mart-category .emoji-mart-emoji {
   cursor: pointer;
 
+  &.emoji-mart-emoji-custom img {
+    width: auto !important;
+    min-width: 22px;
+  }
+
   span {
     z-index: 1;
     position: relative;
@@ -180,7 +170,7 @@
     inset-inline-start: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba($ui-secondary-color, 0.7);
+    background-color: var(--dropdown-border-color);
     border-radius: 100%;
   }
 }
@@ -197,7 +187,6 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: $simple-background-color;
   }
 }
 
@@ -241,7 +230,7 @@
 
 .emoji-mart-no-results {
   font-size: 14px;
-  color: $light-text-color;
+  color: $dark-text-color;
   text-align: center;
   padding: 5px 6px;
   padding-top: 70px;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 555d43cc1c..c909641a6b 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -111,18 +111,30 @@ code {
         margin-top: -2px;
       }
     }
+
+    .kmyblue {
+      position: absolute;
+      margin: 0 4px;
+      margin-top: -2px;
+    }
   }
 
   .row {
     display: flex;
     margin: 0 -5px;
 
-    .input {
+    .input,
+    .fields-label {
       box-sizing: border-box;
       flex: 1 1 auto;
       width: 50%;
       padding: 0 5px;
     }
+
+    .fields-label {
+      font-weight: bold;
+      margin-left: 12px;
+    }
   }
 
   .title {
@@ -1078,6 +1090,7 @@ code {
 
       &__type {
         color: $darker-text-color;
+        word-break: break-word;
       }
     }
 
@@ -1133,6 +1146,10 @@ code {
     margin-top: 10px;
     white-space: nowrap;
   }
+
+  .template-row {
+    display: none;
+  }
 }
 
 .progress-tracker {
@@ -1312,6 +1329,12 @@ code {
         font-weight: 600;
       }
 
+      .hint {
+        display: block;
+        font-size: 14px;
+        color: $darker-text-color;
+      }
+
       .recommended {
         position: absolute;
         margin: 0 4px;
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 0b7220b21d..60e7d62245 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
 .modal-layout {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}33"/></svg>')
     repeat-x bottom fixed;
   display: flex;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index 8a26e611ca..939fca3364 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -52,6 +52,8 @@
   &__option {
     position: relative;
     display: flex;
+    align-items: flex-start;
+    gap: 8px;
     padding: 6px 0;
     line-height: 18px;
     cursor: default;
@@ -78,16 +80,22 @@
       box-sizing: border-box;
       width: 100%;
       font-size: 14px;
-      color: $inverted-text-color;
+      color: $secondary-text-color;
       outline: 0;
       font-family: inherit;
-      background: $simple-background-color;
-      border: 1px solid darken($simple-background-color, 14%);
+      background: $ui-base-color;
+      border: 1px solid $darker-text-color;
       border-radius: 4px;
-      padding: 6px 10px;
+      padding: 8px 12px;
 
       &:focus {
-        border-color: $highlight-text-color;
+        border-color: $ui-highlight-color;
+      }
+
+      @media screen and (width <= 600px) {
+        font-size: 16px;
+        line-height: 24px;
+        letter-spacing: 0.5px;
       }
     }
 
@@ -96,26 +104,20 @@
     }
 
     &.editable {
-      display: flex;
       align-items: center;
       overflow: visible;
     }
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
     border: 1px solid $ui-primary-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
-    margin-inline-end: 10px;
-    top: -1px;
+    width: 17px;
+    height: 17px;
     border-radius: 50%;
-    vertical-align: middle;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 18px;
+    flex: 0 0 auto;
 
     &.checkbox {
       border-radius: 4px;
@@ -159,6 +161,15 @@
     }
   }
 
+  &__option.editable &__input {
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: $ui-primary-color;
+      border-width: 1px;
+    }
+  }
+
   &__number {
     display: inline-block;
     width: 45px;
@@ -209,90 +220,6 @@
   }
 }
 
-.compose-form__poll-wrapper {
-  border-top: 1px solid darken($simple-background-color, 8%);
-
-  ul {
-    padding: 10px;
-  }
-
-  .poll__input {
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: $ui-button-focus-background-color;
-    }
-  }
-
-  .poll__footer {
-    border-top: 1px solid darken($simple-background-color, 8%);
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    button,
-    select {
-      flex: 1 1 50%;
-
-      &:focus {
-        border-color: $highlight-text-color;
-      }
-    }
-  }
-
-  .button.button-secondary {
-    font-size: 14px;
-    font-weight: 400;
-    padding: 6px 10px;
-    height: auto;
-    line-height: inherit;
-    color: $action-button-color;
-    border-color: $action-button-color;
-    margin-inline-end: 5px;
-
-    &:hover,
-    &:focus,
-    &.active {
-      border-color: $action-button-color;
-      background-color: $action-button-color;
-      color: $ui-button-color;
-    }
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-
-    .poll__option {
-      flex: 0 0 auto;
-      width: calc(100% - (23px + 6px));
-      margin-inline-end: 6px;
-    }
-  }
-
-  select {
-    appearance: none;
-    box-sizing: border-box;
-    font-size: 14px;
-    color: $inverted-text-color;
-    display: inline-block;
-    width: auto;
-    outline: 0;
-    font-family: inherit;
-    background: $simple-background-color
-      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($simple-background-color, 14%);
-    border-radius: 4px;
-    padding: 6px 10px;
-    padding-inline-end: 30px;
-  }
-
-  .icon-button.disabled {
-    color: darken($simple-background-color, 14%);
-  }
-}
-
 .muted .poll {
   color: $dark-text-color;
 
diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss
index c77c23bc40..f713a5d10e 100644
--- a/app/javascript/styles/mastodon/rich_text.scss
+++ b/app/javascript/styles/mastodon/rich_text.scss
@@ -1,5 +1,7 @@
+.account__header__bio,
 .status__content__text,
 .e-content,
+.edit-indicator__content,
 .reply-indicator__content {
   pre,
   blockquote {
@@ -12,6 +14,32 @@
     }
   }
 
+  code,
+  pre {
+    font-family: monospace;
+  }
+
+  code {
+    margin: 0 8px;
+  }
+
+  pre {
+    padding: 4px 8px;
+
+    span.ellipsis::after {
+      content: '';
+    }
+
+    span.invisible {
+      display: inline;
+      font-size: inherit;
+      line-height: inherit;
+      width: inherit;
+      height: inherit;
+      position: static;
+    }
+  }
+
   blockquote {
     padding-inline-start: 10px;
     border-inline-start: 3px solid $darker-text-color;
@@ -54,11 +82,22 @@
   ol {
     list-style-type: decimal;
   }
-}
 
-.reply-indicator__content {
-  blockquote {
-    border-left-color: $inverted-text-color;
-    color: $inverted-text-color;
+  sup {
+    vertical-align: super;
+  }
+
+  .emojione {
+    transition: transform 0.2s ease;
+
+    &:hover {
+      transform: scale(1.2);
+    }
+  }
+}
+
+.status__content__text {
+  a.kmy-dangerous-link {
+    color: red !important;
   }
 }
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index dd5b483ec4..25206f9a5d 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -304,7 +304,8 @@ a.table-action-link {
         margin-inline-end: 10px;
 
         .emojione {
-          width: 32px;
+          min-width: 32px;
+          max-width: min(10em, 100%);
           height: 32px;
         }
       }
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 611c8bb5d1..0f2f68354b 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -14,6 +14,7 @@ $success-green: #79bd9a !default; // Padua
 $error-red: $red-500 !default; // Cerise
 $warning-red: #ff5050 !default; // Sunset Orange
 $gold-star: #ca8f04 !default; // Dark Goldenrod
+$kmyblue: #29a5f7 !default;
 
 $red-bookmark: $warning-red;
 
@@ -23,6 +24,10 @@ $classic-primary-color: #9baec8; // Echo Blue
 $classic-secondary-color: #d9e1e8; // Pattens Blue
 $classic-highlight-color: #6364ff; // Brand purple
 
+// Values for kmyblue original functions
+$emoji-reaction-color: #42485a !default;
+$emoji-reaction-selected-color: #617ed5 !default;
+
 // Variables for defaults in UI
 $base-shadow-color: $black !default;
 $base-overlay-background: $black !default;
@@ -46,10 +51,10 @@ $ui-button-focus-background-color: $blurple-600 !default;
 $ui-button-focus-outline-color: $blurple-400 !default;
 $ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
 
-$ui-button-secondary-color: $grey-100 !default;
-$ui-button-secondary-border-color: $grey-100 !default;
-$ui-button-secondary-focus-background-color: $grey-600 !default;
-$ui-button-secondary-focus-color: $white !default;
+$ui-button-secondary-color: $blurple-500 !default;
+$ui-button-secondary-border-color: $blurple-500 !default;
+$ui-button-secondary-focus-border-color: $blurple-300 !default;
+$ui-button-secondary-focus-color: $blurple-300 !default;
 
 $ui-button-tertiary-color: $blurple-300 !default;
 $ui-button-tertiary-border-color: $blurple-300 !default;
@@ -94,10 +99,16 @@ $font-display: 'mastodon-font-display' !default;
 $font-monospace: 'mastodon-font-monospace' !default;
 
 :root {
-  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
-  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-border-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
   --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
     0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
-  --modal-background-color: #{darken($ui-base-color, 4%)};
+  --modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
+  --modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
+  --background-border-color: #{lighten($ui-base-color, 4%)};
+  --background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+  --background-color: #{darken($ui-base-color, 8%)};
+  --background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
+  --surface-background-color: #{darken($ui-base-color, 4%)};
 }
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 1f69f0cf01..d35b36f28b 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -36,7 +36,8 @@
     font-weight: 400;
 
     .emojione {
-      width: 20px;
+      min-width: 20px;
+      max-width: min(10em, 100%);
       height: 20px;
       margin: -3px 0 0;
       margin-inline-start: 0.075em;
diff --git a/app/javascript/svg-icons/repeat_active.svg b/app/javascript/svg-icons/repeat_active.svg
new file mode 100644
index 0000000000..a5bbb8fc4f
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_active.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 22L3 18L7 14L8.4 15.45L6.85 17H17V13H19V19H6.85L8.4 20.55L7 22ZM5 11V5H17.15L15.6 3.45L17 2L21 6L17 10L15.6 8.55L17.15 7H7V11H5Z"/>
+<path d="M9 9H15V15H9V9Z"/>
+</svg>
diff --git a/app/javascript/svg-icons/repeat_disabled.svg b/app/javascript/svg-icons/repeat_disabled.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private.svg b/app/javascript/svg-icons/repeat_private.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private_active.svg b/app/javascript/svg-icons/repeat_private_active.svg
new file mode 100644
index 0000000000..cf2a05c84e
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_private_active.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.4 15.45L7 14L3 18L7 22L8.4 20.55L6.85 19H13.5V18C13.5 17.6567 13.5638 17.3171 13.6988 17H6.85L8.4 15.45Z"/>
+<path d="M15 14.1883C14.8435 14.443 14.7232 14.7147 14.6398 15H9V9H15V14.1883Z"/>
+<path d="M5 5V11H7V7H17.15L15.6 8.55L17 10L21 6L17 2L15.6 3.45L17.15 5H5Z"/>
+<path d="M16 22C15.7167 22 15.475 21.9083 15.275 21.725C15.0917 21.525 15 21.2833 15 21V18C15 17.7167 15.0917 17.4833 15.275 17.3C15.475 17.1 15.7167 17 16 17V16C16 15.45 16.1917 14.9833 16.575 14.6C16.975 14.2 17.45 14 18 14C18.55 14 19.0167 14.2 19.4 14.6C19.8 14.9833 20 15.45 20 16V17C20.2833 17 20.5167 17.1 20.7 17.3C20.9 17.4833 21 17.7167 21 18V21C21 21.2833 20.9 21.525 20.7 21.725C20.5167 21.9083 20.2833 22 20 22H16ZM17 17H19V16C19 15.7167 18.9 15.4833 18.7 15.3C18.5167 15.1 18.2833 15 18 15C17.7167 15 17.475 15.1 17.275 15.3C17.0917 15.4833 17 15.7167 17 16V17Z"/>
+</svg>
diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb
index f51bde4927..4e9585dd1e 100644
--- a/app/lib/access_token_extension.rb
+++ b/app/lib/access_token_extension.rb
@@ -6,6 +6,8 @@ module AccessTokenExtension
   included do
     include Redisable
 
+    has_many :web_push_subscriptions, class_name: 'Web::PushSubscription', inverse_of: :access_token
+
     after_commit :push_to_streaming_api
   end
 
diff --git a/app/lib/account_statuses_filter.rb b/app/lib/account_statuses_filter.rb
index eb7592cdce..f97d9def3e 100644
--- a/app/lib/account_statuses_filter.rb
+++ b/app/lib/account_statuses_filter.rb
@@ -26,6 +26,18 @@ class AccountStatusesFilter
     scope.merge!(no_reblogs_scope) if exclude_reblogs?
     scope.merge!(hashtag_scope)    if tagged?
 
+    available_searchabilities = [:public, :public_unlisted, :unlisted, :private, :direct, :limited, nil]
+    available_visibilities = [:public, :public_unlisted, :login, :unlisted, :private, :direct, :limited]
+
+    available_visibilities -= [:public_unlisted] if (domain_block&.detect_invalid_subscription || misskey_software?) && @account.user&.setting_reject_public_unlisted_subscription
+    available_visibilities -= [:unlisted] if (domain_block&.detect_invalid_subscription || misskey_software?) && @account.user&.setting_reject_unlisted_subscription
+    available_visibilities -= [:login] if current_account.nil?
+
+    scope.merge!(scope.where(sensitive: false)) if domain_block&.reject_send_sensitive
+
+    scope.merge!(scope.where(searchability: available_searchabilities))
+    scope.merge!(scope.where(visibility: available_visibilities))
+
     scope
   end
 
@@ -34,12 +46,12 @@ class AccountStatusesFilter
   def initial_scope
     return Status.none if account.unavailable?
 
-    if anonymous?
-      account.statuses.where(visibility: %i(public unlisted))
+    if blocked?
+      Status.none
+    elsif anonymous?
+      account.statuses.distributable_visibility_for_anonymous
     elsif author?
       account.statuses.all # NOTE: #merge! does not work without the #all
-    elsif blocked?
-      Status.none
     else
       filtered_scope
     end
@@ -48,7 +60,7 @@ class AccountStatusesFilter
   def filtered_scope
     scope = account.statuses.left_outer_joins(:mentions)
 
-    scope.merge!(scope.where(visibility: follower? ? %i(public unlisted private) : %i(public unlisted)).or(scope.where(mentions: { account_id: current_account.id })).group(Status.arel_table[:id]))
+    scope.merge!(scope.where(visibility: follower? ? %i(public unlisted public_unlisted login private) : %i(public unlisted public_unlisted login)).or(scope.where(mentions: { account_id: current_account.id })).group(Status.arel_table[:id]))
     scope.merge!(filtered_reblogs_scope) if reblogs_may_occur?
 
     scope
@@ -104,6 +116,8 @@ class AccountStatusesFilter
   end
 
   def blocked?
+    return false if current_account.nil?
+
     account.blocking?(current_account) || (current_account.domain.present? && account.domain_blocking?(current_account.domain))
   end
 
@@ -138,4 +152,23 @@ class AccountStatusesFilter
   def truthy_param?(key)
     ActiveModel::Type::Boolean.new.cast(params[key])
   end
+
+  def domain_block
+    return nil if @current_account.nil? || @current_account.local?
+
+    @domain_block = DomainBlock.find_by(domain: @current_account.domain)
+  end
+
+  def misskey_software?
+    return false if @account.nil? || @account.local?
+    return false if instance_info.nil?
+
+    %w(misskey cherrypick).include?(instance_info.software)
+  end
+
+  def instance_info
+    return @instance_info if defined?(@instance_info)
+
+    @instance_info = InstanceInfo.find_by(domain: @account.domain)
+  end
 end
diff --git a/app/lib/activity_tracker.rb b/app/lib/activity_tracker.rb
index 9160ef22a6..d0e675f07d 100644
--- a/app/lib/activity_tracker.rb
+++ b/app/lib/activity_tracker.rb
@@ -24,7 +24,7 @@ class ActivityTracker
   end
 
   def get(start_at, end_at = Time.now.utc)
-    (start_at.to_date...end_at.to_date).map do |date|
+    (start_at.to_date..end_at.to_date).map do |date|
       key = key_at(date.to_time(:utc))
 
       value = case @type
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 51384ef984..5416d90015 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -37,7 +37,7 @@ class ActivityPub::Activity
         ActivityPub::Activity::Delete
       when 'Follow'
         ActivityPub::Activity::Follow
-      when 'Like'
+      when 'Like', 'EmojiReaction', 'EmojiReact'
         ActivityPub::Activity::Like
       when 'Block'
         ActivityPub::Activity::Block
@@ -154,7 +154,7 @@ class ActivityPub::Activity
     if object_uri.start_with?('http')
       return if ActivityPub::TagManager.instance.local_uri?(object_uri)
 
-      ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id])
+      ActivityPub::FetchRemoteStatusService.new.call(object_uri, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id])
     elsif @object['url'].present?
       ::FetchRemoteStatusService.new.call(@object['url'], request_id: @options[:request_id])
     end
@@ -169,7 +169,8 @@ class ActivityPub::Activity
   end
 
   def requested_through_relay?
-    @options[:relayed_through_actor] && Relay.find_by(inbox_url: @options[:relayed_through_actor].inbox_url)&.enabled?
+    @options[:relayed_through_actor] &&
+      (Relay.find_by(inbox_url: @options[:relayed_through_actor].inbox_url)&.enabled? || FriendDomain.free_receivings.exists?(inbox_url: @options[:relayed_through_actor].inbox_url))
   end
 
   def reject_payload!
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb
index 5126e23c6a..649c3503f7 100644
--- a/app/lib/activitypub/activity/accept.rb
+++ b/app/lib/activitypub/activity/accept.rb
@@ -3,6 +3,7 @@
 class ActivityPub::Activity::Accept < ActivityPub::Activity
   def perform
     return accept_follow_for_relay if relay_follow?
+    return accept_follow_for_friend if friend_follow?
     return accept_follow!(follow_request_from_object) unless follow_request_from_object.nil?
 
     case @object['type']
@@ -43,6 +44,18 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
     relay.present?
   end
 
+  def accept_follow_for_friend
+    friend.update!(active_state: :accepted, passive_state: :idle)
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain, active_follow_activity_id: object_uri, active_state: [:pending, :accepted]) if @account.domain.present?
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 9dcafff3ab..ceeccd2b3f 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Announce < ActivityPub::Activity
+  include NgRuleHelper
+
   def perform
     return reject_payload! if delete_arrived_first?(@json['id']) || !related_to_local_activity?
 
@@ -9,6 +11,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
 
       return reject_payload! if original_status.nil? || !announceable?(original_status)
       return if requested_through_relay?
+      return unless check_invalid_reaction_for_ng_rule! @account, uri: @json['id'], reaction_type: 'reblog', recipient: original_status.account, target_status: original_status
 
       @status = Status.find_by(account: @account, reblog: original_status)
 
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 5a2d33c1fa..1f8750e4c5 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -2,6 +2,7 @@
 
 class ActivityPub::Activity::Create < ActivityPub::Activity
   include FormattingHelper
+  include NgRuleHelper
 
   def perform
     @account.schedule_refresh_if_stale!
@@ -49,6 +50,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def create_status
     return reject_payload! if unsupported_object_type? || non_matching_uri_hosts?(@account.uri, object_uri) || tombstone_exists? || !related_to_local_activity?
 
+    if @account.suspended?
+      process_pending_status if @account.remote_pending?
+      return
+    end
+
     with_redis_lock("create:#{object_uri}") do
       return if delete_arrived_first?(object_uri) || poll_vote?
 
@@ -61,7 +67,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       end
     end
 
-    @status
+    @status || reject_payload!
   end
 
   def audience_to
@@ -77,11 +83,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @mentions             = []
     @silenced_account_ids = []
     @params               = {}
+    @raw_mention_uris     = []
 
     process_status_params
+    process_sensitive_words
     process_tags
     process_audience
 
+    return nil unless valid_status?
+    return nil if (mention_to_local_stranger? || reference_to_local_stranger?) && reject_reply_exclude_followers?
+
     ApplicationRecord.transaction do
       @status = Status.create!(@params)
       attach_tags(@status)
@@ -89,8 +100,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     resolve_thread(@status)
     fetch_replies(@status)
+    process_conversation! if @status.limited_visibility?
+    process_references!
     distribute
     forward_for_reply
+    join_group!
   end
 
   def distribute
@@ -108,9 +122,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status_params
-    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
+    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object, account: @account, friend_domain: friend_domain?)
 
-    attachment_ids = process_attachments.take(4).map(&:id)
+    attachment_ids = process_attachments.take(MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX).map(&:id)
 
     @params = {
       uri: @status_parser.uri,
@@ -125,15 +139,62 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       reply: @status_parser.reply,
       sensitive: @account.sensitized? || @status_parser.sensitive || false,
       visibility: @status_parser.visibility,
+      limited_scope: @status_parser.limited_scope,
+      searchability: @status_parser.searchability,
       thread: replied_to_status,
-      conversation: conversation_from_uri(@object['conversation']),
+      conversation: conversation_from_activity,
       media_attachment_ids: attachment_ids,
       ordered_media_attachment_ids: attachment_ids,
       poll: process_poll,
     }
   end
 
-  def process_audience
+  def process_sensitive_words
+    return unless %i(public public_unlisted login).include?(@params[:visibility].to_sym) && Admin::SensitiveWord.sensitive?(@params[:text], @params[:spoiler_text], local: false)
+
+    @params[:text] = Admin::SensitiveWord.modified_text(@params[:text], @params[:spoiler_text])
+    @params[:spoiler_text] = Admin::SensitiveWord.alternative_text
+    @params[:sensitive] = true
+  end
+
+  def valid_status?
+    valid = true
+    valid = false if valid && !valid_status_for_ng_rule?
+    valid = !Admin::NgWord.reject?("#{@params[:spoiler_text]}\n#{@params[:text]}", uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, stranger: mention_to_local_stranger? || reference_to_local_stranger?) if valid
+    valid = !Admin::NgWord.hashtag_reject?(@tags.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, text: "#{@params[:spoiler_text]}\n#{@params[:text]}") if valid
+    valid = !Admin::NgWord.mention_reject?(@raw_mention_uris.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?, text: "#{@params[:spoiler_text]}\n#{@params[:text]}") if valid
+    if valid && (mention_to_local_stranger? || reference_to_local_stranger?)
+      valid = !Admin::NgWord.stranger_mention_reject_with_count?(@raw_mention_uris.size, uri: @params[:uri], target_type: :status, public: @status_parser.distributable_visibility?,
+                                                                                         text: "#{@params[:spoiler_text]}\n#{@params[:text]}")
+    end
+    valid = false if valid && Setting.block_unfollow_account_mention && (mention_to_local_stranger? || reference_to_local_stranger?) && !local_following_sender?
+
+    valid
+  end
+
+  def valid_status_for_ng_rule?
+    check_invalid_status_for_ng_rule! @account,
+                                      reaction_type: 'create',
+                                      uri: @params[:uri],
+                                      url: @params[:url],
+                                      spoiler_text: @params[:spoiler_text],
+                                      text: @params[:text],
+                                      tag_names: @tags.map(&:name),
+                                      visibility: @params[:visibility].to_s,
+                                      searchability: @params[:searchability]&.to_s,
+                                      sensitive: @params[:sensitive],
+                                      media_count: @params[:media_attachment_ids]&.size,
+                                      poll_count: @params[:poll]&.options&.size || 0,
+                                      quote: quote,
+                                      reply: in_reply_to_uri.present?,
+                                      mention_count: mentioned_accounts.count,
+                                      reference_count: reference_uris.size,
+                                      mention_to_following: !(mention_to_local_stranger? || reference_to_local_stranger?)
+  end
+
+  def accounts_in_audience
+    return @accounts_in_audience if @accounts_in_audience
+
     # Unlike with tags, there is no point in resolving accounts we don't already
     # know here, because silent mentions would only be used for local access control anyway
     accounts_in_audience = (audience_to + audience_cc).uniq.filter_map do |audience|
@@ -147,6 +208,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       accounts_in_audience.uniq!
     end
 
+    @accounts_in_audience = accounts_in_audience
+  end
+
+  def process_audience
     accounts_in_audience.each do |account|
       # This runs after tags are processed, and those translate into non-silent
       # mentions, which take precedence
@@ -165,6 +230,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @silenced_account_ids = @mentions.map(&:account_id) - accounts_in_audience.map(&:id)
   end
 
+  def account_representative
+    accounts_in_audience.detect(&:local?) || Account.representative
+  end
+
   def postprocess_audience_and_deliver
     return if @status.mentions.find_by(account_id: @options[:delivered_to_account_id])
 
@@ -212,7 +281,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_hashtag(tag)
-    return if tag['name'].blank?
+    return if tag['name'].blank? || ignore_hashtags?
 
     Tag.find_or_create_by_names(tag['name']) do |hashtag|
       @tags << hashtag unless @tags.include?(hashtag) || !hashtag.valid?
@@ -224,6 +293,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def process_mention(tag)
     return if tag['href'].blank?
 
+    @raw_mention_uris << tag['href']
+
     account = account_from_uri(tag['href'])
     account = ActivityPub::FetchRemoteAccountService.new.call(tag['href'], request_id: @options[:request_id]) if account.nil?
 
@@ -241,11 +312,21 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
 
-    return unless emoji.nil? || custom_emoji_parser.image_remote_url != emoji.image_remote_url || (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
+    return unless emoji.nil? ||
+                  custom_emoji_parser.image_remote_url != emoji.image_remote_url ||
+                  (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at) ||
+                  custom_emoji_parser.license != emoji.license
 
     begin
-      emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri)
+      emoji ||= CustomEmoji.new(
+        domain: @account.domain,
+        shortcode: custom_emoji_parser.shortcode,
+        uri: custom_emoji_parser.uri
+      )
       emoji.image_remote_url = custom_emoji_parser.image_remote_url
+      emoji.license = custom_emoji_parser.license
+      emoji.is_sensitive = custom_emoji_parser.is_sensitive
+      emoji.aliases = custom_emoji_parser.aliases
       emoji.save
     rescue Seahorse::Client::NetworkingError => e
       Rails.logger.warn "Error storing emoji: #{e}"
@@ -260,7 +341,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     as_array(@object['attachment']).each do |attachment|
       media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
 
-      next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4
+      next if media_attachment_parser.remote_url.blank? || media_attachments.size >= MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX
 
       begin
         media_attachment = MediaAttachment.create(
@@ -310,6 +391,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def poll_vote?
     return false if replied_to_status.nil? || replied_to_status.preloadable_poll.nil? || !replied_to_status.local? || !replied_to_status.preloadable_poll.options.include?(@object['name'])
 
+    return true unless check_invalid_reaction_for_ng_rule! @account, uri: @json['id'], reaction_type: 'vote', recipient: replied_to_status.account, target_status: replied_to_status
+
     poll_vote! unless replied_to_status.preloadable_poll.expired?
 
     true
@@ -320,7 +403,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     already_voted = true
 
     with_redis_lock("vote:#{replied_to_status.poll_id}:#{@account.id}") do
-      already_voted = poll.votes.where(account: @account).exists?
+      already_voted = poll.votes.exists?(account: @account)
       poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: object_uri)
     end
 
@@ -328,6 +411,20 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     ActivityPub::DistributePollUpdateWorker.perform_in(3.minutes, replied_to_status.id) unless replied_to_status.preloadable_poll.hide_totals?
   end
 
+  def process_pending_status
+    with_redis_lock("pending_status:#{@object['id']}") do
+      return if PendingStatus.exists?(uri: @object['id'])
+
+      fetch_account = as_array(@object['tag'])
+                      .filter_map { |tag| equals_or_includes?(tag['type'], 'Mention') && tag['href'] && ActivityPub::TagManager.instance.local_uri?(tag['href']) && ActivityPub::TagManager.instance.uri_to_resource(tag['href'], Account) }
+                      .first
+      fetch_account ||= (audience_to + audience_cc).filter_map { |uri| ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Account) }.first
+      fetch_account ||= Account.representative
+
+      PendingStatus.create!(account: @account, uri: @object['id'], fetch_account: fetch_account)
+    end
+  end
+
   def resolve_thread(status)
     return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri)
 
@@ -345,6 +442,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     ActivityPub::FetchRepliesWorker.perform_async(status.id, uri, { 'request_id' => @options[:request_id] }) unless uri.nil?
   end
 
+  def conversation_from_activity
+    conversation_from_context(@object['context']) || conversation_from_uri(@object['conversation'])
+  end
+
   def conversation_from_uri(uri)
     return nil if uri.nil?
     return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri)
@@ -356,6 +457,26 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
   end
 
+  def conversation_from_context(uri)
+    return nil if uri.nil? || (!uri.start_with?('https://') && !uri.start_with?('http://'))
+    return Conversation.find_by(id: ActivityPub::TagManager.instance.uri_to_local_id(uri)) if ActivityPub::TagManager.instance.local_uri?(uri)
+
+    begin
+      conversation = Conversation.find_or_create_by!(uri: uri)
+
+      json = fetch_resource_without_id_validation(uri, account_representative)
+      return conversation if json.nil? || json['type'] != 'Group'
+      return conversation if json['inbox'].blank? || json['inbox'] == conversation.inbox_url
+
+      conversation.update!(inbox_url: json['inbox'])
+      conversation
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+      retry
+    rescue Mastodon::UnexpectedResponseError
+      Conversation.find_or_create_by!(uri: uri)
+    end
+  end
+
   def replied_to_status
     return @replied_to_status if defined?(@replied_to_status)
 
@@ -390,9 +511,41 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     !replied_to_status.nil? && replied_to_status.account.local?
   end
 
+  def mention_to_local_stranger?
+    mentioned_accounts.any? { |account| account.local? && !account.following?(@account) }
+  end
+
+  def mentioned_accounts
+    return @mentioned_accounts if defined?(@mentioned_accounts)
+
+    @mentioned_accounts = (accounts_in_audience + [replied_to_status&.account] + (@mentions&.map(&:account) || [])).compact.uniq
+  end
+
+  def reference_to_local_account?
+    local_referred_accounts.any?
+  end
+
+  def reference_to_local_stranger?
+    local_referred_accounts.any? { |account| !account.following?(@account) }
+  end
+
+  def reject_reply_exclude_followers?
+    @reject_reply_exclude_followers ||= DomainBlock.reject_reply_exclude_followers?(@account.domain)
+  end
+
+  def local_following_sender?
+    ::Follow.exists?(account: Account.local, target_account: @account)
+  end
+
+  def ignore_hashtags?
+    return @ignore_hashtags if defined?(@ignore_hashtags)
+
+    @ignore_hashtags ||= DomainBlock.reject_hashtag?(@account.domain)
+  end
+
   def related_to_local_activity?
     fetch? || followed_by_local_accounts? || requested_through_relay? ||
-      responds_to_followed_account? || addresses_local_accounts?
+      responds_to_followed_account? || addresses_local_accounts? || quote_local? || free_friend_domain?
   end
 
   def responds_to_followed_account?
@@ -406,7 +559,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     return false if local_usernames.empty?
 
-    Account.local.where(username: local_usernames).exists?
+    Account.local.exists?(username: local_usernames)
   end
 
   def tombstone_exists?
@@ -419,6 +572,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
   end
 
+  def process_conversation!
+    return unless @status.conversation.present? && @status.conversation.local?
+
+    ProcessConversationService.new.call(@status)
+
+    return if @json['signature'].blank?
+
+    ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, false)
+  end
+
   def increment_voters_count!
     poll = replied_to_status.preloadable_poll
 
@@ -430,4 +593,62 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     poll.reload
     retry
   end
+
+  def reference_uris
+    return @reference_uris if defined?(@reference_uris)
+
+    @reference_uris = @object['references'].nil? ? [] : (ActivityPub::FetchReferencesService.new.call(@account, @object['references']) || []).uniq
+    @reference_uris += ProcessReferencesService.extract_uris(@object['content'] || '', remote: true)
+  end
+
+  def local_referred_accounts
+    return @local_referred_accounts if defined?(@local_referred_accounts)
+
+    local_referred_statuses = reference_uris.filter_map do |uri|
+      ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+    end.compact
+
+    @local_referred_accounts = local_referred_statuses.map(&:account)
+  end
+
+  def process_references!
+    ProcessReferencesService.call_service_without_error(@status, [], reference_uris, [quote].compact)
+  end
+
+  def quote_local?
+    url = quote
+
+    if url.present?
+      ActivityPub::TagManager.instance.uri_to_resource(url, Status)&.local?
+    else
+      false
+    end
+  end
+
+  def free_friend_domain?
+    FriendDomain.free_receivings.exists?(domain: @account.domain)
+  end
+
+  def friend_domain?
+    FriendDomain.enabled.find_by(domain: @account.domain)&.accepted?
+  end
+
+  def quote
+    @quote ||= quote_from_tags || @object['quote'] || @object['quoteUrl'] || @object['quoteURL'] || @object['_misskey_quote']
+  end
+
+  LINK_MEDIA_TYPES = ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].freeze
+
+  def quote_from_tags
+    return @quote_from_tags if defined?(@quote_from_tags)
+
+    hit_tag = as_array(@object['tag']).detect do |tag|
+      equals_or_includes?(tag['type'], 'Link') && LINK_MEDIA_TYPES.include?(tag['mediaType']) && tag['href'].present?
+    end
+    @quote_from_tags = hit_tag && hit_tag['href']
+  end
+
+  def join_group!
+    GroupReblogService.new.call(@status)
+  end
 end
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 61f6ca6997..4f02d83427 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -4,6 +4,8 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def perform
     if @account.uri == object_uri
       delete_person
+    elsif object_uri == ActivityPub::TagManager::COLLECTIONS[:public]
+      delete_friend
     else
       delete_note
     end
@@ -38,10 +40,22 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
       return if @status.nil?
 
       forwarder.forward! if forwarder.forwardable?
+      forward_for_conversation
       delete_now!
     end
   end
 
+  def forward_for_conversation
+    return unless @status.conversation.present? && @status.conversation.local? && @json['signature'].present?
+
+    ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, true)
+  end
+
+  def delete_friend
+    friend = FriendDomain.find_by(domain: @account.domain)
+    friend&.destroy
+  end
+
   def forwarder
     @forwarder ||= ActivityPub::Forwarder.new(@account, @json, @status)
   end
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 97e41ab789..75c88d964e 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -2,20 +2,30 @@
 
 class ActivityPub::Activity::Follow < ActivityPub::Activity
   include Payloadable
+  include FollowHelper
+  include NgRuleHelper
 
   def perform
+    return request_follow_for_friend if friend_follow?
+
     target_account = account_from_uri(object_uri)
 
     return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id'])
+    return unless check_invalid_reaction_for_ng_rule! @account, uri: @json['id'], reaction_type: 'follow', recipient: target_account
 
     # Update id of already-existing follow requests
-    existing_follow_request = ::FollowRequest.find_by(account: @account, target_account: target_account)
+    existing_follow_request = ::FollowRequest.find_by(account: @account, target_account: target_account) || PendingFollowRequest.find_by(account: @account, target_account: target_account)
     unless existing_follow_request.nil?
       existing_follow_request.update!(uri: @json['id'])
       return
     end
 
-    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved? || target_account.instance_actor?
+    if @account.suspended?
+      PendingFollowRequest.create!(account: @account, target_account: target_account, uri: @json['id']) if @account.remote_pending?
+      return
+    end
+
+    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved? || target_account.instance_actor? || block_new_follow?
       reject_follow_request!(target_account)
       return
     end
@@ -30,7 +40,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
 
     follow_request = FollowRequest.create!(account: @account, target_account: target_account, uri: @json['id'])
 
-    if target_account.locked? || @account.silenced?
+    if request_pending_follow?(@account, target_account)
       LocalNotificationWorker.perform_async(target_account.id, follow_request.id, 'FollowRequest', 'follow_request')
     else
       AuthorizeFollowService.new.call(@account, target_account)
@@ -42,4 +52,50 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
     json = Oj.dump(serialize_payload(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), ActivityPub::RejectFollowSerializer))
     ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url)
   end
+
+  def request_follow_for_friend
+    already_accepted = false
+
+    if friend.present?
+      already_accepted = friend.accepted?
+      friend.update!(passive_state: :pending, active_state: :idle, passive_follow_activity_id: @json['id'])
+    else
+      @friend = FriendDomain.new(domain: @account.domain, passive_state: :pending, passive_follow_activity_id: @json['id'])
+      @friend.inbox_url = @json['inboxUrl'].presence || @friend.default_inbox_url
+      @friend.save!
+    end
+
+    if already_accepted || Setting.unlocked_friend
+      friend.accept!
+
+      # Notify for admin even if unlocked
+      notify_staff_about_pending_friend_server! unless already_accepted
+    else
+      notify_staff_about_pending_friend_server!
+    end
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain) if @account.domain.present?
+  end
+
+  def friend_follow?
+    @json['object'] == ActivityPub::TagManager::COLLECTIONS[:public] && !block_friend?
+  end
+
+  def block_friend?
+    @block_friend ||= DomainBlock.reject_friend?(@account.domain) || DomainBlock.blocked?(@account.domain)
+  end
+
+  def block_new_follow?
+    @block_new_follow ||= DomainBlock.reject_new_follow?(@account.domain)
+  end
+
+  def notify_staff_about_pending_friend_server!
+    User.those_who_can(:manage_federation).includes(:account).find_each do |u|
+      next unless u.allows_pending_friend_server_emails?
+
+      AdminMailer.with(recipient: u.account).new_pending_friend_server(friend).deliver_later
+    end
+  end
 end
diff --git a/app/lib/activitypub/activity/like.rb b/app/lib/activitypub/activity/like.rb
index aa1dc30403..4f149857c3 100644
--- a/app/lib/activitypub/activity/like.rb
+++ b/app/lib/activitypub/activity/like.rb
@@ -1,14 +1,169 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Like < ActivityPub::Activity
+  include Redisable
+  include Lockable
+  include JsonLdHelper
+  include NgRuleHelper
+
   def perform
-    original_status = status_from_uri(object_uri)
+    @original_status = status_from_uri(object_uri)
 
-    return if original_status.nil? || !original_status.account.local? || delete_arrived_first?(@json['id']) || @account.favourited?(original_status)
+    return if @original_status.nil? || delete_arrived_first?(@json['id']) || block_domain? || reject_favourite?
 
-    favourite = original_status.favourites.create!(account: @account)
+    if shortcode.nil? || !Setting.enable_emoji_reaction
+      process_favourite
+    else
+      process_emoji_reaction
+    end
+  end
 
-    LocalNotificationWorker.perform_async(original_status.account_id, favourite.id, 'Favourite', 'favourite')
-    Trends.statuses.register(original_status)
+  private
+
+  def reject_favourite?
+    @reject_favourite ||= DomainBlock.reject_favourite?(@account.domain)
+  end
+
+  def process_favourite
+    return if @account.favourited?(@original_status)
+    return unless check_invalid_reaction_for_ng_rule! @account, uri: @json['id'], reaction_type: 'favourite', recipient: @original_status.account, target_status: @original_status
+
+    favourite = @original_status.favourites.create!(account: @account, uri: @json['id'])
+
+    LocalNotificationWorker.perform_async(@original_status.account_id, favourite.id, 'Favourite', 'favourite')
+    Trends.statuses.register(@original_status)
+  end
+
+  def process_emoji_reaction
+    return if !@original_status.account.local? && !Setting.receive_other_servers_emoji_reaction
+    return if (silence_domain? || @account.silenced?) && (!@original_status.local? || !@original_status.account.following?(@account))
+
+    # custom emoji
+    emoji = nil
+    if emoji_tag.present?
+      emoji = process_emoji(emoji_tag)
+      return if emoji.nil?
+    end
+
+    return unless check_invalid_reaction_for_ng_rule! @account, uri: @json['id'], reaction_type: 'emoji_reaction', emoji_reaction_name: emoji&.shortcode || shortcode, emoji_reaction_origin_domain: emoji&.domain, recipient: @original_status.account, target_status: @original_status
+
+    reaction = nil
+
+    with_redis_lock("emoji_reaction:#{@original_status.id}") do
+      return if EmojiReaction.where(account: @account, status: @original_status).count >= EmojiReaction::EMOJI_REACTION_PER_REMOTE_ACCOUNT_LIMIT
+      return if EmojiReaction.find_by(account: @account, status: @original_status, name: shortcode)
+
+      reaction = @original_status.emoji_reactions.create!(account: @account, name: shortcode, custom_emoji: emoji, uri: @json['id'])
+    end
+
+    Trends.statuses.register(@original_status)
+    write_stream(reaction)
+
+    NotifyService.new.call(@original_status.account, :emoji_reaction, reaction) if @original_status.account.local?
+  rescue Seahorse::Client::NetworkingError, ActiveRecord::RecordInvalid
+    nil
+  end
+
+  def shortcode
+    return @shortcode if defined?(@shortcode)
+
+    @shortcode = begin
+      if @json['_misskey_reaction'] == '⭐'
+        nil
+      else
+        @json['content']&.delete(':')
+      end
+    end
+  end
+
+  def process_emoji(tag)
+    custom_emoji_parser = ActivityPub::Parser::CustomEmojiParser.new(tag)
+
+    return if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank?
+
+    domain = URI.split(custom_emoji_parser.uri)[2] || @account.domain
+
+    if domain == Rails.configuration.x.local_domain || domain == Rails.configuration.x.web_domain
+      # Block overwriting remote-but-local data
+      return CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: nil)
+    end
+
+    return if domain.present? && skip_download?(domain)
+
+    emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: domain)
+
+    return emoji unless emoji.nil? ||
+                        custom_emoji_parser.image_remote_url != emoji.image_remote_url ||
+                        (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at) ||
+                        custom_emoji_parser.license != emoji.license
+
+    custom_emoji_parser = original_emoji_parser(custom_emoji_parser) if @account.domain != domain
+    return if custom_emoji_parser.nil?
+
+    begin
+      emoji ||= CustomEmoji.new(
+        domain: domain,
+        shortcode: custom_emoji_parser.shortcode,
+        uri: custom_emoji_parser.uri
+      )
+      emoji.image_remote_url = custom_emoji_parser.image_remote_url
+      emoji.license = custom_emoji_parser.license
+      emoji.is_sensitive = custom_emoji_parser.is_sensitive
+      emoji.aliases = custom_emoji_parser.aliases
+      emoji.save
+    rescue Seahorse::Client::NetworkingError => e
+      Rails.logger.warn "Error storing emoji: #{e}"
+    end
+
+    emoji
+  end
+
+  def original_emoji_parser(custom_emoji_parser)
+    uri = custom_emoji_parser.uri
+    emoji = fetch_resource_without_id_validation(uri)
+    return nil unless emoji
+
+    parser = ActivityPub::Parser::CustomEmojiParser.new(emoji)
+    return nil unless parser.uri == uri && custom_emoji_parser.shortcode == parser.shortcode
+
+    parser
+  end
+
+  def skip_download?(domain)
+    return true if DomainBlock.reject_media?(domain)
+    return false if @account.domain == domain
+
+    DomainBlock.blocked?(domain) || (DomainBlock.silence?(domain) && !@original_status.account.following?(@account))
+  end
+
+  def block_domain?
+    DomainBlock.blocked?(@account.domain)
+  end
+
+  def silence_domain?
+    DomainBlock.silence?(@account.domain)
+  end
+
+  def misskey_favourite?
+    misskey_shortcode = @json['_misskey_reaction']&.delete(':')
+
+    misskey_shortcode == shortcode && misskey_shortcode == '⭐'
+  end
+
+  def emoji_tag
+    return @emoji_tag if defined?(@emoji_tag)
+
+    @emoji_tag = @json['tag'].is_a?(Array) ? @json['tag']&.first : @json['tag']
+  end
+
+  def write_stream(emoji_reaction)
+    emoji_group = @original_status.emoji_reactions_grouped_by_name(nil, force: true)
+                                  .find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
+    emoji_group['status_id'] = @original_status.id.to_s
+    DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if @original_status.local? ? Setting.streaming_local_emoji_reaction : Setting.streaming_other_servers_emoji_reaction
+  end
+
+  def render_emoji_reaction(emoji_group)
+    @render_emoji_reaction ||= Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
   end
 end
diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 886dddb235..e1eb3c2368 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -3,6 +3,7 @@
 class ActivityPub::Activity::Reject < ActivityPub::Activity
   def perform
     return reject_follow_for_relay if relay_follow?
+    return reject_follow_for_friend if friend_follow?
     return follow_request_from_object.reject! unless follow_request_from_object.nil?
     return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
 
@@ -37,6 +38,18 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
     relay.present?
   end
 
+  def reject_follow_for_friend
+    friend.update!(active_state: :rejected, passive_state: :idle)
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain, active_follow_activity_id: object_uri, active_state: [:pending, :accepted]) if @account.domain.present?
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end
diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb
index 9eff1b71c9..9827f9310f 100644
--- a/app/lib/activitypub/activity/undo.rb
+++ b/app/lib/activitypub/activity/undo.rb
@@ -9,7 +9,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
       undo_accept
     when 'Follow'
       undo_follow
-    when 'Like'
+    when 'Like', 'EmojiReaction', 'EmojiReact'
       undo_like
     when 'Block'
       undo_block
@@ -87,6 +87,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
   end
 
   def undo_follow
+    return remove_follow_from_friend if friend_follow?
+
     target_account = account_from_uri(target_uri)
 
     return if target_account.nil? || !target_account.local?
@@ -100,7 +102,19 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
     end
   end
 
-  def undo_like
+  def remove_follow_from_friend
+    friend.destroy_without_signal!
+  end
+
+  def friend
+    @friend ||= FriendDomain.find_by(domain: @account.domain) if @account.domain.present? && @object['object'] == ActivityPub::TagManager::COLLECTIONS[:public]
+  end
+
+  def friend_follow?
+    friend.present?
+  end
+
+  def undo_like_original
     status = status_from_uri(target_uri)
 
     return if status.nil? || !status.account.local?
@@ -113,6 +127,61 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
     end
   end
 
+  def undo_like
+    @original_status = status_from_uri(target_uri)
+
+    return if @original_status.nil?
+
+    if shortcode.present?
+      emoji_tag = @object['tag'].is_a?(Array) ? @object['tag']&.first : @object['tag']
+
+      emoji = nil
+      if emoji_tag.present? && emoji_tag['id'].present?
+        domain = URI.split(emoji_tag['id'])[2]
+        domain = nil if domain == Rails.configuration.x.local_domain || domain == Rails.configuration.x.web_domain
+        emoji = CustomEmoji.find_by(shortcode: shortcode, domain: domain) if emoji_tag.present? && emoji_tag['id'].present?
+      end
+
+      emoji_reaction = @original_status.emoji_reactions.where(account: @account, name: shortcode, custom_emoji: emoji).first
+
+      if emoji_reaction
+        emoji_reaction.destroy
+        write_stream(emoji_reaction)
+      end
+    else
+      undo_like_original
+    end
+  end
+
+  def write_stream(emoji_reaction)
+    emoji_group = @original_status.emoji_reactions_grouped_by_name
+                                  .find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
+    if emoji_group
+      emoji_group['status_id'] = @original_status.id.to_s
+    else
+      # name: emoji_reaction.name, count: 0, domain: emoji_reaction.domain
+      emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @original_status.id.to_s }
+      emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
+    end
+    DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if @original_status.local? ? Setting.streaming_local_emoji_reaction : Setting.streaming_other_servers_emoji_reaction
+  end
+
+  def render_emoji_reaction(emoji_group)
+    @render_emoji_reaction ||= Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
+  end
+
+  def shortcode
+    return @shortcode if defined?(@shortcode)
+
+    @shortcode = begin
+      if @object['_misskey_reaction'] == '⭐'
+        nil
+      else
+        @object['content']&.delete(':')
+      end
+    end
+  end
+
   def undo_block
     target_account = account_from_uri(target_uri)
 
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 973706f595..8658684b03 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -31,5 +31,15 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
     return if @status.nil?
 
     ActivityPub::ProcessStatusUpdateService.new.call(@status, @json, @object, request_id: @options[:request_id])
+
+    forward_for_conversation
+
+    @status
+  end
+
+  def forward_for_conversation
+    return unless @status.conversation.present? && @status.conversation.local? && @json['signature'].present?
+
+    ActivityPub::ForwardConversationWorker.perform_async(Oj.dump(@json), @status.id, true)
   end
 end
diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb
index bf5de72210..5f2430600e 100644
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@@ -2,6 +2,11 @@
 
 module ActivityPub::CaseTransform
   class << self
+    NO_CONVERT_VALUES = %w(
+      _misskey_content
+      _misskey_quote
+    ).freeze
+
     def camel_lower_cache
       @camel_lower_cache ||= {}
     end
@@ -12,9 +17,11 @@ module ActivityPub::CaseTransform
       when Hash then value.deep_transform_keys! { |key| camel_lower(key) }
       when Symbol then camel_lower(value.to_s).to_sym
       when String
-        camel_lower_cache[value] ||= if value.start_with?('_:')
+        camel_lower_cache[value] ||= if NO_CONVERT_VALUES.include?(value)
+                                       value
+                                     elsif value.start_with?('_:')
                                        "_:#{value.delete_prefix('_:').underscore.camelize(:lower)}"
-                                     elsif LanguagesHelper::ISO_639_1_REGIONAL.key?(value.to_sym)
+                                     elsif LanguagesHelper::ISO_639_1_REGIONAL.key?(value.to_sym) # rubocop:disable Lint/DuplicateBranch
                                        value
                                      else
                                        value.underscore.camelize(:lower)
diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index faea63e8f1..9459fdd8b7 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -19,7 +19,7 @@ class ActivityPub::LinkedDataSignature
     return unless type == 'RsaSignature2017'
 
     creator = ActivityPub::TagManager.instance.uri_to_actor(creator_uri)
-    creator = ActivityPub::FetchRemoteKeyService.new.call(creator_uri, id: false) if creator&.public_key.blank?
+    creator = ActivityPub::FetchRemoteKeyService.new.call(creator_uri) if creator&.public_key.blank?
 
     return if creator.nil?
 
diff --git a/app/lib/activitypub/parser/custom_emoji_parser.rb b/app/lib/activitypub/parser/custom_emoji_parser.rb
index 724c602150..0c38f55168 100644
--- a/app/lib/activitypub/parser/custom_emoji_parser.rb
+++ b/app/lib/activitypub/parser/custom_emoji_parser.rb
@@ -15,6 +15,10 @@ class ActivityPub::Parser::CustomEmojiParser
     @json['name']&.delete(':')
   end
 
+  def aliases
+    as_array_ex(@json['keywords'])
+  end
+
   def image_remote_url
     @json.dig('icon', 'url')
   end
@@ -24,4 +28,12 @@ class ActivityPub::Parser::CustomEmojiParser
   rescue ArgumentError
     nil
   end
+
+  def is_sensitive # rubocop:disable Naming/PredicateName
+    @json['isSensitive'].presence || false
+  end
+
+  def license
+    @json['license'] || @json['licence']
+  end
 end
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index 45f5fc5bf2..a77686dcb3 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -4,12 +4,15 @@ class ActivityPub::Parser::StatusParser
   include JsonLdHelper
 
   # @param [Hash] json
-  # @param [Hash] magic_values
-  # @option magic_values [String] :followers_collection
-  def initialize(json, magic_values = {})
-    @json         = json
-    @object       = json['object'] || json
-    @magic_values = magic_values
+  # @param [Hash] options
+  # @option options [String] :followers_collection
+  # @option options [Hash]   :object
+  def initialize(json, **options)
+    @json    = json
+    @object  = options[:object] || json['object'] || json
+    @options = options
+    @account = options[:account]
+    @friend  = options[:friend_domain]
   end
 
   def uri
@@ -76,16 +79,49 @@ class ActivityPub::Parser::StatusParser
   def visibility
     if audience_to.any? { |to| ActivityPub::TagManager.instance.public_collection?(to) }
       :public
+    elsif audience_to.include?('kmyblue:LocalPublic') && @friend
+      :public_unlisted
     elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
       :unlisted
-    elsif audience_to.include?(@magic_values[:followers_collection])
+    elsif audience_to.include?('kmyblue:LoginOnly') || audience_to.include?('as:LoginOnly') || audience_to.include?('LoginUser')
+      :login
+    elsif audience_to.include?(@options[:followers_collection])
       :private
     else
       :direct
     end
   end
 
+  def distributable_visibility?
+    %i(public public_unlisted unlisted login).include?(visibility)
+  end
+
+  def searchability
+    from_audience = searchability_from_audience
+    return from_audience if from_audience
+    return nil if default_searchability_from_bio?
+
+    searchability_from_bio || (misskey_software? ? misskey_searchability : nil)
+  end
+
+  def limited_scope
+    case @object['limitedScope']
+    when 'Mutual'
+      :mutual
+    when 'Circle'
+      :circle
+    when 'Reply'
+      :reply
+    else
+      :none
+    end
+  end
+
   def language
+    @language ||= original_language || (misskey_software? ? 'ja' : nil)
+  end
+
+  def original_language
     if content_language_map?
       @object['contentMap'].keys.first
     elsif name_language_map?
@@ -105,6 +141,12 @@ class ActivityPub::Parser::StatusParser
     as_array(@object['cc'] || @json['cc']).map { |x| value_or_id(x) }
   end
 
+  def audience_searchable_by
+    return nil if @object['searchableBy'].nil?
+
+    @audience_searchable_by = as_array(@object['searchableBy']).map { |x| value_or_id(x) }
+  end
+
   def summary_language_map?
     @object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
   end
@@ -116,4 +158,63 @@ class ActivityPub::Parser::StatusParser
   def name_language_map?
     @object['nameMap'].is_a?(Hash) && !@object['nameMap'].empty?
   end
+
+  def instance_info
+    @instance_info ||= InstanceInfo.find_by(domain: @account.domain)
+  end
+
+  def misskey_software?
+    info = instance_info
+    return false if info.nil?
+
+    %w(misskey calckey).include?(info.software)
+  end
+
+  def misskey_searchability
+    %i(public unlisted).include?(visibility) ? :public : :limited
+  end
+
+  SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/
+  SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/
+
+  def default_searchability_from_bio?
+    note = @account.note
+    return false if note.blank?
+
+    note.include?('searchable_by_default_range')
+  end
+
+  def searchability_from_bio
+    note = @account.note
+    return nil if note.blank?
+
+    searchability_bio = note.scan(SCAN_SEARCHABILITY_FEDIBIRD_RE).first || note.scan(SCAN_SEARCHABILITY_RE).first
+    return nil unless searchability_bio
+
+    searchability = searchability_bio[0]
+    return nil if searchability.nil?
+
+    searchability = :public  if %w(public all_users).include?(searchability)
+    searchability = :private if %w(followers followers_only).include?(searchability)
+    searchability = :direct  if %w(reactors reacted_users_only).include?(searchability)
+    searchability = :limited if %w(private nobody).include?(searchability)
+
+    searchability
+  end
+
+  def searchability_from_audience
+    if audience_searchable_by.nil?
+      nil
+    elsif audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
+      :public
+    elsif audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
+      :limited
+    elsif audience_searchable_by.include?('kmyblue:LocalPublic') && @friend
+      :public_unlisted
+    elsif audience_searchable_by.include?(@account.followers_url)
+      :private
+    else
+      :direct
+    end
+  end
 end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 8643286317..5cf7a67133 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -36,6 +36,8 @@ class ActivityPub::TagManager
   def uri_for(target)
     return target.uri if target.respond_to?(:local?) && !target.local?
 
+    return unless target.respond_to?(:object_type)
+
     case target.object_type
     when :person
       target.instance_actor? ? instance_actor_url : account_url(target)
@@ -45,6 +47,10 @@ class ActivityPub::TagManager
       account_status_url(target.account, target)
     when :emoji
       emoji_url(target)
+    when :emoji_reaction
+      emoji_reaction_url(target)
+    when :conversation
+      context_url(target)
     when :flag
       target.uri
     end
@@ -74,6 +80,12 @@ class ActivityPub::TagManager
     account_status_replies_url(target.account, target, page_params)
   end
 
+  def references_uri_for(target, page_params = nil)
+    raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
+
+    account_status_references_url(target.account, target, page_params)
+  end
+
   def followers_uri_for(target)
     target.local? ? account_followers_url(target) : target.followers_url.presence
   end
@@ -86,9 +98,11 @@ class ActivityPub::TagManager
     case status.visibility
     when 'public'
       [COLLECTIONS[:public]]
-    when 'unlisted', 'private'
+    when 'unlisted', 'public_unlisted', 'private'
       [account_followers_url(status.account)]
-    when 'direct', 'limited'
+    when 'login'
+      [account_followers_url(status.account), 'as:LoginOnly', 'kmyblue:LoginOnly', 'LoginUser']
+    when 'direct'
       if status.account.silenced?
         # Only notify followers if the account is locally silenced
         account_ids = status.active_mentions.pluck(:account_id)
@@ -106,9 +120,18 @@ class ActivityPub::TagManager
           result << followers_uri_for(mention.account) if mention.account.group?
         end.compact
       end
+    when 'limited'
+      # do not empty array to avoid Fedibird personal visibility
+      status.conversation.nil? ? ['kmyblue:Limited'] : [context_url(status.conversation)]
     end
   end
 
+  def to_for_friend(status)
+    to = to(status)
+    to << 'kmyblue:LocalPublic' if status.public_unlisted_visibility?
+    to
+  end
+
   # Secondary audience of a status
   # Public statuses go out to followers as well
   # Unlisted statuses go to the public as well
@@ -122,10 +145,26 @@ class ActivityPub::TagManager
     case status.visibility
     when 'public'
       cc << account_followers_url(status.account)
-    when 'unlisted'
+    when 'unlisted', 'public_unlisted'
       cc << COLLECTIONS[:public]
     end
 
+    cc + cc_private_visibility(status)
+  end
+
+  def cc_for_misskey(status)
+    if status.sending_maybe_compromised_privacy?
+      cc = cc_private_visibility(status)
+      cc << uri_for(status.reblog.account) if status.reblog?
+      return cc
+    end
+
+    cc(status)
+  end
+
+  def cc_private_visibility(status)
+    cc = []
+
     unless status.direct_visibility? || status.limited_visibility?
       if status.account.silenced?
         # Only notify followers if the account is locally silenced
@@ -169,7 +208,7 @@ class ActivityPub::TagManager
     uri_to_resource(uri, Account)
   end
 
-  def uri_to_resource(uri, klass)
+  def uri_to_resource(uri, klass, url: false)
     return if uri.nil?
 
     if local_uri?(uri)
@@ -182,9 +221,90 @@ class ActivityPub::TagManager
     elsif OStatus::TagManager.instance.local_id?(uri)
       klass.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, klass.to_s))
     else
-      klass.find_by(uri: uri.split('#').first)
+      resource   = klass.find_by(uri: uri.split('#').first)
+      resource ||= klass.where('uri != url').find_by(url: uri.split('#').first) if url
+      resource
     end
   rescue ActiveRecord::RecordNotFound
     nil
   end
+
+  def limited_scope(status)
+    case status.limited_scope
+    when 'mutual'
+      'Mutual'
+    when 'circle'
+      'Circle'
+    when 'reply'
+      'Reply'
+    else
+      ''
+    end
+  end
+
+  def subscribable_by(account)
+    case account.subscription_policy
+    when :allow
+      [COLLECTIONS[:public]]
+    when :followers_only
+      [account_followers_url(account)]
+    else
+      []
+    end
+  end
+
+  def searchable_by(status)
+    searchable_by =
+      case status.compute_searchability_activitypub
+      when 'public'
+        [COLLECTIONS[:public]]
+      when 'private'
+        [account_followers_url(status.account)]
+      when 'limited'
+        ['as:Limited', 'kmyblue:Limited']
+      else
+        []
+      end
+
+    searchable_by.concat(mentions_uris(status)).compact
+  end
+
+  def searchable_by_for_friend(status)
+    searchable = searchable_by(status)
+    searchable << 'kmyblue:LocalPublic' if status.compute_searchability_local == 'public_unlisted'
+    searchable
+  end
+
+  def account_searchable_by(account)
+    case account.compute_searchability_activitypub
+    when 'public'
+      [COLLECTIONS[:public]]
+    when 'private'
+      [account_followers_url(account)]
+    when 'limited'
+      ['as:Limited', 'kmyblue:Limited']
+    else
+      []
+    end
+  end
+
+  def mentions_uris(status)
+    if status.account.silenced?
+      # Only notify followers if the account is locally silenced
+      account_ids = status.active_mentions.pluck(:account_id)
+      uris = status.account.followers.where(id: account_ids).each_with_object([]) do |account, result|
+        result << uri_for(account)
+        result << account_followers_url(account) if account.group?
+      end
+      uris.concat(FollowRequest.where(target_account_id: status.account_id, account_id: account_ids).each_with_object([]) do |request, result|
+        result << uri_for(request.account)
+        result << account_followers_url(request.account) if request.account.group?
+      end)
+    else
+      status.active_mentions.each_with_object([]) do |mention, result|
+        result << uri_for(mention.account)
+        result << account_followers_url(mention.account) if mention.account.group?
+      end
+    end
+  end
 end
diff --git a/app/lib/admin/metrics/dimension.rb b/app/lib/admin/metrics/dimension.rb
index e0122a65b5..24f4011cab 100644
--- a/app/lib/admin/metrics/dimension.rb
+++ b/app/lib/admin/metrics/dimension.rb
@@ -2,18 +2,20 @@
 
 class Admin::Metrics::Dimension
   DIMENSIONS = {
-    languages: Admin::Metrics::Dimension::LanguagesDimension,
-    sources: Admin::Metrics::Dimension::SourcesDimension,
-    servers: Admin::Metrics::Dimension::ServersDimension,
-    space_usage: Admin::Metrics::Dimension::SpaceUsageDimension,
-    software_versions: Admin::Metrics::Dimension::SoftwareVersionsDimension,
-    tag_servers: Admin::Metrics::Dimension::TagServersDimension,
-    tag_languages: Admin::Metrics::Dimension::TagLanguagesDimension,
-    instance_accounts: Admin::Metrics::Dimension::InstanceAccountsDimension,
-    instance_languages: Admin::Metrics::Dimension::InstanceLanguagesDimension,
+    languages: LanguagesDimension,
+    sources: SourcesDimension,
+    servers: ServersDimension,
+    space_usage: SpaceUsageDimension,
+    software_versions: SoftwareVersionsDimension,
+    tag_servers: TagServersDimension,
+    tag_languages: TagLanguagesDimension,
+    instance_accounts: InstanceAccountsDimension,
+    instance_languages: InstanceLanguagesDimension,
   }.freeze
 
   def self.retrieve(dimension_keys, start_at, end_at, limit, params)
+    dimension_keys.delete('servers') unless HighLoadHelper.allow_high_load?
+
     Array(dimension_keys).filter_map do |key|
       klass = DIMENSIONS[key.to_sym]
       klass&.new(start_at, end_at, limit, klass.with_params? ? params.require(key.to_sym) : nil)
diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
index b478213808..661e6d93b7 100644
--- a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -37,11 +37,11 @@ class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Di
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 42aba8e213..2c8406d52f 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -30,10 +30,10 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 end
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index ccf556eae0..97cdaf589e 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -25,14 +25,11 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   end
 
   def ruby_version
-    yjit = defined?(RubyVM::YJIT) && RubyVM::YJIT.enabled?
-    value = "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}#{yjit ? ' +YJIT' : ''}"
-
     {
       key: 'ruby',
       human_key: 'Ruby',
-      value: value,
-      human_value: value,
+      value: "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}",
+      human_value: RUBY_DESCRIPTION,
     }
   end
 
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index cd077ff863..6e283d2c65 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -40,11 +40,11 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index fc5e49a966..db820e965c 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -40,11 +40,11 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/measure.rb b/app/lib/admin/metrics/measure.rb
index fe7e049290..afc942a04d 100644
--- a/app/lib/admin/metrics/measure.rb
+++ b/app/lib/admin/metrics/measure.rb
@@ -2,23 +2,25 @@
 
 class Admin::Metrics::Measure
   MEASURES = {
-    active_users: Admin::Metrics::Measure::ActiveUsersMeasure,
-    new_users: Admin::Metrics::Measure::NewUsersMeasure,
-    interactions: Admin::Metrics::Measure::InteractionsMeasure,
-    opened_reports: Admin::Metrics::Measure::OpenedReportsMeasure,
-    resolved_reports: Admin::Metrics::Measure::ResolvedReportsMeasure,
-    tag_accounts: Admin::Metrics::Measure::TagAccountsMeasure,
-    tag_uses: Admin::Metrics::Measure::TagUsesMeasure,
-    tag_servers: Admin::Metrics::Measure::TagServersMeasure,
-    instance_accounts: Admin::Metrics::Measure::InstanceAccountsMeasure,
-    instance_media_attachments: Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure,
-    instance_reports: Admin::Metrics::Measure::InstanceReportsMeasure,
-    instance_statuses: Admin::Metrics::Measure::InstanceStatusesMeasure,
-    instance_follows: Admin::Metrics::Measure::InstanceFollowsMeasure,
-    instance_followers: Admin::Metrics::Measure::InstanceFollowersMeasure,
+    active_users: ActiveUsersMeasure,
+    new_users: NewUsersMeasure,
+    interactions: InteractionsMeasure,
+    opened_reports: OpenedReportsMeasure,
+    resolved_reports: ResolvedReportsMeasure,
+    tag_accounts: TagAccountsMeasure,
+    tag_uses: TagUsesMeasure,
+    tag_servers: TagServersMeasure,
+    instance_accounts: InstanceAccountsMeasure,
+    instance_media_attachments: InstanceMediaAttachmentsMeasure,
+    instance_reports: InstanceReportsMeasure,
+    instance_statuses: InstanceStatusesMeasure,
+    instance_follows: InstanceFollowsMeasure,
+    instance_followers: InstanceFollowersMeasure,
   }.freeze
 
   def self.retrieve(measure_keys, start_at, end_at, params)
+    measure_keys.delete('instance_statuses') unless HighLoadHelper.allow_high_load?
+
     Array(measure_keys).filter_map do |key|
       klass = MEASURES[key.to_sym]
       klass&.new(start_at, end_at, klass.with_params? ? params.require(key.to_sym) : nil)
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 2d4b5f56b0..1d2dbbe414 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -50,7 +50,7 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
             AND #{account_domain_sql(params[:include_subdomains])}
         )
-        SELECT SUM(size) FROM new_media_attachments
+        SELECT COALESCE(SUM(size), 0) FROM new_media_attachments
       ) AS value
       FROM (
         SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 8c71c66145..b918a30a57 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -51,11 +51,11 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def time_period
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index e6378b8021..f273d739d0 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -28,26 +28,29 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
   def sql_query_string
     <<~SQL.squish
       SELECT axis.*, (
-        SELECT count(distinct accounts.domain) AS value
-        FROM statuses
-        INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
-        INNER JOIN accounts ON statuses.account_id = accounts.id
-        WHERE statuses_tags.tag_id = :tag_id
-          AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
-          AND date_trunc('day', statuses.created_at)::date = axis.day
-      )
+        WITH tag_servers AS (
+          SELECT DISTINCT accounts.domain
+          FROM statuses
+          INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
+          INNER JOIN accounts ON statuses.account_id = accounts.id
+          WHERE statuses_tags.tag_id = :tag_id
+            AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
+            AND date_trunc('day', statuses.created_at)::date = axis.period
+        )
+        SELECT COUNT(*) FROM tag_servers
+      ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, ('1 day')::interval) AS day
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) as axis
     SQL
   end
 
   def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
   end
 
   def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at, with_random: false)
+    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
   end
 
   def tag
diff --git a/app/lib/admin/system_check/media_privacy_check.rb b/app/lib/admin/system_check/media_privacy_check.rb
index 1df05b120e..2ddc8e8b07 100644
--- a/app/lib/admin/system_check/media_privacy_check.rb
+++ b/app/lib/admin/system_check/media_privacy_check.rb
@@ -78,7 +78,7 @@ class Admin::SystemCheck::MediaPrivacyCheck < Admin::SystemCheck::BaseCheck
     @media_attachment ||= begin
       attachment = Account.representative.media_attachments.first
       if attachment.present?
-        attachment.touch # rubocop:disable Rails/SkipsModelValidations
+        attachment.touch
         attachment
       else
         create_test_attachment!
diff --git a/app/lib/admin/system_check/sidekiq_process_check.rb b/app/lib/admin/system_check/sidekiq_process_check.rb
index d577b3bf3c..4c7447e4da 100644
--- a/app/lib/admin/system_check/sidekiq_process_check.rb
+++ b/app/lib/admin/system_check/sidekiq_process_check.rb
@@ -8,6 +8,7 @@ class Admin::SystemCheck::SidekiqProcessCheck < Admin::SystemCheck::BaseCheck
     pull
     scheduler
     ingress
+    perishable
   ).freeze
 
   def skip?
diff --git a/app/lib/annual_report.rb b/app/lib/annual_report.rb
new file mode 100644
index 0000000000..cf4297f2a4
--- /dev/null
+++ b/app/lib/annual_report.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class AnnualReport
+  include DatabaseHelper
+
+  SOURCES = [
+    AnnualReport::Archetype,
+    AnnualReport::TypeDistribution,
+    AnnualReport::TopStatuses,
+    AnnualReport::MostUsedApps,
+    AnnualReport::CommonlyInteractedWithAccounts,
+    AnnualReport::TimeSeries,
+    AnnualReport::TopHashtags,
+    AnnualReport::MostRebloggedAccounts,
+    AnnualReport::Percentiles,
+  ].freeze
+
+  SCHEMA = 1
+
+  def initialize(account, year)
+    @account = account
+    @year = year
+  end
+
+  def generate
+    return if GeneratedAnnualReport.exists?(account: @account, year: @year)
+
+    GeneratedAnnualReport.create(
+      account: @account,
+      year: @year,
+      schema_version: SCHEMA,
+      data: data
+    )
+  end
+
+  private
+
+  def data
+    with_read_replica do
+      SOURCES.each_with_object({}) { |klass, hsh| hsh.merge!(klass.new(@account, @year).generate) }
+    end
+  end
+end
diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
new file mode 100644
index 0000000000..ea9ef366df
--- /dev/null
+++ b/app/lib/annual_report/archetype.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AnnualReport::Archetype < AnnualReport::Source
+  # Average number of posts (including replies and reblogs) made by
+  # each active user in a single year (2023)
+  AVERAGE_PER_YEAR = 113
+
+  def generate
+    {
+      archetype: archetype,
+    }
+  end
+
+  private
+
+  def archetype
+    if (standalone_count + replies_count + reblogs_count) < AVERAGE_PER_YEAR
+      :lurker
+    elsif reblogs_count > (standalone_count * 2)
+      :booster
+    elsif polls_count > (standalone_count * 0.1) # standalone_count includes posts with polls
+      :pollster
+    elsif replies_count > (standalone_count * 2)
+      :replier
+    else
+      :oracle
+    end
+  end
+
+  def polls_count
+    @polls_count ||= base_scope.where.not(poll_id: nil).count
+  end
+
+  def reblogs_count
+    @reblogs_count ||= base_scope.where.not(reblog_of_id: nil).count
+  end
+
+  def replies_count
+    @replies_count ||= base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
+  end
+
+  def standalone_count
+    @standalone_count ||= base_scope.without_replies.without_reblogs.count
+  end
+
+  def base_scope
+    @account.statuses.where(id: year_as_snowflake_range)
+  end
+end
diff --git a/app/lib/annual_report/commonly_interacted_with_accounts.rb b/app/lib/annual_report/commonly_interacted_with_accounts.rb
new file mode 100644
index 0000000000..af5e854c22
--- /dev/null
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::CommonlyInteractedWithAccounts < AnnualReport::Source
+  SET_SIZE = 40
+
+  def generate
+    {
+      commonly_interacted_with_accounts: commonly_interacted_with_accounts.map do |(account_id, count)|
+                                           {
+                                             account_id: account_id,
+                                             count: count,
+                                           }
+                                         end,
+    }
+  end
+
+  private
+
+  def commonly_interacted_with_accounts
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('in_reply_to_account_id, count(*) AS total'))
+  end
+end
diff --git a/app/lib/annual_report/most_reblogged_accounts.rb b/app/lib/annual_report/most_reblogged_accounts.rb
new file mode 100644
index 0000000000..e3e8a7c90b
--- /dev/null
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostRebloggedAccounts < AnnualReport::Source
+  SET_SIZE = 10
+
+  def generate
+    {
+      most_reblogged_accounts: most_reblogged_accounts.map do |(account_id, count)|
+                                 {
+                                   account_id: account_id,
+                                   count: count,
+                                 }
+                               end,
+    }
+  end
+
+  private
+
+  def most_reblogged_accounts
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(reblog_of_id: nil).joins(reblog: :account).group('accounts.id').having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('accounts.id, count(*) as total'))
+  end
+end
diff --git a/app/lib/annual_report/most_used_apps.rb b/app/lib/annual_report/most_used_apps.rb
new file mode 100644
index 0000000000..85ff1ff86e
--- /dev/null
+++ b/app/lib/annual_report/most_used_apps.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostUsedApps < AnnualReport::Source
+  SET_SIZE = 10
+
+  def generate
+    {
+      most_used_apps: most_used_apps.map do |(name, count)|
+                        {
+                          name: name,
+                          count: count,
+                        }
+                      end,
+    }
+  end
+
+  private
+
+  def most_used_apps
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).joins(:application).group('oauth_applications.name').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('oauth_applications.name, count(*) as total'))
+  end
+end
diff --git a/app/lib/annual_report/percentiles.rb b/app/lib/annual_report/percentiles.rb
new file mode 100644
index 0000000000..9fe4698ee5
--- /dev/null
+++ b/app/lib/annual_report/percentiles.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class AnnualReport::Percentiles < AnnualReport::Source
+  def generate
+    {
+      percentiles: {
+        followers: (total_with_fewer_followers / (total_with_any_followers + 1.0)) * 100,
+        statuses: (total_with_fewer_statuses / (total_with_any_statuses + 1.0)) * 100,
+      },
+    }
+  end
+
+  private
+
+  def followers_gained
+    @followers_gained ||= @account.passive_relationships.where("date_part('year', follows.created_at) = ?", @year).count
+  end
+
+  def statuses_created
+    @statuses_created ||= @account.statuses.where(id: year_as_snowflake_range).count
+  end
+
+  def total_with_fewer_followers
+    @total_with_fewer_followers ||= Follow.find_by_sql([<<~SQL.squish, { year: @year, comparison: followers_gained }]).first.total
+      WITH tmp0 AS (
+        SELECT follows.target_account_id
+        FROM follows
+        INNER JOIN accounts ON accounts.id = follows.target_account_id
+        WHERE date_part('year', follows.created_at) = :year
+          AND accounts.domain IS NULL
+        GROUP BY follows.target_account_id
+        HAVING COUNT(*) < :comparison
+      )
+      SELECT count(*) AS total
+      FROM tmp0
+    SQL
+  end
+
+  def total_with_fewer_statuses
+    @total_with_fewer_statuses ||= Status.find_by_sql([<<~SQL.squish, { comparison: statuses_created, min_id: year_as_snowflake_range.first, max_id: year_as_snowflake_range.last }]).first.total
+      WITH tmp0 AS (
+        SELECT statuses.account_id
+        FROM statuses
+        INNER JOIN accounts ON accounts.id = statuses.account_id
+        WHERE statuses.id BETWEEN :min_id AND :max_id
+          AND accounts.domain IS NULL
+        GROUP BY statuses.account_id
+        HAVING count(*) < :comparison
+      )
+      SELECT count(*) AS total
+      FROM tmp0
+    SQL
+  end
+
+  def total_with_any_followers
+    @total_with_any_followers ||= Follow.where("date_part('year', follows.created_at) = ?", @year).joins(:target_account).merge(Account.local).count('distinct follows.target_account_id')
+  end
+
+  def total_with_any_statuses
+    @total_with_any_statuses ||= Status.where(id: year_as_snowflake_range).joins(:account).merge(Account.local).count('distinct statuses.account_id')
+  end
+end
diff --git a/app/lib/annual_report/source.rb b/app/lib/annual_report/source.rb
new file mode 100644
index 0000000000..1ccb622676
--- /dev/null
+++ b/app/lib/annual_report/source.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AnnualReport::Source
+  attr_reader :account, :year
+
+  def initialize(account, year)
+    @account = account
+    @year = year
+  end
+
+  protected
+
+  def year_as_snowflake_range
+    (Mastodon::Snowflake.id_at(DateTime.new(year, 1, 1))..Mastodon::Snowflake.id_at(DateTime.new(year, 12, 31)))
+  end
+end
diff --git a/app/lib/annual_report/time_series.rb b/app/lib/annual_report/time_series.rb
new file mode 100644
index 0000000000..a144bac0d1
--- /dev/null
+++ b/app/lib/annual_report/time_series.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AnnualReport::TimeSeries < AnnualReport::Source
+  def generate
+    {
+      time_series: (1..12).map do |month|
+                     {
+                       month: month,
+                       statuses: statuses_per_month[month] || 0,
+                       following: following_per_month[month] || 0,
+                       followers: followers_per_month[month] || 0,
+                     }
+                   end,
+    }
+  end
+
+  private
+
+  def statuses_per_month
+    @statuses_per_month ||= @account.statuses.reorder(nil).where(id: year_as_snowflake_range).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+
+  def following_per_month
+    @following_per_month ||= @account.active_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+
+  def followers_per_month
+    @followers_per_month ||= @account.passive_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+end
diff --git a/app/lib/annual_report/top_hashtags.rb b/app/lib/annual_report/top_hashtags.rb
new file mode 100644
index 0000000000..488dacb1b4
--- /dev/null
+++ b/app/lib/annual_report/top_hashtags.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopHashtags < AnnualReport::Source
+  SET_SIZE = 40
+
+  def generate
+    {
+      top_hashtags: top_hashtags.map do |(name, count)|
+                      {
+                        name: name,
+                        count: count,
+                      }
+                    end,
+    }
+  end
+
+  private
+
+  def top_hashtags
+    Tag.joins(:statuses).where(statuses: { id: @account.statuses.where(id: year_as_snowflake_range).reorder(nil).select(:id) }).group(:id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('COALESCE(tags.display_name, tags.name), count(*) AS total'))
+  end
+end
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
new file mode 100644
index 0000000000..1ab1709523
--- /dev/null
+++ b/app/lib/annual_report/top_statuses.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopStatuses < AnnualReport::Source
+  def generate
+    top_reblogs = base_scope.order(reblogs_count: :desc).first&.id
+    top_favourites = base_scope.where.not(id: top_reblogs).order(favourites_count: :desc).first&.id
+    top_replies = base_scope.where.not(id: [top_reblogs, top_favourites]).order(replies_count: :desc).first&.id
+
+    {
+      top_statuses: {
+        by_reblogs: top_reblogs,
+        by_favourites: top_favourites,
+        by_replies: top_replies,
+      },
+    }
+  end
+
+  def base_scope
+    @account.statuses.public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+  end
+end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
new file mode 100644
index 0000000000..fc12a6f1f4
--- /dev/null
+++ b/app/lib/annual_report/type_distribution.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AnnualReport::TypeDistribution < AnnualReport::Source
+  def generate
+    {
+      type_distribution: {
+        total: base_scope.count,
+        reblogs: base_scope.where.not(reblog_of_id: nil).count,
+        replies: base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
+        standalone: base_scope.without_replies.without_reblogs.count,
+      },
+    }
+  end
+
+  private
+
+  def base_scope
+    @account.statuses.where(id: year_as_snowflake_range)
+  end
+end
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index fb442e2c2d..400c51a023 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -4,14 +4,34 @@ module ApplicationExtension
   extend ActiveSupport::Concern
 
   included do
+    include Redisable
+
     has_many :created_users, class_name: 'User', foreign_key: 'created_by_application_id', inverse_of: :created_by_application
 
     validates :name, length: { maximum: 60 }
     validates :website, url: true, length: { maximum: 2_000 }, if: :website?
     validates :redirect_uri, length: { maximum: 2_000 }
+
+    # The relationship used between Applications and AccessTokens is using
+    # dependent: delete_all, which means the ActiveRecord callback in
+    # AccessTokenExtension is not run, so instead we manually announce to
+    # streaming that these tokens are being deleted.
+    before_destroy :push_to_streaming_api, prepend: true
   end
 
   def confirmation_redirect_uri
     redirect_uri.lines.first.strip
   end
+
+  def push_to_streaming_api
+    # TODO: #28793 Combine into a single topic
+    payload = Oj.dump(event: :kill)
+    access_tokens.in_batches do |tokens|
+      redis.pipelined do |pipeline|
+        tokens.ids.each do |id|
+          pipeline.publish("timeline:access_token:#{id}", payload)
+        end
+      end
+    end
+  end
 end
diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
index b28f5c3d7f..32ccb0b13c 100644
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -37,7 +37,7 @@ class AttachmentBatch
 
   def clear
     remove_files
-    batch.update_all(nullified_attributes) # rubocop:disable Rails/SkipsModelValidations
+    batch.update_all(nullified_attributes)
   end
 
   private
diff --git a/app/lib/chewy_config.rb b/app/lib/chewy_config.rb
new file mode 100644
index 0000000000..9de69b5147
--- /dev/null
+++ b/app/lib/chewy_config.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'yaml'
+
+class ChewyConfig
+  include Singleton
+
+  class InvalidElasticSearchVersionError < Mastodon::Error; end
+
+  CONFIG_VERSION = 1
+
+  def initialize
+    custom_config_file = Rails.root.join('.elasticsearch.yml')
+    default_config_file = Rails.root.join('config', 'elasticsearch.default.yml')
+
+    custom_config = nil
+    custom_config = YAML.load_file(custom_config_file) if File.exist?(custom_config_file)
+    default_config = YAML.load_file(default_config_file)
+
+    @config = default_config.merge(custom_config || {})
+
+    raise InvalidElasticSearchVersionError, "ElasticSearch config version is missmatch. expected version=#{CONFIG_VERSION} actual version=#{@config['version']}" if @config['version'] != CONFIG_VERSION
+  end
+
+  attr_reader :config
+
+  def accounts
+    config['accounts']
+  end
+
+  def accounts_analyzers
+    config['accounts_analyzers']
+  end
+
+  def public_statuses
+    config['public_statuses']
+  end
+
+  def public_statuses_analyzers
+    config['public_statuses_analyzers']
+  end
+
+  def statuses
+    config['statuses']
+  end
+
+  def statuses_analyzers
+    config['statuses_analyzers']
+  end
+
+  def tags
+    config['tags']
+  end
+
+  def tags_analyzers
+    config['tags_analyzers']
+  end
+end
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index d938269829..e17b45d667 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -28,7 +28,7 @@ class DeliveryFailureTracker
   end
 
   def available?
-    !UnavailableDomain.where(domain: @host).exists?
+    !UnavailableDomain.exists?(domain: @host)
   end
 
   def exhausted_deliveries_days
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index 2a3683c499..6c0df0af62 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -63,6 +63,9 @@ class EmojiFormatter
   private
 
   def emoji_map
+    # from emoji_reactions_grouped_by_name (status_stat)
+    return @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.name] = [e.url, e.static_url] } if custom_emojis.first&.image.blank?
+
     @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
   end
 
@@ -78,7 +81,7 @@ class EmojiFormatter
   end
 
   def image_attributes
-    { rel: 'emoji', draggable: false, width: 16, height: 16, class: image_class_names, style: image_style }
+    { rel: 'emoji', draggable: false, height: 16, class: image_class_names, style: image_style }
   end
 
   def image_data_attributes(original_url, static_url)
@@ -90,7 +93,7 @@ class EmojiFormatter
   end
 
   def image_style
-    @options[:style]
+    "min-width:16px;#{@options[:style] || ''}"
   end
 
   def animate?
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 80b0046eea..c3c6545045 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -31,6 +31,8 @@ class EntityCache
       uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end
 
+    uncached ||= {}
+
     shortcodes.filter_map { |shortcode| cached[to_key(:emoji, shortcode, domain)] || uncached[shortcode] }
   end
 
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 53767486ff..ca11fbb40d 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -7,7 +7,7 @@ class FeedManager
   include Redisable
 
   # Maximum number of items stored in a single feed
-  MAX_ITEMS = 800
+  MAX_ITEMS = 1000
 
   # Number of items in the feed since last reblog of status
   # before the new reblog will be inserted. Must be <= MAX_ITEMS
@@ -18,7 +18,7 @@ class FeedManager
   # @yield [Account]
   # @return [void]
   def with_active_accounts(&block)
-    Account.joins(:user).where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago).find_each(&block)
+    Account.joins(:user).merge(User.signed_in_recently).find_each(&block)
   end
 
   # Redis key of a feed
@@ -37,12 +37,12 @@ class FeedManager
   # @param [Status] status
   # @param [Account|List] receiver
   # @return [Boolean]
-  def filter?(timeline_type, status, receiver)
+  def filter?(timeline_type, status, receiver, stl_home: false)
     case timeline_type
     when :home
       filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]), :home)
     when :list
-      filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list)
+      filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list, stl_home: stl_home)
     when :mentions
       filter_from_mentions?(status, receiver.id)
     when :tags
@@ -58,7 +58,7 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_home(account, status, update: false)
-    return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?)
+    return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?, update: update)
 
     trim(:home, account.id)
     PushUpdateWorker.perform_async(account.id, status.id, "timeline:#{account.id}", { 'update' => update }) if push_update_required?("timeline:#{account.id}")
@@ -83,13 +83,21 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_list(list, status, update: false)
-    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
+    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?, update: update)
 
     trim(:list, list.id)
     PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}", { 'update' => update }) if push_update_required?("timeline:list:#{list.id}")
     true
   end
 
+  def push_to_antenna(antenna, status, update: false)
+    return false unless add_to_feed(:antenna, antenna.id, status, aggregate_reblogs: antenna.account.user&.aggregates_reblogs?, update: update)
+
+    trim(:antenna, antenna.id)
+    PushUpdateWorker.perform_async(antenna.account_id, status.id, "timeline:antenna:#{antenna.id}", { 'update' => update }) if push_update_required?("timeline:antenna:#{antenna.id}")
+    true
+  end
+
   # Remove a status from a list feed and send a streaming API update
   # @param [List] list
   # @param [Status] status
@@ -102,6 +110,13 @@ class FeedManager
     true
   end
 
+  def unpush_from_antenna(antenna, status, update: false)
+    return false unless remove_from_feed(:antenna, antenna.id, status, aggregate_reblogs: antenna.account.user&.aggregates_reblogs?)
+
+    redis.publish("timeline:antenna:#{antenna.id}", Oj.dump(event: :delete, payload: status.id.to_s)) unless update
+    true
+  end
+
   # Fill a home feed with an account's statuses
   # @param [Account] from_account
   # @param [Account] into_account
@@ -109,7 +124,7 @@ class FeedManager
   def merge_into_home(from_account, into_account)
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -135,7 +150,7 @@ class FeedManager
   def merge_into_list(from_account, list)
     timeline_key = key(:list, list.id)
     aggregate    = list.account.user&.aggregates_reblogs?
-    query        = from_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
+    query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
 
     if redis.zcard(timeline_key) >= FeedManager::MAX_ITEMS / 4
       oldest_home_score = redis.zrange(timeline_key, 0, 0, with_scores: true).first.last.to_i
@@ -251,6 +266,28 @@ class FeedManager
     end
   end
 
+  def clear_from_antenna(antenna, target_account)
+    timeline_key        = key(:antenna, antenna.id)
+    timeline_status_ids = redis.zrange(timeline_key, 0, -1)
+    statuses            = Status.where(id: timeline_status_ids).select(:id, :reblog_of_id, :account_id).to_a
+    reblogged_ids       = Status.where(id: statuses.filter_map(&:reblog_of_id), account: target_account).pluck(:id)
+    with_mentions_ids   = Mention.active.where(status_id: statuses.flat_map { |s| [s.id, s.reblog_of_id] }.compact, account: target_account).pluck(:status_id)
+
+    target_statuses = statuses.select do |status|
+      status.account_id == target_account.id || reblogged_ids.include?(status.reblog_of_id) || with_mentions_ids.include?(status.id) || with_mentions_ids.include?(status.reblog_of_id)
+    end
+
+    target_statuses.each do |status|
+      unpush_from_antenna(antenna, status)
+    end
+  end
+
+  def clear_from_antennas(account, target_account)
+    Antenna.where(account: account).find_each do |antenna|
+      clear_from_antenna(antenna, target_account)
+    end
+  end
+
   # Populate home feed of account from scratch
   # @param [Account] account
   # @return [void]
@@ -274,7 +311,7 @@ class FeedManager
         next if last_status_score < oldest_home_score
       end
 
-      statuses = target_account.statuses.where(visibility: [:public, :unlisted, :private]).includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
+      statuses = target_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, :account, reblog: :account).limit(limit)
       crutches = build_crutches(account.id, statuses)
 
       statuses.each do |status|
@@ -372,10 +409,10 @@ class FeedManager
   # @param [Integer] receiver_id
   # @param [Hash] crutches
   # @return [Boolean]
-  def filter_from_home?(status, receiver_id, crutches, timeline_type = :home)
+  def filter_from_home?(status, receiver_id, crutches, timeline_type = :home, stl_home: false) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
     return false if receiver_id == status.account_id
-    return true  if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
-    return true if timeline_type != :list && crutches[:exclusive_list_users][status.account_id].present?
+    return true  if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) && !(timeline_type == :home && status.limited_visibility?)
+    return true if (timeline_type != :list || stl_home) && (crutches[:exclusive_list_users][status.account_id].present? || crutches[:exclusive_antenna_users][status.account_id].present?)
     return true if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
 
     check_for_blocks = crutches[:active_mentions][status.id] || []
@@ -389,10 +426,11 @@ class FeedManager
     return true if check_for_blocks.any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] }
     return true if crutches[:blocked_by][status.account_id]
 
-    if status.reply? && !status.in_reply_to_account_id.nil?                                                                      # Filter out if it's a reply
-      should_filter   = !crutches[:following][status.in_reply_to_account_id]                                                     # and I'm not following the person it's a reply to
-      should_filter &&= receiver_id != status.in_reply_to_account_id                                                             # and it's not a reply to me
-      should_filter &&= status.account_id != status.in_reply_to_account_id                                                       # and it's not a self-reply
+    if status.reply? && (!status.in_reply_to_account_id.nil? || (status.thread.present? && status.limited_visibility?)) # Filter out if it's a reply
+      account_id      = status.in_reply_to_account_id || status.thread.account_id
+      should_filter   = !crutches[:following][account_id]                                                     # and I'm not following the person it's a reply to
+      should_filter &&= receiver_id != account_id                                                             # and it's not a reply to me
+      should_filter &&= status.account_id != account_id                                                       # and it's not a self-reply
 
       return !!should_filter
     elsif status.reblog?                                                                                                         # Filter out a reblog
@@ -420,8 +458,8 @@ class FeedManager
     check_for_blocks = status.active_mentions.pluck(:account_id)
     check_for_blocks.push(status.in_reply_to_account) if status.reply? && !status.in_reply_to_account_id.nil?
 
-    should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions)                                                       # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
-    should_filter ||= status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists? # of if the account is silenced and I'm not following them
+    should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
+    should_filter ||= status.account.silenced? && !Follow.exists?(account_id: receiver_id, target_account_id: status.account_id) # Filter if the account is silenced and I'm not following them
 
     should_filter
   end
@@ -431,10 +469,10 @@ class FeedManager
   # @param [List] list
   # @return [Boolean]
   def filter_from_list?(status, list)
-    if status.reply? && status.in_reply_to_account_id != status.account_id
-      should_filter = status.in_reply_to_account_id != list.account_id
-      should_filter &&= !list.show_followed?
-      should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
+    if status.reply? && status.in_reply_to_account_id != status.account_id                                                       # Status is a reply to account other than status account
+      should_filter = status.in_reply_to_account_id != list.account_id                                                           # Status replies to account id other than list account
+      should_filter &&= !list.show_followed?                                                                                     # List show_followed? is false
+      should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))   # If show_list? true, check for a ListAccount with list and reply to account
 
       return !!should_filter
     end
@@ -449,7 +487,11 @@ class FeedManager
   # @param [Hash] crutches
   # @return [Boolean]
   def filter_from_tags?(status, receiver_id, crutches)
-    receiver_id == status.account_id || ((crutches[:active_mentions][status.id] || []) + [status.account_id]).any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } || crutches[:blocked_by][status.account_id] || crutches[:domain_blocking][status.account.domain]
+    receiver_id == status.account_id ||                                                                                          # Receiver is status account?
+      ((crutches[:active_mentions][status.id] || []) + [status.account_id])                                                      # For mentioned accounts or status account:
+        .any? { |target_account_id| crutches[:blocking][target_account_id] || crutches[:muting][target_account_id] } ||          #   - Target account is muted or blocked?
+      crutches[:blocked_by][status.account_id] ||                                                                                # Blocked by status account?
+      crutches[:domain_blocking][status.account.domain]                                                                          # Blocking domain of status account?
   end
 
   # Adds a status to an account's feed, returning true if a status was
@@ -461,7 +503,9 @@ class FeedManager
   # @param [Status] status
   # @param [Boolean] aggregate_reblogs
   # @return [Boolean]
-  def add_to_feed(timeline_type, account_id, status, aggregate_reblogs: true)
+  def add_to_feed(timeline_type, account_id, status, aggregate_reblogs: true, update: false)
+    return true if update
+
     timeline_key = key(timeline_type, account_id)
     reblog_key   = key(timeline_type, account_id, 'reblogs')
 
@@ -548,7 +592,7 @@ class FeedManager
   # @param [Integer] receiver_id
   # @param [Array<Status>] statuses
   # @return [Hash]
-  def build_crutches(receiver_id, statuses)
+  def build_crutches(receiver_id, statuses) # rubocop:disable Metrics/AbcSize
     crutches = {}
 
     crutches[:active_mentions] = crutches_active_mentions(statuses)
@@ -566,8 +610,12 @@ class FeedManager
     end
 
     lists = List.where(account_id: receiver_id, exclusive: true)
+    antennas = Antenna.where(list: lists, insert_feeds: true)
 
-    crutches[:following]            = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:target_account_id).index_with(true)
+    replied_accounts  = statuses.filter_map(&:in_reply_to_account_id)
+    replied_accounts += statuses.filter { |status| status.limited_visibility? && status.thread.present? }.map { |status| status.thread.account_id }
+
+    crutches[:following]            = Follow.where(account_id: receiver_id, target_account_id: replied_accounts).pluck(:target_account_id).index_with(true)
     crutches[:languages]            = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:account_id)).pluck(:target_account_id, :languages).to_h
     crutches[:hiding_reblogs]       = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map { |s| s.account_id if s.reblog? }, show_reblogs: false).pluck(:target_account_id).index_with(true)
     crutches[:blocking]             = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
@@ -575,6 +623,7 @@ class FeedManager
     crutches[:domain_blocking]      = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.flat_map { |s| [s.account.domain, s.reblog&.account&.domain] }.compact).pluck(:domain).index_with(true)
     crutches[:blocked_by]           = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| [s.account_id, s.reblog&.account_id] }.flatten.compact).pluck(:account_id).index_with(true)
     crutches[:exclusive_list_users] = ListAccount.where(list: lists, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
+    crutches[:exclusive_antenna_users] = AntennaAccount.where(antenna: antennas, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
 
     crutches
   end
diff --git a/app/lib/importer/base_importer.rb b/app/lib/importer/base_importer.rb
index 7688426b48..8f53be84b1 100644
--- a/app/lib/importer/base_importer.rb
+++ b/app/lib/importer/base_importer.rb
@@ -3,9 +3,12 @@
 class Importer::BaseImporter
   # @param [Integer] batch_size
   # @param [Concurrent::ThreadPoolExecutor] executor
-  def initialize(batch_size:, executor:)
+  def initialize(batch_size:, executor:, full: true, from: nil, to: nil)
     @batch_size = batch_size
     @executor   = executor
+    @full       = full
+    @from       = from.to_date if from.present?
+    @to         = to.to_date if to.present?
     @wait_for   = Concurrent::Set.new
   end
 
diff --git a/app/lib/importer/public_statuses_index_importer.rb b/app/lib/importer/public_statuses_index_importer.rb
index 7dfe998868..02134dc251 100644
--- a/app/lib/importer/public_statuses_index_importer.rb
+++ b/app/lib/importer/public_statuses_index_importer.rb
@@ -27,6 +27,9 @@ class Importer::PublicStatusesIndexImporter < Importer::BaseImporter
   end
 
   def scope
-    Status.indexable.reorder(nil)
+    to_index = Status.indexable.reorder(nil)
+    to_index = to_index.where('statuses.created_at >= ?', @from) if @from.present?
+    to_index = to_index.where('statuses.created_at < ?', @to) if @to.present?
+    to_index
   end
 end
diff --git a/app/lib/importer/statuses_index_importer.rb b/app/lib/importer/statuses_index_importer.rb
index 1922f65f6d..5a8fa29c86 100644
--- a/app/lib/importer/statuses_index_importer.rb
+++ b/app/lib/importer/statuses_index_importer.rb
@@ -17,11 +17,13 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
 
           bulk = ActiveRecord::Base.connection_pool.with_connection do
             to_index = index.adapter.default_scope.where(id: status_ids)
+            to_index = to_index.where('created_at >= ?', @from) if @from.present?
+            to_index = to_index.where('created_at < ?', @to) if @to.present?
             crutches = Chewy::Index::Crutch::Crutches.new index, to_index
             to_index.map do |object|
               # This is unlikely to happen, but the post may have been
               # un-interacted with since it was queued for indexing
-              if object.searchable_by.empty?
+              if object.searchable_by.empty? && %w(public public_unlisted private).exclude?(object.searchability)
                 deleted += 1
                 { delete: { _id: object.id } }
               else
@@ -49,13 +51,16 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
   end
 
   def scopes
-    [
+    targets = [
       local_statuses_scope,
       local_mentions_scope,
       local_favourites_scope,
+      local_emoji_reacted_scope,
       local_votes_scope,
       local_bookmarks_scope,
     ]
+    targets << remote_searchable_scope if @full
+    targets
   end
 
   def local_mentions_scope
@@ -66,6 +71,10 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
     Favourite.where(account: Account.local).select(:id, :status_id)
   end
 
+  def local_emoji_reacted_scope
+    EmojiReaction.where(account: Account.local).select(:id, :status_id)
+  end
+
   def local_bookmarks_scope
     Bookmark.select(:id, :status_id)
   end
@@ -77,4 +86,8 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
   def local_statuses_scope
     Status.local.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id')
   end
+
+  def remote_searchable_scope
+    Status.remote_dynamic_searchability.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id')
+  end
 end
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 0aebb13fce..b42734dd2c 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -12,8 +12,13 @@ class InlineRenderer
     when :status
       serializer = REST::StatusSerializer
       preload_associations_for_status
+    when :status_internal
+      serializer = REST::StatusInternalSerializer
+      preload_associations_for_status
     when :notification
       serializer = REST::NotificationSerializer
+    when :emoji_reaction
+      serializer = REST::EmojiReactionSerializer
     when :conversation
       serializer = REST::ConversationSerializer
     when :announcement
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index bb031986d6..07776c3699 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -156,7 +156,7 @@ class LinkDetailsExtractor
   end
 
   def title
-    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first)
+    html_entities.decode(structured_data&.headline || opengraph_tag('og:title') || document.xpath('//title').map(&:content).first).strip
   end
 
   def description
@@ -282,6 +282,6 @@ class LinkDetailsExtractor
   end
 
   def html_entities
-    @html_entities ||= HTMLEntities.new
+    @html_entities ||= HTMLEntities.new(:expanded)
   end
 end
diff --git a/app/lib/permalink_redirector.rb b/app/lib/permalink_redirector.rb
index 0dd37483e2..f551f69db8 100644
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -5,17 +5,46 @@ class PermalinkRedirector
 
   def initialize(path)
     @path = path
+    @object = nil
+  end
+
+  def object
+    @object ||= begin
+      if at_username_status_request? || statuses_status_request?
+        status = Status.find_by(id: second_segment)
+        status if status&.distributable? && !status&.local?
+      elsif at_username_request?
+        username, domain = first_segment.delete_prefix('@').split('@')
+        domain = nil if TagManager.instance.local_domain?(domain)
+        account = Account.find_remote(username, domain)
+        account unless account&.local?
+      elsif accounts_request? && record_integer_id_request?
+        account = Account.find_by(id: second_segment)
+        account unless account&.local?
+      end
+    end
   end
 
   def redirect_path
-    if at_username_status_request? || statuses_status_request?
-      find_status_url_by_id(second_segment)
-    elsif at_username_request?
-      find_account_url_by_name(first_segment)
-    elsif accounts_request? && record_integer_id_request?
-      find_account_url_by_id(second_segment)
-    elsif @path.start_with?('/deck')
-      @path.delete_prefix('/deck')
+    return ActivityPub::TagManager.instance.url_for(object) if object.present?
+
+    @path.delete_prefix('/deck') if @path.start_with?('/deck')
+  end
+
+  def redirect_uri
+    return ActivityPub::TagManager.instance.uri_for(object) if object.present?
+
+    @path.delete_prefix('/deck') if @path.start_with?('/deck')
+  end
+
+  def redirect_confirmation_path
+    case object.class.name
+    when 'Account'
+      redirect_account_path(object.id)
+    when 'Status'
+      redirect_status_path(object.id)
+    else
+      @path.delete_prefix('/deck') if @path.start_with?('/deck')
     end
   end
 
@@ -56,22 +85,4 @@ class PermalinkRedirector
   def path_segments
     @path_segments ||= @path.delete_prefix('/deck').delete_prefix('/').split('/')
   end
-
-  def find_status_url_by_id(id)
-    status = Status.find_by(id: id)
-    ActivityPub::TagManager.instance.url_for(status) if status&.distributable? && !status.account.local?
-  end
-
-  def find_account_url_by_id(id)
-    account = Account.find_by(id: id)
-    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
-  end
-
-  def find_account_url_by_name(name)
-    username, domain = name.gsub(/\A@/, '').split('@')
-    domain           = nil if TagManager.instance.local_domain?(domain)
-    account          = Account.find_remote(username, domain)
-
-    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
-  end
 end
diff --git a/app/lib/rate_limiter.rb b/app/lib/rate_limiter.rb
index 4a0b35b081..ff105443e8 100644
--- a/app/lib/rate_limiter.rb
+++ b/app/lib/rate_limiter.rb
@@ -14,6 +14,11 @@ class RateLimiter
       period: 3.hours.freeze,
     }.freeze,
 
+    emoji_reactions: {
+      limit: 300,
+      period: 3.hours.freeze,
+    }.freeze,
+
     reports: {
       limit: 400,
       period: 24.hours.freeze,
diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index 927495eace..c287ac4a24 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -4,12 +4,16 @@ class SearchQueryTransformer < Parslet::Transform
   SUPPORTED_PREFIXES = %w(
     has
     is
+    my
     language
     from
     before
     after
     during
     in
+    domain
+    order
+    searchability
   ).freeze
 
   class Query
@@ -18,6 +22,7 @@ class SearchQueryTransformer < Parslet::Transform
 
       @clauses = clauses
       @options = options
+      @searchability = options[:searchability]&.to_sym || :public
 
       flags_from_clauses!
     end
@@ -25,6 +30,8 @@ class SearchQueryTransformer < Parslet::Transform
     def request
       search = Chewy::Search::Request.new(*indexes).filter(default_filter)
 
+      search = search.filter(flag_following_only) if following_only?
+
       must_clauses.each { |clause| search = search.query.must(clause.to_query) }
       must_not_clauses.each { |clause| search = search.query.must_not(clause.to_query) }
       filter_clauses.each { |clause| search = search.filter(**clause.to_query) }
@@ -32,16 +39,32 @@ class SearchQueryTransformer < Parslet::Transform
       search
     end
 
+    def order_by
+      return @order_by if @order_by
+
+      @order_by = 'desc'
+      order_clauses.each { |clause| @order_by = clause.term }
+      @order_by
+    end
+
+    def valid
+      must_clauses.any? || must_not_clauses.any? || filter_clauses.any?
+    end
+
     private
 
     def clauses_by_operator
-      @clauses_by_operator ||= @clauses.compact.chunk(&:operator).to_h
+      @clauses_by_operator ||= @clauses.compact.group_by(&:operator).to_h
     end
 
     def flags_from_clauses!
       @flags = clauses_by_operator.fetch(:flag, []).to_h { |clause| [clause.prefix, clause.term] }
     end
 
+    def following_only?
+      @flags['following']
+    end
+
     def must_clauses
       clauses_by_operator.fetch(:must, [])
     end
@@ -54,6 +77,10 @@ class SearchQueryTransformer < Parslet::Transform
       clauses_by_operator.fetch(:filter, [])
     end
 
+    def order_clauses
+      clauses_by_operator.fetch(:order, [])
+    end
+
     def indexes
       case @flags['in']
       when 'library'
@@ -61,41 +88,140 @@ class SearchQueryTransformer < Parslet::Transform
       when 'public'
         [PublicStatusesIndex]
       else
-        [PublicStatusesIndex, StatusesIndex]
+        @options[:current_account].user&.setting_use_public_index ? [PublicStatusesIndex, StatusesIndex] : [StatusesIndex]
       end
     end
 
     def default_filter
+      definition_should = [
+        public_index,
+        searchability_limited,
+      ]
+      definition_should << searchability_public if %i(public public_unlisted).include?(@searchability)
+      definition_should << searchability_private if %i(public public_unlisted unlisted private).include?(@searchability)
+      definition_should << searchable_by_me if %i(public public_unlisted unlisted private direct).include?(@searchability)
+      definition_should << self_posts if %i(public public_unlisted unlisted private direct).exclude?(@searchability)
+
       {
         bool: {
-          should: [
-            {
-              term: {
-                _index: PublicStatusesIndex.index_name,
-              },
-            },
-            {
-              bool: {
-                must: [
-                  {
-                    term: {
-                      _index: StatusesIndex.index_name,
-                    },
-                  },
-                  {
-                    term: {
-                      searchable_by: @options[:current_account].id,
-                    },
-                  },
-                ],
-              },
-            },
-          ],
-
+          should: definition_should,
           minimum_should_match: 1,
         },
       }
     end
+
+    def public_index
+      {
+        term: {
+          _index: PublicStatusesIndex.index_name,
+        },
+      }
+    end
+
+    def searchable_by_me
+      {
+        bool: {
+          must: [
+            {
+              term: { _index: StatusesIndex.index_name },
+            },
+            {
+              term: { searchable_by: @options[:current_account].id },
+            },
+          ],
+          must_not: [
+            {
+              term: { searchability: 'limited' },
+            },
+          ],
+        },
+      }
+    end
+
+    def self_posts
+      {
+        bool: {
+          must: [
+            {
+              term: { _index: StatusesIndex.index_name },
+            },
+            {
+              term: { account_id: @options[:current_account].id },
+            },
+          ],
+        },
+      }
+    end
+
+    def searchability_public
+      {
+        bool: {
+          must: [
+            {
+              term: { _index: StatusesIndex.index_name },
+            },
+            {
+              term: { searchability: 'public' },
+            },
+          ],
+        },
+      }
+    end
+
+    def searchability_private
+      {
+        bool: {
+          must: [
+            {
+              term: { _index: StatusesIndex.index_name },
+            },
+            {
+              term: { searchability: 'private' },
+            },
+            {
+              terms: { account_id: following_account_ids },
+            },
+          ],
+        },
+      }
+    end
+
+    def searchability_limited
+      {
+        bool: {
+          must: [
+            {
+              term: { _index: StatusesIndex.index_name },
+            },
+            {
+              term: { searchability: 'limited' },
+            },
+            {
+              term: { account_id: @options[:current_account].id },
+            },
+          ],
+        },
+      }
+    end
+
+    def flag_following_only
+      {
+        bool: {
+          (@flags['following'] == 'following' ? :must : :must_not) => {
+            terms: { account_id: following_account_ids },
+          },
+        },
+      }
+    end
+
+    def following_account_ids
+      return @following_account_ids if defined?(@following_account_ids)
+
+      account_exists_sql     = Account.where('accounts.id = follows.target_account_id').where(searchability: %w(public public_unlisted private)).reorder(nil).select(1).to_sql
+      status_exists_sql      = Status.where('statuses.account_id = follows.target_account_id').where(reblog_of_id: nil).where(searchability: %w(public public_unlisted private)).reorder(nil).select(1).to_sql
+      following_accounts     = Follow.where(account_id: @options[:current_account].id).merge(Account.where("EXISTS (#{account_exists_sql})").or(Account.where("EXISTS (#{status_exists_sql})")))
+      @following_account_ids = following_accounts.pluck(:target_account_id)
+    end
   end
 
   class Operator
@@ -116,14 +242,19 @@ class SearchQueryTransformer < Parslet::Transform
   class TermClause
     attr_reader :operator, :term
 
-    def initialize(operator, term)
+    def initialize(operator, term, current_account: nil)
       @operator = Operator.symbol(operator)
       @term = term
+      @account = current_account
     end
 
     def to_query
       if @term.start_with?('#')
         { match: { tags: { query: @term, operator: 'and' } } }
+      elsif @account&.user&.setting_reverse_search_quote
+        # Memo for checking when manually merge
+        # { multi_match: { type: 'most_fields', query: @term, fields: ['text', 'text.stemmed'], operator: 'and' } }
+        { match_phrase: { text: { query: @term } } }
       else
         { multi_match: { type: 'most_fields', query: @term, fields: ['text', 'text.stemmed'], operator: 'and' } }
       end
@@ -133,24 +264,32 @@ class SearchQueryTransformer < Parslet::Transform
   class PhraseClause
     attr_reader :operator, :phrase
 
-    def initialize(operator, phrase)
+    def initialize(operator, phrase, current_account: nil)
       @operator = Operator.symbol(operator)
       @phrase = phrase
+      @account = current_account
     end
 
     def to_query
-      { match_phrase: { text: { query: @phrase } } }
+      # Memo for checking when manually merge
+      # { match_phrase: { text: { query: @phrase } } }
+      if @account&.user&.setting_reverse_search_quote
+        { multi_match: { type: 'most_fields', query: @phrase, fields: ['text', 'text.stemmed'], operator: 'and' } }
+      else
+        { match_phrase: { text: { query: @phrase } } }
+      end
     end
   end
 
   class PrefixClause
     attr_reader :operator, :prefix, :term
 
-    def initialize(prefix, operator, term, options = {})
+    def initialize(prefix, operator, term, options = {}) # rubocop:disable Metrics/CyclomaticComplexity
       @prefix = prefix
       @negated = operator == '-'
       @options = options
       @operator = :filter
+      @statuses_index_only = false
 
       case prefix
       when 'has', 'is'
@@ -165,6 +304,10 @@ class SearchQueryTransformer < Parslet::Transform
         @filter = :account_id
         @type = :term
         @term = account_id_from_term(term)
+      when 'domain'
+        @filter = :domain
+        @type = :term
+        @term = domain_from_term(term)
       when 'before'
         @filter = :created_at
         @type = :range
@@ -180,6 +323,44 @@ class SearchQueryTransformer < Parslet::Transform
       when 'in'
         @operator = :flag
         @term = term
+        if term == 'following'
+          @prefix = 'following'
+          @term = @negated ? 'not_following' : 'following'
+        end
+      when 'my'
+        @type = :term
+        @term = @options[:current_account]&.id
+        @statuses_index_only = true
+        case term
+        when 'favourited', 'favorited', 'fav'
+          @filter = :favourited_by
+        when 'boosted', 'bt'
+          @filter = :reblogged_by
+        when 'replied', 'mentioned', 're'
+          @filter = :mentioned_by
+        when 'referenced', 'ref'
+          @filter = :referenced_by
+        when 'emoji_reacted', 'stamped', 'stamp', 'emoji'
+          @filter = :emoji_reacted_by
+        when 'bookmarked', 'bm'
+          @filter = :bookmarked_by
+        when 'categoried', 'bmc'
+          @filter = :bookmark_categoried_by
+        when 'voted', 'vote'
+          @filter = :voted_by
+        when 'interacted', 'act'
+          @filter = :searchable_by
+        else
+          raise "Unknown prefix: my:#{term}"
+        end
+      when 'order'
+        @operator = :order
+        @term = case term
+                when 'asc'
+                  term
+                else
+                  'desc'
+                end
       else
         raise "Unknown prefix: #{prefix}"
       end
@@ -207,6 +388,12 @@ class SearchQueryTransformer < Parslet::Transform
       account&.id || -1
     end
 
+    def domain_from_term(term)
+      return '' if ['local', 'me', Rails.configuration.x.local_domain].include?(term)
+
+      term
+    end
+
     def language_code_from_term(term)
       language_code = term
 
@@ -232,11 +419,11 @@ class SearchQueryTransformer < Parslet::Transform
     if clause[:prefix] && SUPPORTED_PREFIXES.include?(prefix)
       PrefixClause.new(prefix, operator, term, current_account: current_account)
     elsif clause[:prefix]
-      TermClause.new(operator, "#{prefix} #{term}")
+      TermClause.new(operator, "#{prefix} #{term}", current_account: current_account)
     elsif clause[:term]
-      TermClause.new(operator, term)
+      TermClause.new(operator, term, current_account: current_account)
     elsif clause[:phrase]
-      PhraseClause.new(operator, term)
+      PhraseClause.new(operator, term, current_account: current_account)
     else
       raise "Unexpected clause type: #{clause}"
     end
@@ -247,6 +434,6 @@ class SearchQueryTransformer < Parslet::Transform
   end
 
   rule(query: sequence(:clauses)) do
-    Query.new(clauses, current_account: current_account)
+    Query.new(clauses, current_account: current_account, searchability: searchability)
   end
 end
diff --git a/app/lib/signature_parser.rb b/app/lib/signature_parser.rb
new file mode 100644
index 0000000000..7a75080d98
--- /dev/null
+++ b/app/lib/signature_parser.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class SignatureParser
+  class ParsingError < StandardError; end
+
+  # The syntax of this header is defined in:
+  # https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures-12#section-4
+  # See https://datatracker.ietf.org/doc/html/rfc7235#appendix-C
+  # and https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.6
+
+  # In addition, ignore a `Signature ` string prefix that was added by old versions
+  # of `node-http-signatures`
+
+  TOKEN_RE = /[0-9a-zA-Z!#$%&'*+.^_`|~-]+/
+  # qdtext and quoted_pair are not exactly according to spec but meh
+  QUOTED_STRING_RE = /"([^\\"]|(\\.))*"/
+  PARAM_RE = /(?<key>#{TOKEN_RE})\s*=\s*((?<value>#{TOKEN_RE})|(?<quoted_value>#{QUOTED_STRING_RE}))/
+
+  def self.parse(raw_signature)
+    # Old versions of node-http-signature add an incorrect "Signature " prefix to the header
+    raw_signature = raw_signature.delete_prefix('Signature ')
+
+    params = {}
+    scanner = StringScanner.new(raw_signature)
+
+    # Use `skip` instead of `scan` as we only care about the subgroups
+    while scanner.skip(PARAM_RE)
+      # This is not actually correct with regards to quoted pairs, but it's consistent
+      # with our previous implementation, and good enough in practice.
+      params[scanner[:key]] = scanner[:value] || scanner[:quoted_value][1...-1]
+
+      scanner.skip(/\s*/)
+      return params if scanner.eos?
+
+      raise ParsingError unless scanner.skip(/\s*,\s*/)
+    end
+
+    raise ParsingError
+  end
+end
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index 45b50cb379..deead3717d 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -6,6 +6,8 @@ class StatusCacheHydrator
   end
 
   def hydrate(account_id)
+    account = Account.find(account_id)
+
     # The cache of the serialized hash is generated by the fan-out-on-write service
     payload = Rails.cache.fetch("fan-out/#{@status.id}") { InlineRenderer.render(@status, nil, :status) }
 
@@ -16,22 +18,23 @@ class StatusCacheHydrator
     # We take advantage of the fact that some relationships can only occur with an original status, not
     # the reblog that wraps it, so we can assume that some values are always false
     if payload[:reblog]
-      hydrate_reblog_payload(payload, account_id)
+      hydrate_reblog_payload(payload, account_id, account)
     else
-      hydrate_non_reblog_payload(payload, account_id)
+      hydrate_non_reblog_payload(payload, account_id, account)
     end
   end
 
   private
 
-  def hydrate_non_reblog_payload(empty_payload, account_id)
+  def hydrate_non_reblog_payload(empty_payload, account_id, account)
     empty_payload.tap do |payload|
-      payload[:favourited] = Favourite.where(account_id: account_id, status_id: @status.id).exists?
-      payload[:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.id).exists?
-      payload[:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
-      payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
-      payload[:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
+      payload[:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.id)
+      payload[:reblogged]  = Status.exists?(account_id: account_id, reblog_of_id: @status.id)
+      payload[:muted]      = ConversationMute.exists?(account_id: account_id, conversation_id: @status.conversation_id)
+      payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.id)
+      payload[:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.id) if @status.account_id == account_id
       payload[:filtered]   = mapped_applied_custom_filter(account_id, @status)
+      payload[:emoji_reactions] = @status.emoji_reactions_grouped_by_name(account)
 
       if payload[:poll]
         payload[:poll][:voted] = @status.account_id == account_id
@@ -40,7 +43,7 @@ class StatusCacheHydrator
     end
   end
 
-  def hydrate_reblog_payload(empty_payload, account_id)
+  def hydrate_reblog_payload(empty_payload, account_id, account)
     empty_payload.tap do |payload|
       payload[:muted]      = false
       payload[:bookmarked] = false
@@ -51,12 +54,13 @@ class StatusCacheHydrator
       # used to create the status, we need to hydrate it here too
       payload[:reblog][:application] = payload_reblog_application if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
 
-      payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
-      payload[:reblog][:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
-      payload[:reblog][:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.reblog.conversation_id).exists?
-      payload[:reblog][:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
-      payload[:reblog][:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.reblog_of_id).exists? if @status.reblog.account_id == account_id
+      payload[:reblog][:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+      payload[:reblog][:reblogged]  = Status.exists?(account_id: account_id, reblog_of_id: @status.reblog_of_id)
+      payload[:reblog][:muted]      = ConversationMute.exists?(account_id: account_id, conversation_id: @status.reblog.conversation_id)
+      payload[:reblog][:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+      payload[:reblog][:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.reblog_of_id) if @status.reblog.account_id == account_id
       payload[:reblog][:filtered]   = payload[:filtered]
+      payload[:reblog][:emoji_reactions] = @status.reblog.emoji_reactions_grouped_by_name(account)
 
       if payload[:reblog][:poll]
         if @status.reblog.account_id == account_id
@@ -76,10 +80,14 @@ class StatusCacheHydrator
 
   def mapped_applied_custom_filter(account_id, status)
     CustomFilter
-      .apply_cached_filters(CustomFilter.cached_filters_for(account_id), status)
+      .apply_cached_filters(CustomFilter.cached_filters_for(account_id), status, following: following?(account_id))
       .map { |filter| serialized_filter(filter) }
   end
 
+  def following?(account_id)
+    Follow.exists?(account_id: account_id, target_account_id: @status.account_id)
+  end
+
   def serialized_filter(filter)
     ActiveModelSerializers::SerializableResource.new(
       filter,
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index c0e6f33313..70656f9c8d 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -3,10 +3,11 @@
 class StatusFilter
   attr_reader :status, :account
 
-  def initialize(status, account, preloaded_relations = {})
+  def initialize(status, account, preloaded_relations = {}, preloaded_status_relations = {})
     @status              = status
     @account             = account
     @preloaded_relations = preloaded_relations
+    @preloaded_status_relations = preloaded_status_relations
   end
 
   def filtered?
@@ -54,6 +55,6 @@ class StatusFilter
   end
 
   def policy_allows_show?
-    StatusPolicy.new(account, status, @preloaded_relations).show?
+    StatusPolicy.new(account, status, @preloaded_relations, @preloaded_status_relations).show?
   end
 end
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index 17e42e3ec3..1058bd30e7 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -10,13 +10,52 @@ class StatusReachFinder
   end
 
   def inboxes
-    (reached_account_inboxes + followers_inboxes + relay_inboxes).uniq
+    (reached_account_inboxes + followers_inboxes + relay_inboxes + nolocal_friend_inboxes).uniq
+  end
+
+  def inboxes_for_misskey
+    if banned_domains_for_misskey.empty?
+      []
+    else
+      (reached_account_inboxes_for_misskey + followers_inboxes_for_misskey).uniq
+    end
+  end
+
+  def inboxes_for_friend
+    (reached_account_inboxes_for_friend + followers_inboxes_for_friend + friend_inboxes).uniq
+  end
+
+  def inboxes_for_limited
+    DeliveryFailureTracker.without_unavailable(
+      @status.mentioned_accounts.where.not(domain: nil).pluck(:inbox_url).compact.uniq
+    )
+  end
+
+  def inboxes_diff_for_sending_domain_block
+    (reached_account_inboxes_for_sending_domain_block + followers_inboxes_for_sending_domain_block).uniq
+  end
+
+  def all_inboxes
+    (inboxes + inboxes_for_misskey + inboxes_for_friend).uniq
   end
 
   private
 
   def reached_account_inboxes
-    Account.where(id: reached_account_ids).inboxes
+    reject_domains = @status.limited_visibility? ? banned_domains : banned_domains + friend_domains
+    Account.where(id: reached_account_ids).where.not(domain: reject_domains).inboxes
+  end
+
+  def reached_account_inboxes_for_misskey
+    Account.where(id: reached_account_ids, domain: banned_domains_for_misskey - friend_domains).inboxes
+  end
+
+  def reached_account_inboxes_for_friend
+    Account.where(id: reached_account_ids, domain: friend_domains).inboxes
+  end
+
+  def reached_account_inboxes_for_sending_domain_block
+    Account.where(id: reached_account_ids, domain: banned_domains_of_status(@status)).inboxes
   end
 
   def reached_account_ids
@@ -25,6 +64,8 @@ class StatusReachFinder
 
     if @status.reblog?
       [reblog_of_account_id]
+    elsif @status.limited_visibility?
+      [mentioned_account_ids]
     else
       [
         replied_to_account_id,
@@ -33,6 +74,7 @@ class StatusReachFinder
         reblogs_account_ids,
         favourites_account_ids,
         replies_account_ids,
+        quoted_account_id,
       ].tap do |arr|
         arr.flatten!
         arr.compact!
@@ -68,16 +110,44 @@ class StatusReachFinder
     @status.replies.pluck(:account_id) if distributable? || unsafe?
   end
 
+  def quoted_account_id
+    @status.quote.account_id if @status.quote?
+  end
+
   def followers_inboxes
     if @status.in_reply_to_local_account? && distributable?
-      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).inboxes
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where.not(domain: banned_domains + friend_domains).inboxes
     elsif @status.direct_visibility? || @status.limited_visibility?
       []
     else
-      @status.account.followers.inboxes
+      @status.account.followers.where.not(domain: banned_domains + friend_domains).inboxes
     end
   end
 
+  def followers_inboxes_for_misskey
+    if @status.in_reply_to_local_account? && distributable?
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where(domain: banned_domains_for_misskey - friend_domains).inboxes
+    elsif @status.direct_visibility? || @status.limited_visibility?
+      []
+    else
+      @status.account.followers.where(domain: banned_domains_for_misskey - friend_domains).inboxes
+    end
+  end
+
+  def followers_inboxes_for_friend
+    if @status.in_reply_to_local_account? && distributable?
+      @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).where(domain: friend_domains).inboxes
+    elsif @status.direct_visibility? || @status.limited_visibility?
+      []
+    else
+      @status.account.followers.where(domain: friend_domains).inboxes
+    end
+  end
+
+  def followers_inboxes_for_sending_domain_block
+    @status.account.followers.where(domain: banned_domains_of_status(@status)).inboxes
+  end
+
   def relay_inboxes
     if @status.public_visibility?
       Relay.enabled.pluck(:inbox_url)
@@ -86,11 +156,72 @@ class StatusReachFinder
     end
   end
 
+  def friend_inboxes
+    if @status.distributable_friend?
+      DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: true).where.not(domain: AccountDomainBlock.where(account: @status.account).select(:domain)).pluck(:inbox_url))
+    else
+      []
+    end
+  end
+
+  def nolocal_friend_inboxes
+    if @status.public_visibility?
+      DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: false).where.not(domain: AccountDomainBlock.where(account: @status.account).select(:domain)).pluck(:inbox_url))
+    else
+      []
+    end
+  end
+
   def distributable?
-    @status.public_visibility? || @status.unlisted_visibility?
+    @status.public_visibility? || @status.unlisted_visibility? || @status.public_unlisted_visibility?
   end
 
   def unsafe?
     @options[:unsafe]
   end
+
+  def friend_domains
+    return @friend_domains if defined?(@friend_domains)
+
+    @friend_domains = FriendDomain.deliver_locals.pluck(:domain)
+    @friend_domains -= UnavailableDomain.where(domain: @friend_domains).pluck(:domain)
+  end
+
+  def banned_domains
+    return @banned_domains if @banned_domains
+
+    domains = banned_domains_of_status(@status)
+    domains += banned_domains_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
+    @banned_domains = domains.uniq + banned_domains_for_misskey
+  end
+
+  def banned_domains_of_status(status)
+    return [] unless status.sending_sensitive?
+    return @banned_domains_of_status if defined?(@banned_domains_of_status) && status.id == @status.id
+
+    blocks = DomainBlock.where(domain: nil)
+    blocks = blocks.or(DomainBlock.where(reject_send_sensitive: true)) if status.sending_sensitive?
+    domains = blocks.pluck(:domain).uniq
+
+    @banned_domains_of_status = domains if status.id == @status.id
+    domains
+  end
+
+  def banned_domains_for_misskey
+    return @banned_domains_for_misskey if defined?(@banned_domains_for_misskey)
+
+    return @banned_domains_for_misskey = [] unless @status.sending_maybe_compromised_privacy? || (@status.reblog? && @status.reblog.sending_maybe_compromised_privacy?)
+
+    domains = banned_domains_for_misskey_of_status(@status)
+    domains += banned_domains_for_misskey_of_status(@status.reblog) if @status.reblog? && @status.reblog.local?
+    @banned_domains_for_misskey = domains.uniq
+  end
+
+  def banned_domains_for_misskey_of_status(status)
+    return [] if status.public_searchability?
+
+    from_info = InstanceInfo.where(software: %w(misskey calckey cherrypick sharkey)).pluck(:domain)
+    from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
+    (from_info + from_domain_block).uniq
+  end
 end
diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
index 1af5188c65..74f49aa558 100644
--- a/app/lib/suspicious_sign_in_detector.rb
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -19,7 +19,7 @@ class SuspiciousSignInDetector
   end
 
   def previously_seen_ip?(request)
-    @user.ips.where('ip <<= ?', masked_ip(request)).exists?
+    @user.ips.exists?(['ip <<= ?', masked_ip(request)])
   end
 
   def freshly_signed_up?
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 581ee835b3..d334babd0e 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -11,6 +11,7 @@ class TextFormatter
 
   DEFAULT_OPTIONS = {
     multiline: true,
+    markdown: false,
   }.freeze
 
   attr_reader :text, :options
@@ -43,13 +44,18 @@ class TextFormatter
       end
     end
 
-    html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+    # line first letter for blockquote
+    html = markdownify(html.gsub(/^&gt;/, '>')) if markdown?
+
+    html = simple_format(html, {}, sanitize: false).delete("\n") if !markdown? && multiline?
+    html = html.delete("\n")
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
   class << self
     include ERB::Util
+    include ActionView::Helpers::TagHelper
 
     def shortened_link(url, rel_me: false)
       url = Addressable::URI.parse(url).to_s
@@ -60,9 +66,11 @@ class TextFormatter
       suffix      = url[prefix.length + 30..]
       cutoff      = url[prefix.length..].length > 30
 
-      <<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety
-        <a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}" translate="no"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a>
-      HTML
+      tag.a href: url, target: '_blank', rel: rel.join(' '), translate: 'no' do
+        tag.span(prefix, class: 'invisible') +
+          tag.span(display_url, class: (cutoff ? 'ellipsis' : '')) +
+          tag.span(suffix, class: 'invisible')
+      end
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
       h(url)
     end
@@ -156,6 +164,10 @@ class TextFormatter
     options[:with_rel_me]
   end
 
+  def markdown?
+    options[:markdown]
+  end
+
   def preloaded_accounts
     options[:preloaded_accounts]
   end
@@ -163,4 +175,54 @@ class TextFormatter
   def preloaded_accounts?
     preloaded_accounts.present?
   end
+
+  def markdownify(html)
+    # not need filter_html because escape is already done
+    @htmlobj ||= MyMarkdownHTML.new(
+      filter_html: false,
+      hard_wrap: true
+    )
+    @markdown ||= Redcarpet::Markdown.new(@htmlobj,
+                                          autolink: false,
+                                          tables: false,
+                                          disable_indented_code_blocks: false,
+                                          fenced_code_blocks: true,
+                                          strikethrough: true,
+                                          superscript: true,
+                                          underline: true,
+                                          highlight: false)
+    @markdown.render(html)
+  end
+
+  class MyMarkdownHTML < Redcarpet::Render::HTML
+    def link(_link, _title, _content)
+      nil
+    end
+
+    def block_code(code, _language)
+      "<pre>#{process_program_code(code)}</pre>"
+    end
+
+    def codespan(code)
+      "<code>#{process_program_code(code)}</code>"
+    end
+
+    def header(text, _header_level)
+      "<p>#{text}</p>"
+    end
+
+    def underline(text)
+      text.include?(':') ? nil : "<u>#{text}</u>"
+    end
+
+    def image(_link, _title, _alt_text)
+      nil
+    end
+
+    private
+
+    def process_program_code(code)
+      code.gsub("\n", '<br>')
+    end
+  end
 end
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 243ffb9ab9..b6da980733 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -6,11 +6,16 @@ require 'yaml'
 class Themes
   include Singleton
 
+  THEME_COLORS = {
+    dark: '#191b22',
+    light: '#f3f5f7',
+  }.freeze
+
   def initialize
     @conf = YAML.load_file(Rails.root.join('config', 'themes.yml'))
   end
 
   def names
-    @conf.keys
+    ['system'] + @conf.keys
   end
 end
diff --git a/app/lib/vacuum/feeds_vacuum.rb b/app/lib/vacuum/feeds_vacuum.rb
index fb0b8a8472..cda424c16c 100644
--- a/app/lib/vacuum/feeds_vacuum.rb
+++ b/app/lib/vacuum/feeds_vacuum.rb
@@ -4,6 +4,7 @@ class Vacuum::FeedsVacuum
   def perform
     vacuum_inactive_home_feeds!
     vacuum_inactive_list_feeds!
+    vacuum_inactive_antenna_feeds!
   end
 
   private
@@ -20,14 +21,24 @@ class Vacuum::FeedsVacuum
     end
   end
 
+  def vacuum_inactive_antenna_feeds!
+    inactive_users_antennas.select(:id).in_batches do |antennas|
+      feed_manager.clean_feeds!(:antenna, antennas.ids)
+    end
+  end
+
   def inactive_users
-    User.confirmed.inactive
+    User.confirmed.not_signed_in_recently
   end
 
   def inactive_users_lists
     List.where(account_id: inactive_users.select(:account_id))
   end
 
+  def inactive_users_antennas
+    Antenna.where(account_id: inactive_users.select(:account_id))
+  end
+
   def feed_manager
     FeedManager.instance
   end
diff --git a/app/lib/vacuum/imports_vacuum.rb b/app/lib/vacuum/imports_vacuum.rb
index ffb9449a42..8c8bb783ac 100644
--- a/app/lib/vacuum/imports_vacuum.rb
+++ b/app/lib/vacuum/imports_vacuum.rb
@@ -9,7 +9,7 @@ class Vacuum::ImportsVacuum
   private
 
   def clean_unconfirmed_imports!
-    BulkImport.where(state: :unconfirmed).where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
+    BulkImport.state_unconfirmed.where('created_at <= ?', 10.minutes.ago).reorder(nil).in_batches.delete_all
   end
 
   def clean_old_imports!
diff --git a/app/lib/vacuum/list_statuses_vacuum.rb b/app/lib/vacuum/list_statuses_vacuum.rb
new file mode 100644
index 0000000000..41dca7602f
--- /dev/null
+++ b/app/lib/vacuum/list_statuses_vacuum.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Vacuum::ListStatusesVacuum
+  include Redisable
+
+  LIST_STATUS_LIFE_DURATION = 1.day.freeze
+
+  def perform
+    vacuum_list_statuses!
+  end
+
+  private
+
+  def vacuum_list_statuses!
+    ListStatus.where('created_at < ?', LIST_STATUS_LIFE_DURATION.ago).in_batches.destroy_all
+  end
+end
diff --git a/app/lib/vacuum/media_attachments_vacuum.rb b/app/lib/vacuum/media_attachments_vacuum.rb
index ab7ea4092f..e558195290 100644
--- a/app/lib/vacuum/media_attachments_vacuum.rb
+++ b/app/lib/vacuum/media_attachments_vacuum.rb
@@ -27,11 +27,17 @@ class Vacuum::MediaAttachmentsVacuum
   end
 
   def media_attachments_past_retention_period
-    MediaAttachment.remote.cached.where(MediaAttachment.arel_table[:created_at].lt(@retention_period.ago)).where(MediaAttachment.arel_table[:updated_at].lt(@retention_period.ago))
+    MediaAttachment
+      .remote
+      .cached
+      .created_before(@retention_period.ago)
+      .updated_before(@retention_period.ago)
   end
 
   def orphaned_media_attachments
-    MediaAttachment.unattached.where(MediaAttachment.arel_table[:created_at].lt(TTL.ago))
+    MediaAttachment
+      .unattached
+      .created_before(TTL.ago)
   end
 
   def retention_period?
diff --git a/app/lib/vacuum/ng_histories_vacuum.rb b/app/lib/vacuum/ng_histories_vacuum.rb
new file mode 100644
index 0000000000..f70558f116
--- /dev/null
+++ b/app/lib/vacuum/ng_histories_vacuum.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Vacuum::NgHistoriesVacuum
+  include Redisable
+
+  HISTORY_LIFE_DURATION = 7.days.freeze
+
+  def perform
+    vacuum_histories!
+  end
+
+  private
+
+  def vacuum_histories!
+    NgwordHistory.where('created_at < ?', HISTORY_LIFE_DURATION.ago).in_batches.destroy_all
+    NgRuleHistory.where('created_at < ?', HISTORY_LIFE_DURATION.ago).in_batches.destroy_all
+  end
+end
diff --git a/app/lib/vacuum/statuses_vacuum.rb b/app/lib/vacuum/statuses_vacuum.rb
index ad1de07380..947ae560f6 100644
--- a/app/lib/vacuum/statuses_vacuum.rb
+++ b/app/lib/vacuum/statuses_vacuum.rb
@@ -32,9 +32,24 @@ class Vacuum::StatusesVacuum
   end
 
   def statuses_scope
-    Status.unscoped.kept
-          .joins(:account).merge(Account.remote)
-          .where('statuses.id < ?', retention_period_as_id)
+    scope = Status.unscoped.kept
+                  .joins(:account).merge(Account.remote)
+                  .where('statuses.id < ?', retention_period_as_id)
+
+    if Setting.delete_content_cache_without_reaction
+      scope = scope.where.not(id: favourited_statuses)
+                   .where.not(id: bookmarked_statuses)
+    end
+
+    scope
+  end
+
+  def favourited_statuses
+    Favourite.local.select(:status_id)
+  end
+
+  def bookmarked_statuses
+    Bookmark.select(:status_id)
   end
 
   def retention_period_as_id
diff --git a/app/lib/video_metadata_extractor.rb b/app/lib/video_metadata_extractor.rb
index f27d34868a..df5409375f 100644
--- a/app/lib/video_metadata_extractor.rb
+++ b/app/lib/video_metadata_extractor.rb
@@ -22,7 +22,7 @@ class VideoMetadataExtractor
   private
 
   def ffmpeg_command_output
-    command = Terrapin::CommandLine.new('ffprobe', '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
+    command = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-i :path -print_format :format -show_format -show_streams -show_error -loglevel :loglevel')
     command.run(path: @path, format: 'json', loglevel: 'fatal')
   end
 
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index 2a6fbb0ab7..c0da9a15c6 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -35,6 +35,14 @@ class AdminMailer < ApplicationMailer
     end
   end
 
+  def new_pending_friend_server(friend_server)
+    @friend = friend_server
+
+    locale_for_account(@me) do
+      mail subject: default_i18n_subject(instance: @instance, domain: @friend.domain)
+    end
+  end
+
   def new_trends(links, tags, statuses)
     @links                  = links
     @tags                   = tags
@@ -46,12 +54,16 @@ class AdminMailer < ApplicationMailer
   end
 
   def new_software_updates
+    @software_updates = SoftwareUpdate.all.to_a.sort_by(&:gem_version)
+
     locale_for_account(@me) do
       mail subject: default_i18n_subject(instance: @instance)
     end
   end
 
   def new_critical_software_updates
+    @software_updates = SoftwareUpdate.where(urgent: true).to_a.sort_by(&:gem_version)
+
     headers['Priority'] = 'urgent'
     headers['X-Priority'] = '1'
     headers['Importance'] = 'high'
@@ -61,6 +73,12 @@ class AdminMailer < ApplicationMailer
     end
   end
 
+  def auto_close_registrations
+    locale_for_account(@me) do
+      mail subject: default_i18n_subject(instance: @instance)
+    end
+  end
+
   private
 
   def process_params
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 5eecfed104..4eb38ec340 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -12,6 +12,8 @@ class NotificationMailer < ApplicationMailer
 
   default to: -> { email_address_with_name(@user.email, @me.username) }
 
+  layout 'mailer'
+
   def mention
     return unless @user.functional? && @status.present?
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 432b851b5e..f8c1c9a8d0 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -5,10 +5,11 @@ class UserMailer < Devise::Mailer
 
   helper :accounts
   helper :application
-  helper :instance
-  helper :statuses
+  helper :mascot
   helper :formatting
+  helper :instance
   helper :routing
+  helper :statuses
 
   before_action :set_instance
 
@@ -135,6 +136,12 @@ class UserMailer < Devise::Mailer
 
     return unless @resource.active_for_authentication?
 
+    @suggestions = AccountSuggestions.new(@resource.account).get(5)
+    @tags = Trends.tags.query.allowed.limit(5)
+    @has_account_fields = @resource.account.display_name.present? || @resource.account.note.present? || @resource.account.avatar.present?
+    @has_active_relationships = @resource.account.active_relationships.exists?
+    @has_statuses = @resource.account.statuses.exists?
+
     I18n.with_locale(locale) do
       mail subject: default_i18n_subject
     end
@@ -191,6 +198,18 @@ class UserMailer < Devise::Mailer
     end
   end
 
+  def failed_2fa(user, remote_ip, user_agent, timestamp)
+    @resource   = user
+    @remote_ip  = remote_ip
+    @user_agent = user_agent
+    @detection  = Browser.new(user_agent)
+    @timestamp  = timestamp.to_time.utc
+
+    I18n.with_locale(locale) do
+      mail subject: default_i18n_subject
+    end
+  end
+
   private
 
   def default_devise_subject
diff --git a/app/models/account.rb b/app/models/account.rb
index 0fca7ce4bd..865624181a 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -17,11 +17,9 @@
 #  url                           :string
 #  avatar_file_name              :string
 #  avatar_content_type           :string
-#  avatar_file_size              :integer
 #  avatar_updated_at             :datetime
 #  header_file_name              :string
 #  header_content_type           :string
-#  header_file_size              :integer
 #  header_updated_at             :datetime
 #  avatar_remote_url             :string
 #  locked                        :boolean          default(FALSE), not null
@@ -50,7 +48,13 @@
 #  trendable                     :boolean
 #  reviewed_at                   :datetime
 #  requested_review_at           :datetime
+#  searchability                 :integer          default("direct"), not null
+#  settings                      :jsonb
 #  indexable                     :boolean          default(FALSE), not null
+#  master_settings               :jsonb
+#  remote_pending                :boolean          default(FALSE), not null
+#  avatar_file_size              :integer
+#  header_file_size              :integer
 #
 
 class Account < ApplicationRecord
@@ -64,11 +68,16 @@ class Account < ApplicationRecord
   )
 
   BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
+  DEFAULT_FIELDS_SIZE = 6
+  INSTANCE_ACTOR_ID = -99
 
   USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
   MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
   URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
+  USERNAME_LENGTH_LIMIT = 30
+  DISPLAY_NAME_LENGTH_LIMIT = 30
+  NOTE_LENGTH_LIMIT = 500
 
   include Attachmentable # Load prior to Avatar & Header concerns
 
@@ -81,12 +90,15 @@ class Account < ApplicationRecord
   include Account::Merging
   include Account::Search
   include Account::StatusesSearch
+  include Account::OtherSettings
+  include Account::MasterSettings
   include DomainMaterializable
   include DomainNormalizable
   include Paginable
 
-  enum protocol: { ostatus: 0, activitypub: 1 }
-  enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
+  enum :protocol, { ostatus: 0, activitypub: 1 }
+  enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
+  enum :searchability, { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, suffix: :searchability
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
@@ -98,11 +110,11 @@ class Account < ApplicationRecord
   validates :uri, presence: true, unless: :local?, on: :create
 
   # Local user validations
-  validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
+  validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: USERNAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
   validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
-  validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
-  validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
-  validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
+  validates :display_name, length: { maximum: DISPLAY_NAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_display_name? }
+  validates :note, note_length: { maximum: NOTE_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_note? }
+  validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
   validates :uri, absence: true, if: :local?, on: :create
   validates :inbox_url, absence: true, if: :local?, on: :create
   validates :shared_inbox_url, absence: true, if: :local?, on: :create
@@ -110,31 +122,34 @@ class Account < ApplicationRecord
 
   normalizes :username, with: ->(username) { username.squish }
 
+  scope :without_internal, -> { where(id: 1...) }
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
   scope :silenced, -> { where.not(silenced_at: nil) }
   scope :suspended, -> { where.not(suspended_at: nil) }
+  scope :remote_pending, -> { where(remote_pending: true).where.not(suspended_at: nil) }
   scope :sensitized, -> { where.not(sensitized_at: nil) }
   scope :without_suspended, -> { where(suspended_at: nil) }
   scope :without_silenced, -> { where(silenced_at: nil) }
-  scope :without_instance_actor, -> { where.not(id: -99) }
+  scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
   scope :bots, -> { where(actor_type: %w(Application Service)) }
   scope :groups, -> { where(actor_type: 'Group') }
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
+  scope :matches_uri_prefix, ->(value) { where(arel_table[:uri].matches("#{sanitize_sql_like(value)}/%", false, true)).or(where(uri: value)) }
   scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
   scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
+  scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
   scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
-  scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
+  scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }
   scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
-  scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
+  scope :dormant, -> { joins(:account_stat).merge(AccountStat.without_recent_activity) }
 
   after_update_commit :trigger_update_webhooks
 
@@ -175,7 +190,7 @@ class Account < ApplicationRecord
   end
 
   def instance_actor?
-    id == -99
+    id == INSTANCE_ACTOR_ID
   end
 
   alias bot bot?
@@ -188,8 +203,28 @@ class Account < ApplicationRecord
     actor_type == 'Group'
   end
 
+  def group=(val)
+    self.actor_type = ActiveModel::Type::Boolean.new.cast(val) ? 'Group' : 'Person'
+  end
+
   alias group group?
 
+  def my_actor_type
+    if actor_type == 'Service'
+      'bot'
+    else
+      actor_type == 'Group' ? 'group' : 'person'
+    end
+  end
+
+  def my_actor_type=(val)
+    self.actor_type = if val == 'bot'
+                        'Service'
+                      else
+                        val == 'group' ? 'Group' : 'Person'
+                      end
+  end
+
   def acct
     local? ? username : "#{username}@#{domain}"
   end
@@ -267,6 +302,23 @@ class Account < ApplicationRecord
     end
   end
 
+  def approve_remote!
+    return unless remote_pending
+
+    update!(remote_pending: false)
+    unsuspend!
+    ActivateRemoteAccountWorker.perform_async(id)
+  end
+
+  def reject_remote!
+    return unless remote_pending
+
+    update!(remote_pending: false, suspension_origin: :local)
+    pending_follow_requests.destroy_all
+    pending_statuses.destroy_all
+    suspend!
+  end
+
   def sensitized?
     sensitized_at.present?
   end
@@ -291,6 +343,18 @@ class Account < ApplicationRecord
     true
   end
 
+  def public_statuses_count
+    hide_statuses_count? ? 0 : statuses_count
+  end
+
+  def public_following_count
+    hide_following_count? ? 0 : following_count
+  end
+
+  def public_followers_count
+    hide_followers_count? ? 0 : followers_count
+  end
+
   def previous_strikes_count
     strikes.where(overruled_at: nil).count
   end
@@ -349,8 +413,6 @@ class Account < ApplicationRecord
     self[:fields] = fields
   end
 
-  DEFAULT_FIELDS_SIZE = 4
-
   def build_fields
     return if fields.size >= DEFAULT_FIELDS_SIZE
 
@@ -439,7 +501,7 @@ class Account < ApplicationRecord
     end
 
     def inboxes
-      urls = reorder(nil).where(protocol: :activitypub).group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
+      urls = reorder(nil).activitypub.group(:preferred_inbox_url).pluck(Arel.sql("coalesce(nullif(accounts.shared_inbox_url, ''), accounts.inbox_url) AS preferred_inbox_url"))
       DeliveryFailureTracker.without_unavailable(urls)
     end
 
@@ -494,6 +556,10 @@ class Account < ApplicationRecord
     save!
   end
 
+  def compute_searchability_activitypub
+    local? ? 'public' : searchability
+  end
+
   private
 
   def prepare_contents
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 42b1c49538..5edaa2e5b8 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -88,6 +88,8 @@ class AccountFilter
       Account.without_suspended
     when 'pending'
       accounts_with_users.merge(User.pending)
+    when 'remote_pending'
+      Account.remote_pending
     when 'suspended'
       Account.suspended
     when 'disabled'
diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb
index ff399bab0c..79b8b4d25e 100644
--- a/app/models/account_moderation_note.rb
+++ b/app/models/account_moderation_note.rb
@@ -13,10 +13,12 @@
 #
 
 class AccountModerationNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
   scope :latest, -> { reorder('created_at DESC') }
 
-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/app/models/account_note.rb b/app/models/account_note.rb
index 9bc704d988..317e6873fa 100644
--- a/app/models/account_note.rb
+++ b/app/models/account_note.rb
@@ -14,9 +14,11 @@
 class AccountNote < ApplicationRecord
   include RelationshipCacheable
 
+  COMMENT_SIZE_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
   validates :account_id, uniqueness: { scope: :target_account_id }
-  validates :comment, length: { maximum: 2_000 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 end
diff --git a/app/models/account_relationship_severance_event.rb b/app/models/account_relationship_severance_event.rb
new file mode 100644
index 0000000000..c1269fad6d
--- /dev/null
+++ b/app/models/account_relationship_severance_event.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#
+# == Schema Information
+#
+# Table name: account_relationship_severance_events
+#
+#  id                              :bigint(8)        not null, primary key
+#  account_id                      :bigint(8)        not null
+#  relationship_severance_event_id :bigint(8)        not null
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#  followers_count                 :integer          default(0), not null
+#  following_count                 :integer          default(0), not null
+#
+class AccountRelationshipSeveranceEvent < ApplicationRecord
+  self.ignored_columns += %w(
+    relationships_count
+  )
+
+  belongs_to :account
+  belongs_to :relationship_severance_event
+
+  has_many :severed_relationships, through: :relationship_severance_event
+
+  delegate :type,
+           :target_name,
+           :purged,
+           :purged?,
+           to: :relationship_severance_event,
+           prefix: false
+
+  before_create :set_relationships_count!
+
+  private
+
+  def set_relationships_count!
+    self.followers_count = severed_relationships.about_local_account(account).passive.count
+    self.following_count = severed_relationships.about_local_account(account).active.count
+  end
+end
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb
index 0fea7732e9..14aa7ef800 100644
--- a/app/models/account_stat.rb
+++ b/app/models/account_stat.rb
@@ -20,6 +20,9 @@ class AccountStat < ApplicationRecord
 
   belongs_to :account, inverse_of: :account_stat
 
+  scope :by_recent_status, -> { order(arel_table[:last_status_at].desc.nulls_last) }
+  scope :without_recent_activity, -> { where(last_status_at: [nil, ...1.month.ago]) }
+
   update_index('accounts', :account)
 
   def following_count
diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb
index a102795446..83a17c7700 100644
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -18,6 +18,8 @@
 #  min_reblogs        :integer
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
+#  min_emojis         :integer
+#  keep_self_emoji    :boolean          default(TRUE), not null
 #
 class AccountStatusesCleanupPolicy < ApplicationRecord
   include Redisable
@@ -33,8 +35,8 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
     2.years.seconds,
   ].freeze
 
-  EXCEPTION_BOOLS      = %w(keep_direct keep_pinned keep_polls keep_media keep_self_fav keep_self_bookmark).freeze
-  EXCEPTION_THRESHOLDS = %w(min_favs min_reblogs).freeze
+  EXCEPTION_BOOLS      = %w(keep_direct keep_pinned keep_polls keep_media keep_self_fav keep_self_bookmark keep_self_emoji).freeze
+  EXCEPTION_THRESHOLDS = %w(min_favs min_reblogs min_emojis).freeze
 
   # Depending on the cleanup policy, the query to discover the next
   # statuses to delete my get expensive if the account has a lot of old
@@ -52,6 +54,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
   validates :min_status_age, inclusion: { in: ALLOWED_MIN_STATUS_AGE }
   validates :min_favs, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
   validates :min_reblogs, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
+  validates :min_emojis, numericality: { greater_than_or_equal_to: 1, allow_nil: true }
   validate :validate_local_account
 
   before_save :update_last_inspected
@@ -60,13 +63,14 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
     scope = account_statuses
     scope.merge!(old_enough_scope(max_id))
     scope = scope.where(id: min_id..) if min_id.present?
-    scope.merge!(without_popular_scope) unless min_favs.nil? && min_reblogs.nil?
+    scope.merge!(without_popular_scope) unless min_favs.nil? && min_reblogs.nil? && min_emojis.nil?
     scope.merge!(without_direct_scope) if keep_direct?
     scope.merge!(without_pinned_scope) if keep_pinned?
     scope.merge!(without_poll_scope) if keep_polls?
     scope.merge!(without_media_scope) if keep_media?
     scope.merge!(without_self_fav_scope) if keep_self_fav?
     scope.merge!(without_self_bookmark_scope) if keep_self_bookmark?
+    scope.merge!(without_self_emoji_scope) if keep_self_emoji?
 
     scope.reorder(id: :asc).limit(limit)
   end
@@ -107,6 +111,8 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
       return unless keep_self_bookmark?
     when :unfav
       return unless keep_self_fav?
+    when :unemoji
+      return unless keep_self_emoji?
     when :unpin
       return unless keep_pinned?
     end
@@ -148,6 +154,10 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
     Status.where('NOT EXISTS (SELECT 1 FROM favourites fav WHERE fav.account_id = statuses.account_id AND fav.status_id = statuses.id)')
   end
 
+  def without_self_emoji_scope
+    Status.where('NOT EXISTS (SELECT 1 FROM emoji_reactions emj WHERE emj.account_id = statuses.account_id AND emj.status_id = statuses.id)')
+  end
+
   def without_self_bookmark_scope
     Status.where('NOT EXISTS (SELECT 1 FROM bookmarks bookmark WHERE bookmark.account_id = statuses.account_id AND bookmark.status_id = statuses.id)')
   end
@@ -168,6 +178,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
     scope = Status.left_joins(:status_stat)
     scope = scope.where('COALESCE(status_stats.reblogs_count, 0) < ?', min_reblogs) unless min_reblogs.nil?
     scope = scope.where('COALESCE(status_stats.favourites_count, 0) < ?', min_favs) unless min_favs.nil?
+    scope = scope.where('COALESCE(status_stats.emoji_reactions_count, 0) < ?', min_emojis) unless min_emojis.nil?
     scope
   end
 
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index d62176c7ca..98ccf4ad4f 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -29,14 +29,14 @@ class AccountSuggestions
       # a complicated query on this end.
 
       account_ids  = account_ids_with_sources[offset, limit]
-      accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat).index_by(&:id)
+      accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
 
-      account_ids.filter_map do |(account_id, source)|
+      account_ids.filter_map do |(account_id, sources)|
         next unless accounts_map.key?(account_id)
 
         AccountSuggestions::Suggestion.new(
           account: accounts_map[account_id],
-          source: source
+          sources: sources
         )
       end
     end
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 28d0ab99b3..825b24f419 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
-  def get(account, limit: 10)
-    Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }
+  def get(account, limit: DEFAULT_LIMIT)
+    source_query(account, limit: limit)
+      .map { |id, _frequency, _followers_count| [id, key] }
+  end
+
+  def source_query(account, limit: DEFAULT_LIMIT)
+    Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, row.frequency, row.followers_count] }
       WITH first_degree AS (
           SELECT target_account_id
           FROM follows
@@ -10,12 +15,16 @@ class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
           WHERE account_id = :id
             AND NOT target_accounts.hide_collections
       )
-      SELECT accounts.id, COUNT(*) AS frequency
+      SELECT accounts.id, COUNT(*) AS frequency, account_stats.followers_count as followers_count
       FROM accounts
       JOIN follows ON follows.target_account_id = accounts.id
       JOIN account_stats ON account_stats.account_id = accounts.id
       LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
       WHERE follows.account_id IN (SELECT * FROM first_degree)
+        AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = follows.target_account_id AND b.account_id = :id)
+        AND NOT EXISTS (SELECT 1 FROM blocks b WHERE b.target_account_id = :id AND b.account_id = follows.target_account_id)
+        AND NOT EXISTS (SELECT 1 FROM mutes m WHERE m.target_account_id = follows.target_account_id AND m.account_id = :id)
+        AND (accounts.domain IS NULL OR NOT EXISTS (SELECT 1 FROM account_domain_blocks b WHERE b.account_id = :id AND b.domain = accounts.domain))
         AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
         AND follows.target_account_id <> :id
         AND accounts.discoverable
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb
index d68f285e4f..c05bcf2ce8 100644
--- a/app/models/account_suggestions/global_source.rb
+++ b/app/models/account_suggestions/global_source.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::GlobalSource < AccountSuggestions::Source
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     FollowRecommendation.localized(content_locale).joins(:account).merge(base_account_scope(account)).order(rank: :desc).limit(limit).pluck(:account_id, :reason)
   end
 
diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb
index 4b7275bf7a..9f3cd7bd3d 100644
--- a/app/models/account_suggestions/setting_source.rb
+++ b/app/models/account_suggestions/setting_source.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::SettingSource < AccountSuggestions::Source
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     if setting_enabled?
       base_account_scope(account).where(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
     else
diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
index 733c5f0bbc..7ecdd607e5 100644
--- a/app/models/account_suggestions/similar_profiles_source.rb
+++ b/app/models/account_suggestions/similar_profiles_source.rb
@@ -47,11 +47,12 @@ class AccountSuggestions::SimilarProfilesSource < AccountSuggestions::Source
     end
   end
 
-  def get(account, limit: 10)
+  def get(account, limit: DEFAULT_LIMIT)
     recently_followed_account_ids = account.active_relationships.recent.limit(5).pluck(:target_account_id)
 
     if Chewy.enabled? && !recently_followed_account_ids.empty?
-      QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i).zip([key].cycle)
+      ids_from_es = QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i)
+      base_account_scope(account).where(id: ids_from_es).pluck(:id).zip([key].cycle)
     else
       []
     end
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index d83f5e3773..7afc4c80ed 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::Source
+  DEFAULT_LIMIT = 10
+
   def get(_account, **kwargs)
     raise NotImplementedError
   end
@@ -10,6 +12,8 @@ class AccountSuggestions::Source
   def base_account_scope(account)
     Account
       .searchable
+      .where(discoverable: true)
+      .without_silenced
       .where.not(follows_sql, id: account.id)
       .where.not(follow_requests_sql, id: account.id)
       .not_excluded_by_account(account)
diff --git a/app/models/account_suggestions/suggestion.rb b/app/models/account_suggestions/suggestion.rb
index 2c6f4d27f5..8a5888069a 100644
--- a/app/models/account_suggestions/suggestion.rb
+++ b/app/models/account_suggestions/suggestion.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::Suggestion < ActiveModelSerializers::Model
-  attributes :account, :source
+  attributes :account, :sources
 
   delegate :id, to: :account, prefix: true
 end
diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 0d8835b83c..327c0ef305 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -10,17 +10,13 @@
 #
 
 class AccountSummary < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :account_id
 
+  has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false, dependent: nil
+
   scope :safe, -> { where(sensitive: false) }
-  scope :localized, ->(locale) { where(language: locale) }
-  scope :filtered, -> { joins(arel_table.join(FollowRecommendationSuppression.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:account_id].eq(FollowRecommendationSuppression.arel_table[:account_id])).join_sources).where(FollowRecommendationSuppression.arel_table[:id].eq(nil)) }
-
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
-  end
-
-  def readonly?
-    true
-  end
+  scope :localized, ->(locale) { order(Arel::Nodes::Case.new.when(arel_table[:language].eq(locale)).then(1).else(0).desc) }
+  scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 end
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
index 9286577f51..29d10f0371 100644
--- a/app/models/account_warning.rb
+++ b/app/models/account_warning.rb
@@ -17,15 +17,18 @@
 #
 
 class AccountWarning < ApplicationRecord
-  enum action: {
+  enum :action, {
     none: 0,
     disable: 1_000,
+    force_cw: 1_200,
     mark_statuses_as_sensitive: 1_250,
     delete_statuses: 1_500,
     sensitive: 2_000,
     silence: 3_000,
     suspend: 4_000,
-  }, _suffix: :action
+  }, suffix: :action
+
+  RECENT_PERIOD = 3.months.freeze
 
   normalizes :text, with: ->(text) { text.to_s }, apply_to_nil: true
 
@@ -37,7 +40,7 @@ class AccountWarning < ApplicationRecord
 
   scope :latest, -> { order(id: :desc) }
   scope :custom, -> { where.not(text: '') }
-  scope :recent, -> { where('account_warnings.created_at >= ?', 3.months.ago) }
+  scope :recent, -> { where(created_at: RECENT_PERIOD.ago..) }
 
   def statuses
     Status.with_discarded.where(id: status_ids || [])
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 2b5560e2eb..3700ce4cd6 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -52,7 +52,7 @@ class Admin::AccountAction
       process_reports!
     end
 
-    process_email!
+    process_notification!
     process_queue!
   end
 
@@ -158,8 +158,11 @@ class Admin::AccountAction
     queue_suspension_worker! if type == 'suspend'
   end
 
-  def process_email!
-    UserMailer.warning(target_account.user, warning).deliver_later! if warnable?
+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, warning.id, 'AccountWarning', 'moderation_warning')
   end
 
   def warnable?
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index d413cb386d..cd4bf8879f 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -16,6 +16,8 @@ class Admin::ActionLogFilter
     confirm_user: { target_type: 'User', action: 'confirm' }.freeze,
     approve_user: { target_type: 'User', action: 'approve' }.freeze,
     reject_user: { target_type: 'User', action: 'reject' }.freeze,
+    approve_remote_account: { target_type: 'Account', action: 'approve_remote' }.freeze,
+    reject_remote_account: { target_type: 'Account', action: 'reject_remote' }.freeze,
     create_account_warning: { target_type: 'AccountWarning', action: 'create' }.freeze,
     create_announcement: { target_type: 'Announcement', action: 'create' }.freeze,
     create_custom_emoji: { target_type: 'CustomEmoji', action: 'create' }.freeze,
@@ -60,6 +62,8 @@ class Admin::ActionLogFilter
     update_announcement: { target_type: 'Announcement', action: 'update' }.freeze,
     update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze,
     update_status: { target_type: 'Status', action: 'update' }.freeze,
+    force_cw_status: { target_type: 'Status', action: 'force_cw' }.freeze,
+    force_sensitive_status: { target_type: 'Status', action: 'force_sensitive' }.freeze,
     update_user_role: { target_type: 'UserRole', action: 'update' }.freeze,
     update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze,
     unblock_email_account: { target_type: 'Account', action: 'unblock_email' }.freeze,
@@ -72,7 +76,7 @@ class Admin::ActionLogFilter
   end
 
   def results
-    scope = latest_action_logs.includes(:target)
+    scope = latest_action_logs.includes(:target, :account)
 
     params.each do |key, value|
       next if key.to_s == 'page'
diff --git a/app/models/admin/import.rb b/app/models/admin/import.rb
index 0fd4bdb824..7a21abec46 100644
--- a/app/models/admin/import.rb
+++ b/app/models/admin/import.rb
@@ -30,12 +30,16 @@ class Admin::Import
 
     csv_converter = lambda do |field, field_info|
       case field_info.header
-      when '#domain', '#public_comment'
+      when '#domain'
+        field&.downcase&.strip
+      when '#public_comment'
         field&.strip
       when '#severity'
-        field&.strip&.to_sym
-      when '#reject_media', '#reject_reports', '#obfuscate'
-        ActiveModel::Type::Boolean.new.cast(field)
+        field&.downcase&.strip&.to_sym
+      when '#reject_media', '#reject_reports', '#obfuscate', '#reject_favourite', '#reject_send_sensitive',
+        '#reject_hashtag', '#reject_straight_follow', '#reject_new_follow', '#hidden', '#detect_invalid_subscription',
+        '#reject_reply_exclude_followers', '#reject_friend', '#block_trends'
+        ActiveModel::Type::Boolean.new.cast(field&.downcase)
       else
         field
       end
diff --git a/app/models/admin/ng_rule.rb b/app/models/admin/ng_rule.rb
new file mode 100644
index 0000000000..54ca39b4c9
--- /dev/null
+++ b/app/models/admin/ng_rule.rb
@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+
+class Admin::NgRule
+  def initialize(ng_rule, account, **options)
+    @ng_rule = ng_rule
+    @account = account
+    @options = options
+    @uri = nil
+  end
+
+  def account_match?
+    return false if @account.local? && !@ng_rule.account_include_local
+    return false if !@account.local? && @ng_rule.account_allow_followed_by_local && followed_by_local_accounts?
+
+    if @account.local?
+      return false unless @ng_rule.account_include_local
+    else
+      return false unless text_match?(:account_domain, @account.domain, @ng_rule.account_domain)
+    end
+
+    text_match?(:account_username, @account.username, @ng_rule.account_username) &&
+      text_match?(:account_display_name, @account.display_name, @ng_rule.account_display_name) &&
+      text_match?(:account_note, @account.note, @ng_rule.account_note) &&
+      text_match?(:account_field_name, @account.fields&.map(&:name)&.join("\n"), @ng_rule.account_field_name) &&
+      text_match?(:account_field_value, @account.fields&.map(&:value)&.join("\n"), @ng_rule.account_field_value) &&
+      media_state_match?(:account_avatar_state, @account.avatar, @ng_rule.account_avatar_state) &&
+      media_state_match?(:account_header_state, @account.header, @ng_rule.account_header_state)
+  end
+
+  def status_match? # rubocop:disable Metrics/CyclomaticComplexity
+    return false if @ng_rule.status_allow_follower_mention && @options[:mention_to_following]
+
+    has_media = @options[:media_count].is_a?(Integer) && @options[:media_count].positive?
+    has_poll = @options[:poll_count].is_a?(Integer) && @options[:poll_count].positive?
+    has_mention = @options[:mention_count].is_a?(Integer) && @options[:mention_count].positive?
+    has_reference = @options[:reference_count].is_a?(Integer) && @options[:reference_count].positive?
+
+    @options = @options.merge({ searchability: 'unset' }) if @options[:searchability].nil?
+
+    text_match?(:status_spoiler_text, @options[:spoiler_text], @ng_rule.status_spoiler_text) &&
+      text_match?(:status_text, @options[:text], @ng_rule.status_text) &&
+      text_match?(:status_tag, @options[:tag_names]&.join("\n"), @ng_rule.status_tag) &&
+      enum_match?(:status_visibility, @options[:visibility], @ng_rule.status_visibility) &&
+      enum_match?(:status_searchability, @options[:searchability], @ng_rule.status_searchability) &&
+      state_match?(:status_sensitive_state, @options[:sensitive], @ng_rule.status_sensitive_state) &&
+      state_match?(:status_cw_state, @options[:spoiler_text].present?, @ng_rule.status_cw_state) &&
+      state_match?(:status_media_state, has_media, @ng_rule.status_media_state) &&
+      state_match?(:status_poll_state, has_poll, @ng_rule.status_poll_state) &&
+      state_match?(:status_quote_state, @options[:quote], @ng_rule.status_quote_state) &&
+      state_match?(:status_reply_state, @options[:reply], @ng_rule.status_reply_state) &&
+      state_match?(:status_mention_state, has_mention, @ng_rule.status_mention_state) &&
+      state_match?(:status_reference_state, has_reference, @ng_rule.status_reference_state) &&
+      value_over_threshold?(:status_tag_threshold, (@options[:tag_names] || []).size, @ng_rule.status_tag_threshold) &&
+      value_over_threshold?(:status_media_threshold, @options[:media_count], @ng_rule.status_media_threshold) &&
+      value_over_threshold?(:status_poll_threshold, @options[:poll_count], @ng_rule.status_poll_threshold) &&
+      value_over_threshold?(:status_mention_threshold, @options[:mention_count], @ng_rule.status_mention_threshold) &&
+      value_over_threshold?(:status_reference_threshold, @options[:reference_count], @ng_rule.status_reference_threshold)
+  end
+
+  def reaction_match?
+    recipient = @options[:recipient]
+    return false if @ng_rule.reaction_allow_follower && (recipient.id == @account.id || (!recipient.local? && !@account.local?) || recipient.following?(@account))
+
+    if @options[:reaction_type] == 'emoji_reaction'
+      enum_match?(:reaction_type, @options[:reaction_type], @ng_rule.reaction_type) &&
+        text_match?(:emoji_reaction_name, @options[:emoji_reaction_name], @ng_rule.emoji_reaction_name) &&
+        text_match?(:emoji_reaction_origin_domain, @options[:emoji_reaction_origin_domain], @ng_rule.emoji_reaction_origin_domain)
+    else
+      enum_match?(:reaction_type, @options[:reaction_type], @ng_rule.reaction_type)
+    end
+  end
+
+  def check_account_or_record!
+    return true unless account_match?
+
+    record!('account', @account.uri, 'account_create') if !@account.local? || @ng_rule.record_history_also_local
+
+    false
+  end
+
+  def check_status_or_record!
+    return true unless account_match? && status_match?
+
+    text = [@options[:spoiler_text], @options[:text]].compact_blank.join("\n\n")
+    data = {
+      media_count: @options[:media_count],
+      poll_count: @options[:poll_count],
+      url: @options[:url],
+    }
+    record!('status', @options[:uri], "status_#{@options[:reaction_type]}", text: text, data: data) if !@account.local? || @ng_rule.record_history_also_local
+
+    false
+  end
+
+  def check_reaction_or_record!
+    return true unless account_match? && reaction_match?
+
+    text = @options[:target_status].present? ? [@options[:target_status].spoiler_text, @options[:target_status].text].compact_blank.join("\n\n") : nil
+    data = {
+      url: @options[:target_status].present? ? @options[:target_status].url : nil,
+    }
+    record!('reaction', @options[:uri], "reaction_#{@options[:reaction_type]}", text: text, data: data) if !@account.local? || @ng_rule.record_history_also_local
+
+    false
+  end
+
+  def loggable_visibility?
+    visibility = @options[:target_status]&.visibility || @options[:visibility]
+    return true unless visibility
+
+    %i(public public_unlisted login unlisted).include?(visibility.to_sym)
+  end
+
+  def self.extract_test!(custom_ng_words)
+    detect_keyword?('test', custom_ng_words)
+  end
+
+  private
+
+  def followed_by_local_accounts?
+    Follow.exists?(account: Account.local, target_account: @account)
+  end
+
+  def record!(reason, uri, reason_action, **options)
+    opts = options.merge({
+      ng_rule: @ng_rule,
+      account: @account,
+      local: @account.local?,
+      reason: reason,
+      reason_action: reason_action,
+      uri: uri,
+    })
+
+    unless loggable_visibility?
+      opts = opts.merge({
+        text: nil,
+        uri: nil,
+        hidden: true,
+      })
+    end
+
+    NgRuleHistory.create!(**opts)
+  end
+
+  def text_match?(_reason, text, arr)
+    return true if arr.blank? || !text.is_a?(String)
+
+    detect_keyword?(text, arr)
+  end
+
+  def enum_match?(_reason, text, arr)
+    return true if !text.is_a?(String) || text.blank?
+
+    arr.include?(text)
+  end
+
+  def state_match?(_reason, exists, expected)
+    case expected.to_sym
+    when :needed
+      exists
+    when :no_needed
+      !exists
+    else
+      true
+    end
+  end
+
+  def media_state_match?(reason, media, expected)
+    state_match?(reason, media.present?, expected)
+  end
+
+  def value_over_threshold?(_reason, value, expected)
+    return true if !expected.is_a?(Integer) || expected.negative? || !value.is_a?(Integer)
+
+    value > expected
+  end
+
+  def detect_keyword?(text, arr)
+    Admin::NgRule.detect_keyword?(text, arr, local: @account.local?)
+  end
+
+  class << self
+    def string_to_array(text)
+      text.delete("\r").split("\n")
+    end
+
+    def detect_keyword(text, arr, local: true)
+      arr = string_to_array(arr) if arr.is_a?(String)
+      text = PlainTextFormatter.new(text, false).to_s unless local
+
+      arr.detect { |word| include?(text, word) ? word : nil }
+    end
+
+    def detect_keyword?(text, arr, local: true)
+      detect_keyword(text, arr, local: local).present?
+    end
+
+    def include?(text, word)
+      if word.start_with?('?') && word.size >= 2
+        text =~ /#{word[1..]}/
+      else
+        text.include?(word)
+      end
+    end
+  end
+end
diff --git a/app/models/admin/ng_word.rb b/app/models/admin/ng_word.rb
new file mode 100644
index 0000000000..db3df319b0
--- /dev/null
+++ b/app/models/admin/ng_word.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+class Admin::NgWord
+  class << self
+    def reject?(text, **options)
+      text = PlainTextFormatter.new(text, false).to_s if options[:uri].present?
+
+      if options.delete(:stranger)
+        ::NgWord.caches.detect { |word| include?(text, word) ? word : nil }&.keyword.tap do |hit_word|
+          record!(:ng_words_for_stranger_mention, text, hit_word, options) if hit_word.present?
+        end.present?
+      else
+        ::NgWord.caches.filter { |w| !w.stranger }.detect { |word| include?(text, word) ? word : nil }&.keyword.tap do |hit_word|
+          record!(:ng_words, text, hit_word, options) if hit_word.present?
+        end.present?
+      end
+    end
+
+    def stranger_mention_reject?(text, **options)
+      opts = options.merge({ stranger: true })
+      reject?(text, **opts)
+    end
+
+    def reject_with_custom_word?(text, word)
+      include_with_regexp?(text, word)
+    end
+
+    def hashtag_reject?(hashtag_count, **options)
+      hit = post_hash_tags_max.positive? && post_hash_tags_max < hashtag_count
+      record_count!(:hashtag_count, hashtag_count, options) if hit
+      hit
+    end
+
+    def hashtag_reject_with_extractor?(text)
+      hashtag_reject?(Extractor.extract_hashtags(text)&.size || 0)
+    end
+
+    def mention_reject?(mention_count, **options)
+      hit = post_mentions_max.positive? && post_mentions_max < mention_count
+      record_count!(:mention_count, mention_count, options) if hit
+      hit
+    end
+
+    def mention_reject_with_extractor?(text)
+      mention_reject?(text.gsub(Account::MENTION_RE)&.count || 0)
+    end
+
+    def stranger_mention_reject_with_count?(mention_count, **options)
+      hit = post_stranger_mentions_max.positive? && post_stranger_mentions_max < mention_count
+      record_count!(:stranger_mention_count, mention_count, options) if hit
+      hit
+    end
+
+    def stranger_mention_reject_with_extractor?(text)
+      stranger_mention_reject_with_count?(text.gsub(Account::MENTION_RE)&.count || 0)
+    end
+
+    private
+
+    def include?(text, word)
+      if word.regexp
+        text =~ /#{word.keyword}/
+      else
+        text.include?(word.keyword)
+      end
+    end
+
+    def include_with_regexp?(text, word)
+      text =~ /#{word}/i
+    end
+
+    def post_hash_tags_max
+      value = Setting.post_hash_tags_max
+      value.is_a?(Integer) && value.positive? ? value : 0
+    end
+
+    def post_mentions_max
+      value = Setting.post_mentions_max
+      value.is_a?(Integer) && value.positive? ? value : 0
+    end
+
+    def post_stranger_mentions_max
+      value = Setting.post_stranger_mentions_max
+      value.is_a?(Integer) && value.positive? ? value : 0
+    end
+
+    def record!(type, text, keyword, options)
+      return unless options[:uri] && options[:target_type]
+      return if options.key?(:public) && !options.delete(:public)
+
+      return if NgwordHistory.where('created_at > ?', 1.day.ago).exists?(uri: options[:uri], keyword: keyword)
+
+      NgwordHistory.create(options.merge({
+        reason: type,
+        text: text,
+        keyword: keyword,
+      }))
+    end
+
+    def record_count!(type, count, options)
+      return unless options[:text] && options[:uri] && options[:target_type]
+      return if options.key?(:public) && !options.delete(:public)
+
+      return if NgwordHistory.where('created_at > ?', 1.day.ago).exists?(uri: options[:uri], reason: type)
+
+      NgwordHistory.create(options.merge({
+        reason: type,
+        text: options[:text],
+        keyword: '',
+        count: count,
+      }))
+    end
+  end
+end
diff --git a/app/models/admin/sensitive_word.rb b/app/models/admin/sensitive_word.rb
new file mode 100644
index 0000000000..a766a3174d
--- /dev/null
+++ b/app/models/admin/sensitive_word.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Admin::SensitiveWord
+  class << self
+    def sensitive?(text, spoiler_text, local: true)
+      exposure_text = spoiler_text.presence || text
+
+      sensitive_words = ::SensitiveWord.caches
+      sensitive_words.select!(&:remote) unless local
+
+      return sensitive_words.filter(&:spoiler).any? { |word| include?(spoiler_text, word) } if spoiler_text.present?
+
+      sensitive_words.any? { |word| include?(exposure_text, word) }
+    end
+
+    def modified_text(text, spoiler_text)
+      spoiler_text.present? ? "#{spoiler_text}\n\n#{text}" : text
+    end
+
+    def alternative_text
+      Setting.auto_warning_text.presence || I18n.t('admin.sensitive_words.alert') || 'CW'
+    end
+
+    private
+
+    def include?(text, word)
+      if word.regexp
+        text =~ /#{word.keyword}/
+      else
+        text.include?(word.keyword)
+      end
+    end
+  end
+end
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 8a8e2fa378..832ddc56ac 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -33,6 +33,8 @@ class Admin::StatusBatchAction
       handle_delete!
     when 'mark_as_sensitive'
       handle_mark_as_sensitive!
+    when 'force_cw'
+      handle_force_cw!
     when 'report'
       handle_report!
     when 'remove_from_report'
@@ -65,7 +67,8 @@ class Admin::StatusBatchAction
       statuses.each { |status| Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) } unless target_account.local?
     end
 
-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
+
     RemovalWorker.push_bulk(status_ids) { |status_id| [status_id, { 'preserve' => target_account.local?, 'immediate' => !target_account.local? }] }
   end
 
@@ -80,7 +83,7 @@ class Admin::StatusBatchAction
       authorize([:admin, status], :update?)
 
       if target_account.local?
-        UpdateStatusService.new.call(status, representative_account.id, sensitive: true)
+        UpdateStatusService.new.call(status, representative_account.id, sensitive: true, bypass_validation: true)
       else
         status.update(sensitive: true)
       end
@@ -101,7 +104,43 @@ class Admin::StatusBatchAction
       text: text
     )
 
-    UserMailer.warning(target_account.user, @warning).deliver_later! if warnable?
+    process_notification!
+  end
+
+  def handle_force_cw!
+    representative_account = Account.representative
+
+    # Can't use a transaction here because UpdateStatusService queues
+    # Sidekiq jobs
+    statuses.find_each do |status|
+      authorize([:admin, status], :update?)
+
+      status_text = status.text
+      status_text = "#{status.spoiler_text}\n\n#{status_text}" if status.spoiler_text
+
+      if target_account.local?
+        UpdateStatusService.new.call(status, representative_account.id, spoiler_text: 'CW', text: status_text, bypass_validation: true)
+      else
+        status.update(spoiler_text: 'CW', text: status_text)
+      end
+
+      log_action(:update, status)
+
+      if with_report?
+        report.resolve!(current_account)
+        log_action(:resolve, report)
+      end
+    end
+
+    @warning = target_account.strikes.create!(
+      action: :force_cw,
+      account: current_account,
+      report: report,
+      status_ids: status_ids,
+      text: text
+    )
+
+    process_notification!
   end
 
   def handle_report!
@@ -127,6 +166,13 @@ class Admin::StatusBatchAction
     !report.nil?
   end
 
+  def process_notification!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, @warning).deliver_later!
+    LocalNotificationWorker.perform_async(target_account.id, @warning.id, 'AccountWarning', 'moderation_warning')
+  end
+
   def warnable?
     send_email_notification && target_account.local?
   end
diff --git a/app/models/admin/status_filter.rb b/app/models/admin/status_filter.rb
index 4708785e7d..8d20e4f6ab 100644
--- a/app/models/admin/status_filter.rb
+++ b/app/models/admin/status_filter.rb
@@ -16,7 +16,7 @@ class Admin::StatusFilter
   end
 
   def results
-    scope = @account.statuses.where(visibility: [:public, :unlisted])
+    scope = @account.statuses.distributable_visibility
 
     params.each do |key, value|
       next if IGNORED_PARAMS.include?(key.to_s)
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 86f7037a56..6b3b8ccfc1 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -59,11 +59,13 @@ class Announcement < ApplicationRecord
   end
 
   def statuses
-    @statuses ||= if status_ids.nil?
-                    []
-                  else
-                    Status.where(id: status_ids, visibility: [:public, :unlisted])
-                  end
+    @statuses ||= begin
+      if status_ids.nil?
+        []
+      else
+        Status.with_includes.distributable_visibility_for_anonymous.where(id: status_ids)
+      end
+    end
   end
 
   def tags
@@ -75,22 +77,41 @@ class Announcement < ApplicationRecord
   end
 
   def reactions(account = nil)
-    records = begin
-      scope = announcement_reactions.group(:announcement_id, :name, :custom_emoji_id).order(Arel.sql('MIN(created_at) ASC'))
-
-      if account.nil?
-        scope.select('name, custom_emoji_id, count(*) as count, false as me')
-      else
-        scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from announcement_reactions r where r.account_id = #{account.id} and r.announcement_id = announcement_reactions.announcement_id and r.name = announcement_reactions.name) as me")
+    grouped_ordered_announcement_reactions.select(
+      [:name, :custom_emoji_id, 'COUNT(*) as count'].tap do |values|
+        values << value_for_reaction_me_column(account)
       end
-    end.to_a
-
-    ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
-    records
+    ).to_a.tap do |records|
+      ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
+    end
   end
 
   private
 
+  def grouped_ordered_announcement_reactions
+    announcement_reactions
+      .group(:announcement_id, :name, :custom_emoji_id)
+      .order(
+        Arel.sql('MIN(created_at)').asc
+      )
+  end
+
+  def value_for_reaction_me_column(account)
+    if account.nil?
+      'FALSE AS me'
+    else
+      <<~SQL.squish
+        EXISTS(
+          SELECT 1
+          FROM announcement_reactions inner_reactions
+          WHERE inner_reactions.account_id = #{account.id}
+            AND inner_reactions.announcement_id = announcement_reactions.announcement_id
+            AND inner_reactions.name = announcement_reactions.name
+        ) AS me
+      SQL
+    end
+  end
+
   def set_published
     return unless scheduled_at.blank? || scheduled_at.past?
 
diff --git a/app/models/antenna.rb b/app/models/antenna.rb
new file mode 100644
index 0000000000..c64e66bde2
--- /dev/null
+++ b/app/models/antenna.rb
@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: antennas
+#
+#  id               :bigint(8)        not null, primary key
+#  account_id       :bigint(8)        not null
+#  list_id          :bigint(8)        not null
+#  title            :string           default(""), not null
+#  keywords         :jsonb
+#  exclude_keywords :jsonb
+#  any_domains      :boolean          default(TRUE), not null
+#  any_tags         :boolean          default(TRUE), not null
+#  any_accounts     :boolean          default(TRUE), not null
+#  any_keywords     :boolean          default(TRUE), not null
+#  available        :boolean          default(TRUE), not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  expires_at       :datetime
+#  with_media_only  :boolean          default(FALSE), not null
+#  exclude_domains  :jsonb
+#  exclude_accounts :jsonb
+#  exclude_tags     :jsonb
+#  stl              :boolean          default(FALSE), not null
+#  ignore_reblog    :boolean          default(FALSE), not null
+#  insert_feeds     :boolean          default(FALSE), not null
+#  ltl              :boolean          default(FALSE), not null
+#
+class Antenna < ApplicationRecord
+  include Expireable
+
+  LIMIT = 30
+  DOMAINS_PER_ANTENNA_LIMIT = 20
+  ACCOUNTS_PER_ANTENNA_LIMIT = 100
+  TAGS_PER_ANTENNA_LIMIT = 50
+  KEYWORDS_PER_ANTENNA_LIMIT = 100
+
+  has_many :antenna_domains, inverse_of: :antenna, dependent: :destroy
+  has_many :antenna_tags, inverse_of: :antenna, dependent: :destroy
+  has_many :tags, through: :antenna_tags
+  has_many :antenna_accounts, inverse_of: :antenna, dependent: :destroy
+  has_many :accounts, through: :antenna_accounts
+
+  belongs_to :account
+  belongs_to :list, optional: true
+
+  scope :stls, -> { where(stl: true) }
+  scope :ltls, -> { where(ltl: true) }
+  scope :all_keywords, -> { where(any_keywords: true) }
+  scope :all_domains, -> { where(any_domains: true) }
+  scope :all_accounts, -> { where(any_accounts: true) }
+  scope :all_tags, -> { where(any_tags: true) }
+  scope :availables, -> { where(available: true).where(Arel.sql('any_keywords = FALSE OR any_domains = FALSE OR any_accounts = FALSE OR any_tags = FALSE')) }
+  scope :available_stls, -> { where(available: true, stl: true) }
+  scope :available_ltls, -> { where(available: true, stl: false, ltl: true) }
+
+  validates :title, presence: true
+
+  validate :list_owner
+  validate :validate_limit
+  validate :validate_stl_limit
+  validate :validate_ltl_limit
+
+  before_destroy :clean_feed_manager
+
+  def list_owner
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.invalid_list_owner') if !list_id.zero? && list.present? && list.account != account
+  end
+
+  def enabled?
+    enabled_config? && !expired?
+  end
+
+  def enabled_config?
+    available && enabled_config_raws?
+  end
+
+  def enabled_config_raws?
+    !(any_keywords && any_domains && any_accounts && any_tags)
+  end
+
+  def expires_in
+    return @expires_in if defined?(@expires_in)
+    return nil if expires_at.nil?
+
+    [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
+  end
+
+  def context
+    context = []
+    context << 'domain' unless any_domains
+    context << 'tag' unless any_tags
+    context << 'keyword' unless any_keywords
+    context << 'account' unless any_accounts
+    context
+  end
+
+  private
+
+  def validate_limit
+    errors.add(:base, I18n.t('antennas.errors.over_limit', limit: LIMIT)) if account.antennas.count >= LIMIT
+  end
+
+  def validate_stl_limit
+    return unless stl
+
+    stls = account.antennas.where(stl: true).where.not(id: id)
+
+    errors.add(:base, I18n.t('antennas.errors.over_stl_limit', limit: 1)) if if insert_feeds
+                                                                               list_id.zero? ? stls.any? { |tl| tl.list_id.zero? } : stls.any? { |tl| tl.list_id != 0 }
+                                                                             else
+                                                                               stls.any? { |tl| !tl.insert_feeds }
+                                                                             end
+  end
+
+  def validate_ltl_limit
+    return unless ltl
+
+    ltls = account.antennas.where(ltl: true).where.not(id: id)
+
+    errors.add(:base, I18n.t('antennas.errors.over_ltl_limit', limit: 1)) if if insert_feeds
+                                                                               list_id.zero? ? ltls.any? { |tl| tl.list_id.zero? } : ltls.any? { |tl| tl.list_id != 0 }
+                                                                             else
+                                                                               ltls.any? { |tl| !tl.insert_feeds }
+                                                                             end
+  end
+
+  def clean_feed_manager
+    FeedManager.instance.clean_feeds!(:antenna, [id])
+  end
+end
diff --git a/app/models/antenna_account.rb b/app/models/antenna_account.rb
new file mode 100644
index 0000000000..b4cab184e7
--- /dev/null
+++ b/app/models/antenna_account.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: antenna_accounts
+#
+#  id         :bigint(8)        not null, primary key
+#  antenna_id :bigint(8)        not null
+#  account_id :bigint(8)        not null
+#  exclude    :boolean          default(FALSE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class AntennaAccount < ApplicationRecord
+  belongs_to :antenna
+  belongs_to :account
+
+  validate :limit_per_antenna
+
+  validates :account_id, uniqueness: { scope: :antenna_id }
+
+  private
+
+  def limit_per_antenna
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.accounts') if AntennaAccount.where(antenna_id: antenna_id).count >= Antenna::ACCOUNTS_PER_ANTENNA_LIMIT
+  end
+end
diff --git a/app/models/antenna_domain.rb b/app/models/antenna_domain.rb
new file mode 100644
index 0000000000..f4b80e2e9f
--- /dev/null
+++ b/app/models/antenna_domain.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: antenna_domains
+#
+#  id         :bigint(8)        not null, primary key
+#  antenna_id :bigint(8)        not null
+#  name       :string
+#  exclude    :boolean          default(FALSE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class AntennaDomain < ApplicationRecord
+  belongs_to :antenna
+
+  validate :limit_per_antenna
+
+  validates :name, uniqueness: { scope: :antenna_id }
+
+  private
+
+  def limit_per_antenna
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.domains') if AntennaDomain.where(antenna_id: antenna_id).count >= Antenna::DOMAINS_PER_ANTENNA_LIMIT
+  end
+end
diff --git a/app/models/antenna_feed.rb b/app/models/antenna_feed.rb
new file mode 100644
index 0000000000..6bef09a4d9
--- /dev/null
+++ b/app/models/antenna_feed.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AntennaFeed < Feed
+  def initialize(antenna)
+    super(:antenna, antenna.id)
+  end
+end
diff --git a/app/models/antenna_tag.rb b/app/models/antenna_tag.rb
new file mode 100644
index 0000000000..6abf5c0312
--- /dev/null
+++ b/app/models/antenna_tag.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: antenna_tags
+#
+#  id         :bigint(8)        not null, primary key
+#  antenna_id :bigint(8)        not null
+#  tag_id     :bigint(8)        not null
+#  exclude    :boolean          default(FALSE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class AntennaTag < ApplicationRecord
+  belongs_to :antenna
+  belongs_to :tag
+
+  validate :limit_per_antenna
+
+  validates :tag_id, uniqueness: { scope: :antenna_id }
+
+  private
+
+  def limit_per_antenna
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.limit.tags') if AntennaTag.where(antenna_id: antenna_id).count >= Antenna::TAGS_PER_ANTENNA_LIMIT
+  end
+end
diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index f1290ad01a..395056b76f 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -20,8 +20,11 @@ class Appeal < ApplicationRecord
 
   belongs_to :account
   belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id', inverse_of: :appeal
-  belongs_to :approved_by_account, class_name: 'Account', optional: true
-  belongs_to :rejected_by_account, class_name: 'Account', optional: true
+
+  with_options class_name: 'Account', optional: true do
+    belongs_to :approved_by_account
+    belongs_to :rejected_by_account
+  end
 
   validates :text, presence: true, length: { maximum: 2_000 }
   validates :account_warning_id, uniqueness: true
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 014a73997d..299aad6340 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -22,4 +22,10 @@ class ApplicationRecord < ActiveRecord::Base
       value
     end
   end
+
+  # Prevent implicit serialization in ActiveModel::Serializer or other code paths.
+  # This is a hardening step to avoid accidental leaking of attributes.
+  def as_json
+    raise NotImplementedError
+  end
 end
diff --git a/app/models/bookmark_category.rb b/app/models/bookmark_category.rb
new file mode 100644
index 0000000000..6673eb9e2e
--- /dev/null
+++ b/app/models/bookmark_category.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: bookmark_categories
+#
+#  id         :bigint(8)        not null, primary key
+#  account_id :bigint(8)        not null
+#  title      :string           default(""), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class BookmarkCategory < ApplicationRecord
+  include Paginable
+
+  PER_CATEGORY_LIMIT = 20
+
+  belongs_to :account
+
+  has_many :bookmark_category_statuses, inverse_of: :bookmark_category, dependent: :destroy
+  has_many :statuses, through: :bookmark_category_statuses
+
+  validates :title, presence: true
+
+  validates_each :account_id, on: :create do |record, _attr, value|
+    record.errors.add(:base, I18n.t('bookmark_categories.errors.limit')) if BookmarkCategory.where(account_id: value).count >= PER_CATEGORY_LIMIT
+  end
+end
diff --git a/app/models/bookmark_category_status.rb b/app/models/bookmark_category_status.rb
new file mode 100644
index 0000000000..8933d0e91f
--- /dev/null
+++ b/app/models/bookmark_category_status.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: bookmark_category_statuses
+#
+#  id                   :bigint(8)        not null, primary key
+#  bookmark_category_id :bigint(8)        not null
+#  status_id            :bigint(8)        not null
+#  bookmark_id          :bigint(8)
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#
+
+class BookmarkCategoryStatus < ApplicationRecord
+  include Paginable
+
+  update_index('statuses', :status) if Chewy.enabled?
+
+  belongs_to :bookmark_category
+  belongs_to :status
+  belongs_to :bookmark
+
+  validates :status_id, uniqueness: { scope: :bookmark_category_id }
+  validate :validate_relationship
+
+  before_validation :set_bookmark
+
+  private
+
+  def set_bookmark
+    self.bookmark = Bookmark.find_by!(account_id: bookmark_category.account_id, status_id: status_id)
+  end
+
+  def validate_relationship
+    errors.add(:account_id, 'bookmark relationship missing') if bookmark_id.blank?
+  end
+end
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 810e471849..9b3f4c8a3a 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -24,7 +24,7 @@ class BulkImport < ApplicationRecord
   belongs_to :account
   has_many :rows, class_name: 'BulkImportRow', inverse_of: :bulk_import, dependent: :delete_all
 
-  enum type: {
+  enum :type, {
     following: 0,
     blocking: 1,
     muting: 2,
@@ -33,19 +33,19 @@ class BulkImport < ApplicationRecord
     lists: 5,
   }
 
-  enum state: {
+  enum :state, {
     unconfirmed: 0,
     scheduled: 1,
     in_progress: 2,
     finished: 3,
-  }
+  }, prefix: true
 
   validates :type, presence: true
 
   def self.progress!(bulk_import_id, imported: false)
     # Use `increment_counter` so that the incrementation is done atomically in the database
-    BulkImport.increment_counter(:processed_items, bulk_import_id) # rubocop:disable Rails/SkipsModelValidations
-    BulkImport.increment_counter(:imported_items, bulk_import_id) if imported # rubocop:disable Rails/SkipsModelValidations
+    BulkImport.increment_counter(:processed_items, bulk_import_id)
+    BulkImport.increment_counter(:imported_items, bulk_import_id) if imported
 
     # Since the incrementation has been done atomically, concurrent access to `bulk_import` is now bening
     bulk_import = BulkImport.find(bulk_import_id)
diff --git a/app/models/canonical_email_block.rb b/app/models/canonical_email_block.rb
index d09df6f5e2..c05eb9801d 100644
--- a/app/models/canonical_email_block.rb
+++ b/app/models/canonical_email_block.rb
@@ -20,6 +20,7 @@ class CanonicalEmailBlock < ApplicationRecord
   validates :canonical_email_hash, presence: true, uniqueness: true
 
   scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
+  scope :matching_account, ->(account) { matching_email(account&.user_email).or(where(reference_account: account)) }
 
   def to_log_human_identifier
     canonical_email_hash
diff --git a/app/models/circle.rb b/app/models/circle.rb
new file mode 100644
index 0000000000..7c11ab59ea
--- /dev/null
+++ b/app/models/circle.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: circles
+#
+#  id         :bigint(8)        not null, primary key
+#  account_id :bigint(8)        not null
+#  title      :string           default(""), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Circle < ApplicationRecord
+  include Paginable
+
+  PER_ACCOUNT_LIMIT = 100
+
+  belongs_to :account
+
+  has_many :circle_accounts, inverse_of: :circle, dependent: :destroy
+  has_many :accounts, through: :circle_accounts
+  has_many :circle_statuses, inverse_of: :circle, dependent: :destroy
+  has_many :statuses, through: :circle_statuses
+
+  validates :title, presence: true
+
+  validates_each :account_id, on: :create do |record, _attr, value|
+    record.errors.add(:base, I18n.t('lists.errors.limit')) if Circle.where(account_id: value).count >= PER_ACCOUNT_LIMIT
+  end
+end
diff --git a/app/models/circle_account.rb b/app/models/circle_account.rb
new file mode 100644
index 0000000000..ec8e24cb2e
--- /dev/null
+++ b/app/models/circle_account.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: circle_accounts
+#
+#  id         :bigint(8)        not null, primary key
+#  circle_id  :bigint(8)
+#  account_id :bigint(8)        not null
+#  follow_id  :bigint(8)        not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class CircleAccount < ApplicationRecord
+  belongs_to :circle
+  belongs_to :account
+  belongs_to :follow
+
+  validates :account_id, uniqueness: { scope: :circle_id }
+  validate :validate_relationship
+
+  before_validation :set_follow
+
+  private
+
+  def set_follow
+    return if circle.account_id == account.id
+
+    self.follow = Follow.find_by!(account_id: account.id, target_account_id: circle.account_id)
+  end
+
+  def validate_relationship
+    return if circle.account_id == account_id
+
+    errors.add(:account_id, 'follow relationship missing') if follow_id.nil?
+    errors.add(:follow, 'mismatched accounts') if follow_id.present? && follow.account_id != account_id
+  end
+end
diff --git a/app/models/circle_status.rb b/app/models/circle_status.rb
new file mode 100644
index 0000000000..b394a4f927
--- /dev/null
+++ b/app/models/circle_status.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: circle_statuses
+#
+#  id         :bigint(8)        not null, primary key
+#  circle_id  :bigint(8)
+#  status_id  :bigint(8)        not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class CircleStatus < ApplicationRecord
+  belongs_to :circle
+  belongs_to :status
+
+  validates :status, uniqueness: { scope: :circle }
+  validate :account_own_status
+
+  private
+
+  def account_own_status
+    errors.add(:status_id, :invalid) unless status.account_id == circle.account_id
+  end
+end
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index 2bb6fed5ad..82d94f0b2d 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -13,11 +13,21 @@ module Account::Associations
     # Timelines
     has_many :statuses, inverse_of: :account, dependent: :destroy
     has_many :favourites, inverse_of: :account, dependent: :destroy
+    has_many :emoji_reactions, inverse_of: :account, dependent: :destroy
     has_many :bookmarks, inverse_of: :account, dependent: :destroy
+    has_many :bookmark_categories, inverse_of: :account, dependent: :destroy
+    has_many :circles, inverse_of: :account, dependent: :destroy
+    has_many :antennas, inverse_of: :account, dependent: :destroy
     has_many :mentions, inverse_of: :account, dependent: :destroy
-    has_many :notifications, inverse_of: :account, dependent: :destroy
     has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
     has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
+    has_many :scheduled_expiration_statuses, inverse_of: :account, dependent: :destroy
+
+    # Notifications
+    has_many :notifications, inverse_of: :account, dependent: :destroy
+    has_one :notification_policy, inverse_of: :account, dependent: :destroy
+    has_many :notification_permissions, inverse_of: :account, dependent: :destroy
+    has_many :notification_requests, inverse_of: :account, dependent: :destroy
 
     # Pinned statuses
     has_many :status_pins, inverse_of: :account, dependent: :destroy
@@ -37,6 +47,7 @@ module Account::Associations
 
     has_many :report_notes, dependent: :destroy
     has_many :custom_filters, inverse_of: :account, dependent: :destroy
+    has_many :antenna_accounts, inverse_of: :account, dependent: :destroy
 
     # Moderation notes
     has_many :account_moderation_notes, dependent: :destroy, inverse_of: :account
@@ -44,6 +55,19 @@ module Account::Associations
     has_many :account_warnings, dependent: :destroy, inverse_of: :account
     has_many :strikes, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
 
+    # Remote pendings
+    has_many :pending_follow_requests, dependent: :destroy
+    has_many :pending_statuses, dependent: :destroy
+    has_many :fetchable_pending_statuses, class_name: 'PendingStatus', foreign_key: :fetch_account_id, dependent: :destroy, inverse_of: :fetch_account
+
+    # Antennas (that the account is on, not owned by the account)
+    has_many :antenna_accounts, inverse_of: :account, dependent: :destroy
+    has_many :joined_antennas, class_name: 'Antenna', through: :antenna_accounts, source: :antenna
+
+    # Circles (that the account is on, not owned by the account)
+    has_many :circle_accounts, inverse_of: :account, dependent: :destroy
+    has_many :joined_circles, class_name: 'Circle', through: :circle_accounts, source: :circle
+
     # Lists (that the account is on, not owned by the account)
     has_many :list_accounts, inverse_of: :account, dependent: :destroy
     has_many :lists, through: :list_accounts
@@ -57,7 +81,7 @@ module Account::Associations
     has_many :aliases, class_name: 'AccountAlias', dependent: :destroy, inverse_of: :account
 
     # Hashtags
-    has_and_belongs_to_many :tags
+    has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
     has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
 
     # Account deletion requests
diff --git a/app/models/concerns/account/counters.rb b/app/models/concerns/account/counters.rb
index 4488398128..536d5ca7bc 100644
--- a/app/models/concerns/account/counters.rb
+++ b/app/models/concerns/account/counters.rb
@@ -35,40 +35,11 @@ module Account::Counters
     raise ArgumentError, "Invalid key #{key}" unless ALLOWED_COUNTER_KEYS.include?(key)
     raise ArgumentError, 'Do not call update_count! on dirty objects' if association(:account_stat).loaded? && account_stat&.changed? && account_stat.changed_attribute_names_to_save == %w(id)
 
-    value = value.to_i
-    default_value = value.positive? ? value : 0
-
-    # We do an upsert using manually written SQL, as Rails' upsert method does
-    # not seem to support writing expressions in the UPDATE clause, but only
-    # re-insert the provided values instead.
-    # Even ARel seem to be missing proper handling of upserts.
-    sql = if value.positive? && key == :statuses_count
-            <<-SQL.squish
-              INSERT INTO account_stats(account_id, #{key}, created_at, updated_at, last_status_at)
-                VALUES (:account_id, :default_value, now(), now(), now())
-              ON CONFLICT (account_id) DO UPDATE
-              SET #{key} = account_stats.#{key} + :value,
-                  last_status_at = now(),
-                  updated_at = now()
-              RETURNING id;
-            SQL
-          else
-            <<-SQL.squish
-              INSERT INTO account_stats(account_id, #{key}, created_at, updated_at)
-                VALUES (:account_id, :default_value, now(), now())
-              ON CONFLICT (account_id) DO UPDATE
-              SET #{key} = account_stats.#{key} + :value,
-                  updated_at = now()
-              RETURNING id;
-            SQL
-          end
-
-    sql = AccountStat.sanitize_sql([sql, account_id: id, default_value: default_value, value: value])
-    account_stat_id = AccountStat.connection.exec_query(sql)[0]['id']
+    result = updated_account_stat(key, value.to_i)
 
     # Reload account_stat if it was loaded, taking into account newly-created unsaved records
     if association(:account_stat).loaded?
-      account_stat.id = account_stat_id if account_stat.new_record?
+      account_stat.id = result.first['id'] if account_stat.new_record?
       account_stat.reload
     end
   end
@@ -79,6 +50,28 @@ module Account::Counters
 
   private
 
+  def updated_account_stat(key, value)
+    AccountStat.upsert(
+      initial_values(key, value),
+      on_duplicate: Arel.sql(
+        duplicate_values(key, value).join(', ')
+      ),
+      unique_by: :account_id
+    )
+  end
+
+  def initial_values(key, value)
+    { :account_id => id, key => [value, 0].max }.tap do |values|
+      values.merge!(last_status_at: Time.current) if key == :statuses_count
+    end
+  end
+
+  def duplicate_values(key, value)
+    ["#{key} = (account_stats.#{key} + #{value})", 'updated_at = CURRENT_TIMESTAMP'].tap do |values|
+      values << 'last_status_at = CURRENT_TIMESTAMP' if key == :statuses_count && value.positive?
+    end
+  end
+
   def save_account_stat
     return unless association(:account_stat).loaded? && account_stat&.changed?
 
diff --git a/app/models/concerns/account/finder_concern.rb b/app/models/concerns/account/finder_concern.rb
index 7faaddeb43..a7acff1cbb 100644
--- a/app/models/concerns/account/finder_concern.rb
+++ b/app/models/concerns/account/finder_concern.rb
@@ -13,11 +13,11 @@ module Account::FinderConcern
     end
 
     def representative
-      actor = Account.find(-99).tap(&:ensure_keys!)
+      actor = Account.find(Account::INSTANCE_ACTOR_ID).tap(&:ensure_keys!)
       actor.update!(username: 'mastodon.internal') if actor.username.include?(':')
       actor
     rescue ActiveRecord::RecordNotFound
-      Account.create!(id: -99, actor_type: 'Application', locked: true, username: 'mastodon.internal')
+      Account.create!(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'mastodon.internal')
     end
 
     def find_local(username)
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 351530c2f0..664ec056c1 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -83,6 +83,11 @@ module Account::Interactions
     has_many :following, -> { order('follows.id desc') }, through: :active_relationships,  source: :target_account
     has_many :followers, -> { order('follows.id desc') }, through: :passive_relationships, source: :account
 
+    with_options class_name: 'SeveredRelationship', dependent: :destroy do
+      has_many :severed_relationships, foreign_key: 'local_account_id', inverse_of: :local_account
+      has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account
+    end
+
     # Account notes
     has_many :account_notes, dependent: :destroy
 
@@ -178,12 +183,16 @@ module Account::Interactions
   end
 
   def unblock_domain!(other_domain)
-    block = domain_blocks.find_by(domain: other_domain)
+    block = domain_blocks.find_by(domain: normalized_domain(other_domain))
     block&.destroy
   end
 
   def following?(other_account)
-    active_relationships.where(target_account: other_account).exists?
+    active_relationships.exists?(target_account: other_account)
+  end
+
+  def following_or_self?(other_account)
+    id == other_account.id || following?(other_account)
   end
 
   def following_anyone?
@@ -198,69 +207,90 @@ module Account::Interactions
     other_account.following?(self)
   end
 
+  def followed_by_domain?(other_domain, since = nil)
+    return true if other_domain.blank?
+    return false unless local?
+
+    scope = followers
+    scope = scope.where('follows.created_at < ?', since) if since.present?
+    scope.exists?(domain: other_domain)
+  end
+
+  def mutual?(other_account)
+    following?(other_account) && followed_by?(other_account)
+  end
+
   def blocking?(other_account)
-    block_relationships.where(target_account: other_account).exists?
+    block_relationships.exists?(target_account: other_account)
   end
 
   def domain_blocking?(other_domain)
-    domain_blocks.where(domain: other_domain).exists?
+    domain_blocks.exists?(domain: other_domain)
   end
 
   def muting?(other_account)
-    mute_relationships.where(target_account: other_account).exists?
+    mute_relationships.exists?(target_account: other_account)
   end
 
   def muting_conversation?(conversation)
-    conversation_mutes.where(conversation: conversation).exists?
+    conversation_mutes.exists?(conversation: conversation)
   end
 
   def muting_notifications?(other_account)
-    mute_relationships.where(target_account: other_account, hide_notifications: true).exists?
+    mute_relationships.exists?(target_account: other_account, hide_notifications: true)
   end
 
   def muting_reblogs?(other_account)
-    active_relationships.where(target_account: other_account, show_reblogs: false).exists?
+    active_relationships.exists?(target_account: other_account, show_reblogs: false)
   end
 
   def requested?(other_account)
-    follow_requests.where(target_account: other_account).exists?
+    follow_requests.exists?(target_account: other_account)
   end
 
   def favourited?(status)
-    status.proper.favourites.where(account: self).exists?
+    status.proper.favourites.exists?(account: self)
+  end
+
+  def emoji_reacted?(status, shortcode = nil, domain = nil, domain_force: false)
+    if shortcode.present?
+      if domain.present? || domain_force
+        status.proper.emoji_reactions.joins(:custom_emoji).exists?(account: self, name: shortcode, custom_emoji: { domain: domain })
+      else
+        status.proper.emoji_reactions.exists?(account: self, name: shortcode)
+      end
+    else
+      status.proper.emoji_reactions.exists?(account: self)
+    end
   end
 
   def bookmarked?(status)
-    status.proper.bookmarks.where(account: self).exists?
+    status.proper.bookmarks.exists?(account: self)
   end
 
   def reblogged?(status)
-    status.proper.reblogs.where(account: self).exists?
+    status.proper.reblogs.exists?(account: self)
   end
 
   def pinned?(status)
-    status_pins.where(status: status).exists?
-  end
-
-  def endorsed?(account)
-    account_pins.where(target_account: account).exists?
+    status_pins.exists?(status: status)
   end
 
   def status_matches_filters(status)
     active_filters = CustomFilter.cached_filters_for(id)
-    CustomFilter.apply_cached_filters(active_filters, status)
+    CustomFilter.apply_cached_filters(active_filters, status, following: following?(status.account))
   end
 
   def followers_for_local_distribution
     followers.local
              .joins(:user)
-             .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+             .merge(User.signed_in_recently)
   end
 
   def lists_for_local_distribution
     scope = lists.joins(account: :user)
     scope.where.not(list_accounts: { follow_id: nil }).or(scope.where(account_id: id))
-         .where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago)
+         .merge(User.signed_in_recently)
   end
 
   def remote_followers_hash(url)
@@ -286,6 +316,10 @@ module Account::Interactions
     end
   end
 
+  def mutuals
+    followers.merge(Account.where(id: following))
+  end
+
   def relations_map(account_ids, domains = nil, **options)
     relations = {
       blocked_by: Account.blocked_by_map(account_ids, id),
@@ -300,4 +334,8 @@ module Account::Interactions
       domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
     })
   end
+
+  def normalized_domain(domain)
+    TagManager.instance.normalize_domain(domain)
+  end
 end
diff --git a/app/models/concerns/account/master_settings.rb b/app/models/concerns/account/master_settings.rb
new file mode 100644
index 0000000000..90c61a06d2
--- /dev/null
+++ b/app/models/concerns/account/master_settings.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Account::MasterSettings
+  extend ActiveSupport::Concern
+
+  included do
+    def subscription_policy
+      return master_settings['subscription_policy']&.to_sym || :allow if master_settings.present?
+
+      # allow, followers_only, block
+      :allow
+    end
+
+    def subscription_policy=(val)
+      self.master_settings = (master_settings.nil? ? {} : master_settings).merge({ 'subscription_policy' => val })
+    end
+
+    def all_subscribable?
+      subscription_policy == :allow
+    end
+
+    def public_master_settings
+      {
+        'subscription_policy' => subscription_policy,
+      }
+    end
+  end
+end
diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb
index 960ee1819f..bd8b162238 100644
--- a/app/models/concerns/account/merging.rb
+++ b/app/models/concerns/account/merging.rb
@@ -27,6 +27,16 @@ module Account::Merging
       end
     end
 
+    [
+      Notification, NotificationPermission, NotificationRequest
+    ].each do |klass|
+      klass.where(from_account_id: other_account.id).reorder(nil).find_each do |record|
+        record.update_attribute(:from_account_id, id)
+      rescue ActiveRecord::RecordNotUnique
+        next
+      end
+    end
+
     target_classes = [
       Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin,
       AccountNote
@@ -48,6 +58,18 @@ module Account::Merging
       record.update_attribute(:account_warning_id, id)
     end
 
+    SeveredRelationship.about_local_account(other_account).reorder(nil).find_each do |record|
+      record.update_attribute(:local_account_id, id)
+    rescue ActiveRecord::RecordNotUnique
+      next
+    end
+
+    SeveredRelationship.about_remote_account(other_account).reorder(nil).find_each do |record|
+      record.update_attribute(:remote_account_id, id)
+    rescue ActiveRecord::RecordNotUnique
+      next
+    end
+
     # Some follow relationships have moved, so the cache is stale
     Rails.cache.delete_matched("followers_hash:#{id}:*")
     Rails.cache.delete_matched("relationships:#{id}:*")
diff --git a/app/models/concerns/account/other_settings.rb b/app/models/concerns/account/other_settings.rb
new file mode 100644
index 0000000000..7968f857ff
--- /dev/null
+++ b/app/models/concerns/account/other_settings.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Account::OtherSettings
+  extend ActiveSupport::Concern
+
+  included do
+    def noindex?
+      user_prefers_noindex? || (settings.present? && settings['noindex']) || false
+    end
+
+    def translatable_private?
+      return user.setting_translatable_private if local? && user.present?
+      return settings['translatable_private'] if settings.present? && settings.key?('translatable_private')
+
+      false
+    end
+
+    def allow_quote?
+      return user.setting_allow_quote if local? && user.present?
+      return settings['allow_quote'] if settings.present? && settings.key?('allow_quote')
+
+      true
+    end
+
+    def hide_statuses_count?
+      return user&.setting_hide_statuses_count if local? && user.present?
+      return settings['hide_statuses_count'] if settings.present? && settings.key?('hide_statuses_count')
+
+      false
+    end
+
+    def hide_following_count?
+      return user&.setting_hide_following_count if local? && user.present?
+      return settings['hide_following_count'] if settings.present? && settings.key?('hide_following_count')
+
+      false
+    end
+
+    def hide_followers_count?
+      return user&.setting_hide_followers_count if local? && user.present?
+      return settings['hide_followers_count'] if settings.present? && settings.key?('hide_followers_count')
+
+      false
+    end
+
+    def emoji_reaction_policy
+      return :block if !local? && Setting.emoji_reaction_disallow_domains&.include?(domain)
+      return settings['emoji_reaction_policy']&.to_sym || :allow if settings.present? && !local?
+      return :allow if user.nil?
+      return :block if local? && !Setting.enable_emoji_reaction # for federation
+
+      user.setting_emoji_reaction_policy&.to_sym
+    end
+
+    def show_emoji_reaction?(account)
+      return false unless Setting.enable_emoji_reaction
+      return true if local? && account&.local? && user.setting_slip_local_emoji_reaction
+
+      case emoji_reaction_policy
+      when :block
+        false
+      when :following_only
+        account.present? && (id == account.id || following?(account))
+      when :followers_only
+        account.present? && (id == account.id || followed_by?(account))
+      when :mutuals_only
+        account.present? && (id == account.id || mutual?(account))
+      when :outside_only
+        account.present? && (id == account.id || following?(account) || followed_by?(account))
+      else
+        true
+      end
+    end
+
+    def allow_emoji_reaction?(account)
+      return false if account.nil?
+      return true unless local? || account.local?
+
+      show_emoji_reaction?(account)
+    end
+
+    def public_settings
+      # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes
+      {
+        'noindex' => noindex?,
+        'hide_network' => hide_collections,
+        'hide_statuses_count' => hide_statuses_count?,
+        'hide_following_count' => hide_following_count?,
+        'hide_followers_count' => hide_followers_count?,
+        'translatable_private' => translatable_private?,
+        'allow_quote' => allow_quote?,
+        'emoji_reaction_policy' => Setting.enable_emoji_reaction ? emoji_reaction_policy.to_s : 'block',
+      }
+    end
+
+    def public_settings_for_local
+      s = public_settings
+      s = s.merge({ 'emoji_reaction_policy' => 'allow' }) if local? && user&.setting_slip_local_emoji_reaction
+      s.merge(public_master_settings)
+    end
+  end
+end
diff --git a/app/models/concerns/account/search.rb b/app/models/concerns/account/search.rb
index 077e5d57b1..45139b093f 100644
--- a/app/models/concerns/account/search.rb
+++ b/app/models/concerns/account/search.rb
@@ -87,6 +87,29 @@ module Account::Search
     LIMIT :limit OFFSET :offset
   SQL
 
+  ADVANCED_SEARCH_WITH_FOLLOWED = <<~SQL.squish
+    WITH first_degree AS (
+      SELECT account_id
+      FROM follows
+      WHERE target_account_id = :id
+      UNION ALL
+      SELECT :id
+    )
+    SELECT
+      accounts.*,
+      (count(f.id) + 1) * #{BOOST} * ts_rank_cd(#{TEXT_SEARCH_RANKS}, to_tsquery('simple', :tsquery), 32) AS rank
+    FROM accounts
+    LEFT OUTER JOIN follows AS f ON (accounts.id = f.target_account_id AND f.account_id = :id)
+    LEFT JOIN account_stats AS s ON accounts.id = s.account_id
+    WHERE accounts.id IN (SELECT * FROM first_degree)
+      AND to_tsquery('simple', :tsquery) @@ #{TEXT_SEARCH_RANKS}
+      AND accounts.suspended_at IS NULL
+      AND accounts.moved_to_account_id IS NULL
+    GROUP BY accounts.id, s.id
+    ORDER BY rank DESC
+    LIMIT :limit OFFSET :offset
+  SQL
+
   ADVANCED_SEARCH_WITHOUT_FOLLOWING = <<~SQL.squish
     SELECT
       accounts.*,
@@ -129,9 +152,13 @@ module Account::Search
       end
     end
 
-    def advanced_search_for(terms, account, limit: DEFAULT_LIMIT, following: false, offset: 0)
+    def advanced_search_for(terms, account, limit: DEFAULT_LIMIT, following: false, follower: false, offset: 0)
       tsquery = generate_query_for_search(terms)
-      sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
+      sql_template = if following
+                       ADVANCED_SEARCH_WITH_FOLLOWING
+                     else
+                       follower ? ADVANCED_SEARCH_WITH_FOLLOWED : ADVANCED_SEARCH_WITHOUT_FOLLOWING
+                     end
 
       find_by_sql([sql_template, { id: account.id, limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
         ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
diff --git a/app/models/concerns/account/statuses_search.rb b/app/models/concerns/account/statuses_search.rb
index 334b714504..93452b78b0 100644
--- a/app/models/concerns/account/statuses_search.rb
+++ b/app/models/concerns/account/statuses_search.rb
@@ -31,7 +31,7 @@ module Account::StatusesSearch
   def add_to_public_statuses_index!
     return unless Chewy.enabled?
 
-    statuses.without_reblogs.where(visibility: :public).reorder(nil).find_in_batches do |batch|
+    statuses.without_reblogs.public_visibility.reorder(nil).find_in_batches do |batch|
       PublicStatusesIndex.import(batch)
     end
   end
diff --git a/app/models/concerns/browser_detection.rb b/app/models/concerns/browser_detection.rb
new file mode 100644
index 0000000000..d42d0a5c99
--- /dev/null
+++ b/app/models/concerns/browser_detection.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module BrowserDetection
+  extend ActiveSupport::Concern
+
+  included do
+    before_save :assign_user_agent
+  end
+
+  def detection
+    @detection ||= Browser.new(user_agent)
+  end
+
+  def browser
+    detection.id
+  end
+
+  def platform
+    detection.platform.id
+  end
+
+  private
+
+  def assign_user_agent
+    self.user_agent ||= ''
+  end
+end
diff --git a/app/models/concerns/cacheable.rb b/app/models/concerns/cacheable.rb
index d7524cdfd0..0633f20c77 100644
--- a/app/models/concerns/cacheable.rb
+++ b/app/models/concerns/cacheable.rb
@@ -14,6 +14,10 @@ module Cacheable
       includes(@cache_associated)
     end
 
+    def preload_cacheable_associations(records)
+      ActiveRecord::Associations::Preloader.new(records: records, associations: @cache_associated).call
+    end
+
     def cache_ids
       select(:id, :updated_at)
     end
diff --git a/app/models/concerns/custom_filter_cache.rb b/app/models/concerns/custom_filter_cache.rb
new file mode 100644
index 0000000000..79b22f11f1
--- /dev/null
+++ b/app/models/concerns/custom_filter_cache.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module CustomFilterCache
+  extend ActiveSupport::Concern
+
+  included do
+    after_commit :invalidate_cache!
+    before_destroy :prepare_cache_invalidation!
+    before_save :prepare_cache_invalidation!
+
+    delegate(
+      :invalidate_cache!,
+      :prepare_cache_invalidation!,
+      to: :custom_filter
+    )
+  end
+end
diff --git a/app/models/concerns/database_view_record.rb b/app/models/concerns/database_view_record.rb
new file mode 100644
index 0000000000..8b6672e299
--- /dev/null
+++ b/app/models/concerns/database_view_record.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DatabaseViewRecord
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def refresh
+      Scenic.database.refresh_materialized_view(
+        table_name,
+        concurrently: true,
+        cascade: false
+      )
+    rescue ActiveRecord::StatementInvalid
+      Scenic.database.refresh_materialized_view(
+        table_name,
+        concurrently: false,
+        cascade: false
+      )
+    end
+  end
+
+  def readonly?
+    true
+  end
+end
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
index 8e244c1d87..76f91c5b64 100644
--- a/app/models/concerns/domain_normalizable.rb
+++ b/app/models/concerns/domain_normalizable.rb
@@ -5,6 +5,18 @@ module DomainNormalizable
 
   included do
     before_validation :normalize_domain
+
+    scope :by_domain_length, -> { order(domain_char_length.desc) }
+  end
+
+  class_methods do
+    def domain_char_length
+      Arel.sql(
+        <<~SQL.squish
+          CHAR_LENGTH(domain)
+        SQL
+      )
+    end
   end
 
   private
diff --git a/app/models/concerns/legacy_otp_secret.rb b/app/models/concerns/legacy_otp_secret.rb
new file mode 100644
index 0000000000..466c4ec9bb
--- /dev/null
+++ b/app/models/concerns/legacy_otp_secret.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+# TODO: This file is here for legacy support during devise-two-factor upgrade.
+# It should be removed after all records have been migrated.
+
+module LegacyOtpSecret
+  extend ActiveSupport::Concern
+
+  private
+
+  # Decrypt and return the `encrypted_otp_secret` attribute which was used in
+  # prior versions of devise-two-factor
+  # @return [String] The decrypted OTP secret
+  def legacy_otp_secret
+    return nil unless self[:encrypted_otp_secret]
+    return nil unless self.class.otp_secret_encryption_key
+
+    hmac_iterations = 2000 # a default set by the Encryptor gem
+    key = self.class.otp_secret_encryption_key
+    salt = Base64.decode64(encrypted_otp_secret_salt)
+    iv = Base64.decode64(encrypted_otp_secret_iv)
+
+    raw_cipher_text = Base64.decode64(encrypted_otp_secret)
+    # The last 16 bytes of the ciphertext are the authentication tag - we use
+    # Galois Counter Mode which is an authenticated encryption mode
+    cipher_text = raw_cipher_text[0..-17]
+    auth_tag =  raw_cipher_text[-16..-1] # rubocop:disable Style/SlicingWithRange
+
+    # this alrorithm lifted from
+    # https://github.com/attr-encrypted/encryptor/blob/master/lib/encryptor.rb#L54
+
+    # create an OpenSSL object which will decrypt the AES cipher with 256 bit
+    # keys in Galois Counter Mode (GCM). See
+    # https://ruby.github.io/openssl/OpenSSL/Cipher.html
+    cipher = OpenSSL::Cipher.new('aes-256-gcm')
+
+    # tell the cipher we want to decrypt. Symmetric algorithms use a very
+    # similar process for encryption and decryption, hence the same object can
+    # do both.
+    cipher.decrypt
+
+    # Use a Password-Based Key Derivation Function to generate the key actually
+    # used for encryptoin from the key we got as input.
+    cipher.key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(key, salt, hmac_iterations, cipher.key_len)
+
+    # set the Initialization Vector (IV)
+    cipher.iv = iv
+
+    # The tag must be set after calling Cipher#decrypt, Cipher#key= and
+    # Cipher#iv=, but before calling Cipher#final. After all decryption is
+    # performed, the tag is verified automatically in the call to Cipher#final.
+    #
+    # If the auth_tag does not verify, then #final will raise OpenSSL::Cipher::CipherError
+    cipher.auth_tag = auth_tag
+
+    # auth_data must be set after auth_tag has been set when decrypting See
+    # http://ruby-doc.org/stdlib-2.0.0/libdoc/openssl/rdoc/OpenSSL/Cipher.html#method-i-auth_data-3D
+    # we are not adding any authenticated data but OpenSSL docs say this should
+    # still be called.
+    cipher.auth_data = ''
+
+    # #update is (somewhat confusingly named) the method which actually
+    # performs the decryption on the given chunk of data. Our OTP secret is
+    # short so we only need to call it once.
+    #
+    # It is very important that we call #final because:
+    #
+    # 1. The authentication tag is checked during the call to #final
+    # 2. Block based cipher modes (e.g. CBC) work on fixed size chunks. We need
+    #    to call #final to get it to process the last chunk properly. The output
+    #    of #final should be appended to the decrypted value. This isn't
+    #    required for streaming cipher modes but including it is a best practice
+    #    so that your code will continue to function correctly even if you later
+    #    change to a block cipher mode.
+    cipher.update(cipher_text) + cipher.final
+  end
+end
diff --git a/app/models/concerns/ranked_trend.rb b/app/models/concerns/ranked_trend.rb
new file mode 100644
index 0000000000..add36afb0c
--- /dev/null
+++ b/app/models/concerns/ranked_trend.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RankedTrend
+  extend ActiveSupport::Concern
+
+  included do
+    scope :by_rank, -> { order(rank: :desc) }
+    scope :ranked_below, ->(value) { where(rank: ..value) }
+  end
+
+  class_methods do
+    def recalculate_ordered_rank
+      connection
+        .exec_update(<<~SQL.squish)
+          UPDATE #{table_name}
+          SET rank = inner_ordered.calculated_rank
+          FROM (
+            SELECT id, row_number() OVER w AS calculated_rank
+            FROM #{table_name}
+            WINDOW w AS (
+              PARTITION BY language
+              ORDER BY score DESC
+            )
+          ) inner_ordered
+          WHERE #{table_name}.id = inner_ordered.id
+        SQL
+    end
+  end
+end
diff --git a/app/models/concerns/status/domain_block_concern.rb b/app/models/concerns/status/domain_block_concern.rb
new file mode 100644
index 0000000000..aa31d5a08a
--- /dev/null
+++ b/app/models/concerns/status/domain_block_concern.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Status::DomainBlockConcern
+  extend ActiveSupport::Concern
+
+  def sending_sensitive?
+    return false unless local?
+
+    sensitive
+  end
+
+  def sending_maybe_compromised_privacy?
+    return false unless local?
+
+    (public_unlisted_visibility? && !public_searchability? && account.user&.setting_reject_public_unlisted_subscription) ||
+      (unlisted_visibility? && !public_searchability? && account.user&.setting_reject_unlisted_subscription)
+  end
+end
diff --git a/app/models/concerns/status/search_concern.rb b/app/models/concerns/status/search_concern.rb
index c16db8bd8c..65422d55ab 100644
--- a/app/models/concerns/status/search_concern.rb
+++ b/app/models/concerns/status/search_concern.rb
@@ -4,7 +4,8 @@ module Status::SearchConcern
   extend ActiveSupport::Concern
 
   included do
-    scope :indexable, -> { without_reblogs.where(visibility: :public).joins(:account).where(account: { indexable: true }) }
+    scope :indexable, -> { without_reblogs.where(visibility: [:public, :login], searchability: nil).joins(:account).where(account: { indexable: true }) }
+    scope :remote_dynamic_searchability, -> { remote.where(searchability: [:public, :public_unlisted, :private]) }
   end
 
   def searchable_by
@@ -13,16 +14,52 @@ module Status::SearchConcern
 
       ids << account_id if local?
 
-      ids += local_mentioned.pluck(:id)
-      ids += local_favorited.pluck(:id)
-      ids += local_reblogged.pluck(:id)
-      ids += local_bookmarked.pluck(:id)
-      ids += preloadable_poll.local_voters.pluck(:id) if preloadable_poll.present?
+      ids += mentioned_by
+      ids += favourited_by
+      ids += reblogged_by
+      ids += bookmarked_by
+      ids += emoji_reacted_by
+      ids += referenced_by
+      ids += voted_by if preloadable_poll.present?
 
       ids.uniq
     end
   end
 
+  def mentioned_by
+    @mentioned_by ||= local_mentioned.pluck(:id)
+  end
+
+  def favourited_by
+    @favourited_by ||= local_favorited.pluck(:id)
+  end
+
+  def reblogged_by
+    @reblogged_by ||= local_reblogged.pluck(:id)
+  end
+
+  def bookmarked_by
+    @bookmarked_by ||= local_bookmarked.pluck(:id)
+  end
+
+  def bookmark_categoried_by
+    @bookmark_categoried_by ||= local_bookmark_categoried.pluck(:id).uniq
+  end
+
+  def emoji_reacted_by
+    @emoji_reacted_by ||= local_emoji_reacted.pluck(:id)
+  end
+
+  def referenced_by
+    @referenced_by ||= local_referenced.pluck(:id)
+  end
+
+  def voted_by
+    return [] if preloadable_poll.blank?
+
+    @voted_by ||= preloadable_poll.local_voters.pluck(:id)
+  end
+
   def searchable_text
     [
       spoiler_text,
@@ -43,6 +80,7 @@ module Status::SearchConcern
       properties << 'embed' if preview_card&.video?
       properties << 'sensitive' if sensitive?
       properties << 'reply' if reply?
+      properties << 'reference' if with_status_reference?
     end
   end
 end
diff --git a/app/models/concerns/status/snapshot_concern.rb b/app/models/concerns/status/snapshot_concern.rb
index ba624d943e..bc469ee2d1 100644
--- a/app/models/concerns/status/snapshot_concern.rb
+++ b/app/models/concerns/status/snapshot_concern.rb
@@ -19,6 +19,7 @@ module Status::SnapshotConcern
       status_id: id,
       text: text,
       spoiler_text: spoiler_text,
+      markdown: markdown,
       sensitive: sensitive,
       ordered_media_attachment_ids: ordered_media_attachment_ids&.dup || media_attachments.pluck(:id),
       media_descriptions: ordered_media_attachments.map(&:description),
diff --git a/app/models/concerns/status/threading_concern.rb b/app/models/concerns/status/threading_concern.rb
index 2606fd2f27..9424d66f5e 100644
--- a/app/models/concerns/status/threading_concern.rb
+++ b/app/models/concerns/status/threading_concern.rb
@@ -3,6 +3,23 @@
 module Status::ThreadingConcern
   extend ActiveSupport::Concern
 
+  class_methods do
+    def permitted_statuses_from_ids(ids, account, stable: false)
+      statuses    = Status.with_accounts(ids).to_a
+      account_ids = statuses.map(&:account_id).uniq
+      domains     = statuses.filter_map(&:account_domain).uniq
+      relations   = account&.relations_map(account_ids, domains) || {}
+
+      statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
+
+      if stable
+        statuses.sort_by! { |status| ids.index(status.id) }
+      else
+        statuses
+      end
+    end
+  end
+
   def ancestors(limit, account = nil)
     find_statuses_from_tree_path(ancestor_ids(limit), account)
   end
@@ -11,8 +28,17 @@ module Status::ThreadingConcern
     find_statuses_from_tree_path(descendant_ids(limit, depth), account, promote: true)
   end
 
+  def readable_references(account = nil)
+    statuses = references.to_a
+    account_ids = statuses.map(&:account_id).uniq
+    domains = statuses.filter_map(&:account_domain).uniq
+    relations = account&.relations_map(account_ids, domains) || {}
+    statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
+    statuses
+  end
+
   def self_replies(limit)
-    account.statuses.where(in_reply_to_id: id, visibility: [:public, :unlisted]).reorder(id: :asc).limit(limit)
+    account.statuses.distributable_visibility.where(in_reply_to_id: id).reorder(id: :asc).limit(limit)
   end
 
   private
@@ -76,15 +102,7 @@ module Status::ThreadingConcern
   end
 
   def find_statuses_from_tree_path(ids, account, promote: false)
-    statuses    = Status.with_accounts(ids).to_a
-    account_ids = statuses.map(&:account_id).uniq
-    domains     = statuses.filter_map(&:account_domain).uniq
-    relations   = account&.relations_map(account_ids, domains) || {}
-
-    statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? }
-
-    # Order ancestors/descendants by tree path
-    statuses.sort_by! { |status| ids.index(status.id) }
+    statuses = Status.permitted_statuses_from_ids(ids, account, stable: true)
 
     # Bring self-replies to the top
     if promote
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index bfa8aa2ca3..6a12df1e69 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -23,12 +23,68 @@ module User::HasSettings
     settings['web.auto_play']
   end
 
+  def setting_reaction_deck
+    settings['reaction_deck']
+  end
+
+  def setting_enable_dtl_menu
+    settings['web.enable_dtl_menu']
+  end
+
+  def setting_bookmark_category_needed
+    settings['web.bookmark_category_needed']
+  end
+
+  def setting_hide_recent_emojis
+    settings['web.hide_recent_emojis']
+  end
+
+  def setting_enable_emoji_reaction
+    settings['web.enable_emoji_reaction']
+  end
+
+  def setting_show_emoji_reaction_on_timeline
+    settings['web.show_emoji_reaction_on_timeline']
+  end
+
+  def setting_simple_timeline_menu
+    settings['web.simple_timeline_menu']
+  end
+
+  def setting_boost_menu
+    settings['web.boost_menu']
+  end
+
   def setting_default_sensitive
     settings['default_sensitive']
   end
 
-  def setting_unfollow_modal
-    settings['web.unfollow_modal']
+  def setting_public_post_to_unlisted
+    settings['public_post_to_unlisted']
+  end
+
+  def setting_reject_public_unlisted_subscription
+    settings['reject_public_unlisted_subscription']
+  end
+
+  def setting_reject_unlisted_subscription
+    settings['reject_unlisted_subscription']
+  end
+
+  def setting_stop_emoji_reaction_streaming
+    settings['stop_emoji_reaction_streaming']
+  end
+
+  def setting_emoji_reaction_streaming_notify_impl2
+    false
+  end
+
+  def setting_emoji_reaction_policy
+    settings['emoji_reaction_policy']
+  end
+
+  def setting_slip_local_emoji_reaction
+    settings['slip_local_emoji_reaction']
   end
 
   def setting_boost_modal
@@ -47,18 +103,82 @@ module User::HasSettings
     settings['web.use_system_font']
   end
 
+  def setting_show_quote_in_home
+    settings['web.show_quote_in_home']
+  end
+
+  def setting_show_quote_in_public
+    settings['web.show_quote_in_public']
+  end
+
+  def setting_hide_blocking_quote
+    settings['web.hide_blocking_quote']
+  end
+
+  def setting_show_relationships
+    settings['web.show_relationships']
+  end
+
+  def setting_allow_quote
+    settings['allow_quote']
+  end
+
+  def setting_reject_send_limited_to_suspects
+    settings['reject_send_limited_to_suspects']
+  end
+
   def setting_noindex
     settings['noindex']
   end
 
+  def setting_translatable_private
+    settings['translatable_private']
+  end
+
+  def setting_dtl_force_visibility
+    settings['dtl_force_visibility']&.to_sym || :unchange
+  end
+
+  def setting_dtl_force_searchability
+    settings['dtl_force_searchability']&.to_sym || :unchange
+  end
+
+  def setting_dtl_force_subscribable
+    settings['dtl_force_subscribable']
+  end
+
+  def setting_hide_statuses_count
+    settings['hide_statuses_count']
+  end
+
+  def setting_hide_following_count
+    settings['hide_following_count']
+  end
+
+  def setting_hide_followers_count
+    settings['hide_followers_count']
+  end
+
   def setting_theme
     settings['theme']
   end
 
+  def setting_bio_markdown
+    settings['bio_markdown']
+  end
+
+  def setting_discoverable_local
+    settings['discoverable_local']
+  end
+
   def setting_display_media
     settings['web.display_media']
   end
 
+  def setting_display_media_expand
+    settings['web.display_media_expand']
+  end
+
   def setting_expand_spoilers
     settings['web.expand_content_warnings']
   end
@@ -103,6 +223,66 @@ module User::HasSettings
     settings['default_privacy'] || (account.locked? ? 'private' : 'public')
   end
 
+  def setting_stay_privacy
+    settings['stay_privacy']
+  end
+
+  def setting_default_reblog_privacy
+    settings['default_reblog_privacy'] || 'unset'
+  end
+
+  def setting_enabled_visibilities
+    settings['enabled_visibilities']
+  end
+
+  def setting_disabled_visibilities
+    settings['disabled_visibilities']
+  end
+
+  def setting_default_searchability
+    settings['default_searchability'] || 'direct'
+  end
+
+  def setting_default_searchability_of_search
+    settings['default_searchability_of_search']
+  end
+
+  def setting_use_public_index
+    settings['use_public_index']
+  end
+
+  def setting_reverse_search_quote
+    settings['reverse_search_quote']
+  end
+
+  def setting_disallow_unlisted_public_searchability
+    settings['disallow_unlisted_public_searchability']
+  end
+
+  def setting_lock_follow_from_bot
+    settings['lock_follow_from_bot']
+  end
+
+  def setting_hide_emoji_reaction_unavailable_server
+    settings['web.hide_emoji_reaction_unavailable_server']
+  end
+
+  def setting_hide_quote_unavailable_server
+    settings['web.hide_quote_unavailable_server']
+  end
+
+  def setting_hide_status_reference_unavailable_server
+    settings['web.hide_status_reference_unavailable_server']
+  end
+
+  def setting_hide_emoji_reaction_count
+    settings['web.hide_emoji_reaction_count']
+  end
+
+  def setting_hide_favourite_menu
+    settings['web.hide_favourite_menu']
+  end
+
   def allows_report_emails?
     settings['notification_emails.report']
   end
@@ -111,6 +291,10 @@ module User::HasSettings
     settings['notification_emails.pending_account']
   end
 
+  def allows_pending_friend_server_emails?
+    settings['notification_emails.pending_friend_server']
+  end
+
   def allows_appeal_emails?
     settings['notification_emails.appeal']
   end
diff --git a/app/models/concerns/user/ldap_authenticable.rb b/app/models/concerns/user/ldap_authenticable.rb
index d84ff084b2..c8e9fa9348 100644
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@@ -22,10 +22,18 @@ module User::LdapAuthenticable
         safe_username = safe_username.gsub(keys, replacement)
       end
 
-      resource = joins(:account).find_by(accounts: { username: safe_username })
+      resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take
 
       if resource.blank?
-        resource = new(email: attributes[Devise.ldap_mail.to_sym].first, agreement: true, account_attributes: { username: safe_username }, admin: false, external: true, confirmed_at: Time.now.utc)
+        resource = new(
+          email: attributes[Devise.ldap_mail.to_sym].first,
+          agreement: true,
+          account_attributes: {
+            username: safe_username,
+          },
+          external: true,
+          confirmed_at: Time.now.utc
+        )
         resource.save!
       end
 
diff --git a/app/models/concerns/user/omniauthable.rb b/app/models/concerns/user/omniauthable.rb
index 6d1d1b8cc3..396a0598f8 100644
--- a/app/models/concerns/user/omniauthable.rb
+++ b/app/models/concerns/user/omniauthable.rb
@@ -19,17 +19,18 @@ module User::Omniauthable
   end
 
   class_methods do
-    def find_for_oauth(auth, signed_in_resource = nil)
+    def find_for_omniauth(auth, signed_in_resource = nil)
       # EOLE-SSO Patch
       auth.uid = (auth.uid[0][:uid] || auth.uid[0][:user]) if auth.uid.is_a? Hashie::Array
-      identity = Identity.find_for_oauth(auth)
+      identity = Identity.find_for_omniauth(auth)
 
       # If a signed_in_resource is provided it always overrides the existing user
       # to prevent the identity being locked with accidentally created accounts.
       # Note that this may leave zombie accounts (with no associated identity) which
       # can be cleaned up at a later date.
       user   = signed_in_resource || identity.user
-      user ||= create_for_oauth(auth)
+      user ||= reattach_for_auth(auth)
+      user ||= create_for_auth(auth)
 
       if identity.user.nil?
         identity.user = user
@@ -39,19 +40,35 @@ module User::Omniauthable
       user
     end
 
-    def create_for_oauth(auth)
-      # Check if the user exists with provided email. If no email was provided,
+    private
+
+    def reattach_for_auth(auth)
+      # If allowed, check if a user exists with the provided email address,
+      # and return it if they does not have an associated identity with the
+      # current authentication provider.
+
+      # This can be used to provide a choice of alternative auth providers
+      # or provide smooth gradual transition between multiple auth providers,
+      # but this is discouraged because any insecure provider will put *all*
+      # local users at risk, regardless of which provider they registered with.
+
+      return unless ENV['ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH'] == 'true'
+
+      email, email_is_verified = email_from_auth(auth)
+      return unless email_is_verified
+
+      user = User.find_by(email: email)
+      return if user.nil? || Identity.exists?(provider: auth.provider, user_id: user.id)
+
+      user
+    end
+
+    def create_for_auth(auth)
+      # Create a user for the given auth params. If no email was provided,
       # we assign a temporary email and ask the user to verify it on
       # the next step via Auth::SetupController.show
 
-      strategy          = Devise.omniauth_configs[auth.provider.to_sym].strategy
-      assume_verified   = strategy&.security&.assume_email_is_verified
-      email_is_verified = auth.info.verified || auth.info.verified_email || auth.info.email_verified || assume_verified
-      email             = auth.info.verified_email || auth.info.email
-
-      user = User.find_by(email: email) if email_is_verified
-
-      return user unless user.nil?
+      email, email_is_verified = email_from_auth(auth)
 
       user = User.new(user_params_from_auth(email, auth))
 
@@ -61,12 +78,19 @@ module User::Omniauthable
         user.account.avatar_remote_url = nil
       end
 
-      user.confirm! if email_is_verified
+      user.mark_email_as_confirmed! if email_is_verified
       user.save!
       user
     end
 
-    private
+    def email_from_auth(auth)
+      strategy          = Devise.omniauth_configs[auth.provider.to_sym].strategy
+      assume_verified   = strategy&.security&.assume_email_is_verified
+      email_is_verified = auth.info.verified || auth.info.verified_email || auth.info.email_verified || assume_verified
+      email             = auth.info.verified_email || auth.info.email
+
+      [email, email_is_verified]
+    end
 
     def user_params_from_auth(email, auth)
       {
diff --git a/app/models/concerns/user/pam_authenticable.rb b/app/models/concerns/user/pam_authenticable.rb
index a682058cca..30dc7d8aef 100644
--- a/app/models/concerns/user/pam_authenticable.rb
+++ b/app/models/concerns/user/pam_authenticable.rb
@@ -32,7 +32,6 @@ module User::PamAuthenticable
 
       self.email        = "#{account.username}@#{find_pam_suffix}" if email.nil? && find_pam_suffix
       self.confirmed_at = Time.now.utc
-      self.admin        = false
       self.account      = account
       self.external     = true
 
diff --git a/app/models/context.rb b/app/models/context.rb
index cc667999ed..533d065a68 100644
--- a/app/models/context.rb
+++ b/app/models/context.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Context < ActiveModelSerializers::Model
-  attributes :ancestors, :descendants
+  attributes :ancestors, :descendants, :references
 end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index a7fe148840..b7d685859a 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -4,18 +4,25 @@
 #
 # Table name: conversations
 #
-#  id         :bigint(8)        not null, primary key
-#  uri        :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                 :bigint(8)        not null, primary key
+#  uri                :string
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  inbox_url          :string
+#  ancestor_status_id :bigint(8)
 #
 
 class Conversation < ApplicationRecord
   validates :uri, uniqueness: true, if: :uri?
 
   has_many :statuses, dependent: nil
+  belongs_to :ancestor_status, class_name: 'Status', inverse_of: :owned_conversation, optional: true
 
   def local?
     uri.nil?
   end
+
+  def object_type
+    :conversation
+  end
 end
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 1c9b443959..a043c3ae10 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -9,7 +9,6 @@
 #  domain                       :string
 #  image_file_name              :string
 #  image_content_type           :string
-#  image_file_size              :integer
 #  image_updated_at             :datetime
 #  created_at                   :datetime         not null
 #  updated_at                   :datetime         not null
@@ -19,25 +18,29 @@
 #  visible_in_picker            :boolean          default(TRUE), not null
 #  category_id                  :bigint(8)
 #  image_storage_schema_version :integer
+#  image_width                  :integer
+#  image_height                 :integer
+#  aliases                      :jsonb
+#  is_sensitive                 :boolean          default(FALSE), not null
+#  license                      :string
+#  image_file_size              :integer
 #
 
 class CustomEmoji < ApplicationRecord
   include Attachmentable
 
-  LIMIT = 256.kilobytes
+  LIMIT = 512.kilobytes
 
   SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
 
-  SCAN_RE = /(?<=[^[:alnum:]:]|\n|^)
-    :(#{SHORTCODE_RE_FRAGMENT}):
-    (?=[^[:alnum:]:]|$)/x
+  SCAN_RE = /:(#{SHORTCODE_RE_FRAGMENT}):/x
   SHORTCODE_ONLY_RE = /\A#{SHORTCODE_RE_FRAGMENT}\z/
 
-  IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze
+  IMAGE_MIME_TYPES = %w(image/png image/gif image/webp image/jpeg).freeze
 
   belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
-
   has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
+  has_many :emoji_reactions, inverse_of: :custom_emoji, dependent: :destroy
 
   has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' } }, validate_media_type: false
 
@@ -56,6 +59,8 @@ class CustomEmoji < ApplicationRecord
 
   after_commit :remove_entity_cache
 
+  after_post_process :set_post_size
+
   def local?
     domain.nil?
   end
@@ -65,7 +70,13 @@ class CustomEmoji < ApplicationRecord
   end
 
   def copy!
-    copy = self.class.find_or_initialize_by(domain: nil, shortcode: shortcode)
+    copy = self.class.find_or_initialize_by(
+      domain: nil,
+      shortcode: shortcode
+    )
+    copy.aliases = (aliases || []).compact_blank
+    copy.license = license
+    copy.is_sensitive = is_sensitive
     copy.image = image
     copy.tap(&:save!)
   end
@@ -74,6 +85,21 @@ class CustomEmoji < ApplicationRecord
     shortcode
   end
 
+  def update_size
+    size(Rails.configuration.x.use_s3 ? image.url : image.path)
+  end
+
+  def aliases_raw
+    return '' if aliases.nil? || aliases.blank?
+
+    aliases.join(',')
+  end
+
+  def aliases_raw=(raw)
+    aliases = raw.split(',').compact_blank.uniq
+    self[:aliases] = aliases
+  end
+
   class << self
     def from_text(text, domain = nil)
       return [] if text.blank?
@@ -95,4 +121,16 @@ class CustomEmoji < ApplicationRecord
   def remove_entity_cache
     Rails.cache.delete(EntityCache.instance.to_key(:emoji, shortcode, domain))
   end
+
+  def set_post_size
+    image.queued_for_write.each do |style, file|
+      size(file.path) if style == :original
+    end
+  end
+
+  def size(path)
+    image_size = FastImage.size(path)
+    self.image_width = image_size[0]
+    self.image_height = image_size[1]
+  end
 end
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 371267fc28..e613de44f9 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -4,14 +4,17 @@
 #
 # Table name: custom_filters
 #
-#  id         :bigint(8)        not null, primary key
-#  account_id :bigint(8)
-#  expires_at :datetime
-#  phrase     :text             default(""), not null
-#  context    :string           default([]), not null, is an Array
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  action     :integer          default("warn"), not null
+#  id                 :bigint(8)        not null, primary key
+#  account_id         :bigint(8)
+#  expires_at         :datetime
+#  phrase             :text             default(""), not null
+#  context            :string           default([]), not null, is an Array
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  action             :integer          default("warn"), not null
+#  exclude_follows    :boolean          default(FALSE), not null
+#  exclude_localusers :boolean          default(FALSE), not null
+#  with_quote         :boolean          default(TRUE), not null
 #
 
 class CustomFilter < ApplicationRecord
@@ -26,12 +29,15 @@ class CustomFilter < ApplicationRecord
     public
     thread
     account
+    explore
   ).freeze
 
+  EXPIRATION_DURATIONS = [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 2.weeks, 1.month, 3.months].freeze
+
   include Expireable
   include Redisable
 
-  enum action: { warn: 0, hide: 1 }, _suffix: :action
+  enum :action, { warn: 0, hide: 1, half_warn: 2 }, suffix: :action
 
   belongs_to :account
   has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
@@ -41,17 +47,17 @@ class CustomFilter < ApplicationRecord
   validates :title, :context, presence: true
   validate :context_must_be_valid
 
-  before_validation :clean_up_contexts
+  normalizes :context, with: ->(context) { context.map(&:strip).filter_map(&:presence) }
+  scope :unexpired, -> { where(expires_at: nil).or where.not(expires_at: ..Time.zone.now) }
 
   before_save :prepare_cache_invalidation!
   before_destroy :prepare_cache_invalidation!
   after_commit :invalidate_cache!
 
   def expires_in
-    return @expires_in if defined?(@expires_in)
     return nil if expires_at.nil?
 
-    [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
+    EXPIRATION_DURATIONS.find { |expires_in| expires_in.from_now >= expires_at }
   end
 
   def irreversible=(value)
@@ -62,27 +68,28 @@ class CustomFilter < ApplicationRecord
     hide_action?
   end
 
+  def exclude_quote=(value)
+    self.with_quote = !ActiveModel::Type::Boolean.new.cast(value)
+  end
+
+  def exclude_quote
+    !with_quote
+  end
+
   def self.cached_filters_for(account_id)
     active_filters = Rails.cache.fetch("filters:v3:#{account_id}") do
       filters_hash = {}
 
-      scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
-      scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
-        keywords.map! do |keyword|
-          if keyword.whole_word
-            sb = /\A[[:word:]]/.match?(keyword.keyword) ? '\b' : ''
-            eb = /[[:word:]]\z/.match?(keyword.keyword) ? '\b' : ''
+      scope = CustomFilterKeyword.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
 
-            /(?mix:#{sb}#{Regexp.escape(keyword.keyword)}#{eb})/
-          else
-            /#{Regexp.escape(keyword.keyword)}/i
-          end
-        end
+      scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
+        keywords.map!(&:to_regex)
 
         filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
       end.to_h
 
-      scope = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
+      scope = CustomFilterStatus.left_outer_joins(:custom_filter).merge(unexpired.where(account_id: account_id))
+
       scope.to_a.group_by(&:custom_filter).each do |filter, statuses|
         filters_hash[filter.id] ||= { filter: filter }
         filters_hash[filter.id].merge!(status_ids: statuses.map(&:status_id))
@@ -94,12 +101,27 @@ class CustomFilter < ApplicationRecord
     active_filters.reject { |custom_filter, _| custom_filter.expired? }
   end
 
-  def self.apply_cached_filters(cached_filters, status)
+  def self.apply_cached_filters(cached_filters, status, following: false)
+    references_text_cache = nil
+    references_spoiler_text_cache = nil
+
     cached_filters.filter_map do |filter, rules|
-      match = rules[:keywords].match(status.proper.searchable_text) if rules[:keywords].present?
+      next if filter.exclude_follows && following
+      next if filter.exclude_localusers && status.account.local?
+
+      if rules[:keywords].present?
+        match = rules[:keywords].match(status.proper.searchable_text)
+        if match.nil? && filter.with_quote && status.proper.reference_objects.exists?
+          references_text_cache = status.proper.references.pluck(:text).join("\n\n") if references_text_cache.nil?
+          references_spoiler_text_cache = status.proper.references.pluck(:spoiler_text).join("\n\n") if references_spoiler_text_cache.nil?
+          match = rules[:keywords].match(references_text_cache)
+          match = rules[:keywords].match(references_spoiler_text_cache) if match.nil?
+        end
+      end
       keyword_matches = [match.to_s] unless match.nil?
 
-      status_matches = [status.id, status.reblog_of_id].compact & rules[:status_ids] if rules[:status_ids].present?
+      reference_ids = filter.with_quote ? status.proper.reference_objects.pluck(:target_status_id) : []
+      status_matches = ([status.id, status.reblog_of_id] + reference_ids).compact & rules[:status_ids] if rules[:status_ids].present?
 
       next if keyword_matches.blank? && status_matches.blank?
 
@@ -123,10 +145,6 @@ class CustomFilter < ApplicationRecord
 
   private
 
-  def clean_up_contexts
-    self.context = Array(context).map(&:strip).filter_map(&:presence)
-  end
-
   def context_must_be_valid
     errors.add(:context, I18n.t('filters.errors.invalid_context')) if invalid_context_value?
   end
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 3158b3b79a..5280332fdd 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -7,29 +7,35 @@
 #  id               :bigint(8)        not null, primary key
 #  custom_filter_id :bigint(8)        not null
 #  keyword          :text             default(""), not null
-#  whole_word       :boolean          default(TRUE), not null
+#  whole_word       :boolean          default(FALSE), not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #
 
 class CustomFilterKeyword < ApplicationRecord
+  include CustomFilterCache
+
   belongs_to :custom_filter
 
   validates :keyword, presence: true
 
   alias_attribute :phrase, :keyword
 
-  before_save :prepare_cache_invalidation!
-  before_destroy :prepare_cache_invalidation!
-  after_commit :invalidate_cache!
+  def to_regex
+    if whole_word?
+      /(?mix:#{to_regex_sb}#{Regexp.escape(keyword)}#{to_regex_eb})/
+    else
+      /#{Regexp.escape(keyword)}/i
+    end
+  end
 
   private
 
-  def prepare_cache_invalidation!
-    custom_filter.prepare_cache_invalidation!
+  def to_regex_sb
+    /\A[[:word:]]/.match?(keyword) ? '\b' : ''
   end
 
-  def invalidate_cache!
-    custom_filter.invalidate_cache!
+  def to_regex_eb
+    /[[:word:]]\z/.match?(keyword) ? '\b' : ''
   end
 end
diff --git a/app/models/custom_filter_status.rb b/app/models/custom_filter_status.rb
index 0a5650204a..58b61cd79d 100644
--- a/app/models/custom_filter_status.rb
+++ b/app/models/custom_filter_status.rb
@@ -12,27 +12,17 @@
 #
 
 class CustomFilterStatus < ApplicationRecord
+  include CustomFilterCache
+
   belongs_to :custom_filter
   belongs_to :status
 
   validates :status, uniqueness: { scope: :custom_filter }
   validate :validate_status_access
 
-  before_save :prepare_cache_invalidation!
-  before_destroy :prepare_cache_invalidation!
-  after_commit :invalidate_cache!
-
   private
 
   def validate_status_access
     errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter.account, status).show?
   end
-
-  def prepare_cache_invalidation!
-    custom_filter.prepare_cache_invalidation!
-  end
-
-  def invalidate_cache!
-    custom_filter.invalidate_cache!
-  end
 end
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index ce9597b4d1..47ada7ac23 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -17,8 +17,6 @@ class DomainAllow < ApplicationRecord
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
-
   def to_log_human_identifier
     domain
   end
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 8da099256a..a6c6cc045b 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -4,16 +4,26 @@
 #
 # Table name: domain_blocks
 #
-#  id              :bigint(8)        not null, primary key
-#  domain          :string           default(""), not null
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  severity        :integer          default("silence")
-#  reject_media    :boolean          default(FALSE), not null
-#  reject_reports  :boolean          default(FALSE), not null
-#  private_comment :text
-#  public_comment  :text
-#  obfuscate       :boolean          default(FALSE), not null
+#  id                             :bigint(8)        not null, primary key
+#  domain                         :string           default(""), not null
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
+#  severity                       :integer          default("silence")
+#  reject_media                   :boolean          default(FALSE), not null
+#  reject_reports                 :boolean          default(FALSE), not null
+#  private_comment                :text
+#  public_comment                 :text
+#  obfuscate                      :boolean          default(FALSE), not null
+#  reject_favourite               :boolean          default(FALSE), not null
+#  reject_send_sensitive          :boolean          default(FALSE), not null
+#  reject_hashtag                 :boolean          default(FALSE), not null
+#  reject_straight_follow         :boolean          default(FALSE), not null
+#  reject_new_follow              :boolean          default(FALSE), not null
+#  hidden                         :boolean          default(FALSE), not null
+#  detect_invalid_subscription    :boolean          default(FALSE), not null
+#  reject_reply_exclude_followers :boolean          default(FALSE), not null
+#  reject_friend                  :boolean          default(FALSE), not null
+#  block_trends                   :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord
@@ -21,16 +31,24 @@ class DomainBlock < ApplicationRecord
   include DomainNormalizable
   include DomainMaterializable
 
-  enum severity: { silence: 0, suspend: 1, noop: 2 }
+  enum :severity, { silence: 0, suspend: 1, noop: 2 }
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
   has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false, dependent: nil
   delegate :count, to: :accounts, prefix: true
 
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
-  scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
-  scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
+  scope :with_user_facing_limitations, -> { where(hidden: false) }
+  scope :with_limitations, lambda {
+    where(severity: [:silence, :suspend])
+      .or(where(reject_media: true))
+      .or(where(reject_favourite: true))
+      .or(where(reject_reply_exclude_followers: true))
+      .or(where(reject_new_follow: true))
+      .or(where(reject_straight_follow: true))
+      .or(where(reject_friend: true))
+      .or(where(block_trends: true))
+  }
   scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
 
   def to_log_human_identifier
@@ -41,7 +59,18 @@ class DomainBlock < ApplicationRecord
     if suspend?
       [:suspend]
     else
-      [severity.to_sym, reject_media? ? :reject_media : nil, reject_reports? ? :reject_reports : nil].reject { |policy| policy == :noop || policy.nil? }
+      [severity.to_sym,
+       reject_media? ? :reject_media : nil,
+       reject_favourite? ? :reject_favourite : nil,
+       reject_reply_exclude_followers? ? :reject_reply_exclude_followers : nil,
+       reject_send_sensitive? ? :reject_send_sensitive : nil,
+       reject_hashtag? ? :reject_hashtag : nil,
+       reject_straight_follow? ? :reject_straight_follow : nil,
+       reject_new_follow? ? :reject_new_follow : nil,
+       reject_friend? ? :reject_friend : nil,
+       block_trends? ? :block_trends : nil,
+       detect_invalid_subscription? ? :detect_invalid_subscription : nil,
+       reject_reports? ? :reject_reports : nil].reject { |policy| policy == :noop || policy.nil? }
     end
   end
 
@@ -58,6 +87,38 @@ class DomainBlock < ApplicationRecord
       !!rule_for(domain)&.reject_media?
     end
 
+    def reject_favourite?(domain)
+      !!rule_for(domain)&.reject_favourite?
+    end
+
+    def reject_reply_exclude_followers?(domain)
+      !!rule_for(domain)&.reject_reply_exclude_followers?
+    end
+
+    def reject_hashtag?(domain)
+      !!rule_for(domain)&.reject_hashtag?
+    end
+
+    def reject_straight_follow?(domain)
+      !!rule_for(domain)&.reject_straight_follow?
+    end
+
+    def reject_new_follow?(domain)
+      !!rule_for(domain)&.reject_new_follow?
+    end
+
+    def reject_friend?(domain)
+      !!rule_for(domain)&.reject_friend?
+    end
+
+    def block_trends?(domain)
+      !!rule_for(domain)&.block_trends?
+    end
+
+    def detect_invalid_subscription?(domain)
+      !!rule_for(domain)&.detect_invalid_subscription?
+    end
+
     def reject_reports?(domain)
       !!rule_for(domain)&.reject_reports?
     end
@@ -71,7 +132,7 @@ class DomainBlock < ApplicationRecord
       segments = uri.normalized_host.split('.')
       variants = segments.map.with_index { |_, i| segments[i..].join('.') }
 
-      where(domain: variants).order(Arel.sql('char_length(domain) desc')).first
+      where(domain: variants).by_domain_length.first
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
       nil
     end
@@ -82,7 +143,7 @@ class DomainBlock < ApplicationRecord
     return false if other_block.suspend? && (silence? || noop?)
     return false if other_block.silence? && noop?
 
-    (reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports)
+    (reject_media || !other_block.reject_media) && (reject_favourite || !other_block.reject_favourite) && (reject_reply_exclude_followers || !other_block.reject_reply_exclude_followers) && (reject_reports || !other_block.reject_reports)
   end
 
   def public_domain
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index f1b14c8b08..f3a86eae8f 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -21,8 +21,10 @@ class EmailDomainBlock < ApplicationRecord
   include DomainNormalizable
   include Paginable
 
-  belongs_to :parent, class_name: 'EmailDomainBlock', optional: true
-  has_many :children, class_name: 'EmailDomainBlock', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  with_options class_name: 'EmailDomainBlock' do
+    belongs_to :parent, optional: true
+    has_many :children, foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  end
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
@@ -54,7 +56,7 @@ class EmailDomainBlock < ApplicationRecord
     end
 
     def blocking?(allow_with_approval: false)
-      blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).order(Arel.sql('char_length(domain) desc'))
+      blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).by_domain_length
       blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
       blocks.any?
     end
diff --git a/app/models/emoji_reaction.rb b/app/models/emoji_reaction.rb
new file mode 100644
index 0000000000..50da1a083f
--- /dev/null
+++ b/app/models/emoji_reaction.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: emoji_reactions
+#
+#  id              :bigint(8)        not null, primary key
+#  account_id      :bigint(8)        not null
+#  status_id       :bigint(8)        not null
+#  name            :string           default(""), not null
+#  custom_emoji_id :bigint(8)
+#  uri             :string
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+
+class EmojiReaction < ApplicationRecord
+  include Paginable
+  include RateLimitable
+
+  EMOJI_REACTION_LIMIT = 32_767
+  EMOJI_REACTION_PER_ACCOUNT_LIMIT = ENV.fetch('EMOJI_REACTION_PER_ACCOUNT_LIMIT', 3).to_i
+  EMOJI_REACTION_PER_REMOTE_ACCOUNT_LIMIT = ENV.fetch('EMOJI_REACTION_PER_REMOTE_ACCOUNT_LIMIT', 3).to_i
+
+  rate_limit by: :account, family: :emoji_reactions
+
+  update_index('statuses', :status)
+
+  scope :local, -> { where(uri: nil) }
+
+  belongs_to :account,       inverse_of: :emoji_reactions
+  belongs_to :status,        inverse_of: :emoji_reactions
+  belongs_to :custom_emoji,  optional: true
+
+  has_one :notification, as: :activity, dependent: :destroy
+
+  validate :status_emoji_reactions_count
+  validates_with EmojiReactionValidator
+
+  after_create :refresh_cache
+  after_destroy :refresh_cache
+  after_destroy :invalidate_cleanup_info
+
+  def custom_emoji?
+    custom_emoji.present?
+  end
+
+  def sign?
+    true
+  end
+
+  def object_type
+    :emoji_reaction
+  end
+
+  private
+
+  def refresh_cache
+    status&.refresh_emoji_reactions_grouped_by_name!
+  end
+
+  def invalidate_cleanup_info
+    return unless status&.account_id == account_id && account.local?
+
+    account.statuses_cleanup_policy&.invalidate_last_inspected(status, :unemoji)
+  end
+
+  def paginate_by_max_id(limit, max_id = nil, since_id = nil)
+    query = order(arel_table[:id].desc).limit(limit)
+    query = query.where(arel_table[:id].lt(max_id)) if max_id.present?
+    query = query.where(arel_table[:id].gt(since_id)) if since_id.present?
+    query
+  end
+
+  def status_same_emoji_reaction
+    return unless status && account && status.emoji_reactions.where(account: account).where(name: name).where(custom_emoji_id: custom_emoji_id).any?
+
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.duplication')
+  end
+
+  def status_emoji_reactions_count
+    return unless status && account && status.emoji_reactions.where(account: account).count >= EMOJI_REACTION_PER_ACCOUNT_LIMIT
+
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.limit_reached')
+  end
+end
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 042f72beae..c2256099a6 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -9,6 +9,7 @@
 #  updated_at :datetime         not null
 #  account_id :bigint(8)        not null
 #  status_id  :bigint(8)        not null
+#  uri        :string
 #
 
 class Favourite < ApplicationRecord
@@ -16,6 +17,8 @@ class Favourite < ApplicationRecord
 
   update_index('statuses', :status)
 
+  scope :local, -> { where(uri: nil) }
+
   belongs_to :account, inverse_of: :favourites
   belongs_to :status,  inverse_of: :favourites
 
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index 7c36aa8b0b..cdd97205eb 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -45,7 +45,7 @@ class FeaturedTag < ApplicationRecord
   end
 
   def decrement(deleted_status_id)
-    update(statuses_count: [0, statuses_count - 1].max, last_status_at: account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).where.not(id: deleted_status_id).select(:created_at).first&.created_at)
+    update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).select(:created_at).first&.created_at)
   end
 
   private
@@ -55,8 +55,8 @@ class FeaturedTag < ApplicationRecord
   end
 
   def reset_data
-    self.statuses_count = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).count
-    self.last_status_at = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).select(:created_at).first&.created_at
+    self.statuses_count = visible_tagged_account_statuses.count
+    self.last_status_at = visible_tagged_account_statuses.select(:created_at).first&.created_at
   end
 
   def validate_featured_tags_limit
@@ -66,6 +66,14 @@ class FeaturedTag < ApplicationRecord
   end
 
   def validate_tag_uniqueness
-    errors.add(:name, :taken) if FeaturedTag.by_name(name).where(account_id: account_id).exists?
+    errors.add(:name, :taken) if tag_already_featured_for_account?
+  end
+
+  def tag_already_featured_for_account?
+    FeaturedTag.by_name(name).exists?(account_id: account_id)
+  end
+
+  def visible_tagged_account_statuses
+    account.statuses.distributable_visibility.tagged_with(tag)
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index d9cab2cd1e..27e1280994 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -28,7 +28,7 @@ class Feed
       unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map { |id| id.first.to_i }
     end
 
-    Status.where(id: unhydrated).cache_ids
+    Status.where(id: unhydrated)
   end
 
   def key
diff --git a/app/models/follow_recommendation.rb b/app/models/follow_recommendation.rb
index 9d2648394b..7ac9e6dfb9 100644
--- a/app/models/follow_recommendation.rb
+++ b/app/models/follow_recommendation.rb
@@ -10,6 +10,8 @@
 #
 
 class FollowRecommendation < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :account_id
   self.table_name = :global_follow_recommendations
 
@@ -17,12 +19,4 @@ class FollowRecommendation < ApplicationRecord
   belongs_to :account
 
   scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }
-
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
-  end
-
-  def readonly?
-    true
-  end
 end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 3c5e8f96f0..c13cc718d8 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -33,7 +33,7 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     follow = account.follow!(target_account, reblogs: show_reblogs, notify: notify, languages: languages, uri: uri, bypass_limit: true)
-    ListAccount.where(follow_request: self).update_all(follow_request_id: nil, follow_id: follow.id) # rubocop:disable Rails/SkipsModelValidations
+    ListAccount.where(follow_request: self).update_all(follow_request_id: nil, follow_id: follow.id)
     MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 4665a58679..5b7d6569e2 100644
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -23,6 +23,12 @@ class Form::AccountBatch
       approve!
     when 'reject'
       reject!
+    when 'approve_remote'
+      approve_remote!
+    when 'approve_remote_domain'
+      approve_remote_domain!
+    when 'reject_remote'
+      reject_remote!
     when 'suppress_follow_recommendation'
       suppress_follow_recommendation!
     when 'unsuppress_follow_recommendation'
@@ -84,10 +90,35 @@ class Form::AccountBatch
     end
   end
 
+  def approve_remote!
+    accounts.find_each do |account|
+      approve_remote_account(account)
+    end
+  end
+
+  def approve_remote_domain!
+    domains = accounts.group_by(&:domain).pluck(0)
+    (domains - SpecifiedDomain.where(domain: domains, table: 0).pluck(:domain)).each do |domain|
+      SpecifiedDomain.create!(domain: domain, table: 0)
+    end
+
+    Account.where(domain: domains, remote_pending: true).find_each do |account|
+      approve_remote_account(account)
+    end
+  end
+
+  def reject_remote!
+    accounts.find_each do |account|
+      reject_remote_account(account)
+    end
+  end
+
   def suspend!
     accounts.find_each do |account|
       if account.user_pending?
         reject_account(account)
+      elsif account.suspended? && account.remote_pending
+        reject_remote_account(account)
       else
         suspend_account(account)
       end
@@ -115,10 +146,21 @@ class Form::AccountBatch
     AccountDeletionWorker.perform_async(account.id, { 'reserve_username' => false })
   end
 
+  def reject_remote_account(account)
+    authorize(account, :reject_remote?)
+    log_action(:reject_remote, account)
+    account.reject_remote!
+    process_suspend(account)
+  end
+
   def suspend_account(account)
     authorize(account, :suspend?)
     log_action(:suspend, account)
     account.suspend!(origin: :local)
+    process_suspend(account)
+  end
+
+  def process_suspend(account)
     account.strikes.create!(
       account: current_account,
       action: :suspend
@@ -143,6 +185,12 @@ class Form::AccountBatch
     account.user.approve!
   end
 
+  def approve_remote_account(account)
+    authorize(account, :approve_remote?)
+    log_action(:approve_remote, account)
+    account.approve_remote!
+  end
+
   def select_all_matching?
     select_all_matching == '1'
   end
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index cb37a52217..cbdd37654c 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -14,6 +14,13 @@ class Form::AdminSettings
     site_terms
     registrations_mode
     closed_registrations_message
+    registration_button_message
+    registrations_limit
+    registrations_limit_per_day
+    registrations_start_hour
+    registrations_end_hour
+    registrations_secondary_start_hour
+    registrations_secondary_end_hour
     timeline_preview
     bootstrap_timeline_accounts
     theme
@@ -34,15 +41,47 @@ class Form::AdminSettings
     media_cache_retention_period
     content_cache_retention_period
     backups_retention_period
+    delete_content_cache_without_reaction
     status_page_url
     captcha_enabled
+    stranger_mention_from_local_ng
+    hide_local_users_for_anonymous
+    post_hash_tags_max
+    post_mentions_max
+    post_stranger_mentions_max
+    auto_warning_text
     authorized_fetch
+    receive_other_servers_emoji_reaction
+    streaming_other_servers_emoji_reaction
+    streaming_local_emoji_reaction
+    enable_emoji_reaction
+    check_lts_version_only
+    enable_public_visibility
+    enable_public_unlisted_visibility
+    unlocked_friend
+    enable_local_timeline
+    emoji_reaction_disallow_domains
+    block_unfollow_account_mention
+    hold_remote_new_accounts
+    stop_fetch_activity_domains
+    stop_link_preview_domains
+    app_icon
+    favicon
   ).freeze
 
   INTEGER_KEYS = %i(
     media_cache_retention_period
     content_cache_retention_period
     backups_retention_period
+    post_hash_tags_max
+    post_mentions_max
+    post_stranger_mentions_max
+    registrations_limit
+    registrations_limit_per_day
+    registrations_start_hour
+    registrations_end_hour
+    registrations_secondary_start_hour
+    registrations_secondary_end_hour
   ).freeze
 
   BOOLEAN_KEYS = %i(
@@ -57,18 +96,40 @@ class Form::AdminSettings
     noindex
     require_invite_text
     captcha_enabled
+    hide_local_users_for_anonymous
     authorized_fetch
+    receive_other_servers_emoji_reaction
+    streaming_other_servers_emoji_reaction
+    streaming_local_emoji_reaction
+    enable_emoji_reaction
+    check_lts_version_only
+    enable_public_visibility
+    enable_public_unlisted_visibility
+    unlocked_friend
+    stranger_mention_from_local_ng
+    enable_local_timeline
+    delete_content_cache_without_reaction
+    block_unfollow_account_mention
+    hold_remote_new_accounts
   ).freeze
 
   UPLOAD_KEYS = %i(
     thumbnail
     mascot
+    app_icon
+    favicon
   ).freeze
 
   OVERRIDEN_SETTINGS = {
     authorized_fetch: :authorized_fetch_mode?,
   }.freeze
 
+  STRING_ARRAY_KEYS = %i(
+    emoji_reaction_disallow_domains
+    stop_fetch_activity_domains
+    stop_link_preview_domains
+  ).freeze
+
   attr_accessor(*KEYS)
 
   validates :registrations_mode, inclusion: { in: %w(open approved none) }, if: -> { defined?(@registrations_mode) }
@@ -88,6 +149,8 @@ class Form::AdminSettings
 
       stored_value = if UPLOAD_KEYS.include?(key)
                        SiteUpload.where(var: key).first_or_initialize(var: key)
+                     elsif STRING_ARRAY_KEYS.include?(key)
+                       Setting.public_send(key)&.join("\n") || ''
                      elsif OVERRIDEN_SETTINGS.include?(key)
                        public_send(OVERRIDEN_SETTINGS[key])
                      else
@@ -132,6 +195,8 @@ class Form::AdminSettings
       value == '1'
     elsif INTEGER_KEYS.include?(key)
       value.blank? ? value : Integer(value)
+    elsif STRING_ARRAY_KEYS.include?(key)
+      value&.split(/\r\n|\r|\n/)&.filter(&:present?)&.uniq || []
     else
       value
     end
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index 712acf3706..3cc4af064f 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -69,7 +69,7 @@ class Form::Import
     ApplicationRecord.transaction do
       now = Time.now.utc
       @bulk_import = current_account.bulk_imports.create(type: type, overwrite: overwrite || false, state: :unconfirmed, original_filename: data.original_filename, likely_mismatched: likely_mismatched?)
-      nb_items = BulkImportRow.insert_all(parsed_rows.map { |row| { bulk_import_id: bulk_import.id, data: row, created_at: now, updated_at: now } }).length # rubocop:disable Rails/SkipsModelValidations
+      nb_items = BulkImportRow.insert_all(parsed_rows.map { |row| { bulk_import_id: bulk_import.id, data: row, created_at: now, updated_at: now } }).length
       @bulk_import.update(total_items: nb_items)
     end
   end
@@ -111,12 +111,14 @@ class Form::Import
     csv_converter = lambda do |field, field_info|
       case field_info.header
       when 'Show boosts', 'Notify on new posts', 'Hide notifications'
-        ActiveModel::Type::Boolean.new.cast(field)
+        ActiveModel::Type::Boolean.new.cast(field&.downcase)
       when 'Languages'
         field&.split(',')&.map(&:strip)&.presence
       when 'Account address'
         field.strip.gsub(/\A@/, '')
-      when '#domain', '#uri', 'List name'
+      when '#domain'
+        field&.strip&.downcase
+      when '#uri', 'List name'
         field.strip
       else
         field
diff --git a/app/models/friend_domain.rb b/app/models/friend_domain.rb
new file mode 100644
index 0000000000..88ebd9338b
--- /dev/null
+++ b/app/models/friend_domain.rb
@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: friend_domains
+#
+#  id                         :bigint(8)        not null, primary key
+#  domain                     :string           default(""), not null
+#  inbox_url                  :string           default(""), not null
+#  active_state               :integer          default("idle"), not null
+#  passive_state              :integer          default("idle"), not null
+#  active_follow_activity_id  :string
+#  passive_follow_activity_id :string
+#  available                  :boolean          default(TRUE), not null
+#  pseudo_relay               :boolean          default(FALSE), not null
+#  allow_all_posts            :boolean          default(TRUE), not null
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  delivery_local             :boolean          default(TRUE), not null
+#
+
+class FriendDomain < ApplicationRecord
+  validates :domain, presence: true, uniqueness: true, if: :will_save_change_to_domain?
+  validates :inbox_url, presence: true, uniqueness: true, if: :will_save_change_to_inbox_url?
+
+  enum :active_state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }, prefix: :i_am
+  enum :passive_state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }, prefix: :they_are
+
+  scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
+  scope :enabled, -> { where(active_state: :accepted).or(FriendDomain.where(passive_state: :accepted)).where(available: true) }
+  scope :distributables, -> { enabled.where(pseudo_relay: true) }
+  scope :deliver_locals, -> { enabled.where(delivery_local: true) }
+  scope :free_receivings, -> { enabled.where(allow_all_posts: true) }
+
+  before_destroy :ensure_disabled
+  after_commit :set_default_inbox_url
+
+  def accepted?
+    i_am_accepted? || they_are_accepted?
+  end
+
+  def pending?
+    !accepted? && (i_am_pending? || they_are_pending?)
+  end
+
+  def idle?
+    (i_am_idle? || i_am_rejected?) && (they_are_idle? || they_are_rejected?)
+  end
+
+  def follow!
+    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    payload     = Oj.dump(follow_activity(activity_id))
+
+    update!(active_state: :pending, passive_state: :idle, active_follow_activity_id: activity_id)
+    DeliveryFailureTracker.reset!(inbox_url)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def unfollow!
+    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    payload     = Oj.dump(unfollow_activity(activity_id))
+
+    update!(active_state: :idle, passive_state: :idle, active_follow_activity_id: nil)
+    DeliveryFailureTracker.reset!(inbox_url)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def accept!
+    return if they_are_idle?
+
+    activity_id = passive_follow_activity_id
+    payload     = Oj.dump(accept_follow_activity(activity_id))
+
+    update!(passive_state: :accepted, active_state: :idle)
+    DeliveryFailureTracker.reset!(inbox_url)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def reject!
+    return if they_are_idle?
+
+    activity_id = passive_follow_activity_id
+    payload     = Oj.dump(reject_follow_activity(activity_id))
+
+    update!(passive_state: :rejected, active_state: :idle, passive_follow_activity_id: nil)
+    DeliveryFailureTracker.reset!(inbox_url)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def destroy_without_signal!
+    self.active_state = :idle
+    self.passive_state = :idle
+    destroy!
+  end
+
+  def default_inbox_url
+    "https://#{domain}/inbox"
+  end
+
+  private
+
+  def delete_for_friend!
+    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    payload     = Oj.dump(delete_follow_activity(activity_id))
+
+    DeliveryFailureTracker.reset!(inbox_url)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def follow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: activity_id,
+      type: 'Follow',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: ActivityPub::TagManager::COLLECTIONS[:public],
+
+      # Cannot use inbox_url method because this model also has inbox_url column
+      inboxUrl: "https://#{Rails.configuration.x.web_domain}/inbox",
+    }
+  end
+
+  def unfollow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: activity_id,
+      type: 'Undo',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: {
+        id: active_follow_activity_id,
+        type: 'Follow',
+        actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+        object: ActivityPub::TagManager::COLLECTIONS[:public],
+      },
+    }
+  end
+
+  def accept_follow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: "#{activity_id}#accepts/friends",
+      type: 'Accept',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: activity_id,
+    }
+  end
+
+  def reject_follow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: "#{activity_id}#rejects/friends",
+      type: 'Reject',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: activity_id,
+    }
+  end
+
+  def delete_follow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: "#{activity_id}#delete/friends",
+      type: 'Delete',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: ActivityPub::TagManager::COLLECTIONS[:public],
+    }
+  end
+
+  def some_local_account
+    @some_local_account ||= Account.representative
+  end
+
+  def ensure_disabled
+    delete_for_friend! unless id.nil? || (i_am_idle? && they_are_idle?)
+  end
+
+  def set_default_inbox_url
+    self.inbox_url = default_inbox_url if inbox_url.blank?
+  end
+end
diff --git a/app/models/generated_annual_report.rb b/app/models/generated_annual_report.rb
new file mode 100644
index 0000000000..43c97d7108
--- /dev/null
+++ b/app/models/generated_annual_report.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: generated_annual_reports
+#
+#  id             :bigint(8)        not null, primary key
+#  account_id     :bigint(8)        not null
+#  year           :integer          not null
+#  data           :jsonb            not null
+#  schema_version :integer          not null
+#  viewed_at      :datetime
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#
+
+class GeneratedAnnualReport < ApplicationRecord
+  belongs_to :account
+
+  scope :pending, -> { where(viewed_at: nil) }
+
+  def viewed?
+    viewed_at.present?
+  end
+
+  def view!
+    update!(viewed_at: Time.now.utc)
+  end
+
+  def account_ids
+    data['most_reblogged_accounts'].pluck('account_id') + data['commonly_interacted_with_accounts'].pluck('account_id')
+  end
+
+  def status_ids
+    data['top_statuses'].values
+  end
+end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index c95a68a6f6..77821b78fa 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -17,7 +17,7 @@ class Identity < ApplicationRecord
   validates :uid, presence: true, uniqueness: { scope: :provider }
   validates :provider, presence: true
 
-  def self.find_for_oauth(auth)
+  def self.find_for_omniauth(auth)
     find_or_create_by(uid: auth.uid, provider: auth.provider)
   end
 end
diff --git a/app/models/import.rb b/app/models/import.rb
index 7cd6cccf7c..6b261f8d00 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -11,10 +11,10 @@
 #  updated_at        :datetime         not null
 #  data_file_name    :string
 #  data_content_type :string
-#  data_file_size    :integer
 #  data_updated_at   :datetime
 #  account_id        :bigint(8)        not null
 #  overwrite         :boolean          default(FALSE), not null
+#  data_file_size    :integer
 #
 
 # NOTE: This is a deprecated model, only kept to not break ongoing imports
@@ -28,7 +28,7 @@ class Import < ApplicationRecord
 
   belongs_to :account
 
-  enum type: { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
+  enum :type, { following: 0, blocking: 1, muting: 2, domain_blocking: 3, bookmarks: 4 }
 
   validates :type, presence: true
 
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 17ee0cbb1e..e238995638 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -9,28 +9,39 @@
 #
 
 class Instance < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :domain
 
   attr_accessor :failure_days
 
-  has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false
-
   with_options foreign_key: :domain, primary_key: :domain, inverse_of: false do
     belongs_to :domain_block
     belongs_to :domain_allow
-    belongs_to :unavailable_domain # skipcq: RB-RL1031
+    belongs_to :unavailable_domain
+    belongs_to :instance_info
+    belongs_to :friend_domain
+
+    has_many :accounts, dependent: nil
   end
 
   scope :searchable, -> { where.not(domain: DomainBlock.select(:domain)) }
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
+  scope :domain_starts_with, ->(value) { where(arel_table[:domain].matches("#{sanitize_sql_like(value)}%", false, true)) }
   scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
+  scope :with_domain_follows, ->(domains) { where(domain: domains).where(domain_account_follows) }
 
-  def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
-  end
-
-  def readonly?
-    true
+  def self.domain_account_follows
+    Arel.sql(
+      <<~SQL.squish
+        EXISTS (
+          SELECT 1
+          FROM follows
+          JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id
+          WHERE accounts.domain = instances.domain
+        )
+      SQL
+    )
   end
 
   def delivery_failure_tracker
diff --git a/app/models/instance_info.rb b/app/models/instance_info.rb
new file mode 100644
index 0000000000..da6396517a
--- /dev/null
+++ b/app/models/instance_info.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: instance_infos
+#
+#  id         :bigint(8)        not null, primary key
+#  domain     :string           default(""), not null
+#  software   :string           default(""), not null
+#  version    :string           default(""), not null
+#  data       :jsonb            not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class InstanceInfo < ApplicationRecord
+  after_commit :reset_cache
+
+  EMOJI_REACTION_AVAILABLE_SOFTWARES = %w(
+    akkoma
+    calckey
+    catodon
+    cherrypick
+    fedibird
+    firefish
+    iceshrimp
+    meisskey
+    misskey
+    pleroma
+    sharkey
+    tanukey
+  ).freeze
+
+  QUOTE_AVAILABLE_SOFTWARES = EMOJI_REACTION_AVAILABLE_SOFTWARES
+
+  STATUS_REFERENCE_AVAILABLE_SOFTWARES = %w(fedibird).freeze
+
+  CIRCLE_AVAILABLE_SOFTWARES = %w(fedibird).freeze
+
+  class << self
+    def emoji_reaction_available?(domain)
+      return Setting.enable_emoji_reaction if domain.nil?
+
+      Rails.cache.fetch("emoji_reaction_available_domain:#{domain}") { load_emoji_reaction_available(domain) }
+    end
+
+    def available_features(domain)
+      return local_features if domain.nil?
+
+      Rails.cache.fetch("domain_available_features:#{domain}") { load_available_features(domain) }
+    end
+
+    private
+
+    def load_available_features(domain)
+      return local_features if domain.nil?
+
+      info = InstanceInfo.find_by(domain: domain)
+
+      {
+        emoji_reaction: feature_available?(info, EMOJI_REACTION_AVAILABLE_SOFTWARES, 'emoji_reaction'),
+        quote: feature_available?(info, QUOTE_AVAILABLE_SOFTWARES, 'quote'),
+        status_reference: feature_available?(info, STATUS_REFERENCE_AVAILABLE_SOFTWARES, 'status_reference'),
+        circle: feature_available?(info, CIRCLE_AVAILABLE_SOFTWARES, 'circle'),
+      }
+    end
+
+    def local_features
+      {
+        emoji_reaction: Setting.enable_emoji_reaction,
+        quote: true,
+        status_reference: true,
+        circle: true,
+      }
+    end
+
+    def feature_available?(info, softwares, feature_name)
+      return false if info.nil?
+
+      softwares.include?(software_name(info)) || metadata_features(info)&.include?(feature_name) || false
+    end
+
+    def metadata_features(info)
+      return nil unless info.data.is_a?(Hash) && info.data['metadata'].is_a?(Hash) && info.data['metadata']['features'].is_a?(Array)
+
+      info.data['metadata']['features']
+    end
+
+    def software_name(info)
+      info.software
+    end
+  end
+
+  private
+
+  def reset_cache
+    Rails.cache.delete("emoji_reaction_available_domain:#{domain}")
+    Rails.cache.delete("domain_available_features:#{domain}")
+  end
+end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c0cbc58458..2fe9f22fbe 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -19,12 +19,14 @@
 class Invite < ApplicationRecord
   include Expireable
 
+  COMMENT_SIZE_LIMIT = 420
+
   belongs_to :user, inverse_of: :invites
   has_many :users, inverse_of: :invite, dependent: nil
 
   scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
 
-  validates :comment, length: { maximum: 420 }
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }
 
   before_validation :set_code
 
diff --git a/app/models/ip_block.rb b/app/models/ip_block.rb
index 99783050b8..d6242efbf7 100644
--- a/app/models/ip_block.rb
+++ b/app/models/ip_block.rb
@@ -19,11 +19,11 @@ class IpBlock < ApplicationRecord
   include Expireable
   include Paginable
 
-  enum severity: {
+  enum :severity, {
     sign_up_requires_approval: 5000,
     sign_up_block: 5500,
     no_access: 9999,
-  }
+  }, prefix: true
 
   validates :ip, :severity, presence: true
   validates :ip, uniqueness: true
diff --git a/app/models/list.rb b/app/models/list.rb
index fcef49e6e9..7205e9052f 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -11,6 +11,7 @@
 #  updated_at     :datetime         not null
 #  replies_policy :integer          default("list"), not null
 #  exclusive      :boolean          default(FALSE), not null
+#  notify         :boolean          default(FALSE), not null
 #
 
 class List < ApplicationRecord
@@ -18,12 +19,15 @@ class List < ApplicationRecord
 
   PER_ACCOUNT_LIMIT = 50
 
-  enum replies_policy: { list: 0, followed: 1, none: 2 }, _prefix: :show
+  enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
 
   belongs_to :account, optional: true
 
   has_many :list_accounts, inverse_of: :list, dependent: :destroy
   has_many :accounts, through: :list_accounts
+  has_many :antennas, inverse_of: :list, dependent: :destroy
+  has_many :list_statuses, inverse_of: :list, dependent: :destroy
+  has_many :statuses, through: :list_statuses
 
   validates :title, presence: true
 
diff --git a/app/models/list_status.rb b/app/models/list_status.rb
new file mode 100644
index 0000000000..a51e4fc331
--- /dev/null
+++ b/app/models/list_status.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: list_statuses
+#
+#  id         :bigint(8)        not null, primary key
+#  list_id    :bigint(8)        not null
+#  status_id  :bigint(8)        not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class ListStatus < ApplicationRecord
+  belongs_to :list
+  belongs_to :status
+
+  has_one :notification, as: :activity, dependent: :destroy
+
+  validates :status, uniqueness: { scope: :list }
+end
diff --git a/app/models/login_activity.rb b/app/models/login_activity.rb
index 2b7b37f8e4..240d571c0e 100644
--- a/app/models/login_activity.rb
+++ b/app/models/login_activity.rb
@@ -16,21 +16,11 @@
 #
 
 class LoginActivity < ApplicationRecord
-  enum authentication_method: { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
+  include BrowserDetection
+
+  enum :authentication_method, { password: 'password', otp: 'otp', webauthn: 'webauthn', sign_in_token: 'sign_in_token', omniauth: 'omniauth' }
 
   belongs_to :user
 
   validates :authentication_method, inclusion: { in: authentication_methods.keys }
-
-  def detection
-    @detection ||= Browser.new(user_agent)
-  end
-
-  def browser
-    detection.id
-  end
-
-  def platform
-    detection.platform.id
-  end
 end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 1f40e5725e..4bd7c643d2 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -8,7 +8,6 @@
 #  status_id                   :bigint(8)
 #  file_file_name              :string
 #  file_content_type           :string
-#  file_file_size              :integer
 #  file_updated_at             :datetime
 #  remote_url                  :string           default(""), not null
 #  created_at                  :datetime         not null
@@ -24,18 +23,24 @@
 #  file_storage_schema_version :integer
 #  thumbnail_file_name         :string
 #  thumbnail_content_type      :string
-#  thumbnail_file_size         :integer
 #  thumbnail_updated_at        :datetime
 #  thumbnail_remote_url        :string
+#  file_file_size              :integer
+#  thumbnail_file_size         :integer
 #
 
 class MediaAttachment < ApplicationRecord
   self.inheritance_column = nil
 
   include Attachmentable
+  include RoutingHelper
 
-  enum type: { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
-  enum processing: { queued: 0, in_progress: 1, complete: 2, failed: 3 }, _prefix: true
+  LOCAL_STATUS_ATTACHMENT_MAX = 4
+  LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL = 4
+  ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 16
+
+  enum :type, { image: 0, gifv: 1, video: 2, unknown: 3, audio: 4 }
+  enum :processing, { queued: 0, in_progress: 1, complete: 2, failed: 3 }, prefix: true
 
   MAX_DESCRIPTION_LENGTH = 1_500
 
@@ -204,12 +209,14 @@ class MediaAttachment < ApplicationRecord
   validates :file, presence: true, if: :local?
   validates :thumbnail, absence: true, if: -> { local? && !audio_or_video? }
 
-  scope :attached,   -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
-  scope :cached,     -> { remote.where.not(file_file_name: nil) }
-  scope :local,      -> { where(remote_url: '') }
-  scope :ordered,    -> { order(id: :asc) }
-  scope :remote,     -> { where.not(remote_url: '') }
+  scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
+  scope :cached, -> { remote.where.not(file_file_name: nil) }
+  scope :created_before, ->(value) { where(arel_table[:created_at].lt(value)) }
+  scope :local, -> { where(remote_url: '') }
+  scope :ordered, -> { order(id: :asc) }
+  scope :remote, -> { where.not(remote_url: '') }
   scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) }
+  scope :updated_before, ->(value) { where(arel_table[:updated_at].lt(value)) }
 
   attr_accessor :skip_download
 
@@ -271,6 +278,10 @@ class MediaAttachment < ApplicationRecord
     delay_processing? && attachment_name == :file
   end
 
+  def url
+    full_asset_url(file.url(:original))
+  end
+
   before_create :set_unknown_type
   before_create :set_processing
 
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 2348b2905c..5addfcc583 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -13,6 +13,8 @@
 #
 
 class Mention < ApplicationRecord
+  include Paginable
+
   belongs_to :account, inverse_of: :mentions
   belongs_to :status
 
diff --git a/app/models/ng_rule.rb b/app/models/ng_rule.rb
new file mode 100644
index 0000000000..6048275e90
--- /dev/null
+++ b/app/models/ng_rule.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: ng_rules
+#
+#  id                              :bigint(8)        not null, primary key
+#  title                           :string           default(""), not null
+#  available                       :boolean          default(TRUE), not null
+#  record_history_also_local       :boolean          default(TRUE), not null
+#  account_domain                  :string           default(""), not null
+#  account_username                :string           default(""), not null
+#  account_display_name            :string           default(""), not null
+#  account_note                    :string           default(""), not null
+#  account_field_name              :string           default(""), not null
+#  account_field_value             :string           default(""), not null
+#  account_avatar_state            :integer          default("optional"), not null
+#  account_header_state            :integer          default("optional"), not null
+#  account_include_local           :boolean          default(TRUE), not null
+#  account_allow_followed_by_local :boolean          default(FALSE), not null
+#  status_spoiler_text             :string           default(""), not null
+#  status_text                     :string           default(""), not null
+#  status_tag                      :string           default(""), not null
+#  status_visibility               :string           default([]), not null, is an Array
+#  status_searchability            :string           default([]), not null, is an Array
+#  status_media_state              :integer          default("optional"), not null
+#  status_sensitive_state          :integer          default("optional"), not null
+#  status_cw_state                 :integer          default("optional"), not null
+#  status_poll_state               :integer          default("optional"), not null
+#  status_quote_state              :integer          default("optional"), not null
+#  status_reply_state              :integer          default("optional"), not null
+#  status_mention_state            :integer          default("optional"), not null
+#  status_reference_state          :integer          default("optional"), not null
+#  status_tag_threshold            :integer          default(-1), not null
+#  status_media_threshold          :integer          default(-1), not null
+#  status_poll_threshold           :integer          default(-1), not null
+#  status_mention_threshold        :integer          default(-1), not null
+#  status_allow_follower_mention   :boolean          default(TRUE), not null
+#  status_reference_threshold      :integer          default(-1), not null
+#  reaction_type                   :string           default([]), not null, is an Array
+#  reaction_allow_follower         :boolean          default(TRUE), not null
+#  emoji_reaction_name             :string           default(""), not null
+#  emoji_reaction_origin_domain    :string           default(""), not null
+#  expires_at                      :datetime
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#
+class NgRule < ApplicationRecord
+  include Expireable
+  include Redisable
+
+  has_many :histories, class_name: 'NgRuleHistory', inverse_of: :ng_rule, dependent: :destroy
+
+  enum :account_avatar_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :account_avatar
+  enum :account_header_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :account_header
+  enum :status_sensitive_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_sensitive
+  enum :status_cw_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_cw
+  enum :status_quote_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_quote
+  enum :status_reply_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_reply
+  enum :status_media_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_media
+  enum :status_poll_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_poll
+  enum :status_mention_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_mention
+  enum :status_reference_state, { optional: 0, needed: 1, no_needed: 2 }, prefix: :status_reference
+
+  scope :enabled, -> { where(available: true) }
+
+  before_validation :clean_up_arrays
+  before_save :prepare_cache_invalidation!
+  before_destroy :prepare_cache_invalidation!
+  after_commit :invalidate_cache!
+
+  def self.cached_rules
+    active_rules = Rails.cache.fetch('ng_rules') do
+      NgRule.enabled.to_a
+    end
+
+    active_rules.reject { |ng_rule, _| ng_rule.expired? }
+  end
+
+  def expires_in
+    return @expires_in if defined?(@expires_in)
+    return nil if expires_at.nil?
+
+    [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 2.weeks, 1.month, 3.months].find { |expires_in| expires_in.from_now >= expires_at }
+  end
+
+  def copy!
+    dup
+  end
+
+  def hit_count
+    Rails.cache.fetch("ng_rule:hit_count:#{id}", expires_in: 15.minutes) { NgRuleHistory.where(ng_rule_id: id).count }
+  end
+
+  private
+
+  def clean_up_arrays
+    self.status_visibility    = Array(status_visibility).map(&:strip).filter_map(&:presence)
+    self.status_searchability = Array(status_searchability).map(&:strip).filter_map(&:presence)
+    self.reaction_type        = Array(reaction_type).map(&:strip).filter_map(&:presence)
+  end
+
+  def prepare_cache_invalidation!
+    @should_invalidate_cache = true
+  end
+
+  def invalidate_cache!
+    return unless @should_invalidate_cache
+
+    @should_invalidate_cache = false
+
+    Rails.cache.delete('ng_rules')
+  end
+end
diff --git a/app/models/ng_rule_history.rb b/app/models/ng_rule_history.rb
new file mode 100644
index 0000000000..07cdbadf08
--- /dev/null
+++ b/app/models/ng_rule_history.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: ng_rule_histories
+#
+#  id            :bigint(8)        not null, primary key
+#  ng_rule_id    :bigint(8)        not null
+#  account_id    :bigint(8)
+#  text          :string
+#  uri           :string
+#  reason        :integer          not null
+#  reason_action :integer          not null
+#  local         :boolean          default(TRUE), not null
+#  hidden        :boolean          default(FALSE), not null
+#  data          :jsonb
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#
+class NgRuleHistory < ApplicationRecord
+  enum :reason, { account: 0, status: 1, reaction: 2 }, prefix: :reason
+  enum :reason_action, {
+    account_create: 0,
+    status_create: 10,
+    status_edit: 11,
+    reaction_favourite: 20,
+    reaction_emoji_reaction: 21,
+    reaction_follow: 22,
+    reaction_reblog: 23,
+    reaction_vote: 24,
+  }, prefix: :reason_action
+
+  belongs_to :ng_rule
+  belongs_to :account
+end
diff --git a/app/models/ng_word.rb b/app/models/ng_word.rb
new file mode 100644
index 0000000000..2bfe7597e1
--- /dev/null
+++ b/app/models/ng_word.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: ng_words
+#
+#  id         :bigint(8)        not null, primary key
+#  keyword    :string           not null
+#  regexp     :boolean          default(FALSE), not null
+#  stranger   :boolean          default(TRUE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class NgWord < ApplicationRecord
+  attr_accessor :keywords, :regexps, :strangers
+
+  validate :check_regexp
+  after_commit :invalidate_cache!
+
+  class << self
+    def caches
+      Rails.cache.fetch('ng_words') { NgWord.where.not(id: 0).order(:keyword).to_a }
+    end
+
+    def save_from_hashes(rows)
+      unmatched = caches
+      matched = []
+
+      NgWord.transaction do
+        rows.filter { |item| item[:keyword].present? }.each do |item|
+          exists = unmatched.find { |i| i.keyword == item[:keyword] }
+
+          if exists.present?
+            unmatched.delete(exists)
+            matched << exists
+
+            next if exists.regexp == item[:regexp] && exists.stranger == item[:stranger]
+
+            exists.update!(regexp: item[:regexp], stranger: item[:stranger])
+          elsif matched.none? { |i| i.keyword == item[:keyword] }
+            NgWord.create!(
+              keyword: item[:keyword],
+              regexp: item[:regexp],
+              stranger: item[:stranger]
+            )
+          end
+        end
+
+        NgWord.destroy(unmatched.map(&:id))
+      end
+
+      true
+    end
+
+    def save_from_raws(rows)
+      regexps = rows['regexps'] || []
+      strangers = rows['strangers'] || []
+
+      hashes = (rows['keywords'] || []).zip(rows['temporary_ids'] || []).map do |item|
+        temp_id = item[1]
+        {
+          keyword: item[0],
+          regexp: regexps.include?(temp_id),
+          stranger: strangers.include?(temp_id),
+        }
+      end
+
+      save_from_hashes(hashes)
+    end
+  end
+
+  private
+
+  def invalidate_cache!
+    Rails.cache.delete('ng_words')
+  end
+
+  def check_regexp
+    return if keyword.blank? || !regexp
+
+    begin
+      Admin::NgWord.reject_with_custom_word?('Sample text', keyword)
+    rescue
+      raise Mastodon::ValidationError, I18n.t('admin.ng_words.test_error')
+    end
+  end
+end
diff --git a/app/models/ngword_history.rb b/app/models/ngword_history.rb
new file mode 100644
index 0000000000..c22f13cd28
--- /dev/null
+++ b/app/models/ngword_history.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: ngword_histories
+#
+#  id          :bigint(8)        not null, primary key
+#  uri         :string           not null
+#  target_type :integer          not null
+#  reason      :integer          not null
+#  text        :string           not null
+#  keyword     :string           not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  count       :integer          default(0), not null
+#
+class NgwordHistory < ApplicationRecord
+  include Paginable
+
+  enum :target_type, { status: 0, account_note: 1, account_name: 2 }, suffix: :blocked
+  enum :reason, { ng_words: 0, ng_words_for_stranger_mention: 1, hashtag_count: 2, mention_count: 3, stranger_mention_count: 4 }, prefix: :within
+end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 54212d675f..602a106d58 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -12,6 +12,7 @@
 #  account_id      :bigint(8)        not null
 #  from_account_id :bigint(8)        not null
 #  type            :string
+#  filtered        :boolean          default(FALSE), not null
 #
 
 class Notification < ApplicationRecord
@@ -22,30 +23,78 @@ class Notification < ApplicationRecord
   LEGACY_TYPE_CLASS_MAP = {
     'Mention' => :mention,
     'Status' => :reblog,
+    'ListStatus' => :list_status,
     'Follow' => :follow,
     'FollowRequest' => :follow_request,
     'Favourite' => :favourite,
+    'EmojiReaction' => :emoji_reaction,
+    'StatusReference' => :status_reference,
     'Poll' => :poll,
+    'AccountWarning' => :moderation_warning,
   }.freeze
 
-  TYPES = %i(
-    mention
-    status
-    reblog
-    follow
-    follow_request
-    favourite
-    poll
-    update
-    admin.sign_up
-    admin.report
-  ).freeze
+  PROPERTIES = {
+    mention: {
+      filterable: true,
+    }.freeze,
+    status: {
+      filterable: false,
+    }.freeze,
+    list_status: {
+      filterable: false,
+    }.freeze,
+    reblog: {
+      filterable: true,
+    }.freeze,
+    status_reference: {
+      filterable: true,
+    }.freeze,
+    follow: {
+      filterable: true,
+    }.freeze,
+    follow_request: {
+      filterable: true,
+    }.freeze,
+    favourite: {
+      filterable: true,
+    }.freeze,
+    emoji_reaction: {
+      filterable: true,
+    }.freeze,
+    reaction: {
+      filterable: true,
+    }.freeze,
+    poll: {
+      filterable: false,
+    }.freeze,
+    update: {
+      filterable: false,
+    }.freeze,
+    severed_relationships: {
+      filterable: false,
+    }.freeze,
+    moderation_warning: {
+      filterable: false,
+    }.freeze,
+    'admin.sign_up': {
+      filterable: false,
+    }.freeze,
+    'admin.report': {
+      filterable: false,
+    }.freeze,
+  }.freeze
+
+  TYPES = PROPERTIES.keys.freeze
 
   TARGET_STATUS_INCLUDES_BY_TYPE = {
     status: :status,
+    list_status: [list_status: :status],
     reblog: [status: :reblog],
+    status_reference: [status_reference: :status],
     mention: [mention: :status],
     favourite: [favourite: :status],
+    emoji_reaction: [emoji_reaction: :status],
+    reaction: [emoji_reaction: :status],
     poll: [poll: :status],
     update: :status,
     'admin.report': [report: :target_account],
@@ -58,11 +107,16 @@ class Notification < ApplicationRecord
   with_options foreign_key: 'activity_id', optional: true do
     belongs_to :mention, inverse_of: :notification
     belongs_to :status, inverse_of: :notification
+    belongs_to :list_status, inverse_of: :notification
     belongs_to :follow, inverse_of: :notification
     belongs_to :follow_request, inverse_of: :notification
     belongs_to :favourite, inverse_of: :notification
+    belongs_to :emoji_reaction, inverse_of: :notification
+    belongs_to :status_reference, inverse_of: :notification
     belongs_to :poll, inverse_of: false
     belongs_to :report, inverse_of: false
+    belongs_to :account_warning, inverse_of: false
+    belongs_to :account_relationship_severance_event, inverse_of: false
   end
 
   validates :type, inclusion: { in: TYPES }
@@ -77,10 +131,16 @@ class Notification < ApplicationRecord
     case type
     when :status, :update
       status
+    when :list_status
+      list_status&.status
     when :reblog
       status&.reblog
+    when :status_reference
+      status_reference&.status
     when :favourite
       favourite&.status
+    when :emoji_reaction, :reaction
+      emoji_reaction&.status
     when :mention
       mention&.status
     when :poll
@@ -89,7 +149,7 @@ class Notification < ApplicationRecord
   end
 
   class << self
-    def browserable(types: [], exclude_types: [], from_account_id: nil)
+    def browserable(types: [], exclude_types: [], from_account_id: nil, include_filtered: false)
       requested_types = if types.empty?
                           TYPES
                         else
@@ -99,6 +159,7 @@ class Notification < ApplicationRecord
       requested_types -= exclude_types.map(&:to_sym)
 
       all.tap do |scope|
+        scope.merge!(where(filtered: false)) unless include_filtered || from_account_id.present?
         scope.merge!(where(from_account_id: from_account_id)) if from_account_id.present?
         scope.merge!(where(type: requested_types)) unless requested_types.size == TYPES.size
       end
@@ -126,10 +187,16 @@ class Notification < ApplicationRecord
         case notification.type
         when :status, :update
           notification.status = cached_status
+        when :list_status
+          notification.list_status.status = cached_status
         when :reblog
           notification.status.reblog = cached_status
+        when :status_reference
+          notification.status_reference.status = cached_status
         when :favourite
           notification.favourite.status = cached_status
+        when :emoji_reaction, :reaction
+          notification.emoji_reaction.status = cached_status
         when :mention
           notification.mention.status = cached_status
         when :poll
@@ -144,18 +211,30 @@ class Notification < ApplicationRecord
   after_initialize :set_from_account
   before_validation :set_from_account
 
+  after_destroy :remove_from_notification_request
+
   private
 
   def set_from_account
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
+    when 'Status', 'Follow', 'Favourite', 'EmojiReaction', 'EmojiReact', 'FollowRequest', 'Poll', 'Report'
       self.from_account_id = activity&.account_id
-    when 'Mention'
+    when 'Mention', 'StatusReference', 'ListStatus'
       self.from_account_id = activity&.status&.account_id
     when 'Account'
       self.from_account_id = activity&.id
+    when 'AccountRelationshipSeveranceEvent', 'AccountWarning'
+      # These do not really have an originating account, but this is mandatory
+      # in the data model, and the recipient's account will by definition
+      # always exist
+      self.from_account_id = account_id
     end
   end
+
+  def remove_from_notification_request
+    notification_request = NotificationRequest.find_by(account_id: account_id, from_account_id: from_account_id)
+    notification_request&.reconsider_existence!
+  end
 end
diff --git a/app/models/notification_permission.rb b/app/models/notification_permission.rb
new file mode 100644
index 0000000000..e0001473f8
--- /dev/null
+++ b/app/models/notification_permission.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_permissions
+#
+#  id              :bigint(8)        not null, primary key
+#  account_id      :bigint(8)        not null
+#  from_account_id :bigint(8)        not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+class NotificationPermission < ApplicationRecord
+  belongs_to :account
+  belongs_to :from_account, class_name: 'Account'
+end
diff --git a/app/models/notification_policy.rb b/app/models/notification_policy.rb
new file mode 100644
index 0000000000..f10b0c2a81
--- /dev/null
+++ b/app/models/notification_policy.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_policies
+#
+#  id                      :bigint(8)        not null, primary key
+#  account_id              :bigint(8)        not null
+#  filter_not_following    :boolean          default(FALSE), not null
+#  filter_not_followers    :boolean          default(FALSE), not null
+#  filter_new_accounts     :boolean          default(FALSE), not null
+#  filter_private_mentions :boolean          default(TRUE), not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#
+
+class NotificationPolicy < ApplicationRecord
+  belongs_to :account
+
+  has_many :notification_requests, primary_key: :account_id, foreign_key: :account_id, dependent: nil, inverse_of: false
+
+  attr_reader :pending_requests_count, :pending_notifications_count
+
+  MAX_MEANINGFUL_COUNT = 100
+
+  def summarize!
+    @pending_requests_count = pending_notification_requests.first
+    @pending_notifications_count = pending_notification_requests.last
+  end
+
+  private
+
+  def pending_notification_requests
+    @pending_notification_requests ||= notification_requests.where(dismissed: false).limit(MAX_MEANINGFUL_COUNT).pick(Arel.sql('count(*), coalesce(sum(notifications_count), 0)::bigint'))
+  end
+end
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
new file mode 100644
index 0000000000..6e9cae6625
--- /dev/null
+++ b/app/models/notification_request.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: notification_requests
+#
+#  id                  :bigint(8)        not null, primary key
+#  account_id          :bigint(8)        not null
+#  from_account_id     :bigint(8)        not null
+#  last_status_id      :bigint(8)
+#  notifications_count :bigint(8)        default(0), not null
+#  dismissed           :boolean          default(FALSE), not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+
+class NotificationRequest < ApplicationRecord
+  include Paginable
+
+  MAX_MEANINGFUL_COUNT = 100
+
+  belongs_to :account
+  belongs_to :from_account, class_name: 'Account'
+  belongs_to :last_status, class_name: 'Status'
+
+  before_save :prepare_notifications_count
+
+  def self.preload_cache_collection(requests)
+    cached_statuses_by_id = yield(requests.filter_map(&:last_status)).index_by(&:id) # Call cache_collection in block
+
+    requests.each do |request|
+      request.last_status = cached_statuses_by_id[request.last_status_id] unless request.last_status_id.nil?
+    end
+  end
+
+  def reconsider_existence!
+    return if dismissed?
+
+    prepare_notifications_count
+
+    if notifications_count.positive?
+      save
+    else
+      destroy
+    end
+  end
+
+  private
+
+  def prepare_notifications_count
+    self.notifications_count = Notification.where(account: account, from_account: from_account, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
+  end
+end
diff --git a/app/models/pending_follow_request.rb b/app/models/pending_follow_request.rb
new file mode 100644
index 0000000000..d9cb114031
--- /dev/null
+++ b/app/models/pending_follow_request.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: pending_follow_requests
+#
+#  id                :bigint(8)        not null, primary key
+#  account_id        :bigint(8)        not null
+#  target_account_id :bigint(8)        not null
+#  uri               :string           not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
+class PendingFollowRequest < ApplicationRecord
+  belongs_to :account
+  belongs_to :target_account, class_name: 'Account'
+
+  validates :account_id, uniqueness: { scope: :target_account_id }
+end
diff --git a/app/models/pending_status.rb b/app/models/pending_status.rb
new file mode 100644
index 0000000000..3b596028ce
--- /dev/null
+++ b/app/models/pending_status.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: pending_statuses
+#
+#  id               :bigint(8)        not null, primary key
+#  account_id       :bigint(8)        not null
+#  fetch_account_id :bigint(8)        not null
+#  uri              :string           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+
+class PendingStatus < ApplicationRecord
+  belongs_to :account
+  belongs_to :fetch_account, class_name: 'Account'
+end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 72f04f00a7..cc4184f80a 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -27,8 +27,11 @@ class Poll < ApplicationRecord
   belongs_to :status
 
   has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :delete_all
-  has_many :voters, -> { group('accounts.id') }, through: :votes, class_name: 'Account', source: :account
-  has_many :local_voters, -> { group('accounts.id').merge(Account.local) }, through: :votes, class_name: 'Account', source: :account
+
+  with_options class_name: 'Account', source: :account, through: :votes do
+    has_many :voters, -> { group('accounts.id') }
+    has_many :local_voters, -> { group('accounts.id').merge(Account.local) }
+  end
 
   has_many :notifications, as: :activity, dependent: :destroy
 
@@ -54,7 +57,7 @@ class Poll < ApplicationRecord
   end
 
   def voted?(account)
-    account.id == account_id || votes.where(account: account).exists?
+    account.id == account_id || votes.exists?(account: account)
   end
 
   def own_votes(account)
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 8375927430..65a55bbd08 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -10,7 +10,6 @@
 #  description                  :string           default(""), not null
 #  image_file_name              :string
 #  image_content_type           :string
-#  image_file_size              :integer
 #  image_updated_at             :datetime
 #  type                         :integer          default("link"), not null
 #  html                         :text             default(""), not null
@@ -32,6 +31,7 @@
 #  link_type                    :integer
 #  published_at                 :datetime
 #  image_description            :string           default(""), not null
+#  image_file_size              :integer
 #
 
 class PreviewCard < ApplicationRecord
@@ -47,8 +47,8 @@ class PreviewCard < ApplicationRecord
 
   self.inheritance_column = false
 
-  enum type: { link: 0, photo: 1, video: 2, rich: 3 }
-  enum link_type: { unknown: 0, article: 1 }
+  enum :type, { link: 0, photo: 1, video: 2, rich: 3 }
+  enum :link_type, { unknown: 0, article: 1 }
 
   has_many :preview_cards_statuses, dependent: :delete_all, inverse_of: :preview_card
   has_many :statuses, through: :preview_cards_statuses
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 8ba24331bb..756707e3f1 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -54,6 +54,6 @@ class PreviewCardProvider < ApplicationRecord
 
   def self.matching_domain(domain)
     segments = domain.split('.')
-    where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).order(Arel.sql('char_length(domain) desc')).first
+    where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).by_domain_length.first
   end
 end
diff --git a/app/models/preview_card_trend.rb b/app/models/preview_card_trend.rb
index 018400dfa9..58155971a3 100644
--- a/app/models/preview_card_trend.rb
+++ b/app/models/preview_card_trend.rb
@@ -12,6 +12,10 @@
 #  language        :string
 #
 class PreviewCardTrend < ApplicationRecord
+  include RankedTrend
+
   belongs_to :preview_card
+
   scope :allowed, -> { where(allowed: true) }
+  scope :not_allowed, -> { where(allowed: false) }
 end
diff --git a/app/models/privacy_policy.rb b/app/models/privacy_policy.rb
index 36cbf18822..c0d6e1b76d 100644
--- a/app/models/privacy_policy.rb
+++ b/app/models/privacy_policy.rb
@@ -1,66 +1,7 @@
 # frozen_string_literal: true
 
 class PrivacyPolicy < ActiveModelSerializers::Model
-  DEFAULT_PRIVACY_POLICY = <<~TXT
-    This privacy policy describes how %{domain} ("%{domain}", "we", "us") collects, protects and uses the personally identifiable information you may provide through the %{domain} website or its API. The policy also describes the choices available to you regarding our use of your personal information and how you can access and update this information. This policy does not apply to the practices of companies that %{domain} does not own or control, or to individuals that %{domain} does not employ or manage.
-
-    # What information do we collect?
-
-    - **Basic account information**: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
-    - **Posts, following and other public information**: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-    - **Direct and followers-only posts**: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. **Please keep in mind that the operators of the server and any receiving server may view such messages**, and that recipients may screenshot, copy or otherwise re-share them. **Do not share any sensitive information over Mastodon.**
-    - **IPs and other metadata**: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
-
-    # What do we use your information for?
-
-    Any of the information we collect from you may be used in the following ways:
-
-    - To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-    - To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-    - The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
-
-    # How do we protect your information?
-
-    We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.
-
-    # What is our data retention policy?
-
-    We will make a good faith effort to:
-
-    - Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-    - Retain the IP addresses associated with registered users no more than 12 months.
-
-    You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
-
-    You may irreversibly delete your account at any time.
-
-    # Do we use cookies?
-
-    Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
-
-    We use cookies to understand and save your preferences for future visits.
-
-    # Do we disclose any information to outside parties?
-
-    We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.
-
-    Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.
-
-    When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.
-
-    # Site usage by children
-
-    If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.
-
-    If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
-
-    Law requirements can be different if this server is in another jurisdiction.
-
-    ___
-
-    This document is CC-BY-SA. Originally adapted from the [Discourse privacy policy](https://github.com/discourse/discourse).
-  TXT
-
+  DEFAULT_PRIVACY_POLICY = Rails.root.join('config', 'templates', 'privacy-policy.md').read
   DEFAULT_UPDATED_AT = DateTime.new(2022, 10, 7).freeze
 
   attributes :updated_at, :text
diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb
index c208d6f664..648df08cc6 100644
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -19,17 +19,21 @@ class PublicFeed
   # @param [Integer] min_id
   # @return [Array<Status>]
   def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    return [] if local_only? && !Setting.enable_local_timeline
+
     scope = public_scope
 
     scope.merge!(without_replies_scope) unless with_replies?
     scope.merge!(without_reblogs_scope) unless with_reblogs?
     scope.merge!(local_only_scope) if local_only?
-    scope.merge!(remote_only_scope) if remote_only?
+    scope.merge!(remote_only_scope) if remote_only? || hide_local_users?
     scope.merge!(account_filters_scope) if account?
     scope.merge!(media_only_scope) if media_only?
     scope.merge!(language_scope) if account&.chosen_languages.present?
+    # scope.merge!(anonymous_scope) unless account?
+    scope = to_anonymous_scope(scope) unless account?
 
-    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end
 
   private
@@ -49,7 +53,11 @@ class PublicFeed
   end
 
   def remote_only?
-    options[:remote] && !options[:local]
+    options[:remote] && !options[:local] && Setting.enable_local_timeline
+  end
+
+  def hide_local_users?
+    @account.nil? && Setting.hide_local_users_for_anonymous
   end
 
   def account?
@@ -64,6 +72,10 @@ class PublicFeed
     Status.with_public_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
   end
 
+  def public_search_scope
+    Status.with_public_search_visibility.joins(:account).merge(Account.without_suspended.without_silenced)
+  end
+
   def local_only_scope
     Status.local
   end
@@ -88,6 +100,14 @@ class PublicFeed
     Status.where(language: account.chosen_languages)
   end
 
+  def anonymous_scope
+    local_only? ? Status.where(visibility: [:public, :public_unlisted]) : Status.where(visibility: :public)
+  end
+
+  def to_anonymous_scope(scope)
+    scope.where.not(visibility: :login)
+  end
+
   def account_filters_scope
     Status.not_excluded_by_account(account).tap do |scope|
       scope.merge!(Status.not_domain_blocked_by_account(account)) unless local_only?
diff --git a/app/models/relationship_filter.rb b/app/models/relationship_filter.rb
index d686f9ed89..828610e46a 100644
--- a/app/models/relationship_filter.rb
+++ b/app/models/relationship_filter.rb
@@ -114,7 +114,7 @@ class RelationshipFilter
   def activity_scope(value)
     case value
     when 'dormant'
-      Account.joins(:account_stat).where(account_stat: { last_status_at: [nil, ...1.month.ago] })
+      Account.dormant
     else
       raise Mastodon::InvalidParameterError, "Unknown activity: #{value}"
     end
diff --git a/app/models/relationship_severance_event.rb b/app/models/relationship_severance_event.rb
new file mode 100644
index 0000000000..30ada25767
--- /dev/null
+++ b/app/models/relationship_severance_event.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: relationship_severance_events
+#
+#  id          :bigint(8)        not null, primary key
+#  type        :integer          not null
+#  target_name :string           not null
+#  purged      :boolean          default(FALSE), not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+class RelationshipSeveranceEvent < ApplicationRecord
+  self.inheritance_column = nil
+
+  has_many :severed_relationships, inverse_of: :relationship_severance_event, dependent: :delete_all
+
+  enum :type, {
+    domain_block: 0,
+    user_domain_block: 1,
+    account_suspension: 2,
+  }
+
+  scope :about_local_account, ->(account) { where(id: SeveredRelationship.about_local_account(account).select(:relationship_severance_event_id)) }
+
+  def import_from_active_follows!(follows)
+    import_from_follows!(follows, true)
+  end
+
+  def import_from_passive_follows!(follows)
+    import_from_follows!(follows, false)
+  end
+
+  def affected_local_accounts
+    Account.where(id: severed_relationships.select(:local_account_id))
+  end
+
+  private
+
+  def import_from_follows!(follows, active)
+    SeveredRelationship.insert_all(
+      follows.pluck(:account_id, :target_account_id, :show_reblogs, :notify, :languages).map do |account_id, target_account_id, show_reblogs, notify, languages|
+        {
+          local_account_id: active ? account_id : target_account_id,
+          remote_account_id: active ? target_account_id : account_id,
+          show_reblogs: show_reblogs,
+          notify: notify,
+          languages: languages,
+          relationship_severance_event_id: id,
+          direction: active ? :active : :passive,
+        }
+      end
+    )
+  end
+end
diff --git a/app/models/relay.rb b/app/models/relay.rb
index 8d697b891f..f652b4864b 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -15,7 +15,7 @@
 class Relay < ApplicationRecord
   validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
 
-  enum state: { idle: 0, pending: 1, accepted: 2, rejected: 3 }
+  enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
 
   scope :enabled, -> { accepted }
 
diff --git a/app/models/report.rb b/app/models/report.rb
index c565362cc6..3df5a20e18 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -26,33 +26,38 @@ class Report < ApplicationRecord
   include Paginable
   include RateLimitable
 
+  COMMENT_SIZE_LIMIT = 1_000
+
   rate_limit by: :account, family: :reports
 
   belongs_to :account
-  belongs_to :target_account, class_name: 'Account'
-  belongs_to :action_taken_by_account, class_name: 'Account', optional: true
-  belongs_to :assigned_account, class_name: 'Account', optional: true
+
+  with_options class_name: 'Account' do
+    belongs_to :target_account
+    belongs_to :action_taken_by_account, optional: true
+    belongs_to :assigned_account, optional: true
+  end
 
   has_many :notes, class_name: 'ReportNote', inverse_of: :report, dependent: :destroy
   has_many :notifications, as: :activity, dependent: :destroy
 
   scope :unresolved, -> { where(action_taken_at: nil) }
   scope :resolved,   -> { where.not(action_taken_at: nil) }
-  scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
+  scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with([:account_stat, { user: [:invite_request, :invite, :ips] }])) }
 
   # A report is considered local if the reporter is local
   delegate :local?, to: :account
 
-  validates :comment, length: { maximum: 1_000 }, if: :local?
-  validates :rule_ids, absence: true, unless: :violation?
+  validates :comment, length: { maximum: COMMENT_SIZE_LIMIT }, if: :local?
+  validates :rule_ids, absence: true, if: -> { (category_changed? || rule_ids_changed?) && !violation? }
 
-  validate :validate_rule_ids
+  validate :validate_rule_ids, if: -> { (category_changed? || rule_ids_changed?) && violation? }
 
   # entries here need to be kept in sync with the front-end:
   # - app/javascript/mastodon/features/notifications/components/report.jsx
   # - app/javascript/mastodon/features/report/category.jsx
   # - app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
-  enum category: {
+  enum :category, {
     other: 0,
     spam: 1_000,
     legal: 1_500,
@@ -159,8 +164,6 @@ class Report < ApplicationRecord
   end
 
   def validate_rule_ids
-    return unless violation?
-
     errors.add(:rule_ids, I18n.t('reports.errors.invalid_rules')) unless rules.size == rule_ids&.size
   end
 
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 74b46027e8..7361c97e67 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -13,10 +13,12 @@
 #
 
 class ReportNote < ApplicationRecord
+  CONTENT_SIZE_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :report, inverse_of: :notes, touch: true
 
   scope :latest, -> { reorder(created_at: :desc) }
 
-  validates :content, presence: true, length: { maximum: 500 }
+  validates :content, presence: true, length: { maximum: CONTENT_SIZE_LIMIT }
 end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index 602e5d5874..99a36397aa 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -10,13 +10,16 @@
 #  text       :text             default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  hint       :text             default(""), not null
 #
 class Rule < ApplicationRecord
   include Discard::Model
 
+  TEXT_SIZE_LIMIT = 300
+
   self.discard_column = :deleted_at
 
-  validates :text, presence: true, length: { maximum: 300 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
 
   scope :ordered, -> { kept.order(priority: :asc, id: :asc) }
 end
diff --git a/app/models/scheduled_expiration_status.rb b/app/models/scheduled_expiration_status.rb
new file mode 100644
index 0000000000..aff27765a8
--- /dev/null
+++ b/app/models/scheduled_expiration_status.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: scheduled_expiration_statuses
+#
+#  id           :bigint(8)        not null, primary key
+#  account_id   :bigint(8)
+#  status_id    :bigint(8)        not null
+#  scheduled_at :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+
+class ScheduledExpirationStatus < ApplicationRecord
+  include Paginable
+
+  TOTAL_LIMIT = 300
+  DAILY_LIMIT = 25
+
+  belongs_to :account, inverse_of: :scheduled_expiration_statuses
+  belongs_to :status,  inverse_of: :scheduled_expiration_status
+
+  validate :validate_total_limit
+  validate :validate_daily_limit
+
+  private
+
+  def validate_total_limit
+    errors.add(:base, I18n.t('scheduled_expiration_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_expiration_statuses.count >= TOTAL_LIMIT
+  end
+
+  def validate_daily_limit
+    errors.add(:base, I18n.t('scheduled_expiration_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_expiration_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT
+  end
+end
diff --git a/app/models/sensitive_word.rb b/app/models/sensitive_word.rb
new file mode 100644
index 0000000000..a46175e213
--- /dev/null
+++ b/app/models/sensitive_word.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: sensitive_words
+#
+#  id         :bigint(8)        not null, primary key
+#  keyword    :string           not null
+#  regexp     :boolean          default(FALSE), not null
+#  remote     :boolean          default(FALSE), not null
+#  spoiler    :boolean          default(TRUE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class SensitiveWord < ApplicationRecord
+  attr_accessor :keywords, :regexps, :remotes, :spoilers
+
+  validate :check_regexp
+  after_commit :invalidate_cache!
+
+  class << self
+    def caches
+      Rails.cache.fetch('sensitive_words') { SensitiveWord.where.not(id: 0).order(:keyword).to_a }
+    end
+
+    def save_from_hashes(rows)
+      unmatched = caches
+      matched = []
+
+      SensitiveWord.transaction do
+        rows.filter { |item| item[:keyword].present? }.each do |item|
+          exists = unmatched.find { |i| i.keyword == item[:keyword] }
+
+          if exists.present?
+            unmatched.delete(exists)
+            matched << exists
+
+            next if exists.regexp == item[:regexp] && exists.remote == item[:remote] && exists.spoiler == item[:spoiler]
+
+            exists.update!(regexp: item[:regexp], remote: item[:remote], spoiler: item[:spoiler])
+          elsif matched.none? { |i| i.keyword == item[:keyword] }
+            SensitiveWord.create!(
+              keyword: item[:keyword],
+              regexp: item[:regexp],
+              remote: item[:remote],
+              spoiler: item[:spoiler]
+            )
+          end
+        end
+
+        SensitiveWord.destroy(unmatched.map(&:id))
+      end
+
+      true
+    end
+
+    def save_from_raws(rows)
+      regexps = rows['regexps'] || []
+      remotes = rows['remotes'] || []
+      spoilers = rows['spoilers'] || []
+
+      hashes = (rows['keywords'] || []).zip(rows['temporary_ids'] || []).map do |item|
+        temp_id = item[1]
+        {
+          keyword: item[0],
+          regexp: regexps.include?(temp_id),
+          remote: remotes.include?(temp_id),
+          spoiler: spoilers.include?(temp_id),
+        }
+      end
+
+      save_from_hashes(hashes)
+    end
+  end
+
+  private
+
+  def invalidate_cache!
+    Rails.cache.delete('sensitive_words')
+  end
+
+  def check_regexp
+    return if keyword.blank? || !regexp
+
+    begin
+      Admin::NgWord.reject_with_custom_word?('Sample text', keyword)
+    rescue
+      raise Mastodon::ValidationError, I18n.t('admin.ng_words.test_error')
+    end
+  end
+end
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 7f5f0d9a9a..d0a77daf0a 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -16,6 +16,8 @@
 #
 
 class SessionActivation < ApplicationRecord
+  include BrowserDetection
+
   belongs_to :user, inverse_of: :session_activations
   belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy, optional: true
   belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy, optional: true
@@ -24,24 +26,11 @@ class SessionActivation < ApplicationRecord
            to: :access_token,
            allow_nil: true
 
-  def detection
-    @detection ||= Browser.new(user_agent)
-  end
-
-  def browser
-    detection.id
-  end
-
-  def platform
-    detection.platform.id
-  end
-
-  before_save   :assign_user_agent
   before_create :assign_access_token
 
   class << self
     def active?(id)
-      id && where(session_id: id).exists?
+      id && exists?(session_id: id)
     end
 
     def activate(**options)
@@ -67,10 +56,6 @@ class SessionActivation < ApplicationRecord
 
   private
 
-  def assign_user_agent
-    self.user_agent = '' if user_agent.nil?
-  end
-
   def assign_access_token
     self.access_token = Doorkeeper::AccessToken.create!(access_token_attributes)
   end
diff --git a/app/models/severed_relationship.rb b/app/models/severed_relationship.rb
new file mode 100644
index 0000000000..64b5b0001b
--- /dev/null
+++ b/app/models/severed_relationship.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: severed_relationships
+#
+#  id                              :bigint(8)        not null, primary key
+#  relationship_severance_event_id :bigint(8)        not null
+#  local_account_id                :bigint(8)        not null
+#  remote_account_id               :bigint(8)        not null
+#  direction                       :integer          not null
+#  show_reblogs                    :boolean
+#  notify                          :boolean
+#  languages                       :string           is an Array
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#
+class SeveredRelationship < ApplicationRecord
+  belongs_to :relationship_severance_event
+  belongs_to :local_account, class_name: 'Account'
+  belongs_to :remote_account, class_name: 'Account'
+
+  enum :direction, {
+    passive: 0, # analogous to `local_account.passive_relationships`
+    active: 1, # analogous to `local_account.active_relationships`
+  }
+
+  scope :about_local_account, ->(account) { where(local_account: account) }
+  scope :about_remote_account, ->(account) { where(remote_account: account) }
+
+  scope :active, -> { where(direction: :active) }
+  scope :passive, -> { where(direction: :passive) }
+
+  def account
+    active? ? local_account : remote_account
+  end
+
+  def target_account
+    active? ? remote_account : local_account
+  end
+end
diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index 03d472cdb2..93e7e7f3f1 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -8,18 +8,41 @@
 #  var               :string           default(""), not null
 #  file_file_name    :string
 #  file_content_type :string
-#  file_file_size    :integer
 #  file_updated_at   :datetime
 #  meta              :json
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  blurhash          :string
+#  file_file_size    :integer
 #
 
 class SiteUpload < ApplicationRecord
   include Attachmentable
 
+  FAVICON_SIZES = [16, 32, 48].freeze
+  APPLE_ICON_SIZES   = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024].freeze
+  ANDROID_ICON_SIZES = [36, 48, 72, 96, 144, 192, 256, 384, 512].freeze
+
+  APP_ICON_SIZES = (APPLE_ICON_SIZES + ANDROID_ICON_SIZES).uniq.freeze
+
   STYLES = {
+    app_icon:
+      APP_ICON_SIZES.to_h do |size|
+        [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+      end.freeze,
+
+    favicon: {
+      ico: {
+        format: 'ico',
+        geometry: '48x48#',
+        file_geometry_parser: FastGeometryParser,
+      }.freeze,
+    }.merge(
+      FAVICON_SIZES.to_h do |size|
+        [:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
+      end
+    ).freeze,
+
     thumbnail: {
       '@1x': {
         format: 'png',
diff --git a/app/models/software_update.rb b/app/models/software_update.rb
index cb3a6df2ae..80ea493eb3 100644
--- a/app/models/software_update.rb
+++ b/app/models/software_update.rb
@@ -16,7 +16,7 @@
 class SoftwareUpdate < ApplicationRecord
   self.inheritance_column = nil
 
-  enum type: { patch: 0, minor: 1, major: 2 }, _suffix: :type
+  enum :type, { patch: 0, minor: 1, major: 2 }, suffix: :type
 
   def gem_version
     Gem::Version.new(version)
@@ -36,5 +36,13 @@ class SoftwareUpdate < ApplicationRecord
     def urgent_pending?
       pending_to_a.any?(&:urgent?)
     end
+
+    def major_pending?
+      pending_to_a.any?(&:major_type?)
+    end
+
+    def patch_pending?
+      pending_to_a.any?(&:patch_type?)
+    end
   end
 end
diff --git a/app/models/specified_domain.rb b/app/models/specified_domain.rb
new file mode 100644
index 0000000000..0b4aacb9af
--- /dev/null
+++ b/app/models/specified_domain.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: specified_domains
+#
+#  id         :bigint(8)        not null, primary key
+#  domain     :string           not null
+#  table      :integer          default(0), not null
+#  options    :jsonb            not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class SpecifiedDomain < ApplicationRecord
+  attr_accessor :domains
+
+  validates :domain, uniqueness: { scope: :table }
+  after_commit :invalidate_cache!
+
+  scope :white_list_domains, -> { where(table: 0) }
+
+  class << self
+    def white_list_domain_caches
+      Rails.cache.fetch('specified_domains:white_list') { white_list_domains.order(:domain).to_a }
+    end
+
+    def save_from_hashes(rows, type, caches)
+      unmatched = caches
+      matched = []
+
+      SpecifiedDomain.transaction do
+        rows.filter { |item| item[:domain].present? }.each do |item|
+          exists = unmatched.find { |i| i.domain == item[:domain] }
+
+          if exists.present?
+            unmatched.delete(exists)
+            matched << exists
+
+            next unless item.key?(:options) && item[:options] == exists.options
+
+            exists.update!(options: item[:options])
+          elsif matched.none? { |i| i.domain == item[:domain] }
+            SpecifiedDomain.create!(
+              domain: item[:domain],
+              table: type,
+              options: item[:options] || {}
+            )
+          end
+        end
+
+        SpecifiedDomain.destroy(unmatched.map(&:id))
+      end
+
+      true
+    end
+
+    def save_from_raws(rows, type, caches)
+      hashes = (rows['domains'] || []).map do |domain|
+        {
+          domain: domain,
+          type: type,
+        }
+      end
+
+      save_from_hashes(hashes, type, caches)
+    end
+
+    def save_from_raws_as_white_list(rows)
+      save_from_raws(rows, 0, white_list_domain_caches)
+    end
+  end
+
+  private
+
+  def invalidate_cache!
+    Rails.cache.delete('specified_domains:white_list')
+  end
+end
diff --git a/app/models/status.rb b/app/models/status.rb
index a498da288a..d9f436c1bf 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -27,17 +27,25 @@
 #  edited_at                    :datetime
 #  trendable                    :boolean
 #  ordered_media_attachment_ids :bigint(8)        is an Array
+#  searchability                :integer
+#  markdown                     :boolean          default(FALSE)
+#  limited_scope                :integer
+#  quote_of_id                  :bigint(8)
 #
 
+require 'ostruct'
+
 class Status < ApplicationRecord
   include Cacheable
   include Discard::Model
   include Paginable
   include RateLimitable
+  include Status::DomainBlockConcern
   include Status::SafeReblogInsert
   include Status::SearchConcern
   include Status::SnapshotConcern
   include Status::ThreadingConcern
+  include DtlHelper
 
   rate_limit by: :account, family: :statuses
 
@@ -50,37 +58,58 @@ class Status < ApplicationRecord
   update_index('statuses', :proper)
   update_index('public_statuses', :proper)
 
-  enum visibility: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, _suffix: :visibility
+  enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4, public_unlisted: 10, login: 11 }, suffix: :visibility
+  enum :searchability, { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, suffix: :searchability
+  enum :limited_scope, { none: 0, mutual: 1, circle: 2, personal: 3, reply: 4 }, suffix: :limited
 
   belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 
   belongs_to :account, inverse_of: :statuses
   belongs_to :in_reply_to_account, class_name: 'Account', optional: true
   belongs_to :conversation, optional: true
+  has_one :owned_conversation, class_name: 'Conversation', foreign_key: 'ancestor_status_id', dependent: :nullify, inverse_of: false
   belongs_to :preloadable_poll, class_name: 'Poll', foreign_key: 'poll_id', optional: true, inverse_of: false
 
-  belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
-  belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
+  with_options class_name: 'Status', optional: true do
+    belongs_to :thread, foreign_key: 'in_reply_to_id', inverse_of: :replies
+    belongs_to :reblog, foreign_key: 'reblog_of_id', inverse_of: :reblogs
+    belongs_to :quote, foreign_key: 'quote_of_id', inverse_of: :quotes
+  end
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
+  has_many :emoji_reactions, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
   has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
   has_many :reblogged_by_accounts, through: :reblogs, class_name: 'Account', source: :account
+  has_many :quotes, foreign_key: 'quote_of_id', class_name: 'Status', inverse_of: :quote, dependent: nil
+  has_many :quoted_by_accounts, through: :quotes, class_name: 'Account', source: :account
   has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread, dependent: nil
   has_many :mentions, dependent: :destroy, inverse_of: :status
   has_many :mentioned_accounts, through: :mentions, source: :account, class_name: 'Account'
-  has_many :media_attachments, dependent: :nullify
+  has_many :media_attachments, dependent: :nullify, inverse_of: false
+  has_many :reference_objects, class_name: 'StatusReference', inverse_of: :status, dependent: :destroy
+  has_many :references, through: :reference_objects, class_name: 'Status', source: :target_status
+  has_many :referenced_by_status_objects, foreign_key: 'target_status_id', class_name: 'StatusReference', inverse_of: :target_status, dependent: :destroy
+  has_many :referenced_by_statuses, through: :referenced_by_status_objects, class_name: 'Status', source: :status
+  has_many :capability_tokens, class_name: 'StatusCapabilityToken', inverse_of: :status, dependent: :destroy
+  has_many :bookmark_category_relationships, class_name: 'BookmarkCategoryStatus', inverse_of: :status, dependent: :destroy
+  has_many :bookmark_categories, class_name: 'BookmarkCategory', through: :bookmark_category_relationships, source: :bookmark_category
+  has_many :joined_bookmark_categories, class_name: 'BookmarkCategory', through: :bookmark_category_relationships, source: :bookmark_category
 
   # The `dependent` option is enabled by the initial `mentions` association declaration
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
+  has_many :silent_mentions, -> { silent }, class_name: 'Mention', inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
 
   # Those associations are used for the private search index
   has_many :local_mentioned, -> { merge(Account.local) }, through: :active_mentions, source: :account
   has_many :local_favorited, -> { merge(Account.local) }, through: :favourites, source: :account
   has_many :local_reblogged, -> { merge(Account.local) }, through: :reblogs, source: :account
   has_many :local_bookmarked, -> { merge(Account.local) }, through: :bookmarks, source: :account
+  has_many :local_bookmark_categoried, -> { merge(Account.local) }, through: :bookmark_categories, source: :account
+  has_many :local_emoji_reacted, -> { merge(Account.local) }, through: :emoji_reactions, source: :account
+  has_many :local_referenced, -> { merge(Account.local) }, through: :referenced_by_statuses, source: :account
 
-  has_and_belongs_to_many :tags
+  has_and_belongs_to_many :tags # rubocop:disable Rails/HasAndBelongsToMany
 
   has_one :preview_cards_status, inverse_of: :status, dependent: :delete
 
@@ -88,6 +117,9 @@ class Status < ApplicationRecord
   has_one :status_stat, inverse_of: :status, dependent: nil
   has_one :poll, inverse_of: :status, dependent: :destroy
   has_one :trend, class_name: 'StatusTrend', inverse_of: :status, dependent: nil
+  has_one :scheduled_expiration_status, inverse_of: :status, dependent: :destroy
+  has_one :circle_status, inverse_of: :status, dependent: :destroy
+  has_many :list_status, inverse_of: :status, dependent: :destroy
 
   validates :uri, uniqueness: true, presence: true, unless: :local?
   validates :text, presence: true, unless: -> { with_media? || reblog? }
@@ -104,12 +136,15 @@ class Status < ApplicationRecord
   scope :remote, -> { where(local: false).where.not(uri: nil) }
   scope :local,  -> { where(local: true).or(where(uri: nil)) }
   scope :with_accounts, ->(ids) { where(id: ids).includes(:account) }
-  scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
+  scope :without_replies, -> { not_reply.or(reply_to_account) }
+  scope :not_reply, -> { where(reply: false) }
+  scope :reply_to_account, -> { where(arel_table[:in_reply_to_account_id].eq arel_table[:account_id]) }
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
-  scope :with_public_visibility, -> { where(visibility: :public) }
+  scope :with_public_visibility, -> { where(visibility: [:public, :public_unlisted, :login]) }
+  scope :with_public_search_visibility, -> { merge(where(visibility: [:public, :public_unlisted, :login]).or(Status.where(searchability: [:public, :public_unlisted]))) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
-  scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
+  scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).merge(Account.not_domain_blocked_by_account(account)) }
   scope :tagged_with_all, lambda { |tag_ids|
     Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
       result.where(<<~SQL.squish, tag_id: id)
@@ -120,6 +155,10 @@ class Status < ApplicationRecord
   scope :tagged_with_none, lambda { |tag_ids|
     where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
   }
+  scope :unset_searchability, -> { where(searchability: nil, reblog_of_id: nil) }
+  scope :distributable_visibility, -> { where(visibility: %i(public public_unlisted login unlisted)) }
+  scope :distributable_visibility_for_anonymous, -> { where(visibility: %i(public public_unlisted unlisted)) }
+  scope :list_eligible_visibility, -> { where(visibility: %i(public public_unlisted login unlisted private)) }
 
   after_create_commit :trigger_create_webhooks
   after_update_commit :trigger_update_webhooks
@@ -133,6 +172,7 @@ class Status < ApplicationRecord
   before_validation :prepare_contents, if: :local?
   before_validation :set_reblog
   before_validation :set_visibility
+  before_validation :set_searchability
   before_validation :set_conversation
   before_validation :set_local
 
@@ -150,6 +190,9 @@ class Status < ApplicationRecord
                    :status_stat,
                    :tags,
                    :preloadable_poll,
+                   :reference_objects,
+                   :references,
+                   :scheduled_expiration_status,
                    preview_cards_status: [:preview_card],
                    account: [:account_stat, user: :role],
                    active_mentions: { account: :account_stat },
@@ -160,6 +203,21 @@ class Status < ApplicationRecord
                      :conversation,
                      :status_stat,
                      :preloadable_poll,
+                     :reference_objects,
+                     :scheduled_expiration_status,
+                     preview_cards_status: [:preview_card],
+                     account: [:account_stat, user: :role],
+                     active_mentions: { account: :account_stat },
+                   ],
+                   quote: [
+                     :application,
+                     :tags,
+                     :media_attachments,
+                     :conversation,
+                     :status_stat,
+                     :preloadable_poll,
+                     :reference_objects,
+                     :scheduled_expiration_status,
                      preview_cards_status: [:preview_card],
                      account: [:account_stat, user: :role],
                      active_mentions: { account: :account_stat },
@@ -198,6 +256,14 @@ class Status < ApplicationRecord
     !reblog_of_id.nil?
   end
 
+  def quote?
+    !quote_of_id.nil? && !quote.nil?
+  end
+
+  def expires?
+    scheduled_expiration_status.present?
+  end
+
   def within_realtime_window?
     created_at >= REAL_TIME_WINDOW.ago
   end
@@ -239,13 +305,18 @@ class Status < ApplicationRecord
   end
 
   def distributable?
-    public_visibility? || unlisted_visibility?
+    public_visibility? || unlisted_visibility? || public_unlisted_visibility?
   end
 
   alias sign? distributable?
 
   def with_media?
-    ordered_media_attachments.any?
+    media_attachments.any?
+  end
+
+  def expired?
+    false
+    # !expired_at.nil?
   end
 
   def with_preview_card?
@@ -256,12 +327,20 @@ class Status < ApplicationRecord
     preloadable_poll.present?
   end
 
+  def with_status_reference?
+    reference_objects.any?
+  end
+
   def non_sensitive_with_media?
     !sensitive? && with_media?
   end
 
   def reported?
-    @reported ||= Report.where(target_account: account).unresolved.where('? = ANY(status_ids)', id).exists?
+    @reported ||= account.targeted_reports.unresolved.exists?(['? = ANY(status_ids)', id]) || account.strikes.exists?(['? = ANY(status_ids)', id.to_s])
+  end
+
+  def dtl?
+    (%w(public public_unlisted login).include?(visibility) || (unlisted_visibility? && public_searchability?)) && tags.exists?(name: dtl_tag_name)
   end
 
   def emojis
@@ -296,6 +375,18 @@ class Status < ApplicationRecord
     status_stat&.favourites_count || 0
   end
 
+  def emoji_reactions_count
+    status_stat&.emoji_reactions_count || 0
+  end
+
+  def emoji_reaction_accounts_count
+    status_stat&.emoji_reaction_accounts_count || 0
+  end
+
+  def status_referred_by_count
+    status_stat&.status_referred_by_count || 0
+  end
+
   def increment_count!(key)
     update_status_stat!(key => public_send(key) + 1)
   end
@@ -304,6 +395,60 @@ class Status < ApplicationRecord
     update_status_stat!(key => [public_send(key) - 1, 0].max)
   end
 
+  def add_status_referred_by_count!(diff)
+    update_status_stat!(status_referred_by_count: [public_send(:status_referred_by_count) + diff, 0].max)
+  end
+
+  def emoji_reactions_grouped_by_name(account = nil, **options)
+    return [] if account.present? && !self.account.show_emoji_reaction?(account)
+    return [] if account.nil? && !options[:force] && self.account.emoji_reaction_policy != :allow
+
+    permitted_account_ids = options[:permitted_account_ids]
+
+    (Oj.load(status_stat&.emoji_reactions || '', mode: :strict) || []).tap do |emoji_reactions|
+      if account.present?
+        public_emoji_reactions = []
+
+        emoji_reactions.each do |emoji_reaction|
+          emoji_reaction['me'] = emoji_reaction['account_ids'].include?(account.id.to_s)
+          emoji_reaction['account_ids'] -= account.excluded_from_timeline_account_ids.map(&:to_s)
+
+          accounts = []
+          if permitted_account_ids
+            emoji_reaction['account_ids'] = emoji_reaction['account_ids'] & permitted_account_ids.map(&:to_s)
+          else
+            accounts = Account.where(id: emoji_reaction['account_ids'], silenced_at: nil, suspended_at: nil)
+            accounts = accounts.where('domain IS NULL OR domain NOT IN (?)', account.excluded_from_timeline_domains) if account.excluded_from_timeline_domains.size.positive?
+            emoji_reaction['account_ids'] = accounts.pluck(:id).map(&:to_s)
+          end
+
+          emoji_reaction['count'] = emoji_reaction['account_ids'].size
+          public_emoji_reactions << emoji_reaction if (emoji_reaction['count']).positive?
+        end
+
+        public_emoji_reactions
+      else
+        emoji_reactions
+      end
+    end
+  end
+
+  def generate_emoji_reactions_grouped_by_name
+    records = emoji_reactions.group(:name).order(Arel.sql('MIN(created_at) ASC')).select('name, min(custom_emoji_id) as custom_emoji_id, count(*) as count, array_agg(account_id::text order by created_at) as account_ids')
+    Oj.dump(ActiveModelSerializers::SerializableResource.new(records, each_serializer: REST::EmojiReactionsGroupedByNameSerializer, scope: nil, scope_name: :current_user))
+  end
+
+  def refresh_emoji_reactions_grouped_by_name!
+    generate_emoji_reactions_grouped_by_name.tap do |emoji_reactions_json|
+      update_status_stat!(emoji_reactions: emoji_reactions_json, emoji_reactions_count: emoji_reactions.size, emoji_reaction_accounts_count: emoji_reactions.map(&:account_id).uniq.size)
+    end
+  end
+
+  def generate_emoji_reactions_grouped_by_account
+    # TODO: for serializer
+    EmojiReaction.where(status_id: id).group_by(&:account)
+  end
+
   def trendable?
     if attributes['trendable'].nil?
       account.trendable?
@@ -320,9 +465,70 @@ class Status < ApplicationRecord
     attributes['trendable'].nil? && account.requires_review_notification?
   end
 
+  def compute_searchability
+    local = account.local?
+    check_searchability = public_unlisted_searchability? ? 'public' : searchability
+
+    return 'private' if %w(public public_unlisted).include?(check_searchability) && account.silenced?
+    return 'direct' if unsupported_searchability?
+    return check_searchability if local && !check_searchability.nil?
+    return 'direct' if local || %i(public private direct limited).exclude?(account.searchability.to_sym)
+
+    account_searchability = Status.searchabilities[account.searchability]
+    status_searchability = Status.searchabilities[check_searchability.nil? ? 'direct' : check_searchability]
+    Status.searchabilities.invert.fetch([account_searchability, status_searchability].max) || 'direct'
+  end
+
+  def compute_searchability_activitypub
+    return 'private' if public_unlisted_searchability?
+
+    compute_searchability
+  end
+
+  def compute_searchability_local
+    return 'public_unlisted' if public_unlisted_searchability?
+
+    compute_searchability
+  end
+
+  def searchable_visibility
+    return limited_scope if limited_visibility? && !none_limited?
+
+    visibility
+  end
+
   class << self
     def selectable_visibilities
-      visibilities.keys - %w(direct limited)
+      selectable_all_visibilities - %w(mutual circle reply direct)
+    end
+
+    def selectable_all_visibilities
+      vs = %w(public public_unlisted login unlisted private mutual circle reply direct)
+      vs -= %w(public_unlisted) unless Setting.enable_public_unlisted_visibility
+      vs -= %w(public) unless Setting.enable_public_visibility
+      vs
+    end
+
+    def selectable_reblog_visibilities
+      %w(unset) + selectable_visibilities
+    end
+
+    def all_visibilities
+      visibilities.keys
+    end
+
+    def selectable_searchabilities
+      ss = searchabilities.keys - %w(unsupported)
+      ss -= %w(public_unlisted) unless Setting.enable_public_unlisted_visibility
+      ss
+    end
+
+    def selectable_searchabilities_for_search
+      searchabilities.keys - %w(public_unlisted unsupported)
+    end
+
+    def all_searchabilities
+      searchabilities.keys - %w(unlisted login unsupported)
     end
 
     def favourites_map(status_ids, account_id)
@@ -341,40 +547,25 @@ class Status < ApplicationRecord
       ConversationMute.select('conversation_id').where(conversation_id: conversation_ids).where(account_id: account_id).each_with_object({}) { |m, h| h[m.conversation_id] = true }
     end
 
+    def blocks_map(account_ids, account_id)
+      Block.where(account_id: account_id, target_account_id: account_ids).each_with_object({}) { |b, h| h[b.target_account_id] = true }
+    end
+
+    def domain_blocks_map(domains, account_id)
+      AccountDomainBlock.where(account_id: account_id, domain: domains).each_with_object({}) { |d, h| h[d.domain] = true }
+    end
+
     def pins_map(status_ids, account_id)
       StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true }
     end
 
-    def reload_stale_associations!(cached_items)
-      account_ids = []
+    def emoji_reaction_allows_map(status_ids, account_id)
+      my_account = Account.find_by(id: account_id)
+      Status.where(id: status_ids).pluck(:account_id).uniq.index_with { |a| Account.find_by(id: a).show_emoji_reaction?(my_account) }
+    end
 
-      cached_items.each do |item|
-        account_ids << item.account_id
-        account_ids << item.reblog.account_id if item.reblog?
-      end
-
-      account_ids.uniq!
-
-      status_ids = cached_items.map { |item| item.reblog? ? item.reblog_of_id : item.id }.uniq
-
-      return if account_ids.empty?
-
-      accounts = Account.where(id: account_ids).includes(:account_stat, :user).index_by(&:id)
-
-      status_stats = StatusStat.where(status_id: status_ids).index_by(&:status_id)
-
-      cached_items.each do |item|
-        item.account = accounts[item.account_id]
-        item.reblog.account = accounts[item.reblog.account_id] if item.reblog?
-
-        if item.reblog?
-          status_stat = status_stats[item.reblog.id]
-          item.reblog.status_stat = status_stat if status_stat.present?
-        else
-          status_stat = status_stats[item.id]
-          item.status_stat = status_stat if status_stat.present?
-        end
-      end
+    def available_features_map(domains)
+      domains.index_with { |d| InstanceInfo.available_features(d) }
     end
 
     def from_text(text)
@@ -413,6 +604,10 @@ class Status < ApplicationRecord
     end
   end
 
+  def distributable_friend?
+    public_visibility? || public_unlisted_visibility? || login_visibility? || (unlisted_visibility? && (public_searchability? || public_unlisted_searchability?))
+  end
+
   private
 
   def update_status_stat!(attrs)
@@ -441,7 +636,20 @@ class Status < ApplicationRecord
   def set_visibility
     self.visibility = reblog.visibility if reblog? && visibility.nil?
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
-    self.sensitive  = false if sensitive.nil?
+  end
+
+  def set_searchability
+    return if searchability.nil?
+
+    self.searchability = if %w(public public_unlisted login unlisted).include?(visibility)
+                           searchability
+                         elsif visibility == 'limited' || visibility == 'direct'
+                           searchability == 'limited' ? :limited : :direct
+                         elsif visibility == 'private'
+                           searchability == 'public' || searchability == 'public_unlisted' ? :private : searchability
+                         else
+                           :direct
+                         end
   end
 
   def set_conversation
@@ -449,11 +657,16 @@ class Status < ApplicationRecord
 
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply
 
-    if reply? && !thread.nil?
+    if reply? && !thread.nil? && (!limited_visibility? || none_limited? || reply_limited?)
       self.in_reply_to_account_id = carried_over_reply_to_account_id
       self.conversation_id        = thread.conversation_id if conversation_id.nil?
     elsif conversation_id.nil?
-      self.conversation = Conversation.new
+      if local?
+        self.owned_conversation = Conversation.new
+        self.conversation = owned_conversation
+      else
+        self.conversation = Conversation.new
+      end
     end
   end
 
diff --git a/app/models/status_capability_token.rb b/app/models/status_capability_token.rb
new file mode 100644
index 0000000000..6bd7916497
--- /dev/null
+++ b/app/models/status_capability_token.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: status_capability_tokens
+#
+#  id         :bigint(8)        not null, primary key
+#  status_id  :bigint(8)        not null
+#  token      :string
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+class StatusCapabilityToken < ApplicationRecord
+  belongs_to :status
+
+  validates :token, presence: true
+
+  before_validation :generate_token, on: :create
+
+  private
+
+  def generate_token
+    self.token = Doorkeeper::OAuth::Helpers::UniqueToken.generate
+  end
+end
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index 50dabb91f5..a727ae87d0 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -15,6 +15,7 @@
 #  media_descriptions           :text             is an Array
 #  poll_options                 :string           is an Array
 #  sensitive                    :boolean
+#  markdown                     :boolean          default(FALSE)
 #
 
 class StatusEdit < ApplicationRecord
@@ -41,7 +42,7 @@ class StatusEdit < ApplicationRecord
 
   scope :ordered, -> { order(id: :asc) }
 
-  delegate :local?, :application, :edited?, :edited_at,
+  delegate :local?, :application, :edited?, :edited_at, :language,
            :discarded?, :visibility, to: :status
 
   def emojis
diff --git a/app/models/status_reference.rb b/app/models/status_reference.rb
new file mode 100644
index 0000000000..79207291ac
--- /dev/null
+++ b/app/models/status_reference.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: status_references
+#
+#  id               :bigint(8)        not null, primary key
+#  status_id        :bigint(8)        not null
+#  target_status_id :bigint(8)        not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  attribute_type   :string
+#  quote            :boolean          default(FALSE), not null
+#
+
+class StatusReference < ApplicationRecord
+  REFERENCES_LIMIT = 5
+
+  belongs_to :status
+  belongs_to :target_status, class_name: 'Status'
+
+  has_one :notification, as: :activity, dependent: :destroy
+
+  after_commit :reset_parent_cache
+  after_create_commit :set_quote
+  after_destroy_commit :remove_quote
+
+  private
+
+  def reset_parent_cache
+    Rails.cache.delete("statuses/#{status_id}")
+    Rails.cache.delete("statuses/#{target_status_id}")
+  end
+
+  def set_quote
+    return unless quote
+    return if status.quote_of_id.present?
+
+    status.quote_of_id = target_status_id
+  end
+
+  def remove_quote
+    return unless quote
+    return unless status.quote_of_id == target_status_id
+
+    status.quote_of_id = nil
+  end
+end
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
index 47aa144777..3e5f564fee 100644
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@@ -4,13 +4,17 @@
 #
 # Table name: status_stats
 #
-#  id               :bigint(8)        not null, primary key
-#  status_id        :bigint(8)        not null
-#  replies_count    :bigint(8)        default(0), not null
-#  reblogs_count    :bigint(8)        default(0), not null
-#  favourites_count :bigint(8)        default(0), not null
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  id                            :bigint(8)        not null, primary key
+#  status_id                     :bigint(8)        not null
+#  replies_count                 :bigint(8)        default(0), not null
+#  reblogs_count                 :bigint(8)        default(0), not null
+#  favourites_count              :bigint(8)        default(0), not null
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
+#  emoji_reactions               :string
+#  emoji_reactions_count         :integer          default(0), not null
+#  emoji_reaction_accounts_count :integer          default(0), not null
+#  status_referred_by_count      :integer          default(0), not null
 #
 
 class StatusStat < ApplicationRecord
@@ -27,4 +31,20 @@ class StatusStat < ApplicationRecord
   def favourites_count
     [attributes['favourites_count'], 0].max
   end
+
+  def emoji_reactions
+    attributes['emoji_reactions'] || ''
+  end
+
+  def emoji_reactions_count
+    [attributes['emoji_reactions_count'], 0].max
+  end
+
+  def emoji_reaction_accounts_count
+    [attributes['emoji_reaction_accounts_count'], 0].max
+  end
+
+  def status_referred_by_count
+    [attributes['status_referred_by_count'] || 0, 0].max
+  end
 end
diff --git a/app/models/status_trend.rb b/app/models/status_trend.rb
index b0f1b6942d..807efec0ff 100644
--- a/app/models/status_trend.rb
+++ b/app/models/status_trend.rb
@@ -14,6 +14,8 @@
 #
 
 class StatusTrend < ApplicationRecord
+  include RankedTrend
+
   belongs_to :status
   belongs_to :account
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 46e55d74f9..9ea710f3b8 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -21,13 +21,17 @@
 
 class Tag < ApplicationRecord
   include Paginable
+  # rubocop:disable Rails/HasAndBelongsToMany
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
+  # rubocop:enable Rails/HasAndBelongsToMany
 
   has_many :passive_relationships, class_name: 'TagFollow', inverse_of: :tag, dependent: :destroy
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag
   has_many :followers, through: :passive_relationships, source: :account
 
+  has_one :antenna_tag, dependent: :destroy, inverse_of: :tag
+
   HASHTAG_SEPARATORS = "_\u00B7\u30FB\u200c"
   HASHTAG_FIRST_SEQUENCE_CHUNK_ONE = "[[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}]"
   HASHTAG_FIRST_SEQUENCE_CHUNK_TWO = "[[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_]"
@@ -35,10 +39,12 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
 
-  HASHTAG_RE = %r{(?<![=/)\w])#(#{HASHTAG_NAME_PAT})}i
+  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])#(#{HASHTAG_NAME_PAT})}i
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
 
+  RECENT_STATUS_LIMIT = 1000
+
   validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
   validates :display_name, format: { with: HASHTAG_NAME_RE }
   validate :validate_name_change, if: -> { !new_record? && name_changed? }
@@ -51,9 +57,11 @@ class Tag < ApplicationRecord
   scope :listable, -> { where(listable: [true, nil]) }
   scope :trendable, -> { Setting.trendable_by_default ? where(trendable: [true, nil]) : where(trendable: true) }
   scope :not_trendable, -> { where(trendable: false) }
+  scope :suggestions_for_account, ->(account) { recently_used(account).not_featured_by(account) }
+  scope :not_featured_by, ->(account) { where.not(id: account.featured_tags.select(:tag_id)) }
   scope :recently_used, lambda { |account|
                           joins(:statuses)
-                            .where(statuses: { id: account.statuses.select(:id).limit(1000) })
+                            .where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
                             .group(:id).order(Arel.sql('count(*) desc'))
                         }
   scope :matches_name, ->(term) { where(arel_table[:name].lower.matches(arel_table.lower("#{sanitize_sql_like(Tag.normalize(term))}%"), nil, true)) } # Search with case-sensitive to use B-tree index
diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb
index b8cd63557e..4d2dd9f9b5 100644
--- a/app/models/tag_feed.rb
+++ b/app/models/tag_feed.rb
@@ -23,17 +23,21 @@ class TagFeed < PublicFeed
   # @param [Integer] min_id
   # @return [Array<Status>]
   def get(limit, max_id = nil, since_id = nil, min_id = nil)
-    scope = public_scope
+    return [] if local_only? && !Setting.enable_local_timeline
+
+    scope = public_search_scope
 
     scope.merge!(tagged_with_any_scope)
     scope.merge!(tagged_with_all_scope)
     scope.merge!(tagged_with_none_scope)
     scope.merge!(local_only_scope) if local_only?
-    scope.merge!(remote_only_scope) if remote_only?
+    scope.merge!(remote_only_scope) if remote_only? || hide_local_users?
     scope.merge!(account_filters_scope) if account?
     scope.merge!(media_only_scope) if media_only?
+    # scope.merge!(anonymous_scope) unless account?
+    scope = to_anonymous_scope(scope) unless account?
 
-    scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end
 
   private
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index b4eae9f702..0650c4109d 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -81,13 +81,13 @@ class Trends::Links < Trends::Base
 
     # Now that all trends have up-to-date scores, and all the ones below the threshold have
     # been removed, we can recalculate their positions
-    PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
+    PreviewCardTrend.recalculate_ordered_rank
   end
 
   def request_review
     PreviewCardTrend.pluck('distinct language').flat_map do |language|
-      score_at_threshold  = PreviewCardTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
-      preview_card_trends = PreviewCardTrend.where(language: language, allowed: false).joins(:preview_card)
+      score_at_threshold  = PreviewCardTrend.where(language: language).allowed.by_rank.ranked_below(options[:review_threshold]).first&.score || 0
+      preview_card_trends = PreviewCardTrend.where(language: language).not_allowed.joins(:preview_card)
 
       preview_card_trends.filter_map do |trend|
         preview_card = trend.preview_card
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index c47fb8427b..87261beeb1 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -74,12 +74,12 @@ class Trends::Statuses < Trends::Base
 
     # Now that all trends have up-to-date scores, and all the ones below the threshold have
     # been removed, we can recalculate their positions
-    StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
+    StatusTrend.recalculate_ordered_rank
   end
 
   def request_review
     StatusTrend.pluck('distinct language').flat_map do |language|
-      score_at_threshold = StatusTrend.where(language: language, allowed: true).order(rank: :desc).where('rank <= ?', options[:review_threshold]).first&.score || 0
+      score_at_threshold = StatusTrend.where(language: language, allowed: true).by_rank.ranked_below(options[:review_threshold]).first&.score || 0
       status_trends      = StatusTrend.where(language: language, allowed: false).joins(:status).includes(status: :account)
 
       status_trends.filter_map do |trend|
@@ -106,13 +106,23 @@ class Trends::Statuses < Trends::Base
   private
 
   def eligible?(status)
-    status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
+    (status.searchability.nil? || status.compute_searchability == 'public') &&
+      (status.public_visibility? || status.public_unlisted_visibility?) &&
+      status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? &&
+      status.spoiler_text.blank? && (!status.sensitive? || status.media_attachments.none?) &&
+      !status.reply? && valid_locale?(status.language) && !domain_blocked?(status)
+  end
+
+  def domain_blocked?(status)
+    return false if status.account.local?
+
+    DomainBlock.block_trends?(status.account.domain)
   end
 
   def calculate_scores(statuses, at_time)
     items = statuses.map do |status|
       expected  = 1.0
-      observed  = (status.reblogs_count + status.favourites_count).to_f
+      observed  = (status.reblogs_count + status.favourites_count + (status.emoji_reaction_accounts_count * 0.8)).to_f
 
       score = if expected > observed || observed < options[:threshold]
                 0
diff --git a/app/models/trends/tags.rb b/app/models/trends/tags.rb
index 9315329906..5b00fca7ec 100644
--- a/app/models/trends/tags.rb
+++ b/app/models/trends/tags.rb
@@ -12,7 +12,8 @@ class Trends::Tags < Trends::Base
   }
 
   def register(status, at_time = Time.now.utc)
-    return unless !status.reblog? && status.public_visibility? && !status.account.silenced?
+    return unless !status.reblog? && %i(public public_unlisted login).include?(status.visibility.to_sym) && !status.account.silenced?
+    return if !status.account.local? && DomainBlock.block_trends?(status.account.domain)
 
     status.tags.each do |tag|
       add(tag, status.account_id, at_time) if tag.usable?
diff --git a/app/models/user.rb b/app/models/user.rb
index 0c589f8068..738171ae3e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,7 +14,6 @@
 #  sign_in_count             :integer          default(0), not null
 #  current_sign_in_at        :datetime
 #  last_sign_in_at           :datetime
-#  admin                     :boolean          default(FALSE), not null
 #  confirmation_token        :string
 #  confirmed_at              :datetime
 #  confirmation_sent_at      :datetime
@@ -29,7 +28,6 @@
 #  otp_backup_codes          :string           is an Array
 #  account_id                :bigint(8)        not null
 #  disabled                  :boolean          default(FALSE), not null
-#  moderator                 :boolean          default(FALSE), not null
 #  invite_id                 :bigint(8)
 #  chosen_languages          :string           is an Array
 #  created_by_application_id :bigint(8)
@@ -41,6 +39,7 @@
 #  role_id                   :bigint(8)
 #  settings                  :text
 #  time_zone                 :string
+#  otp_secret                :string
 #
 
 class User < ApplicationRecord
@@ -51,10 +50,13 @@ class User < ApplicationRecord
     last_sign_in_ip
     skip_sign_in_token
     filtered_languages
+    admin
+    moderator
   )
 
   include LanguagesHelper
   include Redisable
+  include RegistrationLimitationHelper
   include User::HasSettings
   include User::LdapAuthenticable
   include User::Omniauthable
@@ -69,9 +71,13 @@ class User < ApplicationRecord
   # to check their feed
   ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
 
+  REACTION_DECK_MAX = 256
+
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Rails.configuration.x.otp_secret
 
+  include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
+
   devise :two_factor_backupable,
          otp_number_of_backup_codes: 10
 
@@ -95,6 +101,8 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
   validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
+  validates :email, presence: true, email_address: true
+
   validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
@@ -107,14 +115,16 @@ class User < ApplicationRecord
   validates :confirm_password, absence: true, on: :create
   validate :validate_role_elevation
 
+  scope :account_not_suspended, -> { joins(:account).merge(Account.without_suspended) }
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }
   scope :enabled, -> { where(disabled: false) }
   scope :disabled, -> { where(disabled: true) }
-  scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
-  scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
+  scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
+  scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
+  scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
 
@@ -127,11 +137,6 @@ class User < ApplicationRecord
   normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
   normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
 
-  # This avoids a deprecation warning from Rails 5.1
-  # It seems possible that a future release of devise-two-factor will
-  # handle this itself, and this can be removed from our User class.
-  attribute :otp_secret
-
   has_many :session_activations, dependent: :destroy
 
   delegate :can?, to: :role
@@ -149,6 +154,10 @@ class User < ApplicationRecord
     end
   end
 
+  def self.skip_mx_check?
+    Rails.env.local?
+  end
+
   def role
     if role_id.nil?
       UserRole.everyone
@@ -186,37 +195,18 @@ class User < ApplicationRecord
   end
 
   def confirm
-    new_user      = !confirmed?
-    self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
+    raise Mastodon::ValidationError, I18n.t('devise.registrations.sign_up_failed_because_reach_limit') if !invited? && reach_registrations_limit?
 
-    super
-
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
-
-      if approved?
-        prepare_new_user!
-      else
-        notify_staff_about_pending_account!
-      end
+    wrap_email_confirmation do
+      super
     end
   end
 
-  def confirm!
-    new_user      = !confirmed?
-    self.approved = true if open_registrations?
-
-    skip_confirmation!
-    save!
-
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
-
-      prepare_new_user! if approved?
+  # Mark current email as confirmed, bypassing Devise
+  def mark_email_as_confirmed!
+    wrap_email_confirmation do
+      skip_confirmation!
+      save!
     end
   end
 
@@ -359,6 +349,16 @@ class User < ApplicationRecord
     Doorkeeper::AccessToken.by_resource_owner(self).in_batches do |batch|
       batch.update_all(revoked_at: Time.now.utc)
       Web::PushSubscription.where(access_token_id: batch).delete_all
+
+      # Revoke each access token for the Streaming API, since `update_all``
+      # doesn't trigger ActiveRecord Callbacks:
+      # TODO: #28793 Combine into a single topic
+      payload = Oj.dump(event: :kill)
+      redis.pipelined do |pipeline|
+        batch.ids.each do |id|
+          pipeline.publish("timeline:access_token:#{id}", payload)
+        end
+      end
     end
   end
 
@@ -426,18 +426,57 @@ class User < ApplicationRecord
     end
   end
 
+  def grant_approval_on_confirmation?
+    # Re-check approval on confirmation if the server has switched to open registrations
+    open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
+  end
+
+  def wrap_email_confirmation
+    new_user      = !confirmed?
+    self.approved = true if grant_approval_on_confirmation?
+
+    yield
+
+    if new_user
+      # Avoid extremely unlikely race condition when approving and confirming
+      # the user at the same time
+      reload unless approved?
+
+      if approved?
+        prepare_new_user!
+      else
+        notify_staff_about_pending_account!
+      end
+    end
+  end
+
   def sign_up_from_ip_requires_approval?
-    !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
+    sign_up_ip.present? && IpBlock.severity_sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
   end
 
   def sign_up_email_requires_approval?
-    return false unless email.present? || unconfirmed_email.present?
+    return false if email.blank?
 
-    EmailDomainBlock.requires_approval?(email.presence || unconfirmed_email, attempt_ip: sign_up_ip)
+    _, domain = email.split('@', 2)
+    return false if domain.blank?
+
+    records = []
+
+    # Doing this conditionally is not very satisfying, but this is consistent
+    # with the MX records validations we do and keeps the specs tractable.
+    unless self.class.skip_mx_check?
+      Resolv::DNS.open do |dns|
+        dns.timeouts = 5
+
+        records = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }.compact_blank
+      end
+    end
+
+    EmailDomainBlock.requires_approval?(records + [domain], attempt_ip: sign_up_ip)
   end
 
   def open_registrations?
-    Setting.registrations_mode == 'open'
+    Setting.registrations_mode == 'open' && registrations_in_time?
   end
 
   def external?
@@ -456,8 +495,9 @@ class User < ApplicationRecord
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
     ActivityTracker.record('activity:logins', id)
-    UserMailer.welcome(self).deliver_later
+    UserMailer.welcome(self).deliver_later(wait: 1.hour)
     TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
+    reset_registration_limit_caches!
   end
 
   def prepare_returning_user!
@@ -484,7 +524,7 @@ class User < ApplicationRecord
   end
 
   def validate_email_dns?
-    email_changed? && !external? && !Rails.env.local?
+    email_changed? && !external? && !self.class.skip_mx_check?
   end
 
   def validate_role_elevation
diff --git a/app/models/user_invite_request.rb b/app/models/user_invite_request.rb
index 2b76c88b94..9dd6775166 100644
--- a/app/models/user_invite_request.rb
+++ b/app/models/user_invite_request.rb
@@ -12,6 +12,8 @@
 #
 
 class UserInviteRequest < ApplicationRecord
+  TEXT_SIZE_LIMIT = 420
+
   belongs_to :user, inverse_of: :invite_request
-  validates :text, presence: true, length: { maximum: 420 }
+  validates :text, presence: true, length: { maximum: TEXT_SIZE_LIMIT }
 end
diff --git a/app/models/user_ip.rb b/app/models/user_ip.rb
index 38287c2a60..a6da2c0740 100644
--- a/app/models/user_ip.rb
+++ b/app/models/user_ip.rb
@@ -10,11 +10,11 @@
 #
 
 class UserIp < ApplicationRecord
+  include DatabaseViewRecord
+
   self.primary_key = :user_id
 
   belongs_to :user
 
-  def readonly?
-    true
-  end
+  scope :by_latest_used, -> { order(used_at: :desc) }
 end
diff --git a/app/models/user_role.rb b/app/models/user_role.rb
index 89354da542..16d40d4a79 100644
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@@ -36,13 +36,19 @@ class UserRole < ApplicationRecord
     manage_roles: (1 << 17),
     manage_user_access: (1 << 18),
     delete_user_data: (1 << 19),
+    manage_sensitive_words: (1 << 29),
+    manage_ng_words: (1 << 30),
   }.freeze
 
+  EVERYONE_ROLE_ID = -99
+  NOBODY_POSITION = -1
+
   module Flags
     NONE = 0
     ALL  = FLAGS.values.reduce(&:|)
 
-    DEFAULT = FLAGS[:invite_users]
+    DEFAULT = 0
+    EVERYONE_ALLOWED = FLAGS[:invite_users]
 
     CATEGORIES = {
       invites: %i(
@@ -61,6 +67,8 @@ class UserRole < ApplicationRecord
         manage_blocks
         manage_taxonomies
         manage_invites
+        manage_ng_words
+        manage_sensitive_words
       ).freeze,
 
       administration: %i(
@@ -94,18 +102,21 @@ class UserRole < ApplicationRecord
 
   before_validation :set_position
 
-  scope :assignable, -> { where.not(id: -99).order(position: :asc) }
+  scope :assignable, -> { where.not(id: EVERYONE_ROLE_ID).order(position: :asc) }
+  scope :highlighted, -> { where(highlighted: true) }
+  scope :with_color, -> { where.not(color: [nil, '']) }
+  scope :providing_styles, -> { highlighted.with_color }
 
   has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
 
   def self.nobody
-    @nobody ||= UserRole.new(permissions: Flags::NONE, position: -1)
+    @nobody ||= UserRole.new(permissions: Flags::NONE, position: NOBODY_POSITION)
   end
 
   def self.everyone
-    UserRole.find(-99)
+    UserRole.find(EVERYONE_ROLE_ID)
   rescue ActiveRecord::RecordNotFound
-    UserRole.create!(id: -99, permissions: Flags::DEFAULT)
+    UserRole.create!(id: EVERYONE_ROLE_ID, permissions: Flags::DEFAULT)
   end
 
   def self.that_can(*any_of_privileges)
@@ -113,7 +124,7 @@ class UserRole < ApplicationRecord
   end
 
   def everyone?
-    id == -99
+    id == EVERYONE_ROLE_ID
   end
 
   def nobody?
@@ -168,7 +179,7 @@ class UserRole < ApplicationRecord
   end
 
   def set_position
-    self.position = -1 if everyone?
+    self.position = NOBODY_POSITION if everyone?
   end
 
   def validate_own_role_edition
@@ -187,6 +198,6 @@ class UserRole < ApplicationRecord
   end
 
   def validate_dangerous_permissions
-    errors.add(:permissions_as_keys, :dangerous) if everyone? && Flags::DEFAULT & permissions != permissions
+    errors.add(:permissions_as_keys, :dangerous) if everyone? && Flags::EVERYONE_ALLOWED & permissions != permissions
   end
 end
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 030cbec4d8..23ccb7eba2 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -11,12 +11,44 @@ class UserSettings
   setting :aggregate_reblogs, default: true
   setting :theme, default: -> { ::Setting.theme }
   setting :noindex, default: -> { ::Setting.noindex }
+  setting :translatable_private, default: false
+  setting :bio_markdown, default: false
+  setting :discoverable_local, default: false
+  setting :hide_statuses_count, default: false
+  setting :hide_following_count, default: false
+  setting :hide_followers_count, default: false
   setting :show_application, default: true
   setting :default_language, default: nil
   setting :default_sensitive, default: false
-  setting :default_privacy, default: nil, in: %w(public unlisted private)
+  setting :default_privacy, default: nil, in: %w(public public_unlisted login unlisted private)
+  setting :stay_privacy, default: false
+  setting :default_reblog_privacy, default: nil
+  setting :disabled_visibilities, default: %w()
+  setting :default_searchability, default: :direct, in: %w(public private direct limited public_unlisted)
+  setting :default_searchability_of_search, default: :public, in: %w(public private direct limited)
+  setting :use_public_index, default: true
+  setting :reverse_search_quote, default: false
+  setting :disallow_unlisted_public_searchability, default: false
+  setting :public_post_to_unlisted, default: false
+  setting :reject_public_unlisted_subscription, default: false
+  setting :reject_unlisted_subscription, default: false
+  setting :reaction_deck, default: nil
+  setting :stop_emoji_reaction_streaming, default: false
+  setting :emoji_reaction_streaming_notify_impl2, default: false
+  setting :emoji_reaction_policy, default: :allow, in: %w(allow outside_only followers_only following_only mutuals_only block)
+  setting :slip_local_emoji_reaction, default: false
+  setting :dtl_force_visibility, default: :unchange, in: %w(unchange public public_unlisted unlisted)
+  setting :dtl_force_searchability, default: :unchange, in: %w(unchange public public_unlisted)
+  setting :dtl_force_subscribable, default: false
+  setting :lock_follow_from_bot, default: false
+  setting :allow_quote, default: true
+  setting :reject_send_limited_to_suspects, default: false
 
   setting_inverse_alias :indexable, :noindex
+  setting_inverse_alias :show_statuses_count, :hide_statuses_count
+  setting_inverse_alias :show_following_count, :hide_following_count
+  setting_inverse_alias :show_followers_count, :hide_followers_count
+  setting_inverse_array :enabled_visibilities, :disabled_visibilities, %w(public public_unlisted login unlisted private mutual circle reply personal direct)
 
   namespace :web do
     setting :advanced_layout, default: false
@@ -24,14 +56,35 @@ class UserSettings
     setting :use_blurhash, default: true
     setting :use_pending_items, default: false
     setting :use_system_font, default: false
+    setting :bookmark_category_needed, default: false
     setting :disable_swiping, default: false
     setting :delete_modal, default: true
+    setting :enable_dtl_menu, default: false
+    setting :hide_recent_emojis, default: false
+    setting :enable_emoji_reaction, default: true
+    setting :show_emoji_reaction_on_timeline, default: true
     setting :reblog_modal, default: false
-    setting :unfollow_modal, default: true
     setting :reduce_motion, default: false
     setting :expand_content_warnings, default: false
     setting :display_media, default: 'default', in: %w(default show_all hide_all)
-    setting :auto_play, default: false
+    setting :display_media_expand, default: true
+    setting :auto_play, default: true
+    setting :simple_timeline_menu, default: false
+    setting :boost_menu, default: false
+    setting :show_quote_in_home, default: true
+    setting :show_quote_in_public, default: false
+    setting :show_relationships, default: true
+    setting :hide_blocking_quote, default: true
+    setting :hide_emoji_reaction_unavailable_server, default: false
+    setting :hide_quote_unavailable_server, default: false
+    setting :hide_status_reference_unavailable_server, default: false
+    setting :hide_favourite_menu, default: false
+    setting :hide_emoji_reaction_count, default: false
+
+    setting_inverse_alias :'web.show_blocking_quote', :'web.hide_blocking_quote'
+    setting_inverse_alias :'web.show_emoji_reaction_count', :'web.hide_emoji_reaction_count'
+    setting_inverse_alias :'web.show_favourite_menu', :'web.hide_favourite_menu'
+    setting_inverse_alias :'web.show_recent_emojis', :'web.hide_recent_emojis'
   end
 
   namespace :notification_emails do
@@ -42,6 +95,7 @@ class UserSettings
     setting :follow_request, default: true
     setting :report, default: true
     setting :pending_account, default: true
+    setting :pending_friend_server, default: true
     setting :trends, default: true
     setting :appeal, default: true
     setting :software_updates, default: 'critical', in: %w(none critical patch all)
diff --git a/app/models/user_settings/dsl.rb b/app/models/user_settings/dsl.rb
index 4282830711..a77581718f 100644
--- a/app/models/user_settings/dsl.rb
+++ b/app/models/user_settings/dsl.rb
@@ -14,6 +14,10 @@ module UserSettings::DSL
       @definitions[key] = @definitions[original_key].inverse_of(key)
     end
 
+    def setting_inverse_array(key, original_key, reverse_array)
+      @definitions[key] = @definitions[original_key].array_inverse_of(key, reverse_array)
+    end
+
     def namespace(key, &block)
       @definitions ||= {}
 
diff --git a/app/models/user_settings/namespace.rb b/app/models/user_settings/namespace.rb
index b8f7e092e8..bceaf05d3a 100644
--- a/app/models/user_settings/namespace.rb
+++ b/app/models/user_settings/namespace.rb
@@ -18,4 +18,12 @@ class UserSettings::Namespace
       @definitions[s.key] = s
     end
   end
+
+  def setting_inverse_alias(key, original_key)
+    @definitions[key] = @definitions[original_key].inverse_of(key)
+  end
+
+  def setting_inverse_array(key, original_key, reverse_array)
+    @definitions[key] = @definitions[original_key].array_inverse_of(key, reverse_array)
+  end
 end
diff --git a/app/models/user_settings/setting.rb b/app/models/user_settings/setting.rb
index 1ab6cbeab2..0aab0da689 100644
--- a/app/models/user_settings/setting.rb
+++ b/app/models/user_settings/setting.rb
@@ -15,6 +15,12 @@ class UserSettings::Setting
     self
   end
 
+  def array_inverse_of(name, arr)
+    @inverse_of_array = name.to_sym
+    @reverse_array = arr
+    self
+  end
+
   def value_for(name, original_value)
     value = begin
       if original_value.nil?
@@ -24,13 +30,21 @@ class UserSettings::Setting
       end
     end
 
+    value = value.compact_blank if value.is_a?(Array)
+
     if !@inverse_of.nil? && @inverse_of == name.to_sym
       !value
+    elsif !@inverse_of_array.nil? && @inverse_of_array == name.to_sym
+      reverse_array(value)
     else
       value
     end
   end
 
+  def reverse_array(value)
+    @reverse_array.clone.filter { |v| value.exclude?(v) }
+  end
+
   def default_value
     if @default_value.respond_to?(:call)
       @default_value.call
@@ -39,7 +53,13 @@ class UserSettings::Setting
     end
   end
 
+  def array_type?
+    default_value.is_a?(Array) || default_value == []
+  end
+
   def type
+    return ActiveRecord::Type.lookup(:string, array: true) if array_type?
+
     case default_value
     when TrueClass, FalseClass
       ActiveModel::Type::Boolean.new
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index a744af81de..dd9d043e01 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -64,4 +64,12 @@ class AccountPolicy < ApplicationPolicy
   def review?
     role.can?(:manage_taxonomies)
   end
+
+  def approve_remote?
+    role.can?(:manage_users) && record.remote_pending
+  end
+
+  def reject_remote?
+    role.can?(:manage_users) && record.remote_pending
+  end
 end
diff --git a/app/policies/admin/status_policy.rb b/app/policies/admin/status_policy.rb
index e9379c25ec..7a42d5bf28 100644
--- a/app/policies/admin/status_policy.rb
+++ b/app/policies/admin/status_policy.rb
@@ -12,7 +12,7 @@ class Admin::StatusPolicy < ApplicationPolicy
   end
 
   def show?
-    role.can?(:manage_reports, :manage_users) && (record.public_visibility? || record.unlisted_visibility? || record.reported? || viewable_through_normal_policy?)
+    role.can?(:manage_reports, :manage_users) && (record.public_visibility? || record.unlisted_visibility? || record.public_unlisted_visibility? || record.reported? || viewable_through_normal_policy?)
   end
 
   def destroy?
diff --git a/app/policies/friend_server_policy.rb b/app/policies/friend_server_policy.rb
new file mode 100644
index 0000000000..c84b2b825a
--- /dev/null
+++ b/app/policies/friend_server_policy.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FriendServerPolicy < ApplicationPolicy
+  def update?
+    role.can?(:manage_federation)
+  end
+end
diff --git a/app/policies/ng_words_policy.rb b/app/policies/ng_words_policy.rb
new file mode 100644
index 0000000000..0ba640a895
--- /dev/null
+++ b/app/policies/ng_words_policy.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class NgWordsPolicy < ApplicationPolicy
+  def show?
+    role.can?(:manage_ng_words)
+  end
+
+  def create?
+    role.can?(:manage_ng_words)
+  end
+end
diff --git a/app/policies/sensitive_words_policy.rb b/app/policies/sensitive_words_policy.rb
new file mode 100644
index 0000000000..0812aa9751
--- /dev/null
+++ b/app/policies/sensitive_words_policy.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SensitiveWordsPolicy < ApplicationPolicy
+  def show?
+    role.can?(:manage_sensitive_words)
+  end
+
+  def create?
+    role.can?(:manage_sensitive_words)
+  end
+end
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 322d3aec5c..f846a9bc75 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -1,24 +1,40 @@
 # frozen_string_literal: true
 
 class StatusPolicy < ApplicationPolicy
-  def initialize(current_account, record, preloaded_relations = {})
+  def initialize(current_account, record, preloaded_relations = {}, preloaded_status_relations = {})
     super(current_account, record)
 
     @preloaded_relations = preloaded_relations
+    @preloaded_status_relations = preloaded_status_relations
   end
 
+  delegate :reply?, :expired?, to: :record
+
   def show?
     return false if author.unavailable?
 
     if requires_mention?
       owned? || mention_exists?
+    elsif login?
+      owned? || !current_account.nil?
     elsif private?
       owned? || following_author? || mention_exists?
     else
-      current_account.nil? || (!author_blocking? && !author_blocking_domain?)
+      current_account.nil? || (!author_blocking? && !author_blocking_domain? && !server_blocking_domain?)
     end
   end
 
+  def show_mentioned_users?
+    record.limited_visibility? ? owned_conversation? : owned?
+  end
+
+  def show_activity?
+    return false unless show?
+    return true unless record.expires?
+
+    following_author_domain?
+  end
+
   def reblog?
     !requires_mention? && (!private? || owned?) && show? && !blocking_author?
   end
@@ -27,6 +43,14 @@ class StatusPolicy < ApplicationPolicy
     show? && !blocking_author?
   end
 
+  def emoji_reaction?
+    show? && !blocking_author?
+  end
+
+  def quote?
+    %i(public public_unlisted unlisted).include?(record.visibility.to_sym) && show? && !blocking_author?
+  end
+
   def destroy?
     owned?
   end
@@ -47,17 +71,30 @@ class StatusPolicy < ApplicationPolicy
     author.id == current_account&.id
   end
 
+  def owned_conversation?
+    record.conversation&.local? &&
+      (record.conversation.ancestor_status.nil? ? owned? : record.conversation.ancestor_status.account_id == current_account&.id)
+  end
+
   def private?
     record.private_visibility?
   end
 
+  def login?
+    record.login_visibility?
+  end
+
+  def public?
+    record.public_visibility? || record.public_unlisted_visibility?
+  end
+
   def mention_exists?
     return false if current_account.nil?
 
     if record.mentions.loaded?
       record.mentions.any? { |mention| mention.account_id == current_account.id }
     else
-      record.mentions.where(account: current_account).exists?
+      record.mentions.exists?(account: current_account)
     end
   end
 
@@ -85,7 +122,31 @@ class StatusPolicy < ApplicationPolicy
     @preloaded_relations[:following] ? @preloaded_relations[:following][author.id] : current_account.following?(author)
   end
 
+  def following_author_domain?
+    return false if current_account.nil?
+
+    author.followed_by_domain?(current_account.domain, record.created_at)
+  end
+
   def author
     record.account
   end
+
+  def server_blocking_domain?
+    if record.reblog? && record.reblog.local?
+      server_blocking_domain_of_status?(record) || server_blocking_domain_of_status?(record.reblog)
+    else
+      server_blocking_domain_of_status?(record)
+    end
+  end
+
+  def server_blocking_domain_of_status?(status)
+    @domain_block ||= DomainBlock.find_by(domain: current_account&.domain)
+    if @domain_block
+      (@domain_block.detect_invalid_subscription && status.sending_maybe_compromised_privacy?) ||
+        (@domain_block.reject_send_sensitive && status.sending_sensitive?)
+    else
+      false
+    end
+  end
 end
diff --git a/app/presenters/activitypub/activity_presenter.rb b/app/presenters/activitypub/activity_presenter.rb
index 38e8527e8e..eb7186592f 100644
--- a/app/presenters/activitypub/activity_presenter.rb
+++ b/app/presenters/activitypub/activity_presenter.rb
@@ -4,14 +4,14 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
   attributes :id, :type, :actor, :published, :to, :cc, :virtual_object
 
   class << self
-    def from_status(status, allow_inlining: true)
+    def from_status(status, use_bearcap: true, allow_inlining: true, for_misskey: false, for_friend: false)
       new.tap do |presenter|
         presenter.id        = ActivityPub::TagManager.instance.activity_uri_for(status)
         presenter.type      = status.reblog? ? 'Announce' : 'Create'
         presenter.actor     = ActivityPub::TagManager.instance.uri_for(status.account)
         presenter.published = status.created_at
-        presenter.to        = ActivityPub::TagManager.instance.to(status)
-        presenter.cc        = ActivityPub::TagManager.instance.cc(status)
+        presenter.to        = for_friend ? ActivityPub::TagManager.instance.to_for_friend(status) : ActivityPub::TagManager.instance.to(status)
+        presenter.cc        = for_misskey ? ActivityPub::TagManager.instance.cc_for_misskey(status) : ActivityPub::TagManager.instance.cc(status)
 
         presenter.virtual_object = begin
           if status.reblog?
@@ -20,6 +20,8 @@ class ActivityPub::ActivityPresenter < ActiveModelSerializers::Model
             else
               ActivityPub::TagManager.instance.uri_for(status.proper)
             end
+          elsif status.limited_visibility? && use_bearcap
+            "bear:?#{{ u: ActivityPub::TagManager.instance.uri_for(status.proper), t: status.capability_tokens.first.token }.to_query}"
           else
             status.proper
           end
diff --git a/app/presenters/annual_reports_presenter.rb b/app/presenters/annual_reports_presenter.rb
new file mode 100644
index 0000000000..001e1d37b0
--- /dev/null
+++ b/app/presenters/annual_reports_presenter.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AnnualReportsPresenter
+  alias read_attribute_for_serialization send
+
+  attr_reader :annual_reports
+
+  def initialize(annual_reports)
+    @annual_reports = annual_reports
+  end
+
+  def accounts
+    @accounts ||= Account.where(id: @annual_reports.flat_map(&:account_ids)).includes(:account_stat, :moved_to_account, user: :role)
+  end
+
+  def statuses
+    @statuses ||= Status.where(id: @annual_reports.flat_map(&:status_ids)).with_includes
+  end
+
+  def self.model_name
+    @model_name ||= ActiveModel::Name.new(self)
+  end
+end
diff --git a/app/presenters/emoji_reaction_accounts_presenter.rb b/app/presenters/emoji_reaction_accounts_presenter.rb
new file mode 100644
index 0000000000..1b683f3366
--- /dev/null
+++ b/app/presenters/emoji_reaction_accounts_presenter.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class EmojiReactionAccountsPresenter
+  attr_reader :permitted_account_ids
+
+  def initialize(statuses, current_account_id = nil, **_options)
+    @current_account_id = current_account_id
+
+    statuses            = statuses.compact
+    status_ids          = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
+    emoji_reactions     = EmojiReaction.where(status_id: status_ids)
+    account_ids         = emoji_reactions.pluck(:account_id).uniq
+
+    permitted_accounts  = Account.where(id: account_ids, silenced_at: nil, suspended_at: nil)
+    if current_account_id.present?
+      account = Account.find(current_account_id)
+      permitted_accounts = permitted_accounts.where('domain IS NULL OR domain NOT IN (?)', account.excluded_from_timeline_domains) if account.present? && account.excluded_from_timeline_domains.size.positive?
+    end
+
+    @permitted_account_ids = permitted_accounts.pluck(:id)
+  end
+end
diff --git a/app/presenters/initial_state_presenter.rb b/app/presenters/initial_state_presenter.rb
index 222cc8566c..0d2b6bfdef 100644
--- a/app/presenters/initial_state_presenter.rb
+++ b/app/presenters/initial_state_presenter.rb
@@ -2,7 +2,7 @@
 
 class InitialStatePresenter < ActiveModelSerializers::Model
   attributes :settings, :push_subscription, :token,
-             :current_account, :admin, :owner, :text, :visibility,
+             :current_account, :admin, :owner, :text, :visibility, :searchability,
              :disabled_account, :moved_to_account, :critical_updates_pending
 
   def role
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 25df4d85aa..92415a6903 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -81,4 +81,16 @@ class InstancePresenter < ActiveModelSerializers::Model
   def mascot
     @mascot ||= Rails.cache.fetch('site_uploads/mascot') { SiteUpload.find_by(var: 'mascot') }
   end
+
+  def favicon
+    return @favicon if defined?(@favicon)
+
+    @favicon ||= Rails.cache.fetch('site_uploads/favicon') { SiteUpload.find_by(var: 'favicon') }
+  end
+
+  def app_icon
+    return @app_icon if defined?(@app_icon)
+
+    @app_icon ||= Rails.cache.fetch('site_uploads/app_icon') { SiteUpload.find_by(var: 'app_icon') }
+  end
 end
diff --git a/app/presenters/oauth_metadata_presenter.rb b/app/presenters/oauth_metadata_presenter.rb
new file mode 100644
index 0000000000..546503bfcc
--- /dev/null
+++ b/app/presenters/oauth_metadata_presenter.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class OauthMetadataPresenter < ActiveModelSerializers::Model
+  include RoutingHelper
+
+  attributes :issuer, :authorization_endpoint, :token_endpoint,
+             :revocation_endpoint, :scopes_supported,
+             :response_types_supported, :response_modes_supported,
+             :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :service_documentation, :app_registration_endpoint
+
+  def issuer
+    root_url
+  end
+
+  def service_documentation
+    'https://docs.joinmastodon.org/'
+  end
+
+  def authorization_endpoint
+    oauth_authorization_url
+  end
+
+  def token_endpoint
+    oauth_token_url
+  end
+
+  # As the api_v1_apps route doesn't technically conform to the specification
+  # for OAuth 2.0 Dynamic Client Registration defined in RFC 7591 we use a
+  # non-standard property for now to indicate the mastodon specific registration
+  # endpoint. See: https://datatracker.ietf.org/doc/html/rfc7591
+  def app_registration_endpoint
+    api_v1_apps_url
+  end
+
+  def revocation_endpoint
+    oauth_revoke_url
+  end
+
+  def scopes_supported
+    doorkeeper.scopes
+  end
+
+  def response_types_supported
+    doorkeeper.authorization_response_types
+  end
+
+  def response_modes_supported
+    doorkeeper.authorization_response_flows.flat_map(&:response_mode_matches).uniq
+  end
+
+  def grant_types_supported
+    grant_types_supported = doorkeeper.grant_flows.dup
+    grant_types_supported << 'refresh_token' if doorkeeper.refresh_token_enabled?
+    grant_types_supported
+  end
+
+  def token_endpoint_auth_methods_supported
+    %w(client_secret_basic client_secret_post)
+  end
+
+  private
+
+  def doorkeeper
+    @doorkeeper ||= Doorkeeper.configuration
+  end
+end
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index 5d53040fb2..e42bdb560f 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -1,32 +1,41 @@
 # frozen_string_literal: true
 
 class StatusRelationshipsPresenter
-  PINNABLE_VISIBILITIES = %w(public unlisted private).freeze
+  PINNABLE_VISIBILITIES = %w(public public_unlisted unlisted login private).freeze
 
-  attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map,
-              :bookmarks_map, :filters_map, :attributes_map
+  attr_reader :reblogs_map, :favourites_map, :mutes_map, :pins_map, :blocks_map, :domain_blocks_map,
+              :bookmarks_map, :filters_map, :attributes_map, :emoji_reaction_allows_map
 
   def initialize(statuses, current_account_id = nil, **options)
+    @current_account_id = current_account_id
+
     if current_account_id.nil?
-      @reblogs_map    = {}
-      @favourites_map = {}
-      @bookmarks_map  = {}
-      @mutes_map      = {}
-      @pins_map       = {}
-      @filters_map    = {}
+      @reblogs_map         = {}
+      @favourites_map      = {}
+      @bookmarks_map       = {}
+      @mutes_map           = {}
+      @blocks_map          = {}
+      @domain_blocks_map   = {}
+      @pins_map            = {}
+      @filters_map         = {}
+      @emoji_reaction_allows_map = nil
     else
-      statuses            = statuses.compact
+      statuses = statuses.compact
+      statuses += statuses.filter_map(&:quote)
       status_ids          = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
       conversation_ids    = statuses.filter_map(&:conversation_id).uniq
       pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && PINNABLE_VISIBILITIES.include?(s.visibility) }
 
-      @filters_map     = build_filters_map(statuses, current_account_id).merge(options[:filters_map] || {})
-      @reblogs_map     = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
-      @favourites_map  = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
-      @bookmarks_map   = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
-      @mutes_map       = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
-      @pins_map        = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
-      @attributes_map  = options[:attributes_map] || {}
+      @filters_map       = build_filters_map(statuses, current_account_id).merge(options[:filters_map] || {})
+      @reblogs_map       = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
+      @favourites_map    = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
+      @bookmarks_map     = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
+      @mutes_map         = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
+      @blocks_map        = Status.blocks_map(statuses.map(&:account_id), current_account_id).merge(options[:blocks_map] || {})
+      @domain_blocks_map = Status.domain_blocks_map(statuses.filter_map { |status| status.account.domain }.uniq, current_account_id).merge(options[:domain_blocks_map] || {})
+      @pins_map          = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
+      @emoji_reaction_allows_map = Status.emoji_reaction_allows_map(status_ids, current_account_id).merge(options[:emoji_reaction_allows_map] || {})
+      @attributes_map = options[:attributes_map] || {}
     end
   end
 
@@ -36,7 +45,7 @@ class StatusRelationshipsPresenter
     active_filters = CustomFilter.cached_filters_for(current_account_id)
 
     @filters_map = statuses.each_with_object({}) do |status, h|
-      filter_matches = CustomFilter.apply_cached_filters(active_filters, status)
+      filter_matches = CustomFilter.apply_cached_filters(active_filters, status, following: following?(status.account_id))
 
       unless filter_matches.empty?
         h[status.id] = filter_matches
@@ -44,4 +53,14 @@ class StatusRelationshipsPresenter
       end
     end
   end
+
+  def following?(other_account_id)
+    return false if @current_account_id.nil?
+
+    @account ||= Account.find(@current_account_id)
+    return false unless @account
+
+    @following_map ||= @account.following.pluck(:id)
+    @following_map.include?(other_account_id)
+  end
 end
diff --git a/app/serializers/activitypub/activity_for_friend_serializer.rb b/app/serializers/activitypub/activity_for_friend_serializer.rb
new file mode 100644
index 0000000000..b968e00fa6
--- /dev/null
+++ b/app/serializers/activitypub/activity_for_friend_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActivityForFriendSerializer < ActivityPub::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      ActivityPub::NoteForFriendSerializer
+    when 'DeliverToDeviceService::EncryptedMessage'
+      ActivityPub::EncryptedMessageSerializer
+    else
+      super
+    end
+  end
+
+  attributes :id, :type, :actor, :published, :to, :cc
+
+  has_one :virtual_object, key: :object
+
+  def published
+    object.published.iso8601
+  end
+end
diff --git a/app/serializers/activitypub/activity_for_misskey_serializer.rb b/app/serializers/activitypub/activity_for_misskey_serializer.rb
new file mode 100644
index 0000000000..039bb63d57
--- /dev/null
+++ b/app/serializers/activitypub/activity_for_misskey_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActivityForMisskeySerializer < ActivityPub::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      ActivityPub::NoteForMisskeySerializer
+    when 'DeliverToDeviceService::EncryptedMessage'
+      ActivityPub::EncryptedMessageSerializer
+    else
+      super
+    end
+  end
+
+  attributes :id, :type, :actor, :published, :to, :cc
+
+  has_one :virtual_object, key: :object
+
+  def published
+    object.published.iso8601
+  end
+end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 4ab48ff204..73fd17238e 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -7,14 +7,14 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   context :security
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
-                     :moved_to, :property_value, :discoverable, :olm, :suspended,
-                     :memorial, :indexable
+                     :moved_to, :property_value, :discoverable, :olm, :suspended, :searchable_by, :subscribable_by,
+                     :other_setting, :memorial, :indexable
 
   attributes :id, :type, :following, :followers,
              :inbox, :outbox, :featured, :featured_tags,
              :preferred_username, :name, :summary,
              :url, :manually_approves_followers,
-             :discoverable, :indexable, :published, :memorial
+             :discoverable, :indexable, :published, :memorial, :searchable_by, :subscribable_by, :other_setting
 
   has_one :public_key, serializer: ActivityPub::PublicKeySerializer
 
@@ -96,6 +96,14 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   end
 
   def discoverable
+    if object.local?
+      object.user&.setting_discoverable_local ? false : original_discoverable
+    else
+      original_discoverable
+    end
+  end
+
+  def original_discoverable
     object.unavailable? ? false : (object.discoverable || false)
   end
 
@@ -167,6 +175,25 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     object.created_at.midnight.iso8601
   end
 
+  def searchable_by
+    ActivityPub::TagManager.instance.account_searchable_by(object)
+  end
+
+  def subscribable_by
+    ActivityPub::TagManager.instance.subscribable_by(object)
+  end
+
+  def other_setting
+    config = object.public_settings
+    config.map do |k, v|
+      {
+        type: 'PropertyValue',
+        name: k,
+        value: v,
+      }
+    end
+  end
+
   class CustomEmojiSerializer < ActivityPub::EmojiSerializer
   end
 
diff --git a/app/serializers/activitypub/context_serializer.rb b/app/serializers/activitypub/context_serializer.rb
new file mode 100644
index 0000000000..a6a0bbb07f
--- /dev/null
+++ b/app/serializers/activitypub/context_serializer.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ActivityPub::ContextSerializer < ActivityPub::Serializer
+  include RoutingHelper
+
+  attributes :id, :type, :inbox
+
+  def id
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+
+  def type
+    'Group'
+  end
+
+  def inbox
+    return '' if object.ancestor_status.nil?
+
+    account_inbox_url(object.ancestor_status.account)
+  end
+end
diff --git a/app/serializers/activitypub/emoji_reaction_serializer.rb b/app/serializers/activitypub/emoji_reaction_serializer.rb
new file mode 100644
index 0000000000..dce27a47ce
--- /dev/null
+++ b/app/serializers/activitypub/emoji_reaction_serializer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class ActivityPub::EmojiReactionSerializer < ActivityPub::Serializer
+  attributes :id, :type, :actor, :content
+  attribute :virtual_object, key: :object
+
+  has_many :virtual_tags, key: :tag, unless: -> { object.custom_emoji.nil? }
+
+  def id
+    [ActivityPub::TagManager.instance.uri_for(object.account), '#emoji_reactions/', object.id].join
+  end
+
+  def type
+    'Like'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def virtual_object
+    ActivityPub::TagManager.instance.uri_for(object.status)
+  end
+
+  def content
+    object.custom_emoji.nil? ? object.name : ":#{object.name}:"
+  end
+
+  def virtual_tags
+    [object.custom_emoji]
+  end
+
+  class CustomEmojiSerializer < ActivityPub::EmojiSerializer
+  end
+end
diff --git a/app/serializers/activitypub/emoji_serializer.rb b/app/serializers/activitypub/emoji_serializer.rb
index 4dc38f3ea6..24c21c3ccf 100644
--- a/app/serializers/activitypub/emoji_serializer.rb
+++ b/app/serializers/activitypub/emoji_serializer.rb
@@ -3,9 +3,11 @@
 class ActivityPub::EmojiSerializer < ActivityPub::Serializer
   include RoutingHelper
 
-  context_extensions :emoji
+  context_extensions :emoji, :license, :keywords
 
-  attributes :id, :type, :name, :updated
+  attributes :id, :type, :name, :keywords, :is_sensitive, :updated
+
+  attribute :license, if: -> { object.license.present? }
 
   has_one :icon, serializer: ActivityPub::ImageSerializer
 
@@ -17,6 +19,10 @@ class ActivityPub::EmojiSerializer < ActivityPub::Serializer
     'Emoji'
   end
 
+  def keywords
+    object.aliases
+  end
+
   def icon
     object.image
   end
diff --git a/app/serializers/activitypub/note_for_friend_serializer.rb b/app/serializers/activitypub/note_for_friend_serializer.rb
new file mode 100644
index 0000000000..fdceaf421c
--- /dev/null
+++ b/app/serializers/activitypub/note_for_friend_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ActivityPub::NoteForFriendSerializer < ActivityPub::NoteSerializer
+  def to
+    ActivityPub::TagManager.instance.to_for_friend(object)
+  end
+
+  def searchable_by
+    ActivityPub::TagManager.instance.searchable_by_for_friend(object)
+  end
+end
diff --git a/app/serializers/activitypub/note_for_misskey_serializer.rb b/app/serializers/activitypub/note_for_misskey_serializer.rb
new file mode 100644
index 0000000000..fb0adf0809
--- /dev/null
+++ b/app/serializers/activitypub/note_for_misskey_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ActivityPub::NoteForMisskeySerializer < ActivityPub::NoteSerializer
+  def cc
+    ActivityPub::TagManager.instance.cc_for_misskey(object)
+  end
+end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 27e058199d..fe7be2eae9 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -3,22 +3,27 @@
 class ActivityPub::NoteSerializer < ActivityPub::Serializer
   include FormattingHelper
 
-  context_extensions :atom_uri, :conversation, :sensitive, :voters_count
+  context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :searchable_by, :references, :limited_scope, :quote_uri
 
   attributes :id, :type, :summary,
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :searchable_by, :context
 
   attribute :content
   attribute :content_map, if: :language?
   attribute :updated, if: :edited?
+  attribute :limited_scope, if: :limited_visibility?
+
+  attribute :quote_uri, if: :quote?
+  attribute :misskey_quote, key: :_misskey_quote, if: :quote?
 
   has_many :virtual_attachments, key: :attachment
   has_many :virtual_tags, key: :tag
 
   has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
+  has_one :references, serializer: ActivityPub::CollectionSerializer
 
   has_many :poll_options, key: :one_of, if: :poll_and_not_multiple?
   has_many :poll_options, key: :any_of, if: :poll_and_multiple?
@@ -48,6 +53,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     { object.language => content }
   end
 
+  def context
+    ActivityPub::TagManager.instance.uri_for(object.conversation)
+  end
+
   def replies
     replies = object.self_replies(5).pluck(:id, :uri)
     last_id = replies.last&.first
@@ -64,10 +73,28 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     )
   end
 
+  def references
+    refs = object.references.reorder(id: :asc).take(5).pluck(:id, :uri)
+    last_id = refs.last&.first
+
+    ActivityPub::CollectionPresenter.new(
+      type: :unordered,
+      id: ActivityPub::TagManager.instance.references_uri_for(object),
+      first: ActivityPub::CollectionPresenter.new(
+        type: :unordered,
+        part_of: ActivityPub::TagManager.instance.references_uri_for(object),
+        items: refs.map(&:second),
+        next: last_id ? ActivityPub::TagManager.instance.references_uri_for(object, page: true, min_id: last_id) : ActivityPub::TagManager.instance.references_uri_for(object, page: true, only_other_accounts: true)
+      )
+    )
+  end
+
   def language?
     object.language.present?
   end
 
+  delegate :limited_visibility?, to: :object
+
   delegate :edited?, to: :object
 
   def in_reply_to
@@ -113,7 +140,19 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def virtual_tags
-    object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
+    object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis + virtual_tags_of_quote
+  end
+
+  def virtual_tags_of_quote
+    return [] unless object.quote?
+
+    [
+      {
+        type: 'Link',
+        mediaType: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+        href: quote_uri,
+      },
+    ]
   end
 
   def atom_uri
@@ -138,10 +177,32 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
   end
 
+  def searchable_by
+    ActivityPub::TagManager.instance.searchable_by(object)
+  end
+
+  def limited_scope
+    ActivityPub::TagManager.instance.limited_scope(object)
+  end
+
   def local?
     object.account.local?
   end
 
+  delegate :quote?, to: :object
+
+  def quote_post
+    @quote_post ||= object.quote
+  end
+
+  def quote_uri
+    ActivityPub::TagManager.instance.uri_for(quote_post)
+  end
+
+  def misskey_quote
+    quote_uri
+  end
+
   def poll_options
     object.preloadable_poll.loaded_options
   end
diff --git a/app/serializers/activitypub/undo_emoji_reaction_serializer.rb b/app/serializers/activitypub/undo_emoji_reaction_serializer.rb
new file mode 100644
index 0000000000..7bba3c88b8
--- /dev/null
+++ b/app/serializers/activitypub/undo_emoji_reaction_serializer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ActivityPub::UndoEmojiReactionSerializer < ActivityPub::Serializer
+  attributes :id, :type, :actor, :content
+
+  has_one :object, serializer: ActivityPub::EmojiReactionSerializer
+
+  def id
+    [ActivityPub::TagManager.instance.uri_for(object.account), '#emoji_reactions/', object.id, '/undo'].join
+  end
+
+  def type
+    'Undo'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def content
+    object.custom_emoji.nil? ? object.name : ":#{object.name}:"
+  end
+end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 9f7921461d..36089dc177 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -2,6 +2,8 @@
 
 class InitialStateSerializer < ActiveModel::Serializer
   include RoutingHelper
+  include DtlHelper
+  include RegistrationLimitationHelper
 
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings,
@@ -17,23 +19,47 @@ class InitialStateSerializer < ActiveModel::Serializer
 
     if object.current_account
       store[:me]                = object.current_account.id.to_s
-      store[:unfollow_modal]    = object_account_user.setting_unfollow_modal
       store[:boost_modal]       = object_account_user.setting_boost_modal
       store[:delete_modal]      = object_account_user.setting_delete_modal
       store[:auto_play_gif]     = object_account_user.setting_auto_play_gif
       store[:display_media]     = object_account_user.setting_display_media
-      store[:expand_spoilers]   = object_account_user.setting_expand_spoilers
+      store[:display_media_expand] = object_account_user.setting_display_media_expand
+      store[:expand_spoilers] = object_account_user.setting_expand_spoilers
+      store[:enable_emoji_reaction] = object_account_user.setting_enable_emoji_reaction && Setting.enable_emoji_reaction
+      store[:enable_dtl_menu]   = object_account_user.setting_enable_dtl_menu
       store[:reduce_motion]     = object_account_user.setting_reduce_motion
       store[:disable_swiping]   = object_account_user.setting_disable_swiping
       store[:advanced_layout]   = object_account_user.setting_advanced_layout
       store[:use_blurhash]      = object_account_user.setting_use_blurhash
       store[:use_pending_items] = object_account_user.setting_use_pending_items
       store[:show_trends]       = Setting.trends && object_account_user.setting_trends
+      store[:bookmark_category_needed] = object_account_user.setting_bookmark_category_needed
+      store[:simple_timeline_menu] = object_account_user.setting_simple_timeline_menu
+      store[:boost_menu] = object_account_user.setting_boost_menu
+      store[:hide_items] = [
+        object_account_user.setting_hide_favourite_menu ? 'favourite_menu' : nil,
+        object_account_user.setting_hide_recent_emojis ? 'recent_emojis' : nil,
+        object_account_user.setting_hide_blocking_quote ? 'blocking_quote' : nil,
+        object_account_user.setting_hide_emoji_reaction_unavailable_server ? 'emoji_reaction_unavailable_server' : nil,
+        object_account_user.setting_hide_quote_unavailable_server ? 'quote_unavailable_server' : nil,
+        object_account_user.setting_hide_status_reference_unavailable_server ? 'status_reference_unavailable_server' : nil,
+        object_account_user.setting_hide_emoji_reaction_count ? 'emoji_reaction_count' : nil,
+        object_account_user.setting_show_emoji_reaction_on_timeline ? nil : 'emoji_reaction_on_timeline',
+        object_account_user.setting_show_quote_in_home ? nil : 'quote_in_home',
+        object_account_user.setting_show_quote_in_public ? nil : 'quote_in_public',
+        object_account_user.setting_show_relationships ? nil : 'relationships',
+      ].compact
+      store[:enabled_visibilities] = enabled_visibilities
+      store[:featured_tags] = object.current_account.featured_tags.pluck(:name)
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media
       store[:reduce_motion] = Setting.reduce_motion
       store[:use_blurhash]  = Setting.use_blurhash
+      store[:enable_emoji_reaction] = Setting.enable_emoji_reaction
+      store[:hide_items] = [
+        Setting.enable_emoji_reaction ? nil : 'emoji_reaction_on_timeline',
+      ].compact
     end
 
     store[:disabled_account_id] = object.disabled_account.id.to_s if object.disabled_account
@@ -48,10 +74,12 @@ class InitialStateSerializer < ActiveModel::Serializer
     store = {}
 
     if object.current_account
-      store[:me]                = object.current_account.id.to_s
-      store[:default_privacy]   = object.visibility || object_account_user.setting_default_privacy
-      store[:default_sensitive] = object_account_user.setting_default_sensitive
-      store[:default_language]  = object_account_user.preferred_posting_language
+      store[:me]                    = object.current_account.id.to_s
+      store[:default_privacy]       = object.visibility || object_account_user.setting_default_privacy
+      store[:stay_privacy]          = object_account_user.setting_stay_privacy
+      store[:default_searchability] = object.searchability || object_account_user.setting_default_searchability
+      store[:default_sensitive]     = object_account_user.setting_default_sensitive
+      store[:default_language]      = object_account_user.preferred_posting_language
     end
 
     store[:text] = object.text if object.text
@@ -84,6 +112,13 @@ class InitialStateSerializer < ActiveModel::Serializer
     LanguagesHelper::SUPPORTED_LOCALES.map { |(key, value)| [key, value[0], value[1]] }
   end
 
+  def enabled_visibilities
+    vs = object_account_user.setting_enabled_visibilities
+    vs -= %w(public_unlisted) unless Setting.enable_public_unlisted_visibility
+    vs -= %w(public) unless Setting.enable_public_visibility
+    vs
+  end
+
   private
 
   def default_meta_store
@@ -92,11 +127,14 @@ class InitialStateSerializer < ActiveModel::Serializer
       activity_api_enabled: Setting.activity_api_enabled,
       admin: object.admin&.id&.to_s,
       domain: Addressable::IDNA.to_unicode(instance_presenter.domain),
+      dtl_tag: dtl_enabled? ? dtl_tag_name : nil,
+      enable_local_timeline: Setting.enable_local_timeline,
       limited_federation_mode: Rails.configuration.x.limited_federation_mode,
       locale: I18n.locale,
       mascot: instance_presenter.mascot&.file&.url,
       profile_directory: Setting.profile_directory,
-      registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
+      registrations_open: Setting.registrations_mode != 'none' && !reach_registrations_limit? && !Rails.configuration.x.single_user_mode,
+      registrations_reach_limit: Setting.registrations_mode != 'none' && reach_registrations_limit?,
       repository: Mastodon::Version.repository,
       search_enabled: Chewy.enabled?,
       single_user_mode: Rails.configuration.x.single_user_mode,
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 501bb788e7..a39fb5ef54 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -1,21 +1,10 @@
 # frozen_string_literal: true
 
 class ManifestSerializer < ActiveModel::Serializer
+  include ApplicationHelper
   include RoutingHelper
   include ActionView::Helpers::TextHelper
 
-  ICON_SIZES = %w(
-    36
-    48
-    72
-    96
-    144
-    192
-    256
-    384
-    512
-  ).freeze
-
   attributes :id, :name, :short_name,
              :icons, :theme_color, :background_color,
              :display, :start_url, :scope,
@@ -37,9 +26,12 @@ class ManifestSerializer < ActiveModel::Serializer
   end
 
   def icons
-    ICON_SIZES.map do |size|
+    SiteUpload::ANDROID_ICON_SIZES.map do |size|
+      src = app_icon_path(size.to_i)
+      src = URI.join(root_url, src).to_s if src.present?
+
       {
-        src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
+        src: src || frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
         sizes: "#{size}x#{size}",
         type: 'image/png',
         purpose: 'any maskable',
diff --git a/app/serializers/node_info/serializer.rb b/app/serializers/node_info/serializer.rb
index 3920b3ee42..cf52518ad0 100644
--- a/app/serializers/node_info/serializer.rb
+++ b/app/serializers/node_info/serializer.rb
@@ -2,6 +2,8 @@
 
 class NodeInfo::Serializer < ActiveModel::Serializer
   include RoutingHelper
+  include KmyblueCapabilitiesHelper
+  include RegistrationLimitationHelper
 
   attributes :version, :software, :protocols, :services, :usage, :open_registrations, :metadata
 
@@ -10,7 +12,7 @@ class NodeInfo::Serializer < ActiveModel::Serializer
   end
 
   def software
-    { name: 'mastodon', version: Mastodon::Version.to_s }
+    { name: 'kmyblue', version: Mastodon::Version.to_s }
   end
 
   def services
@@ -34,13 +36,18 @@ class NodeInfo::Serializer < ActiveModel::Serializer
   end
 
   def open_registrations
-    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+    Setting.registrations_mode != 'none' && !reach_registrations_limit? && !Rails.configuration.x.single_user_mode
   end
 
   def metadata
     {
       nodeName: Setting.site_title,
       nodeDescription: Setting.site_short_description,
+      features: capabilities_for_nodeinfo,
+      upstream: {
+        name: 'Mastodon',
+        version: Mastodon::Version.to_s_of_mastodon,
+      },
     }
   end
 
diff --git a/app/serializers/oauth_metadata_serializer.rb b/app/serializers/oauth_metadata_serializer.rb
new file mode 100644
index 0000000000..5f3dc7b87e
--- /dev/null
+++ b/app/serializers/oauth_metadata_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class OauthMetadataSerializer < ActiveModel::Serializer
+  attributes :issuer, :authorization_endpoint, :token_endpoint,
+             :revocation_endpoint, :scopes_supported,
+             :response_types_supported, :response_modes_supported,
+             :grant_types_supported, :token_endpoint_auth_methods_supported,
+             :service_documentation, :app_registration_endpoint
+end
diff --git a/app/serializers/rest/account_relationship_severance_event_serializer.rb b/app/serializers/rest/account_relationship_severance_event_serializer.rb
new file mode 100644
index 0000000000..751bc103c2
--- /dev/null
+++ b/app/serializers/rest/account_relationship_severance_event_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::AccountRelationshipSeveranceEventSerializer < ActiveModel::Serializer
+  attributes :id, :type, :purged, :target_name, :followers_count, :following_count, :created_at
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 354d384464..b7520bbfb4 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -7,16 +7,16 @@ class REST::AccountSerializer < ActiveModel::Serializer
   # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes
 
   attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :indexable, :group, :created_at,
-             :note, :url, :uri, :avatar, :avatar_static, :header, :header_static,
-             :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections
+             :note, :url, :uri, :avatar, :avatar_static, :header, :header_static, :subscribable, :emoji_reaction_available_server,
+             :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections, :other_settings, :noindex,
+             :server_features
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
 
-  has_many :emojis, serializer: REST::CustomEmojiSerializer
+  has_many :emojis, serializer: REST::CustomEmojiSlimSerializer
 
   attribute :suspended, if: :suspended?
   attribute :silenced, key: :limited, if: :silenced?
-  attribute :noindex, if: :local?
 
   attribute :memorial, if: :memorial?
 
@@ -112,10 +112,22 @@ class REST::AccountSerializer < ActiveModel::Serializer
     object.unavailable? ? false : object.discoverable
   end
 
+  def subscribable
+    object.all_subscribable?
+  end
+
   def indexable
     object.unavailable? ? false : object.indexable
   end
 
+  def emoji_reaction_available_server
+    server_features[:emoji_reaction]
+  end
+
+  def server_features
+    InstanceInfo.available_features(object.domain)
+  end
+
   def moved_to_account
     object.unavailable? ? nil : AccountDecorator.new(object.moved_to_account)
   end
@@ -149,7 +161,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def noindex
-    object.user_prefers_noindex?
+    object.noindex?
   end
 
   delegate :suspended?, :silenced?, :local?, :memorial?, to: :object
@@ -157,4 +169,20 @@ class REST::AccountSerializer < ActiveModel::Serializer
   def moved_and_not_nested?
     object.moved?
   end
+
+  def statuses_count
+    object.public_statuses_count
+  end
+
+  def followers_count
+    object.public_followers_count
+  end
+
+  def following_count
+    object.public_following_count
+  end
+
+  def other_settings
+    object.suspended? ? {} : object.public_settings_for_local
+  end
 end
diff --git a/app/serializers/rest/account_warning_serializer.rb b/app/serializers/rest/account_warning_serializer.rb
new file mode 100644
index 0000000000..a0ef341d25
--- /dev/null
+++ b/app/serializers/rest/account_warning_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::AccountWarningSerializer < ActiveModel::Serializer
+  attributes :id, :action, :text, :status_ids, :created_at
+
+  has_one :target_account, serializer: REST::AccountSerializer
+  has_one :appeal, serializer: REST::AppealSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def status_ids
+    object&.status_ids&.map(&:to_s)
+  end
+end
diff --git a/app/serializers/rest/admin/domain_block_serializer.rb b/app/serializers/rest/admin/domain_block_serializer.rb
index b955d008a6..6a496e2b80 100644
--- a/app/serializers/rest/admin/domain_block_serializer.rb
+++ b/app/serializers/rest/admin/domain_block_serializer.rb
@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
-  attributes :id, :domain, :created_at, :severity,
-             :reject_media, :reject_reports,
+  attributes :id, :domain, :digest, :created_at, :severity,
+             :reject_media, :reject_favourite, :reject_reports,
+             :reject_reply_exclude_followers, :reject_send_sensitive, :block_trends,
+             :reject_hashtag, :reject_straight_follow, :reject_new_follow, :reject_friend, :detect_invalid_subscription,
              :private_comment, :public_comment, :obfuscate
 
   def id
     object.id.to_s
   end
+
+  def digest
+    object.domain_digest
+  end
 end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 23b2fa514b..d1a011425d 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -9,7 +9,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   attribute :read, if: :current_user?
 
   has_many :mentions
-  has_many :statuses
+  has_many :statuses, serializer: REST::StatusSerializer
   has_many :tags, serializer: REST::StatusSerializer::TagSerializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
   has_many :reactions, serializer: REST::ReactionSerializer
@@ -23,7 +23,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   end
 
   def read
-    object.announcement_mutes.where(account: current_user.account).exists?
+    object.announcement_mutes.exists?(account: current_user.account)
   end
 
   def content
@@ -49,16 +49,4 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
       object.pretty_acct
     end
   end
-
-  class StatusSerializer < ActiveModel::Serializer
-    attributes :id, :url
-
-    def id
-      object.id.to_s
-    end
-
-    def url
-      ActivityPub::TagManager.instance.url_for(object)
-    end
-  end
 end
diff --git a/app/serializers/rest/annual_report_serializer.rb b/app/serializers/rest/annual_report_serializer.rb
new file mode 100644
index 0000000000..1fb5ddb5c1
--- /dev/null
+++ b/app/serializers/rest/annual_report_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportSerializer < ActiveModel::Serializer
+  attributes :year, :data, :schema_version
+end
diff --git a/app/serializers/rest/annual_reports_serializer.rb b/app/serializers/rest/annual_reports_serializer.rb
new file mode 100644
index 0000000000..ea9572be1b
--- /dev/null
+++ b/app/serializers/rest/annual_reports_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportsSerializer < ActiveModel::Serializer
+  has_many :annual_reports, serializer: REST::AnnualReportSerializer
+  has_many :accounts, serializer: REST::AccountSerializer
+  has_many :statuses, serializer: REST::StatusSerializer
+end
diff --git a/app/serializers/rest/antenna_serializer.rb b/app/serializers/rest/antenna_serializer.rb
new file mode 100644
index 0000000000..c0d03c7282
--- /dev/null
+++ b/app/serializers/rest/antenna_serializer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class REST::AntennaSerializer < ActiveModel::Serializer
+  attributes :id, :title, :stl, :ltl, :insert_feeds, :with_media_only, :ignore_reblog, :accounts_count, :domains_count, :tags_count, :keywords_count
+
+  class ListSerializer < ActiveModel::Serializer
+    attributes :id, :title
+
+    def id
+      object.id.to_s
+    end
+  end
+
+  has_one :list, serializer: ListSerializer, optional: true
+
+  def id
+    object.id.to_s
+  end
+
+  def accounts_count
+    object.antenna_accounts.count
+  end
+
+  def domains_count
+    object.antenna_domains.count
+  end
+
+  def tags_count
+    object.antenna_tags.count
+  end
+
+  def keywords_count
+    object.keywords&.size || 0
+  end
+end
diff --git a/app/serializers/rest/appeal_serializer.rb b/app/serializers/rest/appeal_serializer.rb
new file mode 100644
index 0000000000..a24cabc272
--- /dev/null
+++ b/app/serializers/rest/appeal_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::AppealSerializer < ActiveModel::Serializer
+  attributes :text, :state
+
+  def state
+    if object.approved?
+      'approved'
+    elsif object.rejected?
+      'rejected'
+    else
+      'pending'
+    end
+  end
+end
diff --git a/app/serializers/rest/bookmark_category_serializer.rb b/app/serializers/rest/bookmark_category_serializer.rb
new file mode 100644
index 0000000000..86e538e4c6
--- /dev/null
+++ b/app/serializers/rest/bookmark_category_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::BookmarkCategorySerializer < ActiveModel::Serializer
+  attributes :id, :title
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/circle_serializer.rb b/app/serializers/rest/circle_serializer.rb
new file mode 100644
index 0000000000..f2c9c510fc
--- /dev/null
+++ b/app/serializers/rest/circle_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::CircleSerializer < ActiveModel::Serializer
+  attributes :id, :title
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/context_serializer.rb b/app/serializers/rest/context_serializer.rb
index 44515c85d7..21032228f5 100644
--- a/app/serializers/rest/context_serializer.rb
+++ b/app/serializers/rest/context_serializer.rb
@@ -3,4 +3,5 @@
 class REST::ContextSerializer < ActiveModel::Serializer
   has_many :ancestors,   serializer: REST::StatusSerializer
   has_many :descendants, serializer: REST::StatusSerializer
+  has_many :references, serializer: REST::StatusSerializer
 end
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
index 77ccf8c869..d178438023 100644
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -10,6 +10,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
 
     {
       privacy: user.setting_default_privacy,
+      searchability: user.setting_default_searchability,
       sensitive: user.setting_default_sensitive,
       language: user.setting_default_language,
       note: object.note,
diff --git a/app/serializers/rest/custom_emoji_serializer.rb b/app/serializers/rest/custom_emoji_serializer.rb
index 33da69da53..e4986adf14 100644
--- a/app/serializers/rest/custom_emoji_serializer.rb
+++ b/app/serializers/rest/custom_emoji_serializer.rb
@@ -1,27 +1,18 @@
 # frozen_string_literal: true
 
-class REST::CustomEmojiSerializer < ActiveModel::Serializer
+class REST::CustomEmojiSerializer < REST::CustomEmojiSlimSerializer
   include RoutingHelper
 
   # Please update `app/javascript/mastodon/api_types/custom_emoji.ts` when making changes to the attributes
 
-  attributes :shortcode, :url, :static_url, :visible_in_picker
+  attribute :aliases
+  attribute :license
 
-  attribute :category, if: :category_loaded?
-
-  def url
-    full_asset_url(object.image.url)
-  end
-
-  def static_url
-    full_asset_url(object.image.url(:static))
-  end
-
-  def category
-    object.category.name
-  end
-
-  def category_loaded?
-    object.association(:category).loaded? && object.category.present?
+  def aliases
+    if object.respond_to?(:aliases) && object.aliases.present?
+      object.aliases.compact_blank
+    else
+      []
+    end
   end
 end
diff --git a/app/serializers/rest/custom_emoji_slim_serializer.rb b/app/serializers/rest/custom_emoji_slim_serializer.rb
new file mode 100644
index 0000000000..6b17c15a03
--- /dev/null
+++ b/app/serializers/rest/custom_emoji_slim_serializer.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class REST::CustomEmojiSlimSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  # Please update `app/javascript/mastodon/api_types/custom_emoji.ts` when making changes to the attributes
+
+  attributes :shortcode, :url, :static_url, :visible_in_picker
+
+  attribute :category, if: :category_loaded?
+  attribute :width, if: :width?
+  attribute :height, if: :height?
+  attribute :sensitive, if: :sensitive?
+  attribute :is_sensitive, if: :sensitive?
+
+  def url
+    full_asset_url(object.image.url)
+  end
+
+  def static_url
+    full_asset_url(object.image.url(:static))
+  end
+
+  def category
+    object.category.name
+  end
+
+  def category_loaded?
+    object.association(:category).loaded? && object.category.present?
+  end
+
+  def width?
+    object.respond_to?(:image_width) || object.respond_to?(:width)
+  end
+
+  def height?
+    object.respond_to?(:image_height) || object.respond_to?(:height)
+  end
+
+  def width
+    object.respond_to?(:image_width) ? object.image_width : object.width
+  end
+
+  def height
+    object.respond_to?(:image_height) ? object.image_height : object.height
+  end
+
+  def sensitive?
+    object.respond_to?(:is_sensitive)
+  end
+
+  def sensitive
+    object.is_sensitive
+  end
+
+  def is_sensitive # rubocop:disable Naming/PredicateName
+    sensitive
+  end
+end
diff --git a/app/serializers/rest/domain_block_serializer.rb b/app/serializers/rest/domain_block_serializer.rb
index 678463e13b..ad352db619 100644
--- a/app/serializers/rest/domain_block_serializer.rb
+++ b/app/serializers/rest/domain_block_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::DomainBlockSerializer < ActiveModel::Serializer
-  attributes :domain, :digest, :severity, :comment
+  attributes :domain, :digest, :severity, :severity_ex, :comment
 
   def domain
     object.public_domain
@@ -11,6 +11,14 @@ class REST::DomainBlockSerializer < ActiveModel::Serializer
     object.domain_digest
   end
 
+  def severity
+    object.severity == 'noop' ? 'silence' : object.severity
+  end
+
+  def severity_ex
+    object.severity
+  end
+
   def comment
     object.public_comment if instance_options[:with_comment]
   end
diff --git a/app/serializers/rest/emoji_reaction_account_serializer.rb b/app/serializers/rest/emoji_reaction_account_serializer.rb
new file mode 100644
index 0000000000..1925754077
--- /dev/null
+++ b/app/serializers/rest/emoji_reaction_account_serializer.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class REST::EmojiReactionAccountSerializer < ActiveModel::Serializer
+  include RoutingHelper
+  include FormattingHelper
+
+  attributes :id, :name
+
+  attribute :url, if: :custom_emoji?
+  attribute :static_url, if: :custom_emoji?
+  attribute :domain, if: :custom_emoji?
+
+  belongs_to :account, serializer: REST::AccountSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def url
+    full_asset_url(object.custom_emoji.image.url)
+  end
+
+  def static_url
+    full_asset_url(object.custom_emoji.image.url(:static))
+  end
+
+  def domain
+    object.custom_emoji.domain
+  end
+
+  def custom_emoji?
+    object.custom_emoji.present?
+  end
+end
diff --git a/app/serializers/rest/emoji_reaction_serializer.rb b/app/serializers/rest/emoji_reaction_serializer.rb
new file mode 100644
index 0000000000..fd58a125f5
--- /dev/null
+++ b/app/serializers/rest/emoji_reaction_serializer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class REST::EmojiReactionSerializer < ActiveModel::Serializer
+  attributes :name
+
+  attribute :count, if: :count?
+  attribute :url, if: :custom_emoji?
+  attribute :static_url, if: :custom_emoji?
+  attribute :domain, if: :custom_emoji?
+  attribute :account_ids, if: :account_ids?
+
+  def count?
+    object.respond_to?(:count)
+  end
+
+  def custom_emoji?
+    object.respond_to?(:url)
+  end
+
+  def account_ids?
+    object.respond_to?(:account_ids)
+  end
+end
diff --git a/app/serializers/rest/emoji_reactions_grouped_by_name_serializer.rb b/app/serializers/rest/emoji_reactions_grouped_by_name_serializer.rb
new file mode 100644
index 0000000000..48c70a4808
--- /dev/null
+++ b/app/serializers/rest/emoji_reactions_grouped_by_name_serializer.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class REST::EmojiReactionsGroupedByNameSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :name, :count
+
+  attribute :me, if: :current_user?
+  attribute :url, if: :custom_emoji?
+  attribute :static_url, if: :custom_emoji?
+  attribute :domain, if: :custom_emoji?
+  attribute :width, if: :custom_emoji?
+  attribute :height, if: :custom_emoji?
+  attribute :account_ids, if: :account_ids?
+
+  def current_user?
+    !current_user.nil?
+  end
+
+  def custom_emoji?
+    object.custom_emoji.present?
+  end
+
+  def account_ids?
+    object.respond_to?(:account_ids)
+  end
+
+  def url
+    full_asset_url(object.custom_emoji.image.url)
+  end
+
+  def static_url
+    full_asset_url(object.custom_emoji.image.url(:static))
+  end
+
+  def domain
+    object.custom_emoji.domain
+  end
+
+  def width
+    object.custom_emoji.image_width
+  end
+
+  def height
+    object.custom_emoji.image_height
+  end
+end
diff --git a/app/serializers/rest/filter_serializer.rb b/app/serializers/rest/filter_serializer.rb
index 8816dd8076..e4deae9d3d 100644
--- a/app/serializers/rest/filter_serializer.rb
+++ b/app/serializers/rest/filter_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::FilterSerializer < ActiveModel::Serializer
-  attributes :id, :title, :context, :expires_at, :filter_action
+  attributes :id, :title, :exclude_follows, :exclude_localusers, :with_quote, :context, :expires_at, :filter_action, :filter_action_ex
   has_many :keywords, serializer: REST::FilterKeywordSerializer, if: :rules_requested?
   has_many :statuses, serializer: REST::FilterStatusSerializer, if: :rules_requested?
 
@@ -12,4 +12,14 @@ class REST::FilterSerializer < ActiveModel::Serializer
   def rules_requested?
     instance_options[:rules_requested]
   end
+
+  def filter_action
+    return :warn if object.half_warn_action?
+
+    object.filter_action
+  end
+
+  def filter_action_ex
+    object.filter_action
+  end
 end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d7ed381e16..ff55350e8f 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -8,10 +8,12 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   end
 
   include RoutingHelper
+  include KmyblueCapabilitiesHelper
+  include RegistrationLimitationHelper
 
   attributes :domain, :title, :version, :source_url, :description,
              :usage, :thumbnail, :languages, :configuration,
-             :registrations
+             :registrations, :fedibird_capabilities
 
   has_one :contact, serializer: ContactSerializer
   has_many :rules, serializer: REST::RuleSerializer
@@ -28,7 +30,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       }
     else
       {
-        url: full_pack_url('media/images/preview.png'),
+        url: frontend_asset_url('images/preview.png'),
       }
     end
   end
@@ -54,11 +56,14 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
       accounts: {
         max_featured_tags: FeaturedTag::LIMIT,
+        max_pinned_statuses: StatusPinValidator::PIN_LIMIT,
       },
 
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
-        max_media_attachments: 4,
+        max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX,
+        max_media_attachments_with_poll: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL,
+        max_media_attachments_from_activitypub: MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
@@ -76,18 +81,39 @@ class REST::InstanceSerializer < ActiveModel::Serializer
         max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
         min_expiration: PollValidator::MIN_EXPIRATION,
         max_expiration: PollValidator::MAX_EXPIRATION,
+        allow_image: true,
       },
 
       translation: {
         enabled: TranslationService.configured?,
       },
+
+      emoji_reactions: {
+        max_reactions: EmojiReaction::EMOJI_REACTION_LIMIT,
+        max_reactions_per_account: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
+        max_reactions_per_remote_account: EmojiReaction::EMOJI_REACTION_PER_REMOTE_ACCOUNT_LIMIT,
+      },
+
+      reaction_deck: {
+        max_emojis: User::REACTION_DECK_MAX,
+      },
+
+      reactions: {
+        max_reactions: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
+      },
+
+      # https://github.com/mastodon/mastodon/pull/27009
+      search: {
+        enabled: Chewy.enabled?,
+      },
     }
   end
 
   def registrations
     {
       enabled: registrations_enabled?,
-      approval_required: Setting.registrations_mode == 'approved',
+      approval_required: Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?),
+      limit_reached: Setting.registrations_mode != 'none' && reach_registrations_limit?,
       message: registrations_enabled? ? nil : registrations_message,
       url: ENV.fetch('SSO_ACCOUNT_SIGN_UP', nil),
     }
@@ -96,7 +122,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   private
 
   def registrations_enabled?
-    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+    Setting.registrations_mode != 'none' && !reach_registrations_limit? && !Rails.configuration.x.single_user_mode
   end
 
   def registrations_message
diff --git a/app/serializers/rest/list_serializer.rb b/app/serializers/rest/list_serializer.rb
index 6a1b6ea3eb..2415fe7283 100644
--- a/app/serializers/rest/list_serializer.rb
+++ b/app/serializers/rest/list_serializer.rb
@@ -1,9 +1,23 @@
 # frozen_string_literal: true
 
 class REST::ListSerializer < ActiveModel::Serializer
-  attributes :id, :title, :replies_policy, :exclusive
+  attributes :id, :title, :replies_policy, :exclusive, :notify
 
   def id
     object.id.to_s
   end
+
+  class AntennaSerializer < ActiveModel::Serializer
+    attributes :id, :title, :stl
+
+    def id
+      object.id.to_s
+    end
+  end
+
+  has_many :antennas, serializer: AntennaSerializer
+
+  def antennas
+    object.antennas.where(insert_feeds: true)
+  end
 end
diff --git a/app/serializers/rest/marker_serializer.rb b/app/serializers/rest/marker_serializer.rb
index 2eaf3d5076..b0c1c553ff 100644
--- a/app/serializers/rest/marker_serializer.rb
+++ b/app/serializers/rest/marker_serializer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class REST::MarkerSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/markers.ts` when making changes to the attributes
+
   attributes :last_read_id, :version, :updated_at
 
   def last_read_id
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index f27dda832a..90a2a97275 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -3,6 +3,8 @@
 class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   include RoutingHelper
 
+  # Please update `app/javascript/mastodon/api_types/media_attachments.ts` when making changes to the attributes
+
   attributes :id, :type, :url, :preview_url,
              :remote_url, :preview_remote_url, :text_url, :meta,
              :description, :blurhash
diff --git a/app/serializers/rest/notification_policy_serializer.rb b/app/serializers/rest/notification_policy_serializer.rb
new file mode 100644
index 0000000000..a50ba9e66b
--- /dev/null
+++ b/app/serializers/rest/notification_policy_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationPolicySerializer < ActiveModel::Serializer
+  attributes :filter_not_following,
+             :filter_not_followers,
+             :filter_new_accounts,
+             :filter_private_mentions,
+             :summary
+
+  def summary
+    {
+      pending_requests_count: object.pending_requests_count.to_i,
+      pending_notifications_count: object.pending_notifications_count.to_i,
+    }
+  end
+end
diff --git a/app/serializers/rest/notification_request_serializer.rb b/app/serializers/rest/notification_request_serializer.rb
new file mode 100644
index 0000000000..581959d827
--- /dev/null
+++ b/app/serializers/rest/notification_request_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class REST::NotificationRequestSerializer < ActiveModel::Serializer
+  attributes :id, :created_at, :updated_at, :notifications_count
+
+  belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
+  belongs_to :last_status, serializer: REST::StatusSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def notifications_count
+    object.notifications_count.to_s
+  end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 137fc53dda..22f5e8e1aa 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -6,16 +6,40 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
   belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
   belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
+  belongs_to :emoji_reaction, if: :emoji_reaction_type?, serializer: REST::NotifyEmojiReactionSerializer
+  belongs_to :list, if: :list_status_type?, serializer: REST::ListSerializer
+  belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
+  belongs_to :account_warning, key: :moderation_warning, if: :moderation_warning_event?, serializer: REST::AccountWarningSerializer
 
   def id
     object.id.to_s
   end
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+    [:favourite, :emoji_reaction, :reaction, :reblog, :status_reference, :status, :list_status, :mention, :poll, :update].include?(object.type)
   end
 
   def report_type?
     object.type == :'admin.report'
   end
+
+  def emoji_reaction_type?
+    object.type == :emoji_reaction
+  end
+
+  def list_status_type?
+    object.type == :list_status
+  end
+
+  def list
+    object.list_status.list
+  end
+
+  def relationship_severance_event?
+    object.type == :severed_relationships
+  end
+
+  def moderation_warning_event?
+    object.type == :moderation_warning
+  end
 end
diff --git a/app/serializers/rest/notify_emoji_reaction_serializer.rb b/app/serializers/rest/notify_emoji_reaction_serializer.rb
new file mode 100644
index 0000000000..6f2b99a0c8
--- /dev/null
+++ b/app/serializers/rest/notify_emoji_reaction_serializer.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class REST::NotifyEmojiReactionSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :name
+
+  attribute :count
+  attribute :url, if: :custom_emoji?
+  attribute :static_url, if: :custom_emoji?
+  attribute :domain, if: :custom_emoji?
+  attribute :width, if: :width?
+  attribute :height, if: :height?
+  attribute :me
+
+  def count?
+    object.respond_to?(:count)
+  end
+
+  def count
+    count? ? object.count : 1
+  end
+
+  def custom_emoji?
+    object.respond_to?(:custom_emoji) && object.custom_emoji.present?
+  end
+
+  def account_ids?
+    object.respond_to?(:account_ids)
+  end
+
+  def url
+    full_asset_url(object.custom_emoji.image.url)
+  end
+
+  def static_url
+    full_asset_url(object.custom_emoji.image.url(:static))
+  end
+
+  def domain
+    object.custom_emoji.domain
+  end
+
+  def width?
+    custom_emoji? && (object.custom_emoji.respond_to?(:image_width) || object.custom_emoji.respond_to?(:width))
+  end
+
+  def height?
+    custom_emoji? && (object.custom_emoji.respond_to?(:image_height) || object.custom_emoji.respond_to?(:height))
+  end
+
+  def width
+    object.custom_emoji.respond_to?(:image_width) ? object.custom_emoji.image_width : object.custom_emoji.width
+  end
+
+  def height
+    object.custom_emoji.respond_to?(:image_height) ? object.custom_emoji.image_height : object.custom_emoji.height
+  end
+
+  def me
+    false
+  end
+end
diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb
index df6ebd0d44..2faa86032b 100644
--- a/app/serializers/rest/poll_serializer.rb
+++ b/app/serializers/rest/poll_serializer.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 class REST::PollSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/polls.ts` when making changes to the attributes
+
   attributes :id, :expires_at, :expired,
              :multiple, :votes_count, :voters_count
 
   has_many :loaded_options, key: :options
-  has_many :emojis, serializer: REST::CustomEmojiSerializer
+  has_many :emojis, serializer: REST::CustomEmojiSlimSerializer
 
   attribute :voted, if: :current_user?
   attribute :own_votes, if: :current_user?
diff --git a/app/serializers/rest/preferences_serializer.rb b/app/serializers/rest/preferences_serializer.rb
index e1c6544608..d98d5fcaec 100644
--- a/app/serializers/rest/preferences_serializer.rb
+++ b/app/serializers/rest/preferences_serializer.rb
@@ -2,6 +2,8 @@
 
 class REST::PreferencesSerializer < ActiveModel::Serializer
   attribute :posting_default_privacy, key: 'posting:default:visibility'
+  attribute :posting_stay_privacy, key: 'posting:keep:visibility'
+  attribute :posting_default_searchability, key: 'posting:default:searchability'
   attribute :posting_default_sensitive, key: 'posting:default:sensitive'
   attribute :posting_default_language, key: 'posting:default:language'
 
@@ -13,6 +15,14 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
     object.user.setting_default_privacy
   end
 
+  def posting_stay_privacy
+    object.user.setting_stay_privacy
+  end
+
+  def posting_default_searchability
+    object.user.setting_default_searchability
+  end
+
   def posting_default_sensitive
     object.user.setting_default_sensitive
   end
diff --git a/app/serializers/rest/rule_serializer.rb b/app/serializers/rest/rule_serializer.rb
index fc925925a9..9e2bcda15e 100644
--- a/app/serializers/rest/rule_serializer.rb
+++ b/app/serializers/rest/rule_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::RuleSerializer < ActiveModel::Serializer
-  attributes :id, :text
+  attributes :id, :text, :hint
 
   def id
     object.id.to_s
diff --git a/app/serializers/rest/status_edit_serializer.rb b/app/serializers/rest/status_edit_serializer.rb
index f7a48797d1..476e946a14 100644
--- a/app/serializers/rest/status_edit_serializer.rb
+++ b/app/serializers/rest/status_edit_serializer.rb
@@ -5,10 +5,10 @@ class REST::StatusEditSerializer < ActiveModel::Serializer
 
   has_one :account, serializer: REST::AccountSerializer
 
-  attributes :content, :spoiler_text, :sensitive, :created_at
+  attributes :content, :spoiler_text, :markdown, :sensitive, :created_at
 
   has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
-  has_many :emojis, serializer: REST::CustomEmojiSerializer
+  has_many :emojis, serializer: REST::CustomEmojiSlimSerializer
 
   attribute :poll, if: -> { object.poll_options.present? }
 
diff --git a/app/serializers/rest/status_internal_serializer.rb b/app/serializers/rest/status_internal_serializer.rb
new file mode 100644
index 0000000000..7a2cbf5746
--- /dev/null
+++ b/app/serializers/rest/status_internal_serializer.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class REST::StatusInternalSerializer < REST::StatusSerializer
+  attributes :reference_texts
+
+  def reference_texts
+    object.references.pluck(:text)
+  end
+end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index d32621541a..79f7adcf16 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -3,16 +3,22 @@
 class REST::StatusSerializer < ActiveModel::Serializer
   include FormattingHelper
 
+  # Please update `app/javascript/mastodon/api_types/statuses.ts` when making changes to the attributes
+
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
-             :sensitive, :spoiler_text, :visibility, :language,
-             :uri, :url, :replies_count, :reblogs_count,
-             :favourites_count, :edited_at
+             :sensitive, :spoiler_text, :visibility, :visibility_ex, :limited_scope, :language,
+             :uri, :url, :replies_count, :reblogs_count, :searchability, :markdown,
+             :status_reference_ids, :status_references_count, :status_referred_by_count,
+             :favourites_count, :emoji_reactions, :emoji_reactions_count, :reactions, :edited_at
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
   attribute :muted, if: :current_user?
   attribute :bookmarked, if: :current_user?
   attribute :pinned, if: :pinnable?
+  attribute :reactions, if: :reactions?
+  attribute :expires_at, if: :will_expire?
+  attribute :quote_id, if: :quote?
   has_many :filtered, serializer: REST::FilterResultSerializer, if: :current_user?
 
   attribute :content, unless: :source_requested?
@@ -25,11 +31,28 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
   has_many :tags
-  has_many :emojis, serializer: REST::CustomEmojiSerializer
+  has_many :emojis, serializer: REST::CustomEmojiSlimSerializer
 
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
   has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
 
+  class QuotedStatusSerializer < REST::StatusSerializer
+    attribute :quote_muted, if: :current_user?
+
+    def quote
+      nil
+    end
+
+    def quote_muted
+      if relationships
+        muted || relationships.blocks_map[object.account_id] || relationships.domain_blocks_map[object.account.domain] || false
+      else
+        muted || current_user.account.blocking?(object.account_id) || current_user.account.domain_blocking?(object.account.domain)
+      end
+    end
+  end
+  belongs_to :quote, if: :quote?, serializer: QuotedStatusSerializer, relationships: -> { relationships }
+
   def id
     object.id.to_s
   end
@@ -56,11 +79,25 @@ class REST::StatusSerializer < ActiveModel::Serializer
     # UX differences
     if object.limited_visibility?
       'private'
+    elsif object.public_unlisted_visibility? || object.login_visibility?
+      'public'
     else
       object.visibility
     end
   end
 
+  def visibility_ex
+    object.visibility
+  end
+
+  def limited_scope
+    !object.none_limited? && object.limited_visibility? ? object.limited_scope : nil
+  end
+
+  def searchability
+    object.compute_searchability_local
+  end
+
   def sensitive
     if current_user? && current_user.account_id == object.account_id
       object.sensitive
@@ -81,6 +118,14 @@ class REST::StatusSerializer < ActiveModel::Serializer
     ActivityPub::TagManager.instance.url_for(object)
   end
 
+  def status_reference_ids
+    @status_reference_ids = object.reference_objects.pluck(:target_status_id)
+  end
+
+  def status_references_count
+    status_reference_ids.size
+  end
+
   def reblogs_count
     relationships&.attributes_map&.dig(object.id, :reblogs_count) || object.reblogs_count
   end
@@ -97,6 +142,47 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 
+  def emoji_reactions
+    show_emoji_reaction? ? object.emoji_reactions_grouped_by_name(current_user&.account, permitted_account_ids: emoji_reaction_permitted_account_ids) : []
+  end
+
+  def emoji_reactions_count
+    if current_user&.account.nil?
+      return 0 unless Setting.enable_emoji_reaction
+
+      object.account.emoji_reaction_policy == :allow ? object.emoji_reactions_count : 0
+    else
+      show_emoji_reaction? ? object.emoji_reactions_count : 0
+    end
+  end
+
+  def show_emoji_reaction?
+    if relationships
+      return true if relationships.emoji_reaction_allows_map.nil?
+
+      relationships.emoji_reaction_allows_map[object.account_id] || false
+    else
+      object.account.show_emoji_reaction?(current_user&.account)
+    end
+  end
+
+  def reactions
+    emoji_reactions.tap do |rs|
+      rs.each do |emoji_reaction|
+        emoji_reaction['name'] = emoji_reaction['domain'].present? ? "#{emoji_reaction['name']}@#{emoji_reaction['domain']}" : emoji_reaction['name']
+        emoji_reaction.delete('account_ids')
+        emoji_reaction.delete('me')
+        emoji_reaction.delete('domain')
+      end
+    end
+  end
+
+  def quote_id
+    object.quote_of_id.to_s
+  end
+
+  delegate :quote?, to: :object
+
   def reblogged
     if relationships
       relationships.reblogs_map[object.id] || false
@@ -141,7 +227,11 @@ class REST::StatusSerializer < ActiveModel::Serializer
     current_user? &&
       current_user.account_id == object.account_id &&
       !object.reblog? &&
-      %w(public unlisted private).include?(object.visibility)
+      %w(public unlisted public_unlisted login private).include?(object.visibility)
+  end
+
+  def reactions?
+    current_user? && current_user.setting_emoji_reaction_streaming_notify_impl2
   end
 
   def source_requested?
@@ -152,12 +242,24 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.active_mentions.to_a.sort_by(&:id)
   end
 
+  def will_expire?
+    object.scheduled_expiration_status.present?
+  end
+
+  def expires_at
+    object.scheduled_expiration_status.scheduled_at
+  end
+
   private
 
   def relationships
     instance_options && instance_options[:relationships]
   end
 
+  def emoji_reaction_permitted_account_ids
+    current_user.present? && instance_options && instance_options[:emoji_reaction_permitted_account_ids]&.permitted_account_ids
+  end
+
   class ApplicationSerializer < ActiveModel::Serializer
     attributes :name, :website
 
diff --git a/app/serializers/rest/suggestion_serializer.rb b/app/serializers/rest/suggestion_serializer.rb
index 3d697fd9f1..c60f343ba4 100644
--- a/app/serializers/rest/suggestion_serializer.rb
+++ b/app/serializers/rest/suggestion_serializer.rb
@@ -1,7 +1,20 @@
 # frozen_string_literal: true
 
 class REST::SuggestionSerializer < ActiveModel::Serializer
-  attributes :source
+  attributes :source, :sources
 
   has_one :account, serializer: REST::AccountSerializer
+
+  LEGACY_SOURCE_TYPE_MAP = {
+    featured: 'staff',
+    most_followed: 'global',
+    most_interactions: 'global',
+    # NOTE: Those are not completely accurate, but those are personalized interactions
+    similar_to_recently_followed: 'past_interactions',
+    friends_of_friends: 'past_interactions',
+  }.freeze
+
+  def source
+    LEGACY_SOURCE_TYPE_MAP[object.sources.first]
+  end
 end
diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb
index 7801e77d1f..017b572718 100644
--- a/app/serializers/rest/tag_serializer.rb
+++ b/app/serializers/rest/tag_serializer.rb
@@ -19,7 +19,7 @@ class REST::TagSerializer < ActiveModel::Serializer
     if instance_options && instance_options[:relationships]
       instance_options[:relationships].following_map[object.id] || false
     else
-      TagFollow.where(tag_id: object.id, account_id: current_user.account_id).exists?
+      TagFollow.exists?(tag_id: object.id, account_id: current_user.account_id)
     end
   end
 
diff --git a/app/serializers/rest/v1/filter_serializer.rb b/app/serializers/rest/v1/filter_serializer.rb
index 455f17efdb..ef77e3ca82 100644
--- a/app/serializers/rest/v1/filter_serializer.rb
+++ b/app/serializers/rest/v1/filter_serializer.rb
@@ -2,7 +2,7 @@
 
 class REST::V1::FilterSerializer < ActiveModel::Serializer
   attributes :id, :phrase, :context, :whole_word, :expires_at,
-             :irreversible
+             :irreversible, :exclude_follows, :exclude_localusers
 
   delegate :context, :expires_at, to: :custom_filter
 
@@ -18,6 +18,10 @@ class REST::V1::FilterSerializer < ActiveModel::Serializer
     custom_filter.irreversible?
   end
 
+  delegate :exclude_follows, to: :custom_filter
+
+  delegate :exclude_localusers, to: :custom_filter
+
   private
 
   def custom_filter
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 99d1b2bd62..4895c28c8c 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -2,11 +2,13 @@
 
 class REST::V1::InstanceSerializer < ActiveModel::Serializer
   include RoutingHelper
+  include KmyblueCapabilitiesHelper
+  include RegistrationLimitationHelper
 
   attributes :uri, :title, :short_description, :description, :email,
              :version, :urls, :stats, :thumbnail,
              :languages, :registrations, :approval_required, :invites_enabled,
-             :configuration
+             :configuration, :fedibird_capabilities
 
   has_one :contact_account, serializer: REST::AccountSerializer
 
@@ -33,7 +35,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
   end
 
   def thumbnail
-    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
+    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : frontend_asset_url('images/preview.png')
   end
 
   def stats
@@ -64,7 +66,9 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
 
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
-        max_media_attachments: 4,
+        max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX,
+        max_media_attachments_with_poll: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL,
+        max_media_attachments_from_activitypub: MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
@@ -82,16 +86,36 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
         max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
         min_expiration: PollValidator::MIN_EXPIRATION,
         max_expiration: PollValidator::MAX_EXPIRATION,
+        allow_image: true,
+      },
+
+      emoji_reactions: {
+        max_reactions: EmojiReaction::EMOJI_REACTION_LIMIT,
+        max_reactions_per_account: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
+        max_reactions_per_remote_account: EmojiReaction::EMOJI_REACTION_PER_REMOTE_ACCOUNT_LIMIT,
+      },
+
+      reaction_deck: {
+        max_emojis: User::REACTION_DECK_MAX,
+      },
+
+      reactions: {
+        max_reactions: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
+      },
+
+      # https://github.com/mastodon/mastodon/pull/27009
+      search: {
+        enabled: Chewy.enabled?,
       },
     }
   end
 
   def registrations
-    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
+    Setting.registrations_mode != 'none' && !reach_registrations_limit? && !Rails.configuration.x.single_user_mode
   end
 
   def approval_required
-    Setting.registrations_mode == 'approved'
+    Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?)
   end
 
   def invites_enabled
diff --git a/app/services/accept_notification_request_service.rb b/app/services/accept_notification_request_service.rb
new file mode 100644
index 0000000000..e49eae6fd3
--- /dev/null
+++ b/app/services/accept_notification_request_service.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AcceptNotificationRequestService < BaseService
+  def call(request)
+    NotificationPermission.create!(account: request.account, from_account: request.from_account)
+    UnfilterNotificationsWorker.perform_async(request.id)
+  end
+end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 571a0fa57d..578e155d18 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -45,6 +45,8 @@ class AccountSearchService < BaseService
     def must_clauses
       if @account && @options[:following]
         [core_query, only_following_query]
+      elsif @account && @options[:follower]
+        [core_query, only_follower_query]
       else
         [core_query]
       end
@@ -55,7 +57,7 @@ class AccountSearchService < BaseService
     end
 
     def should_clauses
-      if @account && !@options[:following]
+      if @account && !@options[:following] && !@options[:follower]
         [boost_following_query]
       else
         []
@@ -81,6 +83,23 @@ class AccountSearchService < BaseService
       }
     end
 
+    def only_follower_query
+      {
+        terms: {
+          id: follower_ids,
+        },
+      }
+    end
+
+    def boost_follower_query
+      {
+        terms: {
+          id: follower_ids,
+          boost: 100,
+        },
+      }
+    end
+
     # This function deranks accounts that follow more people than follow them
     def reputation_score_function
       {
@@ -119,6 +138,10 @@ class AccountSearchService < BaseService
     def following_ids
       @following_ids ||= @account.active_relationships.pluck(:target_account_id) + [@account.id]
     end
+
+    def follower_ids
+      @follower_ids ||= @account.passive_relationships.pluck(:account_id)
+    end
   end
 
   class AutocompleteQueryBuilder < QueryBuilder
@@ -182,6 +205,7 @@ class AccountSearchService < BaseService
             end
 
     match = nil if !match.nil? && !account.nil? && options[:following] && !account.following?(match)
+    match = nil if !match.nil? && !account.nil? && options[:follower] && !match.following?(account)
 
     @exact_match = match
   end
@@ -205,7 +229,7 @@ class AccountSearchService < BaseService
   end
 
   def advanced_search_results
-    Account.advanced_search_for(terms_for_query, account, limit: limit_for_non_exact_results, following: options[:following], offset: offset)
+    Account.advanced_search_for(terms_for_query, account, limit: limit_for_non_exact_results, following: options[:following], follower: options[:follower], offset: offset)
   end
 
   def simple_search_results
@@ -215,9 +239,9 @@ class AccountSearchService < BaseService
   def from_elasticsearch
     query_builder = begin
       if options[:use_searchable_text]
-        FullQueryBuilder.new(terms_for_query, account, options.slice(:following))
+        FullQueryBuilder.new(terms_for_query, account, options.slice(:following, :follower))
       else
-        AutocompleteQueryBuilder.new(terms_for_query, account, options.slice(:following))
+        AutocompleteQueryBuilder.new(terms_for_query, account, options.slice(:following, :follower))
       end
     end
 
diff --git a/app/services/activate_follow_requests_service.rb b/app/services/activate_follow_requests_service.rb
new file mode 100644
index 0000000000..3c4641f7cd
--- /dev/null
+++ b/app/services/activate_follow_requests_service.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class ActivateFollowRequestsService < BaseService
+  include Payloadable
+  include FollowHelper
+
+  def call(account)
+    @account = account
+
+    PendingFollowRequest.transaction do
+      PendingFollowRequest.where(account: account).find_each do |follow_request|
+        approve_follow!(follow_request)
+      end
+    end
+  end
+
+  private
+
+  def approve_follow!(pending)
+    follow_request = FollowRequest.create!(account: @account, target_account: pending.target_account, uri: pending.uri)
+    pending.destroy!
+
+    target_account = follow_request.target_account
+
+    if request_pending_follow?(@account, target_account)
+      LocalNotificationWorker.perform_async(target_account.id, follow_request.id, 'FollowRequest', 'follow_request')
+    else
+      AuthorizeFollowService.new.call(@account, target_account)
+      LocalNotificationWorker.perform_async(target_account.id, ::Follow.find_by(account: @account, target_account: target_account).id, 'Follow', 'follow')
+    end
+  end
+end
diff --git a/app/services/activate_remote_statuses_service.rb b/app/services/activate_remote_statuses_service.rb
new file mode 100644
index 0000000000..f1e6a8660c
--- /dev/null
+++ b/app/services/activate_remote_statuses_service.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class ActivateRemoteStatusesService < BaseService
+  include Payloadable
+  include FollowHelper
+
+  def call(account)
+    @account = account
+
+    PendingStatus.transaction do
+      PendingStatus.where(account: account).find_each do |status_info|
+        approve_status!(status_info)
+      end
+    end
+  end
+
+  private
+
+  def approve_status!(pending)
+    account_id       = pending.account_id
+    fetch_account_id = pending.fetch_account_id
+    fetch_account    = pending.fetch_account
+    uri              = pending.uri
+    pending.destroy!
+
+    return if fetch_account.suspended?
+    return if ActivityPub::TagManager.instance.uri_to_resource(uri, Status).present?
+
+    ActivityPub::FetchRemoteStatusWorker.perform_async(uri, account_id, fetch_account_id)
+  end
+end
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index d2bae08a0e..89c3a1b6c0 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -23,9 +23,9 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
diff --git a/app/services/activitypub/fetch_references_service.rb b/app/services/activitypub/fetch_references_service.rb
new file mode 100644
index 0000000000..0c71af58fd
--- /dev/null
+++ b/app/services/activitypub/fetch_references_service.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class ActivityPub::FetchReferencesService < BaseService
+  include JsonLdHelper
+
+  def call(account, collection_or_uri)
+    @account = account
+
+    collection_items(collection_or_uri)&.take(8)&.map { |item| value_or_id(item) }
+  end
+
+  private
+
+  def collection_items(collection_or_uri)
+    collection = fetch_collection(collection_or_uri)
+    return unless collection.is_a?(Hash)
+
+    collection = fetch_collection(collection['first']) if collection['first'].present?
+    return unless collection.is_a?(Hash)
+
+    case collection['type']
+    when 'Collection', 'CollectionPage'
+      as_array(collection['items'])
+    when 'OrderedCollection', 'OrderedCollectionPage'
+      as_array(collection['orderedItems'])
+    end
+  end
+
+  def fetch_collection(collection_or_uri)
+    return collection_or_uri if collection_or_uri.is_a?(Hash)
+    return if unsupported_uri_scheme?(collection_or_uri)
+    return if ActivityPub::TagManager.instance.local_uri?(collection_or_uri)
+
+    # NOTE: For backward compatibility reasons, Mastodon signs outgoing
+    # queries incorrectly by default.
+    #
+    # While this is relevant for all URLs with query strings, this is
+    # the only code path where this happens in practice.
+    #
+    # Therefore, retry with correct signatures if this fails.
+    begin
+      fetch_resource_without_id_validation(collection_or_uri, nil, true)
+    rescue Mastodon::UnexpectedResponseError => e
+      raise unless e.response && e.response.code == 401 && Addressable::URI.parse(collection_or_uri).query.present?
+
+      fetch_resource_without_id_validation(collection_or_uri, nil, true, request_options: { with_query_string: true })
+    end
+  end
+end
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 567dd8a14a..7b083d889b 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -2,7 +2,7 @@
 
 class ActivityPub::FetchRemoteAccountService < ActivityPub::FetchRemoteActorService
   # Does a WebFinger roundtrip on each call, unless `only_key` is true
-  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+  def call(uri, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
     actor = super
     return actor if actor.nil? || actor.is_a?(Account)
 
diff --git a/app/services/activitypub/fetch_remote_actor_service.rb b/app/services/activitypub/fetch_remote_actor_service.rb
index 8df8c75876..86a134bb4e 100644
--- a/app/services/activitypub/fetch_remote_actor_service.rb
+++ b/app/services/activitypub/fetch_remote_actor_service.rb
@@ -10,15 +10,15 @@ class ActivityPub::FetchRemoteActorService < BaseService
   SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
 
   # Does a WebFinger roundtrip on each call, unless `only_key` is true
-  def call(uri, id: true, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
+  def call(uri, prefetched_body: nil, break_on_redirect: false, only_key: false, suppress_errors: true, request_id: nil)
     return if domain_not_allowed?(uri)
     return ActivityPub::TagManager.instance.uri_to_actor(uri) if ActivityPub::TagManager.instance.local_uri?(uri)
 
     @json = begin
       if prefetched_body.nil?
-        fetch_resource(uri, id)
+        fetch_resource(uri, true)
       else
-        body_to_json(prefetched_body, compare_id: id ? uri : nil)
+        body_to_json(prefetched_body, compare_id: uri)
       end
     rescue Oj::ParseError
       raise Error, "Error parsing JSON-LD document #{uri}"
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb
index 8eb97c1e66..e96b5ad3bb 100644
--- a/app/services/activitypub/fetch_remote_key_service.rb
+++ b/app/services/activitypub/fetch_remote_key_service.rb
@@ -6,23 +6,10 @@ class ActivityPub::FetchRemoteKeyService < BaseService
   class Error < StandardError; end
 
   # Returns actor that owns the key
-  def call(uri, id: true, prefetched_body: nil, suppress_errors: true)
+  def call(uri, suppress_errors: true)
     raise Error, 'No key URI given' if uri.blank?
 
-    if prefetched_body.nil?
-      if id
-        @json = fetch_resource_without_id_validation(uri)
-        if actor_type?
-          @json = fetch_resource(@json['id'], true)
-        elsif uri != @json['id']
-          raise Error, "Fetched URI #{uri} has wrong id #{@json['id']}"
-        end
-      else
-        @json = fetch_resource(uri, id)
-      end
-    else
-      @json = body_to_json(prefetched_body, compare_id: id ? uri : nil)
-    end
+    @json = fetch_resource(uri, false)
 
     raise Error, "Unable to fetch key JSON at #{uri}" if @json.nil?
     raise Error, "Unsupported JSON-LD context for document #{uri}" unless supported_context?(@json)
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index a491b32b26..6f8882378f 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -8,14 +8,14 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   DISCOVERIES_PER_REQUEST = 1000
 
   # Should be called when uri has already been checked for locality
-  def call(uri, id: true, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
+  def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
     return if domain_not_allowed?(uri)
 
     @request_id = request_id || "#{Time.now.utc.to_i}-status-#{uri}"
     @json = if prefetched_body.nil?
-              fetch_resource(uri, id, on_behalf_of)
+              fetch_resource(uri, true, on_behalf_of)
             else
-              body_to_json(prefetched_body, compare_id: id ? uri : nil)
+              body_to_json(prefetched_body, compare_id: uri)
             end
 
     return unless supported_context?
@@ -44,7 +44,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
 
     # If we fetched a status that already exists, then we need to treat the
     # activity as an update rather than create
-    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
+    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.exists?(uri: object_uri, account_id: actor.id)
 
     with_redis do |redis|
       discoveries = redis.incr("status_discovery_per_request:#{@request_id}")
@@ -65,7 +65,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
 
   def account_from_uri(uri)
     actor = ActivityPub::TagManager.instance.uri_to_resource(uri, Account)
-    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, id: true, request_id: @request_id) if actor.nil? || actor.possibly_stale?
+    actor = ActivityPub::FetchRemoteAccountService.new.call(uri, request_id: @request_id) if actor.nil? || actor.possibly_stale?
     actor
   end
 
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index b5c7759ec5..e2ecdef165 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -26,9 +26,9 @@ class ActivityPub::FetchRepliesService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
@@ -37,7 +37,20 @@ class ActivityPub::FetchRepliesService < BaseService
     return unless @allow_synchronous_requests
     return if non_matching_uri_hosts?(@account.uri, collection_or_uri)
 
-    fetch_resource_without_id_validation(collection_or_uri, nil, true)
+    # NOTE: For backward compatibility reasons, Mastodon signs outgoing
+    # queries incorrectly by default.
+    #
+    # While this is relevant for all URLs with query strings, this is
+    # the only code path where this happens in practice.
+    #
+    # Therefore, retry with correct signatures if this fails.
+    begin
+      fetch_resource_without_id_validation(collection_or_uri, nil, true)
+    rescue Mastodon::UnexpectedResponseError => e
+      raise unless e.response && e.response.code == 401 && Addressable::URI.parse(collection_or_uri).query.present?
+
+      fetch_resource_without_id_validation(collection_or_uri, nil, true, request_options: { with_query_string: true })
+    end
   end
 
   def filtered_replies
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 8fc0989a3f..6897ef3068 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -8,10 +8,12 @@ class ActivityPub::ProcessAccountService < BaseService
 
   SUBDOMAINS_RATELIMIT = 10
   DISCOVERIES_PER_REQUEST = 400
+  SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/
+  SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/
 
   # Should be called with confirmed valid JSON
   # and WebFinger-resolved username and domain
-  def call(username, domain, json, options = {})
+  def call(username, domain, json, options = {}) # rubocop:disable Metrics/PerceivedComplexity
     return if json['inbox'].blank? || unsupported_uri_scheme?(json['id']) || domain_not_allowed?(domain)
 
     @options     = options
@@ -21,6 +23,8 @@ class ActivityPub::ProcessAccountService < BaseService
     @domain      = TagManager.instance.normalize_domain(domain)
     @collections = {}
 
+    return unless valid_account?
+
     # The key does not need to be unguessable, it just needs to be somewhat unique
     @options[:request_id] ||= "#{Time.now.utc.to_i}-#{username}@#{domain}"
 
@@ -29,6 +33,7 @@ class ActivityPub::ProcessAccountService < BaseService
       @account          ||= Account.find_remote(@username, @domain)
       @old_public_key     = @account&.public_key
       @old_protocol       = @account&.protocol
+      @old_searchability  = @account&.searchability
       @suspension_changed = false
 
       if @account.nil?
@@ -54,12 +59,14 @@ class ActivityPub::ProcessAccountService < BaseService
     clear_tombstones! if key_changed?
     after_suspension_change! if suspension_changed?
 
-    unless @options[:only_key] || @account.suspended?
+    unless @options[:only_key] || (@account.suspended? && !@account.remote_pending)
       check_featured_collection! if @account.featured_collection_url.present?
       check_featured_tags_collection! if @json['featuredTags'].present?
       check_links! if @account.fields.any?(&:requires_verification?)
     end
 
+    fetch_instance_info
+
     @account
   rescue Oj::ParseError
     nil
@@ -76,6 +83,13 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.suspended_at      = domain_block.created_at if auto_suspend?
     @account.suspension_origin = :local if auto_suspend?
     @account.silenced_at       = domain_block.created_at if auto_silence?
+    @account.searchability     = :direct # not null
+
+    if @account.suspended_at.nil? && blocking_new_account?
+      @account.suspended_at      = Time.now.utc
+      @account.suspension_origin = :local
+      @account.remote_pending    = true
+    end
 
     set_immediate_protocol_attributes!
 
@@ -88,9 +102,12 @@ class ActivityPub::ProcessAccountService < BaseService
 
     set_suspension!
     set_immediate_protocol_attributes!
-    set_fetchable_key! unless @account.suspended? && @account.suspension_origin_local?
-    set_immediate_attributes! unless @account.suspended?
-    set_fetchable_attributes! unless @options[:only_key] || @account.suspended?
+
+    freeze_data = @account.suspended? && (@account.suspension_origin_remote? || !@account.remote_pending)
+
+    set_fetchable_key! unless @account.suspended? && @account.suspension_origin_local? && !@account.remote_pending
+    set_immediate_attributes! unless freeze_data
+    set_fetchable_attributes! unless @options[:only_key] || freeze_data
 
     @account.save_with_optional_media!
   end
@@ -116,9 +133,25 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) }
     @account.discoverable            = @json['discoverable'] || false
     @account.indexable               = @json['indexable'] || false
+    @account.searchability           = searchability_from_audience
+    @account.settings                = other_settings
+    @account.master_settings         = (@account.master_settings || {}).merge(master_settings(@account.note))
     @account.memorial                = @json['memorial'] || false
   end
 
+  def blocking_new_account?
+    return false unless Setting.hold_remote_new_accounts
+
+    SpecifiedDomain.white_list_domain_caches.none? { |item| item.domain == @domain }
+  end
+
+  def valid_account?
+    display_name = @json['name'] || ''
+    note = @json['summary'] || ''
+    !Admin::NgWord.reject?(display_name, uri: @uri, target_type: :account_name) &&
+      !Admin::NgWord.reject?(note, uri: @uri, target_type: :account_note)
+  end
+
   def set_fetchable_key!
     @account.public_key = public_key || ''
   end
@@ -155,6 +188,10 @@ class ActivityPub::ProcessAccountService < BaseService
     end
   end
 
+  def after_searchability_change!
+    SearchabilityUpdateWorker.perform_async(@account.id) if @account.statuses.unset_searchability.exists?
+  end
+
   def after_protocol_change!
     ActivityPub::PostUpgradeWorker.perform_async(@account.domain)
   end
@@ -189,6 +226,10 @@ class ActivityPub::ProcessAccountService < BaseService
     AccountMergingWorker.perform_async(@account.id)
   end
 
+  def fetch_instance_info
+    ActivityPub::FetchInstanceInfoWorker.perform_async(@account.domain) unless Rails.cache.exist?("fetch_instance_info:#{@account.domain}", expires_in: 1.day)
+  end
+
   def actor_type
     if @json['type'].is_a?(Array)
       @json['type'].find { |type| ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(type) }
@@ -201,10 +242,15 @@ class ActivityPub::ProcessAccountService < BaseService
     value = first_of_value(@json[key])
 
     return if value.nil?
-    return value['url'] if value.is_a?(Hash)
 
-    image = fetch_resource_without_id_validation(value)
-    image['url'] if image
+    if value.is_a?(String)
+      value = fetch_resource_without_id_validation(value)
+      return if value.nil?
+    end
+
+    value = first_of_value(value['url']) if value.is_a?(Hash) && value['type'] == 'Image'
+    value = value['href'] if value.is_a?(Hash)
+    value if value.is_a?(String)
   end
 
   def public_key
@@ -229,6 +275,96 @@ class ActivityPub::ProcessAccountService < BaseService
     end
   end
 
+  def audience_searchable_by
+    return nil if @json['searchableBy'].nil?
+
+    @audience_searchable_by_processaccountservice = as_array(@json['searchableBy']).map { |x| value_or_id(x) }
+  end
+
+  def searchability_from_audience
+    if audience_searchable_by.nil?
+      bio = searchability_from_bio
+      return bio unless bio.nil?
+
+      return misskey_software? ? misskey_searchability_from_indexable : :direct
+    end
+
+    if audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
+      :public
+    elsif audience_searchable_by.include?(@account.followers_url)
+      :private
+    elsif audience_searchable_by.include?('kmyblue:Limited') || audience_searchable_by.include?('as:Limited')
+      :limited
+    else
+      :direct
+    end
+  end
+
+  def searchability_from_bio
+    note = @json['summary'] || ''
+    return nil if note.blank?
+
+    searchability_bio = note.scan(SCAN_SEARCHABILITY_FEDIBIRD_RE).first || note.scan(SCAN_SEARCHABILITY_RE).first
+    return nil unless searchability_bio
+
+    searchability = searchability_bio[0]
+    return nil if searchability.nil?
+
+    searchability = :public  if %w(public all_users).include?(searchability)
+    searchability = :private if %w(followers followers_only).include?(searchability)
+    searchability = :direct  if %w(reactors reacted_users_only).include?(searchability)
+    searchability = :limited if %w(private nobody).include?(searchability)
+
+    searchability
+  end
+
+  def misskey_searchability_from_indexable
+    return :public if @json['indexable'].nil?
+
+    @json['indexable'] ? :public : :limited
+  end
+
+  def instance_info
+    @instance_info ||= InstanceInfo.find_by(domain: @domain)
+  end
+
+  def misskey_software?
+    info = instance_info
+    return false if info.nil?
+
+    %w(misskey calckey).include?(info.software)
+  end
+
+  def subscribable_by
+    return nil if @json['subscribableBy'].nil?
+
+    @subscribable_by = as_array(@json['subscribableBy']).map { |x| value_or_id(x) }
+  end
+
+  def subscription_policy(note)
+    if subscribable_by.nil?
+      note.include?('[subscribable:no]') ? :block : :allow
+    elsif subscribable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
+      :allow
+    elsif subscribable_by.include?(@account.followers_url)
+      :followers_only
+    else
+      :block
+    end
+  end
+
+  def master_settings(note)
+    {
+      'subscription_policy' => subscription_policy(note),
+    }
+  end
+
+  def other_settings
+    return {} unless @json['otherSetting'].is_a?(Array)
+
+    @json['otherSetting'].each_with_object({}) { |v, h| h.merge!({ v['name'] => v['value'] }) if v['type'] == 'PropertyValue' }
+  end
+
   def property_values
     return unless @json['attachment'].is_a?(Array)
 
@@ -277,12 +413,12 @@ class ActivityPub::ProcessAccountService < BaseService
 
   def moved_account
     account   = ActivityPub::TagManager.instance.uri_to_resource(@json['movedTo'], Account)
-    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true, request_id: @options[:request_id])
+    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], break_on_redirect: true, request_id: @options[:request_id])
     account
   end
 
   def skip_download?
-    @account.suspended? || domain_block&.reject_media?
+    (@account.suspended? && !@account.remote_pending) || domain_block&.reject_media?
   end
 
   def auto_suspend?
@@ -315,6 +451,10 @@ class ActivityPub::ProcessAccountService < BaseService
     !@old_protocol.nil? && @old_protocol != @account.protocol
   end
 
+  def searchability_changed?
+    !@old_searchability.nil? && @old_searchability != @account.searchability
+  end
+
   def process_tags
     return if @json['tag'].blank?
 
@@ -330,12 +470,14 @@ class ActivityPub::ProcessAccountService < BaseService
     shortcode = tag['name'].delete(':')
     image_url = tag['icon']['url']
     uri       = tag['id']
+    sensitive = tag['isSensitive'].presence || false
+    license   = tag['license']
     updated   = tag['updated']
     emoji     = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
 
     return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
 
-    emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
+    emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri, is_sensitive: sensitive, license: license)
     emoji.image_remote_url = image_url
     emoji.save
   end
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index 4f049a5ae9..202a3640ef 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -48,13 +48,17 @@ class ActivityPub::ProcessCollectionService < BaseService
   end
 
   def suspended_actor?
-    @account.suspended? && !activity_allowed_while_suspended?
+    @account.suspended? && (@account.remote_pending ? !activity_allowed_while_remote_pending? : !activity_allowed_while_suspended?)
   end
 
   def activity_allowed_while_suspended?
     %w(Delete Reject Undo Update).include?(@json['type'])
   end
 
+  def activity_allowed_while_remote_pending?
+    %w(Follow Create).include?(@json['type']) || activity_allowed_while_suspended?
+  end
+
   def process_items(items)
     items.reverse_each.filter_map { |item| process_item(item) }
   end
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index fb2b33114e..d44ea02749 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -4,13 +4,16 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
   include JsonLdHelper
   include Redisable
   include Lockable
+  include NgRuleHelper
+
+  class AbortError < ::StandardError; end
 
   def call(status, activity_json, object_json, request_id: nil)
     raise ArgumentError, 'Status has unsaved changes' if status.changed?
 
     @activity_json             = activity_json
     @json                      = object_json
-    @status_parser             = ActivityPub::Parser::StatusParser.new(@json)
+    @status_parser             = ActivityPub::Parser::StatusParser.new(@json, account: status.account)
     @uri                       = @status_parser.uri
     @status                    = status
     @account                   = status.account
@@ -22,11 +25,17 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     return @status if !expected_type? || already_updated_more_recently?
 
     if @status_parser.edited_at.present? && (@status.edited_at.nil? || @status_parser.edited_at > @status.edited_at)
+      read_metadata
+      return @status unless valid_status?
+
       handle_explicit_update!
     else
       handle_implicit_update!
     end
 
+    @status
+  rescue AbortError
+    @status.reload
     @status
   end
 
@@ -43,9 +52,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
         update_poll!
         update_immediate_attributes!
         update_metadata!
+        validate_status_mentions!
         create_edits!
       end
 
+      update_references!
       download_media_files!
       queue_poll_notifications!
 
@@ -73,7 +84,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     as_array(@json['attachment']).each do |attachment|
       media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment)
 
-      next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > 4
+      next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX
 
       begin
         media_attachment   = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }
@@ -150,12 +161,60 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     end
   end
 
+  def valid_status?
+    valid = !Admin::NgWord.reject?("#{@status_parser.spoiler_text}\n#{@status_parser.text}", uri: @status.uri, target_type: :status, stranger: mention_to_local_stranger? || reference_to_local_stranger?)
+    valid = !Admin::NgWord.hashtag_reject?(@raw_tags.size) if valid
+    valid = false if valid && Admin::NgWord.mention_reject?(@raw_mentions.size, uri: @status.uri, target_type: :status, text: "#{@status_parser.spoiler_text}\n#{@status_parser.text}")
+    valid = false if valid && (mention_to_local_stranger? || reference_to_local_stranger?) && Admin::NgWord.stranger_mention_reject_with_count?(@raw_mentions.size, uri: @status.uri, target_type: :status, text: "#{@status_parser.spoiler_text}\n#{@status_parser.text}")
+    valid = false if valid && (mention_to_local_stranger? || reference_to_local_stranger?) && reject_reply_exclude_followers?
+
+    valid
+  end
+
+  def validate_status_mentions!
+    raise AbortError unless valid_status_for_ng_rule?
+  end
+
+  def valid_status_for_ng_rule?
+    check_invalid_status_for_ng_rule! @account,
+                                      reaction_type: 'edit',
+                                      uri: @status.uri,
+                                      url: @status_parser.url || @status.url,
+                                      spoiler_text: @status.spoiler_text,
+                                      text: @status.text,
+                                      tag_names: @raw_tags,
+                                      visibility: @status.visibility,
+                                      searchability: @status.searchability,
+                                      sensitive: @status.sensitive,
+                                      media_count: @next_media_attachments.size,
+                                      poll_count: @status.poll&.options&.size || 0,
+                                      quote: quote,
+                                      reply: @status.reply?,
+                                      mention_count: @status.mentions.count,
+                                      reference_count: reference_uris.size,
+                                      mention_to_following: !(mention_to_local_stranger? || reference_to_local_stranger?)
+  end
+
+  def mention_to_local_stranger?
+    return @mention_to_local_stranger if defined?(@mention_to_local_stranger)
+
+    @mention_to_local_stranger = @raw_mentions.filter_map { |uri| ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Account) }.any? { |mentioned_account| !mentioned_account.following?(@status.account) }
+    @mention_to_local_stranger ||= @status.thread.present? && @status.thread.account_id != @status.account_id && @status.thread.account.local? && !@status.thread.account.following?(@status.account)
+    @mention_to_local_stranger
+  end
+
+  def reference_to_local_stranger?
+    local_referred_accounts.any? { |account| !account.following?(@account) }
+  end
+
   def update_immediate_attributes!
     @status.text         = @status_parser.text || ''
     @status.spoiler_text = @status_parser.spoiler_text || ''
     @status.sensitive    = @account.sensitized? || @status_parser.sensitive || false
     @status.language     = @status_parser.language
 
+    process_sensitive_words
+
     @significant_changes = text_significantly_changed? || @status.spoiler_text_changed? || @media_attachments_changed || @poll_changed
 
     @status.edited_at = @status_parser.edited_at if significant_changes?
@@ -163,21 +222,31 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @status.save!
   end
 
-  def update_metadata!
+  def process_sensitive_words
+    return unless %i(public public_unlisted login).include?(@status.visibility.to_sym) && Admin::SensitiveWord.sensitive?(@status.text, @status.spoiler_text, local: false)
+
+    @status.text = Admin::SensitiveWord.modified_text(@status.text, @status.spoiler_text)
+    @status.spoiler_text = Admin::SensitiveWord.alternative_text
+    @status.sensitive = true
+  end
+
+  def read_metadata
     @raw_tags     = []
     @raw_mentions = []
     @raw_emojis   = []
 
     as_array(@json['tag']).each do |tag|
       if equals_or_includes?(tag['type'], 'Hashtag')
-        @raw_tags << tag['name'] if tag['name'].present?
+        @raw_tags << tag['name'] if !ignore_hashtags? && tag['name'].present?
       elsif equals_or_includes?(tag['type'], 'Mention')
         @raw_mentions << tag['href'] if tag['href'].present?
       elsif equals_or_includes?(tag['type'], 'Emoji')
         @raw_emojis << tag
       end
     end
+  end
 
+  def update_metadata!
     update_tags!
     update_mentions!
     update_emojis!
@@ -227,11 +296,17 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
       emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
 
-      next unless emoji.nil? || custom_emoji_parser.image_remote_url != emoji.image_remote_url || (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
+      next unless emoji.nil? ||
+                  custom_emoji_parser.image_remote_url != emoji.image_remote_url ||
+                  (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at) ||
+                  custom_emoji_parser.license != emoji.license
 
       begin
         emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri)
         emoji.image_remote_url = custom_emoji_parser.image_remote_url
+        emoji.license = custom_emoji_parser.license
+        emoji.is_sensitive = custom_emoji_parser.is_sensitive
+        emoji.aliases = custom_emoji_parser.aliases
         emoji.save
       rescue Seahorse::Client::NetworkingError => e
         Rails.logger.warn "Error storing emoji: #{e}"
@@ -239,6 +314,33 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     end
   end
 
+  def update_references!
+    references = reference_uris
+
+    ProcessReferencesService.call_service_without_error(@status, [], references, [quote].compact)
+  end
+
+  def reference_uris
+    return @reference_uris if defined?(@reference_uris)
+
+    @reference_uris = @json['references'].nil? ? [] : (ActivityPub::FetchReferencesService.new.call(@status.account, @json['references']) || [])
+    @reference_uris += ProcessReferencesService.extract_uris(@json['content'] || '')
+  end
+
+  def quote
+    @json['quote'] || @json['quoteUrl'] || @json['quoteURL'] || @json['_misskey_quote']
+  end
+
+  def local_referred_accounts
+    return @local_referred_accounts if defined?(@local_referred_accounts)
+
+    local_referred_statuses = reference_uris.filter_map do |uri|
+      ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
+    end.compact
+
+    @local_referred_accounts = local_referred_statuses.map(&:account)
+  end
+
   def expected_type?
     equals_or_includes_any?(@json['type'], %w(Note Question))
   end
@@ -260,6 +362,18 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @skip_download ||= DomainBlock.reject_media?(@account.domain)
   end
 
+  def ignore_hashtags?
+    return @ignore_hashtags if defined?(@ignore_hashtags)
+
+    @ignore_hashtags ||= DomainBlock.reject_hashtag?(@account.domain)
+  end
+
+  def reject_reply_exclude_followers?
+    return @reject_reply_exclude_followers if defined?(@reject_reply_exclude_followers)
+
+    @reject_reply_exclude_followers ||= DomainBlock.reject_reply_exclude_followers?(@account.domain)
+  end
+
   def unsupported_media_type?(mime_type)
     mime_type.present? && !MediaAttachment.supported_mime_types.include?(mime_type)
   end
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
index 7ccc917309..f51d671a00 100644
--- a/app/services/activitypub/synchronize_followers_service.rb
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -59,9 +59,9 @@ class ActivityPub::SynchronizeFollowersService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index 89d007c1cd..fc5dc65681 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -9,18 +9,22 @@ class AfterBlockDomainFromAccountService < BaseService
   def call(account, domain)
     @account = account
     @domain  = domain
+    @domain_block_event = nil
 
     clear_notifications!
+    clear_notification_permissions!
     remove_follows!
     reject_existing_followers!
     reject_pending_follow_requests!
+    notify_of_severed_relationships!
   end
 
   private
 
   def remove_follows!
-    @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).find_each do |follow|
-      UnfollowService.new.call(@account, follow.target_account)
+    @account.active_relationships.where(target_account: Account.where(domain: @domain)).includes(:target_account).reorder(nil).in_batches do |follows|
+      domain_block_event.import_from_active_follows!(follows)
+      follows.each { |follow| UnfollowService.new.call(@account, follow.target_account) }
     end
   end
 
@@ -28,9 +32,14 @@ class AfterBlockDomainFromAccountService < BaseService
     Notification.where(account: @account).where(from_account: Account.where(domain: @domain)).in_batches.delete_all
   end
 
+  def clear_notification_permissions!
+    NotificationPermission.where(account: @account, from_account: Account.where(domain: @domain)).in_batches.delete_all
+  end
+
   def reject_existing_followers!
-    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow|
-      reject_follow!(follow)
+    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).in_batches do |follows|
+      domain_block_event.import_from_passive_follows!(follows)
+      follows.each { |follow| reject_follow!(follow) }
     end
   end
 
@@ -47,4 +56,15 @@ class AfterBlockDomainFromAccountService < BaseService
 
     ActivityPub::DeliveryWorker.perform_async(Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)), @account.id, follow.account.inbox_url)
   end
+
+  def notify_of_severed_relationships!
+    return if @domain_block_event.nil?
+
+    event = AccountRelationshipSeveranceEvent.create!(account: @account, relationship_severance_event: @domain_block_event)
+    LocalNotificationWorker.perform_async(@account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
+  end
+
+  def domain_block_event
+    @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :user_domain_block, target_name: @domain)
+  end
 end
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index 899e84be44..fafd5f5b9f 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -7,6 +7,7 @@ class AfterBlockService < BaseService
 
     clear_home_feed!
     clear_list_feeds!
+    clear_antenna_feeds!
     clear_notifications!
     clear_conversations!
   end
@@ -21,6 +22,10 @@ class AfterBlockService < BaseService
     FeedManager.instance.clear_from_lists(@account, @target_account)
   end
 
+  def clear_antenna_feeds!
+    FeedManager.instance.clear_from_antennas(@account, @target_account)
+  end
+
   def clear_conversations!
     AccountConversation.where(account: @account).where('? = ANY(participant_account_ids)', @target_account.id).in_batches.destroy_all
   end
diff --git a/app/services/approve_appeal_service.rb b/app/services/approve_appeal_service.rb
index b8a522b2a1..40bb76b8a4 100644
--- a/app/services/approve_appeal_service.rb
+++ b/app/services/approve_appeal_service.rb
@@ -29,6 +29,8 @@ class ApproveAppealService < BaseService
       undo_delete_statuses!
     when 'mark_statuses_as_sensitive'
       undo_mark_statuses_as_sensitive!
+    when 'force_cw'
+      undo_force_cw!
     when 'sensitive'
       undo_sensitive!
     when 'silence'
@@ -54,7 +56,14 @@ class ApproveAppealService < BaseService
   def undo_mark_statuses_as_sensitive!
     representative_account = Account.representative
     @strike.statuses.includes(:media_attachments).find_each do |status|
-      UpdateStatusService.new.call(status, representative_account.id, sensitive: false) if status.with_media?
+      UpdateStatusService.new.call(status, representative_account.id, sensitive: false, bypass_validation: true) if status.with_media?
+    end
+  end
+
+  def undo_force_cw!
+    representative_account = Account.representative
+    @strike.statuses.includes(:media_attachments).find_each do |status|
+      UpdateStatusService.new.call(status, representative_account.id, spoiler_text: '', bypass_validation: true) if status.spoiler_text.present?
     end
   end
 
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 886bab1ebf..75bd0c472c 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -32,7 +32,7 @@ class BackupService < BaseService
       add_comma = true
 
       file.write(statuses.map do |status|
-        item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status), ActivityPub::ActivitySerializer)
+        item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status, use_bearcap: false), ActivityPub::ActivitySerializer)
         item.delete('@context')
 
         unless item[:type] == 'Announce' || item[:object][:attachment].blank?
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index de4ee16e91..f5c5cb7109 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -50,6 +50,7 @@ class BatchedRemoveStatusService < BaseService
 
       unpush_from_home_timelines(account, account_statuses)
       unpush_from_list_timelines(account, account_statuses)
+      unpush_from_antenna_timelines(account, account_statuses)
     end
 
     # Cannot be batched
@@ -79,6 +80,14 @@ class BatchedRemoveStatusService < BaseService
     end
   end
 
+  def unpush_from_antenna_timelines(_account, statuses)
+    Antenna.availables.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |antenna|
+      statuses.each do |status|
+        FeedManager.instance.unpush_from_antenna(antenna, status)
+      end
+    end
+  end
+
   def unpush_from_public_timelines(status, pipeline)
     return unless status.public_visibility? && status.id > @status_id_cutoff
 
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index 76cc36ff6b..0c5bfaefeb 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -5,8 +5,11 @@ class BlockDomainService < BaseService
 
   def call(domain_block, update = false)
     @domain_block = domain_block
+    @domain_block_event = nil
+
     process_domain_block!
     process_retroactive_updates! if update
+    notify_of_severed_relationships!
   end
 
   private
@@ -24,6 +27,9 @@ class BlockDomainService < BaseService
       silence_accounts!
     elsif domain_block.suspend?
       suspend_accounts!
+      remove_friends!
+    elsif domain_block.reject_friend?
+      remove_friends!
     end
 
     DomainClearMediaWorker.perform_async(domain_block.id) if domain_block.reject_media?
@@ -37,15 +43,37 @@ class BlockDomainService < BaseService
     blocked_domain_accounts.without_suspended.in_batches.update_all(suspended_at: @domain_block.created_at, suspension_origin: :local)
 
     blocked_domain_accounts.where(suspended_at: @domain_block.created_at).reorder(nil).find_each do |account|
-      DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at)
+      DeleteAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at, relationship_severance_event: domain_block_event)
     end
   end
 
+  def notify_of_severed_relationships!
+    return if @domain_block_event.nil?
+
+    # TODO: check how efficient that query is, also check `push_bulk`/`perform_bulk`
+    @domain_block_event.affected_local_accounts.reorder(nil).find_each do |account|
+      event = AccountRelationshipSeveranceEvent.create!(account: account, relationship_severance_event: @domain_block_event)
+      LocalNotificationWorker.perform_async(account.id, event.id, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
+    end
+  end
+
+  def remove_friends!
+    blocked_friends.find_each(&:destroy)
+  end
+
   def blocked_domain
     domain_block.domain
   end
 
+  def domain_block_event
+    @domain_block_event ||= RelationshipSeveranceEvent.create!(type: :domain_block, target_name: blocked_domain)
+  end
+
   def blocked_domain_accounts
     Account.by_domain_and_subdomains(blocked_domain)
   end
+
+  def blocked_friends
+    @blocked_friends ||= FriendDomain.by_domain_and_subdomains(blocked_domain)
+  end
 end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 266a0f4b9d..98229d98c0 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -10,6 +10,8 @@ class BlockService < BaseService
     UnfollowService.new.call(target_account, account) if target_account.following?(account)
     RejectFollowService.new.call(target_account, account) if target_account.requested?(account)
 
+    NotificationPermission.where(account: account, from_account: target_account).destroy_all
+
     block = account.block!(target_account)
 
     BlockWorker.perform_async(account.id, target_account.id)
diff --git a/app/services/bulk_import_row_service.rb b/app/services/bulk_import_row_service.rb
index ef4c18e789..26909dfe04 100644
--- a/app/services/bulk_import_row_service.rb
+++ b/app/services/bulk_import_row_service.rb
@@ -10,7 +10,7 @@ class BulkImportRowService
     when :following, :blocking, :muting, :lists
       target_acct     = @data['acct']
       target_domain   = domain(target_acct)
-      @target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
+      @target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
       return false if @target_account.nil?
     when :bookmarks
       target_uri      = @data['uri']
@@ -18,7 +18,7 @@ class BulkImportRowService
       @target_status = ActivityPub::TagManager.instance.uri_to_resource(target_uri, Status)
       return false if @target_status.nil? && ActivityPub::TagManager.instance.local_uri?(target_uri)
 
-      @target_status ||= stoplight_wrap_request(target_domain) { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
+      @target_status ||= stoplight_wrapper(target_domain).run { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
       return false if @target_status.nil?
     end
 
@@ -51,16 +51,15 @@ class BulkImportRowService
     TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
   end
 
-  def stoplight_wrap_request(domain, &block)
+  def stoplight_wrapper(domain)
     if domain.present?
-      Stoplight("source:#{domain}", &block)
+      Stoplight("source:#{domain}")
         .with_fallback { nil }
         .with_threshold(1)
         .with_cool_off_time(5.minutes.seconds)
         .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-        .run
     else
-      yield
+      Stoplight('domain-blank')
     end
   end
 end
diff --git a/app/services/concerns/account_scope.rb b/app/services/concerns/account_scope.rb
new file mode 100644
index 0000000000..f670d17f38
--- /dev/null
+++ b/app/services/concerns/account_scope.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module AccountScope
+  def scope_status(status)
+    case status.visibility.to_sym
+    when :public, :unlisted, :public_unlisted, :login
+      scope_local
+    when :private
+      scope_account_local_followers(status.account)
+    when :limited
+      scope_status_all_mentioned(status)
+    else
+      scope_status_mentioned(status)
+    end
+  end
+
+  def scope_local
+    Account.local.select(:id)
+  end
+
+  def scope_account_local_followers(account)
+    account.followers_for_local_distribution.or(Account.where(id: account.id)).select(:id).reorder(nil)
+  end
+
+  def scope_status_mentioned(status)
+    Account.local.where(id: status.active_mentions.select(:account_id)).reorder(nil)
+  end
+
+  def scope_status_all_mentioned(status)
+    Account.local.where(id: status.mentions.select(:account_id)).reorder(nil)
+  end
+
+  # TODO: not work
+  def scope_list_following_account(account)
+    account.lists_for_local_distribution.select(:id).reorder(nil)
+  end
+
+  def scope_tag_following_account(_status)
+    TagFollow.where(tag_id: @status.tags.map(&:id)).select('account_id AS id').reorder(nil)
+  end
+end
diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
index bd9d9d74b5..113b389fac 100644
--- a/app/services/concerns/payloadable.rb
+++ b/app/services/concerns/payloadable.rb
@@ -14,10 +14,12 @@ module Payloadable
     signer      = options.delete(:signer)
     sign_with   = options.delete(:sign_with)
     always_sign = options.delete(:always_sign)
+    always_sign_unsafe = options.delete(:always_sign_unsafe)
     payload     = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
     object      = record.respond_to?(:virtual_object) ? record.virtual_object : record
+    bearcap     = object.is_a?(String) && record.respond_to?(:type) && (record.type == 'Create' || record.type == 'Update')
 
-    if (object.respond_to?(:sign?) && object.sign?) && signer && (always_sign || signing_enabled?)
+    if ((object.respond_to?(:sign?) && object.sign?) && signer && (always_sign || signing_enabled?)) || bearcap || (signer && always_sign_unsafe)
       ActivityPub::LinkedDataSignature.new(payload).sign!(signer, sign_with: sign_with)
     else
       payload
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 7c7cb97df2..96d382b495 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -2,20 +2,25 @@
 
 class DeleteAccountService < BaseService
   include Payloadable
+  include RegistrationLimitationHelper
 
   ASSOCIATIONS_ON_SUSPEND = %w(
     account_notes
     account_pins
     active_relationships
     aliases
+    antennas
     block_relationships
     blocked_by_relationships
+    bookmark_categories
+    circles
     conversation_mutes
     conversations
     custom_filters
     devices
     domain_blocks
     featured_tags
+    fetchable_pending_statuses
     follow_requests
     list_accounts
     migrations
@@ -24,8 +29,11 @@ class DeleteAccountService < BaseService
     notifications
     owned_lists
     passive_relationships
+    pending_follow_requests
+    pending_statuses
     report_notes
     scheduled_statuses
+    scheduled_expiration_statuses
     status_pins
   ).freeze
 
@@ -37,12 +45,15 @@ class DeleteAccountService < BaseService
     account_notes
     account_pins
     aliases
+    antenna_accounts
+    circle_accounts
     conversation_mutes
     conversations
     custom_filters
     devices
     domain_blocks
     featured_tags
+    fetchable_pending_statuses
     follow_requests
     list_accounts
     migrations
@@ -50,7 +61,10 @@ class DeleteAccountService < BaseService
     muted_by_relationships
     notifications
     owned_lists
+    pending_follow_requests
+    pending_statuses
     scheduled_statuses
+    scheduled_expiration_statuses
     status_pins
   )
 
@@ -58,6 +72,8 @@ class DeleteAccountService < BaseService
     reports
     targeted_moderation_notes
     targeted_reports
+    severed_relationships
+    remote_severed_relationships
   ).freeze
 
   # Suspend or remove an account and remove as much of its data
@@ -72,6 +88,7 @@ class DeleteAccountService < BaseService
   # @option [Boolean] :skip_side_effects Side effects are ActivityPub and streaming API payloads
   # @option [Boolean] :skip_activitypub Skip sending ActivityPub payloads. Implied by :skip_side_effects
   # @option [Time]    :suspended_at Only applicable when :reserve_username is true
+  # @option [RelationshipSeveranceEvent] :relationship_severance_event Event used to record severed relationships not initiated by the user
   def call(account, **options)
     @account = account
     @options = { reserve_username: true, reserve_email: true }.merge(options)
@@ -84,6 +101,7 @@ class DeleteAccountService < BaseService
 
     @options[:skip_activitypub] = true if @options[:skip_side_effects]
 
+    record_severed_relationships!
     distribute_activities!
     purge_content!
     fulfill_deletion_request!
@@ -136,6 +154,8 @@ class DeleteAccountService < BaseService
     else
       @account.user.destroy
     end
+
+    reset_registration_limit_caches!
   end
 
   def purge_content!
@@ -147,6 +167,7 @@ class DeleteAccountService < BaseService
     purge_polls!
     purge_generated_notifications!
     purge_favourites!
+    purge_emoji_reactions!
     purge_bookmarks!
     purge_feeds!
     purge_other_associations!
@@ -181,6 +202,7 @@ class DeleteAccountService < BaseService
     # polymorphically associated notifications generated by this account
 
     Notification.where(from_account: @account).in_batches.delete_all
+    NotificationRequest.where(from_account: @account).in_batches.delete_all
   end
 
   def purge_favourites!
@@ -193,6 +215,16 @@ class DeleteAccountService < BaseService
     end
   end
 
+  def purge_emoji_reactions!
+    @account.emoji_reactions.in_batches do |reactions|
+      reactions.each do |reaction|
+        reaction.status.refresh_emoji_reactions_grouped_by_name!
+      end
+      Chewy.strategy.current.update(StatusesIndex, reactions.pluck(:status_id)) if Chewy.enabled?
+      reactions.delete_all
+    end
+  end
+
   def purge_bookmarks!
     @account.bookmarks.in_batches do |bookmarks|
       Chewy.strategy.current.update(StatusesIndex, bookmarks.pluck(:status_id)) if Chewy.enabled?
@@ -211,6 +243,7 @@ class DeleteAccountService < BaseService
 
     FeedManager.instance.clean_feeds!(:home, [@account.id])
     FeedManager.instance.clean_feeds!(:list, @account.owned_lists.pluck(:id))
+    FeedManager.instance.clean_feeds!(:antenna, @account.antennas.pluck(:id))
   end
 
   def purge_profile!
@@ -266,6 +299,20 @@ class DeleteAccountService < BaseService
     end
   end
 
+  def record_severed_relationships!
+    return if relationship_severance_event.nil?
+
+    @account.active_relationships.in_batches do |follows|
+      # NOTE: these follows are passive with regards to the local accounts
+      relationship_severance_event.import_from_passive_follows!(follows)
+    end
+
+    @account.passive_relationships.in_batches do |follows|
+      # NOTE: these follows are active with regards to the local accounts
+      relationship_severance_event.import_from_active_follows!(follows)
+    end
+  end
+
   def delete_actor_json
     @delete_actor_json ||= Oj.dump(serialize_payload(@account, ActivityPub::DeleteActorSerializer, signer: @account, always_sign: true))
   end
@@ -305,4 +352,8 @@ class DeleteAccountService < BaseService
   def skip_activitypub?
     @options[:skip_activitypub]
   end
+
+  def relationship_severance_event
+    @options[:relationship_severance_event]
+  end
 end
diff --git a/app/services/delivery_antenna_service.rb b/app/services/delivery_antenna_service.rb
new file mode 100644
index 0000000000..07888f50a6
--- /dev/null
+++ b/app/services/delivery_antenna_service.rb
@@ -0,0 +1,186 @@
+# frozen_string_literal: true
+
+class DeliveryAntennaService
+  include FormattingHelper
+  include DtlHelper
+
+  def call(status, update, **options)
+    @status = status
+    @account = @status.account
+    @update = update
+
+    mode = options[:mode] || :home
+    case mode
+    when :home
+      delivery!
+    when :stl
+      delivery_stl!
+    when :ltl
+      delivery_ltl!
+    end
+  end
+
+  private
+
+  def delivery! # rubocop:disable Metrics/AbcSize
+    subscription_policy = @account.subscription_policy
+
+    dtl_post = @status.dtl? && dtl_enabled?
+    return if subscription_policy == :block && (!dtl_post || !@account.user&.setting_dtl_force_subscribable)
+
+    tag_ids = @status.tags.pluck(:id)
+    domain = @account.domain
+    domain ||= Rails.configuration.x.local_domain if Setting.enable_local_timeline
+    follower_ids = @status.unlisted_visibility? ? @status.account.followers.pluck(:id) : []
+
+    antennas = Antenna.availables
+    antennas = antennas.left_joins(:antenna_domains).where(any_domains: true).or(Antenna.left_joins(:antenna_domains).where(antenna_domains: { name: domain }))
+
+    antennas = Antenna.where(id: antennas.select(:id))
+    antennas = antennas.left_joins(:antenna_accounts).where(any_accounts: true).or(Antenna.left_joins(:antenna_accounts).where(antenna_accounts: { account: @account }))
+
+    antennas = Antenna.where(id: antennas.select(:id))
+    if subscription_policy == :block
+      dtl_tag = Tag.find_or_create_by_names(dtl_tag_name).first
+      return if !dtl_tag || tag_ids.exclude?(dtl_tag.id)
+
+      antennas = antennas.left_joins(:antenna_tags).where(antenna_tags: { tag_id: dtl_tag.id })
+    else
+      antennas = antennas.left_joins(:antenna_tags).where(any_tags: true).or(Antenna.left_joins(:antenna_tags).where(antenna_tags: { tag_id: tag_ids }))
+    end
+
+    antennas = antennas.where(account_id: Account.without_suspended.joins(:user).select('accounts.id').where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago))
+    antennas = antennas.where(account: @status.account.followers) if followers_only?
+    antennas = antennas.where(account: @status.mentioned_accounts) if mentioned_users_only?
+    antennas = antennas.where(with_media_only: false) unless @status.with_media?
+    antennas = antennas.where(ignore_reblog: false) if @status.reblog?
+    antennas = antennas.where(stl: false, ltl: false)
+
+    collection = AntennaCollection.new(@status, @update)
+    content = extract_status_plain_text_with_spoiler_text(@status)
+
+    antennas.in_batches do |ans|
+      ans.each do |antenna|
+        next unless antenna.enabled?
+        next if antenna.keywords&.any? && antenna.keywords&.none? { |keyword| content.include?(keyword) }
+        next if antenna.exclude_keywords&.any? { |keyword| content.include?(keyword) }
+        next if antenna.exclude_accounts&.include?(@status.account_id)
+        next if antenna.exclude_domains&.include?(domain)
+        next if antenna.exclude_tags&.any? { |tag_id| tag_ids.include?(tag_id) }
+
+        searchability = @status.compute_searchability
+        next if @status.unlisted_visibility? && searchability != 'public' && follower_ids.exclude?(antenna.account_id)
+        next if @status.unlisted_visibility? && searchability == 'public' && follower_ids.exclude?(antenna.account_id) && antenna.any_keywords && antenna.any_tags
+
+        collection.push(antenna)
+      end
+    end
+
+    collection.deliver!
+  end
+
+  def delivery_stl!
+    return unless Setting.enable_local_timeline
+
+    antennas = Antenna.available_stls
+    antennas = antennas.where(account_id: Account.without_suspended.joins(:user).select('accounts.id').where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago))
+
+    home_post = !@account.domain.nil? || @status.reblog? || [:public, :public_unlisted, :login].exclude?(@status.visibility.to_sym)
+    antennas = antennas.where(account: @account.followers).or(antennas.where(account: @account)).where('insert_feeds IS FALSE OR list_id > 0') if home_post && !@status.limited_visibility?
+    antennas = antennas.where(account: @status.mentioned_accounts).or(antennas.where(account: @account)).where('insert_feeds IS FALSE OR list_id > 0') if @status.limited_visibility?
+
+    collection = AntennaCollection.new(@status, @update, stl_home: home_post)
+
+    antennas.in_batches do |ans|
+      ans.each do |antenna|
+        next if antenna.expired?
+
+        collection.push(antenna)
+      end
+    end
+
+    collection.deliver!
+  end
+
+  def delivery_ltl!
+    return if %i(public public_unlisted login).exclude?(@status.visibility.to_sym)
+    return unless @account.local?
+    return if @status.reblog?
+    return unless Setting.enable_local_timeline
+
+    antennas = Antenna.available_ltls
+    antennas = antennas.where(account_id: Account.without_suspended.joins(:user).select('accounts.id').where('users.current_sign_in_at > ?', User::ACTIVE_DURATION.ago))
+
+    collection = AntennaCollection.new(@status, @update)
+
+    antennas.in_batches do |ans|
+      ans.each do |antenna|
+        next if antenna.expired?
+
+        collection.push(antenna)
+      end
+    end
+
+    collection.deliver!
+  end
+
+  def followers_only?
+    case @status.visibility.to_sym
+    when :public, :public_unlisted, :login, :limited
+      @status.account.subscription_policy == :followers_only
+    when :unlisted
+      @status.compute_searchability != 'public' || @status.account.subscription_policy == :followers_only
+    else
+      true
+    end
+  end
+
+  def mentioned_users_only?
+    @status.visibility.to_sym == :limited
+  end
+
+  class AntennaCollection
+    def initialize(status, update, stl_home: false)
+      @status = status
+      @update = update
+      @stl_home = stl_home
+      @home_account_ids = []
+      @list_ids = []
+      @antenna_timeline_ids = []
+    end
+
+    def push(antenna)
+      if !antenna.insert_feeds?
+        @antenna_timeline_ids << { id: antenna.id, antenna_id: antenna.id }
+      elsif antenna.list_id.zero?
+        @home_account_ids << { id: antenna.account_id, antenna_id: antenna.id } if @home_account_ids.none? { |id| id[:id] == antenna.account_id }
+      elsif @list_ids.none? { |id| id[:id] == antenna.list_id }
+        @list_ids << { id: antenna.list_id, antenna_id: antenna.id }
+      end
+    end
+
+    def deliver!
+      lists = @list_ids
+      homes = @home_account_ids
+      timelines = @antenna_timeline_ids
+
+      if lists.any?
+        FeedInsertWorker.push_bulk(lists) do |list|
+          [@status.id, list[:id], 'list', { 'update' => @update, 'stl_home' => @stl_home || false, 'antenna_id' => list[:antenna_id] }]
+        end
+      end
+
+      if homes.any?
+        FeedInsertWorker.push_bulk(homes) do |home|
+          [@status.id, home[:id], 'home', { 'update' => @update, 'antenna_id' => home[:antenna_id] }]
+        end
+      end
+
+      return unless timelines.any?
+
+      FeedInsertWorker.push_bulk(timelines) do |antenna|
+        [@status.id, antenna[:id], 'antenna', { 'update' => @update }]
+      end
+    end
+  end
+end
diff --git a/app/services/emoji_react_service.rb b/app/services/emoji_react_service.rb
new file mode 100644
index 0000000000..f7d4b0ff37
--- /dev/null
+++ b/app/services/emoji_react_service.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+class EmojiReactService < BaseService
+  include Authorization
+  include Payloadable
+  include Redisable
+  include Lockable
+  include NgRuleHelper
+
+  # React a status with emoji and notify remote user
+  # @param [Account] account
+  # @param [Status] status
+  # @param [string] name
+  # @return [Favourite]
+  def call(account, status, name)
+    status = status.reblog if status.reblog? && !status.reblog.nil?
+    authorize_with account, status, :emoji_reaction?
+    @status = status
+
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.banned') if account.silenced? && !status.account.following?(account)
+
+    shortcode, domain = name.split('@')
+    domain = nil if TagManager.instance.local_domain?(domain)
+
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless check_invalid_reaction_for_ng_rule! account, reaction_type: 'emoji_reaction', emoji_reaction_name: shortcode, emoji_reaction_origin_domain: domain, recipient: status.account, target_status: status
+
+    with_redis_lock("emoji_reaction:#{status.id}") do
+      custom_emoji = CustomEmoji.find_by(shortcode: shortcode, domain: domain)
+      return if domain.present? && !EmojiReaction.exists?(status: status, custom_emoji: custom_emoji)
+
+      @emoji_reaction = EmojiReaction.find_by(account: account, status: status, name: shortcode, custom_emoji: custom_emoji)
+      raise Mastodon::ValidationError, I18n.t('reactions.errors.duplication') unless @emoji_reaction.nil?
+
+      @emoji_reaction = EmojiReaction.create!(account: account, status: status, name: shortcode, custom_emoji: custom_emoji)
+
+      status.touch
+    end
+
+    raise Mastodon::ValidationError, I18n.t('reactions.errors.duplication') if @emoji_reaction.nil?
+
+    Trends.statuses.register(status)
+
+    create_notification
+    notify_to_followers
+    increment_statistics
+    write_stream! if Setting.streaming_local_emoji_reaction
+
+    @emoji_reaction
+  end
+
+  private
+
+  def create_notification
+    status = @emoji_reaction.status
+    return unless status.account.local?
+    return unless status.account.user&.setting_enable_emoji_reaction
+
+    LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'reaction') if status.account.user&.setting_emoji_reaction_streaming_notify_impl2
+    LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'emoji_reaction')
+  end
+
+  def notify_to_followers
+    ActivityPub::EmojiReactionDistributionWorker.perform_async(@emoji_reaction.id)
+  end
+
+  def write_stream!
+    emoji_group = @emoji_reaction.status.emoji_reactions_grouped_by_name(nil, force: true)
+                                 .find { |reaction_group| reaction_group['name'] == @emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == @emoji_reaction.custom_emoji&.domain) }
+    emoji_group['status_id'] = @emoji_reaction.status_id.to_s
+    DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @emoji_reaction.status_id, @emoji_reaction.account_id)
+  end
+
+  def increment_statistics
+    ActivityTracker.increment('activity:interactions')
+  end
+
+  def payload
+    @payload = Oj.dump(serialize_payload(@emoji_reaction, ActivityPub::EmojiReactionSerializer, signer: @emoji_reaction.account))
+  end
+
+  def render_emoji_reaction(emoji_group)
+    # @rendered_emoji_reaction ||= InlineRenderer.render(HashObject.new(emoji_group), nil, :emoji_reaction)
+    @render_emoji_reaction ||= Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
+  end
+end
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 50b414bc52..9b47674a24 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -2,6 +2,7 @@
 
 class FanOutOnWriteService < BaseService
   include Redisable
+  include DtlHelper
 
   # Push a status into home and mentions feeds
   # @param [Status] status
@@ -18,8 +19,12 @@ class FanOutOnWriteService < BaseService
     warm_payload_cache!
 
     fan_out_to_local_recipients!
-    fan_out_to_public_recipients! if broadcastable?
-    fan_out_to_public_streams! if broadcastable?
+    if broadcastable?
+      fan_out_to_public_recipients!
+      fan_out_to_public_streams!
+    elsif broadcastable_unlisted_public?
+      fan_out_to_unlisted_public_streams!
+    end
   end
 
   private
@@ -41,14 +46,21 @@ class FanOutOnWriteService < BaseService
 
     unless @options[:skip_notifications]
       notify_mentioned_accounts!
+      notify_for_conversation! if @status.limited_visibility?
       notify_about_update! if update?
     end
 
     case @status.visibility.to_sym
-    when :public, :unlisted, :private
+    when :public, :unlisted, :public_unlisted, :login, :private
       deliver_to_all_followers!
       deliver_to_lists!
+      deliver_to_antennas!
+      deliver_to_stl_antennas! if Setting.enable_local_timeline
+      deliver_to_ltl_antennas! if Setting.enable_local_timeline
     when :limited
+      deliver_to_lists_mentioned_accounts_only!
+      deliver_to_antennas!
+      deliver_to_stl_antennas! if Setting.enable_local_timeline
       deliver_to_mentioned_followers!
     else
       deliver_to_mentioned_followers!
@@ -65,6 +77,11 @@ class FanOutOnWriteService < BaseService
     broadcast_to_public_streams!
   end
 
+  def fan_out_to_unlisted_public_streams!
+    broadcast_to_hashtag_streams!
+    deliver_to_hashtag_followers!
+  end
+
   def deliver_to_self!
     FeedManager.instance.push_to_home(@account, @status, update: update?) if @account.local?
   end
@@ -86,8 +103,19 @@ class FanOutOnWriteService < BaseService
     end
   end
 
+  def notify_for_conversation!
+    return if @status.conversation.nil?
+
+    account_ids = @status.conversation.statuses.pluck(:account_id).uniq.reject { |account_id| account_id == @status.account_id }
+    @status.silent_mentions.where(account_id: account_ids).joins(:account).merge(Account.local).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
+      LocalNotificationWorker.push_bulk(mentions) do |mention|
+        [mention.account_id, mention.id, 'Mention', 'mention']
+      end
+    end
+  end
+
   def notify_about_update!
-    @status.reblogged_by_accounts.merge(Account.local).select(:id).reorder(nil).find_in_batches do |accounts|
+    @status.reblogged_by_accounts.or(@status.quoted_by_accounts).merge(Account.local).select(:id).reorder(nil).find_in_batches do |accounts|
       LocalNotificationWorker.push_bulk(accounts) do |account|
         [account.id, @status.id, 'Status', 'update']
       end
@@ -118,6 +146,27 @@ class FanOutOnWriteService < BaseService
     end
   end
 
+  def deliver_to_lists_mentioned_accounts_only!
+    mentioned_account_ids = @status.mentions.pluck(:account_id)
+    @account.lists_for_local_distribution.where(account_id: mentioned_account_ids).select(:id).reorder(nil).find_in_batches do |lists|
+      FeedInsertWorker.push_bulk(lists) do |list|
+        [@status.id, list.id, 'list', { 'update' => update? }]
+      end
+    end
+  end
+
+  def deliver_to_stl_antennas!
+    DeliveryAntennaService.new.call(@status, @options[:update], mode: :stl)
+  end
+
+  def deliver_to_ltl_antennas!
+    DeliveryAntennaService.new.call(@status, @options[:update], mode: :ltl)
+  end
+
+  def deliver_to_antennas!
+    DeliveryAntennaService.new.call(@status, @options[:update], mode: :home)
+  end
+
   def deliver_to_mentioned_followers!
     @status.mentions.joins(:account).merge(@account.followers_for_local_distribution).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
       FeedInsertWorker.push_bulk(mentions) do |mention|
@@ -129,7 +178,7 @@ class FanOutOnWriteService < BaseService
   def broadcast_to_hashtag_streams!
     @status.tags.map(&:name).each do |hashtag|
       redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", anonymous_payload)
-      redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", anonymous_payload) if @status.local?
+      redis.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}:local", anonymous_payload) if @status.local? && Setting.enable_local_timeline
     end
   end
 
@@ -137,11 +186,13 @@ class FanOutOnWriteService < BaseService
     return if @status.reply? && @status.in_reply_to_account_id != @account.id
 
     redis.publish('timeline:public', anonymous_payload)
-    redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
+    redis.publish('timeline:public:remote', anonymous_payload) unless @status.local?
+    redis.publish('timeline:public:local', anonymous_payload) if @status.local? && Setting.enable_local_timeline
 
     if @status.with_media?
       redis.publish('timeline:public:media', anonymous_payload)
-      redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
+      redis.publish('timeline:public:remote:media', anonymous_payload) unless @status.local?
+      redis.publish('timeline:public:local:media', anonymous_payload) if @status.local? && Setting.enable_local_timeline
     end
   end
 
@@ -161,7 +212,7 @@ class FanOutOnWriteService < BaseService
   end
 
   def rendered_status
-    @rendered_status ||= InlineRenderer.render(@status, nil, :status)
+    @rendered_status ||= InlineRenderer.render(@status, nil, :status_internal)
   end
 
   def update?
@@ -169,7 +220,11 @@ class FanOutOnWriteService < BaseService
   end
 
   def broadcastable?
-    @status.public_visibility? && !@status.reblog? && !@account.silenced?
+    (@status.public_visibility? || @status.public_unlisted_visibility? || @status.login_visibility?) && !@status.reblog? && !@account.silenced?
+  end
+
+  def broadcastable_unlisted_public?
+    @status.unlisted_visibility? && @status.compute_searchability == 'public' && !@status.reblog? && !@account.silenced?
   end
 
   def subscribed_to_streaming_api?(account_id)
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index ded50187f7..50ed5831ea 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -3,6 +3,7 @@
 class FavouriteService < BaseService
   include Authorization
   include Payloadable
+  include NgRuleHelper
 
   # Favourite a status and notify remote user
   # @param [Account] account
@@ -11,6 +12,8 @@ class FavouriteService < BaseService
   def call(account, status)
     authorize_with account, status, :favourite?
 
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless check_invalid_reaction_for_ng_rule! account, reaction_type: 'favourite', recipient: status.account, target_status: status
+
     favourite = Favourite.find_by(account: account, status: status)
 
     return favourite unless favourite.nil?
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c6b600dd7c..30e4f23abb 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -3,6 +3,7 @@
 class FetchLinkCardService < BaseService
   include Redisable
   include Lockable
+  include FormattingHelper
 
   URL_PATTERN = %r{
     (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceding chars
@@ -80,12 +81,33 @@ class FetchLinkCardService < BaseService
              links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
            end
 
+    exclude_urls = referenced_urls
+    urls = urls.filter { |url| exclude_urls.exclude?(url.to_s) }
+
     urls.reject { |uri| bad_url?(uri) }.first
   end
 
+  def referenced_urls
+    referenced_urls_raw.filter { |uri| ActivityPub::TagManager.instance.uri_to_resource(uri, Status, url: true).present? }
+  end
+
+  def referenced_urls_raw
+    unless @status.local?
+      document = Nokogiri::HTML(@status.text)
+      document.search('a[href^="http://"]', 'a[href^="https://"]').each do |link|
+        link.replace(link['href']) if link['href']
+      end
+
+      return PlainTextFormatter.new(document.to_s, false).to_s.scan(ProcessReferencesService::REFURL_EXP).pluck(3).uniq
+    end
+
+    extract_status_plain_text(@status).scan(ProcessReferencesService::REFURL_EXP).pluck(3).uniq
+  end
+
   def bad_url?(uri)
     # Avoid local instance URLs and invalid URLs
-    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
+    uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) ||
+      referenced_urls.include?(uri.to_s) || Setting.stop_link_preview_domains&.include?(uri.host)
   end
 
   def mention_link?(anchor)
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index a3406e5a57..84c36f6a10 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -44,11 +44,19 @@ class FetchResourceService < BaseService
     @response_code = response.code
     return nil if response.code != 200
 
-    if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
+    if valid_activitypub_content_type?(response)
       body = response.body_with_limit
       json = body_to_json(body)
 
-      [json['id'], { prefetched_body: body, id: true }] if supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) || expected_type?(json))
+      return unless supported_context?(json) && (equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteActorService::SUPPORTED_TYPES) || expected_type?(json))
+
+      if json['id'] != @url
+        return if terminal
+
+        return process(json['id'], terminal: true)
+      end
+
+      [@url, { prefetched_body: body }]
     elsif !terminal
       link_header = response['Link'] && parse_link_header(response)
 
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index af5f996077..f269916c4d 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -4,6 +4,7 @@ class FollowService < BaseService
   include Redisable
   include Payloadable
   include DomainControlHelper
+  include NgRuleHelper
 
   # Follow a remote user, notify remote user about the follow
   # @param [Account] source_account From which to follow
@@ -23,6 +24,8 @@ class FollowService < BaseService
     raise ActiveRecord::RecordNotFound if following_not_possible?
     raise Mastodon::NotPermittedError  if following_not_allowed?
 
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless check_invalid_reaction_for_ng_rule! @source_account, reaction_type: 'follow', recipient: @target_account
+
     if @source_account.following?(@target_account)
       return change_follow_options!
     elsif @source_account.requested?(@target_account)
@@ -36,7 +39,7 @@ class FollowService < BaseService
     # and the feeds are being merged
     mark_home_feed_as_partial! if @source_account.not_following_anyone?
 
-    if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub?
+    if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub? || (@source_account.bot? && @target_account.user&.setting_lock_follow_from_bot)
       request_follow!
     elsif @target_account.local?
       direct_follow!
diff --git a/app/services/group_reblog_service.rb b/app/services/group_reblog_service.rb
new file mode 100644
index 0000000000..b754391dda
--- /dev/null
+++ b/app/services/group_reblog_service.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class GroupReblogService < BaseService
+  def call(status)
+    return nil if status.account.group?
+
+    visibility = status.visibility.to_sym
+    return nil unless %i(public public_unlisted unlisted login).include?(visibility)
+
+    status.mentions.map(&:account).each do |account|
+      next unless account.local?
+      next unless status.account.following?(account)
+      next unless account.group?
+      next if account.id == status.account_id
+
+      ReblogService.new.call(account, status, { visibility: status.visibility })
+    end
+  end
+end
diff --git a/app/services/keys/query_service.rb b/app/services/keys/query_service.rb
index 14c9d9205b..33e13293f3 100644
--- a/app/services/keys/query_service.rb
+++ b/app/services/keys/query_service.rb
@@ -69,7 +69,7 @@ class Keys::QueryService < BaseService
 
     return if json['items'].blank?
 
-    @devices = json['items'].map do |device|
+    @devices = as_array(json['items']).map do |device|
       Device.new(device_id: device['id'], name: device['name'], identity_key: device.dig('identityKey', 'publicKeyBase64'), fingerprint_key: device.dig('fingerprintKey', 'publicKeyBase64'), claim_url: device['claim'])
     end
   rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error => e
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 13eb20986e..3716d38f92 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -8,129 +8,213 @@ class NotifyService < BaseService
     admin.sign_up
     update
     poll
+    emoji_reaction
+    status_reference
     status
+    list_status
+    moderation_warning
+    # TODO: this probably warrants an email notification
+    severed_relationships
   ).freeze
 
+  class DismissCondition
+    def initialize(notification)
+      @recipient = notification.account
+      @sender = notification.from_account
+      @notification = notification
+    end
+
+    def dismiss?
+      blocked   = @recipient.unavailable?
+      blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
+
+      return blocked if message? && from_staff?
+
+      blocked ||= domain_blocking?
+      blocked ||= @recipient.blocking?(@sender)
+      blocked ||= @recipient.muting_notifications?(@sender)
+      blocked ||= conversation_muted?
+      blocked ||= blocked_mention? if message?
+      blocked
+    end
+
+    private
+
+    def blocked_mention?
+      FeedManager.instance.filter?(:mentions, @notification.target_status, @recipient)
+    end
+
+    def message?
+      @notification.type == :mention
+    end
+
+    def from_staff?
+      @sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
+    end
+
+    def from_self?
+      @recipient.id == @sender.id
+    end
+
+    def domain_blocking?
+      @recipient.domain_blocking?(@sender.domain) && !following_sender?
+    end
+
+    def conversation_muted?
+      @notification.target_status && @recipient.muting_conversation?(@notification.target_status.conversation)
+    end
+
+    def following_sender?
+      @recipient.following?(@sender)
+    end
+  end
+
+  class FilterCondition
+    NEW_ACCOUNT_THRESHOLD = 30.days.freeze
+
+    NEW_FOLLOWER_THRESHOLD = 3.days.freeze
+
+    NON_FILTERABLE_TYPES = %i(
+      admin.sign_up
+      admin.report
+      poll
+      update
+      account_warning
+    ).freeze
+
+    def initialize(notification)
+      @notification = notification
+      @recipient = notification.account
+      @sender = notification.from_account
+      @policy = NotificationPolicy.find_or_initialize_by(account: @recipient)
+    end
+
+    def filter?
+      return false unless Notification::PROPERTIES[@notification.type][:filterable]
+      return false if override_for_sender?
+
+      from_limited? ||
+        filtered_by_not_following_policy? ||
+        filtered_by_not_followers_policy? ||
+        filtered_by_new_accounts_policy? ||
+        filtered_by_private_mentions_policy?
+    end
+
+    private
+
+    def filtered_by_not_following_policy?
+      @policy.filter_not_following? && not_following?
+    end
+
+    def filtered_by_not_followers_policy?
+      @policy.filter_not_followers? && not_follower?
+    end
+
+    def filtered_by_new_accounts_policy?
+      @policy.filter_new_accounts? && new_account?
+    end
+
+    def filtered_by_private_mentions_policy?
+      @policy.filter_private_mentions? && not_following? && private_mention_not_in_response?
+    end
+
+    def not_following?
+      !@recipient.following?(@sender)
+    end
+
+    def not_follower?
+      follow = Follow.find_by(account: @sender, target_account: @recipient)
+      follow.nil? || follow.created_at > NEW_FOLLOWER_THRESHOLD.ago
+    end
+
+    def new_account?
+      @sender.created_at > NEW_ACCOUNT_THRESHOLD.ago
+    end
+
+    def override_for_sender?
+      NotificationPermission.exists?(account: @recipient, from_account: @sender)
+    end
+
+    def from_limited?
+      @sender.silenced? && not_following?
+    end
+
+    def private_mention_not_in_response?
+      @notification.type == :mention && @notification.target_status.direct_visibility? && !response_to_recipient?
+    end
+
+    def response_to_recipient?
+      return false if @notification.target_status.in_reply_to_id.nil?
+
+      statuses_that_mention_sender.positive?
+    end
+
+    def statuses_that_mention_sender
+      Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @sender.id, depth_limit: 100])
+        WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
+            SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
+            FROM statuses s
+            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+            WHERE s.id = :id
+          UNION ALL
+            SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
+            FROM ancestors st
+            JOIN statuses s ON s.id = st.in_reply_to_id
+            LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
+            WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
+        )
+        SELECT COUNT(*)
+        FROM ancestors st
+        JOIN statuses s ON s.id = st.id
+        WHERE st.mention_id IS NOT NULL AND s.visibility = 3
+      SQL
+    end
+  end
+
   def call(recipient, type, activity)
+    return if recipient.user.nil?
+
     @recipient    = recipient
     @activity     = activity
     @notification = Notification.new(account: @recipient, type: type, activity: @activity)
 
-    return if recipient.user.nil? || blocked?
+    # For certain conditions we don't need to create a notification at all
+    return if dismiss?
 
+    @notification.filtered = filter?
     @notification.save!
 
     # It's possible the underlying activity has been deleted
     # between the save call and now
     return if @notification.activity.nil?
 
-    push_notification!
-    push_to_conversation! if direct_message?
-    send_email! if email_needed?
+    if @notification.filtered?
+      update_notification_request!
+    else
+      push_notification!
+      push_to_conversation! if direct_message?
+      send_email! if email_needed?
+    end
   rescue ActiveRecord::RecordInvalid
     nil
   end
 
   private
 
-  def blocked_mention?
-    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
+  def dismiss?
+    DismissCondition.new(@notification).dismiss?
   end
 
-  def following_sender?
-    return @following_sender if defined?(@following_sender)
-
-    @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
+  def filter?
+    FilterCondition.new(@notification).filter?
   end
 
-  def optional_non_follower?
-    @recipient.user.settings['interactions.must_be_follower']  && !@notification.from_account.following?(@recipient)
-  end
+  def update_notification_request!
+    return unless @notification.type == :mention
 
-  def optional_non_following?
-    @recipient.user.settings['interactions.must_be_following'] && !following_sender?
-  end
-
-  def message?
-    @notification.type == :mention
-  end
-
-  def direct_message?
-    message? && @notification.target_status.direct_visibility?
-  end
-
-  # Returns true if the sender has been mentioned by the recipient up the thread
-  def response_to_recipient?
-    return false if @notification.target_status.in_reply_to_id.nil?
-
-    # Using an SQL CTE to avoid unneeded back-and-forth with SQL server in case of long threads
-    !Status.count_by_sql([<<-SQL.squish, id: @notification.target_status.in_reply_to_id, recipient_id: @recipient.id, sender_id: @notification.from_account.id, depth_limit: 100]).zero?
-      WITH RECURSIVE ancestors(id, in_reply_to_id, mention_id, path, depth) AS (
-          SELECT s.id, s.in_reply_to_id, m.id, ARRAY[s.id], 0
-          FROM statuses s
-          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-          WHERE s.id = :id
-        UNION ALL
-          SELECT s.id, s.in_reply_to_id, m.id, st.path || s.id, st.depth + 1
-          FROM ancestors st
-          JOIN statuses s ON s.id = st.in_reply_to_id
-          LEFT JOIN mentions m ON m.silent = FALSE AND m.account_id = :sender_id AND m.status_id = s.id
-          WHERE st.mention_id IS NULL AND NOT s.id = ANY(path) AND st.depth < :depth_limit
-      )
-      SELECT COUNT(*)
-      FROM ancestors st
-      JOIN statuses s ON s.id = st.id
-      WHERE st.mention_id IS NOT NULL AND s.visibility = 3
-    SQL
-  end
-
-  def from_staff?
-    @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user_role&.overrides?(@recipient.user_role)
-  end
-
-  def optional_non_following_and_direct?
-    direct_message? &&
-      @recipient.user.settings['interactions.must_be_following_dm'] &&
-      !following_sender? &&
-      !response_to_recipient?
-  end
-
-  def hellbanned?
-    @notification.from_account.silenced? && !following_sender?
-  end
-
-  def from_self?
-    @recipient.id == @notification.from_account.id
-  end
-
-  def domain_blocking?
-    @recipient.domain_blocking?(@notification.from_account.domain) && !following_sender?
-  end
-
-  def blocked?
-    blocked   = @recipient.unavailable?
-    blocked ||= from_self? && @notification.type != :poll
-
-    return blocked if message? && from_staff?
-
-    blocked ||= domain_blocking?
-    blocked ||= @recipient.blocking?(@notification.from_account)
-    blocked ||= @recipient.muting_notifications?(@notification.from_account)
-    blocked ||= hellbanned?
-    blocked ||= optional_non_follower?
-    blocked ||= optional_non_following?
-    blocked ||= optional_non_following_and_direct?
-    blocked ||= conversation_muted?
-    blocked ||= blocked_mention? if @notification.type == :mention
-    blocked
-  end
-
-  def conversation_muted?
-    if @notification.target_status
-      @recipient.muting_conversation?(@notification.target_status.conversation)
-    else
-      false
-    end
+    notification_request = NotificationRequest.find_or_initialize_by(account_id: @recipient.id, from_account_id: @notification.from_account_id)
+    notification_request.last_status_id = @notification.target_status.id
+    notification_request.save
   end
 
   def push_notification!
@@ -150,6 +234,10 @@ class NotifyService < BaseService
     AccountConversation.add_status(@recipient, @notification.target_status)
   end
 
+  def direct_message?
+    @notification.type == :mention && @notification.target_status.direct_visibility?
+  end
+
   def push_to_web_push_subscriptions!
     ::Web::PushNotificationWorker.push_bulk(web_push_subscriptions.select { |subscription| subscription.pushable?(@notification) }) { |subscription| [subscription.id, @notification.id] }
   end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 8aa43ab245..e84cc2b23b 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -3,6 +3,8 @@
 class PostStatusService < BaseService
   include Redisable
   include LanguagesHelper
+  include DtlHelper
+  include NgRuleHelper
 
   MIN_SCHEDULE_OFFSET = 5.minutes.freeze
 
@@ -22,7 +24,10 @@ class PostStatusService < BaseService
   # @option [Status] :thread Optional status to reply to
   # @option [Boolean] :sensitive
   # @option [String] :visibility
+  # @option [Boolean] :force_visibility
+  # @option [String] :searchability
   # @option [String] :spoiler_text
+  # @option [Boolean] :markdown
   # @option [String] :language
   # @option [String] :scheduled_at
   # @option [Hash] :poll Optional poll to attach
@@ -31,6 +36,7 @@ class PostStatusService < BaseService
   # @option [String] :idempotency Optional idempotency key
   # @option [Boolean] :with_rate_limit
   # @option [Enumerable] :allowed_mentions Optional array of expected mentioned account IDs, raises `UnexpectedMentionsError` if unexpected accounts end up in mentions
+  # @option [Enumerable] :status_reference_ids Optional array
   # @return [Status]
   def call(account, options = {})
     @account     = account
@@ -40,6 +46,7 @@ class PostStatusService < BaseService
 
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
+    validate_status!
     validate_media!
     preprocess_attributes!
 
@@ -64,23 +71,103 @@ class PostStatusService < BaseService
   def preprocess_attributes!
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
-    @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
-    @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
+    @visibility   = visibility
+    @limited_scope = @options[:visibility]&.to_sym if @visibility == :limited && @options[:visibility] != 'limited'
+    @searchability = searchability
+    @searchability = :private if @account.silenced? && %i(public public_unlisted).include?(@searchability&.to_sym)
+    @markdown     = @options[:markdown] || false
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+    @reference_ids = (@options[:status_reference_ids] || []).map(&:to_i).filter(&:positive?)
+    raise ArgumentError if !Setting.enable_public_unlisted_visibility && (@visibility == :public_unlisted || @searchability == :public_unlisted)
+    raise ArgumentError if @account.user&.setting_disabled_visibilities&.include?((@limited_scope || @visibility).to_s)
+
+    if @in_reply_to.present? && ((@options[:visibility] == 'limited' && @options[:circle_id].nil?) || @limited_scope == :reply)
+      @visibility = :limited
+      @limited_scope = :reply
+    end
+
+    load_circle
+    overwrite_dtl_post
+    process_sensitive_words
   rescue ArgumentError
     raise ActiveRecord::RecordInvalid
   end
 
+  def visibility
+    v = @options[:visibility]&.to_sym || @account.user&.setting_default_privacy&.to_sym
+    v = :limited if %w(mutual circle reply).include?(@options[:visibility])
+    v = :unlisted if %i(public public_unlisted login).include?(v) && @account.silenced?
+    v = :public_unlisted if v == :public && !@options[:force_visibility] && !@options[:application]&.superapp && @account.user&.setting_public_post_to_unlisted && Setting.enable_public_unlisted_visibility
+    v = Setting.enable_public_unlisted_visibility ? :public_unlisted : :unlisted if !Setting.enable_public_visibility && v == :public
+    v
+  end
+
+  def load_circle
+    return if @visibility == :limited && @limited_scope == :reply && @in_reply_to.present?
+    return unless %w(circle limited reply).include?(@options[:visibility])
+    raise ArgumentError if @options[:circle_id].nil?
+
+    @circle = @options[:circle_id].present? && Circle.find(@options[:circle_id])
+    @limited_scope = :circle
+    raise ArgumentError if @circle.nil? || @circle.account_id != @account.id
+  end
+
+  def overwrite_dtl_post
+    return unless dtl_enabled?
+
+    raw_tags = Extractor.extract_hashtags(@text)
+    return if raw_tags.exclude?(dtl_tag_name)
+    return unless %i(public public_unlisted unlisted).include?(@visibility)
+
+    @visibility = @account.user&.setting_dtl_force_visibility if %i(public public_unlisted unlisted).include?(@account.user&.setting_dtl_force_visibility)
+    @searchability = @account.user&.setting_dtl_force_searchability if %i(public public_unlisted).include?(@account.user&.setting_dtl_force_searchability)
+    @dtl = true
+  end
+
+  def process_sensitive_words
+    if [:public, :public_unlisted, :login].include?(@visibility&.to_sym) && Admin::SensitiveWord.sensitive?(@text, @options[:spoiler_text] || '')
+      @text = Admin::SensitiveWord.modified_text(@text, @options[:spoiler_text])
+      @options[:spoiler_text] = Admin::SensitiveWord.alternative_text
+      @sensitive = true
+    end
+  end
+
+  def searchability
+    return :private if %i(public public_unlisted).include?(@options[:searchability]&.to_sym) && @visibility&.to_sym == :unlisted && @account.user&.setting_disallow_unlisted_public_searchability
+
+    case @options[:searchability]&.to_sym
+    when :public
+      case @visibility&.to_sym when :public, :public_unlisted, :login, :unlisted then :public when :private then :private else :direct end
+    when :public_unlisted
+      case @visibility&.to_sym when :public, :public_unlisted, :login, :unlisted then :public_unlisted when :private then :private else :direct end
+    when :private
+      case @visibility&.to_sym when :public, :public_unlisted, :login, :unlisted, :private then :private else :direct end
+    when :direct
+      :direct
+    when nil
+      @account.user&.setting_default_searchability || @account.searchability
+    else
+      :limited
+    end
+  end
+
   def process_status!
     @status = @account.statuses.new(status_attributes)
-    process_mentions_service.call(@status, save_records: false)
+    process_mentions_service.call(@status, limited_type: @status.limited_visibility? ? @limited_scope : '', circle: @circle, save_records: false)
     safeguard_mentions!(@status)
+    validate_status_ng_rules!
+    validate_status_mentions!
+
+    @status.limited_scope = :personal if @status.limited_visibility? && !@status.reply_limited? && !process_mentions_service.mentions?
+
+    UpdateStatusExpirationService.new.call(@status)
 
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
     ApplicationRecord.transaction do
       @status.save!
+      @status.capability_tokens.create! if @status.limited_visibility?
     end
   end
 
@@ -116,12 +203,79 @@ class PostStatusService < BaseService
   end
 
   def postprocess_status!
+    @account.user.update!(settings_attributes: { default_privacy: @options[:visibility] }) if @account.user&.setting_stay_privacy && !@status.reply? && %i(public public_unlisted login unlisted
+                                                                                                                                                           private).include?(@status.visibility.to_sym) && @status.visibility.to_s != @account.user&.setting_default_privacy && !@dtl
+
     process_hashtags_service.call(@status)
     Trends.tags.register(@status)
+    ProcessConversationService.new.call(@status) if @status.limited_visibility? && @status.reply_limited?
+    ProcessReferencesService.call_service(@status, @reference_ids, [])
     LinkCrawlWorker.perform_async(@status.id)
     DistributionWorker.perform_async(@status.id)
-    ActivityPub::DistributionWorker.perform_async(@status.id)
+    ActivityPub::DistributionWorker.perform_async(@status.id) unless @status.personal_limited?
     PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
+    GroupReblogService.new.call(@status) unless @status.personal_limited?
+  end
+
+  def validate_status!
+    raise Mastodon::ValidationError, I18n.t('statuses.contains_ng_words') if Admin::NgWord.reject?("#{@options[:spoiler_text]}\n#{@options[:text]}")
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_hashtags') if Admin::NgWord.hashtag_reject_with_extractor?(@text)
+  end
+
+  def validate_status_mentions!
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_mentions') if Admin::NgWord.mention_reject_with_extractor?(@text)
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_mentions') if (mention_to_stranger? || reference_to_stranger?) && Admin::NgWord.stranger_mention_reject_with_extractor?(@text)
+    raise Mastodon::ValidationError, I18n.t('statuses.contains_ng_words') if (mention_to_stranger? || reference_to_stranger?) && Setting.stranger_mention_from_local_ng && Admin::NgWord.stranger_mention_reject?("#{@options[:spoiler_text]}\n#{@options[:text]}")
+  end
+
+  def validate_status_ng_rules!
+    result = check_invalid_status_for_ng_rule! @account,
+                                               reaction_type: 'create',
+                                               spoiler_text: @options[:spoiler_text] || '',
+                                               text: @text,
+                                               tag_names: Extractor.extract_hashtags(@text) || [],
+                                               visibility: @visibility.to_s,
+                                               searchability: @searchability.to_s,
+                                               sensitive: @sensitive,
+                                               media_count: (@media || []).size,
+                                               poll_count: @options.dig(:poll, 'options')&.size || 0,
+                                               quote: quote_url,
+                                               reply: @in_reply_to.present?,
+                                               mention_count: mention_count,
+                                               reference_count: reference_urls.size,
+                                               mention_to_following: !(mention_to_stranger? || reference_to_stranger?)
+
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless result
+  end
+
+  def mention_count
+    @text.gsub(Account::MENTION_RE)&.count || 0
+  end
+
+  def mention_to_stranger?
+    return @mention_to_stranger if defined?(@mention_to_stranger)
+
+    @mention_to_stranger = @status.mentions.map(&:account).to_a.any? { |mentioned_account| !mentioned_account.following_or_self?(@account) } ||
+                           (@in_reply_to && !@in_reply_to.account.following_or_self?(@account))
+  end
+
+  def reference_to_stranger?
+    referred_statuses.any? { |status| !status.account.following_or_self?(@account) }
+  end
+
+  def referred_statuses
+    statuses = reference_urls.filter_map { |uri| ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Status, url: true) }
+    statuses += Status.where(id: @reference_ids) if @reference_ids.present?
+
+    statuses
+  end
+
+  def quote_url
+    ProcessReferencesService.extract_quote(@text)
+  end
+
+  def reference_urls
+    @reference_urls ||= ProcessReferencesService.extract_uris(@text) || []
   end
 
   def validate_media!
@@ -130,16 +284,18 @@ class PostStatusService < BaseService
       return
     end
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+    media_max = @options[:poll] ? MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL : MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX
 
-    @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > media_max
+
+    @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(media_max).map(&:to_i))
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?)
   end
 
   def process_mentions_service
-    ProcessMentionsService.new
+    @process_mentions_service ||= ProcessMentionsService.new
   end
 
   def process_hashtags_service
@@ -160,7 +316,7 @@ class PostStatusService < BaseService
 
   def idempotency_duplicate
     if scheduled?
-      @account.schedule_statuses.find(@idempotency_duplicate)
+      @account.scheduled_statuses.find(@idempotency_duplicate)
     else
       @account.statuses.find(@idempotency_duplicate)
     end
@@ -186,10 +342,14 @@ class PostStatusService < BaseService
       media_attachments: @media || [],
       ordered_media_attachment_ids: (@options[:media_ids] || []).map(&:to_i) & @media.map(&:id),
       thread: @in_reply_to,
+      status_reference_ids: @status_reference_ids,
       poll_attributes: poll_attributes,
       sensitive: @sensitive,
       spoiler_text: @options[:spoiler_text] || '',
+      markdown: @markdown,
       visibility: @visibility,
+      limited_scope: @limited_scope || :none,
+      searchability: @searchability,
       language: valid_locale_cascade(@options[:language], @account.user&.preferred_posting_language, I18n.default_locale),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
@@ -211,7 +371,7 @@ class PostStatusService < BaseService
   end
 
   def scheduled_options
-    @options.tap do |options_hash|
+    @options.dup.tap do |options_hash|
       options_hash[:in_reply_to_id]  = options_hash.delete(:thread)&.id
       options_hash[:application_id]  = options_hash.delete(:application)&.id
       options_hash[:scheduled_at]    = nil
diff --git a/app/services/process_conversation_service.rb b/app/services/process_conversation_service.rb
new file mode 100644
index 0000000000..7facbb5a42
--- /dev/null
+++ b/app/services/process_conversation_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class ProcessConversationService < BaseService
+  def call(status)
+    @status = status
+
+    return if !@status.limited_visibility? || @status.conversation.nil?
+
+    duplicate_reply!
+  end
+
+  private
+
+  def thread
+    @thread ||= @status.thread || @status.conversation.ancestor_status
+  end
+
+  def duplicate_reply!
+    return unless @status.conversation.local?
+    return if !@status.reply? || thread.nil?
+    return if thread.conversation_id != @status.conversation_id
+
+    mentioned_account_ids = @status.mentions.pluck(:account_id)
+
+    thread.mentioned_accounts.find_each do |account|
+      @status.mentions << @status.mentions.new(silent: true, account: account) unless mentioned_account_ids.include?(account.id)
+      mentioned_account_ids << account.id
+    end
+    @status.mentions << @status.mentions.new(silent: true, account: thread.account) unless mentioned_account_ids.include?(thread.account.id)
+
+    @status.save!
+  end
+end
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 1c4c7805f1..ebd5d260f0 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -7,8 +7,10 @@ class ProcessMentionsService < BaseService
   # and create local mention pointers
   # @param [Status] status
   # @param [Boolean] save_records Whether to save records in database
-  def call(status, save_records: true)
+  def call(status, limited_type: '', circle: nil, save_records: true)
     @status = status
+    @limited_type = limited_type
+    @circle = circle
     @save_records = save_records
 
     return unless @status.local?
@@ -22,6 +24,10 @@ class ProcessMentionsService < BaseService
     end
   end
 
+  def mentions?
+    @current_mentions.present?
+  end
+
   private
 
   def scan_text!
@@ -62,6 +68,9 @@ class ProcessMentionsService < BaseService
       "@#{mentioned_account.acct}"
     end
 
+    process_mutual! if @limited_type == :mutual
+    process_circle! if @limited_type == :circle
+
     @status.save! if @save_records
   end
 
@@ -92,4 +101,25 @@ class ProcessMentionsService < BaseService
   def mention_undeliverable?(mentioned_account)
     mentioned_account.nil? || (!mentioned_account.local? && !mentioned_account.activitypub?)
   end
+
+  def process_mutual!
+    mentioned_account_ids = @current_mentions.map(&:account_id)
+
+    mutuals = @status.account.mutuals
+    mutuals = mutuals.where.not(domain: InstanceInfo.where(software: 'misskey').select(:domain)).or(mutuals.where(domain: nil)) if @status.account.user&.setting_reject_send_limited_to_suspects
+
+    mutuals.reorder(nil).find_each do |target_account|
+      @current_mentions << @status.mentions.new(silent: true, account: target_account) unless mentioned_account_ids.include?(target_account.id)
+    end
+  end
+
+  def process_circle!
+    mentioned_account_ids = @current_mentions.map(&:account_id)
+
+    @circle.accounts.find_each do |target_account|
+      @current_mentions << @status.mentions.new(silent: true, account: target_account) unless mentioned_account_ids.include?(target_account.id)
+    end
+
+    @circle.statuses << @status
+  end
 end
diff --git a/app/services/process_references_service.rb b/app/services/process_references_service.rb
new file mode 100644
index 0000000000..bbb22a0575
--- /dev/null
+++ b/app/services/process_references_service.rb
@@ -0,0 +1,254 @@
+# frozen_string_literal: true
+
+class ProcessReferencesService < BaseService
+  include Payloadable
+  include FormattingHelper
+  include Redisable
+  include Lockable
+
+  DOMAIN = ENV['WEB_DOMAIN'] || ENV.fetch('LOCAL_DOMAIN', nil)
+  REFURL_EXP = /(RT|QT|BT|RN|RE)((:|;)?\s+|:|;)(#{URI::DEFAULT_PARSER.make_regexp(%w(http https))})/
+  QUOTEURL_EXP = /(QT|RN|RE)((:|;)?\s+|:|;)(#{URI::DEFAULT_PARSER.make_regexp(%w(http https))})/
+  MAX_REFERENCES = 5
+
+  def call(status, reference_parameters, urls: nil, fetch_remote: true, no_fetch_urls: nil, quote_urls: nil)
+    @status = status
+    @reference_parameters = reference_parameters || []
+    @quote_urls = quote_urls || []
+    @urls = (urls - @quote_urls) || []
+    @no_fetch_urls = no_fetch_urls || []
+    @fetch_remote = fetch_remote
+    @again = false
+
+    @attributes = {}
+
+    with_redis_lock("process_status_refs:#{@status.id}") do
+      @references_count = @status.reference_objects.count
+      build_references_diff
+
+      if @added_items.present? || @removed_items.present? || @changed_items.present?
+        StatusReference.transaction do
+          remove_old_references
+          add_references
+          change_reference_attributes
+
+          @status.save!
+        end
+
+        create_notifications!
+      end
+    end
+
+    launch_worker if @again
+  end
+
+  def self.need_process?(status, reference_parameters, urls, quote_urls)
+    reference_parameters.any? || (urls || []).any? || (quote_urls || []).any? || FormattingHelper.extract_status_plain_text(status).scan(REFURL_EXP).pluck(3).uniq.any?
+  end
+
+  def self.extract_uris(text, remote: false)
+    return text.scan(REFURL_EXP).pluck(3) unless remote
+
+    PlainTextFormatter.new(text, false).to_s.scan(REFURL_EXP).pluck(3)
+  end
+
+  def self.extract_quote(text)
+    text.scan(QUOTEURL_EXP).pick(3)
+  end
+
+  def self.perform_worker_async(status, reference_parameters, urls, quote_urls)
+    return unless need_process?(status, reference_parameters, urls, quote_urls)
+
+    ProcessReferencesWorker.perform_async(status.id, reference_parameters, urls, [], quote_urls || [])
+  end
+
+  def self.call_service(status, reference_parameters, urls, quote_urls = [])
+    return unless need_process?(status, reference_parameters, urls, quote_urls)
+
+    ProcessReferencesService.new.call(status, reference_parameters || [], urls: urls || [], fetch_remote: false, quote_urls: quote_urls)
+  end
+
+  def self.call_service_without_error(status, reference_parameters, urls, quote_urls = [])
+    return unless need_process?(status, reference_parameters, urls, quote_urls)
+
+    begin
+      ProcessReferencesService.new.call(status, reference_parameters || [], urls: urls || [], quote_urls: quote_urls)
+    rescue
+      true
+    end
+  end
+
+  private
+
+  def build_old_references
+    @status.reference_objects.pluck(:target_status_id, :attribute_type).to_h
+  end
+
+  def build_new_references
+    scan_text_and_quotes.tap do |status_id_to_attributes|
+      @reference_parameters.each do |status_id|
+        id_num = status_id.to_i
+        status_id_to_attributes[id_num] = 'BT' unless id_num.positive? && status_id_to_attributes.key?(id_num)
+      end
+    end
+  end
+
+  def build_references_diff
+    olds = build_old_references
+    news = build_new_references
+
+    @changed_items = {}
+    @added_items = {}
+    @removed_items = {}
+
+    news.each_key do |status_id|
+      exist_attribute = olds[status_id]
+
+      @added_items[status_id] = news[status_id] if exist_attribute.nil?
+      @changed_items[status_id] = news[status_id] if olds.key?(status_id) && exist_attribute != news[status_id]
+    end
+
+    olds.each_key do |status_id|
+      new_attribute = news[status_id]
+
+      @removed_items[status_id] = olds[status_id] if new_attribute.nil?
+    end
+  end
+
+  def scan_text_and_quotes
+    text = extract_status_plain_text(@status)
+    url_to_attributes = @urls.index_with('BT')
+                             .merge(text.scan(REFURL_EXP).to_h { |result| [result[3], result[0]] })
+                             .merge(@quote_urls.index_with('QT'))
+
+    url_to_statuses = fetch_statuses(url_to_attributes.keys.uniq)
+
+    @again = true if !@fetch_remote && url_to_statuses.values.any?(&:nil?)
+
+    url_to_statuses.keys.to_h do |url|
+      attribute = url_to_attributes[url] || 'BT'
+      status = url_to_statuses[url]
+
+      if status.present?
+        quote = quote_attribute?(attribute)
+
+        [status.id, !quote || quotable?(status) ? attribute : 'BT']
+      else
+        [url, attribute]
+      end
+    end
+  end
+
+  def quote_attribute?(attribute)
+    %w(QT RE).include?(attribute)
+  end
+
+  def fetch_statuses(urls)
+    urls.to_h do |url|
+      status = url_to_status(url)
+      @no_fetch_urls << url if !@fetch_remote && status.present?
+      [url, status]
+    end
+  end
+
+  def url_to_status(url)
+    status   = ActivityPub::TagManager.instance.uri_to_resource(url, Status, url: true)
+    status ||= ResolveURLService.new.call(url, on_behalf_of: @status.account) unless bad_url_to_fetch?(url)
+    referrable?(status) ? status : nil
+  end
+
+  def bad_url_to_fetch?(url)
+    uri = Addressable::URI.parse(url).normalize
+
+    !@fetch_remote || @no_fetch_urls.include?(url) || uri.host.blank? || Setting.stop_fetch_activity_domains&.include?(uri.host)
+  end
+
+  def referrable?(target_status)
+    return false if target_status.nil?
+    return @referrable if defined?(@referrable)
+
+    @referrable = StatusPolicy.new(@status.account, target_status).show?
+  end
+
+  def quotable?(target_status)
+    target_status.account.allow_quote? && StatusPolicy.new(@status.account, target_status).quote?
+  end
+
+  def add_references
+    return if @added_items.empty?
+
+    @added_objects = []
+
+    statuses = Status.where(id: @added_items.keys).to_a
+    @added_items.each_key do |status_id|
+      status = statuses.find { |s| s.id == status_id }
+      next if status.blank?
+
+      attribute_type = @added_items[status_id]
+      quote = quote_attribute?(attribute_type)
+      @added_objects << @status.reference_objects.new(target_status: status, attribute_type: attribute_type, quote: quote)
+
+      @status.update!(quote_of_id: status_id) if quote
+
+      status.increment_count!(:status_referred_by_count)
+      @references_count += 1
+
+      break if @references_count >= MAX_REFERENCES
+    end
+  end
+
+  def create_notifications!
+    return if @added_objects.blank?
+
+    local_reference_objects = @added_objects.filter { |ref| ref.target_status.account.local? && StatusPolicy.new(ref.target_status.account, ref.status).show? }
+    return if local_reference_objects.empty?
+
+    LocalNotificationWorker.push_bulk(local_reference_objects) do |ref|
+      [ref.target_status.account_id, ref.id, 'StatusReference', 'status_reference']
+    end
+  end
+
+  def remove_old_references
+    return if @removed_items.empty?
+
+    @removed_objects = []
+
+    @status.reference_objects.where(target_status: @removed_items.keys).destroy_all
+    @status.update!(quote_of_id: nil) if @status.quote_of_id.present? && @removed_items.key?(@status.quote_of_id)
+
+    statuses = Status.where(id: @added_items.keys).to_a
+    @removed_items.each_key do |status_id|
+      status = statuses.find { |s| s.id == status_id }
+      next if status.blank?
+
+      status.decrement_count!(:status_referred_by_count)
+      @references_count -= 1
+    end
+  end
+
+  def change_reference_attributes
+    return if @changed_items.empty?
+
+    @changed_objects = []
+
+    @status.reference_objects.where(target_status: @changed_items.keys).find_each do |ref|
+      attribute_type = @changed_items[ref.target_status_id]
+      quote = quote_attribute?(attribute_type)
+      quote_change = ref.quote != quote
+
+      ref.update!(attribute_type: attribute_type, quote: quote)
+
+      next unless quote_change
+
+      if quote
+        ref.status.update!(quote_of_id: ref.target_status.id)
+      else
+        ref.status.update!(quote_of_id: nil)
+      end
+    end
+  end
+
+  def launch_worker
+    ProcessReferencesWorker.perform_async(@status.id, @reference_parameters, @urls, @no_fetch_urls, @quote_urls)
+  end
+end
diff --git a/app/services/purge_domain_service.rb b/app/services/purge_domain_service.rb
index 9df81f13e6..ca0f0d441f 100644
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -2,10 +2,26 @@
 
 class PurgeDomainService < BaseService
   def call(domain)
-    Account.remote.where(domain: domain).reorder(nil).find_each do |account|
-      DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
-    end
-    CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy)
+    @domain = domain
+
+    purge_relationship_severance_events!
+    purge_accounts!
+    purge_emojis!
+
     Instance.refresh
   end
+
+  def purge_relationship_severance_events!
+    RelationshipSeveranceEvent.where(type: [:domain_block, :user_domain_block], target_name: @domain).in_batches.update_all(purged: true)
+  end
+
+  def purge_accounts!
+    Account.remote.where(domain: @domain).reorder(nil).find_each do |account|
+      DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
+    end
+  end
+
+  def purge_emojis!
+    CustomEmoji.remote.where(domain: @domain).reorder(nil).find_each(&:destroy)
+  end
 end
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index cca79eced6..2c04d2becd 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -3,6 +3,7 @@
 class ReblogService < BaseService
   include Authorization
   include Payloadable
+  include NgRuleHelper
 
   # Reblog a status and notify its remote author
   # @param [Account] account Account to reblog from
@@ -16,6 +17,8 @@ class ReblogService < BaseService
 
     authorize_with account, reblogged_status, :reblog?
 
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless check_invalid_reaction_for_ng_rule! account, reaction_type: 'reblog', recipient: reblogged_status.account, target_status: reblogged_status
+
     reblog = account.statuses.find_by(reblog: reblogged_status)
 
     return reblog unless reblog.nil?
@@ -23,8 +26,12 @@ class ReblogService < BaseService
     visibility = if reblogged_status.hidden?
                    reblogged_status.visibility
                  else
-                   options[:visibility] || account.user&.setting_default_privacy
-                 end
+                   options[:visibility] ||
+                     (account.user&.setting_default_reblog_privacy == 'unset' ? account.user&.setting_default_privacy : account.user&.setting_default_reblog_privacy)
+                 end.to_s
+
+    visibility = 'public_unlisted' if !Setting.enable_public_visibility && visibility == 'public'
+    visibility = 'unlisted' if !Setting.enable_public_unlisted_visibility && visibility == 'public_unlisted'
 
     reblog = account.statuses.create!(reblog: reblogged_status, text: '', visibility: visibility, rate_limit: options[:with_rate_limit])
 
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 221791ad32..d5ef41b19d 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -19,6 +19,9 @@ class RemoveStatusService < BaseService
     @account  = status.account
     @options  = options
 
+    @visibility = @status.visibility&.to_sym || :public
+    @searchability = @status.searchability&.to_sym || @status.compute_searchability&.to_sym || :public
+
     with_redis_lock("distribute:#{@status.id}") do
       @status.discard_with_reblogs
 
@@ -27,6 +30,7 @@ class RemoveStatusService < BaseService
       remove_from_self if @account.local?
       remove_from_followers
       remove_from_lists
+      remove_from_antennas
 
       # There is no reason to send out Undo activities when the
       # cause is that the original object has been removed, since
@@ -45,6 +49,7 @@ class RemoveStatusService < BaseService
         remove_from_public
         remove_from_media if @status.with_media?
         remove_media
+        decrement_references
       end
 
       @status.destroy! if permanently?
@@ -72,6 +77,18 @@ class RemoveStatusService < BaseService
     end
   end
 
+  def remove_from_antennas
+    Antenna.availables.where.not(list_id: 0).select(:id, :list_id, :account_id).includes(account: :user).reorder(nil).find_each do |antenna|
+      FeedManager.instance.unpush_from_list(antenna.list, @status) if antenna.list.present?
+    end
+    Antenna.availables.where(list_id: 0).select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |antenna|
+      FeedManager.instance.unpush_from_home(antenna.account, @status)
+    end
+    Antenna.availables.select(:id, :account_id).includes(account: :user).reorder(nil).find_each do |antenna|
+      FeedManager.instance.unpush_from_antenna(antenna, @status)
+    end
+  end
+
   def remove_from_mentions
     # For limited visibility statuses, the mentions that determine
     # who receives them in their home feed are a subset of followers
@@ -92,15 +109,23 @@ class RemoveStatusService < BaseService
     # the author and wouldn't normally receive the delete
     # notification - so here, we explicitly send it to them
 
+    return remove_from_conversation if @status.limited_visibility? && @status.conversation.present? && !@status.conversation.local?
+
     status_reach_finder = StatusReachFinder.new(@status, unsafe: true)
 
-    ActivityPub::DeliveryWorker.push_bulk(status_reach_finder.inboxes, limit: 1_000) do |inbox_url|
+    ActivityPub::DeliveryWorker.push_bulk(status_reach_finder.all_inboxes, limit: 1_000) do |inbox_url|
       [signed_activity_json, @account.id, inbox_url]
     end
   end
 
+  def remove_from_conversation
+    return if @status.conversation.nil? || @status.conversation.inbox_url.blank?
+
+    ActivityPub::DeliveryWorker.perform_async(signed_activity_json, @account.id, @status.conversation.inbox_url)
+  end
+
   def signed_activity_json
-    @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account, always_sign: true))
+    @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account, always_sign_unsafe: @status.limited_visibility?))
   end
 
   def remove_reblogs
@@ -113,12 +138,18 @@ class RemoveStatusService < BaseService
     end
   end
 
+  def decrement_references
+    @status.references.reorder(nil).find_each do |ref|
+      ref.decrement_count!(:status_referred_by_count)
+    end
+  end
+
   def remove_from_hashtags
     @account.featured_tags.where(tag_id: @status.tags.map(&:id)).find_each do |featured_tag|
       featured_tag.decrement(@status.id)
     end
 
-    return unless @status.public_visibility?
+    return unless %i(public public_unlisted login).include?(@visibility) || (@status.unlisted_visibility? && %i(public public_unlisted).include?(@searchability))
 
     return if skip_streaming?
 
@@ -129,7 +160,7 @@ class RemoveStatusService < BaseService
   end
 
   def remove_from_public
-    return unless @status.public_visibility?
+    return unless %i(public public_unlisted login).include?(@visibility)
 
     return if skip_streaming?
 
@@ -138,7 +169,7 @@ class RemoveStatusService < BaseService
   end
 
   def remove_from_media
-    return unless @status.public_visibility?
+    return unless %i(public public_unlisted login).include?(@visibility)
 
     return if skip_streaming?
 
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index fe546c383e..5038ba28d2 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -82,7 +82,7 @@ class ReportService < BaseService
     # If the account making reports is remote, it is likely anonymized so we have to relax the requirements for attaching statuses.
     domain = @source_account.domain.to_s.downcase
     has_followers = @target_account.followers.where(Account.arel_table[:domain].lower.eq(domain)).exists?
-    visibility = has_followers ? %i(public unlisted private) : %i(public unlisted)
+    visibility = has_followers ? %i(public unlisted public_unlisted login private) : %i(public unlisted public_unlisted)
     scope = @target_account.statuses.with_discarded
     scope.merge!(scope.where(visibility: visibility).or(scope.where('EXISTS (SELECT 1 FROM mentions m JOIN accounts a ON m.account_id = a.id WHERE lower(a.domain) = ?)', domain)))
     # Allow missing posts to not drop reports that include e.g. a deleted post
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 9a40d7bdd5..9e51b684a5 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -11,6 +11,7 @@ class SearchService < BaseService
     @offset    = options[:type].blank? ? 0 : options[:offset].to_i
     @resolve   = options[:resolve] || false
     @following = options[:following] || false
+    @searchability = options[:searchability] || account&.user&.setting_default_searchability_of_search.to_s || 'public'
 
     default_results.tap do |results|
       next if @query.blank? || @limit.zero?
@@ -48,7 +49,8 @@ class SearchService < BaseService
       offset: @offset,
       account_id: @options[:account_id],
       min_id: @options[:min_id],
-      max_id: @options[:max_id]
+      max_id: @options[:max_id],
+      searchability: @searchability
     )
   end
 
diff --git a/app/services/searchability_update_service.rb b/app/services/searchability_update_service.rb
new file mode 100644
index 0000000000..a6b448a0ee
--- /dev/null
+++ b/app/services/searchability_update_service.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class SearchabilityUpdateService < BaseService
+  def call(account)
+    statuses = account.statuses.unset_searchability
+
+    return unless statuses.exists?
+
+    ids = statuses.pluck(:id)
+
+    if account.public_searchability?
+      statuses.update_all('searchability = CASE visibility WHEN 0 THEN 0 WHEN 10 THEN 0 WHEN 1 THEN 2 WHEN 2 THEN 2 ELSE 3 END, updated_at = CURRENT_TIMESTAMP')
+    elsif account.unlisted_searchability?
+      statuses.update_all('searchability = CASE visibility WHEN 0 THEN 1 WHEN 10 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 2 ELSE 3 END, updated_at = CURRENT_TIMESTAMP')
+    elsif account.private_searchability?
+      statuses.update_all('searchability = CASE WHEN visibility IN (0, 1, 2, 10) THEN 2 ELSE 3 END, updated_at = CURRENT_TIMESTAMP')
+    else
+      statuses.update_all('searchability = 3, updated_at = CURRENT_TIMESTAMP')
+    end
+
+    return unless Chewy.enabled?
+
+    ids.each_slice(100) do |chunk_ids|
+      StatusesIndex.import chunk_ids, update_fields: [:searchability]
+    end
+  end
+end
diff --git a/app/services/software_update_check_service.rb b/app/services/software_update_check_service.rb
index c8ce1753f5..8c95ca546e 100644
--- a/app/services/software_update_check_service.rb
+++ b/app/services/software_update_check_service.rb
@@ -27,11 +27,19 @@ class SoftwareUpdateCheckService < BaseService
   end
 
   def api_url
-    ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check')
+    ENV.fetch('UPDATE_CHECK_URL', 'https://kmy.blue/update-check')
   end
 
   def version
-    @version ||= Mastodon::Version.to_s.split('+')[0]
+    if ENV.fetch('UPDATE_CHECK_SOURCE', 'kmyblue') == 'kmyblue'
+      @version = "#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}"
+      @version += '-lts' if Setting.check_lts_version_only
+      @version += '-dev' if Mastodon::Version.dev?
+    else
+      @version = Mastodon::Version.to_s.split('+')[0]
+    end
+
+    @version
   end
 
   def process_update_notices!(update_notices)
diff --git a/app/services/statuses_search_service.rb b/app/services/statuses_search_service.rb
index 7d5b0203a0..72468496bb 100644
--- a/app/services/statuses_search_service.rb
+++ b/app/services/statuses_search_service.rb
@@ -7,6 +7,7 @@ class StatusesSearchService < BaseService
     @options = options
     @limit   = options[:limit].to_i
     @offset  = options[:offset].to_i
+    @searchability = options[:searchability]&.to_sym
 
     convert_deprecated_options!
     status_search_results
@@ -15,8 +16,11 @@ class StatusesSearchService < BaseService
   private
 
   def status_search_results
-    request             = parsed_query.request
-    results             = request.collapse(field: :id).order(id: { order: :desc }).limit(@limit).offset(@offset).objects.compact
+    query               = parsed_query
+    request             = query.request
+    return [] unless query.valid
+
+    results             = request.collapse(field: :id).order(id: { order: query.order_by }).limit(@limit).offset(@offset).objects.compact
     account_ids         = results.map(&:account_id)
     account_domains     = results.map(&:account_domain)
     preloaded_relations = @account.relations_map(account_ids, account_domains)
@@ -27,7 +31,7 @@ class StatusesSearchService < BaseService
   end
 
   def parsed_query
-    SearchQueryTransformer.new.apply(SearchQueryParser.new.parse(@query), current_account: @account)
+    SearchQueryTransformer.new.apply(SearchQueryParser.new.parse(@query), current_account: @account, searchability: @searchability)
   end
 
   def convert_deprecated_options!
diff --git a/app/services/tag_search_service.rb b/app/services/tag_search_service.rb
index d5d1974275..929cfd884f 100644
--- a/app/services/tag_search_service.rb
+++ b/app/services/tag_search_service.rb
@@ -16,7 +16,32 @@ class TagSearchService < BaseService
   private
 
   def from_elasticsearch
-    query = {
+    definition = TagsIndex.query(elastic_search_query)
+    definition = definition.filter(elastic_search_filter) if @options[:exclude_unreviewed]
+
+    ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
+  rescue Faraday::ConnectionFailed, Parslet::ParseFailed
+    nil
+  end
+
+  # Since the ElasticSearch Query doesn't guarantee the exact match will be the
+  # first result or that it will even be returned, patch the results accordingly
+  def ensure_exact_match(results)
+    return results unless @offset.nil? || @offset.zero?
+
+    normalized_query = Tag.normalize(@query)
+    exact_match = results.find { |tag| tag.name.downcase == normalized_query }
+    exact_match ||= Tag.find_normalized(normalized_query)
+    unless exact_match.nil?
+      results.delete(exact_match)
+      results = [exact_match] + results
+    end
+
+    results
+  end
+
+  def elastic_search_query
+    {
       function_score: {
         query: {
           multi_match: {
@@ -50,8 +75,10 @@ class TagSearchService < BaseService
         boost_mode: 'multiply',
       },
     }
+  end
 
-    filter = {
+  def elastic_search_filter
+    {
       bool: {
         should: [
           {
@@ -72,29 +99,6 @@ class TagSearchService < BaseService
         ],
       },
     }
-
-    definition = TagsIndex.query(query)
-    definition = definition.filter(filter) if @options[:exclude_unreviewed]
-
-    ensure_exact_match(definition.limit(@limit).offset(@offset).objects.compact)
-  rescue Faraday::ConnectionFailed, Parslet::ParseFailed
-    nil
-  end
-
-  # Since the ElasticSearch Query doesn't guarantee the exact match will be the
-  # first result or that it will even be returned, patch the results accordingly
-  def ensure_exact_match(results)
-    return results unless @offset.nil? || @offset.zero?
-
-    normalized_query = Tag.normalize(@query)
-    exact_match = results.find { |tag| tag.name.downcase == normalized_query }
-    exact_match ||= Tag.find_normalized(normalized_query)
-    unless exact_match.nil?
-      results.delete(exact_match)
-      results = [exact_match] + results
-    end
-
-    results
   end
 
   def from_database
diff --git a/app/services/translate_status_service.rb b/app/services/translate_status_service.rb
index 9ad146ae7d..93a06ef46d 100644
--- a/app/services/translate_status_service.rb
+++ b/app/services/translate_status_service.rb
@@ -30,7 +30,7 @@ class TranslateStatusService < BaseService
   end
 
   def permitted?
-    return false unless @status.distributable? && TranslationService.configured?
+    return false unless (@status.distributable? || @status.account.translatable_private?) && TranslationService.configured?
 
     languages[@status.language]&.include?(@target_language)
   end
diff --git a/app/services/un_emoji_react_service.rb b/app/services/un_emoji_react_service.rb
new file mode 100644
index 0000000000..db8f414343
--- /dev/null
+++ b/app/services/un_emoji_react_service.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class UnEmojiReactService < BaseService
+  include Redisable
+  include Payloadable
+
+  def call(account, status, emoji_reaction = nil)
+    @account = account
+    @status = status
+
+    if emoji_reaction
+      emoji_reaction.destroy!
+
+      status.touch
+
+      create_notification(emoji_reaction) if !@status.account.local? && @status.account.activitypub?
+      notify_to_followers(emoji_reaction)
+      write_stream(emoji_reaction) if Setting.streaming_local_emoji_reaction
+
+      relay_for_undo_emoji_reaction!(emoji_reaction)
+      relay_friend_for_undo_emoji_reaction!(emoji_reaction)
+    else
+      bulk(account, status)
+    end
+    emoji_reaction
+  end
+
+  private
+
+  def bulk(account, status)
+    EmojiReaction.where(account: account, status: status).find_each do |emoji_reaction|
+      call(account, status, emoji_reaction)
+    end
+  end
+
+  def create_notification(emoji_reaction)
+    ActivityPub::DeliveryWorker.perform_async(build_json(emoji_reaction), emoji_reaction.account_id, @status.account.inbox_url)
+  end
+
+  def notify_to_followers(emoji_reaction)
+    ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @account.id)
+  end
+
+  def write_stream(emoji_reaction)
+    emoji_group = @status.emoji_reactions_grouped_by_name(@account)
+                         .find { |reaction_group| reaction_group['name'] == emoji_reaction.name }
+    if emoji_group
+      emoji_group['status_id'] = @status.id.to_s
+    else
+      # name: emoji_reaction.name, count: 0, domain: emoji_reaction.domain
+      emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @status.id.to_s }
+      emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
+    end
+
+    DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @status.id, emoji_reaction.account_id)
+  end
+
+  def build_json(emoji_reaction)
+    @build_json = Oj.dump(serialize_payload(emoji_reaction, ActivityPub::UndoEmojiReactionSerializer, signer: emoji_reaction.account))
+  end
+
+  def render_emoji_reaction(emoji_group)
+    # @rendered_emoji_reaction ||= InlineRenderer.render(emoji_group, nil, :emoji_reaction)
+    Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
+  end
+
+  def relay_for_undo_emoji_reaction!(emoji_reaction)
+    return unless @status.local? && @status.public_visibility?
+
+    ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
+      [build_json(emoji_reaction), @status.account.id, inbox_url]
+    end
+  end
+
+  def relay_friend_for_undo_emoji_reaction!(emoji_reaction)
+    return unless @status.local? && @status.distributable_friend?
+
+    ActivityPub::DeliveryWorker.push_bulk(FriendDomain.distributables.pluck(:inbox_url)) do |inbox_url|
+      [build_json(emoji_reaction), @status.account.id, inbox_url]
+    end
+  end
+end
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
index 78a846e03e..79f01e8b40 100644
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@@ -5,6 +5,12 @@ class UpdateAccountService < BaseService
     was_locked    = account.locked
     update_method = raise_error ? :update! : :update
 
+    if account.user && params.key?(:bio_markdown)
+      user_params = { settings_attributes: { bio_markdown: params['bio_markdown'] } }
+      params.delete(:bio_markdown)
+      account.user.send(update_method, user_params)
+    end
+
     account.send(update_method, params).tap do |ret|
       next unless ret
 
@@ -21,12 +27,16 @@ class UpdateAccountService < BaseService
 
   def authorize_all_follow_requests(account)
     follow_requests = FollowRequest.where(target_account: account)
-    follow_requests = follow_requests.preload(:account).reject { |req| req.account.silenced? }
+    follow_requests = follow_requests.preload(:account).reject { |req| req.account.silenced? || reject_straight_follow_domains.include?(req.account.domain) }
     AuthorizeFollowWorker.push_bulk(follow_requests, limit: 1_000) do |req|
       [req.account_id, req.target_account_id]
     end
   end
 
+  def reject_straight_follow_domains
+    DomainBlock.where(reject_straight_follow: true).pluck(:domain)
+  end
+
   def check_links(account)
     return unless account.fields.any?(&:requires_verification?)
 
diff --git a/app/services/update_status_expiration_service.rb b/app/services/update_status_expiration_service.rb
new file mode 100644
index 0000000000..2dc533c530
--- /dev/null
+++ b/app/services/update_status_expiration_service.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class UpdateStatusExpirationService < BaseService
+  SCAN_EXPIRATION_RE = /#exp((\d{1,4}\.\d{1,2}|\d{1,4}))(d|h|m|s)/
+
+  def call(status)
+    existing_expiration = ScheduledExpirationStatus.find_by(status: status)
+    existing_expiration&.destroy!
+
+    expiration = status.text.scan(SCAN_EXPIRATION_RE).first
+    return unless expiration
+
+    expiration_num = expiration[1].to_f
+    expiration_option = expiration[2]
+    base_time = status.created_at || Time.now.utc
+
+    # rubocop:disable Style/CaseLikeIf
+    due = if expiration_option == 'd'
+            expiration_num.days
+          elsif expiration_option == 'h'
+            expiration_num.hours
+          else
+            expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes
+          end
+    # rubocop:enable Style/CaseLikeIf
+
+    expired_at = base_time + due
+    expired_status = ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
+
+    RemoveExpiredStatusWorker.perform_at(expired_at, expired_status.id) if due < PostStatusService::MIN_SCHEDULE_OFFSET
+  end
+end
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index cdfe283659..3feec8c68d 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -3,6 +3,7 @@
 class UpdateStatusService < BaseService
   include Redisable
   include LanguagesHelper
+  include NgRuleHelper
 
   class NoChangesSubmittedError < StandardError; end
 
@@ -15,27 +16,43 @@ class UpdateStatusService < BaseService
   # @option options [String] :text
   # @option options [String] :spoiler_text
   # @option options [Boolean] :sensitive
+  # @option options [Boolean] :markdown
   # @option options [String] :language
+  # @option [Enumerable] :status_reference_ids Optional array
   def call(status, account_id, options = {})
     @status                    = status
     @options                   = options
     @account_id                = account_id
     @media_attachments_changed = false
     @poll_changed              = false
+    @old_sensitive             = sensitive?
+
+    clear_histories! if @options[:no_history]
+
+    validate_status!
 
     Status.transaction do
-      create_previous_edit!
+      validate_status_ng_rules!
+
+      create_previous_edit! unless @options[:no_history]
       update_media_attachments! if @options.key?(:media_ids)
       update_poll! if @options.key?(:poll)
       update_immediate_attributes!
-      create_edit!
+      create_edit! unless @options[:no_history]
+
+      reset_preview_card!
+      process_mentions_service.call(@status)
+      validate_status_mentions!
     end
 
     queue_poll_notifications!
-    reset_preview_card!
     update_metadata!
+    update_references!
     broadcast_updates!
 
+    # Mentions are not updated (Cause unknown)
+    @status.reload
+
     @status
   rescue NoChangesSubmittedError
     # For calls that result in no changes, swallow the error
@@ -66,12 +83,80 @@ class UpdateStatusService < BaseService
     @status.media_attachments.reload
   end
 
+  def validate_status!
+    return if @options[:bypass_validation]
+    raise Mastodon::ValidationError, I18n.t('statuses.contains_ng_words') if Admin::NgWord.reject?("#{@options[:spoiler_text]}\n#{@options[:text]}")
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_hashtags') if Admin::NgWord.hashtag_reject_with_extractor?(@options[:text] || '')
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_mentions') if Admin::NgWord.mention_reject_with_extractor?(@options[:text] || '')
+    raise Mastodon::ValidationError, I18n.t('statuses.too_many_mentions') if (mention_to_stranger? || reference_to_stranger?) && Admin::NgWord.stranger_mention_reject_with_extractor?(@options[:text] || '')
+  end
+
+  def validate_status_mentions!
+    return if @options[:bypass_validation]
+    raise Mastodon::ValidationError, I18n.t('statuses.contains_ng_words') if (mention_to_stranger? || reference_to_stranger?) && Setting.stranger_mention_from_local_ng && Admin::NgWord.stranger_mention_reject?("#{@options[:spoiler_text]}\n#{@options[:text]}")
+  end
+
+  def validate_status_ng_rules!
+    return if @options[:bypass_validation]
+
+    result = check_invalid_status_for_ng_rule! @status.account,
+                                               reaction_type: 'edit',
+                                               spoiler_text: @options.key?(:spoiler_text) ? (@options[:spoiler_text] || '') : @status.spoiler_text,
+                                               text: text,
+                                               tag_names: Extractor.extract_hashtags(text) || [],
+                                               visibility: @status.visibility,
+                                               searchability: @status.searchability,
+                                               sensitive: @options.key?(:sensitive) ? @options[:sensitive] : @status.sensitive,
+                                               media_count: @options[:media_ids].present? ? @options[:media_ids].size : @status.media_attachments.count,
+                                               poll_count: @options.dig(:poll, 'options')&.size || 0,
+                                               quote: quote_url,
+                                               reply: @status.reply?,
+                                               mention_count: mention_count,
+                                               reference_count: reference_urls.size,
+                                               mention_to_following: !(mention_to_stranger? || reference_to_stranger?)
+
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless result
+  end
+
+  def mention_count
+    text.gsub(Account::MENTION_RE)&.count || 0
+  end
+
+  def mention_to_stranger?
+    @status.mentions.map(&:account).to_a.any? { |mentioned_account| !mentioned_account.following_or_self?(@status.account) } ||
+      (@status.thread.present? && !@status.thread.account.following_or_self?(@status.account))
+  end
+
+  def reference_to_stranger?
+    referred_statuses.any? { |status| !status.account.following_or_self?(@status.account) }
+  end
+
+  def referred_statuses
+    return [] unless text
+
+    reference_urls.filter_map { |uri| ActivityPub::TagManager.instance.local_uri?(uri) && ActivityPub::TagManager.instance.uri_to_resource(uri, Status, url: true) }
+  end
+
+  def quote_url
+    ProcessReferencesService.extract_quote(text)
+  end
+
+  def reference_urls
+    @reference_urls ||= ProcessReferencesService.extract_uris(text) || []
+  end
+
+  def text
+    @options.key?(:text) ? (@options[:text] || '') : @status.text
+  end
+
   def validate_media!
     return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
+    media_max = @options[:poll] ? MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX_WITH_POLL : MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX
 
-    media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > media_max
+
+    media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(media_max).map(&:to_i)).to_a
 
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?)
     raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?)
@@ -110,16 +195,32 @@ class UpdateStatusService < BaseService
   def update_immediate_attributes!
     @status.text         = @options[:text].presence || @options.delete(:spoiler_text) || '' if @options.key?(:text)
     @status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text)
+    @status.markdown     = @options[:markdown] || false
     @status.sensitive    = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text)
     @status.language     = valid_locale_cascade(@options[:language], @status.language, @status.account.user&.preferred_posting_language, I18n.default_locale)
+    process_sensitive_words
 
     # We raise here to rollback the entire transaction
     raise NoChangesSubmittedError unless significant_changes?
 
+    update_expiration!
+
     @status.edited_at = Time.now.utc
     @status.save!
   end
 
+  def process_sensitive_words
+    return unless [:public, :public_unlisted, :login].include?(@status.visibility&.to_sym) && Admin::SensitiveWord.sensitive?(@status.text, @status.spoiler_text || '')
+
+    @status.text = Admin::SensitiveWord.modified_text(@status.text, @status.spoiler_text)
+    @status.spoiler_text = Admin::SensitiveWord.alternative_text
+    @status.sensitive = true
+  end
+
+  def update_expiration!
+    UpdateStatusExpirationService.new.call(@status)
+  end
+
   def reset_preview_card!
     return unless @status.text_previously_changed?
 
@@ -127,14 +228,25 @@ class UpdateStatusService < BaseService
     LinkCrawlWorker.perform_async(@status.id)
   end
 
+  def update_references!
+    reference_ids = (@options[:status_reference_ids] || []).map(&:to_i).filter(&:positive?)
+
+    ProcessReferencesService.call_service(@status, reference_ids, [])
+  end
+
   def update_metadata!
     ProcessHashtagsService.new.call(@status)
-    ProcessMentionsService.new.call(@status)
+
+    @status.update(limited_scope: :circle) if process_mentions_service.mentions?
+  end
+
+  def process_mentions_service
+    @process_mentions_service ||= ProcessMentionsService.new
   end
 
   def broadcast_updates!
     DistributionWorker.perform_async(@status.id, { 'update' => true })
-    ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id)
+    ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id, { 'sensitive' => sensitive?, 'sensitive_changed' => @old_sensitive != sensitive? && sensitive? })
   end
 
   def queue_poll_notifications!
@@ -166,4 +278,14 @@ class UpdateStatusService < BaseService
   def significant_changes?
     @status.changed? || @poll_changed || @media_attachments_changed
   end
+
+  def clear_histories!
+    @status.edits.destroy_all
+    @status.edited_at = nil
+    @status.save!
+  end
+
+  def sensitive?
+    @status.sensitive
+  end
 end
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 707aeb4e08..b317fc31a8 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -19,7 +19,7 @@ class VerifyLinkService < BaseService
 
   def perform_request!
     @body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
-      res.code == 200 ? res.body_with_limit : nil
+      res.code == 200 ? res.truncated_body : nil
     end
   end
 
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 3e92a1690a..d4f5006be3 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -5,6 +5,7 @@ class VoteService < BaseService
   include Payloadable
   include Redisable
   include Lockable
+  include NgRuleHelper
 
   def call(account, poll, choices)
     return if choices.empty?
@@ -16,10 +17,12 @@ class VoteService < BaseService
     @choices = choices
     @votes   = []
 
+    raise Mastodon::ValidationError, I18n.t('statuses.violate_rules') unless check_invalid_reaction_for_ng_rule! @account, reaction_type: 'vote', recipient: @poll.status.account, target_status: @poll.status
+
     already_voted = true
 
     with_redis_lock("vote:#{@poll.id}:#{@account.id}") do
-      already_voted = @poll.votes.where(account: @account).exists?
+      already_voted = @poll.votes.exists?(account: @account)
 
       ApplicationRecord.transaction do
         @choices.each do |choice|
diff --git a/app/validators/email_address_validator.rb b/app/validators/email_address_validator.rb
new file mode 100644
index 0000000000..ed0bb11652
--- /dev/null
+++ b/app/validators/email_address_validator.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# NOTE: I initially wrote this as `EmailValidator` but it ended up clashing
+# with an indirect dependency of ours, `validate_email`, which, turns out,
+# has the same approach as we do, but with an extra check disallowing
+# single-label domains. Decided to not switch to `validate_email` because
+# we do want to allow at least `localhost`.
+
+class EmailAddressValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    value = value.strip
+
+    address = Mail::Address.new(value)
+    record.errors.add(attribute, :invalid) if address.address != value
+  rescue Mail::Field::FieldError
+    record.errors.add(attribute, :invalid)
+  end
+end
diff --git a/app/validators/emoji_reaction_validator.rb b/app/validators/emoji_reaction_validator.rb
new file mode 100644
index 0000000000..d49e73a75b
--- /dev/null
+++ b/app/validators/emoji_reaction_validator.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class EmojiReactionValidator < ActiveModel::Validator
+  SUPPORTED_EMOJIS = Oj.load_file(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json').to_s).keys.freeze
+
+  def validate(emoji_reaction)
+    return if emoji_reaction.name.blank?
+
+    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.blank? && !unicode_emoji?(emoji_reaction.name)
+    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.present? && disabled_custom_emoji?(emoji_reaction.custom_emoji)
+    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if deny_emoji_reactions?(emoji_reaction)
+    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if blocking?(emoji_reaction) || domain_blocking?(emoji_reaction)
+  end
+
+  private
+
+  def unicode_emoji?(name)
+    SUPPORTED_EMOJIS.include?(name)
+  end
+
+  def disabled_custom_emoji?(custom_emoji)
+    custom_emoji.nil? ? false : custom_emoji.disabled
+  end
+
+  def deny_emoji_reactions?(emoji_reaction)
+    !emoji_reaction.status.account.allow_emoji_reaction?(emoji_reaction.account)
+  end
+
+  def blocking?(emoji_reaction)
+    return false if !emoji_reaction.status.local? || emoji_reaction.status.account == emoji_reaction.account
+
+    emoji_reaction.status.account.blocking?(emoji_reaction.account)
+  end
+
+  def domain_blocking?(emoji_reaction)
+    return false unless !emoji_reaction.account.local? && emoji_reaction.status.local?
+
+    emoji_reaction.status.account.domain_blocking?(emoji_reaction.account.domain)
+  end
+end
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb
index a327277963..bd913188f3 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PollValidator < ActiveModel::Validator
-  MAX_OPTIONS      = 4
+  MAX_OPTIONS      = 8
   MAX_OPTION_CHARS = 50
   MAX_EXPIRATION   = 1.month.freeze
   MIN_EXPIRATION   = 5.minutes.freeze
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb
index 4ed3376e8b..89d83de5a2 100644
--- a/app/validators/reaction_validator.rb
+++ b/app/validators/reaction_validator.rb
@@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
   end
 
   def new_reaction?(reaction)
-    !reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
+    !reaction.announcement.announcement_reactions.exists?(name: reaction.name)
   end
 
   def limit_reached?(reaction)
diff --git a/app/validators/vote_validator.rb b/app/validators/vote_validator.rb
index fa2bd223dc..e725b4c0b8 100644
--- a/app/validators/vote_validator.rb
+++ b/app/validators/vote_validator.rb
@@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
     if vote.persisted?
       account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
     else
-      account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
+      account_votes_on_same_poll(vote).exists?(choice: vote.choice)
     end
   end
 
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index dde9c50847..6c76748585 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -2,8 +2,12 @@
   #{display_name(@account)} (#{acct(@account)})
 
 - content_for :header_tags do
-  - if @account.user_prefers_noindex?
-    %meta{ name: 'robots', content: 'noindex, noarchive' }/
+  - if @account.noindex?
+    %meta{ name: 'robots', content: 'noindex, noarchive, noai, noimageai' }/
+    %meta{ name: 'CCBot', content: 'nofollow' }/
+  - else
+    %meta{ name: 'robots', content: 'noai, noimageai' }/
+    %meta{ name: 'CCBot', content: 'nofollow' }/
 
   %link{ rel: 'alternate', type: 'application/rss+xml', href: rss_url }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 4cb4401c70..bce1c31760 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -2,29 +2,48 @@
   = t('admin.account_actions.title', acct: @account.pretty_acct)
 
 = simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
-  = f.input :report_id, as: :hidden
+  = f.input :report_id,
+            as: :hidden
 
   .fields-group
-    = f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { account_action_type_label(type) }, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct)
+    = f.input :type,
+              as: :radio_buttons,
+              collection: Admin::AccountAction.types_for_account(@account),
+              hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct),
+              include_blank: false,
+              label_method: ->(type) { account_action_type_label(type) },
+              wrapper: :with_block_label
 
   - if @account.local?
     %hr.spacer/
 
     .fields-group
-      = f.input :send_email_notification, as: :boolean, wrapper: :with_label
+      = f.input :send_email_notification,
+                as: :boolean,
+                wrapper: :with_label
 
     - if params[:report_id].present?
       .fields-group
-        = f.input :include_statuses, as: :boolean, wrapper: :with_label
+        = f.input :include_statuses,
+                  as: :boolean,
+                  wrapper: :with_label
 
     %hr.spacer/
 
     - unless @warning_presets.empty?
       .fields-group
-        = f.input :warning_preset_id, collection: @warning_presets, label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') }, wrapper: :with_block_label
+        = f.input :warning_preset_id,
+                  collection: @warning_presets,
+                  label_method: ->(warning_preset) { [warning_preset.title.presence, truncate(warning_preset.text)].compact.join(' - ') },
+                  wrapper: :with_block_label
 
     .fields-group
-      = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
+      = f.input :text,
+                as: :text,
+                hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path),
+                wrapper: :with_block_label
 
   .actions
-    = f.button :button, t('admin.account_actions.action'), type: :submit
+    = f.button :button,
+               t('admin.account_actions.action'),
+               type: :submit
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 5702e4f6d2..368e69e63e 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -2,7 +2,7 @@
   .log-entry__header
     .log-entry__avatar
       .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' }
-        = fa_icon 'warning'
+        = material_symbol 'warning'
     .log-entry__content
       .log-entry__title
         = t(account_warning.action,
diff --git a/app/views/admin/accounts/_buttons.html.haml b/app/views/admin/accounts/_buttons.html.haml
index 2aaca8962c..2063e93c7b 100644
--- a/app/views/admin/accounts/_buttons.html.haml
+++ b/app/views/admin/accounts/_buttons.html.haml
@@ -1,4 +1,4 @@
-- if account.suspended?
+- if account.suspended? && !account.remote_pending
   %hr.spacer/
   - if account.suspension_origin_remote?
     %p.muted-hint= deletion_request.present? ? t('admin.accounts.remote_suspension_reversible_hint_html', date: content_tag(:strong, l(deletion_request.due_at.to_date))) : t('admin.accounts.remote_suspension_irreversible')
@@ -8,6 +8,11 @@
   = link_to t('admin.accounts.redownload'), redownload_admin_account_path(account.id), method: :post, class: 'button' if can?(:redownload, account) && account.suspension_origin_remote?
   - if deletion_request.present? && can?(:destroy, account)
     = link_to t('admin.accounts.delete'), admin_account_path(account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') }
+- elsif account.suspended? && account.remote_pending
+  %hr.spacer/
+  %p.muted-hint= t('admin.accounts.remote_pending_hint_html')
+  = link_to t('admin.accounts.approve_remote'), approve_remote_admin_account_path(account.id), method: :post, class: 'button' if can?(:approve_remote, account)
+  = link_to t('admin.accounts.reject_remote'), reject_remote_admin_account_path(account.id), method: :post, class: 'button' if can?(:reject_remote, account)
 - else
   .action-buttons
     %div
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 82197cda43..3ed392cd1a 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -62,13 +62,7 @@
   %td
     %time.formatted{ datetime: account.created_at.iso8601, title: l(account.created_at) }= l account.created_at
   %td
-- recent_ips = account.user.ips.order(used_at: :desc).to_a
-- recent_ips.each_with_index do |recent_ip, i|
-  %tr
-    - if i.zero?
-      %th{ rowspan: recent_ips.size }= t('admin.accounts.most_recent_ip')
-    %td= recent_ip.ip
-    %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: recent_ip.ip)
+  = render partial: 'admin/accounts/user_ip', collection: account.user.ips.by_latest_used
 %tr
   %th= t('admin.accounts.most_recent_activity')
   %td
diff --git a/app/views/admin/accounts/_remote_account.html.haml b/app/views/admin/accounts/_remote_account.html.haml
index 99996e1d46..6755af2496 100644
--- a/app/views/admin/accounts/_remote_account.html.haml
+++ b/app/views/admin/accounts/_remote_account.html.haml
@@ -2,14 +2,14 @@
   %th= t('admin.accounts.inbox_url')
   %td
     = account.inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.inbox_url) ? 'check' : 'close'
   %td
     = table_link_to 'search', domain_block.present? ? t('admin.domain_blocks.view') : t('admin.accounts.view_domain'), admin_instance_path(account.domain)
 %tr
   %th= t('admin.accounts.shared_inbox_url')
   %td
     = account.shared_inbox_url
-    = fa_icon DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'times'
+    = material_symbol DeliveryFailureTracker.available?(account.shared_inbox_url) ? 'check' : 'close'
   %td
     - if domain_block.nil?
       = table_link_to 'ban', t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: account.domain)
diff --git a/app/views/admin/accounts/_user_ip.html.haml b/app/views/admin/accounts/_user_ip.html.haml
new file mode 100644
index 0000000000..1938cf7edf
--- /dev/null
+++ b/app/views/admin/accounts/_user_ip.html.haml
@@ -0,0 +1,5 @@
+%tr
+  - if user_ip_iteration.first?
+    %th{ rowspan: user_ip_iteration.size }= t('admin.accounts.most_recent_ip')
+  %td= user_ip.ip
+  %td= table_link_to 'search', t('admin.accounts.search_same_ip'), admin_accounts_path(ip: user_ip.ip)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 8354441895..ac4991e8c5 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -6,19 +6,26 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.location.title')
       .input.select.optional
-        = select_tag :origin, options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]), prompt: I18n.t('generic.all')
+        = select_tag :origin,
+                     options_for_select([[t('admin.accounts.location.local'), 'local'], [t('admin.accounts.location.remote'), 'remote']], params[:origin]),
+                     prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.moderation.title')
       .input.select.optional
-        = select_tag :status, options_for_select(admin_accounts_moderation_options, params[:status]), prompt: I18n.t('generic.all')
+        = select_tag :status,
+                     options_for_select(admin_accounts_moderation_options, params[:status]),
+                     prompt: I18n.t('generic.all')
     .filter-subset.filter-subset--with-select
       %strong= t('admin.accounts.role')
       .input.select.optional
-        = select_tag :role_ids, options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]), prompt: I18n.t('admin.accounts.moderation.all')
+        = select_tag :role_ids,
+                     options_from_collection_for_select(UserRole.assignable, :id, :name, params[:role_ids]),
+                     prompt: I18n.t('admin.accounts.moderation.all')
     .filter-subset.filter-subset--with-select
       %strong= t 'generic.order_by'
       .input.select
-        = select_tag :order, options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
+        = select_tag :order,
+                     options_for_select([[t('relationships.most_recent'), 'recent'], [t('relationships.last_active'), 'active']], params[:order])
 
   .fields-group
     - %i(username by_domain display_name email ip).each do |key|
@@ -46,18 +53,49 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if @accounts.any?(&:user_pending?)
-          = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :approve,
+                     type: :submit
 
-          = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.accounts.reject')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :reject,
+                     type: :submit
 
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-    - if @accounts.total_count > @accounts.size
+        - elsif @accounts.any?(&:remote_pending)
+          = f.button safe_join([material_symbol('check'), t('admin.accounts.approve')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :approve_remote,
+                     type: :submit
+
+          = f.button safe_join([material_symbol('check'), t('admin.accounts.approve_domain')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :approve_remote_domain,
+                     type: :submit
+
+          = f.button safe_join([material_symbol('times'), t('admin.accounts.reject')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :reject_remote,
+                     type: :submit
+
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :suspend,
+                   type: :submit
+    - if @accounts.size >= 40
       .batch-table__select-all
         .not-selected.active
           %span= t('generic.all_items_on_page_selected_html', count: @accounts.size)
-          %button{ type: 'button' }= t('generic.select_all_matching_items', count: @accounts.total_count)
+          %button{ type: 'button' }= t('generic.select_all_matching_items', count: '>40')
         .selected
-          %span= t('generic.all_matching_items_selected_html', count: @accounts.total_count)
+          %span= t('generic.all_matching_items_selected_html', count: '>40')
           %button{ type: 'button' }= t('generic.deselect')
     .batch-table__body
       - if @accounts.empty?
@@ -65,4 +103,6 @@
       - else
         = render partial: 'account', collection: @accounts, locals: { f: f }
 
-= paginate @accounts
+%nav.pagination
+  = link_to_previous_page @accounts, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), rel: 'prev'
+  = link_to_next_page @accounts, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), rel: 'next'
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index da2f2055d0..bcf7c07314 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -20,7 +20,7 @@
               %dd{ title: field.value, class: custom_field_classes(field) }
                 - if field.verified?
                   %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
-                    = fa_icon 'check'
+                    = material_symbol 'check'
                 = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
 
     - if account.note.present?
@@ -30,7 +30,7 @@
 = render 'admin/accounts/counters', account: @account
 
 - if @account.local? && @account.user.nil?
-  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.exists?(reference_account_id: @account.id)
+  = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.matching_account(@account).exists?
 - else
   .table-wrapper
     %table.table.inline-table
@@ -62,14 +62,16 @@
   .report-notes
     = render partial: 'admin/report_notes/report_note', collection: @moderation_notes
 
-  = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |f|
-    = f.hidden_field :target_account_id
+  = simple_form_for @account_moderation_note, url: admin_account_moderation_notes_path do |form|
+    = form.hidden_field :target_account_id
+
+    = render 'shared/error_messages', object: @account_moderation_note
 
     .field-group
-      = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+      = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: AccountModerationNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @account_moderation_note.errors.any? }
 
     .actions
-      = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+      = form.button :button, t('admin.account_moderation_notes.create'), type: :submit
 
   %hr.spacer/
 
diff --git a/app/views/admin/announcements/_form.html.haml b/app/views/admin/announcements/_form.html.haml
new file mode 100644
index 0000000000..3a9b371907
--- /dev/null
+++ b/app/views/admin/announcements/_form.html.haml
@@ -0,0 +1,28 @@
+.fields-group
+  = form.input :starts_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+  = form.input :ends_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :all_day,
+               as: :boolean,
+               wrapper: :with_label
+
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
+
+- unless form.object.published?
+  .fields-group
+    = form.input :scheduled_at,
+                 html5: true,
+                 include_blank: true,
+                 input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+                 wrapper: :with_block_label
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 150d98272f..8cec7d36c2 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -1,22 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-
-  .fields-group
-    = f.input :all_day, as: :boolean, wrapper: :with_label
-
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
-
-  - unless @announcement.published?
-    .fields-group
-      = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button,
+                  t('generic.save_changes'),
+                  type: :submit
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index 0123632ff4..266ca65e80 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -1,21 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-    = f.input :ends_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
-
-  .fields-group
-    = f.input :all_day, as: :boolean, wrapper: :with_label
-
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
-
-  .fields-group
-    = f.input :scheduled_at, include_blank: true, wrapper: :with_block_label, html5: true, input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder }
+  = render form
 
   .actions
-    = f.button :button, t('.create'), type: :submit
+    = form.button :button,
+                  t('.create'),
+                  type: :submit
diff --git a/app/views/admin/custom_emojis/_custom_emoji.html.haml b/app/views/admin/custom_emojis/_custom_emoji.html.haml
index f0cb64ec52..3c207c97f7 100644
--- a/app/views/admin/custom_emojis/_custom_emoji.html.haml
+++ b/app/views/admin/custom_emojis/_custom_emoji.html.haml
@@ -7,9 +7,16 @@
 
     .batch-table__row__content__text
       %samp :#{custom_emoji.shortcode}:
+      = link_to safe_join([fa_icon('pencil'), t('admin.custom_emojis.edit.label')]), edit_admin_custom_emoji_path(custom_emoji, local: params[:local], remote: params[:remote], shortcode: params[:shortcode], by_domain: params[:by_domain]), method: :get, class: 'table-action-link'
 
       - if custom_emoji.local?
         %span.information-badge= custom_emoji.category&.name || t('admin.custom_emojis.uncategorized')
+      - if custom_emoji.aliases_raw.present?
+        %br/
+        %span.neutral-hint= custom_emoji.aliases_raw
+      - if custom_emoji.license.present?
+        %br/
+        %span= custom_emoji.license
 
     .batch-table__row__content__extra
       - if custom_emoji.local?
diff --git a/app/views/admin/custom_emojis/edit.html.haml b/app/views/admin/custom_emojis/edit.html.haml
new file mode 100644
index 0000000000..9752179f81
--- /dev/null
+++ b/app/views/admin/custom_emojis/edit.html.haml
@@ -0,0 +1,45 @@
+- content_for :page_title do
+  = t('.title')
+
+= simple_form_for @custom_emoji, url: admin_custom_emoji_path(@custom_emoji.id), method: :put do |f|
+  = render 'shared/error_messages', object: @custom_emoji
+  - CustomEmojiFilter::KEYS.each do |key|
+    = hidden_field_tag key, params[key] if params[key].present?
+
+  .fields-group
+    = custom_emoji_tag(@custom_emoji)
+
+  %h4= t('admin.custom_emojis.shortcode')
+
+  .fields-group
+    %samp= @custom_emoji.shortcode
+
+  - unless @custom_emoji.local?
+    %h4= t('admin.custom_emojis.domain')
+
+    .fields-group
+      %samp= @custom_emoji.domain
+
+  - if @custom_emoji.local?
+    %h4= t('admin.custom_emojis.edit.label')
+
+    .fields-group
+      = f.input :category_id, collection: CustomEmojiCategory.all, label_method: ->(item) { item.name }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', include_blank: t('admin.custom_emojis.assign_category'), wrapper: :with_label, label: false, hint: false
+
+    .fields-group
+      = f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
+
+    .fields-group
+      = f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
+
+    .fields-group
+      = f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
+
+    .actions
+      = f.button :button, t('generic.save_changes'), type: :submit
+
+  - elsif @custom_emoji.license.present?
+    %h4= t('admin.custom_emojis.license')
+
+    .fields-group
+      %p= @custom_emoji.license
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml
index 8b4e93ac35..07f7041beb 100644
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -48,19 +48,19 @@
         - if params[:local] == '1'
           = f.button safe_join([fa_icon('save'), t('generic.save_changes')]), name: :update, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-          = f.button safe_join([fa_icon('eye'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility'), t('admin.custom_emojis.list')]), name: :list, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
-          = f.button safe_join([fa_icon('eye-slash'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('visibility_off'), t('admin.custom_emojis.unlist')]), name: :unlist, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.enable')]), name: :enable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         = f.button safe_join([fa_icon('power-off'), t('admin.custom_emojis.disable')]), name: :disable, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         - if can?(:destroy, :custom_emoji)
-          = f.button safe_join([fa_icon('times'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.custom_emojis.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
         - if can?(:copy, :custom_emoji) && params[:local] != '1'
-          = f.button safe_join([fa_icon('copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('content_copy'), t('admin.custom_emojis.copy')]), name: :copy, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
 
     - if params[:local] == '1'
       .batch-table__form.simple_form
@@ -68,12 +68,19 @@
           .fields-group.fields-row__column.fields-row__column-6
             .input.select.optional
               .label_input
-                = f.select :category_id, options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'), prompt: t('admin.custom_emojis.assign_category'), class: 'select optional', 'aria-label': t('admin.custom_emojis.assign_category')
+                = f.select :category_id,
+                           options_from_collection_for_select(CustomEmojiCategory.all, 'id', 'name'),
+                           'aria-label': t('admin.custom_emojis.assign_category'),
+                           class: 'select optional',
+                           prompt: t('admin.custom_emojis.assign_category')
 
           .fields-group.fields-row__column.fields-row__column-6
             .input.string.optional
               .label_input
-                = f.text_field :category_name, class: 'string optional', placeholder: t('admin.custom_emojis.create_new_category'), 'aria-label': t('admin.custom_emojis.create_new_category')
+                = f.text_field :category_name,
+                               'aria-label': t('admin.custom_emojis.create_new_category'),
+                               class: 'string optional',
+                               placeholder: t('admin.custom_emojis.create_new_category')
 
     .batch-table__body
       - if @custom_emojis.empty?
@@ -81,4 +88,6 @@
       - else
         = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f }
 
-= paginate @custom_emojis
+%nav.pagination
+  = link_to_previous_page @custom_emojis, safe_join([fa_icon('chevron-left'), t('pagination.prev')], ' '), rel: 'prev'
+  = link_to_next_page @custom_emojis, safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), rel: 'next'
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index a03676b001..87fd13f836 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -5,9 +5,30 @@
   = render 'shared/error_messages', object: @custom_emoji
 
   .fields-group
-    = f.input :shortcode, wrapper: :with_label, label: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
+    = f.input :shortcode,
+              wrapper: :with_label,
+              label: t('admin.custom_emojis.shortcode'),
+              hint: t('admin.custom_emojis.shortcode_hint')
+
   .fields-group
-    = f.input :image, wrapper: :with_label, input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
+    = f.input :image,
+              wrapper: :with_label,
+              input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') },
+              hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT))
+
+  .fields-group
+    = f.input :category_id, collection: CustomEmojiCategory.all, label_method: ->(item) { item.name }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', include_blank: t('admin.custom_emojis.assign_category'), wrapper: :with_label, label: false, hint: false
+
+  .fields-group
+    = f.input :visible_in_picker, as: :boolean, wrapper: :with_label, label: t('admin.custom_emojis.visible_in_picker')
+
+  .fields-group
+    = f.input :aliases_raw, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.aliases'), hint: t('admin.custom_emojis.aliases_hint')
+
+  .fields-group
+    = f.input :license, wrapper: :with_label, kmyblue: true, label: t('admin.custom_emojis.license'), hint: t('admin.custom_emojis.license_hint')
 
   .actions
-    = f.button :button, t('admin.custom_emojis.upload'), type: :submit
+    = f.button :button,
+               t('admin.custom_emojis.upload'),
+               type: :submit
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3597152e09..8430dd3c4f 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -16,53 +16,106 @@
 
 .dashboard
   .dashboard__item
-    = react_admin_component :counter, measure: 'new_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.new_users'), href: admin_accounts_path(origin: 'local')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_accounts_path(origin: 'local'),
+                            label: t('admin.dashboard.new_users'),
+                            measure: 'new_users',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'active_users', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.active_users'), href: admin_accounts_path(origin: 'local')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_accounts_path(origin: 'local'),
+                            label: t('admin.dashboard.active_users'),
+                            measure: 'active_users',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'interactions', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.interactions')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.interactions'),
+                            measure: 'interactions',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'opened_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.opened_reports'), href: admin_reports_path
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_reports_path,
+                            label: t('admin.dashboard.opened_reports'),
+                            measure: 'opened_reports',
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :counter, measure: 'resolved_reports', start_at: @time_period.first, end_at: @time_period.last, label: t('admin.dashboard.resolved_reports'), href: admin_reports_path(resolved: '1')
+    = react_admin_component :counter,
+                            end_at: @time_period.last,
+                            href: admin_reports_path(resolved: '1'),
+                            label: t('admin.dashboard.resolved_reports'),
+                            measure: 'resolved_reports',
+                            start_at: @time_period.first
 
   .dashboard__item
     = link_to admin_reports_path, class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_reports_html', count: @pending_reports_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_accounts_path(status: 'pending'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_users_html', count: @pending_users_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_trends_tags_path(status: 'pending_review'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_tags_html', count: @pending_tags_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
 
     = link_to admin_disputes_appeals_path(status: 'pending'), class: 'dashboard__quick-access' do
       %span= t('admin.dashboard.pending_appeals_html', count: @pending_appeals_count)
-      = fa_icon 'chevron-right fw'
+      = material_symbol 'chevron_right'
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'sources', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.sources')
+    = react_admin_component :dimension,
+                            dimension: 'sources',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.sources'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'languages', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_languages')
+    = react_admin_component :dimension,
+                            dimension: 'languages',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.top_languages'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'servers', start_at: @time_period.first, end_at: @time_period.last, limit: 8, label: t('admin.dashboard.top_servers')
+    = react_admin_component :dimension,
+                            dimension: 'servers',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.top_servers'),
+                            limit: 8,
+                            start_at: @time_period.first
 
   .dashboard__item.dashboard__item--span-double-column
-    = react_admin_component :retention, start_at: @time_period.last - 6.months, end_at: @time_period.last, frequency: 'month'
+    = react_admin_component :retention,
+                            end_at: @time_period.last,
+                            frequency: 'month',
+                            start_at: @time_period.last - 6.months
 
   .dashboard__item.dashboard__item--span-double-row
-    = react_admin_component :trends, limit: 7
+    = react_admin_component :trends,
+                            limit: 7
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'software_versions', start_at: @time_period.first, end_at: @time_period.last, limit: 4, label: t('admin.dashboard.software')
+    = react_admin_component :dimension,
+                            dimension: 'software_versions',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.software'),
+                            limit: 4,
+                            start_at: @time_period.first
 
   .dashboard__item
-    = react_admin_component :dimension, dimension: 'space_usage', start_at: @time_period.first, end_at: @time_period.last, limit: 3, label: t('admin.dashboard.space')
+    = react_admin_component :dimension,
+                            dimension: 'space_usage',
+                            end_at: @time_period.last,
+                            label: t('admin.dashboard.space'),
+                            limit: 3,
+                            start_at: @time_period.first
diff --git a/app/views/admin/domain_blocks/_domain_block_list.html.haml b/app/views/admin/domain_blocks/_domain_block_list.html.haml
new file mode 100644
index 0000000000..2b7b382165
--- /dev/null
+++ b/app/views/admin/domain_blocks/_domain_block_list.html.haml
@@ -0,0 +1,32 @@
+%h4= I18n.t('admin.domain_blocks.headers.harassment')
+
+.fields-group
+  = f.input :reject_favourite, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_favourite'), hint: I18n.t('admin.domain_blocks.reject_favourite_hint')
+
+.fields-group
+  = f.input :reject_reply_exclude_followers, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reply_exclude_followers'), hint: I18n.t('admin.domain_blocks.reject_reply_exclude_followers_hint')
+
+.fields-group
+  = f.input :reject_hashtag, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_hashtag'), hint: I18n.t('admin.domain_blocks.reject_hashtag_hint')
+
+.fields-group
+  = f.input :reject_straight_follow, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_straight_follow'), hint: I18n.t('admin.domain_blocks.reject_straight_follow_hint')
+
+.fields-group
+  = f.input :reject_new_follow, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_new_follow'), hint: I18n.t('admin.domain_blocks.reject_new_follow_hint')
+
+.fields-group
+  = f.input :reject_friend, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_friend'), hint: I18n.t('admin.domain_blocks.reject_friend_hint')
+
+%h4= I18n.t('admin.domain_blocks.headers.invalid_privacy')
+
+.fields-group
+  = f.input :detect_invalid_subscription, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.detect_invalid_subscription'), hint: I18n.t('admin.domain_blocks.detect_invalid_subscription_hint')
+
+%h4= I18n.t('admin.domain_blocks.headers.disagreement')
+
+.fields-group
+  = f.input :reject_send_sensitive, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_send_sensitive'), hint: I18n.t('admin.domain_blocks.reject_send_sensitive_hint')
+
+.fields-group
+  = f.input :block_trends, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.block_trends'), hint: I18n.t('admin.domain_blocks.block_trends_hint')
diff --git a/app/views/admin/domain_blocks/_form.html.haml b/app/views/admin/domain_blocks/_form.html.haml
new file mode 100644
index 0000000000..8c2a24cad5
--- /dev/null
+++ b/app/views/admin/domain_blocks/_form.html.haml
@@ -0,0 +1,54 @@
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = form.input :domain,
+                 disabled: form.object.persisted?,
+                 hint: t('admin.domain_blocks.new.hint'),
+                 label: t('admin.domain_blocks.domain'),
+                 readonly: form.object.persisted?,
+                 required: true,
+                 wrapper: :with_label
+  .fields-row__column.fields-row__column-6.fields-group
+    = form.input :severity,
+                 collection: DomainBlock.severities.keys,
+                 hint: t('admin.domain_blocks.new.severity.desc_html'),
+                 include_blank: false,
+                 label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") },
+                 wrapper: :with_label
+
+= render 'domain_block_list', f: form
+
+%h4= I18n.t('admin.domain_blocks.headers.mastodon_default')
+
+.fields-group
+  = form.input :reject_media,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.reject_media_hint'),
+               label: I18n.t('admin.domain_blocks.reject_media'),
+               wrapper: :with_label
+.fields-group
+  = form.input :reject_reports,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.reject_reports_hint'),
+               label: I18n.t('admin.domain_blocks.reject_reports'),
+               wrapper: :with_label
+.fields-group
+  = form.input :obfuscate,
+               as: :boolean,
+               hint: I18n.t('admin.domain_blocks.obfuscate_hint'),
+               label: I18n.t('admin.domain_blocks.obfuscate'),
+               wrapper: :with_label
+.field-group
+  = form.input :private_comment,
+               as: :string,
+               hint: t('admin.domain_blocks.private_comment_hint'),
+               label: I18n.t('admin.domain_blocks.private_comment'),
+               wrapper: :with_label
+.field-group
+  = form.input :public_comment,
+               as: :string,
+               hint: t('admin.domain_blocks.public_comment_hint'),
+               label: I18n.t('admin.domain_blocks.public_comment'),
+               wrapper: :with_label
+
+.fields-group
+  = form.input :hidden, as: :boolean, kmyblue: true, wrapper: :with_label, label: I18n.t('admin.domain_blocks.hidden'), hint: I18n.t('admin.domain_blocks.hidden_hint')
diff --git a/app/views/admin/domain_blocks/confirm_suspension.html.haml b/app/views/admin/domain_blocks/confirm_suspension.html.haml
index a5df8ba3f3..4c4f92d710 100644
--- a/app/views/admin/domain_blocks/confirm_suspension.html.haml
+++ b/app/views/admin/domain_blocks/confirm_suspension.html.haml
@@ -14,7 +14,8 @@
 
   %hr.spacer
 
-  = react_admin_component :impact_report, domain: @domain_block.domain
+  = react_admin_component :impact_report,
+                          domain: @domain_block.domain
 
   .actions
     = link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index ae76b6777a..40c46b8b6b 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -1,30 +1,12 @@
 - content_for :page_title do
   = t('admin.domain_blocks.edit')
 
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |f|
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |form|
   = render 'shared/error_messages', object: @domain_block
 
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('admin.domain_blocks.new.hint'), required: true, readonly: true, disabled: true
-
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t("admin.domain_blocks.new.severity.#{type}") }, hint: t('admin.domain_blocks.new.severity.desc_html')
-
-  .fields-group
-    = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
-
-  .fields-group
-    = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
-
-  .fields-group
-    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
-
-  .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
-
-  .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button,
+                  t('generic.save_changes'),
+                  type: :submit
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 86e519f451..78bcfcba8e 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -1,30 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @domain_block, url: admin_domain_blocks_path do |f|
+= simple_form_for @domain_block, url: admin_domain_blocks_path do |form|
   = render 'shared/error_messages', object: @domain_block
 
-  .fields-row
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('.hint'), required: true
-
-    .fields-row__column.fields-row__column-6.fields-group
-      = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: ->(type) { t(".severity.#{type}") }, hint: t('.severity.desc_html')
-
-  .fields-group
-    = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
-
-  .fields-group
-    = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
-
-  .fields-group
-    = f.input :obfuscate, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.obfuscate'), hint: I18n.t('admin.domain_blocks.obfuscate_hint')
-
-  .field-group
-    = f.input :private_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.private_comment'), hint: t('admin.domain_blocks.private_comment_hint'), as: :string
-
-  .field-group
-    = f.input :public_comment, wrapper: :with_label, label: I18n.t('admin.domain_blocks.public_comment'), hint: t('admin.domain_blocks.public_comment_hint'), as: :string
+  = render form
 
   .actions
-    = f.button :button, t('.create'), type: :submit
+    = form.button :button,
+                  t('.create'),
+                  type: :submit
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 9f16e0d5c3..684735c207 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -12,7 +12,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('times'), t('admin.email_domain_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('close'), t('admin.email_domain_blocks.delete')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :delete,
+                   type: :submit
     .batch-table__body
       - if @email_domain_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index 3d31487733..dd4b83ee3f 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -5,10 +5,16 @@
   = render 'shared/error_messages', object: @email_domain_block
 
   .fields-group
-    = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain'), input_html: { readonly: defined?(@resolved_records) }
+    = f.input :domain,
+              input_html: { readonly: defined?(@resolved_records) },
+              label: t('admin.email_domain_blocks.domain'),
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :allow_with_approval, wrapper: :with_label, hint: false, label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval')
+    = f.input :allow_with_approval,
+              hint: false,
+              label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval'),
+              wrapper: :with_label
 
   - if defined?(@resolved_records)
     %p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
@@ -22,7 +28,11 @@
         - @resolved_records.each do |record|
           .batch-table__row
             %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
-              = f.input_field :other_domains, as: :boolean, checked_value: record.exchange.to_s, include_hidden: false, multiple: true
+              = f.input_field :other_domains,
+                              as: :boolean,
+                              checked_value: record.exchange.to_s,
+                              include_hidden: false,
+                              multiple: true
             .batch-table__row__content.pending-account
               .pending-account__header
                 %samp= record.exchange.to_s
diff --git a/app/views/admin/export_domain_allows/new.html.haml b/app/views/admin/export_domain_allows/new.html.haml
index dc0cf8c52a..66c6aa8d8a 100644
--- a/app/views/admin/export_domain_allows/new.html.haml
+++ b/app/views/admin/export_domain_allows/new.html.haml
@@ -4,7 +4,10 @@
 = simple_form_for @import, url: import_admin_export_domain_allows_path, html: { multipart: true } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+      = f.input :data,
+                as: :file,
+                hint: t('simple_form.hints.imports.data'),
+                wrapper: :with_block_label
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index cdce4fd28a..6b808db478 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -10,6 +10,13 @@
       = f.hidden_field :domain
       = f.hidden_field :severity
       = f.hidden_field :reject_media
+      = f.hidden_field :reject_favourite
+      = f.hidden_field :reject_reply_exclude_followers
+      = f.hidden_field :reject_send_sensitive
+      = f.hidden_field :reject_hashtag
+      = f.hidden_field :reject_straight_follow
+      = f.hidden_field :reject_new_follow
+      = f.hidden_field :detect_invalid_subscription
       = f.hidden_field :reject_reports
       = f.hidden_field :obfuscate
       = f.hidden_field :private_comment
@@ -23,5 +30,5 @@
         = f.object.public_comment
       - if existing_relationships
         ·
-        = fa_icon 'warning fw'
+        = material_symbol 'warning'
         = t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/export_domain_blocks/import.html.haml b/app/views/admin/export_domain_blocks/import.html.haml
index 01add232d1..52ffc3d465 100644
--- a/app/views/admin/export_domain_blocks/import.html.haml
+++ b/app/views/admin/export_domain_blocks/import.html.haml
@@ -12,7 +12,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('copy'), t('admin.domain_blocks.import')]), name: :save, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('content_copy'), t('admin.domain_blocks.import')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :save,
+                   type: :submit
     .batch-table__body
       - if @domain_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/export_domain_blocks/new.html.haml b/app/views/admin/export_domain_blocks/new.html.haml
index 0291aeed77..9c960d47fe 100644
--- a/app/views/admin/export_domain_blocks/new.html.haml
+++ b/app/views/admin/export_domain_blocks/new.html.haml
@@ -4,7 +4,10 @@
 = simple_form_for @import, url: import_admin_export_domain_blocks_path, html: { multipart: true } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data'), as: :file
+      = f.input :data,
+                as: :file,
+                hint: t('simple_form.hints.imports.data'),
+                wrapper: :with_block_label
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index 9c2063d3c5..c8ad653a88 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -13,7 +13,8 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :language, options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
+        = select_tag :language,
+                     options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key] }, @language)
     .filter-subset
       %strong= t('admin.follow_recommendations.status')
       %ul
@@ -30,9 +31,16 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if params[:status].blank? && can?(:suppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('times'), t('admin.follow_recommendations.suppress')]), name: :suppress, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.follow_recommendations.suppress')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :suppress,
+                     type: :submit
         - if params[:status] == 'suppressed' && can?(:unsuppress, :follow_recommendation)
-          = f.button safe_join([fa_icon('plus'), t('admin.follow_recommendations.unsuppress')]), name: :unsuppress, class: 'table-action-link', type: :submit
+          = f.button safe_join([material_symbol('add'), t('admin.follow_recommendations.unsuppress')]),
+                     class: 'table-action-link',
+                     name: :unsuppress,
+                     type: :submit
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/friend_servers/_friend_domain.html.haml b/app/views/admin/friend_servers/_friend_domain.html.haml
new file mode 100644
index 0000000000..9a2e857aba
--- /dev/null
+++ b/app/views/admin/friend_servers/_friend_domain.html.haml
@@ -0,0 +1,31 @@
+%tr
+  %td
+    - unless friend.available
+      %span.negative-hint
+        = fa_icon('times')
+        &nbsp;
+        = t 'admin.friend_servers.disabled'
+    %samp= friend.domain
+  %td
+    - if friend.accepted?
+      %span.positive-hint
+        = fa_icon('check')
+        &nbsp;
+        = t 'admin.friend_servers.enabled'
+    - elsif friend.i_am_pending?
+      = fa_icon('hourglass')
+      &nbsp;
+      = t 'admin.friend_servers.pending'
+    - elsif friend.they_are_pending?
+      %span.warning-hint
+        = fa_icon('hourglass')
+        &nbsp;
+        = t 'admin.friend_servers.pending_you'
+    - else
+      %span.negative-hint
+        = fa_icon('times')
+        &nbsp;
+        = t 'admin.friend_servers.disabled'
+  %td
+    = table_link_to 'pencil', t('admin.friend_servers.edit_friend'), edit_admin_friend_server_path(friend)
+    = table_link_to 'times', t('admin.friend_servers.delete'), admin_friend_server_path(friend), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/friend_servers/_friend_fields.html.haml b/app/views/admin/friend_servers/_friend_fields.html.haml
new file mode 100644
index 0000000000..ad9b0d60ca
--- /dev/null
+++ b/app/views/admin/friend_servers/_friend_fields.html.haml
@@ -0,0 +1,20 @@
+%p= t 'admin.friend_servers.edit.description'
+%hr.spacer/
+
+.fields-group
+  = f.input :domain, as: :string, wrapper: :with_label, required: true, disabled: !friend.id.nil?, label: t('admin.friend_servers.edit.domain')
+
+.fields-group
+  = f.input :inbox_url, as: :string, wrapper: :with_label, label: t('admin.friend_servers.edit.inbox_url'), hint: t('admin.friend_servers.edit.inbox_url_hint')
+
+.fields-group
+  = f.input :available, as: :boolean, wrapper: :with_label, label: t('admin.friend_servers.edit.available')
+
+.fields-group
+  = f.input :delivery_local, as: :boolean, wrapper: :with_label, label: t('admin.friend_servers.edit.delivery_local'), hint: t('admin.friend_servers.edit.delivery_local_hint')
+
+.fields-group
+  = f.input :pseudo_relay, as: :boolean, wrapper: :with_label, label: t('admin.friend_servers.edit.pseudo_relay'), hint: t('admin.friend_servers.edit.pseudo_relay_hint')
+
+.fields-group
+  = f.input :allow_all_posts, as: :boolean, wrapper: :with_label, label: t('admin.friend_servers.edit.allow_all_posts'), hint: t('admin.friend_servers.edit.allow_all_posts_hint')
diff --git a/app/views/admin/friend_servers/edit.html.haml b/app/views/admin/friend_servers/edit.html.haml
new file mode 100644
index 0000000000..9a2acb21a5
--- /dev/null
+++ b/app/views/admin/friend_servers/edit.html.haml
@@ -0,0 +1,32 @@
+- content_for :page_title do
+  = t('admin.friend_servers.edit_friend')
+
+= simple_form_for @friend, url: admin_friend_server_path(@friend), method: :put do |f|
+  = render 'shared/error_messages', object: @friend
+  = render 'friend_fields', f: f, friend: @friend
+
+  .fields-group
+    %h4= t('admin.friend_servers.status')
+    .fields-group
+      - if @friend.accepted?
+        %span.positive-hint
+          = fa_icon('check')
+          &nbsp;
+          = t 'admin.friend_servers.enabled'
+      - elsif @friend.pending?
+        = fa_icon('hourglass')
+        &nbsp;
+        = t 'admin.friend_servers.pending'
+      - else
+        %span.negative-hint
+          = fa_icon('times')
+          &nbsp;
+          = t 'admin.friend_servers.disabled'
+      .action-buttons
+        %div
+          = link_to t('admin.friend_servers.follow'), follow_admin_friend_server_path(@friend), class: 'button', method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if @friend.idle?
+          = link_to t('admin.friend_servers.accept'), accept_admin_friend_server_path(@friend), class: 'button', method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if @friend.they_are_pending?
+          = link_to t('admin.friend_servers.reject'), reject_admin_friend_server_path(@friend), class: 'button', method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if @friend.they_are_pending?
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/friend_servers/index.html.haml b/app/views/admin/friend_servers/index.html.haml
new file mode 100644
index 0000000000..196407c4c4
--- /dev/null
+++ b/app/views/admin/friend_servers/index.html.haml
@@ -0,0 +1,20 @@
+- content_for :page_title do
+  = t('admin.friend_servers.title')
+
+.simple_form
+  %p.hint= t('admin.friend_servers.description_html')
+  = link_to @friends.empty? ? t('admin.friend_servers.setup') : t('admin.friend_servers.add_new'), new_admin_friend_server_path, class: 'block-button'
+
+- unless @friends.empty?
+  %hr.spacer
+
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('admin.friend_servers.domain')
+          %th= t('admin.friend_servers.status')
+          %th
+      %tbody
+        - @friends.each do |friend|
+          = render 'friend_domain', friend: friend
diff --git a/app/views/admin/friend_servers/new.html.haml b/app/views/admin/friend_servers/new.html.haml
new file mode 100644
index 0000000000..1cb5b06b6f
--- /dev/null
+++ b/app/views/admin/friend_servers/new.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('admin.friend_servers.add_new')
+
+= simple_form_for @friend, url: admin_friend_servers_path do |f|
+  = render 'shared/error_messages', object: @friend
+  = render 'friend_fields', f: f, friend: @friend
+
+  .actions
+    = f.button :button, t('admin.friend_servers.save_and_enable'), type: :submit
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 65cf789ce3..522a2444bb 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -7,6 +7,10 @@
       %small
         - if instance.domain_block
           = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
+          - if instance.domain_block.public_comment.present?
+            %span.comment.public-comment #{t('admin.domain_blocks.public_comment')}: #{instance.domain_block.public_comment}
+          - if instance.domain_block.private_comment.present?
+            %span.comment.private-comment #{t('admin.domain_blocks.private_comment')}: #{instance.domain_block.private_comment}
         - elsif instance.domain_allow
           = t('admin.accounts.whitelisted')
         - else
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 5f2664df76..a357eaf4b4 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -1,6 +1,10 @@
 - content_for :page_title do
   = @instance.domain
 
+- if @instance.instance_info.present?
+  %p
+    #{@instance.instance_info.software} #{@instance.instance_info.version}
+
 - if current_user.can?(:view_dashboard)
   - content_for :heading_actions do
     = l(@time_period.first)
@@ -9,26 +13,71 @@
 
   - if @instance.persisted?
     %p
-      = fa_icon 'info fw'
+      = material_symbol 'info'
       = t('admin.instances.totals_time_period_hint_html')
 
     .dashboard
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_accounts_measure'), href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain)
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                href: admin_accounts_path(origin: 'remote', by_domain: @instance.domain),
+                                label: t('admin.instances.dashboard.instance_accounts_measure'),
+                                measure: 'instance_accounts',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_statuses', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_statuses_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_statuses_measure'),
+                                measure: 'instance_statuses',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_media_attachments', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_media_attachments_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_media_attachments_measure'),
+                                measure: 'instance_media_attachments',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_follows', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_follows_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_follows_measure'),
+                                measure: 'instance_follows',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_followers', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_followers_measure')
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_followers_measure'),
+                                measure: 'instance_followers',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :counter, measure: 'instance_reports', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, label: t('admin.instances.dashboard.instance_reports_measure'), href: admin_reports_path(by_target_domain: @instance.domain)
+        = react_admin_component :counter,
+                                end_at: @time_period.last,
+                                href: admin_reports_path(by_target_domain: @instance.domain),
+                                label: t('admin.instances.dashboard.instance_reports_measure'),
+                                measure: 'instance_reports',
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :dimension, dimension: 'instance_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_accounts_dimension')
+        = react_admin_component :dimension,
+                                dimension: 'instance_accounts',
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_accounts_dimension'),
+                                limit: 8,
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
       .dashboard__item
-        = react_admin_component :dimension, dimension: 'instance_languages', start_at: @time_period.first, end_at: @time_period.last, params: { domain: @instance.domain }, limit: 8, label: t('admin.instances.dashboard.instance_languages_dimension')
+        = react_admin_component :dimension,
+                                dimension: 'instance_languages',
+                                end_at: @time_period.last,
+                                label: t('admin.instances.dashboard.instance_languages_dimension'),
+                                limit: 8,
+                                params: { domain: @instance.domain },
+                                start_at: @time_period.first
+
   - else
     %p
       = t('admin.instances.unknown_instance')
diff --git a/app/views/admin/invites/_invite.html.haml b/app/views/admin/invites/_invite.html.haml
index e6ad9de34c..f9cd6003f3 100644
--- a/app/views/admin/invites/_invite.html.haml
+++ b/app/views/admin/invites/_invite.html.haml
@@ -12,7 +12,7 @@
 
   - if invite.valid_for_use?
     %td
-      = fa_icon 'user fw'
+      = material_symbol 'person'
       = invite.uses
       = " / #{invite.max_uses}" unless invite.max_uses.nil?
     %td
diff --git a/app/views/admin/ip_blocks/index.html.haml b/app/views/admin/ip_blocks/index.html.haml
index a48e4791a3..9eba6c68ff 100644
--- a/app/views/admin/ip_blocks/index.html.haml
+++ b/app/views/admin/ip_blocks/index.html.haml
@@ -14,7 +14,11 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if can?(:destroy, :ip_block)
-          = f.button safe_join([fa_icon('times'), t('admin.ip_blocks.delete')]), name: :delete, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([material_symbol('close'), t('admin.ip_blocks.delete')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :delete,
+                     type: :submit
     .batch-table__body
       - if @ip_blocks.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/ip_blocks/new.html.haml b/app/views/admin/ip_blocks/new.html.haml
index ecaf04315b..81493012c6 100644
--- a/app/views/admin/ip_blocks/new.html.haml
+++ b/app/views/admin/ip_blocks/new.html.haml
@@ -5,16 +5,30 @@
   = render 'shared/error_messages', object: @ip_block
 
   .fields-group
-    = f.input :ip, as: :string, wrapper: :with_block_label, input_html: { placeholder: '192.0.2.0/24' }
+    = f.input :ip,
+              as: :string,
+              input_html: { placeholder: '192.0.2.0/24' },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :expires_in, wrapper: :with_block_label, collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i), label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt')
+    = f.input :expires_in,
+              collection: [1.day, 2.weeks, 1.month, 6.months, 1.year, 3.years].map(&:to_i),
+              label_method: ->(i) { I18n.t("admin.ip_blocks.expires_in.#{i}") },
+              prompt: I18n.t('invites.expires_in_prompt'),
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :severity, as: :radio_buttons, collection: IpBlock.severities.keys, include_blank: false, wrapper: :with_block_label, label_method: ->(severity) { ip_blocks_severity_label(severity) }
+    = f.input :severity,
+              as: :radio_buttons,
+              collection: IpBlock.severities.keys,
+              include_blank: false,
+              label_method: ->(severity) { ip_blocks_severity_label(severity) },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :comment, as: :string, wrapper: :with_block_label
+    = f.input :comment,
+              as: :string,
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('admin.ip_blocks.add_new'), type: :submit
diff --git a/app/views/admin/ng_rule_histories/_history.html.haml b/app/views/admin/ng_rule_histories/_history.html.haml
new file mode 100644
index 0000000000..1425b1cda2
--- /dev/null
+++ b/app/views/admin/ng_rule_histories/_history.html.haml
@@ -0,0 +1,42 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-checkbox
+    -# = f.check_box :history_ids, { multiple: true, include_hidden: false }, history.id
+  .batch-table__row__content
+    - if history.hidden
+      .simple_form
+        %p.hint= t('admin.ng_rule_histories.hidden')
+    - else
+      .status__content><
+        = html_aware_format(history.text, history.local)
+
+    .detailed-status__meta
+      = t("admin.ng_rule_histories.reason_actions.#{history.reason_action}")
+      - if history.data.present? && !history.hidden
+        - if history.data['media_count'].present? && history.data['media_count'].positive?
+          ·
+          = t('admin.ng_rule_histories.data.media_count', count: history.data['media_count'])
+        - if history.data['poll_count'].present? && history.data['poll_count'].positive?
+          ·
+          = t('admin.ng_rule_histories.data.poll_count', count: history.data['poll_count'])
+
+      %br/
+
+      - if history.account.present?
+        - if history.hidden
+          - if history.account.local?
+            = t('admin.ng_rule_histories.from_local_user')
+          - else
+            = history.account.domain
+          ·
+        - else
+          = link_to t('admin.ng_rule_histories.moderate_account'), admin_account_path(history.account.id)
+          ·
+
+      %time.formatted{ datetime: history.created_at.iso8601, title: l(history.created_at) }= l(history.created_at)
+
+      - if history.uri.present? && !history.hidden
+        ·
+        - if history.data.present? && history.data['url'].present?
+          = link_to history.uri, history.data['url'] || history.uri, target: '_blank', rel: 'noopener'
+        - else
+          = link_to history.uri, target: '_blank', rel: 'noopener'
diff --git a/app/views/admin/ng_rule_histories/show.html.haml b/app/views/admin/ng_rule_histories/show.html.haml
new file mode 100644
index 0000000000..9c074b2e05
--- /dev/null
+++ b/app/views/admin/ng_rule_histories/show.html.haml
@@ -0,0 +1,25 @@
+- content_for :page_title do
+  = t('admin.ng_rule_histories.title', title: @ng_rule.title)
+
+.filters
+  .back-link
+    = link_to edit_admin_ng_rule_path(id: @ng_rule.id) do
+      = fa_icon 'chevron-left fw'
+      = t('admin.ng_rule_histories.back_to_ng_rule')
+    = link_to admin_ng_rules_path do
+      = fa_icon 'chevron-left fw'
+      = t('admin.ng_rule_histories.back_to_ng_rules')
+
+%hr.spacer/
+
+.batch-table
+  .batch-table__toolbar
+    %label.batch-table__toolbar__select.batch-checkbox-all
+      = check_box_tag :batch_checkbox_all, nil, false
+  .batch-table__body
+    - if @histories.empty?
+      = nothing_here 'nothing-here--under-tabs'
+    - else
+      = render partial: 'admin/ng_rule_histories/history', collection: @histories
+
+= paginate @histories
diff --git a/app/views/admin/ng_rules/_ng_rule.html.haml b/app/views/admin/ng_rules/_ng_rule.html.haml
new file mode 100644
index 0000000000..4313363535
--- /dev/null
+++ b/app/views/admin/ng_rules/_ng_rule.html.haml
@@ -0,0 +1,25 @@
+.filters-list__item{ class: [(ng_rule.expired? || !ng_rule.available) && 'expired'] }
+  = link_to edit_admin_ng_rule_path(ng_rule), class: 'filters-list__item__title' do
+    = ng_rule.title.presence || "(#{t('admin.ng_rules.index.empty_title')})"
+
+    - if ng_rule.expires?
+      .expiration{ title: t('filters.index.expires_on', date: l(ng_rule.expires_at)) }
+        - if ng_rule.expired?
+          = t('invites.expired')
+        - else
+          = t('filters.index.expires_in', distance: distance_of_time_in_words_to_now(ng_rule.expires_at))
+    - elsif !ng_rule.available
+      .expiration
+        = t('admin.ng_rules.index.disabled')
+
+  .filters-list__item__permissions
+    %ul.permissions-list
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      = link_to t('admin.ng_rules.index.hit_count', count: ng_rule.hit_count), admin_ng_rule_history_path(ng_rule)
+
+    %div
+      = table_link_to 'pencil', t('admin.ng_rules.index.edit.title'), edit_admin_ng_rule_path(ng_rule)
+      = table_link_to 'files-o', t('admin.ng_rules.copy'), duplicate_admin_ng_rule_path(ng_rule), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+      = table_link_to 'times', t('admin.ng_rules.index.delete'), admin_ng_rule_path(ng_rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/ng_rules/_ng_rule_fields.html.haml b/app/views/admin/ng_rules/_ng_rule_fields.html.haml
new file mode 100644
index 0000000000..139fd65bd2
--- /dev/null
+++ b/app/views/admin/ng_rules/_ng_rule_fields.html.haml
@@ -0,0 +1,123 @@
+
+.fields-group
+  %p= t('admin.ng_rules.edit.helps.generic')
+
+.fields-group
+  %p
+    = t('admin.ng_rules.edit.helps.textarea_html')
+    = link_to t('admin.ng_rules.rubular'), 'https://rubular.com/', target: '_blank', rel: 'noopener'
+
+.fields-group
+  %p= t('admin.ng_rules.edit.helps.threshold_html')
+
+- if @ng_rule.id.present?
+  %p.hint= link_to t('admin.ng_rules.edit.history'), admin_ng_rule_history_path(id: @ng_rule.id)
+
+%hr.spacer/
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :title, as: :string, wrapper: :with_label, hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week, 2.weeks, 1.month, 3.months].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+
+%h4= t('admin.ng_rules.edit.headers.account')
+%p.lead= t('admin.ng_rules.edit.summary.account')
+
+.fields-group
+  = f.input :account_allow_followed_by_local, as: :boolean, wrapper: :with_label, hint: t('admin.ng_rules.account_allow_followed_by_local_hint'), label: t('admin.ng_rules.account_allow_followed_by_local')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_domain, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_domain'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_include_local, as: :boolean, wrapper: :with_label, label: t('admin.ng_rules.account_include_local'), hint: false
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_username, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_username'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_display_name, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_display_name'), hint: false
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_field_name, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_field_name'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_field_value, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_field_value'), hint: false
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_note, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.account_note'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :account_avatar_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.account_avatar_state')
+    = f.input :account_header_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.account_header_state')
+
+%h4= t('admin.ng_rules.edit.headers.status')
+%p.lead= t('admin.ng_rules.edit.summary.status')
+
+.fields-group
+  = f.input :status_allow_follower_mention, as: :boolean, wrapper: :with_label, hint: t('admin.ng_rules.status_allow_follower_mention_hint'), label: t('admin.ng_rules.status_allow_follower_mention')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_text, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.status_text'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_spoiler_text, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.status_spoiler_text'), hint: false
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_tag, as: :text, input_html: { rows: 4 }, wrapper: :with_label, label: t('admin.ng_rules.status_tag'), hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_sensitive_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_sensitive_state')
+    = f.input :status_cw_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_cw_state')
+
+.fields-group
+  = f.input :status_visibility, wrapper: :with_block_label, collection: Status.all_visibilities, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("statuses.visibilities.#{context}") }, include_blank: false, label: t('admin.ng_rules.status_visibility')
+
+.fields-group
+  = f.input :status_searchability, wrapper: :with_block_label, collection: Status.all_searchabilities + %w(unset), as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("statuses.searchabilities.#{context}") }, include_blank: false, label: t('admin.ng_rules.status_searchability')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_media_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_media_state')
+    = f.input :status_media_threshold, as: :string, wrapper: :with_label, hint: false, label: t('admin.ng_rules.status_media_threshold')
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_poll_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_poll_state')
+    = f.input :status_poll_threshold, as: :string, wrapper: :with_label, hint: false, label: t('admin.ng_rules.status_poll_threshold')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_quote_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_quote_state')
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_reply_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_reply_state')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_mention_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_mention_state')
+    = f.input :status_mention_threshold, as: :string, wrapper: :with_label, hint: false, label: t('admin.ng_rules.status_mention_threshold')
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :status_reference_state, wrapper: :with_label, collection: %i(optional needed no_needed), include_blank: false, label_method: ->(i) { I18n.t("admin.ng_rules.states.#{i}") }, label: t('admin.ng_rules.status_reference_state')
+    = f.input :status_reference_threshold, as: :string, wrapper: :with_label, hint: false, label: t('admin.ng_rules.status_reference_threshold')
+
+%h4= t('admin.ng_rules.edit.headers.reaction')
+%p.lead= t('admin.ng_rules.edit.summary.reaction')
+
+.fields-row
+  = f.input :reaction_allow_follower, wrapper: :with_label, hint: t('admin.ng_rules.reaction_allow_follower_hint'), label: t('admin.ng_rules.reaction_allow_follower')
+
+.fields-group
+  = f.input :reaction_type, wrapper: :with_block_label, collection: %i(favourite emoji_reaction reblog follow vote), as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("admin.ng_rules.reaction_types.#{context}") }, include_blank: false, label: t('admin.ng_rules.reaction_type')
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :emoji_reaction_name, as: :text, input_html: { rows: 4 }, wrapper: :with_label, hint: false, label: t('admin.ng_rules.emoji_reaction_name')
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :emoji_reaction_origin_domain, as: :text, input_html: { rows: 4 }, wrapper: :with_label, hint: t('admin.ng_rules.emoji_reaction_origin_domain_hint'), label: t('admin.ng_rules.emoji_reaction_origin_domain')
+
+%h4= t('admin.ng_rules.edit.headers.options')
+
+.fields-group
+  = f.input :available, wrapper: :with_label, label: t('admin.ng_rules.available'), hint: false
+
+.fields-group
+  = f.input :record_history_also_local, wrapper: :with_label, label: t('admin.ng_rules.record_history_also_local'), hint: false
diff --git a/app/views/admin/ng_rules/edit.html.haml b/app/views/admin/ng_rules/edit.html.haml
new file mode 100644
index 0000000000..4d3990bcc3
--- /dev/null
+++ b/app/views/admin/ng_rules/edit.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('admin.ng_rules.edit.title')
+
+= simple_form_for @ng_rule, url: admin_ng_rule_path(@ng_rule), method: :put do |f|
+  = render 'shared/error_messages', object: @ng_rule
+  = render 'ng_rule_fields', f: f
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/ng_rules/index.html.haml b/app/views/admin/ng_rules/index.html.haml
new file mode 100644
index 0000000000..339cb0f7b6
--- /dev/null
+++ b/app/views/admin/ng_rules/index.html.haml
@@ -0,0 +1,14 @@
+- content_for :page_title do
+  = t('admin.ng_rules.index.title')
+
+- content_for :heading_actions do
+  = link_to t('admin.ng_rules.new.title'), new_admin_ng_rule_path, class: 'button'
+
+.simple_form
+  %p.lead= t('admin.ng_rules.index.preamble')
+
+- if @ng_rules.empty?
+  .muted-hint.center-text= t 'admin.ng_rules.index.empty'
+- else
+  .applications-list
+    = render partial: 'ng_rule', collection: @ng_rules
diff --git a/app/views/admin/ng_rules/new.html.haml b/app/views/admin/ng_rules/new.html.haml
new file mode 100644
index 0000000000..3c620e7724
--- /dev/null
+++ b/app/views/admin/ng_rules/new.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  = t('admin.ng_rules.new.title')
+
+= simple_form_for @ng_rule, url: admin_ng_rules_path do |f|
+  = render 'ng_rule_fields', f: f
+
+  .actions
+    = f.button :button, t('admin.ng_rules.new.save'), type: :submit
diff --git a/app/views/admin/ng_words/keywords/_ng_word.html.haml b/app/views/admin/ng_words/keywords/_ng_word.html.haml
new file mode 100644
index 0000000000..bf81193a97
--- /dev/null
+++ b/app/views/admin/ng_words/keywords/_ng_word.html.haml
@@ -0,0 +1,10 @@
+- temporary_id = defined?(@temp_id) ? @temp_id += 1 : @temp_id = 1
+%tr{ class: template ? 'template-row' : nil }
+  %td= f.input :keywords, as: :string, input_html: { multiple: true, value: ng_word.keyword }
+  %td
+    .label_input__wrapper= f.check_box :regexps, { multiple: true, checked: ng_word.regexp }, temporary_id, nil
+  %td
+    .label_input__wrapper= f.check_box :strangers, { multiple: true, checked: ng_word.stranger }, temporary_id, nil
+  %td
+    = hidden_field_tag :'form_admin_settings[ng_words_test][temporary_ids][]', temporary_id, class: 'temporary_id'
+    = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button'
diff --git a/app/views/admin/ng_words/keywords/show.html.haml b/app/views/admin/ng_words/keywords/show.html.haml
new file mode 100644
index 0000000000..d53676b7bf
--- /dev/null
+++ b/app/views/admin/ng_words/keywords/show.html.haml
@@ -0,0 +1,43 @@
+- content_for :page_title do
+  = t('admin.ng_words.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :heading do
+  %h2= t('admin.ng_words.title')
+  = render partial: 'admin/ng_words/shared/links'
+
+= simple_form_for @admin_settings, url: admin_ng_words_keywords_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead
+    = t('admin.ng_words.preamble')
+    = link_to t('admin.ngword_histories.title'), admin_ngword_histories_path
+
+  %p= t 'admin.ng_words.phrases.regexp_html'
+  %p= t 'admin.ng_words.phrases.stranger_html'
+
+  %hr/
+
+  .table-wrapper
+    %table.table.keywords-table#ng-words-table
+      %thead
+        %tr
+          %th= t('simple_form.labels.defaults.phrase')
+          %th= t('admin.ng_words.phrases.regexp_short')
+          %th= t('admin.ng_words.phrases.stranger_short')
+          %th
+      %tbody
+        = f.simple_fields_for :ng_words_test, @ng_words do |keyword|
+          = render partial: 'ng_word', collection: @ng_words, locals: { f: keyword, template: false }
+
+        = f.simple_fields_for :ng_words_test, @ng_words do |keyword|
+          = render partial: 'ng_word', collection: [NgWord.new], locals: { f: keyword, template: true }
+      %tfoot
+        %tr
+          %td{ colspan: 4 }
+            = link_to safe_join([fa_icon('plus'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button'
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/ng_words/settings/show.html.haml b/app/views/admin/ng_words/settings/show.html.haml
new file mode 100644
index 0000000000..53d2ad3214
--- /dev/null
+++ b/app/views/admin/ng_words/settings/show.html.haml
@@ -0,0 +1,36 @@
+- content_for :page_title do
+  = t('admin.ng_words.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :heading do
+  %h2= t('admin.ng_words.title')
+  = render partial: 'admin/ng_words/shared/links'
+
+= simple_form_for @admin_settings, url: admin_ng_words_settings_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  .fields-group
+    = f.input :post_hash_tags_max, wrapper: :with_label, as: :integer, label: t('admin.ng_words.post_hash_tags_max')
+
+  .fields-group
+    = f.input :post_stranger_mentions_max, wrapper: :with_label, as: :integer, label: t('admin.ng_words.post_stranger_mentions_max')
+
+  .fields-group
+    = f.input :post_mentions_max, wrapper: :with_label, as: :integer, label: t('admin.ng_words.post_mentions_max')
+
+  %h4= t('admin.ng_words.deprecated')
+  %p.hint= t('admin.ng_words.deprecated_hint')
+
+  .fields-group
+    = f.input :stranger_mention_from_local_ng, wrapper: :with_label, as: :boolean, label: t('admin.ng_words.stranger_mention_from_local_ng'), hint: t('admin.ng_words.stranger_mention_from_local_ng_hint')
+
+  .fields-group
+    = f.input :hide_local_users_for_anonymous, wrapper: :with_label, as: :boolean, label: t('admin.ng_words.hide_local_users_for_anonymous'), hint: t('admin.ng_words.hide_local_users_for_anonymous_hint')
+
+  .fields-group
+    = f.input :block_unfollow_account_mention, wrapper: :with_label, as: :boolean, label: t('admin.ng_words.block_unfollow_account_mention'), hint: t('admin.ng_words.block_unfollow_account_mention_hint')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/ng_words/shared/_links.html.haml b/app/views/admin/ng_words/shared/_links.html.haml
new file mode 100644
index 0000000000..aac891c381
--- /dev/null
+++ b/app/views/admin/ng_words/shared/_links.html.haml
@@ -0,0 +1,6 @@
+.content__heading__tabs
+  = render_navigation renderer: :links do |primary|
+    :ruby
+      primary.item :keywords, safe_join([fa_icon('pencil fw'), t('admin.ng_words.keywords')]), admin_ng_words_keywords_path
+      primary.item :white_list, safe_join([fa_icon('list fw'), t('admin.ng_words.white_list')]), admin_ng_words_white_list_path
+      primary.item :settings, safe_join([fa_icon('cog fw'), t('admin.ng_words.settings')]), admin_ng_words_settings_path
diff --git a/app/views/admin/ng_words/white_list/_specified_domain.html.haml b/app/views/admin/ng_words/white_list/_specified_domain.html.haml
new file mode 100644
index 0000000000..d9eb8dfae6
--- /dev/null
+++ b/app/views/admin/ng_words/white_list/_specified_domain.html.haml
@@ -0,0 +1,6 @@
+- temporary_id = defined?(@temp_id) ? @temp_id += 1 : @temp_id = 1
+%tr{ class: template ? 'template-row' : nil }
+  %td= f.input :domains, as: :string, input_html: { multiple: true, value: specified_domain.domain }
+  %td
+    = hidden_field_tag :'form_admin_settings[specified_domains][temporary_ids][]', temporary_id, class: 'temporary_id'
+    = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button'
diff --git a/app/views/admin/ng_words/white_list/show.html.haml b/app/views/admin/ng_words/white_list/show.html.haml
new file mode 100644
index 0000000000..fc4f354e53
--- /dev/null
+++ b/app/views/admin/ng_words/white_list/show.html.haml
@@ -0,0 +1,41 @@
+- content_for :page_title do
+  = t('admin.ng_words.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+- content_for :heading do
+  %h2= t('admin.ng_words.title')
+  = render partial: 'admin/ng_words/shared/links'
+
+= simple_form_for @admin_settings, url: admin_ng_words_white_list_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead
+    = t('admin.ng_words.white_list_hint')
+    = link_to t('admin.ng_words.remote_approval_list'), admin_accounts_path(status: 'remote_pending', origin: 'remote')
+
+  .fields-group
+    = f.input :hold_remote_new_accounts, wrapper: :with_label, as: :boolean, label: t('admin.ng_words.hold_remote_new_accounts'), hint: t('admin.ng_words.remote_approval_hint')
+
+  %h4= t('admin.ng_words.white_list_header')
+
+  .table-wrapper
+    %table.table.keywords-table#white-list-table
+      %thead
+        %tr
+          %th= t('simple_form.labels.defaults.domain')
+          %th
+      %tbody
+        = f.simple_fields_for :specified_domains, @white_list_domains do |domain|
+          = render partial: 'specified_domain', collection: @white_list_domains, locals: { f: domain, template: false }
+
+        = f.simple_fields_for :specified_domains, @white_list_domains do |domain|
+          = render partial: 'specified_domain', collection: [SpecifiedDomain.new], locals: { f: domain, template: true }
+      %tfoot
+        %tr
+          %td{ colspan: 2 }
+            = link_to safe_join([fa_icon('plus'), t('admin.ng_words.edit.add_domain')]), '#', class: 'table-action-link add-row-button'
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/ngword_histories/_history.html.haml b/app/views/admin/ngword_histories/_history.html.haml
new file mode 100644
index 0000000000..53666bb60c
--- /dev/null
+++ b/app/views/admin/ngword_histories/_history.html.haml
@@ -0,0 +1,36 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-checkbox
+    -# = f.check_box :history_ids, { multiple: true, include_hidden: false }, history.id
+  .batch-table__row__content
+    .status__content><
+      = html_aware_format(history.text, false)
+
+    .detailed-status__meta
+      - if history.within_ng_words? || history.within_ng_words_for_stranger_mention?
+        %span.negative-hint= history.keyword
+      - else
+        %span.negative-hint= history.count.to_s
+      ·
+      - if history.within_ng_words?
+        = t('admin.ng_words.keywords')
+      - elsif history.within_ng_words_for_stranger_mention?
+        = t('admin.ng_words.keywords_for_stranger_mention')
+      - elsif history.within_hashtag_count?
+        = t('admin.ng_words.post_hash_tags_max')
+      - elsif history.within_mention_count?
+        = t('admin.ng_words.post_mentions_max')
+      - elsif history.within_stranger_mention_count?
+        = t('admin.ng_words.post_stranger_mentions_max')
+
+      %br/
+
+      %time.formatted{ datetime: history.created_at.iso8601, title: l(history.created_at) }= l(history.created_at)
+      ·
+      - if history.account_note_blocked?
+        = t('admin.ngword_histories.target_types.account_note')
+      - elsif history.account_name_blocked?
+        = t('admin.ngword_histories.target_types.account_name')
+      - elsif history.status_blocked?
+        = t('admin.ngword_histories.target_types.status')
+      ·
+      = history.uri
diff --git a/app/views/admin/ngword_histories/index.html.haml b/app/views/admin/ngword_histories/index.html.haml
new file mode 100644
index 0000000000..517ccc3559
--- /dev/null
+++ b/app/views/admin/ngword_histories/index.html.haml
@@ -0,0 +1,22 @@
+- content_for :page_title do
+  = t('admin.ngword_histories.title')
+
+.filters
+  .back-link
+    = link_to admin_ng_words_keywords_path do
+      = fa_icon 'chevron-left fw'
+      = t('admin.ngword_histories.back_to_ng_words')
+
+%hr.spacer/
+
+.batch-table
+  .batch-table__toolbar
+    %label.batch-table__toolbar__select.batch-checkbox-all
+      = check_box_tag :batch_checkbox_all, nil, false
+  .batch-table__body
+    - if @histories.empty?
+      = nothing_here 'nothing-here--under-tabs'
+    - else
+      = render partial: 'admin/ngword_histories/history', collection: @histories
+
+= paginate @histories
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml
index f82cf26a38..c2daefb424 100644
--- a/app/views/admin/relationships/index.html.haml
+++ b/app/views/admin/relationships/index.html.haml
@@ -19,7 +19,7 @@
 
   .back-link
     = link_to admin_account_path(@account.id) do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
       = t('admin.statuses.back_to_account')
 
 %hr.spacer/
@@ -30,7 +30,11 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('lock'), t('admin.accounts.perform_full_suspension')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :suspend,
+                   type: :submit
     .batch-table__body
       - if @accounts.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
index f1dd2b2dd1..0960124ccf 100644
--- a/app/views/admin/relays/_relay.html.haml
+++ b/app/views/admin/relays/_relay.html.haml
@@ -4,7 +4,7 @@
   %td
     - if relay.accepted?
       %span.positive-hint
-        = fa_icon('check')
+        = material_symbol('check')
         &nbsp;
         = t 'admin.relays.enabled'
     - elsif relay.pending?
@@ -13,7 +13,7 @@
       = t 'admin.relays.pending'
     - else
       %span.negative-hint
-        = fa_icon('times')
+        = material_symbol('close')
         &nbsp;
         = t 'admin.relays.disabled'
   %td
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
index da9ac89315..daa554566e 100644
--- a/app/views/admin/reports/_actions.html.haml
+++ b/app/views/admin/reports/_actions.html.haml
@@ -11,6 +11,11 @@
           = button_tag t('admin.reports.mark_as_sensitive'), name: :mark_as_sensitive, class: 'button'
         .report-actions__item__description
           = t('admin.reports.actions.mark_as_sensitive_description_html')
+    .report-actions__item
+      .report-actions__item__button
+        = button_tag t('admin.reports.force_cw'), name: :force_cw, class: 'button'
+      .report-actions__item__description
+        = t('admin.reports.actions.force_cw_description_html')
     .report-actions__item
       .report-actions__item__button
         = button_tag t('admin.reports.delete_and_resolve'), name: :delete, class: 'button button--destructive'
diff --git a/app/views/admin/reports/_header_card.html.haml b/app/views/admin/reports/_header_card.html.haml
index 6fd8b4ecc8..52e62b4499 100644
--- a/app/views/admin/reports/_header_card.html.haml
+++ b/app/views/admin/reports/_header_card.html.haml
@@ -1,5 +1,11 @@
 .report-header__card
   .account-card
+    - if report.target_account.suspended?
+      .account-card__warning-badge
+        - if report.target_account.suspension_origin_local?
+          = t('admin.reports.already_suspended_badges.local')
+        - else
+          = t('admin.reports.already_suspended_badges.remote')
     .account-card__header
       = image_tag report.target_account.header.url, alt: ''
     .account-card__title
@@ -10,7 +16,7 @@
           %strong.emojify.p-name= display_name(report.target_account, custom_emojify: true)
         %span
           = acct(report.target_account)
-          = fa_icon('lock') if report.target_account.locked?
+          = material_symbol('lock') if report.target_account.locked?
     - if report.target_account.note.present?
       .account-card__bio.emojify
         = prerender_custom_emojis(account_bio_format(report.target_account), report.target_account.emojis)
diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
index 3c52d69178..45cc4c5aa3 100644
--- a/app/views/admin/reports/_media_attachments.html.haml
+++ b/app/views/admin/reports/_media_attachments.html.haml
@@ -12,6 +12,6 @@
   = react_component :media_gallery,
                     height: 343,
                     lang: status.language,
-                    media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
+                    media: serialized_media_attachments(status.ordered_media_attachments),
                     sensitive: status.sensitive?,
                     visible: false
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index b2982a42bf..66820f0a6e 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -22,7 +22,9 @@
         %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
       - if status.edited?
         ·
-        = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')), admin_account_status_path(status.account_id, status), class: 'detailed-status__datetime'
+        = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')),
+                  admin_account_status_path(status.account_id, status),
+                  class: 'detailed-status__datetime'
       - if status.discarded?
         ·
         %span.negative-hint= t('admin.statuses.deleted')
@@ -35,5 +37,5 @@
         = t("statuses.visibilities.#{status.visibility}")
       - if status.proper.sensitive?
         ·
-        = fa_icon('eye-slash fw')
+        = material_symbol('visibility_off')
         = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/reports/actions/preview.html.haml b/app/views/admin/reports/actions/preview.html.haml
index 8634bb215c..7a737d4f72 100644
--- a/app/views/admin/reports/actions/preview.html.haml
+++ b/app/views/admin/reports/actions/preview.html.haml
@@ -58,7 +58,7 @@
 
                   - status.ordered_media_attachments.each do |media_attachment|
                     %abbr{ title: media_attachment.description }
-                      = fa_icon 'link'
+                      = material_symbol 'link'
                       = media_attachment.file_file_name
                 .strike-card__statuses-list__item__meta
                   = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 4376e5af4d..842aa51597 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -20,7 +20,11 @@
 
 %p= t 'admin.reports.category_description_html'
 
-= react_admin_component :report_reason_selector, id: @report.id, category: @report.category, rule_ids: @report.rule_ids&.map(&:to_s), disabled: @report.action_taken?
+= react_admin_component :report_reason_selector,
+                        category: @report.category,
+                        disabled: @report.action_taken?,
+                        id: @report.id,
+                        rule_ids: @report.rule_ids&.map(&:to_s)
 
 - if @report.comment.present?
   = render 'admin/reports/comment', report: @report
@@ -37,7 +41,9 @@
 %p
   = t 'admin.reports.statuses_description_html'
   —
-  = link_to safe_join([fa_icon('plus'), t('admin.reports.add_to_report')]), admin_account_statuses_path(@report.target_account_id, report_id: @report.id), class: 'table-action-link'
+  = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
+            admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+            class: 'table-action-link'
 
 = form_for(@form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id)) do |f|
   .batch-table
@@ -46,7 +52,7 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - if !@statuses.empty? && @report.unresolved?
-          = f.button safe_join([fa_icon('times'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
+          = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
@@ -77,15 +83,17 @@
 .report-notes
   = render @report_notes
 
-= simple_form_for @report_note, url: admin_report_notes_path do |f|
-  = f.input :report_id, as: :hidden
+= simple_form_for @report_note, url: admin_report_notes_path do |form|
+  = form.input :report_id, as: :hidden
+
+  = render 'shared/error_messages', object: @report_note
 
   .field-group
-    = f.input :content, placeholder: t('admin.reports.notes.placeholder'), rows: 6
+    = form.input :content, input_html: { placeholder: t('admin.reports.notes.placeholder'), maxlength: ReportNote::CONTENT_SIZE_LIMIT, rows: 6, autofocus: @report_note.errors.any? }
 
   .actions
     - if @report.unresolved?
-      = f.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
+      = form.button :button, t('admin.reports.notes.create_and_resolve'), name: :create_and_resolve, type: :submit
     - else
-      = f.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
-    = f.button :button, t('admin.reports.notes.create'), type: :submit
+      = form.button :button, t('admin.reports.notes.create_and_unresolve'), name: :create_and_unresolve, type: :submit
+    = form.button :button, t('admin.reports.notes.create'), type: :submit
diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml
index 46a1c537a7..0b1c310162 100644
--- a/app/views/admin/roles/_form.html.haml
+++ b/app/views/admin/roles/_form.html.haml
@@ -5,19 +5,25 @@
     = t('admin.roles.everyone_full_description_html')
 - else
   .fields-group
-    = form.input :name, wrapper: :with_label
+    = form.input :name,
+                 wrapper: :with_label
 
   - unless current_user.role == form.object
     .fields-group
-      = form.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 }
+      = form.input :position,
+                   input_html: { max: current_user.role.position - 1 },
+                   wrapper: :with_label
 
   .fields-group
-    = form.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' }
+    = form.input :color,
+                 input_html: { placeholder: '#000000', type: 'color' },
+                 wrapper: :with_label
 
   %hr.spacer/
 
   .fields-group
-    = form.input :highlighted, wrapper: :with_label
+    = form.input :highlighted,
+                 wrapper: :with_label
 
   %hr.spacer/
 
@@ -31,6 +37,17 @@
     - (form.object.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions|
       %h4= t(category, scope: 'admin.roles.categories')
 
-      = form.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { privilege_label(privilege) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: disable_permissions?(permissions)
+      = form.input :permissions_as_keys,
+                   as: :check_boxes,
+                   collection_wrapper_tag: 'ul',
+                   collection: permissions,
+                   disabled: disable_permissions?(permissions),
+                   hint: false,
+                   include_blank: false,
+                   item_wrapper_tag: 'li',
+                   label_method: ->(privilege) { privilege_label(privilege) },
+                   label: false,
+                   required: false,
+                   wrapper: :with_block_label
 
   %hr.spacer/
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index d6c6b62c81..fd37644c83 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -2,7 +2,7 @@
   - if can?(:update, role)
     = link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
       %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'
 
         - if role.everyone?
           = t('admin.roles.everyone')
@@ -11,7 +11,7 @@
   - else
     %span.announcements-list__item__title
       %span.user-role{ class: "user-role-#{role.id}" }
-        = fa_icon 'users fw'
+        = material_symbol 'group'
 
         - if role.everyone?
           = t('admin.roles.everyone')
diff --git a/app/views/admin/rules/_form.html.haml b/app/views/admin/rules/_form.html.haml
new file mode 100644
index 0000000000..9fc54e2887
--- /dev/null
+++ b/app/views/admin/rules/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :hint,
+               wrapper: :with_block_label
diff --git a/app/views/admin/rules/_rule.html.haml b/app/views/admin/rules/_rule.html.haml
index a0896fe806..5f37f69354 100644
--- a/app/views/admin/rules/_rule.html.haml
+++ b/app/views/admin/rules/_rule.html.haml
@@ -5,7 +5,7 @@
 
   .announcements-list__item__action-bar
     .announcements-list__item__meta
-      = rule.text
+      = rule.hint
 
     %div
       = table_link_to 'trash', t('admin.rules.delete'), admin_rule_path(rule), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, rule)
diff --git a/app/views/admin/rules/edit.html.haml b/app/views/admin/rules/edit.html.haml
index ba7e6451a1..9e3c915812 100644
--- a/app/views/admin/rules/edit.html.haml
+++ b/app/views/admin/rules/edit.html.haml
@@ -1,11 +1,10 @@
 - content_for :page_title do
   = t('admin.rules.edit')
 
-= simple_form_for @rule, url: admin_rule_path(@rule) do |f|
+= simple_form_for @rule, url: admin_rule_path(@rule) do |form|
   = render 'shared/error_messages', object: @rule
 
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/rules/index.html.haml b/app/views/admin/rules/index.html.haml
index aa6a4c1b6a..5a2789edcf 100644
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@@ -6,14 +6,13 @@
 %hr.spacer/
 
 - if can? :create, :rule
-  = simple_form_for @rule, url: admin_rules_path do |f|
+  = simple_form_for @rule, url: admin_rules_path do |form|
     = render 'shared/error_messages', object: @rule
 
-    .fields-group
-      = f.input :text, wrapper: :with_block_label
+    = render form
 
     .actions
-      = f.button :button, t('admin.rules.add_new'), type: :submit
+      = form.button :button, t('admin.rules.add_new'), type: :submit
 
   %hr.spacer/
 
diff --git a/app/views/admin/sensitive_words/_sensitive_word.html.haml b/app/views/admin/sensitive_words/_sensitive_word.html.haml
new file mode 100644
index 0000000000..de9c65714e
--- /dev/null
+++ b/app/views/admin/sensitive_words/_sensitive_word.html.haml
@@ -0,0 +1,12 @@
+- temporary_id = defined?(@temp_id) ? @temp_id += 1 : @temp_id = 1
+%tr{ class: template ? 'template-row' : nil }
+  %td= f.input :keywords, as: :string, input_html: { multiple: true, value: sensitive_word.keyword }
+  %td
+    .label_input__wrapper= f.check_box :regexps, { multiple: true, checked: sensitive_word.regexp }, temporary_id, nil
+  %td
+    .label_input__wrapper= f.check_box :remotes, { multiple: true, checked: sensitive_word.remote }, temporary_id, nil
+  %td
+    .label_input__wrapper= f.check_box :spoilers, { multiple: true, checked: sensitive_word.spoiler }, temporary_id, nil
+  %td
+    = hidden_field_tag :'form_admin_settings[sensitive_words_test][temporary_ids][]', temporary_id, class: 'temporary_id'
+    = link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button'
diff --git a/app/views/admin/sensitive_words/show.html.haml b/app/views/admin/sensitive_words/show.html.haml
new file mode 100644
index 0000000000..6f51419cc1
--- /dev/null
+++ b/app/views/admin/sensitive_words/show.html.haml
@@ -0,0 +1,42 @@
+- content_for :page_title do
+  = t('admin.sensitive_words.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= simple_form_for @admin_settings, url: admin_sensitive_words_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  %p.lead= t 'admin.sensitive_words.hint'
+
+  %p= t 'admin.sensitive_words.phrases.regexp_html'
+  %p= t 'admin.sensitive_words.phrases.remote_html'
+  %p= t 'admin.sensitive_words.phrases.spoiler_html'
+
+  %hr/
+
+  .table-wrapper
+    %table.table.keywords-table#sensitive-words-table
+      %thead
+        %tr
+          %th= t('simple_form.labels.defaults.phrase')
+          %th= t('admin.sensitive_words.phrases.regexp_short')
+          %th= t('admin.sensitive_words.phrases.remote_short')
+          %th= t('admin.sensitive_words.phrases.spoiler_short')
+          %th
+      %tbody
+        = f.simple_fields_for :sensitive_words_test, @sensitive_words do |keyword|
+          = render partial: 'sensitive_word', collection: @sensitive_words, locals: { f: keyword, template: false }
+
+        = f.simple_fields_for :sensitive_words_test, @sensitive_words do |keyword|
+          = render partial: 'sensitive_word', collection: [SensitiveWord.new], locals: { f: keyword, template: true }
+      %tfoot
+        %tr
+          %td{ colspan: 4 }
+            = link_to safe_join([fa_icon('plus'), t('filters.edit.add_keyword')]), '#', class: 'table-action-link add-row-button'
+
+  .fields-group
+    = f.input :auto_warning_text, wrapper: :with_label, input_html: { placeholder: t('admin.sensitive_words.alert') }, label: t('admin.sensitive_words.auto_warning_text'), hint: t('admin.sensitive_words.auto_warning_text_hint')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml
index 1237c20fa8..1eb47a0b54 100644
--- a/app/views/admin/settings/about/show.html.haml
+++ b/app/views/admin/settings/about/show.html.haml
@@ -11,7 +11,10 @@
   %p.lead= t('admin.settings.about.preamble')
 
   .fields-group
-    = f.input :site_extended_description, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :site_extended_description,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
     %p.hint
       = t 'admin.settings.about.rules_hint'
@@ -19,15 +22,32 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+      = f.input :show_domain_blocks,
+                collection_wrapper_tag: 'ul',
+                collection: %i(disabled users all),
+                include_blank: false,
+                item_wrapper_tag: 'li',
+                label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :show_domain_blocks_rationale, wrapper: :with_label, collection: %i(disabled users all), label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") }, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+      = f.input :show_domain_blocks_rationale,
+                collection_wrapper_tag: 'ul',
+                collection: %i(disabled users all),
+                include_blank: false,
+                item_wrapper_tag: 'li',
+                label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
+                wrapper: :with_label
 
   .fields-group
-    = f.input :status_page_url, wrapper: :with_block_label, input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" }
+    = f.input :status_page_url,
+              input_html: { placeholder: "https://status.#{Rails.configuration.x.local_domain}" },
+              wrapper: :with_block_label
 
   .fields-group
-    = f.input :site_terms, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :site_terms,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/appearance/show.html.haml b/app/views/admin/settings/appearance/show.html.haml
index ed61774c9b..3ef4920cd5 100644
--- a/app/views/admin/settings/appearance/show.html.haml
+++ b/app/views/admin/settings/appearance/show.html.haml
@@ -11,14 +11,23 @@
   %p.lead= t('admin.settings.appearance.preamble')
 
   .fields-group
-    = f.input :theme, collection: Themes.instance.names, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+    = f.input :theme,
+              collection: Themes.instance.names,
+              include_blank: false,
+              label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) },
+              wrapper: :with_label
 
   .fields-group
-    = f.input :custom_css, wrapper: :with_block_label, as: :text, input_html: { rows: 8 }
+    = f.input :custom_css,
+              as: :text,
+              input_html: { rows: 8 },
+              wrapper: :with_block_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :mascot, as: :file, wrapper: :with_block_label
+      = f.input :mascot,
+                as: :file,
+                wrapper: :with_block_label
 
     .fields-row__column.fields-row__column-6.fields-group
       - if @admin_settings.mascot.persisted?
diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml
index aee7306892..71aac5ead1 100644
--- a/app/views/admin/settings/branding/show.html.haml
+++ b/app/views/admin/settings/branding/show.html.haml
@@ -11,20 +11,28 @@
   %p.lead= t('admin.settings.branding.preamble')
 
   .fields-group
-    = f.input :site_title, wrapper: :with_label
+    = f.input :site_title,
+              wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_username, wrapper: :with_label
+      = f.input :site_contact_username,
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :site_contact_email, wrapper: :with_label
+      = f.input :site_contact_email,
+                wrapper: :with_label
 
   .fields-group
-    = f.input :site_short_description, wrapper: :with_block_label, as: :text, input_html: { rows: 2, maxlength: 200 }
+    = f.input :site_short_description,
+              as: :text,
+              input_html: { rows: 2, maxlength: 200 },
+              wrapper: :with_block_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :thumbnail, as: :file, wrapper: :with_block_label
+      = f.input :thumbnail,
+                as: :file,
+                wrapper: :with_block_label
     .fields-row__column.fields-row__column-6.fields-group
       - if @admin_settings.thumbnail.persisted?
         = image_tag @admin_settings.thumbnail.file.url(:'@1x'), class: 'fields-group__thumbnail'
@@ -32,5 +40,33 @@
           = fa_icon 'trash fw'
           = t('admin.site_uploads.delete')
 
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :favicon,
+                as: :file,
+                input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+                wrapper: :with_block_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.favicon.persisted?
+        = image_tag @admin_settings.favicon.file.url('48'), class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.favicon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :app_icon,
+                as: :file,
+                input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') },
+                wrapper: :with_block_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      - if @admin_settings.app_icon.persisted?
+        = image_tag @admin_settings.app_icon.file.url('48'), class: 'fields-group__thumbnail'
+        = link_to admin_site_upload_path(@admin_settings.app_icon), data: { method: :delete }, class: 'link-button link-button--destructive' do
+          = fa_icon 'trash fw'
+          = t('admin.site_uploads.delete')
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
index 5a67016148..5e7ebfbdd9 100644
--- a/app/views/admin/settings/content_retention/show.html.haml
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -11,9 +11,22 @@
   %p.lead= t('admin.settings.content_retention.preamble')
 
   .fields-group
-    = f.input :media_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
-    = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }, hint: false, warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period')
-    = f.input :backups_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+    = f.input :media_cache_retention_period,
+              input_html: { pattern: '[0-9]+' },
+              wrapper: :with_block_label
+    = f.input :backups_retention_period,
+              input_html: { pattern: '[0-9]+' },
+              wrapper: :with_block_label
+
+  %h4= t('admin.settings.content_retention.danger_zone')
+
+  .fields-group
+    = f.input :content_cache_retention_period,
+              hint: false,
+              input_html: { pattern: '[0-9]+' },
+              warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period'),
+              wrapper: :with_block_label
+    = f.input :delete_content_cache_without_reaction, as: :boolean, wrapper: :with_label, kmyblue: true, hint: t('simple_form.hints.form_admin_settings.delete_content_cache_without_reaction')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/discovery/show.html.haml b/app/views/admin/settings/discovery/show.html.haml
index 59fc3226ac..162dd51d86 100644
--- a/app/views/admin/settings/discovery/show.html.haml
+++ b/app/views/admin/settings/discovery/show.html.haml
@@ -13,46 +13,108 @@
   %h4= t('admin.settings.discovery.trends')
 
   .fields-group
-    = f.input :trends, as: :boolean, wrapper: :with_label
+    = f.input :trends,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :trends_as_landing_page, as: :boolean, wrapper: :with_label
+    = f.input :trends_as_landing_page,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :trendable_by_default, as: :boolean, wrapper: :with_label, recommended: :not_recommended
+    = f.input :trendable_by_default,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :not_recommended
 
   %h4= t('admin.settings.discovery.public_timelines')
 
   .fields-group
-    = f.input :timeline_preview, as: :boolean, wrapper: :with_label
+    = f.input :timeline_preview,
+              as: :boolean,
+              wrapper: :with_label
 
   .fields-group
-    = f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
+    = f.input :noindex,
+              as: :boolean,
+              hint: t('admin.settings.default_noindex.desc_html'),
+              label: t('admin.settings.default_noindex.title'),
+              wrapper: :with_label
+
+  %h4= t('admin.settings.discovery.emoji_reactions')
+
+  .fields-group
+    = f.input :enable_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true, hint: false
+
+  .fields-group
+    = f.input :streaming_local_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  .fields-group
+    = f.input :receive_other_servers_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  .fields-group
+    = f.input :streaming_other_servers_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  %h4= t('admin.settings.discovery.visibilities')
+
+  .fields-group
+    = f.input :enable_public_visibility, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  .fields-group
+    = f.input :enable_public_unlisted_visibility, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  .fields-group
+    = f.input :enable_local_timeline, as: :boolean, wrapper: :with_label, kmyblue: true
+
+  %h4= t('admin.settings.discovery.friend_servers')
+
+  .fields-group
+    = f.input :unlocked_friend, as: :boolean, wrapper: :with_label, kmyblue: true, hint: false
 
   %h4= t('admin.settings.discovery.publish_statistics')
 
   .fields-group
-    = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+    = f.input :activity_api_enabled,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :recommended
 
   %h4= t('admin.settings.discovery.publish_discovered_servers')
 
   .fields-group
-    = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
+    = f.input :peers_api_enabled,
+              as: :boolean,
+              wrapper: :with_label,
+              recommended: :recommended
 
   %h4= t('admin.settings.security.federation_authentication')
 
   .fields-group
-    = f.input :authorized_fetch, as: :boolean, wrapper: :with_label, label: t('admin.settings.security.authorized_fetch'), warning_hint: discovery_warning_hint_text, hint: discovery_hint_text, disabled: authorized_fetch_overridden?, recommended: discovery_recommended_value
+    = f.input :authorized_fetch,
+              as: :boolean,
+              disabled: authorized_fetch_overridden?,
+              hint: discovery_hint_text,
+              label: t('admin.settings.security.authorized_fetch'),
+              recommended: discovery_recommended_value,
+              warning_hint: discovery_warning_hint_text,
+              wrapper: :with_label
+
+  .fields-group
+    = f.input :check_lts_version_only, as: :boolean, wrapper: :with_label, kmyblue: true, hint: false
 
   %h4= t('admin.settings.discovery.follow_recommendations')
 
   .fields-group
-    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label
+    = f.input :bootstrap_timeline_accounts,
+              wrapper: :with_block_label
 
   %h4= t('admin.settings.discovery.profile_directory')
 
   .fields-group
-    = f.input :profile_directory, as: :boolean, wrapper: :with_label
+    = f.input :profile_directory,
+              as: :boolean,
+              wrapper: :with_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index 168f109757..fe6a71a4ca 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -10,19 +10,57 @@
 
   %p.lead= t('admin.settings.registrations.preamble')
 
+  .flash-message= t('admin.settings.registrations.moderation_recommandation')
+
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, include_blank: false, label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") }
+      = f.input :registrations_mode,
+                collection: %w(open approved none),
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") },
+                warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint'),
+                wrapper: :with_label
 
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :require_invite_text, as: :boolean, wrapper: :with_label, disabled: !approved_registrations?
+      = f.input :require_invite_text,
+                as: :boolean,
+                disabled: !approved_registrations?,
+                wrapper: :with_label
 
   - if captcha_available?
     .fields-group
-      = f.input :captcha_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.captcha_enabled.title'), hint: t('admin.settings.captcha_enabled.desc_html')
+      = f.input :captcha_enabled,
+                as: :boolean,
+                hint: t('admin.settings.captcha_enabled.desc_html'),
+                label: t('admin.settings.captcha_enabled.title'),
+                wrapper: :with_label
 
   .fields-group
-    = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, input_html: { rows: 2 }
+    = f.input :closed_registrations_message,
+              as: :text,
+              input_html: { rows: 2 },
+              wrapper: :with_block_label
+
+  .fields-group
+    = f.input :registration_button_message, as: :text, kmyblue: true, hint: false, wrapper: :with_label, input_html: { rows: 2 }
+
+  .fields-group
+    = f.input :registrations_limit, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }, label: I18n.t('simple_form.labels.form_admin_settings.registrations_limit', count: @current_users_count)
+
+  .fields-group
+    = f.input :registrations_limit_per_day, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }, label: I18n.t('simple_form.labels.form_admin_settings.registrations_limit_per_day', count: @current_users_count_today)
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_secondary_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_secondary_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }, hint: I18n.t('simple_form.labels.form_admin_settings.registrations_secondary_end_hour_hint')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/settings/shared/_links.html.haml b/app/views/admin/settings/shared/_links.html.haml
index d8b697592a..8b0678d4c9 100644
--- a/app/views/admin/settings/shared/_links.html.haml
+++ b/app/views/admin/settings/shared/_links.html.haml
@@ -3,7 +3,7 @@
     :ruby
       primary.item :branding, safe_join([fa_icon('pencil fw'), t('admin.settings.branding.title')]), admin_settings_branding_path
       primary.item :about, safe_join([fa_icon('file-text fw'), t('admin.settings.about.title')]), admin_settings_about_path
-      primary.item :registrations, safe_join([fa_icon('users fw'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
+      primary.item :registrations, safe_join([material_symbol('group'), t('admin.settings.registrations.title')]), admin_settings_registrations_path
       primary.item :discovery, safe_join([fa_icon('search fw'), t('admin.settings.discovery.title')]), admin_settings_discovery_path
       primary.item :content_retention, safe_join([fa_icon('history fw'), t('admin.settings.content_retention.title')]), admin_settings_content_retention_path
       primary.item :appearance, safe_join([fa_icon('desktop fw'), t('admin.settings.appearance.title')]), admin_settings_appearance_path
diff --git a/app/views/admin/special_domains/show.html.haml b/app/views/admin/special_domains/show.html.haml
new file mode 100644
index 0000000000..7a94c2cf2c
--- /dev/null
+++ b/app/views/admin/special_domains/show.html.haml
@@ -0,0 +1,17 @@
+- content_for :page_title do
+  = t('admin.special_domains.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= simple_form_for @admin_settings, url: admin_special_domains_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  .fields-group
+    = f.input :stop_fetch_activity_domains, wrapper: :with_label, as: :text, input_html: { rows: 6 }, label: t('admin.special_domains.stop_fetch_activity_domains.title'), hint: t('admin.special_domains.stop_fetch_activity_domains.preamble')
+
+  .fields-group
+    = f.input :stop_link_preview_domains, wrapper: :with_label, as: :text, input_html: { rows: 6 }, label: t('admin.special_domains.stop_link_preview_domains.title'), hint: t('admin.special_domains.stop_link_preview_domains.preamble')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/special_instances/show.html.haml b/app/views/admin/special_instances/show.html.haml
new file mode 100644
index 0000000000..0805932240
--- /dev/null
+++ b/app/views/admin/special_instances/show.html.haml
@@ -0,0 +1,14 @@
+- content_for :page_title do
+  = t('admin.special_instances.title')
+
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
+
+= simple_form_for @admin_settings, url: admin_special_instances_path, html: { method: :post } do |f|
+  = render 'shared/error_messages', object: @admin_settings
+
+  .fields-group
+    = f.input :emoji_reaction_disallow_domains, wrapper: :with_label, as: :text, input_html: { rows: 6 }, label: t('admin.special_instances.emoji_reaction_disallow_domains'), hint: t('admin.special_instances.emoji_reaction_disallow_domains_hint')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 19a0e063da..0bec0159ee 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -1,20 +1,30 @@
-.status
-  .status__content><
-    - if status_edit.spoiler_text.blank?
-      = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-    - else
-      %details<
-        %summary><
-          %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
-        = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-
-  - unless status_edit.ordered_media_attachments.empty?
-    = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
-
-  .detailed-status__meta
-    %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
-    - if status_edit.sensitive?
+%li
+  .history__entry
+    %h5
+      - if status_edit_iteration.first?
+        = t('admin.statuses.original_status')
+      - else
+        = t('admin.statuses.status_changed')
       ·
-      = fa_icon('eye-slash fw')
-      = t('stream_entries.sensitive_content')
+      %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+    .status
+      .status__content><
+        - if status_edit.spoiler_text.blank?
+          = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+        - else
+          %details<
+            %summary><
+              %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
+            = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
+
+      - unless status_edit.ordered_media_attachments.empty?
+        = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+
+      .detailed-status__meta
+        %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
+
+        - if status_edit.sensitive?
+          ·
+          = material_symbol('visibility_off')
+          = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index a2e3cbc0da..a41a6332dd 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -12,11 +12,11 @@
   .back-link
     - if params[:report_id]
       = link_to admin_report_path(params[:report_id].to_i) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
         = t('admin.statuses.back_to_report')
     - else
       = link_to admin_account_path(@account.id) do
-        = fa_icon 'chevron-left fw'
+        = material_symbol 'chevron_left'
         = t('admin.statuses.back_to_account')
 
 %hr.spacer/
@@ -33,7 +33,11 @@
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
         - unless @statuses.empty?
-          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]), name: :report, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+          = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]),
+                     class: 'table-action-link',
+                     data: { confirm: t('admin.reports.are_you_sure') },
+                     name: :report,
+                     type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
index 0e88624def..1322f1dda9 100644
--- a/app/views/admin/statuses/show.html.haml
+++ b/app/views/admin/statuses/show.html.haml
@@ -42,20 +42,22 @@
         %th= t('admin.statuses.favourites')
         %td= friendly_number_to_human @status.favourites_count
 
+.action-buttons
+  %div
+    - if @account.local? && can?(:warn, @account)
+      = link_to t('admin.statuses.remove_history'), remove_history_admin_account_status_path(@account.id), data: { confirm: t('admin.statuses.are_you_sure') }, method: :post, class: 'button'
+    - if @account.local? && @status.with_media? && can?(:warn, @account)
+      = link_to t('admin.statuses.remove_media'), remove_media_admin_account_status_path(@account.id), data: { confirm: t('admin.statuses.are_you_sure') }, method: :post, class: 'button'
+    - if @account.local? && !@status.sensitive && @status.with_media? && can?(:warn, @account)
+      = link_to t('admin.statuses.force_nsfw'), force_sensitive_admin_account_status_path(@account.id), data: { confirm: t('admin.statuses.are_you_sure') }, method: :post, class: 'button'
+    - if @account.local? && @status.spoiler_text.blank? && can?(:warn, @account)
+      = link_to t('admin.statuses.force_cw'), force_cw_admin_account_status_path(@account.id), data: { confirm: t('admin.statuses.are_you_sure') }, method: :post, class: 'button'
+    - if @account.local? && can?(:warn, @account)
+      = link_to t('admin.statuses.remove'), remove_status_admin_account_status_path(@account.id), data: { confirm: t('admin.statuses.are_you_sure') }, method: :post, class: 'button'
+
 %hr.spacer/
 
 %h3= t('admin.statuses.history')
 
 %ol.history
-  - batched_ordered_status_edits.with_index do |status_edit, i|
-    %li
-      .history__entry
-        %h5
-          - if i.zero?
-            = t('admin.statuses.original_status')
-          - else
-            = t('admin.statuses.status_changed')
-          ·
-          %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
-
-        = render status_edit
+  = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits
diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml
index e4c985c19e..f2d87b54b0 100644
--- a/app/views/admin/tags/show.html.haml
+++ b/app/views/admin/tags/show.html.haml
@@ -9,39 +9,69 @@
 
   .dashboard
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_accounts', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_accounts_measure'), href: tag_url(@tag), target: '_blank', rel: 'noopener noreferrer'
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              href: tag_url(@tag),
+                              label: t('admin.trends.tags.dashboard.tag_accounts_measure'),
+                              measure: 'tag_accounts',
+                              params: { id: @tag.id },
+                              rel: 'noopener noreferrer',
+                              start_at: @time_period.first,
+                              target: '_blank'
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_uses', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_uses_measure')
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_uses_measure'),
+                              measure: 'tag_uses',
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :counter, measure: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, label: t('admin.trends.tags.dashboard.tag_servers_measure')
+      = react_admin_component :counter,
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_servers_measure'),
+                              measure: 'tag_servers',
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :dimension, dimension: 'tag_servers', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_servers_dimension')
+      = react_admin_component :dimension,
+                              dimension: 'tag_servers',
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_servers_dimension'),
+                              limit: 8,
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
-      = react_admin_component :dimension, dimension: 'tag_languages', start_at: @time_period.first, end_at: @time_period.last, params: { id: @tag.id }, limit: 8, label: t('admin.trends.tags.dashboard.tag_languages_dimension')
+      = react_admin_component :dimension,
+                              dimension: 'tag_languages',
+                              end_at: @time_period.last,
+                              label: t('admin.trends.tags.dashboard.tag_languages_dimension'),
+                              limit: 8,
+                              params: { id: @tag.id },
+                              start_at: @time_period.first
     .dashboard__item
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.usable? ? 'positive' : 'negative'] do
         - if @tag.usable?
           %span= t('admin.trends.tags.usable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_usable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.trendable? ? 'positive' : 'negative'] do
         - if @tag.trendable?
           %span= t('admin.trends.tags.trendable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_trendable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
       = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
         - if @tag.listable?
           %span= t('admin.trends.tags.listable')
-          = fa_icon 'check fw'
+          = material_symbol 'check'
         - else
           %span= t('admin.trends.tags.not_listable')
-          = fa_icon 'lock fw'
+          = material_symbol 'lock'
 
   %hr.spacer/
 
diff --git a/app/views/admin/trends/links/index.html.haml b/app/views/admin/trends/links/index.html.haml
index e6ed9d95f6..c503b2d396 100644
--- a/app/views/admin/trends/links/index.html.haml
+++ b/app/views/admin/trends/links/index.html.haml
@@ -13,7 +13,9 @@
     .filter-subset.filter-subset--with-select
       %strong= t('admin.follow_recommendations.language')
       .input.select.optional
-        = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true
+        = select_tag :locale,
+                     options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]),
+                     include_blank: true
     .filter-subset
       %strong= t('admin.trends.trending')
       %ul
@@ -22,7 +24,7 @@
     .back-link
       = link_to admin_trends_links_preview_card_providers_path do
         = t('admin.trends.preview_card_providers.title')
-        = fa_icon 'chevron-right fw'
+        = material_symbol 'chevron_right'
 
 = form_for(@form, url: batch_admin_trends_links_path) do |f|
   = hidden_field_tag :page, params[:page] || 1
@@ -35,10 +37,26 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('check'), t('admin.trends.links.allow_provider')]), name: :approve_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.links.disallow_provider')]), name: :reject_providers, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([material_symbol('check'), t('admin.trends.links.allow_provider')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve_providers,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.links.disallow_provider')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject_providers,
+                   type: :submit
     .batch-table__body
       - if @preview_cards.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index d9ad12fc96..706c607010 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -15,7 +15,7 @@
       %li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{PreviewCardProvider.pending_review.count})"], ' '), status: 'pending_review'
   .back-link
     = link_to admin_trends_links_path do
-      = fa_icon 'chevron-left fw'
+      = material_symbol 'chevron_left'
       = t('admin.trends.links.title')
 
 %hr.spacer/
@@ -31,8 +31,16 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
 
     .batch-table__body
       - if @preview_card_providers.empty?
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index 98f2e77090..09547ff036 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -11,10 +11,12 @@
 
         - status.ordered_media_attachments.each do |media_attachment|
           %abbr{ title: media_attachment.description }
-            = fa_icon 'link'
+            = material_symbol 'link'
             = media_attachment.file_file_name
 
-    = t('admin.trends.statuses.shared_by', count: status.reblogs_count + status.favourites_count, friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count))
+    = t 'admin.trends.statuses.shared_by',
+        count: status.reblogs_count + status.favourites_count,
+        friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count)
 
     - if status.account.domain.present?
       ·
diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml
index bf04772f22..66151ad31e 100644
--- a/app/views/admin/trends/statuses/index.html.haml
+++ b/app/views/admin/trends/statuses/index.html.haml
@@ -31,10 +31,26 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('check'), t('admin.trends.statuses.allow_account')]), name: :approve_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.statuses.disallow_account')]), name: :reject_accounts, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([material_symbol('check'), t('admin.trends.statuses.allow_account')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve_accounts,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.statuses.disallow_account')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject_accounts,
+                   type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index 70c7d8dbd4..8cc0d713b9 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -5,7 +5,7 @@
   .batch-table__row__content.pending-account
     .pending-account__header
       = link_to admin_tag_path(tag.id) do
-        = fa_icon 'hashtag'
+        = material_symbol 'tag'
         = tag.display_name
 
       %br/
diff --git a/app/views/admin/trends/tags/index.html.haml b/app/views/admin/trends/tags/index.html.haml
index 4730d20c18..655955f7f6 100644
--- a/app/views/admin/trends/tags/index.html.haml
+++ b/app/views/admin/trends/tags/index.html.haml
@@ -25,8 +25,16 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
-        = f.button safe_join([fa_icon('check'), t('admin.trends.allow')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
-        = f.button safe_join([fa_icon('times'), t('admin.trends.disallow')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
+        = f.button safe_join([material_symbol('check'), t('admin.trends.allow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :approve,
+                   type: :submit
+        = f.button safe_join([material_symbol('close'), t('admin.trends.disallow')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :reject,
+                   type: :submit
 
     .batch-table__body
       - if @tags.empty?
diff --git a/app/views/admin/users/roles/show.html.haml b/app/views/admin/users/roles/show.html.haml
index 8216180607..f26640f2a1 100644
--- a/app/views/admin/users/roles/show.html.haml
+++ b/app/views/admin/users/roles/show.html.haml
@@ -3,7 +3,13 @@
 
 = simple_form_for @user, url: admin_user_role_path(@user) do |f|
   .fields-group
-    = f.association :role, wrapper: :with_block_label, collection: UserRole.assignable, label_method: :name, include_blank: I18n.t('admin.accounts.change_role.no_role')
+    = f.association :role,
+                    collection: UserRole.assignable,
+                    include_blank: I18n.t('admin.accounts.change_role.no_role'),
+                    label_method: :name,
+                    wrapper: :with_block_label
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = f.button :button,
+               t('generic.save_changes'),
+               type: :submit
diff --git a/app/views/admin/warning_presets/_form.html.haml b/app/views/admin/warning_presets/_form.html.haml
new file mode 100644
index 0000000000..cba74163c5
--- /dev/null
+++ b/app/views/admin/warning_presets/_form.html.haml
@@ -0,0 +1,7 @@
+.fields-group
+  = form.input :title,
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
index b5c5107ef4..f0bd9c12ec 100644
--- a/app/views/admin/warning_presets/edit.html.haml
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -1,14 +1,10 @@
 - content_for :page_title do
   = t('admin.warning_presets.edit_preset')
 
-= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
+= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |form|
   = render 'shared/error_messages', object: @warning_preset
 
-  .fields-group
-    = f.input :title, wrapper: :with_block_label
-
-  .fields-group
-    = f.input :text, wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
index b26a13d966..22fee21050 100644
--- a/app/views/admin/warning_presets/index.html.haml
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -2,17 +2,13 @@
   = t('admin.warning_presets.title')
 
 - if can? :create, :account_warning_preset
-  = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
+  = simple_form_for @warning_preset, url: admin_warning_presets_path do |form|
     = render 'shared/error_messages', object: @warning_preset
 
-    .fields-group
-      = f.input :title, wrapper: :with_block_label
-
-    .fields-group
-      = f.input :text, wrapper: :with_block_label
+    = render form
 
     .actions
-      = f.button :button, t('admin.warning_presets.add_new'), type: :submit
+      = form.button :button, t('admin.warning_presets.add_new'), type: :submit
 
   %hr.spacer/
 
diff --git a/app/views/admin/webhooks/_form.html.haml b/app/views/admin/webhooks/_form.html.haml
index 6c4574fd3b..2b948b9a6a 100644
--- a/app/views/admin/webhooks/_form.html.haml
+++ b/app/views/admin/webhooks/_form.html.haml
@@ -1,10 +1,21 @@
 = render 'shared/error_messages', object: form.object
 
 .fields-group
-  = form.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' }
+  = form.input :url,
+               wrapper: :with_block_label,
+               input_html: { placeholder: 'https://' }
 
 .fields-group
-  = form.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
+  = form.input :events,
+               collection: Webhook::EVENTS,
+               wrapper: :with_block_label,
+               include_blank: false,
+               as: :check_boxes,
+               collection_wrapper_tag: 'ul',
+               item_wrapper_tag: 'li',
+               disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) }
 
 .fields-group
-  = form.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
+  = form.input :template,
+               wrapper: :with_block_label,
+               input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
diff --git a/app/views/admin/webhooks/edit.html.haml b/app/views/admin/webhooks/edit.html.haml
index 2c2a7aa034..abc9bdfabc 100644
--- a/app/views/admin/webhooks/edit.html.haml
+++ b/app/views/admin/webhooks/edit.html.haml
@@ -2,6 +2,6 @@
   = t('admin.webhooks.edit')
 
 = simple_form_for @webhook, url: admin_webhook_path(@webhook) do |form|
-  = render partial: 'form', object: form
+  = render form
   .actions
     = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/new.html.haml b/app/views/admin/webhooks/new.html.haml
index f51b039ce8..50fcdc2be7 100644
--- a/app/views/admin/webhooks/new.html.haml
+++ b/app/views/admin/webhooks/new.html.haml
@@ -2,6 +2,6 @@
   = t('admin.webhooks.new')
 
 = simple_form_for @webhook, url: admin_webhooks_path do |form|
-  = render partial: 'form', object: form
+  = render form
   .actions
     = form.button :button, t('admin.webhooks.add_new'), type: :submit
diff --git a/app/views/admin_mailer/auto_close_registrations.text.erb b/app/views/admin_mailer/auto_close_registrations.text.erb
new file mode 100644
index 0000000000..c0f8486929
--- /dev/null
+++ b/app/views/admin_mailer/auto_close_registrations.text.erb
@@ -0,0 +1,3 @@
+<%= raw t('admin_mailer.auto_close_registrations.body', instance: @instance) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_settings_registrations_url %>
diff --git a/app/views/admin_mailer/new_critical_software_updates.text.erb b/app/views/admin_mailer/new_critical_software_updates.text.erb
index 63c170dc0d..a3f031bdad 100644
--- a/app/views/admin_mailer/new_critical_software_updates.text.erb
+++ b/app/views/admin_mailer/new_critical_software_updates.text.erb
@@ -1,3 +1,7 @@
 <%= raw t('admin_mailer.new_critical_software_updates.body') %>
 
+<% @software_updates.each do |update| %>
+- Mastodon <%= update.version %>: <%= update.release_notes %>
+<% end %>
+
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/admin_mailer/new_pending_friend_server.text.erb b/app/views/admin_mailer/new_pending_friend_server.text.erb
new file mode 100644
index 0000000000..89c9ec1b09
--- /dev/null
+++ b/app/views/admin_mailer/new_pending_friend_server.text.erb
@@ -0,0 +1,5 @@
+<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
+
+<%= raw t('admin_mailer.new_pending_friend_server.body', domain: @friend.domain) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_friend_servers_url %>
diff --git a/app/views/admin_mailer/new_software_updates.text.erb b/app/views/admin_mailer/new_software_updates.text.erb
index 96808f3cb3..0eccbbf9ef 100644
--- a/app/views/admin_mailer/new_software_updates.text.erb
+++ b/app/views/admin_mailer/new_software_updates.text.erb
@@ -1,3 +1,7 @@
 <%= raw t('admin_mailer.new_software_updates.body') %>
 
+<% @software_updates.each do |update| %>
+- Mastodon <%= update.version %>: <%= update.release_notes %>
+<% end %>
+
 <%= raw t('application_mailer.view')%> <%= admin_software_updates_url %>
diff --git a/app/views/antennas/_antenna.html.haml b/app/views/antennas/_antenna.html.haml
new file mode 100644
index 0000000000..ed3b8c3bde
--- /dev/null
+++ b/app/views/antennas/_antenna.html.haml
@@ -0,0 +1,77 @@
+.filters-list__item{ class: [(antenna.expired? || !antenna.enabled_config?) && 'expired'] }
+  = link_to edit_antenna_path(antenna), class: 'filters-list__item__title' do
+    = antenna.title
+
+    - if !antenna.enabled_config? && !antenna.stl
+      .expiration{ title: t('antennas.index.disabled') }
+        = t('antennas.index.disabled')
+    - elsif antenna.expires?
+      .expiration{ title: t('antennas.index.expires_on', date: l(antenna.expires_at)) }
+        - if antenna.expired?
+          = t('invites.expired')
+        - else
+          = t('antennas.index.expires_in', distance: distance_of_time_in_words_to_now(antenna.expires_at))
+
+  .listname
+    = antenna.list&.title || '[Insert to Home]'
+
+  .filters-list__item__permissions
+    %ul.permissions-list
+      - unless antenna.stl
+        - unless antenna.antenna_domains.empty?
+          %li.permissions-list__item
+            .permissions-list__item__icon
+              = fa_icon('sitemap')
+            .permissions-list__item__text
+              .permissions-list__item__text__title
+                = t('antennas.index.domains', count: antenna.antenna_domains.size)
+              .permissions-list__item__text__type
+                - domains = antenna.antenna_domains.map(&:name)
+                - domains = domains.take(5) + ['…'] if domains.size > 5 # TODO
+                = domains.join(', ')
+        - unless antenna.antenna_accounts.empty?
+          %li.permissions-list__item
+            .permissions-list__item__icon
+              = fa_icon('users')
+            .permissions-list__item__text
+              .permissions-list__item__text__title
+                = t('antennas.index.accounts', count: antenna.antenna_accounts.size)
+              .permissions-list__item__text__type
+                - accounts = antenna.antenna_accounts.map { |account| account.account.domain ? "@#{account.account.username}@#{account.account.domain}" : "@#{account.account.username}" }
+                - accounts = accounts.take(5) + ['…'] if accounts.size > 5 # TODO
+                = accounts.join(', ')
+        - if antenna.keywords.present?
+          %li.permissions-list__item
+            .permissions-list__item__icon
+              = fa_icon('paragraph')
+            .permissions-list__item__text
+              .permissions-list__item__text__title
+                = t('antennas.index.keywords', count: antenna.keywords.size)
+              .permissions-list__item__text__type
+                - keywords = antenna.keywords
+                - keywords = keywords.take(5) + ['…'] if keywords.size > 5 # TODO
+                = keywords.join(', ')
+        - unless antenna.antenna_tags.empty?
+          %li.permissions-list__item
+            .permissions-list__item__icon
+              = fa_icon('hashtag')
+            .permissions-list__item__text
+              .permissions-list__item__text__title
+                = t('antennas.index.tags', count: antenna.antenna_tags.size)
+              .permissions-list__item__text__type
+                - tags = antenna.antenna_tags.map { |tag| tag.tag.name }
+                - tags = tags.take(5) + ['…'] if tags.size > 5 # TODO
+                = tags.join(', ')
+
+  .announcements-list__item__action-bar
+    .announcements-list__item__meta
+      - if antenna.stl
+        = t('antennas.index.stl')
+      - elsif antenna.enabled_config_raws?
+        = t('antennas.index.contexts', contexts: antenna.context.map { |context| I18n.t("antennas.contexts.#{context}") }.join(', '))
+      - else
+        = t('antennas.errors.empty_contexts')
+
+    %div
+      = table_link_to 'pencil', t('antennas.edit.title'), edit_antenna_path(antenna)
+      = table_link_to 'times', t('antennas.index.delete'), antenna_path(antenna), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/antennas/_antenna_fields.html.haml b/app/views/antennas/_antenna_fields.html.haml
new file mode 100644
index 0000000000..49ec951669
--- /dev/null
+++ b/app/views/antennas/_antenna_fields.html.haml
@@ -0,0 +1,11 @@
+%p= t 'antennas.edit.description'
+%hr.spacer/
+
+.fields-row
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :title, as: :string, wrapper: :with_label, hint: false
+  .fields-row__column.fields-row__column-6.fields-group
+    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+
+.fields-row
+  = f.input :available, wrapper: :with_label, label: t('antennas.edit.available'), hint: false
diff --git a/app/views/antennas/edit.html.haml b/app/views/antennas/edit.html.haml
new file mode 100644
index 0000000000..ba3e4f368d
--- /dev/null
+++ b/app/views/antennas/edit.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('antennas.edit.title')
+
+= simple_form_for @antenna, url: antenna_path(@antenna), method: :put do |f|
+  = render 'shared/error_messages', object: @antenna
+  = render 'antenna_fields', f: f, lists: @lists
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/antennas/index.html.haml b/app/views/antennas/index.html.haml
new file mode 100644
index 0000000000..27a7933051
--- /dev/null
+++ b/app/views/antennas/index.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  = t('antennas.index.title')
+
+- if @antennas.empty?
+  .muted-hint.center-text= t 'antennas.index.empty'
+- else
+  .applications-list
+    = render partial: 'antenna', collection: @antennas
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml
new file mode 100644
index 0000000000..9d0efa7e10
--- /dev/null
+++ b/app/views/application/_sidebar.html.haml
@@ -0,0 +1,16 @@
+.hero-widget
+  .hero-widget__img
+    = image_tag @instance_presenter.thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title
+
+  .hero-widget__text
+    %p= @instance_presenter.description.presence || t('about.about_mastodon_html')
+
+- if Setting.trends && !(user_signed_in? && !current_user.setting_trends)
+  - trends = Trends.tags.query.allowed.limit(3)
+
+  - unless trends.empty?
+    .endorsements-widget.trends-widget
+      %h4.emojify= t('footer.trending_now')
+
+      - trends.each do |tag|
+        = react_component :hashtag, hashtag: ActiveModelSerializers::SerializableResource.new(tag, serializer: REST::TagSerializer, scope: current_user, scope_name: :current_user).as_json
diff --git a/app/views/application/mailer/_account.html.haml b/app/views/application/mailer/_account.html.haml
new file mode 100644
index 0000000000..27493f770d
--- /dev/null
+++ b/app/views/application/mailer/_account.html.haml
@@ -0,0 +1,30 @@
+%table.email-w-full.email-account-banner-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-banner-td{ height: 140, background: full_asset_url(account.header.url) }
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-account-banner-inner-td
+            .email-account-banner-overlap-div
+              %table.email-account-banner-icon-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td
+                    %img{ src: full_asset_url(account.avatar.url), width: 80, height: 80, alt: '' }
+%table.email-w-full.email-account-body-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-body-td
+      %p.email-account-name= display_name(account)
+      %p.email-account-handle= acct(account)
+      %table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-padding-top-16
+            %table.email-w-full.email-account-stats-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td
+                  %b= account_formatted_stat(account.statuses_count)
+                  %span= t('accounts.posts', count: account.statuses_count)
+                %td
+                  %b= account_formatted_stat(account.following_count)
+                  %span= t('accounts.following')
+                %td
+                  %b= account_formatted_stat(account.followers_count)
+                  %span= t('accounts.followers', count: account.followers_count)
diff --git a/app/views/application/mailer/_button.html.haml b/app/views/application/mailer/_button.html.haml
new file mode 100644
index 0000000000..0bf80b505a
--- /dev/null
+++ b/app/views/application/mailer/_button.html.haml
@@ -0,0 +1,7 @@
+%table.email-btn-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-btn-td
+      - if defined?(has_arrow) && !has_arrow
+        = link_to text, url, class: 'email-btn-a email-btn-hover'
+      - else
+        = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
new file mode 100644
index 0000000000..91c7c98f26
--- /dev/null
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -0,0 +1,37 @@
+%table.email-w-full.email-checklist-wrapper-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-checklist-wrapper-td
+      %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation', class: ('email-checklist-checked' if defined?(checked) && checked) }
+        %tr
+          %td.email-checklist-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-checklist-icons-td
+                  %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                    %tr
+                      %td.email-checklist-icons-checkbox-td
+                        - if defined?(checked) && checked
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
+                        - else
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
+                      %td.email-checklist-icons-step-td
+                        - if defined?(key)
+                          = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}_step-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
+                %td.email-checklist-text-td
+                  .email-desktop-flex
+                    /[if mso]
+                      <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td vertical-align:top;">
+                    %div
+                      %h3= t("user_mailer.welcome.#{key}_title")
+                      %p= t("user_mailer.welcome.#{key}_step")
+                    /[if mso]
+                      </td><td style="vertical-align:top;">
+                    %div
+                      - if defined?(show_apps_buttons) && show_apps_buttons
+                        .email-welcome-apps-btns
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
+                      - elsif defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
+                        = render 'application/mailer/button', text: button_text, url: button_url, has_arrow: false
+                    /[if mso]
+                      </td></tr></table>
diff --git a/app/views/application/mailer/_feature.html.haml b/app/views/application/mailer/_feature.html.haml
new file mode 100644
index 0000000000..94dd4b9cff
--- /dev/null
+++ b/app/views/application/mailer/_feature.html.haml
@@ -0,0 +1,30 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-feature-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-feature-td
+            .email-desktop-flex{ class: ('email-dir-rtl' if feature_iteration.index.odd?) }
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
+              .email-desktop-column
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-td
+                      %h2.email-h2= t("user_mailer.welcome.feature_#{feature}_title")
+                      %p.email-p= t("user_mailer.welcome.feature_#{feature}")
+                      - if defined?(feature_btn_url)
+                        = link_to '', href: feature_btn_url, class: 'email-link-with-arrow' do
+                          #{t('user_mailer.welcome.feature_action')} 
+                          %span= '❯'
+              /[if mso]
+                </td><td style="width:50%; vertical-align:top;">
+              .email-desktop-column
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-td
+                      - if defined?(feature)
+                        %p{ class: ('email-desktop-text-right' if feature_iteration.index.even?) }
+                          = image_tag frontend_asset_url("images/mailer-new/welcome/feature_#{feature}.png"), alt: '', width: 240, height: 230
+              /[if mso]
+                </td></tr></table>
diff --git a/app/views/application/mailer/_follow.html.haml b/app/views/application/mailer/_follow.html.haml
new file mode 100644
index 0000000000..382151a234
--- /dev/null
+++ b/app/views/application/mailer/_follow.html.haml
@@ -0,0 +1,15 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-mini-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-mini-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-mini-follow-img-td
+                  = image_tag full_asset_url(follow.account.avatar.url), alt: '', width: 40, height: 40
+                %td.email-mini-follow-text-td
+                  %h3= follow.account.display_name.presence || follow.account.username
+                  %p @#{follow.account.pretty_acct}
+                %td.email-mini-follow-btn-td
+                  = render 'application/mailer/button', text: t('user_mailer.welcome.follow_action'), url: web_url("@#{follow.account.acct}"), has_arrow: false
diff --git a/app/views/application/mailer/_frame.html.haml b/app/views/application/mailer/_frame.html.haml
new file mode 100644
index 0000000000..74403e7678
--- /dev/null
+++ b/app/views/application/mailer/_frame.html.haml
@@ -0,0 +1,4 @@
+%table.email-w-full.email-frame-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-frame-td
+      %p= text
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
new file mode 100644
index 0000000000..b740ba31b9
--- /dev/null
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -0,0 +1,21 @@
+- accounts = hashtag.statuses.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
+
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-mini-wrapper-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-mini-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-mini-hashtag-td{ height: 40 }
+                  %h3 ##{hashtag.display_name}
+                  %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                    %tr
+                      %td.email-mini-hashtag-img-td
+                        - accounts.each do |account|
+                          %span.email-mini-hashtag-img-span
+                            = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
+                      %td
+                        - people = hashtag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
+                        %p= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people)
diff --git a/app/views/application/mailer/_heading.html.haml b/app/views/application/mailer/_heading.html.haml
new file mode 100644
index 0000000000..9fc5dc7471
--- /dev/null
+++ b/app/views/application/mailer/_heading.html.haml
@@ -0,0 +1,13 @@
+%table.email-w-full.email-header-heading-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-header-heading-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          - if defined?(heading_image_url)
+            %td.email-header-heading-img-td
+              = image_tag heading_image_url, alt: '', width: 56, height: 56
+          %td.email-header-heading-txt-td
+            - if defined?(heading_title)
+              %h1= heading_title
+            - if defined?(heading_subtitle)
+              %p= heading_subtitle
diff --git a/app/views/auth/confirmations/limitation_error.html.haml b/app/views/auth/confirmations/limitation_error.html.haml
new file mode 100644
index 0000000000..8fdc6ec2a1
--- /dev/null
+++ b/app/views/auth/confirmations/limitation_error.html.haml
@@ -0,0 +1,11 @@
+- content_for :page_title do
+  = t('auth.registration_limit.title')
+
+= form_tag root_url, method: 'GET', class: 'simple_form' do
+  = render 'auth/shared/progress', stage: 'confirm'
+
+  %h1.title= t('auth.registration_limit.title')
+  %p.lead= t('auth.registration_limit.hint_html')
+
+  .actions
+    = button_tag t('challenge.confirm'), class: 'button', type: :submit
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 1e5aac2976..1ec878e9d4 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -75,6 +75,10 @@
               required: true,
               wrapper: :with_label
 
+  - if Setting.registration_button_message.present?
+    %div
+      = Setting.registration_button_message
+
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
 
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
index 234f4a601d..3a05ed54f0 100644
--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@@ -20,6 +20,7 @@
     - @rules.each do |rule|
       %li
         .rules-list__text= rule.text
+        .rules-list__hint= rule.hint
 
   .stacked-actions
     - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
diff --git a/app/views/filters/_filter_fields.html.haml b/app/views/filters/_filter_fields.html.haml
index a3260816ed..0ca23e8d90 100644
--- a/app/views/filters/_filter_fields.html.haml
+++ b/app/views/filters/_filter_fields.html.haml
@@ -1,16 +1,44 @@
 .fields-row
   .fields-row__column.fields-row__column-6.fields-group
-    = f.input :title, as: :string, wrapper: :with_label, hint: false
+    = f.input :title,
+              as: :string,
+              hint: false,
+              wrapper: :with_label
   .fields-row__column.fields-row__column-6.fields-group
-    = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: ->(i) { I18n.t("invites.expires_in.#{i}") }, include_blank: I18n.t('invites.expires_in_prompt')
+    = f.input :expires_in,
+              collection: CustomFilter::EXPIRATION_DURATIONS.map(&:to_i),
+              include_blank: I18n.t('invites.expires_in_prompt'),
+              label_method: ->(i) { I18n.t("invites.expires_in.#{i}") },
+              wrapper: :with_label
 
 .fields-group
-  = f.input :context, wrapper: :with_block_label, collection: CustomFilter::VALID_CONTEXTS, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label_method: ->(context) { I18n.t("filters.contexts.#{context}") }, include_blank: false
+  = f.input :context,
+            as: :check_boxes,
+            collection_wrapper_tag: 'ul',
+            collection: CustomFilter::VALID_CONTEXTS,
+            include_blank: false,
+            item_wrapper_tag: 'li',
+            label_method: ->(context) { I18n.t("filters.contexts.#{context}") },
+            wrapper: :with_block_label
 
 %hr.spacer/
 
 .fields-group
-  = f.input :filter_action, as: :radio_buttons, collection: %i(warn hide), include_blank: false, wrapper: :with_block_label, label_method: ->(action) { filter_action_label(action) }, hint: t('simple_form.hints.filters.action'), required: true
+  = f.input :filter_action,
+            as: :radio_buttons,
+            collection: %i(half_warn warn hide),
+            hint: t('simple_form.hints.filters.action'),
+            include_blank: false,
+            label_method: ->(action) { filter_action_label(action) },
+            required: true,
+            wrapper: :with_block_label
+
+.fields-group
+  = f.input :exclude_follows, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_follows')
+  = f.input :exclude_localusers, wrapper: :with_label, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_localusers')
+
+.fields-group
+  = f.input :exclude_quote, wrapper: :with_label, as: :boolean, kmyblue: true, label: t('simple_form.labels.filters.options.exclude_quote')
 
 %hr.spacer/
 
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
index d93540c028..b73ac9051c 100644
--- a/app/views/follower_accounts/index.html.haml
+++ b/app/views/follower_accounts/index.html.haml
@@ -1,5 +1,6 @@
 - content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
+  %meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
+  %meta{ name: 'CCBot', content: 'nofollow' }
 
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
index d93540c028..b73ac9051c 100644
--- a/app/views/following_accounts/index.html.haml
+++ b/app/views/following_accounts/index.html.haml
@@ -1,5 +1,6 @@
 - content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
+  %meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
+  %meta{ name: 'CCBot', content: 'nofollow' }
 
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 45990cd10c..c4ab49dbcd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,6 +1,9 @@
 - content_for :header_tags do
   - unless request.path == '/'
-    %meta{ name: 'robots', content: 'noindex' }/
+    %meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
+  - else
+    %meta{ name: 'robots', content: 'noai, noimageai' }/
+  %meta{ name: 'CCBot', content: 'nofollow' }
 
   = render partial: 'shared/og'
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6f6b1825f6..5957d1dbf5 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,23 +11,23 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
+    %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
 
-    - %w(16 32 48).each do |size|
-      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+    - SiteUpload::FAVICON_SIZES.each do |size|
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
 
-    - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
-      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
+    - SiteUpload::APPLE_ICON_SIZES.each do |size|
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: app_icon_path(size.to_i) || frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
 
-    %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+    %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
-    %meta{ name: 'theme-color', content: '#191b22' }/
+    = theme_color_tags current_theme
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
     %title= html_title
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags current_theme
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
     = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
 
@@ -44,5 +44,5 @@
     = content_for?(:content) ? yield(:content) : yield
 
     .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
-      = render_symbol :icon
-      = render_symbol :wordmark
+      = inline_svg_tag 'logo-symbol-icon.svg'
+      = inline_svg_tag 'logo-symbol-wordmark.svg'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index d8aa522d80..da0a73bdc6 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -2,7 +2,8 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
-    %meta{ name: 'robots', content: 'noindex' }/
+    %meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
+    %meta{ name: 'CCBot', content: 'nofollow' }
 
     - if cdn_host?
       %link{ rel: 'dns-prefetch', href: cdn_host }/
@@ -12,7 +13,7 @@
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags Setting.theme # Use the admin-configured theme here, even if logged in
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = render_initial_state
@@ -21,4 +22,4 @@
     = yield
 
     .logo-resources{ 'tabindex' => '-1', 'inert' => true, 'aria-hidden' => true }
-      = render_symbol :icon
+      = inline_svg_tag 'logo-symbol-icon.svg'
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index b7aafe9879..485a69c909 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -6,7 +6,7 @@
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
-    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
+    = theme_style_tags Setting.default_settings['theme']
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = javascript_pack_tag 'error', crossorigin: 'anonymous'
   %body.error
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 7fa344a9b7..270f2b1e0c 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -1,54 +1,87 @@
 !!!
-%html{ lang: I18n.locale }
+%html{ lang: I18n.locale, dir: locale_direction }
   %head
-    %meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8' }/
-    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, shrink-to-fit=no' }
-
+    %meta{ 'charset' => 'utf-8' }
+    %title Mastodon
+    %meta{ name: 'x-apple-disable-message-reformatting' }
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    %meta{ name: 'format-detection', content: 'telephone=no, date=no, address=no, email=no, url=no' }
+    %meta{ name: 'supported-color-schemes', content: 'light' }
+    %style
+      \table { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
+    %style{ 'data-premailer': 'ignore' }
+      \.email a { color: inherit; text-decoration: none; }
+      \.email-btn-hover:hover { background-color: #563acc !important; }
+    /[if mso]
+      <xml>
+      <o:OfficeDocumentSettings xmlns:o="urn:schemas-microsoft-com:office:office">
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+      </xml>
     = stylesheet_pack_tag 'mailer'
-  %body{ dir: locale_direction }
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
-      %tbody
+  %body
+    .email{ dir: locale_direction }
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
         %tr
-          %td.email-body.email-start
+          %td.email-desktop-p-8
             .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.header
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.column-cell
-                                  = link_to root_url do
-                                    = image_tag full_pack_url('media/images/mailer/wordmark.png'), alt: 'Mastodon', height: 34, class: 'logo'
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:740px;" role="presentation"><tr><td>
+              %table.email-w-full.email-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-card-td.email-desktop-rounded-16px
 
-    = yield
+                    -# Header
+                    %table.email-header-table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                      %tr
+                        %td.email-header-td
 
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
-      %tbody
-        %tr
-          %td.email-body.email-end
+                          -# Logo
+                          %table.email-header-logo-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                            %tr
+                              %td.email-header-logo-td
+                                /[if mso]
+                                  <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="false" stroke="false" style="position:absolute; left:40px; top:26px; width:636px;"><v:textbox style="mso-fit-shape-to-text:true" inset="0,0,0,0">
+                                .email-header-logo-div
+                                  %p.email-header-logo-p
+                                    %span.email-header-logo-span
+                                      = '/ '
+                                      = site_hostname
+                                /[if mso]
+                                  </v:textbox></v:rect>
+                                = link_to root_url, class: 'email-header-logo-a' do
+                                  = image_tag frontend_asset_url('images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
+
+                          -# Heading
+                          = yield :heading
+
+                    .email-header-after-div
+                      .email-header-after-inside-div
+                    %table.email-body-table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                      %tr
+                        %td.email-body-td
+                          -# Content
+                          = yield
+
+              /[if mso]
+                </td></tr></table>
+
+            -# Footer
             .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.content-end
-                      != '&nbsp; '
-                  %tr
-                    %td.blank-cell.footer
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %td.column-cell
-                                %p= t 'about.hosted_on', domain: site_hostname
-                                %p
-                                  = link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
-                                  - if defined?(@unsubscribe_url)
-                                    ·
-                                    = link_to t('application_mailer.unsubscribe'), @unsubscribe_url
-                              %td.column-cell.text-right
-                                = link_to root_url do
-                                  = image_tag full_pack_url('media/images/mailer/logo.png'), alt: 'Mastodon', height: 24
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:740px;" role="presentation"><tr><td>
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-footer-td
+                    %p.email-footer-p
+                      = link_to root_url, class: 'email-footer-logo-a' do
+                        = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
+                    %p.email-footer-p
+                      = t 'about.hosted_on', domain: site_hostname
+                    %p.email-footer-p
+                      = link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
+                      - if defined?(@unsubscribe_url)
+                        ·
+                        = link_to t('application_mailer.unsubscribe'), @unsubscribe_url
+              /[if mso]
+                </td></tr></table>
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index e053a30fde..bf38dc9aa2 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -1,45 +1,31 @@
-- i ||= 0
-- highlighted ||= false
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-header-img
+      = image_tag full_asset_url(status.account.avatar.url), alt: '', width: 48, height: 48
+    %td.email-status-header-text
+      %h2.email-status-header-name
+        = display_name(status.account)
+      %p.email-status-header-handle
+        @#{status.account.pretty_acct}
 
-%table.email-table{ cellspacing: 0, cellpadding: 0, dir: 'ltr' }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell{ class: i.zero? ? 'content-start' : nil }
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded.status{ class: highlighted ? 'status--highlighted' : '' }
-                              %table.status-header{ cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td{ align: 'left', width: 48 }
-                                      = image_tag full_asset_url(status.account.avatar.url), alt: ''
-                                    %td{ align: 'left' }
-                                      %bdi= display_name(status.account)
-                                      @#{status.account.pretty_acct}
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-content
+      .auto-dir
+        - if status.spoiler_text?
+          %p.email-status-spoiler
+            = status.spoiler_text
 
-                              - if status.spoiler_text?
-                                .auto-dir
-                                  %p
-                                    = status.spoiler_text
+        .email-status-prose
+          = status_content_format(status)
 
-                              .auto-dir
-                                = status_content_format(status)
+        - if status.ordered_media_attachments.size.positive?
+          %p.email-status-media
+            - status.ordered_media_attachments.each do |a|
+              - if status.local?
+                = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
+              - else
+                = link_to a.remote_url, a.remote_url
 
-                                - if status.ordered_media_attachments.size.positive?
-                                  %p
-                                    - status.ordered_media_attachments.each do |a|
-                                      - if status.local?
-                                        = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
-                                      - else
-                                        = link_to a.remote_url, a.remote_url
-
-                              %p.status-footer
-                                = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
+      %p.email-status-footer
+        = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index 325f0aff5f..62c0a39abe 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/favorite.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_grade.png'), alt: ''
-
-                              %h1= t 'notification_mailer.favourite.title'
-                              %p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('application_mailer.view_status'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index f250cbbd2a..8247aa5b44 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -1,43 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/user.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
-
-                              %h1= t 'notification_mailer.follow.title'
-                              %p.lead= t('notification_mailer.follow.body', name: @account.pretty_acct)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@account.pretty_acct}") do
-                                    %span= t 'application_mailer.view_profile'
+                %td.email-padding-24.email-padding-top-0
+                  = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 3885a411d9..9344ef7eb3 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -1,43 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/follow.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
-
-                              %h1= t 'notification_mailer.follow_request.title'
-                              %p.lead= t('notification_mailer.follow_request.body', name: @account.pretty_acct)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url('follow_requests') do
-                                    %span= t 'notification_mailer.follow_request.action'
+                %td.email-padding-24.email-padding-top-0
+                  = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index e830644c3f..83fa5086a6 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/mention.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_reply.png'), alt: ''
-
-                              %h1= t 'notification_mailer.mention.title'
-                              %p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'notification_mailer.mention.action'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('notification_mailer.mention.action'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index e4f9441236..f91c678cf5 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/boost.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_cached.png'), alt: ''
-
-                              %h1= t 'notification_mailer.reblog.title'
-                              %p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('application_mailer.view_status'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/redirects/show.html.haml b/app/views/redirects/show.html.haml
new file mode 100644
index 0000000000..0d09387a9c
--- /dev/null
+++ b/app/views/redirects/show.html.haml
@@ -0,0 +1,8 @@
+.redirect
+  .redirect__logo
+    = link_to render_logo, root_path
+
+  .redirect__message
+    %h1= t('redirects.title', instance: site_hostname)
+    %p= t('redirects.prompt')
+    %p= link_to @redirect_path, @redirect_path, rel: 'noreferrer noopener'
diff --git a/app/views/relationships/_account.html.haml b/app/views/relationships/_account.html.haml
index 43a3d64bc8..23afcf7495 100644
--- a/app/views/relationships/_account.html.haml
+++ b/app/views/relationships/_account.html.haml
@@ -16,7 +16,7 @@
             %small= t('accounts.followers', count: account.followers_count).downcase
           %td.accounts-table__count
             - if account.last_status_at.present?
-              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at
+              %time.time-ago{ datetime: account.last_status_at.to_date.iso8601, title: l(account.last_status_at.to_date) }= l account.last_status_at.to_date
             - else
               \-
             %small= t('accounts.last_active')
diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml
index ed97e880fc..d539848952 100644
--- a/app/views/settings/applications/_fields.html.haml
+++ b/app/views/settings/applications/_fields.html.haml
@@ -11,6 +11,7 @@
 .fields-group
   = f.input :redirect_uri,
             label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri'),
+            required: true,
             wrapper: :with_block_label
 
   %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index d5ca252dc1..ca815720fd 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -49,7 +49,7 @@
           %tr
             %td= t("imports.types.#{import.type}")
             %td
-              - if import.unconfirmed?
+              - if import.state_unconfirmed?
                 = link_to t("imports.states.#{import.state}"), settings_import_path(import)
               - else
                 = t("imports.states.#{import.state}")
@@ -59,7 +59,7 @@
             %td
               - num_failed = import.processed_items - import.imported_items
               - if num_failed.positive?
-                - if import.finished?
+                - if import.state_finished?
                   = link_to num_failed, failures_settings_import_path(import, format: 'csv')
                 - else
                   = num_failed
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 76cd4381d8..cf5025a77b 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -44,6 +44,7 @@
                  hint: false,
                  label: I18n.t('simple_form.labels.defaults.setting_advanced_layout'),
                  wrapper: :with_label
+
     %h4= t 'appearance.animations_and_accessibility'
 
     .fields-group
@@ -58,15 +59,60 @@
       = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping')
       = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
 
+    %h4= t 'appearance.custom_emoji_and_emoji_reactions'
+
+    .fields-group
+      = ff.input :'web.hide_recent_emojis', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_recent_emojis'), hint: false
+      - if Setting.enable_emoji_reaction
+        = ff.input :'web.enable_emoji_reaction', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_enable_emoji_reaction'), hint: I18n.t('simple_form.hints.defaults.setting_enable_emoji_reaction')
+        = ff.input :'web.show_emoji_reaction_on_timeline', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_emoji_reaction_on_timeline')
+        = ff.input :'web.show_emoji_reaction_count', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_emoji_reaction_count')
+
+    %h4= t 'appearance.remote_server_features'
+
+    .fields-group
+      - if Setting.enable_emoji_reaction
+        = ff.input :'web.hide_emoji_reaction_unavailable_server', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_emoji_reaction_unavailable_server')
+      = ff.input :'web.hide_quote_unavailable_server', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_quote_unavailable_server')
+      = ff.input :'web.hide_status_reference_unavailable_server', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_status_reference_unavailable_server')
+
+    %h4= t 'appearance.saved_posts'
+
+    .fields-group
+      = ff.input :'web.bookmark_category_needed', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_bookmark_category_needed'), hint: I18n.t('simple_form.hints.defaults.setting_bookmark_category_needed')
+      = ff.input :'web.show_favourite_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_favourite_menu')
+
+    %h4= t 'appearance.quotes'
+
+    .fields-group
+      = ff.input :'web.show_quote_in_home', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_quote_in_home'), hint: false
+      = ff.input :'web.show_quote_in_public', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_quote_in_public'), hint: false
+      = ff.input :'web.show_blocking_quote', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_blocking_quote'), hint: false
+
+    %h4= t 'appearance.status_action_bar'
+
+    .fields-group
+      = ff.input :'web.simple_timeline_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_simple_timeline_menu')
+      = ff.input :'web.boost_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_boost_menu')
+
     %h4= t 'appearance.discovery'
 
     .fields-group
       = ff.input :'web.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_trends')
+      = ff.input :'web.show_relationships', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_relationships')
+
+    %h4= t 'appearance.media'
+
+    .fields-group
+      = ff.input :'web.display_media_expand',
+                 kmyblue: true,
+                 hint: I18n.t('simple_form.hints.defaults.setting_display_media_expand'),
+                 label: I18n.t('simple_form.labels.defaults.setting_display_media_expand'),
+                 wrapper: :with_label
 
     %h4= t 'appearance.confirmation_dialogs'
 
     .fields-group
-      = ff.input :'web.unfollow_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_unfollow_modal')
       = ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal')
       = ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal')
 
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index d9d496c7fa..7c5715b845 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -22,13 +22,14 @@
     .fields-group
       = ff.input :always_send_emails, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_always_send_emails'), hint: I18n.t('simple_form.hints.defaults.setting_always_send_emails')
 
-    - if current_user.can?(:manage_reports, :manage_appeals, :manage_users, :manage_taxonomies) || (SoftwareUpdate.check_enabled? && current_user.can?(:view_devops))
+    - if current_user.can?(:manage_reports, :manage_appeals, :manage_users, :manage_taxonomies, :manage_federation) || (SoftwareUpdate.check_enabled? && current_user.can?(:view_devops))
       %h4= t 'notifications.administration_emails'
 
       .fields-group
         = ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports)
         = ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals)
         = ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users)
+        = ff.input :'notification_emails.pending_friend_server', as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.notification_emails.pending_friend_server') if current_user.can?(:manage_federation)
         = ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies)
 
       - if SoftwareUpdate.check_enabled? && current_user.can?(:view_devops)
@@ -41,10 +42,7 @@
                      label: I18n.t('simple_form.labels.notification_emails.software_updates.label'),
                      wrapper: :with_label
 
-  %h4= t 'notifications.other_settings'
-
-  .fields-group
+  - if Setting.enable_emoji_reaction
     = f.simple_fields_for :settings, current_user.settings do |ff|
-      = ff.input :'interactions.must_be_follower', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_follower')
-      = ff.input :'interactions.must_be_following', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following')
-      = ff.input :'interactions.must_be_following_dm', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following_dm')
+      .fields-group
+        = ff.input :stop_emoji_reaction_streaming, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_stop_emoji_reaction_streaming'), hint: I18n.t('simple_form.hints.defaults.setting_stop_emoji_reaction_streaming')
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index e2888f7212..8b7aca9a8d 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -15,20 +15,13 @@
                  recommended: true,
                  wrapper: :with_label
 
+    .fields-group
+      = ff.input :lock_follow_from_bot, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_lock_follow_from_bot')
+
     %h4= t 'preferences.posting_defaults'
 
     .fields-row
-      .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_privacy,
-                   collection: Status.selectable_visibilities,
-                   hint: false,
-                   include_blank: false,
-                   label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
-                   label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
-                   required: false,
-                   wrapper: :with_label
-
-      .fields-group.fields-row__column.fields-row__column-6
+      .fields-group.fields-row__column.fields-row__column-12
         = ff.input :default_language,
                    collection: [nil] + filterable_languages,
                    hint: false,
@@ -44,6 +37,62 @@
                  label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
                  wrapper: :with_label
 
+    - if Setting.enable_emoji_reaction
+      %h4= t 'preferences.emoji_reaction_permitting'
+
+      .fields-row
+        .fields-group.fields-row__column.fields-row__column-12
+          = ff.input :emoji_reaction_policy,
+                     collection: %w(allow outside_only followers_only following_only mutuals_only block),
+                     collection_wrapper_tag: 'ul',
+                     hint: false,
+                     include_blank: false,
+                     item_wrapper_tag: 'li',
+                     kmyblue: true,
+                     label: I18n.t('simple_form.labels.defaults.setting_emoji_reaction_policy'),
+                     label_method: ->(item) { safe_join([t("simple_form.labels.defaults.setting_emoji_reaction_policy_items.#{item}")]) },
+                     warning_hint: I18n.t('simple_form.hints.defaults.setting_emoji_reaction_policy'),
+                     wrapper: :with_label
+
+      .fields-group
+        = ff.input :slip_local_emoji_reaction, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_slip_local_emoji_reaction')
+
+    - if @dtl_enabled
+
+      %h4= t 'preferences.dtl'
+
+      %p.hint= t 'preferences.dtl_hint', tag: @dtl_tag
+
+      .fields-group
+        = ff.input :'web.enable_dtl_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_dtl_menu')
+
+      .fields-group
+        = ff.input :dtl_force_visibility,
+                   as: :radio_buttons,
+                   collection: %w(unchange public public_unlisted unlisted),
+                   collection_wrapper_tag: 'ul',
+                   hint: I18n.t('simple_form.hints.defaults.setting_dtl_force_visibility', tag: @dtl_tag),
+                   item_wrapper_tag: 'li',
+                   kmyblue: true,
+                   label: I18n.t('simple_form.labels.defaults.setting_dtl_force_visibility'),
+                   label_method: ->(item) { safe_join([t("simple_form.labels.dtl_force_visibility.#{item}")]) },
+                   wrapper: :with_floating_label
+
+      .fields-group
+        = ff.input :dtl_force_searchability,
+                   as: :radio_buttons,
+                   collection: %w(unchange public public_unlisted),
+                   collection_wrapper_tag: 'ul',
+                   hint: I18n.t('simple_form.hints.defaults.setting_dtl_force_searchability', tag: @dtl_tag),
+                   item_wrapper_tag: 'li',
+                   kmyblue: true,
+                   label: I18n.t('simple_form.labels.defaults.setting_dtl_force_searchability'),
+                   label_method: ->(item) { safe_join([t("simple_form.labels.dtl_force_searchability.#{item}")]) },
+                   wrapper: :with_floating_label
+
+      .fields-group
+        = ff.input :dtl_force_subscribable, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_dtl_force_subscribable'), hint: I18n.t('simple_form.hints.defaults.setting_dtl_force_subscribable')
+
   %h4= t 'preferences.public_timelines'
 
   .fields-group
diff --git a/app/views/settings/preferences/reaching/show.html.haml b/app/views/settings/preferences/reaching/show.html.haml
new file mode 100644
index 0000000000..3176c8056b
--- /dev/null
+++ b/app/views/settings/preferences/reaching/show.html.haml
@@ -0,0 +1,98 @@
+- content_for :page_title do
+  = t('preferences.reaching')
+
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+= simple_form_for current_user, url: settings_preferences_reaching_path, html: { method: :put, id: 'edit_preferences' } do |f|
+  = render 'shared/error_messages', object: current_user
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    %h4= t 'preferences.visibility'
+
+    .fields-row
+      .fields-group.fields-row__column.fields-row__column-6
+        = ff.input :default_privacy,
+                   collection: Status.selectable_visibilities,
+                   hint: false,
+                   include_blank: false,
+                   label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
+                   label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
+                   required: false,
+                   wrapper: :with_label
+
+      .fields-group.fields-row__column.fields-row__column-6
+        = ff.input :default_reblog_privacy,
+                   collection: Status.selectable_reblog_visibilities,
+                   hint: false,
+                   include_blank: false,
+                   kmyblue: true,
+                   label: I18n.t('simple_form.labels.defaults.setting_default_reblog_privacy'),
+                   label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
+                   required: false,
+                   wrapper: :with_label
+
+    .fields-group
+      = ff.input :stay_privacy, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_stay_privacy')
+
+    - if Setting.enable_public_unlisted_visibility
+      .fields-group
+        = ff.input :public_post_to_unlisted, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_public_post_to_unlisted'), hint: I18n.t('simple_form.hints.defaults.setting_public_post_to_unlisted')
+
+    .fields-group
+      = ff.input :enabled_visibilities,
+                 as: :check_boxes,
+                 collection_wrapper_tag: 'ul',
+                 collection: Status.selectable_all_visibilities,
+                 hint: I18n.t('simple_form.hints.defaults.setting_enabled_visibilities'),
+                 include_blank: false,
+                 item_wrapper_tag: 'li',
+                 kmyblue: true,
+                 label: I18n.t('simple_form.labels.defaults.setting_enabled_visibilities'),
+                 label_method: ->(visibility) { I18n.t("statuses.visibilities.#{visibility}") },
+                 required: false,
+                 wrapper: :with_block_label
+
+    %h4= t 'preferences.searchability'
+
+    - unless Chewy.enabled?
+      %p.hint= t 'preferences.does_not_search'
+
+    .fields-row
+      .fields-group.fields-row__column.fields-row__column-12
+        = ff.input :default_searchability,
+                   collection: Status.selectable_searchabilities,
+                   hint: I18n.t('simple_form.hints.defaults.setting_default_searchability'),
+                   include_blank: false,
+                   kmyblue: true,
+                   label: I18n.t('simple_form.labels.defaults.setting_default_searchability'),
+                   label_method: ->(searchability) { safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_long")], ' - ') },
+                   required: false,
+                   wrapper: :with_label
+
+    .fields-group
+      = ff.input :disallow_unlisted_public_searchability, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_disallow_unlisted_public_searchability'), hint: I18n.t('simple_form.hints.defaults.setting_disallow_unlisted_public_searchability')
+
+    - if Chewy.enabled?
+      %h4= t 'preferences.search'
+
+      .fields-row
+        .fields-group.fields-row__column.fields-row__column-12
+          = ff.input :default_searchability_of_search,
+                     collection: Status.selectable_searchabilities_for_search,
+                     hint: false,
+                     include_blank: false,
+                     kmyblue: true,
+                     label: I18n.t('simple_form.labels.defaults.setting_default_searchability_of_search'),
+                     label_method: ->(searchability) { safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_search_long")], ' - ') },
+                     required: false,
+                     wrapper: :with_label
+
+      .fields-group
+        = ff.input :reverse_search_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_reverse_search_quote'), hint: I18n.t('simple_form.hints.defaults.setting_reverse_search_quote')
+
+      .fields-group
+        = ff.input :use_public_index, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_use_public_index')
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml
index 3c14382587..eb02ee2f5c 100644
--- a/app/views/settings/privacy/show.html.haml
+++ b/app/views/settings/privacy/show.html.haml
@@ -17,6 +17,10 @@
   .fields-group
     = f.input :discoverable, as: :boolean, wrapper: :with_label, recommended: true
 
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-group
+      = ff.input :discoverable_local, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.discoverable_local'), hint: I18n.t('simple_form.hints.defaults.discoverable_local')
+
   .fields-group
     = f.input :unlocked, as: :boolean, wrapper: :with_label
 
@@ -24,13 +28,27 @@
 
   %p.lead= t('privacy.search_hint_html')
 
-  .fields-group
-    = f.input :indexable, as: :boolean, wrapper: :with_label
-
   = f.simple_fields_for :settings, current_user.settings do |ff|
     .fields-group
       = ff.input :indexable, wrapper: :with_label
 
+  %p.lead= t('privacy.search_kmyblue_hint_html')
+
+  .fields-group
+    = f.input :indexable, as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.account.indexable_kmyblue')
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-row
+      .fields-group.fields-row__column.fields-row__column-12
+        = ff.input :default_searchability,
+                   collection: Status.selectable_searchabilities,
+                   include_blank: false,
+                   kmyblue: true,
+                   label: I18n.t('simple_form.labels.account.searchability_kmyblue'),
+                   label_method: ->(searchability) { safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_long")], ' - ') },
+                   required: false,
+                   wrapper: :with_label
+
   %h4= t('privacy.privacy')
 
   %p.lead= t('privacy.privacy_hint_html')
@@ -39,6 +57,11 @@
     = f.input :show_collections, as: :boolean, wrapper: :with_label
 
   = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-group
+      = ff.input :show_statuses_count, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_statuses_count'), hint: false
+      = ff.input :show_following_count, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_following_count'), hint: false
+      = ff.input :show_followers_count, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_followers_count'), hint: false
+
     .fields-group
       = ff.input :show_application, wrapper: :with_label
 
diff --git a/app/views/settings/privacy_extra/show.html.haml b/app/views/settings/privacy_extra/show.html.haml
new file mode 100644
index 0000000000..fc7ed4db52
--- /dev/null
+++ b/app/views/settings/privacy_extra/show.html.haml
@@ -0,0 +1,55 @@
+- content_for :page_title do
+  = t('privacy_extra.title')
+
+- content_for :heading do
+  %h2= t('settings.profile')
+  = render partial: 'settings/shared/profile_navigation'
+
+= simple_form_for @account, url: settings_privacy_extra_path, html: { method: :put } do |f|
+  = render 'shared/error_messages', object: @account
+
+  %p.lead= t('privacy_extra.hint_html')
+
+  %h4= t('privacy_extra.post_processing')
+
+  %p.lead= t('privacy_extra.post_processing_hint_html')
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .fields-group
+      = ff.input :translatable_private, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_translatable_private')
+
+    .fields-group
+      = ff.input :allow_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_allow_quote'), hint: I18n.t('simple_form.hints.defaults.setting_allow_quote')
+
+  %h4= t 'privacy_extra.stop_deliver'
+
+  %p.lead= t('privacy_extra.stop_deliver_hint_html')
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    - if Setting.enable_public_unlisted_visibility
+      .fields-group
+        = ff.input :reject_public_unlisted_subscription, kmyblue: true, as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_reject_public_unlisted_subscription')
+
+    .fields-group
+      = ff.input :reject_unlisted_subscription, kmyblue: true, as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_reject_unlisted_subscription'), hint: I18n.t('simple_form.hints.defaults.setting_reject_unlisted_subscription')
+
+    .fields-group
+      = ff.input :reject_send_limited_to_suspects, kmyblue: true, as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_reject_send_limited_to_suspects'), hint: I18n.t('simple_form.hints.defaults.setting_reject_send_limited_to_suspects')
+
+  %h4= t('privacy_extra.will_remove_settings')
+  %p.hint= t('privacy_extra.will_remove_settings_hint_html')
+
+  .fields-group
+    = f.input :subscription_policy,
+              as: :radio_buttons,
+              collection: %w(allow followers_only block),
+              collection_wrapper_tag: 'ul',
+              hint: t('simple_form.hints.defaults.subscription_policy'),
+              item_wrapper_tag: 'li',
+              kmyblue: true,
+              label: t('simple_form.labels.defaults.subscription_policy'),
+              label_method: ->(item) { safe_join([t("simple_form.labels.subscription_policy.#{item}")]) },
+              wrapper: :with_floating_label
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index b7b0a0da92..102141ad32 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -11,24 +11,31 @@
   %p.lead= t('edit_profile.hint_html')
 
   %h4= t('edit_profile.basic_information')
-
   .fields-row
     .fields-row__column.fields-row__column-6
       .fields-group
         = f.input :display_name, wrapper: :with_block_label, input_html: { maxlength: 30, data: { default: @account.username } }
 
       .fields-group
-        = f.input :note, wrapper: :with_block_label, input_html: { maxlength: 500 }
+        = f.input :note, wrapper: :with_block_label, input_html: { maxlength: 500, rows: 8 }
+
+      = f.simple_fields_for :settings, current_user.settings do |ff|
+        .fields-group
+          = ff.input :bio_markdown, input_html: { name: 'account[bio_markdown]' }, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_bio_markdown')
 
     .fields-row__column.fields-group.fields-row__column-6
       .input.with_block_label
         %label= t('simple_form.labels.defaults.fields')
         %span.hint= t('simple_form.hints.account.fields')
 
+        .row
+          %p.fields-label= t('simple_form.labels.account.fields.name')
+          %p.fields-label= t('simple_form.labels.account.fields.value')
+
         = f.simple_fields_for :fields do |fields_f|
           .row
-            = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
-            = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
+            = fields_f.input :name, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.name_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
+            = fields_f.input :value, placeholder: fields_f.index.zero? ? t("simple_form.labels.account.fields.examples.value_#{fields_f.index + 1}") : t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
 
   .fields-row
     .fields-row__column.fields-row__column-6
@@ -65,7 +72,13 @@
   %h4= t('edit_profile.other')
 
   .fields-group
-    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
+    = f.input :my_actor_type,
+              as: :radio_buttons,
+              collection: %w(person bot),
+              collection_wrapper_tag: 'ul',
+              item_wrapper_tag: 'li',
+              label_method: ->(item) { safe_join([t("simple_form.labels.defaults.#{item}"), content_tag(:span, I18n.t("simple_form.hints.defaults.#{item}"), class: 'hint')]) },
+              wrapper: :with_floating_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/shared/_profile_navigation.html.haml b/app/views/settings/shared/_profile_navigation.html.haml
index 3a657c5bde..fb7e80e023 100644
--- a/app/views/settings/shared/_profile_navigation.html.haml
+++ b/app/views/settings/shared/_profile_navigation.html.haml
@@ -3,5 +3,6 @@
     :ruby
       primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path
       primary.item :privacy, safe_join([fa_icon('lock fw'), t('privacy.title')]), settings_privacy_path
+      primary.item :privacy_extra, safe_join([fa_icon('lock fw'), t('privacy_extra.title')]), settings_privacy_extra_path
       primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path
       primary.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
new file mode 100644
index 0000000000..7c599e9c0e
--- /dev/null
+++ b/app/views/severed_relationships/index.html.haml
@@ -0,0 +1,34 @@
+- content_for :page_title do
+  = t('settings.severed_relationships')
+
+%p.muted-hint= t('severed_relationships.preamble')
+
+- unless @events.empty?
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('exports.archive_takeout.date')
+          %th= t('severed_relationships.type')
+          %th= t('severed_relationships.lost_follows')
+          %th= t('severed_relationships.lost_followers')
+      %tbody
+        - @events.each do |event|
+          %tr
+            %td= l event.created_at
+            %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
+            - if event.purged?
+              %td{ rowspan: 2 }= t('severed_relationships.purged')
+            - else
+              %td
+                - count = event.following_count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
+              %td
+                - count = event.followers_count
+                - if count.zero?
+                  = t('generic.none')
+                - else
+                  = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv)
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index 385351ee14..d1e3cd9c6f 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -8,7 +8,7 @@
 = opengraph 'og:type', 'website'
 = opengraph 'og:title', instance_presenter.title
 = opengraph 'og:description', description
-= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png', protocol: :request))
+= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png'))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
 = opengraph 'twitter:card', 'summary_large_image'
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
index e9ca541691..89d6ee567d 100644
--- a/app/views/shared/_web_app.html.haml
+++ b/app/views/shared/_web_app.html.haml
@@ -12,7 +12,7 @@
 
 .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
-    = image_pack_tag 'logo.svg', alt: 'Mastodon'
+    = image_tag frontend_asset_path('images/logo.svg'), alt: 'Mastodon'
 
     %div
       = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index c55dff5d96..0964a1c505 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -1,3 +1,6 @@
+:ruby
+  grouped_emoji_reactions ||= Oj.load(status.status_stat&.emoji_reactions || '', mode: :strict) || []
+
 .detailed-status.detailed-status--flex{ class: "detailed-status-#{status.visibility}" }
   .p-author.h-card
     = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'detailed-status__display-name u-url', target: stream_link_target, rel: 'noopener' do
@@ -36,6 +39,13 @@
   - elsif status.preview_card
     = render_card_component(status)
 
+  - if grouped_emoji_reactions.size.positive?
+    .status__emoji-reactions-bar
+      - grouped_emoji_reactions.each do |reaction|
+        %button.emoji-reactions-bar__button
+          %span.emojify= prerender_custom_emojis_from_hash(emoji_name_format(reaction, status), reaction)
+          %span.count= reaction['count']
+
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
     - if status.edited?
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 93effc4524..a9bf479a43 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -1,5 +1,6 @@
 :ruby
   hide_show_thread ||= false
+  grouped_emoji_reactions ||= Oj.load(status.status_stat&.emoji_reactions || '', mode: :strict) || []
 
 .status{ class: "status-#{status.visibility}" }
   .status__info
@@ -52,6 +53,13 @@
     = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do
       = t 'statuses.show_thread'
 
+  - if grouped_emoji_reactions.size.positive?
+    .status__emoji-reactions-bar
+      - grouped_emoji_reactions.each do |reaction|
+        %button.emoji-reactions-bar__button
+          %span.emojify= prerender_custom_emojis_from_hash(emoji_name_format(reaction, status), reaction)
+          %span.count= reaction['count']
+
   .status__action-bar
     %span.status__action-bar-button.icon-button.icon-button--with-counter
       - if status.in_reply_to_id.nil?
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 08bab63073..f9dc1712cf 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -2,8 +2,12 @@
   = t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false))
 
 - content_for :header_tags do
-  - if @account.user_prefers_noindex?
-    %meta{ name: 'robots', content: 'noindex, noarchive' }/
+  - if @account.noindex?
+    %meta{ name: 'robots', content: 'noindex, noarchive, noai, noimageai' }/
+    %meta{ name: 'CCBot', content: 'nofollow' }/
+  - else
+    %meta{ name: 'robots', content: 'noai, noimageai' }/
+    %meta{ name: 'CCBot', content: 'nofollow' }/
 
   %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: short_account_status_url(@account, @status), format: 'json') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@status) }/
diff --git a/app/views/statuses_cleanup/show.html.haml b/app/views/statuses_cleanup/show.html.haml
index bd4cc1d86c..44fb992810 100644
--- a/app/views/statuses_cleanup/show.html.haml
+++ b/app/views/statuses_cleanup/show.html.haml
@@ -7,9 +7,19 @@
 = simple_form_for @policy, url: statuses_cleanup_path, method: :put, html: { id: 'edit_policy' } do |f|
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint')
+      = f.input :enabled,
+                as: :boolean,
+                hint: t('statuses_cleanup.enabled_hint'),
+                label: t('statuses_cleanup.enabled'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_status_age, wrapper: :with_label, label: t('statuses_cleanup.min_age_label'), collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i), label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") }, include_blank: false, hint: false
+      = f.input :min_status_age,
+                collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i),
+                hint: false,
+                include_blank: false,
+                label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") },
+                label: t('statuses_cleanup.min_age_label'),
+                wrapper: :with_label
 
   .flash-message= t('statuses_cleanup.explanation')
 
@@ -17,28 +27,62 @@
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_pinned, wrapper: :with_label, label: t('statuses_cleanup.keep_pinned'), hint: t('statuses_cleanup.keep_pinned_hint')
+      = f.input :keep_pinned,
+                hint: t('statuses_cleanup.keep_pinned_hint'),
+                label: t('statuses_cleanup.keep_pinned'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_direct, wrapper: :with_label, label: t('statuses_cleanup.keep_direct'), hint: t('statuses_cleanup.keep_direct_hint')
+      = f.input :keep_direct,
+                hint: t('statuses_cleanup.keep_direct_hint'),
+                label: t('statuses_cleanup.keep_direct'),
+                wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_self_fav, wrapper: :with_label, label: t('statuses_cleanup.keep_self_fav'), hint: t('statuses_cleanup.keep_self_fav_hint')
+      = f.input :keep_self_fav,
+                hint: t('statuses_cleanup.keep_self_fav_hint'),
+                label: t('statuses_cleanup.keep_self_fav'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_self_bookmark, wrapper: :with_label, label: t('statuses_cleanup.keep_self_bookmark'), hint: t('statuses_cleanup.keep_self_bookmark_hint')
+      = f.input :keep_self_bookmark,
+                hint: t('statuses_cleanup.keep_self_bookmark_hint'),
+                label: t('statuses_cleanup.keep_self_bookmark'),
+                wrapper: :with_label
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_polls, wrapper: :with_label, label: t('statuses_cleanup.keep_polls'), hint: t('statuses_cleanup.keep_polls_hint')
+      = f.input :keep_polls,
+                hint: t('statuses_cleanup.keep_polls_hint'),
+                label: t('statuses_cleanup.keep_polls'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :keep_media, wrapper: :with_label, label: t('statuses_cleanup.keep_media'), hint: t('statuses_cleanup.keep_media_hint')
+      = f.input :keep_media,
+                hint: t('statuses_cleanup.keep_media_hint'),
+                label: t('statuses_cleanup.keep_media'),
+                wrapper: :with_label
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :keep_self_emoji, wrapper: :with_label, label: t('statuses_cleanup.keep_self_emoji'), hint: t('statuses_cleanup.keep_self_emoji_hint')
 
   %h4= t('statuses_cleanup.interaction_exceptions')
 
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_favs, wrapper: :with_label, label: t('statuses_cleanup.min_favs'), hint: t('statuses_cleanup.min_favs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') }
+      = f.input :min_favs,
+                hint: t('statuses_cleanup.min_favs_hint'),
+                input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') },
+                label: t('statuses_cleanup.min_favs'),
+                wrapper: :with_label
     .fields-row__column.fields-row__column-6.fields-group
-      = f.input :min_reblogs, wrapper: :with_label, label: t('statuses_cleanup.min_reblogs'), hint: t('statuses_cleanup.min_reblogs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') }
+      = f.input :min_reblogs,
+                hint: t('statuses_cleanup.min_reblogs_hint'),
+                input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') },
+                label: t('statuses_cleanup.min_reblogs'),
+                wrapper: :with_label
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :min_emojis, wrapper: :with_label, label: t('statuses_cleanup.min_emojis'), hint: t('statuses_cleanup.min_emojis_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_emojis') }
 
   .flash-message= t('statuses_cleanup.interaction_exceptions_explanation')
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index 4b4967a8f5..355a0c3f2e 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -1,5 +1,6 @@
 - content_for :header_tags do
-  %meta{ name: 'robots', content: 'noindex' }/
+  %meta{ name: 'robots', content: 'noindex, noai, noimageai' }/
+  %meta{ name: 'CCBot', content: 'nofollow' }
   = render partial: 'shared/og'
 
 = render partial: 'shared/web_app'
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 223ba7f0b8..54e9a94a54 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -1,61 +1,12 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
-
-                              %h1= t 'user_mailer.appeal_approved.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_approved.explanation',
-                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
-                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to root_url do
-                                    %span= t 'user_mailer.appeal_approved.action'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-approved.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.appeal_approved.explanation',
+                  appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                  strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('user_mailer.appeal_approved.action'), url: root_url
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index 59354f1d40..b493712b05 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -1,61 +1,12 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
-
-                              %h1= t 'user_mailer.appeal_rejected.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_rejected.explanation',
-                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
-                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to root_url do
-                                    %span= t 'user_mailer.appeal_approved.action'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-rejected.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.appeal_rejected.explanation',
+                  appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                  strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('user_mailer.appeal_approved.action'), url: root_url
diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml
index 465ead2c8b..99a48e7fdb 100644
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@@ -1,59 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_file_download.png'), alt: ''
-
-                              %h1= t 'user_mailer.backup_ready.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.backup_ready.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to download_backup_url(@backup) do
-                                    %span= t 'exports.archive_takeout.download'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/archive.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.backup_ready.extra'
+            = render 'application/mailer/button', text: t('exports.archive_takeout.download'), url: download_backup_url(@backup)
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 447e689b40..13e68c722b 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -1,80 +1,14 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.confirmation_instructions.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  - if @resource.created_by_application
-                                    = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
-                                      %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
-                                  - else
-                                    = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                      %span= t 'devise.mailer.confirmation_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
+            - if @resource.created_by_application
+              = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name), url: confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true')
+            - else
+              = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
+            %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 96be8624d9..71678ad029 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -1,58 +1,11 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.email_changed.title'
-                              %p.lead= t 'devise.mailer.email_changed.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.input-cell
-                          %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td= @resource.unconfirmed_email
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.email_changed.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            = render 'application/mailer/frame', text: @resource.unconfirmed_email
+            %p= t 'devise.mailer.email_changed.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/failed_2fa.html.haml b/app/views/user_mailer/failed_2fa.html.haml
new file mode 100644
index 0000000000..e1da35ce06
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.html.haml
@@ -0,0 +1,24 @@
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.failed_2fa.title'), heading_subtitle: t('user_mailer.failed_2fa.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.failed_2fa.details'
+            %p
+              %strong #{t('sessions.ip')}:
+              = @remote_ip
+              %br/
+              %strong #{t('sessions.browser')}:
+              %span{ title: @user_agent }
+                = t 'sessions.description',
+                    browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+                    platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+              %br/
+              %strong #{t('sessions.date')}:
+              = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+      %p= t 'user_mailer.failed_2fa.further_actions_html',
+            action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/failed_2fa.text.erb b/app/views/user_mailer/failed_2fa.text.erb
new file mode 100644
index 0000000000..c1dbf7d929
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.text.erb
@@ -0,0 +1,15 @@
+<%= t 'user_mailer.failed_2fa.title' %>
+
+===
+
+<%= t 'user_mailer.failed_2fa.explanation' %>
+
+<%= t 'user_mailer.failed_2fa.details' %>
+
+<%= t('sessions.ip') %>: <%= @remote_ip %>
+<%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
+<%= l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone) %>
+
+<%= t 'user_mailer.failed_2fa.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 559abf027c..44c8c0dcaf 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -1,40 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.password_change.title'
-                              %p.lead= t 'devise.mailer.password_change.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.password_change.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.password_change.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 7f10ba94fd..854887a7e0 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -1,60 +1,11 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.reconfirmation_instructions.title'
-                              %p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                    %span= t 'devise.mailer.confirmation_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reconfirmation_instructions.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t('devise.mailer.reconfirmation_instructions.explanation')
+            = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
+            %p= t 'devise.mailer.reconfirmation_instructions.extra'
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index eeed38c9e4..a1384fcc27 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -1,60 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.reset_password_instructions.title'
-                              %p.lead= t 'devise.mailer.reset_password_instructions.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_password_url(@resource, reset_password_token: @token) do
-                                    %span= t 'devise.mailer.reset_password_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reset_password_instructions.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.reset_password_instructions.extra'
+            = render 'application/mailer/button', text: t('devise.mailer.reset_password_instructions.action'), url: edit_password_url(@resource, reset_password_token: @token)
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index 0cd21b4e60..deee7a1ce1 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -1,71 +1,24 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.warning-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'user_mailer.suspicious_sign_in.title'
-                              %p= t 'user_mailer.suspicious_sign_in.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.suspicious_sign_in.details'
-                          %tr
-                            %td.column-cell.text-center
-                              %p
-                                %strong #{t('sessions.ip')}:
-                                = @remote_ip
-                                %br/
-                                %strong #{t('sessions.browser')}:
-                                %span{ title: @user_agent }
-                                  = t 'sessions.description',
-                                      browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
-                                      platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
-                                %br/
-                                = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.suspicious_sign_in.further_actions_html',
-                                    action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.suspicious_sign_in.details'
+            %p
+              %strong #{t('sessions.ip')}:
+              = @remote_ip
+              %br/
+              %strong #{t('sessions.browser')}:
+              %span{ title: @user_agent }
+                = t 'sessions.description',
+                    browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+                    platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+              %br/
+              %strong #{t('sessions.date')}:
+              = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+      %p= t 'user_mailer.suspicious_sign_in.further_actions_html',
+            action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/two_factor_disabled.html.haml b/app/views/user_mailer/two_factor_disabled.html.haml
index 651c6f940e..28f6ca6600 100644
--- a/app/views/user_mailer/two_factor_disabled.html.haml
+++ b/app/views/user_mailer/two_factor_disabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_disabled.title'
-                              %p.lead= t 'devise.mailer.two_factor_disabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-disabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_disabled.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/two_factor_enabled.html.haml b/app/views/user_mailer/two_factor_enabled.html.haml
index fc31bd979f..691dc661a0 100644
--- a/app/views/user_mailer/two_factor_enabled.html.haml
+++ b/app/views/user_mailer/two_factor_enabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_enabled.title'
-                              %p.lead= t 'devise.mailer.two_factor_enabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-enabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_enabled.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
index 833708868b..2d063e4c76 100644
--- a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
+++ b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_recovery_codes_changed.title'
-                              %p.lead= t 'devise.mailer.two_factor_recovery_codes_changed.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-recovery.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_recovery_codes_changed.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 5d64e83247..837cde550e 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -1,98 +1,46 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: frontend_asset_url('images/mailer-new/heading/warning.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td-without-padding
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
+                %td.email-prose.email-padding-24
+                  - unless @warning.none_action?
+                    %p= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance
 
-                              %h1= t "user_mailer.warning.title.#{@warning.action}"
+                  - if @warning.text.present?
+                    = linkify(@warning.text)
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+                  - if @warning.report && !@warning.report.other?
+                    %p
+                      %strong= t('user_mailer.warning.reason')
+                      = t("user_mailer.warning.categories.#{@warning.report.category}")
+
+                    - if @warning.report.violation? && @warning.report.rule_ids.present?
+                      %ul.rules-list
+                        - @warning.report.rules.each do |rule|
+                          %li= rule.text
+
+                  - unless @statuses.empty?
+                    %p
+                      %strong= t('user_mailer.warning.statuses')
+
+            - unless @statuses.empty?
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-border-top
+                    - @statuses.each_with_index do |status, i|
+                      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                        %tr
+                          %td.email-border-bottom.email-padding-24
+                            = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence
+
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              - unless @warning.none_action?
-                                %p= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance
-
-                              - if @warning.text.present?
-                                = linkify(@warning.text)
-
-                              - if @warning.report && !@warning.report.other?
-                                %p
-                                  %strong= t('user_mailer.warning.reason')
-                                  = t("user_mailer.warning.categories.#{@warning.report.category}")
-
-                                - if @warning.report.violation? && @warning.report.rule_ids.present?
-                                  %ul.rules-list
-                                    - @warning.report.rules.each do |rule|
-                                      %li= rule.text
-
-                              - unless @statuses.empty?
-                                %p
-                                  %strong= t('user_mailer.warning.statuses')
-
-- unless @statuses.empty?
-  - @statuses.each_with_index do |status, i|
-    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell{ class: @statuses.blank? ? '' : 'content-start' }
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to disputes_strike_url(@warning) do
-                                    %span= t 'user_mailer.warning.appeal'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.warning.appeal_description', instance: @instance
+                %td.email-prose.email-padding-24
+                  %p= t 'user_mailer.warning.appeal_description', instance: @instance
+                  = render 'application/mailer/button', text: t('user_mailer.warning.appeal'), url: disputes_strike_url(@warning)
diff --git a/app/views/user_mailer/webauthn_credential_added.html.haml b/app/views/user_mailer/webauthn_credential_added.html.haml
index 2ecb62d967..3e16766238 100644
--- a/app/views/user_mailer/webauthn_credential_added.html.haml
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@@ -1,44 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-added.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_credential.added.title'
-                              %p.lead #{t('devise.mailer.webauthn_credential.added.explanation')}:
-                              %p.lead= @webauthn_credential.nickname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+                %td.email-frame-wrapper-td
+                  = render 'application/mailer/frame', text: @webauthn_credential.nickname
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_credential_deleted.html.haml b/app/views/user_mailer/webauthn_credential_deleted.html.haml
index f282985b14..59dcb75d3a 100644
--- a/app/views/user_mailer/webauthn_credential_deleted.html.haml
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@@ -1,44 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-deleted.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_credential.deleted.title'
-                              %p.lead #{t('devise.mailer.webauthn_credential.deleted.explanation')}:
-                              %p.lead= @webauthn_credential.nickname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+                %td.email-frame-wrapper-td
+                  = render 'application/mailer/frame', text: @webauthn_credential.nickname
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_disabled.html.haml b/app/views/user_mailer/webauthn_disabled.html.haml
index 81a2a7954c..0f7c534bc4 100644
--- a/app/views/user_mailer/webauthn_disabled.html.haml
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_disabled.title'
-                              %p.lead= t 'devise.mailer.webauthn_disabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-disabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.webauthn_disabled.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_enabled.html.haml b/app/views/user_mailer/webauthn_enabled.html.haml
index f08e764e8d..cd11aa5a40 100644
--- a/app/views/user_mailer/webauthn_enabled.html.haml
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_enabled.title'
-                              %p.lead= t 'devise.mailer.webauthn_enabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-enabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.webauthn_enabled.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 0d8a15cfd7..0f9cbf36ff 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,99 +1,71 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
+= content_for :heading do
+  .email-desktop-flex
+    .email-header-left
+      = render 'application/mailer/heading', heading_title: t('user_mailer.welcome.title', name: @resource.account.username), heading_subtitle: t('user_mailer.welcome.explanation')
+    .email-header-right
+      .email-header-card
+        %table.email-header-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+          %tr
+            %td
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-header-card-banner-td{ height: 140, background: full_asset_url(instance_presenter.thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png')) }
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-header-card-body-td
+                    %p.email-header-card-instance= @instance
+                    - if instance_presenter.description.present?
+                      %p.email-header-card-description= instance_presenter.description
+                    = render 'application/mailer/button', text: t('user_mailer.welcome.sign_in_action'), url: new_user_session_url, has_arrow: false
 
-                              %h1= t 'user_mailer.welcome.title', name: @resource.account.username
-                              %p.lead= t 'user_mailer.welcome.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.input-cell.text-center.padded-bottom
-                              %h5= t 'user_mailer.welcome.full_handle'
-                              %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td @#{@resource.account.username}@#{@instance}
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell
-                              %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.edit_profile_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_profile_url do
-                                        %span= t 'user_mailer.welcome.edit_profile_action'
-
-              %tr
-                %td.content-cell.padded-bottom
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.final_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to web_url do
-                                        %span= t 'user_mailer.welcome.final_action'
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-huge-padding-td
+      %h2.email-h2= t('user_mailer.welcome.checklist_title')
+      %p.email-h-sub= t('user_mailer.welcome.checklist_subtitle')
+      = render 'application/mailer/checklist', key: 'edit_profile', checked: @has_account_fields, button_text: t('user_mailer.welcome.edit_profile_action'), button_url: web_url('start/profile')
+      = render 'application/mailer/checklist', key: 'follow', checked: @has_active_relationships, button_text: t('user_mailer.welcome.follow_action'), button_url: web_url('start/follows')
+      = render 'application/mailer/checklist', key: 'post', checked: @has_statuses, button_text: t('user_mailer.welcome.post_action'), button_url: web_url
+      = render 'application/mailer/checklist', key: 'share', checked: false, button_text: t('user_mailer.welcome.share_action'), button_url: web_url('start/share')
+      = render 'application/mailer/checklist', key: 'apps', checked: false, show_apps_buttons: true
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-columns-td
+      .email-desktop-flex
+        /[if mso]
+          <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:100%;" role="presentation"><tr><td style="width:50%; vertical-align:top;">
+        .email-desktop-column
+          %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+            %tr
+              %td.email-column-td
+                %h2.email-h2= t('user_mailer.welcome.follows_title')
+                %p.email-h-sub= t('user_mailer.welcome.follows_subtitle')
+                = render partial: 'application/mailer/follow', collection: @suggestions
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-action-td
+                      = link_to '', href: web_url('explore/suggestions'), class: 'email-link-with-arrow' do
+                        = t('user_mailer.welcome.follows_view_more')
+                        %span= '❯'
+        /[if mso]
+          </td><td style="width:50%; vertical-align:top;">
+        .email-desktop-column
+          %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+            %tr
+              %td.email-column-td
+                %h2.email-h2= t('user_mailer.welcome.hashtags_title')
+                %p.email-h-sub= t('user_mailer.welcome.hashtags_subtitle')
+                = render partial: 'application/mailer/hashtag', collection: @tags
+                %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                  %tr
+                    %td.email-column-action-td
+                      = link_to '', href: web_url('explore/tags'), class: 'email-link-with-arrow' do
+                        = t('user_mailer.welcome.hashtags_view_more')
+                        %span= '❯'
+        /[if mso]
+          </td></tr></table>
+.email-extra-wave
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-extra-td
+      = render partial: 'application/mailer/feature', collection: %w(control audience moderation creativity)
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index d78cdb938a..d9da2997da 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -1,16 +1,78 @@
 <%= t 'user_mailer.welcome.title', name: @resource.account.username %> <%= t 'user_mailer.welcome.explanation' %>
 
-===
-
-<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.local_username_and_domain}" %>)
-<%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %>
-
 ---
 
-<%= t 'user_mailer.welcome.edit_profile_step' %>
+<%= t('user_mailer.welcome.sign_in_action') %>
+===
+<%= new_user_session_url %>
 
-=> <%= settings_profile_url %>
+---
 
-<%= t 'user_mailer.welcome.final_step' %>
+<%= t('user_mailer.welcome.checklist_title') %>
+===
+<%= t('user_mailer.welcome.checklist_subtitle') %>
 
-=> <%= web_url %>
+1. <%= t('user_mailer.welcome.edit_profile_title') %>
+   <%= t('user_mailer.welcome.edit_profile_step') %>
+   * <%= web_url('start/profile') %>
+
+2. <%= t('user_mailer.welcome.follow_title') %>
+   <%= t('user_mailer.welcome.follow_step') %>
+   * <%= web_url('start/follows') %>
+
+3. <%= t('user_mailer.welcome.post_title') %>
+   <%= t('user_mailer.welcome.post_step') %>
+   * <%= web_url %>
+
+4. <%= t('user_mailer.welcome.share_title') %>
+   <%= t('user_mailer.welcome.share_step') %>
+   * <%= web_url('start/share') %>
+
+5. <%= t('user_mailer.welcome.apps_title') %>
+   <%= t('user_mailer.welcome.apps_step') %>
+   * iOS: https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974
+   * Android: https://play.google.com/store/apps/details?id=org.joinmastodon.android
+
+---
+
+<%= t('user_mailer.welcome.follows_title') %>
+===
+<%= t('user_mailer.welcome.follows_subtitle') %>
+
+<%- @suggestions.each do |suggestion| %>
+* <%= suggestion.account.display_name.presence || suggestion.account.username %> · @<%= suggestion.account.pretty_acct %>
+  <%= web_url("@#{suggestion.account.acct}") %>
+<%- end %>
+
+<%= web_url('explore/suggestions') %>
+
+---
+
+<%= t('user_mailer.welcome.hashtags_title') %>
+===
+<%= t('user_mailer.welcome.hashtags_subtitle') %>
+
+<%- @tags.each do |tag| %>
+* #<%= tag.display_name %> · <%= t('user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts)) %>
+  <%= tag_url(tag) %>
+<%- end %>
+
+<%= web_url('explore/tags') %>
+
+---
+
+<%= t('user_mailer.welcome.feature_control_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_control') %>
+
+<%= t('user_mailer.welcome.feature_audience_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_audience') %>
+
+<%= t('user_mailer.welcome.feature_moderation_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_moderation') %>
+
+<%= t('user_mailer.welcome.feature_creativity_title') %>
+===
+<%= word_wrap t('user_mailer.welcome.feature_creativity') %>
diff --git a/app/workers/activate_remote_account_worker.rb b/app/workers/activate_remote_account_worker.rb
new file mode 100644
index 0000000000..c122cdeb54
--- /dev/null
+++ b/app/workers/activate_remote_account_worker.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ActivateRemoteAccountWorker
+  include Sidekiq::Worker
+
+  def perform(account_id)
+    account = Account.find_by(id: account_id)
+    return true if account.nil?
+    return true if account.suspended?
+
+    ActivateFollowRequestsService.new.call(account)
+    ActivateRemoteStatusesService.new.call(account)
+  end
+end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 376c237a98..0c6ca026bb 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -59,7 +59,7 @@ class ActivityPub::DeliveryWorker
   end
 
   def perform_request
-    light = Stoplight(@inbox_url) do
+    stoplight_wrapper.run do
       request_pool.with(@host) do |http_client|
         build_request(http_client).perform do |response|
           raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
@@ -68,10 +68,12 @@ class ActivityPub::DeliveryWorker
         end
       end
     end
+  end
 
-    light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
-         .with_cool_off_time(STOPLIGHT_COOLDOWN)
-         .run
+  def stoplight_wrapper
+    Stoplight(@inbox_url)
+      .with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
+      .with_cool_off_time(STOPLIGHT_COOLDOWN)
   end
 
   def failure_tracker
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index 575e110257..260334760e 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -7,25 +7,86 @@ class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
     @status  = Status.find(status_id)
     @account = @status.account
 
-    distribute!
+    if @status.limited_visibility?
+      distribute_limited!
+    else
+      distribute!
+    end
   rescue ActiveRecord::RecordNotFound
     true
   end
 
   protected
 
+  def distribute_limited!
+    if @status.reply? && @status.conversation.present? && !@status.conversation.local?
+      distribute_conversation!
+    else
+      distribute_limited_mentions!
+    end
+  end
+
+  def distribute_limited_mentions!
+    ActivityPub::DeliveryWorker.push_bulk(inboxes_for_limited, limit: 1_000) do |inbox_url|
+      [payload, @account.id, inbox_url, options]
+    end
+  end
+
+  def distribute_conversation!
+    inbox_url = @status.conversation.inbox_url
+    return if inbox_url.blank?
+
+    ActivityPub::DeliveryWorker.perform_async(payload, @account.id, inbox_url, options)
+  end
+
   def inboxes
-    @inboxes ||= StatusReachFinder.new(@status).inboxes
+    @inboxes ||= status_reach_finder.inboxes
+  end
+
+  def inboxes_for_misskey
+    @inboxes_for_misskey ||= status_reach_finder.inboxes_for_misskey
+  end
+
+  def inboxes_for_friend
+    @inboxes_for_friend ||= status_reach_finder.inboxes_for_friend
+  end
+
+  def inboxes_for_limited
+    @inboxes_for_limited ||= status_reach_finder.inboxes_for_limited
+  end
+
+  def status_reach_finder
+    @status_reach_finder ||= StatusReachFinder.new(@status)
   end
 
   def payload
-    @payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
+    @payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account, always_sign_unsafe: always_sign))
+  end
+
+  def payload_for_misskey
+    @payload_for_misskey ||= Oj.dump(serialize_payload(activity_for_misskey, ActivityPub::ActivityForMisskeySerializer, signer: @account))
+  end
+
+  def payload_for_friend
+    @payload_for_friend ||= Oj.dump(serialize_payload(activity_for_friend, ActivityPub::ActivityForFriendSerializer, signer: @account, always_sign_unsafe: always_sign))
   end
 
   def activity
     ActivityPub::ActivityPresenter.from_status(@status)
   end
 
+  def activity_for_misskey
+    ActivityPub::ActivityPresenter.from_status(@status, for_misskey: true)
+  end
+
+  def activity_for_friend
+    ActivityPub::ActivityPresenter.from_status(@status, for_friend: true)
+  end
+
+  def always_sign
+    false
+  end
+
   def options
     { 'synchronize_followers' => @status.private_visibility? }
   end
diff --git a/app/workers/activitypub/emoji_reaction_distribution_worker.rb b/app/workers/activitypub/emoji_reaction_distribution_worker.rb
new file mode 100644
index 0000000000..06b1c73960
--- /dev/null
+++ b/app/workers/activitypub/emoji_reaction_distribution_worker.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class ActivityPub::EmojiReactionDistributionWorker < ActivityPub::RawDistributionWorker
+  # Distribute an emoji reaction to servers that might have a copy of ohagi
+  def perform(emoji_reaction_id, options = {})
+    @options = options.with_indifferent_access
+    @emoji_reaction = EmojiReaction.find(emoji_reaction_id)
+    @account = @emoji_reaction.account
+    @status = @emoji_reaction.status
+
+    distribute!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  protected
+
+  def payload
+    @payload ||= Oj.dump(serialize_payload(@emoji_reaction, ActivityPub::EmojiReactionSerializer, signer: @account))
+  end
+
+  def inboxes
+    @inboxes ||= (@account.followers.inboxes + [@status.account.preferred_inbox_url].compact_blank + relay_inboxes + friend_inboxes).uniq
+  end
+
+  def relay_inboxes
+    if @status.public_visibility?
+      Relay.enabled.pluck(:inbox_url)
+    else
+      []
+    end
+  end
+
+  def friend_inboxes
+    if @status.distributable_friend?
+      DeliveryFailureTracker.without_unavailable(FriendDomain.distributables.where(delivery_local: true).where.not(domain: AccountDomainBlock.where(account: @status.account).select(:domain)).pluck(:inbox_url))
+    else
+      []
+    end
+  end
+end
diff --git a/app/workers/activitypub/fetch_instance_info_worker.rb b/app/workers/activitypub/fetch_instance_info_worker.rb
new file mode 100644
index 0000000000..fb71106e25
--- /dev/null
+++ b/app/workers/activitypub/fetch_instance_info_worker.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+class ActivityPub::FetchInstanceInfoWorker
+  include Sidekiq::Worker
+  include JsonLdHelper
+  include Redisable
+  include Lockable
+
+  sidekiq_options queue: 'pull', retry: 2
+
+  SUPPORTED_NOTEINFO_RELS = ['http://nodeinfo.diaspora.software/ns/schema/2.0', 'http://nodeinfo.diaspora.software/ns/schema/2.1'].freeze
+
+  def perform(domain)
+    @instance = Instance.find_by(domain: domain)
+    return if !@instance || @instance.unavailable_domain.present?
+
+    Rails.cache.fetch("fetch_instance_info:#{@instance.domain}", expires_in: 1.day, race_condition_ttl: 1.hour) do
+      fetch!
+    end
+
+    true
+  end
+
+  private
+
+  def fetch!
+    link = nodeinfo_link
+    return if link.nil?
+
+    update_info!(link)
+
+    true
+  rescue
+    true
+  end
+
+  def nodeinfo_link
+    nodeinfo = fetch_json("https://#{@instance.domain}/.well-known/nodeinfo")
+    return nil if nodeinfo.nil? || !nodeinfo.key?('links')
+
+    nodeinfo_links = nodeinfo['links']
+    return nil if !nodeinfo_links.is_a?(Array) || nodeinfo_links.blank?
+
+    nodeinfo_link = nodeinfo_links.find { |item| item.key?('rel') && item.key?('href') && SUPPORTED_NOTEINFO_RELS.include?(item['rel']) }
+    return nil if nodeinfo_link.nil? || nodeinfo_link['href'].nil? || !nodeinfo_link['href'].start_with?('http')
+
+    nodeinfo_link['href']
+  end
+
+  def update_info!(url)
+    content = fetch_json(url)
+    return nil if content.nil? || !content.key?('software') || !content['software'].key?('name')
+
+    software = content['software']['name']
+    version = content['software'].key?('version') ? content['software']['version'] : ''
+
+    exists = @instance.instance_info
+    if exists.nil?
+      InstanceInfo.create!(domain: @instance.domain, software: software, version: version, data: content)
+    else
+      exists.software = software
+      exists.version = version
+      exists.data = content
+      exists.save!
+    end
+  end
+
+  def fetch_json(url)
+    build_request(url).perform do |response|
+      raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
+
+      body_to_json(response.body_with_limit)
+    end
+  end
+
+  def build_request(url)
+    Request.new(:get, url).add_headers('Accept' => 'application/jrd+json, application/json')
+  end
+end
diff --git a/app/workers/activitypub/fetch_remote_status_worker.rb b/app/workers/activitypub/fetch_remote_status_worker.rb
new file mode 100644
index 0000000000..158ce63f2c
--- /dev/null
+++ b/app/workers/activitypub/fetch_remote_status_worker.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ActivityPub::FetchRemoteStatusWorker
+  include Sidekiq::Worker
+  include Redisable
+
+  sidekiq_options queue: 'pull', retry: 3
+
+  def perform(uri, author_account_id, on_behalf_of_account_id)
+    author       = Account.find(author_account_id)
+    on_behalf_of = on_behalf_of_account_id.present? ? Account.find(on_behalf_of_account_id) : nil
+
+    ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: on_behalf_of, expected_actor_uri: ActivityPub::TagManager.instance.uri_for(author), request_id: uri)
+  rescue ActiveRecord::RecordNotFound, Mastodon::RaceConditionError
+    true
+  end
+end
diff --git a/app/workers/activitypub/forward_conversation_worker.rb b/app/workers/activitypub/forward_conversation_worker.rb
new file mode 100644
index 0000000000..8e0bd59767
--- /dev/null
+++ b/app/workers/activitypub/forward_conversation_worker.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class ActivityPub::ForwardConversationWorker
+  include Sidekiq::Worker
+
+  def perform(payload, status_id, shared_inbox)
+    @status  = Status.find(status_id)
+    @payload = payload
+    @shared_inbox = shared_inbox
+
+    return unless @status.conversation.present? && @status.conversation.local? && @status.conversation.ancestor_status.present?
+    return unless @status.limited_visibility?
+
+    @account = @status.conversation.ancestor_status.account
+
+    distribute_limited_mentions!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  protected
+
+  def distribute_limited_mentions!
+    ActivityPub::DeliveryWorker.push_bulk(inboxes_for_limited, limit: 1_000) do |inbox_url|
+      [payload, @account.id, inbox_url, options]
+    end
+  end
+
+  def inboxes_for_limited
+    if @shared_inbox
+      inbox_accounts.inboxes
+    else
+      DeliveryFailureTracker.without_unavailable(inbox_accounts.pluck(:inbox_url).compact_blank.uniq)
+    end
+  end
+
+  def inbox_accounts
+    Account.remote.merge(@status.mentioned_accounts)
+  end
+
+  def options
+    { 'synchronize_followers' => @status.private_visibility? }
+  end
+
+  attr_reader :payload
+end
diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb
index c77821e0f1..a1fc778559 100644
--- a/app/workers/activitypub/raw_distribution_worker.rb
+++ b/app/workers/activitypub/raw_distribution_worker.rb
@@ -23,6 +23,18 @@ class ActivityPub::RawDistributionWorker
   protected
 
   def distribute!
+    unless inboxes_for_misskey.empty?
+      ActivityPub::DeliveryWorker.push_bulk(inboxes_for_misskey, limit: 1_000) do |inbox_url|
+        [payload_for_misskey, source_account_id, inbox_url, options]
+      end
+    end
+
+    unless inboxes_for_friend.empty?
+      ActivityPub::DeliveryWorker.push_bulk(inboxes_for_friend, limit: 1_000) do |inbox_url|
+        [payload_for_friend, source_account_id, inbox_url, options]
+      end
+    end
+
     return if inboxes.empty?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
@@ -34,6 +46,14 @@ class ActivityPub::RawDistributionWorker
     @json
   end
 
+  def payload_for_misskey
+    payload
+  end
+
+  def payload_for_friend
+    payload
+  end
+
   def source_account_id
     @account.id
   end
@@ -42,6 +62,14 @@ class ActivityPub::RawDistributionWorker
     @inboxes ||= @account.followers.inboxes - @exclude_inboxes
   end
 
+  def inboxes_for_misskey
+    []
+  end
+
+  def inboxes_for_friend
+    []
+  end
+
   def options
     {}
   end
diff --git a/app/workers/activitypub/status_update_distribution_worker.rb b/app/workers/activitypub/status_update_distribution_worker.rb
index a79ede2bf6..df415ab23a 100644
--- a/app/workers/activitypub/status_update_distribution_worker.rb
+++ b/app/workers/activitypub/status_update_distribution_worker.rb
@@ -8,22 +8,81 @@ class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWor
     @status  = Status.find(status_id)
     @account = @status.account
 
-    distribute!
+    if @status.limited_visibility?
+      distribute_limited!
+    else
+      distribute!
+      distribute_delete_activity!
+    end
   rescue ActiveRecord::RecordNotFound
     true
   end
 
   protected
 
-  def activity
+  def inboxes
+    return super if @status.limited_visibility?
+    return super unless sensitive?
+
+    super - inboxes_diff_for_sending_domain_block
+  end
+
+  def inboxes_diff_for_sending_domain_block
+    status_reach_finder.inboxes_diff_for_sending_domain_block
+  end
+
+  def inboxes_for_limited
+    @inboxes_for_limited ||= @status.mentioned_accounts.inboxes
+  end
+
+  def build_activity(for_misskey: false, for_friend: false)
     ActivityPub::ActivityPresenter.new(
       id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
       type: 'Update',
       actor: ActivityPub::TagManager.instance.uri_for(@status.account),
       published: @status.edited_at,
-      to: ActivityPub::TagManager.instance.to(@status),
-      cc: ActivityPub::TagManager.instance.cc(@status),
+      to: for_friend ? ActivityPub::TagManager.instance.to_for_friend(@status) : ActivityPub::TagManager.instance.to(@status),
+      cc: for_misskey ? ActivityPub::TagManager.instance.cc_for_misskey(@status) : ActivityPub::TagManager.instance.cc(@status),
       virtual_object: @status
     )
   end
+
+  def activity
+    build_activity
+  end
+
+  def activity_for_misskey
+    build_activity(for_misskey: true)
+  end
+
+  def activity_for_friend
+    build_activity(for_friend: true)
+  end
+
+  def delete_activity
+    @delete_activity ||= Oj.dump(serialize_payload(@status, ActivityPub::DeleteSerializer, signer: @account))
+  end
+
+  def distribute_delete_activity!
+    return unless sensitive_changed?
+
+    target_inboxes = inboxes_diff_for_sending_domain_block
+    return if target_inboxes.empty?
+
+    ActivityPub::DeliveryWorker.push_bulk(target_inboxes, limit: 1_000) do |inbox_url|
+      [delete_activity, @account.id, inbox_url, {}]
+    end
+  end
+
+  def always_sign
+    @status.limited_visibility?
+  end
+
+  def sensitive?
+    @options[:sensitive]
+  end
+
+  def sensitive_changed?
+    @options[:sensitive_changed]
+  end
 end
diff --git a/app/workers/delivery_emoji_reaction_worker.rb b/app/workers/delivery_emoji_reaction_worker.rb
new file mode 100644
index 0000000000..6720d4623c
--- /dev/null
+++ b/app/workers/delivery_emoji_reaction_worker.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class DeliveryEmojiReactionWorker
+  include Sidekiq::Worker
+  include Redisable
+  include Lockable
+  include AccountScope
+
+  sidekiq_options queue: 'perishable'
+
+  def perform(payload_json, status_id, reacted_account_id)
+    return unless Setting.enable_emoji_reaction
+
+    status = Status.find(status_id)
+    reacted_account = Account.find(reacted_account_id)
+
+    if status.present?
+      scope = scope_status(status)
+
+      policy = status.account.emoji_reaction_policy
+      return if policy == :block
+
+      scope.select(:id).merge(policy_scope(status.account, policy)).includes(:user).find_each do |account|
+        next if account.user.present? && (account.user.setting_stop_emoji_reaction_streaming || !account.user.setting_enable_emoji_reaction)
+        next unless redis.exists?("subscribed:timeline:#{account.id}")
+        next if !reacted_account.local? && account.excluded_from_timeline_domains.include?(reacted_account.domain)
+
+        redis.publish("timeline:#{account.id}", payload_json)
+      end
+    end
+
+    true
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  def policy_scope(account, policy)
+    case policy
+    when :block
+      Account.where(id: 0)
+    when :mutuals_only
+      account.mutuals.local.or(Account.where(id: account))
+    when :following_only
+      account.following.local.or(Account.where(id: account))
+    when :followers_only
+      account.followers.local.or(Account.where(id: account))
+    when :outside_only
+      account.followers.local.or(Account.where(id: account.following.local)).or(Account.where(id: account))
+    else
+      Account.local
+    end
+  end
+end
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb
index fd7dbd30da..e6daee1617 100644
--- a/app/workers/feed_insert_worker.rb
+++ b/app/workers/feed_insert_worker.rb
@@ -9,6 +9,8 @@ class FeedInsertWorker
       @type      = type.to_sym
       @status    = Status.find(status_id)
       @options   = options.symbolize_keys
+      @antenna   = Antenna.find(@options[:antenna_id]) if @options[:antenna_id].present?
+      @pushed    = false
 
       case @type
       when :home, :tags
@@ -16,12 +18,17 @@ class FeedInsertWorker
       when :list
         @list     = List.find(id)
         @follower = @list.account
+      when :antenna
+        @antenna  = Antenna.find(id)
+        @follower = @antenna.account
       end
     end
 
     with_read_replica do
       check_and_insert
     end
+
+    perform_notify_for_list if !feed_filtered? && notify_for_list?
   rescue ActiveRecord::RecordNotFound
     true
   end
@@ -39,12 +46,12 @@ class FeedInsertWorker
 
   def feed_filtered?
     case @type
-    when :home
+    when :home, :antenna
       FeedManager.instance.filter?(:home, @status, @follower)
     when :tags
       FeedManager.instance.filter?(:tags, @status, @follower)
     when :list
-      FeedManager.instance.filter?(:list, @status, @list)
+      FeedManager.instance.filter?(:list, @status, @list, stl_home: stl_home?)
     end
   end
 
@@ -54,13 +61,25 @@ class FeedInsertWorker
     Follow.find_by(account: @follower, target_account: @status.account)&.notify?
   end
 
+  def notify_for_list?
+    return false if @type != :list || update? || !@pushed
+
+    @list.notify?
+  end
+
   def perform_push
-    case @type
-    when :home, :tags
-      FeedManager.instance.push_to_home(@follower, @status, update: update?)
-    when :list
-      FeedManager.instance.push_to_list(@list, @status, update: update?)
+    if @antenna.nil? || @antenna.insert_feeds
+      case @type
+      when :home, :tags
+        @pushed = FeedManager.instance.push_to_home(@follower, @status, update: update?)
+      when :list
+        @pushed = FeedManager.instance.push_to_list(@list, @status, update: update?)
+      end
     end
+
+    return if @antenna.nil?
+
+    FeedManager.instance.push_to_antenna(@antenna, @status, update: update?)
   end
 
   def perform_unpush
@@ -70,13 +89,26 @@ class FeedInsertWorker
     when :list
       FeedManager.instance.unpush_from_list(@list, @status, update: true)
     end
+
+    return if @antenna.nil?
+
+    FeedManager.instance.unpush_from_antenna(@antenna, @status, update: true)
   end
 
   def perform_notify
     LocalNotificationWorker.perform_async(@follower.id, @status.id, 'Status', 'status')
   end
 
+  def perform_notify_for_list
+    list_status = ListStatus.create!(list: @list, status: @status)
+    LocalNotificationWorker.perform_async(@list.account_id, list_status.id, 'ListStatus', 'list_status')
+  end
+
   def update?
     @options[:update]
   end
+
+  def stl_home?
+    @options[:stl_home]
+  end
 end
diff --git a/app/workers/generate_annual_report_worker.rb b/app/workers/generate_annual_report_worker.rb
new file mode 100644
index 0000000000..7094c1ab9c
--- /dev/null
+++ b/app/workers/generate_annual_report_worker.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class GenerateAnnualReportWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, year)
+    AnnualReport.new(Account.find(account_id), year).generate
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordNotUnique
+    true
+  end
+end
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index a411ab5876..2298b095a7 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -11,7 +11,7 @@ class Import::RelationshipWorker
   def perform(account_id, target_account_uri, relationship, options)
     from_account   = Account.find(account_id)
     target_domain  = domain(target_account_uri)
-    target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
+    target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_account_uri, { check_delivery_availability: true }) }
     options.symbolize_keys!
 
     return if target_account.nil?
@@ -43,16 +43,15 @@ class Import::RelationshipWorker
     TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
   end
 
-  def stoplight_wrap_request(domain, &block)
+  def stoplight_wrapper(domain)
     if domain.present?
-      Stoplight("source:#{domain}", &block)
+      Stoplight("source:#{domain}")
         .with_fallback { nil }
         .with_threshold(1)
         .with_cool_off_time(5.minutes.seconds)
         .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
-        .run
     else
-      yield
+      Stoplight('domain-blank')
     end
   end
 end
diff --git a/app/workers/link_crawl_worker.rb b/app/workers/link_crawl_worker.rb
index b3d8aa2646..c63af1e43a 100644
--- a/app/workers/link_crawl_worker.rb
+++ b/app/workers/link_crawl_worker.rb
@@ -7,7 +7,7 @@ class LinkCrawlWorker
 
   def perform(status_id)
     FetchLinkCardService.new.call(Status.find(status_id))
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordNotUnique
     true
   end
 end
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index 73ae268bee..a18f38556b 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -123,7 +123,7 @@ class MoveWorker
   end
 
   def add_account_note_if_needed!(account, id)
-    unless AccountNote.where(account: account, target_account: @target_account).exists?
+    unless AccountNote.exists?(account: account, target_account: @target_account)
       text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
         I18n.t(id, acct: @source_account.acct)
       end
diff --git a/app/workers/process_references_worker.rb b/app/workers/process_references_worker.rb
new file mode 100644
index 0000000000..26dfbae465
--- /dev/null
+++ b/app/workers/process_references_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ProcessReferencesWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', retry: 3
+
+  def perform(status_id, ids, urls, no_fetch_urls = nil, quote_urls = nil)
+    ProcessReferencesService.new.call(Status.find(status_id), ids || [], urls: urls || [], no_fetch_urls: no_fetch_urls, quote_urls: quote_urls || [])
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/redownload_avatar_worker.rb b/app/workers/redownload_avatar_worker.rb
index df17b7718d..428dd4aea0 100644
--- a/app/workers/redownload_avatar_worker.rb
+++ b/app/workers/redownload_avatar_worker.rb
@@ -10,7 +10,7 @@ class RedownloadAvatarWorker
   def perform(id)
     account = Account.find(id)
 
-    return if account.suspended? || DomainBlock.rule_for(account.domain)&.reject_media?
+    return if (account.suspended? && !account.remote_pending) || DomainBlock.rule_for(account.domain)&.reject_media?
     return if account.avatar_remote_url.blank? || account.avatar_file_name.present?
 
     account.reset_avatar!
diff --git a/app/workers/redownload_header_worker.rb b/app/workers/redownload_header_worker.rb
index 3b142ec5f9..a2920e479b 100644
--- a/app/workers/redownload_header_worker.rb
+++ b/app/workers/redownload_header_worker.rb
@@ -10,7 +10,7 @@ class RedownloadHeaderWorker
   def perform(id)
     account = Account.find(id)
 
-    return if account.suspended? || DomainBlock.rule_for(account.domain)&.reject_media?
+    return if (account.suspended? && !account.remote_pending) || DomainBlock.rule_for(account.domain)&.reject_media?
     return if account.header_remote_url.blank? || account.header_file_name.present?
 
     account.reset_header!
diff --git a/app/workers/remove_expired_status_worker.rb b/app/workers/remove_expired_status_worker.rb
new file mode 100644
index 0000000000..b86a4b65e2
--- /dev/null
+++ b/app/workers/remove_expired_status_worker.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class RemoveExpiredStatusWorker
+  include Sidekiq::Worker
+
+  sidekiq_options lock: :until_executed
+
+  def perform(scheduled_expiration_status_id)
+    scheduled_expiration_status = ScheduledExpirationStatus.find(scheduled_expiration_status_id)
+    scheduled_expiration_status.destroy!
+
+    RemoveStatusService.new.call(scheduled_expiration_status.status)
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
+    true
+  end
+end
diff --git a/app/workers/scheduler/auto_close_registrations_scheduler.rb b/app/workers/scheduler/auto_close_registrations_scheduler.rb
new file mode 100644
index 0000000000..6874502915
--- /dev/null
+++ b/app/workers/scheduler/auto_close_registrations_scheduler.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Scheduler::AutoCloseRegistrationsScheduler
+  include Sidekiq::Worker
+  include Redisable
+
+  sidekiq_options retry: 0
+
+  # Automatically switch away from open registrations if no
+  # moderator had any activity in that period of time
+  OPEN_REGISTRATIONS_MODERATOR_THRESHOLD = 1.week + UserTrackingConcern::SIGN_IN_UPDATE_FREQUENCY
+
+  def perform
+    return if Rails.configuration.x.email_domains_whitelist.present? || ENV['DISABLE_AUTOMATIC_SWITCHING_TO_APPROVED_REGISTRATIONS'] == 'true'
+    return unless Setting.registrations_mode == 'open'
+
+    switch_to_approval_mode! unless active_moderators?
+  end
+
+  private
+
+  def active_moderators?
+    User.those_who_can(:manage_reports).exists?(current_sign_in_at: OPEN_REGISTRATIONS_MODERATOR_THRESHOLD.ago...)
+  end
+
+  def switch_to_approval_mode!
+    Setting.registrations_mode = 'approved'
+
+    User.those_who_can(:manage_settings).includes(:account).find_each do |user|
+      AdminMailer.with(recipient: user.account).auto_close_registrations.deliver_later
+    end
+  end
+end
diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb
index 5c985e25a0..f52d0141d4 100644
--- a/app/workers/scheduler/indexing_scheduler.rb
+++ b/app/workers/scheduler/indexing_scheduler.rb
@@ -24,6 +24,8 @@ class Scheduler::IndexingScheduler
     end
   end
 
+  private
+
   def indexes
     [AccountsIndex, TagsIndex, PublicStatusesIndex, StatusesIndex]
   end
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
index fe60d5524e..bdc07d1ffb 100644
--- a/app/workers/scheduler/scheduled_statuses_scheduler.rb
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -7,6 +7,7 @@ class Scheduler::ScheduledStatusesScheduler
 
   def perform
     publish_scheduled_statuses!
+    unpublish_expired_statuses!
     publish_scheduled_announcements!
     unpublish_expired_announcements!
   end
@@ -19,10 +20,20 @@ class Scheduler::ScheduledStatusesScheduler
     end
   end
 
+  def unpublish_expired_statuses!
+    expired_statuses.find_each do |expired_status|
+      RemoveExpiredStatusWorker.perform_at(expired_status.scheduled_at, expired_status.id)
+    end
+  end
+
   def due_statuses
     ScheduledStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
   end
 
+  def expired_statuses
+    ScheduledExpirationStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
+  end
+
   def publish_scheduled_announcements!
     due_announcements.find_each do |announcement|
       PublishScheduledAnnouncementWorker.perform_at(announcement.scheduled_at, announcement.id)
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 2d2efc731a..63ea876e50 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,6 +3,9 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
+  UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS = 7
+  DISCARDED_STATUSES_MAX_AGE_DAYS = 30
+
   sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
@@ -13,7 +16,7 @@ class Scheduler::UserCleanupScheduler
   private
 
   def clean_unconfirmed_accounts!
-    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
+    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', UNCONFIRMED_ACCOUNTS_MAX_AGE_DAYS.days.ago).reorder(nil).find_in_batches do |batch|
       # We have to do it separately because of missing database constraints
       AccountModerationNote.where(target_account_id: batch.map(&:account_id)).delete_all
       Account.where(id: batch.map(&:account_id)).delete_all
@@ -22,7 +25,7 @@ class Scheduler::UserCleanupScheduler
   end
 
   def clean_discarded_statuses!
-    Status.unscoped.discarded.where('deleted_at <= ?', 30.days.ago).find_in_batches do |statuses|
+    Status.unscoped.discarded.where('deleted_at <= ?', DISCARDED_STATUSES_MAX_AGE_DAYS.days.ago).find_in_batches do |statuses|
       RemovalWorker.push_bulk(statuses) do |status|
         [status.id, { 'immediate' => true, 'skip_streaming' => true }]
       end
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
index 1c9a2aabe3..5c6e74e3d4 100644
--- a/app/workers/scheduler/vacuum_scheduler.rb
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -25,6 +25,8 @@ class Scheduler::VacuumScheduler
       applications_vacuum,
       feeds_vacuum,
       imports_vacuum,
+      list_statuses_vacuum,
+      ng_histories_vacuum,
     ]
   end
 
@@ -32,6 +34,10 @@ class Scheduler::VacuumScheduler
     Vacuum::StatusesVacuum.new(content_retention_policy.content_cache_retention_period)
   end
 
+  def list_statuses_vacuum
+    Vacuum::ListStatusesVacuum.new
+  end
+
   def media_attachments_vacuum
     Vacuum::MediaAttachmentsVacuum.new(content_retention_policy.media_cache_retention_period)
   end
@@ -60,6 +66,10 @@ class Scheduler::VacuumScheduler
     Vacuum::ApplicationsVacuum.new
   end
 
+  def ng_histories_vacuum
+    Vacuum::NgHistoriesVacuum.new
+  end
+
   def content_retention_policy
     ContentRetentionPolicy.current
   end
diff --git a/app/workers/searchability_update_worker.rb b/app/workers/searchability_update_worker.rb
new file mode 100644
index 0000000000..ce288f813a
--- /dev/null
+++ b/app/workers/searchability_update_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SearchabilityUpdateWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', lock: :until_executed
+
+  def perform(account_id)
+    SearchabilityUpdateService.new.call(Account.find(account_id))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/unfilter_notifications_worker.rb b/app/workers/unfilter_notifications_worker.rb
new file mode 100644
index 0000000000..223654aa16
--- /dev/null
+++ b/app/workers/unfilter_notifications_worker.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class UnfilterNotificationsWorker
+  include Sidekiq::Worker
+
+  def perform(notification_request_id)
+    @notification_request = NotificationRequest.find(notification_request_id)
+
+    push_to_conversations!
+    unfilter_notifications!
+    remove_request!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  private
+
+  def push_to_conversations!
+    notifications_with_private_mentions.find_each { |notification| AccountConversation.add_status(@notification_request.account, notification.target_status) }
+  end
+
+  def unfilter_notifications!
+    filtered_notifications.in_batches.update_all(filtered: false)
+  end
+
+  def remove_request!
+    @notification_request.destroy!
+  end
+
+  def filtered_notifications
+    Notification.where(account: @notification_request.account, from_account: @notification_request.from_account, filtered: true)
+  end
+
+  def notifications_with_private_mentions
+    filtered_notifications.joins(mention: :status).merge(Status.where(visibility: :direct)).includes(mention: :status)
+  end
+end
diff --git a/bin/bundle b/bin/bundle
index f19acf5b5c..50da5fdf9e 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,109 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 0000000000..0911bae558
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+
+# Default to port 3000 if not specified
+export PORT="${PORT:-3000}"
+
+# Get around our boot.rb ENV check
+export RAILS_ENV="${RAILS_ENV:-development}"
+
+if command -v overmind 1> /dev/null 2>&1
+then
+  overmind start -f Procfile.dev "$@"
+  exit $?
+fi
+
+if gem list --no-installed --exact --silent foreman; then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev "$@"
diff --git a/bin/tootctl b/bin/tootctl
index b3311c6b2a..ff64eb2e42 100755
--- a/bin/tootctl
+++ b/bin/tootctl
@@ -6,8 +6,13 @@ require_relative '../lib/mastodon/cli/main'
 
 begin
   Chewy.strategy(:mastodon) do
-    Mastodon::CLI::Main.start(ARGV)
+    Mastodon::CLI::Main.start(ARGV, debug: true) # Enables the script to rescue `Thor::Error`
   end
+rescue Thor::Error => e
+  Thor::Shell::Color
+    .new
+    .say_error(e.message, :red)
+  exit(1)
 rescue Interrupt
   exit(130)
 end
diff --git a/config/application.rb b/config/application.rb
index bab1b46cb0..07b50ca036 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -40,6 +40,7 @@ require_relative '../lib/mastodon/rack_middleware'
 require_relative '../lib/public_file_server_middleware'
 require_relative '../lib/devise/strategies/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/strategies/two_factor_pam_authenticatable'
+require_relative '../lib/elasticsearch/client_extensions'
 require_relative '../lib/chewy/settings_extensions'
 require_relative '../lib/chewy/index_extensions'
 require_relative '../lib/chewy/strategy/mastodon'
@@ -50,14 +51,9 @@ require_relative '../lib/rails/engine_extensions'
 require_relative '../lib/active_record/database_tasks_extensions'
 require_relative '../lib/active_record/batches'
 require_relative '../lib/simple_navigation/item_extensions'
-require_relative '../lib/http_extensions'
-
-Dotenv::Railtie.load
 
 Bundler.require(:pam_authentication) if ENV['PAM_ENABLED'] == 'true'
 
-require_relative '../lib/mastodon/redis_config'
-
 module Mastodon
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
@@ -99,6 +95,10 @@ module Mastodon
       app.deprecators[:mastodon] = ActiveSupport::Deprecation.new('4.3', 'mastodon/mastodon')
     end
 
+    config.before_configuration do
+      require 'mastodon/redis_config'
+    end
+
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'
diff --git a/config/boot.rb b/config/boot.rb
index 717de85f20..70ffe22c04 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
 unless ENV.key?('RAILS_ENV')
-  warn 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
-  exit 1
+  abort <<~ERROR
+    The RAILS_ENV environment variable is not set.
+
+    Please set it correctly depending on context:
+
+      - Use "production" for a live deployment of the application
+      - Use "development" for local feature work
+      - Use "test" when running the automated spec suite
+  ERROR
 end
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
diff --git a/config/deploy.rb b/config/deploy.rb
deleted file mode 100644
index 75bfcc26f4..0000000000
--- a/config/deploy.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-lock '3.17.2'
-
-set :repo_url, ENV.fetch('REPO', 'https://github.com/mastodon/mastodon.git')
-set :branch, ENV.fetch('BRANCH', 'main')
-
-set :application, 'mastodon'
-set :rbenv_type, :user
-set :rbenv_ruby, File.read('.ruby-version').strip
-set :migration_role, :app
-
-append :linked_files, '.env.production', 'public/robots.txt'
-append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
-
-SYSTEMD_SERVICES = %i[sidekiq streaming web].freeze
-SERVICE_ACTIONS = %i[reload restart status].freeze
-
-namespace :systemd do
-  SYSTEMD_SERVICES.each do |service|
-    SERVICE_ACTIONS.each do |action|
-      desc "Perform a #{action} on #{service} service"
-      task :"#{service}:#{action}" do
-        on roles(:app) do
-          # runs e.g. "sudo restart mastodon-sidekiq.service"
-          sudo :systemctl, action, "#{fetch(:application)}-#{service}.service"
-        end
-      end
-    end
-  end
-end
-
-after 'deploy:publishing', 'systemd:web:reload'
-after 'deploy:publishing', 'systemd:sidekiq:restart'
-after 'deploy:publishing', 'systemd:streaming:restart'
diff --git a/config/elasticsearch.default-ja-sudachi.yml b/config/elasticsearch.default-ja-sudachi.yml
new file mode 100644
index 0000000000..ad3dc287c7
--- /dev/null
+++ b/config/elasticsearch.default-ja-sudachi.yml
@@ -0,0 +1,234 @@
+# This is a configuration file for environments that use Japanese and Sudachi plug-ins.
+# To use this file, copy it to the Mastodon root directory and rename the file to ".elasticsearch.yml".
+
+version: 1
+
+accounts:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+    my_posfilter:
+      type: sudachi_part_of_speech
+      stoptags:
+        - 助詞
+        - 助動詞
+        - 補助記号,句点
+        - 補助記号,読点
+
+  analyzer:
+    natural:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - elision
+        - english_possessive_stemmer
+        - english_stop
+        - english_stemmer
+    sudachi_analyzer:
+      type: custom
+      tokenizer: sudachi_tokenizer
+      filter:
+        - my_posfilter
+        - sudachi_normalizedform
+    verbatim:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+    edge_ngram:
+      tokenizer: edge_ngram
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+  tokenizer:
+    edge_ngram:
+      type: edge_ngram
+      min_gram: 1
+      max_gram: 15
+    sudachi_tokenizer:
+      resources_path: '/etc/elasticsearch/sudachi'
+      split_mode: A
+      type: sudachi_tokenizer
+      discard_punctuation: 'true'
+
+public_statuses:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+    my_posfilter:
+      type: sudachi_part_of_speech
+      stoptags:
+        - 助詞
+        - 助動詞
+        - 補助記号,句点
+        - 補助記号,読点
+
+  analyzer:
+    content:
+      tokenizer: uax_url_email
+      filter:
+        - english_possessive_stemmer
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - english_stop
+        - english_stemmer
+    hashtag:
+      tokenizer: keyword
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+    sudachi_analyzer:
+      tokenizer: sudachi_tokenizer
+      type: custom
+      filter:
+        - english_possessive_stemmer
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - english_stop
+        - english_stemmer
+        - my_posfilter
+        - sudachi_normalizedform
+
+  tokenizer:
+    sudachi_tokenizer:
+      resources_path: '/etc/elasticsearch/sudachi'
+      split_mode: A
+      type: sudachi_tokenizer
+      discard_punctuation: 'true'
+
+statuses:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+    my_posfilter:
+      type: sudachi_part_of_speech
+      stoptags:
+        - 助詞
+        - 助動詞
+        - 補助記号,句点
+        - 補助記号,読点
+
+  analyzer:
+    verbatim:
+      tokenizer: uax_url_email
+      filter:
+        - lowercase
+    content:
+      tokenizer: uax_url_email
+      filter:
+        - english_possessive_stemmer
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - english_stop
+        - english_stemmer
+    hashtag:
+      tokenizer: keyword
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+    sudachi_analyzer:
+      tokenizer: sudachi_tokenizer
+      type: custom
+      filter:
+        - english_possessive_stemmer
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - english_stop
+        - english_stemmer
+        - my_posfilter
+        - sudachi_normalizedform
+
+tags:
+  analyzer:
+    content:
+      tokenizer: keyword
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+    edge_ngram:
+      tokenizer: edge_ngram
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+  tokenizer:
+    edge_ngram:
+      type: edge_ngram
+      min_gram: 2
+      max_gram: 15
+
+accounts_analyzers:
+  display_name:
+    analyzer: verbatim
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: verbatim
+  username:
+    analyzer: verbatim
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: verbatim
+  text:
+    analyzer: sudachi_analyzer
+    stemmed:
+      analyzer: natural
+
+public_statuses_analyzers:
+  text:
+    analyzer: sudachi_analyzer
+    stemmed:
+      analyzer: content
+  tags:
+    analyzer: hashtag
+
+statuses_analyzers:
+  text:
+    analyzer: sudachi_analyzer
+    stemmed:
+      analyzer: content
+  tags:
+    analyzer: hashtag
+
+tags_analyzers:
+  name:
+    analyzer: content
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: content
diff --git a/config/elasticsearch.default.yml b/config/elasticsearch.default.yml
new file mode 100644
index 0000000000..149881ac50
--- /dev/null
+++ b/config/elasticsearch.default.yml
@@ -0,0 +1,177 @@
+# The standard ElasticSearch settings described in the original Mastodon code are stored.
+# This configuration file is overridden by creating a ".elasticsearch.yml" file in the Mastodon root directory.
+
+version: 1
+
+accounts:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+
+  analyzer:
+    natural:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - elision
+        - english_possessive_stemmer
+        - english_stop
+        - english_stemmer
+    verbatim:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+    edge_ngram:
+      tokenizer: edge_ngram
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+  tokenizer:
+    edge_ngram:
+      type: edge_ngram
+      min_gram: 1
+      max_gram: 15
+
+public_statuses:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+
+  analyzer:
+    verbatim:
+      tokenizer: uax_url_email
+      filter:
+        - lowercase
+    content:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - elision
+        - english_possessive_stemmer
+        - english_stop
+        - english_stemmer
+    hashtag:
+      tokenizer: keyword
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+statuses:
+  filter:
+    english_stop:
+      type: stop
+      stopwords: _english_
+    english_stemmer:
+      type: stemmer
+      language: english
+    english_possessive_stemmer:
+      type: stemmer
+      language: possessive_english
+
+  analyzer:
+    verbatim:
+      tokenizer: uax_url_email
+      filter:
+        - lowercase
+    content:
+      tokenizer: standard
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+        - elision
+        - english_possessive_stemmer
+        - english_stop
+        - english_stemmer
+    hashtag:
+      tokenizer: standard
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+tags:
+  analyzer:
+    content:
+      tokenizer: keyword
+      filter:
+        - word_delimiter_graph
+        - lowercase
+        - asciifolding
+        - cjk_width
+    edge_ngram:
+      tokenizer: edge_ngram
+      filter:
+        - lowercase
+        - asciifolding
+        - cjk_width
+
+  tokenizer:
+    edge_ngram:
+      type: edge_ngram
+      min_gram: 2
+      max_gram: 15
+
+accounts_analyzers:
+  display_name:
+    analyzer: verbatim
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: verbatim
+  username:
+    analyzer: verbatim
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: verbatim
+  text:
+    analyzer: verbatim
+    stemmed:
+      analyzer: natural
+
+public_statuses_analyzers:
+  text:
+    analyzer: verbatim
+    stemmed:
+      analyzer: content
+  tags:
+    analyzer: hashtag
+
+statuses_analyzers:
+  text:
+    analyzer: verbatim
+    stemmed:
+      analyzer: content
+  tags:
+    analyzer: hashtag
+
+tags_analyzers:
+  name:
+    analyzer: content
+    edge_ngram:
+      analyzer: edge_ngram
+      search_analyzer: content
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3c13ada380..a3254125c0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -85,10 +85,9 @@ Rails.application.configure do
   # If using a Heroku, Vagrant or generic remote development environment,
   # use letter_opener_web, accessible at  /letter_opener.
   # Otherwise, use letter_opener, which launches a browser window to view sent mail.
-  config.action_mailer.delivery_method = (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) ? :letter_opener_web : :letter_opener
+  config.action_mailer.delivery_method = ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV'] ? :letter_opener_web : :letter_opener
 
-  # We provide a default secret for the development environment here.
-  # This value should not be used in production environments!
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
 
   # Raise error when a before_action's only/except options reference missing actions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 11da32f18a..a39843e956 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/integer/time"
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -44,8 +44,8 @@ Rails.application.configure do
   config.force_ssl = true
   config.ssl_options = {
     redirect: {
-      exclude: ->(request) { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
-    }
+      exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') },
+    },
   }
 
   # Info include generic and useful information about system operation, but avoids logging too much
@@ -86,9 +86,7 @@ Rails.application.configure do
   config.lograge.enabled = true
 
   config.lograge.custom_payload do |controller|
-    if controller.respond_to?(:signed_request?) && controller.signed_request?
-      { key: controller.signature_key_id }
-    end
+    { key: controller.signature_key_id } if controller.respond_to?(:signed_request?) && controller.signed_request?
   end
 
   # Use a different logger for distributed setups.
@@ -157,6 +155,7 @@ Rails.application.configure do
     'Referrer-Policy' => 'same-origin',
   }
 
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = ENV.fetch('OTP_SECRET')
 
   # Enable DNS rebinding protection and other `Host` header attacks.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0b2f57fba7..49b0c1f303 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -44,6 +44,7 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # TODO: Remove once devise-two-factor data migration complete
   config.x.otp_secret = '100c7faeef00caa29242f6b04156742bf76065771fd4117990c4282b8748ff3d99f8fdae97c982ab5bd2e6756a159121377cce4421f4a8ecd2d67bd7749a3fb4'
 
   # Generate random VAPID keys
@@ -88,7 +89,7 @@ if ENV['PAM_ENABLED'] == 'true'
       usernames: Set['pam_user1', 'pam_user2'],
       servicenames: Set['pam_test', 'pam_test_controlled'],
       password: '123456',
-      env: { email: 'pam@example.com' }
+      env: { email: 'pam@example.com' },
     }
 end
 
diff --git a/config/imagemagick/policy.xml b/config/imagemagick/policy.xml
index e2aa202f27..2730a9f84e 100644
--- a/config/imagemagick/policy.xml
+++ b/config/imagemagick/policy.xml
@@ -23,5 +23,5 @@
   <!-- Disallow any coder by default, and only enable ones required by Mastodon -->
   <policy domain="coder" rights="none" pattern="*" />
   <policy domain="coder" rights="read | write" pattern="{JPEG,PNG,GIF,WEBP,HEIC,AVIF}" />
-  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO}" />
+  <policy domain="coder" rights="write" pattern="{HISTOGRAM,RGB,INFO,ICO}" />
 </policymap>
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
new file mode 100644
index 0000000000..7cda8c621c
--- /dev/null
+++ b/config/initializers/active_record_encryption.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+%w(
+  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+).each do |key|
+  ENV.fetch(key) do
+    abort <<~MESSAGE
+
+      Mastodon now requires that these variables are set:
+
+        - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+        - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+
+      Run `bin/rails db:encryption:init` to generate values and then assign the environment variables.
+    MESSAGE
+  end
+end
+
+Rails.application.configure do
+  config.active_record.encryption.deterministic_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY')
+  config.active_record.encryption.key_derivation_salt = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT')
+  config.active_record.encryption.primary_key = ENV.fetch('ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY')
+end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index f4556db399..6d56e43900 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 74f30e8875..d43cc1d2fe 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -7,4 +7,4 @@
 
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
 # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
-Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
+Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 076f383324..bc9845a87d 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../app/lib/chewy_config'
+
 enabled         = ENV['ES_ENABLED'] == 'true'
 host            = ENV.fetch('ES_HOST') { 'localhost' }
 port            = ENV.fetch('ES_PORT') { 9200 }
@@ -7,6 +9,9 @@ user            = ENV.fetch('ES_USER', nil).presence
 password        = ENV.fetch('ES_PASS', nil).presence
 fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
 prefix          = ENV.fetch('ES_PREFIX') { fallback_prefix }
+ca_file         = ENV.fetch('ES_CA_FILE', nil).presence
+
+transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
 
 Chewy.settings = {
   host: "#{host}:#{port}",
@@ -18,6 +23,7 @@ Chewy.settings = {
   index: {
     number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
   },
+  transport_options: transport_options,
 }
 
 # We use our own async strategy even outside the request-response
@@ -33,3 +39,6 @@ Chewy.use_after_commit_callbacks = false
 # Mastodon is run with hidden services enabled, because
 # Elasticsearch is *not* supposed to be accessed through a proxy
 Faraday.ignore_env_proxy = true
+
+# Check Elasticsearch config file version
+ChewyConfig.instance.accounts if enabled
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index a8b61e356f..e43e38786c 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -52,9 +52,9 @@ Rails.application.config.content_security_policy do |p|
 
   if Rails.env.development?
     webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
-    webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
+    front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
 
-    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
+    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
     p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
   else
     p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 2c6099623d..5c88c4cd5f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,15 +2,6 @@
 
 require 'devise/strategies/authenticatable'
 
-# TODO: Remove this patch when this PR or similar is merged into Devise:
-# https://github.com/heartcombo/devise/pull/5645
-# We rely on ENV vars and not secrets/credentials, so the deprecation is just noise.
-class Devise::SecretKeyFinder
-  def find
-    @application.secret_key_base
-  end
-end
-
 Warden::Manager.after_set_user except: :fetch do |user, warden|
   session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
   session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
@@ -47,42 +38,25 @@ Warden::Manager.before_logout do |_, warden|
 end
 
 module Devise
-  mattr_accessor :pam_authentication
-  @@pam_authentication = false
-  mattr_accessor :pam_controlled_service
-  @@pam_controlled_service = nil
+  mattr_accessor :pam_authentication, default: false
+  mattr_accessor :pam_controlled_service, default: nil
 
-  mattr_accessor :check_at_sign
-  @@check_at_sign = false
+  mattr_accessor :check_at_sign, default: false
 
-  mattr_accessor :ldap_authentication
-  @@ldap_authentication = false
-  mattr_accessor :ldap_host
-  @@ldap_host = nil
-  mattr_accessor :ldap_port
-  @@ldap_port = nil
-  mattr_accessor :ldap_method
-  @@ldap_method = nil
-  mattr_accessor :ldap_base
-  @@ldap_base = nil
-  mattr_accessor :ldap_uid
-  @@ldap_uid = nil
-  mattr_accessor :ldap_mail
-  @@ldap_mail = nil
-  mattr_accessor :ldap_bind_dn
-  @@ldap_bind_dn = nil
-  mattr_accessor :ldap_password
-  @@ldap_password = nil
-  mattr_accessor :ldap_tls_no_verify
-  @@ldap_tls_no_verify = false
-  mattr_accessor :ldap_search_filter
-  @@ldap_search_filter = nil
-  mattr_accessor :ldap_uid_conversion_enabled
-  @@ldap_uid_conversion_enabled = false
-  mattr_accessor :ldap_uid_conversion_search
-  @@ldap_uid_conversion_search = nil
-  mattr_accessor :ldap_uid_conversion_replace
-  @@ldap_uid_conversion_replace = nil
+  mattr_accessor :ldap_authentication, default: false
+  mattr_accessor :ldap_host, default: nil
+  mattr_accessor :ldap_port, default: nil
+  mattr_accessor :ldap_method, default: nil
+  mattr_accessor :ldap_base, default: nil
+  mattr_accessor :ldap_uid, default: nil
+  mattr_accessor :ldap_mail, default: nil
+  mattr_accessor :ldap_bind_dn, default: nil
+  mattr_accessor :ldap_password, default: nil
+  mattr_accessor :ldap_tls_no_verify, default: false
+  mattr_accessor :ldap_search_filter, default: nil
+  mattr_accessor :ldap_uid_conversion_enabled, default: false
+  mattr_accessor :ldap_uid_conversion_search, default: nil
+  mattr_accessor :ldap_uid_conversion_replace, default: nil
 
   module Strategies
     class PamAuthenticatable
@@ -105,9 +79,7 @@ module Devise
           return pass
         end
 
-        if validate(resource)
-          success!(resource)
-        end
+        success!(resource) if validate(resource)
       end
 
       private
@@ -133,9 +105,11 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
-  # by default. You can change it below and use your own secret key.
-  # config.secret_key = '2f86974c4dd7735170fd70fbf399f7a477ffd635ef240d07a22cf4bd7cd13dbae17c4383a2996d0c1e79a991ec18a91a17424c53e4771adb75a8b21904bd1403'
+  #
+  # Set explicitly to Rails default to avoid deprecation warnings.
+  # https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856
+  # Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
+  config.secret_key = Rails.application.secret_key_base
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index fe3871d2e7..97b2c4d282 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -21,9 +21,14 @@ Doorkeeper.configure do
     user unless user&.otp_required_for_login?
   end
 
-  # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
+  # Doorkeeper provides some administrative interfaces for managing OAuth
+  # Applications, allowing creation, edit, and deletion of applications from the
+  # server. At present, these administrative routes are not integrated into
+  # Mastodon, and as such, we've disabled them by always return a 403 forbidden
+  # response for them. This does not affect the ability for users to manage
+  # their own OAuth Applications.
   admin_authenticator do
-    current_user&.admin? || redirect_to(new_user_session_url)
+    head 403
   end
 
   # Authorization Code expiration time (default 10 minutes).
@@ -84,6 +89,7 @@ Doorkeeper.configure do
                   :'write:reports',
                   :'write:statuses',
                   :read,
+                  :'read:me',
                   :'read:accounts',
                   :'read:blocks',
                   :'read:bookmarks',
@@ -99,6 +105,7 @@ Doorkeeper.configure do
                   :push,
                   :'admin:read',
                   :'admin:read:accounts',
+                  :'admin:read:media_attachments',
                   :'admin:read:reports',
                   :'admin:read:domain_allows',
                   :'admin:read:domain_blocks',
@@ -107,6 +114,7 @@ Doorkeeper.configure do
                   :'admin:read:canonical_email_blocks',
                   :'admin:write',
                   :'admin:write:accounts',
+                  :'admin:write:media_attachments',
                   :'admin:write:reports',
                   :'admin:write:domain_allows',
                   :'admin:write:domain_blocks',
@@ -145,7 +153,7 @@ Doorkeeper.configure do
   #
   # You can use this option in order to forbid URI's with 'javascript' scheme
   # for example.
-  forbid_redirect_uri { |uri| %w[data vbscript javascript].include?(uri.scheme.to_s.downcase) }
+  forbid_redirect_uri { |uri| %w(data vbscript javascript).include?(uri.scheme.to_s.downcase) }
 
   # Specify what grant flows are enabled in array of Strings. The valid
   # strings and the flows they enable are:
diff --git a/config/initializers/enable_yjit.rb b/config/initializers/enable_yjit.rb
new file mode 100644
index 0000000000..7b1053ec11
--- /dev/null
+++ b/config/initializers/enable_yjit.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Automatically enable YJIT as of Ruby 3.3, as it brings very
+# sizeable performance improvements.
+
+# If you are deploying to a memory constrained environment
+# you may want to delete this file, but otherwise it's free
+# performance.
+if defined?(RubyVM::YJIT.enable)
+  Rails.application.config.after_initialize do
+    RubyVM::YJIT.enable
+  end
+end
diff --git a/config/initializers/ffmpeg.rb b/config/initializers/ffmpeg.rb
index 30ea617fcd..87f85eeec7 100644
--- a/config/initializers/ffmpeg.rb
+++ b/config/initializers/ffmpeg.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['FFMPEG_BINARY'].present?
-  FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
+Rails.application.configure do
+  config.x.ffmpeg_binary = ENV['FFMPEG_BINARY'] || 'ffmpeg'
+  config.x.ffprobe_binary = ENV['FFPROBE_BINARY'] || 'ffprobe'
 end
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index 7332ffb53b..93a8d33ff9 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -7,7 +7,7 @@ Rails.application.configure do
     proxy = URI.parse(ENV['http_proxy'])
 
     raise "Unsupported proxy type: #{proxy.scheme}" unless %w(http https).include? proxy.scheme
-    raise "No proxy host" unless proxy.host
+    raise 'No proxy host' unless proxy.host
 
     host = proxy.host
     host = host[1...-1] if host[0] == '[' # for IPv6 address
@@ -24,7 +24,7 @@ Rails.application.configure do
     proxy = URI.parse(ENV['http_hidden_proxy'])
 
     raise "Unsupported proxy type: #{proxy.scheme}" unless %w(http https).include? proxy.scheme
-    raise "No proxy host" unless proxy.host
+    raise 'No proxy host' unless proxy.host
 
     host = proxy.host
     host = host[1...-1] if host[0] == '[' # for IPv6 address
diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 1c1cea1b94..8643060fa6 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -42,6 +42,7 @@ Rails.application.configure do
     :hu,
     :hy,
     :id,
+    :ie,
     :ig,
     :io,
     :is,
diff --git a/config/initializers/open_redirects.rb b/config/initializers/open_redirects.rb
index c953a990c6..1c5a66e07d 100644
--- a/config/initializers/open_redirects.rb
+++ b/config/initializers/open_redirects.rb
@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-# TODO
-# Starting with Rails 7.0, the framework default here is to set this true.
-# However, we have a location in devise that redirects where we don't have an
-# easy ability to override the method or set a config option, and where the
-# redirect does not supply this option itself.
-# https://github.com/heartcombo/devise/blob/v4.9.2/app/controllers/devise/confirmations_controller.rb#L28
-# Once a solution is found, this line can be removed.
+# TODO: Starting with Rails 7.0, the framework default is true for this setting.
+# This location in devise redirects and we can't hook in or override:
+# https://github.com/heartcombo/devise/blob/v4.9.3/app/controllers/devise/confirmations_controller.rb#L28
+# When solution is found, this setting can go back to default.
 Rails.application.config.action_controller.raise_on_open_redirects = false
diff --git a/config/initializers/opentelemetry.rb b/config/initializers/opentelemetry.rb
new file mode 100644
index 0000000000..9af0ab89c8
--- /dev/null
+++ b/config/initializers/opentelemetry.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Set OTEL_* environment variables according to OTel docs:
+# https://opentelemetry.io/docs/concepts/sdk-configuration/
+
+if ENV.keys.any? { |name| name.match?(/OTEL_.*_ENDPOINT/) }
+  require 'opentelemetry/sdk'
+  require 'opentelemetry/exporter/otlp'
+
+  require 'opentelemetry/instrumentation/active_job'
+  require 'opentelemetry/instrumentation/active_model_serializers'
+  require 'opentelemetry/instrumentation/concurrent_ruby'
+  require 'opentelemetry/instrumentation/excon'
+  require 'opentelemetry/instrumentation/faraday'
+  require 'opentelemetry/instrumentation/http'
+  require 'opentelemetry/instrumentation/http_client'
+  require 'opentelemetry/instrumentation/net/http'
+  require 'opentelemetry/instrumentation/pg'
+  require 'opentelemetry/instrumentation/rack'
+  require 'opentelemetry/instrumentation/rails'
+  require 'opentelemetry/instrumentation/redis'
+  require 'opentelemetry/instrumentation/sidekiq'
+
+  OpenTelemetry::SDK.configure do |c|
+    # use_all() attempts to load ALL the auto-instrumentations
+    # currently loaded by Ruby requires.
+    #
+    # Load attempts will emit an INFO or WARN to the console
+    # about the success/failure to wire up an auto-instrumentation.
+    # "WARN -- : Instrumentation: <X> failed to install" is most
+    # likely caused by <X> not being a Ruby library loaded by
+    # the application or the instrumentation has been explicitly
+    # disabled.
+    #
+    # To disable an instrumentation, set an environment variable
+    # along this pattern:
+    #
+    # OTEL_RUBY_INSTRUMENTATION_<X>_ENABLED=false
+    #
+    # For example, PostgreSQL and Redis produce a lot of child spans
+    # in the course of this application doing its business. To turn
+    # them off, set the env vars below, but recognize that you will
+    # be missing details about what particular calls to the
+    # datastores are slow.
+    #
+    # OTEL_RUBY_INSTRUMENTATION_PG_ENABLED=false
+    # OTEL_RUBY_INSTRUMENTATION_REDIS_ENABLED=false
+
+    c.use_all({
+      'OpenTelemetry::Instrumentation::Rack' => {
+        use_rack_events: false, # instead of events, use middleware; allows for untraced_endpoints to ignore child spans
+        untraced_endpoints: ['/health'],
+      },
+    })
+
+    prefix = ENV.fetch('OTEL_SERVICE_NAME_PREFIX', 'mastodon')
+
+    c.service_name =  case $PROGRAM_NAME
+                      when /puma/ then "#{prefix}/web"
+                      else
+                        "#{prefix}/#{$PROGRAM_NAME.split('/').last}"
+                      end
+    c.service_version = Mastodon::Version.to_s
+  end
+end
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index a44c2ab847..b54fc6cf0c 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -73,7 +73,7 @@ if ENV['S3_ENABLED'] == 'true'
   if ENV.has_key?('S3_ENDPOINT')
     Paperclip::Attachment.default_options[:s3_options].merge!(
       endpoint: ENV['S3_ENDPOINT'],
-      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true',
+      force_path_style: ENV['S3_OVERRIDE_PATH_STYLE'] != 'true'
     )
 
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
@@ -159,7 +159,7 @@ else
   Paperclip::Attachment.default_options.merge!(
     storage: :filesystem,
     path: File.join(ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')), ':prefix_path:class', ':attachment', ':id_partition', ':style', ':filename'),
-    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename',
+    url: ENV.fetch('PAPERCLIP_ROOT_URL', '/system') + '/:prefix_url:class/:attachment/:id_partition/:style/:filename'
   )
 end
 
diff --git a/config/initializers/premailer_rails.rb b/config/initializers/premailer_rails.rb
index 52576ef883..1c8df970db 100644
--- a/config/initializers/premailer_rails.rb
+++ b/config/initializers/premailer_rails.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/premailer_webpack_strategy'
+require_relative '../../lib/premailer_bundled_asset_strategy'
 
 Premailer::Rails.config.merge!(remove_ids: true,
                                adapter: :nokogiri,
                                generate_text_part: false,
-                               strategies: [PremailerWebpackStrategy])
+                               css_to_attributes: false,
+                               strategies: [PremailerBundledAssetStrategy])
diff --git a/config/initializers/propshaft.rb b/config/initializers/propshaft.rb
new file mode 100644
index 0000000000..eff7ec90b8
--- /dev/null
+++ b/config/initializers/propshaft.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# SVG icons
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'images')
+
+# Material Design icons
+Rails.application.config.assets.paths << Rails.root.join('app', 'javascript', 'material-icons')
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 429dbd3248..fa1bdca544 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -14,7 +14,7 @@ class Rack::Attack
     end
 
     def remote_ip
-      @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
+      @remote_ip ||= (@env['action_dispatch.remote_ip'] || ip).to_s
     end
 
     def throttleable_remote_ip
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 9a2743ed5b..53b02edc40 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -26,6 +26,7 @@ Sidekiq.configure_server do |config|
           'queue' => 'scheduler',
         },
       }
+      SidekiqScheduler::Scheduler.instance.reload_schedule!
     end
   end
 
diff --git a/config/initializers/simple_cov_source_file.rb b/config/initializers/simple_cov_source_file.rb
new file mode 100644
index 0000000000..c6b3586c82
--- /dev/null
+++ b/config/initializers/simple_cov_source_file.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# TODO: https://github.com/simplecov-ruby/simplecov/pull/1084
+# Patches this missing condition, monitor for upstream fix
+
+module SimpleCov
+  module SourceFileExtensions
+    def build_branches
+      coverage_branch_data = coverage_data.fetch('branches', {}) || {} # Add the final empty hash in case where 'branches' is present, but returns nil
+      branches = coverage_branch_data.flat_map do |condition, coverage_branches|
+        build_branches_from(condition, coverage_branches)
+      end
+
+      process_skipped_branches(branches)
+    end
+  end
+end
+
+SimpleCov::SourceFile.prepend(SimpleCov::SourceFileExtensions) if defined?(SimpleCov::SourceFile)
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index a8bc4b1921..8191825a9a 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -21,6 +21,17 @@ module RecommendedComponent
   end
 end
 
+module KmyblueComponent
+  def kmyblue(_wrapper_options = nil)
+    return unless options[:kmyblue]
+
+    key = options[:kmyblue].is_a?(Symbol) ? options[:kmyblue] : :kmyblue
+    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t(key, scope: 'simple_form'), class: key)]) }
+
+    nil
+  end
+end
+
 module WarningHintComponent
   def warning_hint(_wrapper_options = nil)
     @warning_hint ||= begin
@@ -31,6 +42,7 @@ end
 
 SimpleForm.include_component(AppendComponent)
 SimpleForm.include_component(RecommendedComponent)
+SimpleForm.include_component(KmyblueComponent)
 SimpleForm.include_component(WarningHintComponent)
 
 SimpleForm.setup do |config|
@@ -89,6 +101,7 @@ SimpleForm.setup do |config|
 
     b.wrapper tag: :div, class: :label_input do |ba|
       ba.optional :recommended
+      ba.optional :kmyblue
       ba.use :label
 
       ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
@@ -104,13 +117,25 @@ SimpleForm.setup do |config|
 
   config.wrappers :with_floating_label, class: [:input, :with_floating_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
-    b.use :label_input, wrap_with: { tag: :div, class: :label_input }
+
+    b.wrapper tag: :div, class: :label_input do |ba|
+      ba.optional :recommended
+      ba.optional :kmyblue
+      ba.use :label
+
+      ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
+        bb.use :input
+        bb.optional :append, wrap_with: { tag: :div, class: 'label_input__append' }
+      end
+    end
+
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
   config.wrappers :with_block_label, class: [:input, :with_block_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
+    b.optional :kmyblue
     b.use :label
     b.use :warning_hint, wrap_with: { tag: :span, class: [:hint, 'warning-hint'] }
     b.use :hint, wrap_with: { tag: :span, class: :hint }
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 72fe40600e..7c13d50637 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -3,6 +3,6 @@
 require 'stoplight'
 
 Rails.application.reloader.to_prepare do
-  Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
-  Stoplight::Light.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
+  Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConfiguration.new.connection)
+  Stoplight.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
 end
diff --git a/config/initializers/webauthn.rb b/config/initializers/webauthn.rb
index 924ce6d877..40dfeb8317 100644
--- a/config/initializers/webauthn.rb
+++ b/config/initializers/webauthn.rb
@@ -6,7 +6,7 @@ WebAuthn.configure do |config|
   config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}"
 
   # Relying Party name for display purposes
-  config.rp_name = "Mastodon"
+  config.rp_name = 'Mastodon'
 
   # Optionally configure a client timeout hint, in milliseconds.
   # This hint specifies how long the browser should wait for an
diff --git a/config/locales/activerecord.el.yml b/config/locales/activerecord.el.yml
index 4eae3b6a00..01e9a75f98 100644
--- a/config/locales/activerecord.el.yml
+++ b/config/locales/activerecord.el.yml
@@ -53,3 +53,7 @@ el:
             position:
               elevated: δεν μπορεί να είναι μεγαλύτερο από τον τρέχοντα ρόλο σας
               own_role: δεν μπορεί να αλλάξει με τον τρέχοντα ρόλο σας
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: δεν μπορείτε να συμπεριλάβετε συμβάντα για τα οποία δεν έχετε τα δικαιώματα
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 186104c702..569b783103 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -56,4 +56,4 @@ es:
         webhook:
           attributes:
             events:
-              invalid_permissions: no se pueden incluir eventos para los que no tienes derechos
+              invalid_permissions: no puede incluir eventos para los que no tienes permisos
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index 818dab939c..a67c1403c5 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -19,7 +19,7 @@ eu:
         account:
           attributes:
             username:
-              invalid: letrak, zenbakiak eta gidoi baxuak besterik ez
+              invalid: letrak, zenbakiak eta azpimarrak soilik izan behar ditu
               reserved: erreserbatuta dago
         admin/webhook:
           attributes:
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index 93f338b5d5..feb4fbf4c5 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -4,7 +4,7 @@ fi:
     attributes:
       poll:
         expires_at: Määräaika
-        options: Valinnat
+        options: Vaihtoehdot
       user:
         agreement: Palvelusopimus
         email: Sähköpostiosoite
@@ -36,7 +36,7 @@ fi:
         status:
           attributes:
             reblog:
-              taken: tila on jo olemassa
+              taken: tästä julkaisusta on jo tehty
         user:
           attributes:
             email:
@@ -47,7 +47,7 @@ fi:
         user_role:
           attributes:
             permissions_as_keys:
-              dangerous: sisältää oikeudet, jotka eivät ole turvallisia perusroolille
+              dangerous: sisältää oikeuksia, jotka eivät ole turvallisia perusroolille
               elevated: ei voi sisältää oikeuksia, joita nykyisellä roolillasi ei ole
               own_role: ei voi muuttaa nykyisellä roolillasi
             position:
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index 7d1e7d7190..b1dd90bc36 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -2,8 +2,58 @@
 ia:
   activerecord:
     attributes:
+      poll:
+        expires_at: Data limite
+        options: Optiones
       user:
+        agreement: Accordo de servicio
         email: Adresse de e-mail
+        locale: Region
         password: Contrasigno
       user/account:
         username: Nomine de usator
+      user/invite_request:
+        text: Motivo
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: debe continer solmente litteras, numeros e tractos de sublineamento
+              reserved: es reservate
+        admin/webhook:
+          attributes:
+            url:
+              invalid: non es un URL valide
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: non es un URL valide
+        import:
+          attributes:
+            data:
+              malformed: es mal formate
+        status:
+          attributes:
+            reblog:
+              taken: del message jam existe
+        user:
+          attributes:
+            email:
+              blocked: usa un fornitor de e-mail prohibite
+              unreachable: non pare exister
+            role_id:
+              elevated: non pote esser superior a tu rolo actual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: includer permissiones non secur pro le rolo de base
+              elevated: non pote includer permissiones que tu rolo actual non possede
+              own_role: non pote esser cambiate con tu rolo actual
+            position:
+              elevated: non pote esser superior a tu rolo actual
+              own_role: non pote esser cambiate con tu rolo actual
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: non pote includer eventos pro le quales tu non ha le derectos
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 909ff68c24..b3ca90069b 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -19,7 +19,7 @@ kab:
         account:
           attributes:
             username:
-              invalid: isekkilen, uṭṭunen d yijerriden n wadda kan
+              invalid: ilaq ad ilin isekkilen, uṭṭunen d yijerriden n wadda kan
               reserved: yettwaṭṭef
         status:
           attributes:
diff --git a/config/locales/activerecord.lad.yml b/config/locales/activerecord.lad.yml
index 71a63d1cd1..31e0223cca 100644
--- a/config/locales/activerecord.lad.yml
+++ b/config/locales/activerecord.lad.yml
@@ -11,7 +11,7 @@ lad:
         locale: Lingua
         password: Kod
       user/account:
-        username: Nombre de uzador
+        username: Nombre de utilizador
       user/invite_request:
         text: Razon
     errors:
diff --git a/config/locales/activerecord.sk.yml b/config/locales/activerecord.sk.yml
index d13c416e51..809d006471 100644
--- a/config/locales/activerecord.sk.yml
+++ b/config/locales/activerecord.sk.yml
@@ -7,11 +7,11 @@ sk:
         options: Voľby
       user:
         agreement: Dohoda o poskytovaní služieb
-        email: Emailová adresa
+        email: E-mailová adresa
         locale: Jazyk
         password: Heslo
       user/account:
-        username: Meno používateľa
+        username: Používateľské meno
       user/invite_request:
         text: Dôvod
     errors:
@@ -41,9 +41,9 @@ sk:
           attributes:
             email:
               blocked: používa nepovoleného poskytovateľa e-mailu
-              unreachable: zdá sa, že neexistuje
+              unreachable: vyzerá, že neexistuje
             role_id:
-              elevated: nemôže byť vyššia ako vaša súčasná rola
+              elevated: nemôže byť viac ako vaša súčasná rola
         user_role:
           attributes:
             permissions_as_keys:
@@ -51,9 +51,9 @@ sk:
               elevated: nemôže obsahovať povolenia, ktoré vaša aktuálna rola nemá
               own_role: nie je možné zmeniť s vašou aktuálnou rolou
             position:
-              elevated: nemôže byť vyššia ako vaša súčasná rola
+              elevated: nemôže byť viac ako vaša súčasná rola
               own_role: nie je možné zmeniť s vašou aktuálnou rolou
         webhook:
           attributes:
             events:
-              invalid_permissions: nemožno zahrnúť udalosti, ku ktorým nemáte práva
+              invalid_permissions: nemôže zahrnúť udalosti, ku ktorým nemáte práva
diff --git a/config/locales/activerecord.tok.yml b/config/locales/activerecord.tok.yml
new file mode 100644
index 0000000000..9862a7f953
--- /dev/null
+++ b/config/locales/activerecord.tok.yml
@@ -0,0 +1,14 @@
+---
+tok:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: pini tenpo
+      user/account:
+        username: nimi jan
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              reserved: jan ante li jo e nimi ni
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 74d3495914..adc9d5dbd5 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -2,7 +2,7 @@
 af:
   about:
     contact_missing: Nie ingestel nie
-    contact_unavailable: NVT
+    contact_unavailable: n.v.t
     hosted_on: Mastodon gehuisves op %{domain}
     title: Aangaande
   accounts:
@@ -23,13 +23,18 @@ af:
     account_moderation_notes:
       create: Los nota
     accounts:
+      email: E-pos
+      ip: IP
       location:
         local: Plaaslik
       moderation:
         silenced: Beperk
+      reset_password: Herstel wagwoord
       search: Soek
       silenced: Beperk
     action_logs:
+      action_types:
+        reset_password_user: Herstel Wagwoord
       actions:
         silence_account_html: "%{name} het %{target} se rekening beperk"
       deleted_account: geskrapte rekening
@@ -97,6 +102,7 @@ af:
   auth:
     apply_for_account: Doen aansoek om ’n rekening
     logout: Teken uit
+    reset_password: Herstel wagwoord
   datetime:
     distance_in_words:
       about_x_hours: "%{count} uur"
@@ -121,6 +127,8 @@ af:
     invalid: Hierdie uitnodiging is nie geldig nie
     title: Nooi ander
   login_activities:
+    authentication_methods:
+      password: wagwoord
     description_html: Indien jy onbekende aktiwiteite gewaar, oorweeg dit om jou wagwoord te verander en tweefaktorverifikasie te aktiveer.
   navigation:
     toggle_menu: Wisselkieslys
@@ -165,5 +173,3 @@ af:
     warning:
       title:
         silence: Rekening beperk
-    welcome:
-      edit_profile_action: Stel profiel op
diff --git a/config/locales/an.yml b/config/locales/an.yml
index de791679b6..068a20187d 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1288,7 +1288,6 @@ an:
   notifications:
     email_events: Eventos pa notificacions per correu electronico
     email_events_hint: 'Tría los eventos pa los quals deseyas recibir notificacions:'
-    other_settings: Atros achustes de notificacions
   number:
     human:
       decimal_units:
@@ -1424,7 +1423,6 @@ an:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificacions
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo y seguidores
@@ -1469,8 +1467,6 @@ an:
         other: "%{count} votos"
       vote: Vota
     show_more: Amostrar mas
-    show_newer: Amostrar mas recients
-    show_older: Amostrar mas antigos
     show_thread: Amostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1548,7 +1544,6 @@ an:
     webauthn: Claus de seguranza
   user_mailer:
     appeal_approved:
-      action: Ir ta la tuya cuenta
       explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió aprebada. La tuya cuenta se troba de nuevo en buen estau.
       subject: La tuya apelación d'o %{date} ha estau aprebada
       title: Apelación aprebada
@@ -1557,7 +1552,6 @@ an:
       subject: La tuya apelación d'o %{date} ha estau refusada
       title: Apelación refusada
     backup_ready:
-      explanation: Has solicitau una copia completa d'a tuya cuenta de Mastodon. Ya ye preparada pa descargar!
       subject: Lo tuyo fichero ye preparau pa descargar
       title: Descargar fichero
     suspicious_sign_in:
@@ -1599,13 +1593,7 @@ an:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar lo perfil
-      edit_profile_step: Puetz personalizar lo tuyo perfil puyando una foto de perfil, cambiando lo tuyo nombre d'usuario y muito mas. Puetz optar per revisar a los nuevos seguidores antes que puedan seguir-te.
       explanation: Aquí i hai qualques consellos pa empecipiar
-      final_action: Empecipiar a publicar
-      final_step: 'Empecipia a publicar! Mesmo sin seguidores, las tuyas publicacions publicas pueden estar vistas per atros, per eixemplo en a linia de tiempo local u en etiquetas. Tal vegada quieras presentar-te con a etiqueta de #presentacions.'
-      full_handle: Lo suyo sobrenombre completo
-      full_handle_hint: Esto ye lo que le dirías a los tuyos amigos pa que ells puedan ninviar-te mensaches u seguir-te dende unatra instancia.
       subject: Bienveniu a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c1b2677dcc..02ba56d0b2 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -42,7 +42,7 @@ ar:
       add_email_domain_block: حظر نطاق البريد الإلكتروني هذا
       approve: صادِق عليه
       approved_msg: تمت الموافقة على تسجيل %{username}
-      are_you_sure: متأكد ؟
+      are_you_sure: هل أنت متأكد؟
       avatar: الصورة الرمزية
       by_domain: النطاق
       change_email:
@@ -55,17 +55,17 @@ ar:
       change_role:
         changed_msg: تم تغيير بنجاح!
         label: تغيير الدور
-        no_role: لا رتب
-        title: تم تغيير الرتب ل %{username}
+        no_role: بلا دور
+        title: تغيير دور %{username}
       confirm: تأكيد
       confirmed: مؤكَّد
       confirming: التأكد
       custom: مخصص
       delete: حذف البيانات
-      deleted: تمت إزالته
-      demote: إنزال الرُتبة الوظيفية
+      deleted: محذوف
+      demote: إنزال الدور الوظيفي
       destroyed_msg: بيانات حساب %{username} الآن في قائمة الانتظار ليتم حذفها قريباً
-      disable: تعطيل
+      disable: تجميد
       disable_sign_in_token_auth: تعطيل مصادقة رمز البريد الإلكتروني
       disable_two_factor_authentication: تعطيل المصادقة بخطوتين
       disabled: معطَّل
@@ -91,7 +91,7 @@ ar:
         local: المحلي
         remote: عن بُعد
         title: الموقع
-      login_status: وضع الدخول
+      login_status: حالة الولوج
       media_attachments: الوسائط المرفقة
       memorialize: تحويل الحساب إلى صفحة ذكرى
       memorialized: تذكاري
@@ -203,10 +203,10 @@ ar:
         destroy_canonical_email_block: حذف نطاق للبريد
         destroy_custom_emoji: احذف الإيموجي المخصص
         destroy_domain_allow: حذف النطاق المسموح به
-        destroy_domain_block: حذف كتلة النطاق
-        destroy_email_domain_block: حذف نطاق بريد إلكتروني
+        destroy_domain_block: إزالة حظر النطاق
+        destroy_email_domain_block: حذف حظر نطاق بريد إلكتروني
         destroy_instance: تنظيف النطاق
-        destroy_ip_block: حذف قانون IP
+        destroy_ip_block: حذف قاعدة IP
         destroy_status: حذف المنشور
         destroy_unavailable_domain: حذف نطاق غير متوفر
         destroy_user_role: حذف الدور
@@ -225,7 +225,7 @@ ar:
         reopen_report: إعادة فتح التقرير
         resend_user: إعادة إرسال بريد التأكيد
         reset_password_user: إعادة تعيين كلمة المرور
-        resolve_report: حل الشكوى
+        resolve_report: معالجة الشكوى
         sensitive_account: وضع علامة على الوسائط في حسابك على أنها حساسة
         silence_account: كتم الحساب
         suspend_account: تعليق الحساب
@@ -236,14 +236,14 @@ ar:
         unsuspend_account: إلغاء تعليق الحساب
         update_announcement: تحديث الإعلان
         update_custom_emoji: تحديث الإيموجي المخصص
-        update_domain_block: تحديث كتلة النطاق
+        update_domain_block: تحديث حظر النطاق
         update_ip_block: تحديث قاعدة IP
         update_status: تحديث المنشور
         update_user_role: تحديث الدور
       actions:
-        approve_appeal_html: وافق %{name} على استئناف قرار الاعتدال من %{target}
-        approve_user_html: قبل %{name} تسجيل %{target}
-        assigned_to_self_report_html: قام %{name} بتعيين التقرير %{target} لأنفسهم
+        approve_appeal_html: وافق %{name} على استئناف الطعن بشأن قرار الإشراف من %{target}
+        approve_user_html: وافق %{name} على تسجيل %{target}
+        assigned_to_self_report_html: قام %{name} بإسناد التقرير %{target} لأنفسهم
         change_email_user_html: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
         change_role_user_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         confirm_user_html: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
@@ -284,7 +284,7 @@ ar:
         reopen_report_html: قام %{name} بإعادة فتح الشكوى %{target}
         resend_user_html: "%{name} إعادة إرسال البريد الإلكتروني للتأكيد لـ %{target}"
         reset_password_user_html: قام %{name} بإعادة تعيين كلمة مرور المستخدم %{target}
-        resolve_report_html: قام %{name} بحل الشكوى %{target}
+        resolve_report_html: قام %{name} بمعالجة الشكوى %{target}
         sensitive_account_html: قام %{name} بوضع علامة حساس على محتوى %{target}
         silence_account_html: قام %{name} بكتم حساب %{target}
         suspend_account_html: قام %{name} بتعليق حساب %{target}
@@ -299,7 +299,7 @@ ar:
         update_ip_block_html: قام %{name} بإنشاء قاعدة للـIP %{target}
         update_status_html: قام %{name} بتحديث منشور من %{target}
         update_user_role_html: "%{name} تغيير رتبه %{target}"
-      deleted_account: احذف الحساب
+      deleted_account: حذف الحساب
       empty: لم يتم العثور على سجلات.
       filter_by_action: تصفية بحسب الإجراء
       filter_by_user: تصفية حسب المستخدم
@@ -309,14 +309,14 @@ ar:
       edit:
         title: تعديل الإعلان
       empty: لم يتم العثور على أية إعلانات.
-      live: على المباشر
+      live: حي
       new:
         create: إنشاء إعلان
         title: إعلان جديد
       publish: نشر
       published_msg: تم نشر الإعلان بنجاح!
       scheduled_for: بُرمِج على %{time}
-      scheduled_msg: تمت جدولة نشر الإعلان!
+      scheduled_msg: تمت برمجة نشر الإعلان!
       title: الإعلانات
       unpublish: إلغاء النشر
       unpublished_msg: تم إلغاء نشر الإعلان بنجاح!
@@ -390,8 +390,8 @@ ar:
         other: "<strong>%{count}</strong> مستخدماً قيدَ الانتظار"
         two: "<strong>%{count}</strong> مستخدمان قيدَ الانتظار"
         zero: "<strong>%{count}</strong> مستخدمٍ قيدَ الانتظار"
-      resolved_reports: تقارير تم حلها
-      software: البرنامج
+      resolved_reports: تقارير تم معالجتها
+      software: البرمجيات
       sources: مصادر التسجيل
       space: المساحة المستخدَمة
       title: لوح المراقبة
@@ -453,6 +453,7 @@ ar:
       view: عرض كتلة النطاق
     email_domain_blocks:
       add_new: إضافة
+      allow_registrations_with_approval: السماح بالتسجيلات وإنشاء الحسابات بعد الموافقة
       attempts_over_week:
         few: "%{count} محاولات تسجيل في آخر أسبوع"
         many: "%{count} محاولات تسجيل في آخر أسبوع"
@@ -645,8 +646,8 @@ ar:
       actions_description_remote_html: حدّد الإجراءات التي يتعين اتخاذها لحل هذا التقرير. هذا سيؤثر فقط على كيفية اتصال <strong>خادمك</strong> بهذا الحساب البعيد والتعامل مع محتوياته.
       add_to_report: أضف المزيد إلى التقرير
       are_you_sure: هل أنت متأكد ؟
-      assign_to_self: عين لي
-      assigned: تعين رئيس
+      assign_to_self: اسنده لي
+      assigned: المشرف المُسنَد
       by_target_domain: نطاق الحساب المبلّغ عنه
       cancel: إلغاء
       category: الفئة
@@ -659,14 +660,15 @@ ar:
       created_at: ذكرت
       delete_and_resolve: احذف المنشورات
       forwarded: أُعيد توجيهه
+      forwarded_replies_explanation: هذا التقرير من مستخدم عن بُعد وحول محتوى عن بُعد. تم تحويله إليك لأن المحتوى المُبلَغ عنه هو ردّ على أحد مستخدميك.
       forwarded_to: أُعيد توجيهه إلى %{domain}
-      mark_as_resolved: اعتبار الشكوى كمحلولة
+      mark_as_resolved: اعتبار الشكوى كمعالَجة
       mark_as_sensitive: تعيينه كمنشور حساس
-      mark_as_unresolved: علم كغير محلولة
+      mark_as_unresolved: وضع علامة لم يتم معالجتها
       no_one_assigned: لا أحد
       notes:
         create: اضف ملاحظة
-        create_and_resolve: الحل مع ملاحظة
+        create_and_resolve: معالجة مرفوقة بملاحظة
         create_and_unresolve: إعادة فتح مع ملاحظة
         delete: حذف
         placeholder: قم بوصف الإجراءات التي تم اتخاذها أو أي تحديثات أخرى ذات علاقة...
@@ -680,7 +682,7 @@ ar:
       reported_account: حساب مُبلّغ عنه
       reported_by: أبلغ عنه من طرف
       resolved: معالجة
-      resolved_msg: تم حل تقرير بنجاح!
+      resolved_msg: تمت معالجة الشكوى بنجاح!
       skip_to_actions: تخطي إلى الإجراءات
       status: الحالة
       statuses: المحتوى المبلغ عنه
@@ -802,6 +804,7 @@ ar:
         desc_html: ويعتمد هذا على نصوص برمجية خارجية من hCaptcha، والتي قد تكون مصدر قلق يتعلق بالأمان والخصوصية. بالإضافة إلى ذلك، <strong>قد يؤدي ذلك إلى جعل عملية التسجيل أقل سهولة بالنسبة لبعض الأشخاص (وخاصة المعاقين)</strong>. لهذه الأسباب، يرجى النظر في تدابير بديلة مثل التسجيل على أساس الموافقة أو على أساس الدعوة.
         title: مطالبة المستخدمين الجدد بحل اختبار CAPTCHA لتأكيد حساباتهم
       content_retention:
+        danger_zone: منطقة خطرة
         preamble: التحكم في كيفية تخزين المحتوى الذي ينشئه المستخدم في ماستدون.
         title: الاحتفاظ بالمحتوى
       default_noindex:
@@ -1116,6 +1119,9 @@ ar:
       clicking_this_link: اضغط على هذا الرابط
       login_link: تسجيل الدخول
       proceed_to_login_html: يمكنكَ الآن الاستمرار إلى %{login_link}.
+      redirect_to_app_html: كان من المفترض إعادة توجيهك إلى تطبيق <strong>%{app_name}</strong>. إن لم يحدث ذلك، حاول %{clicking_this_link} أو العودة يدويًا إلى التطبيق.
+      registration_complete: اكتمل تسجيل حسابك على %{domain} الآن!
+      welcome_title: أهلاً بك، %{name}!
       wrong_email_hint: إذا كان عنوان البريد الإلكتروني هذا غير صحيح، يمكنك تغييره في إعدادات الحساب.
     delete_account: احذف الحساب
     delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك <a href="%{path}">المواصلة هنا</a>. سوف يُطلَبُ منك التأكيد قبل الحذف.
@@ -1177,6 +1183,7 @@ ar:
       functional: حسابك يعمل بشكل كامل.
       pending: إن طلبك قيد المراجعة من قبل فريقنا. قد يستغرق هذا بعض الوقت. سوف تتلقى بريدا إلكترونيا إذا تمت الموافقة على طلبك.
       redirecting_to: حسابك غير نشط لأنه تم تحويله حاليا إلى %{acct}.
+      self_destruct: نظرًا لإغلاق %{domain}، ستحصل فقط على وصول محدود إلى حسابك.
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
     too_fast: تم إرسال النموذج بسرعة كبيرة، حاول مرة أخرى.
     use_security_key: استخدام مفتاح الأمان
@@ -1354,6 +1361,20 @@ ar:
         title: الرسائل المصفّاة
   generic:
     all: الكل
+    all_items_on_page_selected_html:
+      few: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      many: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      one: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      other: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      two: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+      zero: تم تحديد كافة العناصر التي يبلغ عددها <strong>%{count}</strong> في هذه الصفحة.
+    all_matching_items_selected_html:
+      few: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      many: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      one: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      other: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      two: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
+      zero: تم تحديد كافة العناصر التي تشمل عددها <strong>%{count}</strong> في هذه الصفحة.
     cancel: إلغاء
     changes_saved_msg: تم حفظ التعديلات بنجاح!
     confirm: تأكيد
@@ -1363,6 +1384,13 @@ ar:
     none: لا شيء
     order_by: ترتيب بحسب
     save_changes: حفظ التغييرات
+    select_all_matching_items:
+      few: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      many: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      one: حدد العنصر المطابق لبحثك.
+      other: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
+      two: حدد العنصران المطابقان لبحثك.
+      zero: حدد كافة العناصر الـ %{count} المطابقة لبحثك.
     today: اليوم
     validation_errors:
       few: هناك شيء ما ليس على ما يرام! يُرجى مراجعة الأخطاء الـ %{count} أدناه
@@ -1441,6 +1469,7 @@ ar:
       '86400': يوم واحد
     expires_in_prompt: أبدا
     generate: توليد
+    invalid: هذه الدعوة غير صالحة
     invited_by: 'تمت دعوتك من طرف:'
     max_uses:
       few: "%{count} استخدامات"
@@ -1566,7 +1595,6 @@ ar:
     administration_emails: إشعارات البريد الإلكتروني الإدارية
     email_events: الأحداث للإشعارات عبر البريد الإلكتروني
     email_events_hint: 'اختر الأحداث التي تريد أن تصِلَك اشعارات عنها:'
-    other_settings: إعدادات أخرى للإشعارات
   number:
     human:
       decimal_units:
@@ -1622,6 +1650,9 @@ ar:
     errors:
       limit_reached: تم بلوغ الحد الأقصى لردود الفعل المختلفة
       unrecognized_emoji: لم يتم التعرف على أنه إيموجي
+  redirects:
+    prompt: إن كنت واثق من هذا الرابط، انقر عليه للمتابعة.
+    title: إنّك مغادر %{instance}.
   relationships:
     activity: نشاط الحساب
     confirm_follow_selected_followers: هل أنت متأكد من أنك تريد متابعة المتابِعين المحددين؟
@@ -1657,6 +1688,9 @@ ar:
     over_daily_limit: لقد تجاوزتَ حد الـ %{limit} منشورات مُبَرمَجة مسموح بها اليوم
     over_total_limit: لقد بلغت حد الـ %{limit} مِن المنشورات المبرمَجة
     too_soon: يجب أن يكون تاريخ البرمجة في المستقبَل
+  self_destruct:
+    lead_html: للأسف، سيتم إغلاق <strong>%{domain}</strong> بشكل دائم. إذا كان لديك حساب هناك، لن تكون قادرًا على الاستمرار في استخدامه، غير أنه يمكنك طلب نسخة احتياطية لبياناتك.
+    title: سيُغلق هذا الخادم أبوابه
   sessions:
     activity: آخر نشاط
     browser: المتصفح
@@ -1681,6 +1715,7 @@ ar:
       unknown_browser: متصفح غير معروف
       weibo: وايبو
     current_session: الجلسة الحالية
+    date: التاريخ
     description: "%{browser} على %{platform}"
     explanation: ها هي قائمة مُتصفِّحات الويب التي تستخدِم حاليًا حساب ماستدون الخاص بك.
     ip: عنوان الإيبي
@@ -1717,14 +1752,17 @@ ar:
     import: استيراد
     import_and_export: استيراد وتصدير
     migrate: تهجير الحساب
-    notifications: الإخطارات
+    notifications: إشعارات البريد الإلكتروني
     preferences: التفضيلات
     profile: الملف التعريفي
     relationships: المتابِعون والمتابَعون
+    severed_relationships: العلاقات المنفصلة
     statuses_cleanup: الحذف الآلي للمنشورات
     strikes: عقوبات الإشراف
     two_factor_authentication: المُصادقة بخُطوَتَيْن
     webauthn_authentication: مفاتيح الأمان
+  severed_relationships:
+    download: تنزيل (%{count})
   statuses:
     attached:
       audio:
@@ -1786,8 +1824,6 @@ ar:
         zero: بدون صوت %{count}
       vote: صوّت
     show_more: أظهر المزيد
-    show_newer: إظهار أحدث
-    show_older: إظهار أقدم
     show_thread: اعرض خيط المحادثة
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1844,6 +1880,7 @@ ar:
     contrast: ماستدون (تباين عالٍ)
     default: ماستدون (داكن)
     mastodon-light: ماستدون (فاتح)
+    system: تلقائي (استخدم سمة النظام)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1871,18 +1908,27 @@ ar:
     webauthn: مفاتيح الأمان
   user_mailer:
     appeal_approved:
-      action: انتقل إلى حسابك
+      action: إعدادات الحساب
       explanation: تمت الموافقة على استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}. حسابك مرة أخرى في حالة جيدة.
       subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
+      subtitle: حسابك في وضع جيد مجدّدا.
       title: تم قبول طعنك
     appeal_rejected:
       explanation: تم رفض استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}.
       subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
+      subtitle: تم رفض طعنك.
       title: رُفض الاستئناف
     backup_ready:
-      explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
+      explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون.
+      extra: إنه الآن جاهز للتحميل!
       subject: نسخة بيانات حسابك جاهزة للتنزيل
       title: المغادرة بأرشيف الحساب
+    failed_2fa:
+      details: 'فيما يلي تفاصيل محاولة تسجيل الدخول:'
+      explanation: حاول شخص ما تسجيل الدخول إلى حسابك ولكنه قدم عامل مصادقة ثانٍ غير صالح.
+      further_actions_html: إن لم تكن أنت، نوصي بأن تقوم بـ %{action} على الفور، حيث قد يكون الحساب قد تعرض للاختراق.
+      subject: فشل المصادقة على العامل الثاني
+      title: فشل المصادقة على العامل الثاني
     suspicious_sign_in:
       change_password: غيّر كلمتك السرية
       details: 'فيما يلي تفاصيل تسجيل الدخول:'
@@ -1922,13 +1968,39 @@ ar:
         silence: الحساب محدود
         suspend: الحساب مُعلَّق
     welcome:
-      edit_profile_action: تهيئة الملف التعريفي
-      edit_profile_step: يمكنك تخصيص ملفك الشخصي عن طريق رفع صورة ملفك الشخصي, تغيير اسم العرض الخاص بك والمزيد. يمكنك اختيار مراجعة المتابعين الجدد قبل السماح لهم بمتابعتك.
+      apps_android_action: احصل عليه من متجر جوجل للتطبيقات
+      apps_ios_action: التنزيل من App Store
+      apps_step: تنزيل تطبيقاتنا الرسمية.
+      apps_title: تطبيقات مَستُدون
+      checklist_subtitle: 'هيا بنا نبدأ مغامرتنا على الويب الاجتماعي الجديد:'
+      checklist_title: الخطوات الترحيبية الأولى
+      edit_profile_action: تخصيص
+      edit_profile_step: قم بتعزيز تفاعلاتك بامتلاك مِلَفّ تعريفي كامل.
+      edit_profile_title: قم بتخصيص ملفك التعريفي
       explanation: ها هي بعض النصائح قبل بداية الاستخدام
-      final_action: اشرَع في النشر
-      final_step: 'ابدأ في النشر! حتى بدون متابعين، منشوراتك العامة قد يشاهدها آخرون، على سبيل المثال في التوقيت المحلي أو في الوسوم. قد ترغب في تقديم نفسك على وسم #introductions.'
-      full_handle: عنوانك الكامل
-      full_handle_hint: هذا هو ما يجب تقديمه لأصدقائك قصد أن يكون بإمكانهم متابَعتك أو مُراسَلتك حتى و إن كانت حساباتهم على خوادم أخرى.
+      feature_action: اعرف المزيد
+      feature_audience_title: اِبنوا جُمهورَكم بِثِقَة
+      feature_control: أنتم الأدرى بالمحتوى الذي تريدون أن تطالعوه في فيض المنشورات الرئيس. لا خوارزميات تتحكم فيما يظهر لكم ولا إعلانات تضيع وقتكم. بحساب واحد تمكنكم متابعة من تشاؤون على أيّ خادوم ماستدون، وتلقّى منشوراتهم بترتيبها الزمني، لتصنعوا ركنكم الأليف في الإنترنت.
+      feature_control_title: تحكَّموا في فيض المنشورات الخاص بكم
+      feature_creativity: ماستدون يدعم المشاركات الصوتية والفيديو والصورة، وصوفات الوصولية، واستطلاعات الرأي، وتحذيرات المحتوى، والصور الرمزية المتحركة، ورموز الإيموجي المطوّعة، والتحكم في قص مصغّرات الصور، والمزيد، لأجل مساعدتكم على التعبير عن أنفسكم عبر الإنترنت. فسواء كنتم تنشرون فنونكم البصرية أو الموسيقية أو البودكاستات، فستجدون ماستدون مفيدًا.
+      feature_creativity_title: إبداعٌ بلا نظير
+      feature_moderation: ماستدون يُرجع القرار لكم، حيث يضع كل خادوم قواعده ولوائحه الخاصة لإدارة المحتوى ومجتمع المشاركين، وهي تُطبّق محليا، ليس من أعلى إلى أسفل مثل منصات التواصل الاجتماعي التجارية. هذا يجعلها أكثر مرونة في الاستجابة لاحتياجات مختلف فئات الناس. انضم إلى خادوم يُطبّق القواعد التي توافق عليها، وإلا فشغّلوا خادومكم بأنفسكم.
+      feature_moderation_title: الإشرَافُ كما يَنبغي أن يكون
+      follow_action: تابِع
+      follow_step: إن متابعة الأشخاص المثيرين للاهتمام هي غاية ماستدون.
+      follow_title: أضفِ طابعا شخصيا على موجزات خيطك الرئيس
+      follows_subtitle: اتبع الحسابات المشهورة
+      follows_title: مَن عليك متابعته
+      follows_view_more: متابعة المزيد من الأشخاص
+      hashtags_title: الوسوم الرائجة
+      hashtags_view_more: عرض المزيد من الوسوم الرائجة
+      post_action: إنشاء
+      post_step: قل مرحبا للعالَم عبر نصّ أو صور أو فيديوهات أو استطلاعات رأي.
+      post_title: قم بإنشاء منشورك الأول
+      share_action: شارِك
+      share_step: أخبر أصدقائك بكيفية العثور عليك على مَستُدون.
+      share_title: شارك مِلَفّ مَستُدون التعريفي الخاص بك
+      sign_in_action: تسجيل الدخول
       subject: أهلًا بك على ماستدون
       title: أهلاً بك، %{name}!
   users:
@@ -1936,6 +2008,7 @@ ar:
     go_to_sso_account_settings: انتقل إلى إعدادات حساب مزود الهوية الخاص بك
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
+    rate_limited: عدد محاولات المصادقة كثير جداً، حاول مرة أخرى لاحقاً.
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 08717c840e..816858d4a0 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -23,6 +23,8 @@ ast:
       are_you_sure: "¿De xuru que quies facer esta aición?"
       avatar: Avatar
       by_domain: Dominiu
+      change_role:
+        label: Camudar el rol
       confirming: En confirmación
       disabled: Conxelóse
       display_name: Nome visible
@@ -59,6 +61,7 @@ ast:
       suspend: Suspender
       title: Cuentes
       username: Nome d'usuariu
+      warn: Alvertir
       web: Web
     action_logs:
       actions:
@@ -181,6 +184,7 @@ ast:
       availability:
         no_failures_recorded: Nun se rexistró nengún fallu.
         title: Disponibilidá
+      back_to_warning: Alvertencia
       by_domain: Dominiu
       content_policies:
         comment: Nota interna
@@ -461,6 +465,7 @@ ast:
     delete_account_html: Si quies desaniciar la cuenta, pues facelo <a href="%{path}">equí</a>. Va pidísete que confirmes l'aición.
     description:
       prefix_sign_up: "¡Rexístrate güei en Mastodon!"
+    didnt_get_confirmation: "¿Nun recibiesti l'enllaz de confirmación?"
     dont_have_your_security_key: "¿Nun tienes una llave de seguranza?"
     forgot_password: "¿Escaeciesti la contraseña?"
     login: Aniciar la sesión
@@ -477,6 +482,8 @@ ast:
       accept: Aceptar
       back: Atrás
     security: Seguranza
+    setup:
+      link_not_received: "¿Nun consiguiesti l'enllaz?"
     sign_in:
       preamble_html: Anicia la sesión colos tos datos d'accesu en <strong>%{domain}</strong>. Si la cuenta ta agospiada n'otru sirvidor, nun vas ser a aniciar la sesión equí.
       title: Aniciu de la sesión en «%{domain}»
@@ -535,6 +542,9 @@ ast:
       your_appeal_approved: Aprobóse la to apellación
       your_appeal_pending: Unviesti una apellación
       your_appeal_rejected: Refugóse la to apellación
+  edit_profile:
+    basic_information: Información básica
+    other: Otres preferencies
   errors:
     '400': La solicitú qu'unviesti nun yera válida o yera incorreuta.
     '403': Nun tienes permisu pa ver esta páxina.
@@ -622,6 +632,7 @@ ast:
       muting: Llista de perfiles colos avisos desactivaos
     upload: Xubir
   invites:
+    delete: Desactivar
     expired: Caducó
     expires_in:
       '1800': 30 minutos
@@ -684,7 +695,6 @@ ast:
   notifications:
     email_events: Unviu d'avisos per corréu electrónicu
     email_events_hint: 'Seleiciona los eventos de los que quies recibir avisos:'
-    other_settings: Configuración d'otros avisos
   number:
     human:
       decimal_units:
@@ -715,6 +725,14 @@ ast:
     other: Otres preferencies
     posting_defaults: Configuración predeterminada del espublizamientu d'artículos
     public_timelines: Llinies de tiempu públiques
+  privacy:
+    hint_html: "<strong>Personaliza cómo quies s'atope esti perfil ya los sos artículos.</strong> Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
+    privacy: Privacidá
+    reach: Algame
+    reach_hint_html: Controla si quies que te descubran ya te sigan perfiles nuevos. ¿Quies que los tos artículos apaezan na pantalla «Esploración»? ¿Quies qu'otres persones te vean na recomendación de cuentes? ¿Quies aceptar toles solicitúes de siguimientu automáticamente o tener un control minuciosu de caúna?
+    search: Busca
+    search_hint_html: Controla cómo quies que t'atopen. ¿Quies que la xente t'atope polo qu'espublices públicamente? ¿Quies que la xente fuera de Mástodon atope esti perfil cuando busque na web? Ten en cuenta que nun se pue garantizar la esclusión total de tolos motores de busca.
+    title: Privacidá ya algame
   privacy_policy:
     title: Política de privacidá
   relationships:
@@ -783,7 +801,6 @@ ast:
     import: Importación
     import_and_export: Importación ya esportación
     migrate: Migración de la cuenta
-    notifications: Avisos
     preferences: Preferencies
     profile: Perfil públicu
     relationships: Perfiles que sigues ya te siguen
@@ -881,15 +898,13 @@ ast:
         none: Alvertencia
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Pues personalizar el perfil pente la xuba d'una semeya, el cambéu del nome visible ya muncho más. Tamién, si lo prefieres, pues revisar los perfiles nuevos enantes de que puedan siguite.
       explanation: Equí tienes dalgunos conseyos pa que comiences
-      final_action: Comenzar a espublizar
       subject: Afáyate en Mastodon
       title: "¡Afáyate, %{name}!"
   users:
     follow_limit_reached: Nun pues siguir a más de %{limit} persones
     invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
+    rate_limited: Fixéronse milenta intentos d'autenticación. Volvi tentalo dempués.
     seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña ya de la direición de corréu electrónicu nun tán disponibles.
     signed_in_as: 'Aniciesti la sesión como:'
   verification:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index ca9b0d2b88..13daa9897e 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -88,7 +88,7 @@ be:
         remote: Адлеглы
         title: Месцазнаходжанне
       login_status: Стан уваходу
-      media_attachments: Медыя дадаткі
+      media_attachments: Медыя далучэнні
       memorialize: Даданае да памяці
       memorialized: Запомненае
       memorialized_msg: Уліковы запіс %{username} ператвораны ў мемарыяльны
@@ -522,7 +522,7 @@ be:
         instance_followers_measure: нашых падпісчыкаў там
         instance_follows_measure: іх падпісчыкаў тут
         instance_languages_dimension: Папулярныя мовы
-        instance_media_attachments_measure: захаваныя медыя-ўкладанні
+        instance_media_attachments_measure: захаваныя медыя-далучэнні
         instance_reports_measure: справаздач пра іх
         instance_statuses_measure: захаваных паведамленняў
       delivery:
@@ -555,7 +555,7 @@ be:
       total_followed_by_them: Іхнія падпіскі
       total_followed_by_us: Нашыя падпіскі
       total_reported: Скаргі на іх
-      total_storage: Медыя дадаткі
+      total_storage: Медыя далучэнні
       totals_time_period_hint_html: Паказаныя агульныя значэнні ніжэй уключаюць даныя за ўвесь час.
       unknown_instance: На дадзены момант няма запісаў аб гэтым дамене на гэтым серверы.
     invites:
@@ -621,6 +621,9 @@ be:
       actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
       actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як <strong>ваш</strong> сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
       add_to_report: Дадаць яшчэ дэталяў да скаргі
+      already_suspended_badges:
+        local: Ужо прыпынена на гэтым сэрвэры
+        remote: Ужо прыпынена на іх сэрвэры
       are_you_sure: Вы ўпэўнены?
       assign_to_self: Прызначыць мне
       assigned: Прызначаны мадэратар
@@ -795,6 +798,7 @@ be:
         disabled: Нікому
         users: Лакальным карыстальнікам, якія ўвайшлі
       registrations:
+        moderation_recommandation: Пераканайцеся, што ў вас ёсць адэкватная і аператыўная каманда мадэратараў, перш чым адчыняць рэгістрацыю для ўсіх жадаючых!
         preamble: Кантралюйце, хто можа ствараць уліковы запіс на вашым серверы.
         title: Рэгістрацыя
       registrations_mode:
@@ -802,6 +806,7 @@ be:
           approved: Для рэгістрацыі патрабуецца пацвярджэнне
           none: Нікому не магчыма зарэгістравацца
           open: Любому магчыма зарэгістравацца
+        warning_hint: Мы рэкамендуем выкарыстоўваць рэжым "для рэгістрацыі патрабуецца пацвярджэнне", калі вы не ўпэўненыя, што ваша каманда мадэратараў зможа своечасова спраўляцца са спамам і шкоднымі рэгістрацыямі.
       security:
         authorized_fetch: Патрабаваць аўтэнтыфікацыю ад федэратыўных сервераў
         authorized_fetch_hint: Патрабаванне аўтэнтыфікацыі ад федэратыўных сервераў дазваляе больш строга выконваць блакіроўкі як на ўзроўні карыстача, так і на ўзроўні сервера. Аднак пры гэтым зніжаецца прадукцыйнасць, памяншаецца ахоп вашых адказаў на допісы і могуць узнікнуць праблемы сумяшчальнасці з некаторымі федэратыўнымі сэрвісамі. Акрамя таго, гэта не перашкодзіць атрымліваць вашыя публічныя допісы і ўліковыя запісы.
@@ -1002,6 +1007,9 @@ be:
       title: Вэбхукі
       webhook: Вэбхук
   admin_mailer:
+    auto_close_registrations:
+      body: У сувязі з адсутнасцю актыўнасці мадэратараў у апошні час, рэгістрацыя на %{instance} была аўтаматычна пераведзена ў рэжым, які патрабуе ручной праверкі, каб прадухіліць выкарыстанне %{instance} у якасці платформы для патэнцыйных зламыснікаў. Вы можаце ў любы момант пераключыць яго назад ў рэжым "вольная рэгістрацыя".
+      subject: Рэгістрацыі для %{instance} былі аўтаматычна пераведзены ў рэжым "патрабуецца пацвярджэнне"
     new_appeal:
       actions:
         delete_statuses: выдаліць іх допісы
@@ -1462,9 +1470,9 @@ be:
       title: Адпісацца
   media_attachments:
     validations:
-      images_and_video: Немагчыма прымацаваць відэа да допісу, які ўжо змяшчае выявы
-      not_ready: Няможна дадаць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
-      too_many: Няможна дадаць больш за 4 файлы
+      images_and_video: Немагчыма далучыць відэа да допісу, які ўжо змяшчае выявы
+      not_ready: Няможна далучыць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
+      too_many: Немагчыма далучыць больш за 4 файлы
   migrations:
     acct: Перамешчана ў
     cancel: Скасаваць перанакіраванне
@@ -1542,7 +1550,6 @@ be:
     administration_emails: Апавяшчэнні эл. пошты для адміністратара
     email_events: Падзеі для апавяшчэнняў эл. пошты
     email_events_hint: 'Выберыце падзеі, аб якіх вы хочаце атрымліваць апавяшчэнні:'
-    other_settings: Іншыя налады апавяшчэнняў
   number:
     human:
       decimal_units:
@@ -1598,6 +1605,9 @@ be:
     errors:
       limit_reached: Дасягнуты ліміт розных рэакцый
       unrecognized_emoji: невядомае эмодзі
+  redirects:
+    prompt: Калі вы давяраеце гэтай спасылцы, націсніце на яе, каб працягнуць.
+    title: Вы пакідаеце %{instance}.
   relationships:
     activity: Актыўнасць ул. запісу
     confirm_follow_selected_followers: Вы ўпэўнены, што жадаеце падпісацца на выбраных падпісчыкаў?
@@ -1660,6 +1670,7 @@ be:
       unknown_browser: Невядомы браўзер
       weibo: Weibo
     current_session: Бягучая сесія
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Гэта вэб-браўзэры, з якіх выкананы ўваход у ваш уліковы запіс Mastodon.
     ip: IP
@@ -1696,14 +1707,26 @@ be:
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
-    notifications: Апавяшчэнні
+    notifications: Email апавяшчэнні
     preferences: Налады
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
+    severed_relationships: Разрыў сувязяў
     statuses_cleanup: Аўтавыдаленне допісаў
     strikes: Папярэджанні мадэратараў
     two_factor_authentication: Двухфактарная аўтэнтыфікацыя
     webauthn_authentication: Ключы бяспекі
+  severed_relationships:
+    download: Спампаваць (%{count})
+    event_type:
+      account_suspension: Прыпыненне ўліковага запісу (%{target_name})
+      domain_block: Прыпыненне сервера (%{target_name})
+      user_domain_block: Вы заблакіравалі %{target_name}
+    lost_followers: Страчаныя падпісчыкі
+    lost_follows: Страчаныя падпіскі
+    preamble: Вы можаце страціць падпіскі і падпісчыкаў, калі заблакіруеце дамен або калі вашы мадэратары вырашаць прыпыніць зносіны з серверам. Калі гэта адбудзецца, вы зможаце загрузіць спіс страчаных зносін, каб праверыць іх і, магчыма, імпартаваць на іншы сервер.
+    purged: Інфармацыя аб гэтым серверы была выдалена адміністратарамі вашага сервера.
+    type: Падзея
   statuses:
     attached:
       audio:
@@ -1753,8 +1776,6 @@ be:
         other: "%{count} голасу"
       vote: Прагаласаваць
     show_more: Паказаць больш
-    show_newer: Паказаць навейшыя
-    show_older: Паказаць старэйшыя
     show_thread: Паказаць ланцуг
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1776,7 +1797,7 @@ be:
     interaction_exceptions_explanation: Звярніце ўвагу, што няма гарантыі выдалення пастоў, калі колькасць іх упадабанняў ці пашырэннняў упадзе ніжэй за ліміт, хаця некалі гэтая колькасць перавышала яго.
     keep_direct: Захаваць асабістыя паведамленні
     keep_direct_hint: Не выдаляць асабістыя паведамленні
-    keep_media: Захоўваць допісы з медыя дадаткамі
+    keep_media: Захоўваць допісы з далучаным медыя
     keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя
     keep_pinned: Захаваць замацаваныя допісы
     keep_pinned_hint: Не выдаляць вашыя замацаваныя допісы
@@ -1811,6 +1832,7 @@ be:
     contrast: Mastodon (высокі кантраст)
     default: Mastodon (цёмная)
     mastodon-light: Mastodon (светлая)
+    system: Аўтаматычна (выкарыстоўваць сістэмную тэму)
   time:
     formats:
       default: "%d.%m.%Y %H:%M"
@@ -1838,18 +1860,27 @@ be:
     webauthn: Ключы бяспекі
   user_mailer:
     appeal_approved:
-      action: Перайсці ў свой уліковы запіс
+      action: Налады ўліковага запісу
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
       subject: Вашая апеляцыя ад %{date} была ўхваленая
+      subtitle: Ваш уліковы запіс зноў знаходзіцца ў добрым стане.
       title: Абскарджанне ўхвалена
     appeal_rejected:
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была адхілена.
       subject: Вашая апеляцыя ад %{date} была адхіленая
+      subtitle: Ваша абскарджанне было адхілена.
       title: Абскарджанне адхілена
     backup_ready:
-      explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
+      explanation: Вы запыталі поўную рэзервовую копію вашага ўліковага запісу Mastodon.
+      extra: Цяпер ён гатовы да загрузкі!
       subject: Ваш архіў гатовы да спампавання
       title: Ваш архіў можна спампаваць
+    failed_2fa:
+      details: 'Вось падрабязнасці ўваходу:'
+      explanation: Хтосьці спрабаваў увайсці ў ваш уліковы запіс, але ўвёў няправільны другі фактар аўтэнтыфікацыі.
+      further_actions_html: Калі гэта не вы, мы рэкамендуем неадкладна %{action}, бо ён можа быць скампраметаваны.
+      subject: Збой аўтэнтыфікацыі па другім фактары
+      title: Няўдалая аўтэнтыфікацыя па другім фактары
     suspicious_sign_in:
       change_password: змяніць свой пароль
       details: 'Вось падрабязнасці ўваходу:'
@@ -1889,13 +1920,46 @@ be:
         silence: Уліковы запіс абмежаваны
         suspend: Уліковы запіс выключаны
     welcome:
-      edit_profile_action: Наладзіць профіль
-      edit_profile_step: Вы можаце наладзіць свой профіль, запампаваўшы выяву профілю, змяніўшы адлюстраванае імя і іншае. Вы можаце праглядаць новых падпісчыкаў, перш чым ім будзе дазволена падпісацца на вас.
+      apps_android_action: Спампаваць з Google Play
+      apps_ios_action: Спампваваць з App Store
+      apps_step: Спампуйце нашыя афіцыйныя праграмы.
+      apps_title: Кліенты Mastodon
+      checklist_subtitle: 'Давайце паспрабуем разабрацца ў гэтай новай сацыяльнай сетцы:'
+      checklist_title: З чаго пачаць
+      edit_profile_action: Персаналізаваць
+      edit_profile_step: Узмацніце ўзаемадзеянне, запоўніўшы поўны профіль.
+      edit_profile_title: Наладзьце свой профіль
       explanation: Вось некаторыя парады каб пачаць
-      final_action: Пачаць пісаць
-      final_step: 'Пачынайце пісаць! Нават, калі ў вас няма падпісчыкаў, іншыя людзі змогуць пабачыць вашыя допісы, напрыклад, у лакальнай стужцы, або праз хэштэгі. Калі хочаце, вы можаце прадставіцца праз хэштэг #introductions.'
-      full_handle: Ваш поўны маркер
-      full_handle_hint: Гэта тое, што вы дасце сваім сябрам, каб яны маглі адпраўляць паведамленні або падпісацца на вас з іншага сервера.
+      feature_action: Даведацца больш
+      feature_audience: Mastodon дае ўнікальную магчымасць кіраваць сваёй аўдыторыяй без пасрэднікаў. Маючы сервер Mastodon, разгорнуты на ўласнай інфраструктуры, яго карыстальнікі могуць узаемадзейнічаць з любым іншым серверам Mastodon, не аддаючы кантроль у чужыя рукі.
+      feature_audience_title: Фармуйце сваю аўдыторыю з упэўненасцю
+      feature_control: Толькі вы дакладна ведаеце, што хочаце бачыць на сваім серверы. Ніякіх алгарытмаў або рэкламы, якія марнуюць ваш час. Сачыце за любым серверам Mastodon з аднаго ўліковага запісу і атрымлівайце паведамленні ў храналагічным парадку, каб ваш куток Інтэрнэту быў крыху падобны на вас.
+      feature_control_title: Кіруйце сваёй стужкай
+      feature_creativity: Mastodon падтрымлівае публікацыі з аўдыя, відэа і малюнкамі, апісаннем даступнасці, апытаннямі, папярэджаннямі аб змесце, аніміраванымі аватарамі, карыстальніцкімі эмодзі, мініяцюрамі, элементамі кіравання абрэзкай мініяцюр і іншым. Незалежна ад таго, дзеліцеся вы сваім мастацтвам, музыкай або падкастам, Mastodon тут для вас.
+      feature_creativity_title: Неабмежаваны творчы патэнцыял
+      feature_moderation: Mastodon вяртае прыняцце рашэнняў у вашыя рукі. У адрозненне ад сацыяльных сетак, якія належаць карпарацыям, якія спускаюць свае правілы зверху, кожны сервер Mastodon усталёўвае свае правілы і нормы, якія выконваюцца на мясцовым узроўні, што робіць іх найболей гнуткімі ў задавальненні запатрабаванняў розных груп людзей. Далучайцеся да сервера з правіламі, з якімі вы згодны, ці стварыце свой уласны.
+      feature_moderation_title: Мадэрацыя, якой яна павінна быць
+      follow_action: Падпісацца
+      follow_step: Падпіска на цікавых людзей - гэта галоўнае ў Mastodon.
+      follow_title: Наладзьце сваю хатнюю стужку
+      follows_subtitle: Падпішыцеся на папулярных карыстальнікаў
+      follows_title: На каго падпісацца
+      follows_view_more: Прагледзець больш людзей, на якіх варта падпісацца
+      hashtags_recent_count:
+        few: "%{people} чалавекі за апошнія 2 дні"
+        many: "%{people} чалавек за апошнія 2 дні"
+        one: "%{people} чалавек за апошнія 2 дні"
+        other: "%{people} чалавека за апошнія 2 дні"
+      hashtags_subtitle: Даведайцеся што было папулярна ў апошнія 2 дні
+      hashtags_title: Папулярныя хэштэгі
+      hashtags_view_more: Прагледзець іншыя папулярныя хэштэгі
+      post_action: Стварыць
+      post_step: Скажыце ўсім прывітанне з дапамогай тэксту, фатаграфій, відэа і апытанняў.
+      post_title: Стварыце свой першы допіс
+      share_action: Абагуліць
+      share_step: Няхай вашыя сябры ведаюць, як знайсці вас у Mastodon.
+      share_title: Абагульце ваш профіль у Mastodon
+      sign_in_action: Увайсці
       subject: Вітаем у Mastodon
       title: Рады вітаць вас, %{name}!
   users:
@@ -1903,6 +1967,7 @@ be:
     go_to_sso_account_settings: Перайдзіце ў налады ідэнтыфікацыі вашага ўліковага запісу
     invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
     otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
+    rate_limited: Занадта шмат спробаў аўтэнтыфікацыі, паспрабуйце пазней.
     seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
   verification:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 1865aa5fca..f242039ed8 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -7,7 +7,7 @@ bg:
     hosted_on: Mastodon е разположен на хост %{domain}
     title: Относно
   accounts:
-    follow: Последвай
+    follow: Последване
     followers:
       one: Последовател
       other: Последователи
@@ -28,7 +28,7 @@ bg:
       title: Извършване на модериращо действие за %{acct}
     account_moderation_notes:
       create: Оставяне на бележка
-      created_msg: Бележката за модерация е създадена успешно!
+      created_msg: Успешно създадена бележка за модерация!
       destroyed_msg: Успешно унищожена бележка за модериране!
     accounts:
       add_email_domain_block: Блокиране на домейн на имейл
@@ -597,6 +597,9 @@ bg:
       actions_description_html: Решете какво действие може да се предприеме, за да бъде отхвърлен докладът. Ако предприемете наказателно действие срещу докладвания акаунт, към него ще бъде изпратено известие по имейл, освен ако <strong>Спам</strong> категорията не е била избрана.
       actions_description_remote_html: Преценете с какво действие да решите този доклад. Това ще има ефекет върху това как <strong>вашият</strong> сървър комуникира с този отдалечен акаунт и се справя с неговото съдържание.
       add_to_report: Добавяне на още към доклада
+      already_suspended_badges:
+        local: Вече е спряно на този сървър
+        remote: Вече е спряно на сървъра им
       are_you_sure: Сигурни ли сте?
       assign_to_self: Назначаване на мен
       assigned: Назначен модератор
@@ -748,6 +751,7 @@ bg:
         desc_html: Това разчита на външни скриптове от hCaptcha, което може да е проблем за сигурността и поверителността. В допълнение <strong>това може да направи процеса на регистриране значимо по-малко достъпно за някои хора (особено с увреждания).</strong>. Заради тези причини, то обмислете алтернативни мерки такива като регистрация на базата на одобрение или на покана.
         title: Изисква се новите потребители да разгадават капчата, за да потвърдят акаунтите си
       content_retention:
+        danger_zone: Опасна зона
         preamble: Управление на това как съдържание, породено от потребители, се съхранява в Mastodon.
         title: Задържане на съдържание
       default_noindex:
@@ -757,7 +761,7 @@ bg:
         follow_recommendations: Препоръки за следване
         preamble: За потребители, които са нови и не познават никого в Mastodon, показването на интересно съдържание е ключово. Настройте начина, по който различни функции по откриване на съдържание работят на вашия сървър.
         profile_directory: Указател на профила
-        public_timelines: Публични часови оси
+        public_timelines: Публични хронологии
         publish_discovered_servers: Публикуване на откритите сървъри
         publish_statistics: Публикуване на статистиката
         title: Откриване
@@ -767,6 +771,7 @@ bg:
         disabled: До никого
         users: До влезнали локални потребители
       registrations:
+        moderation_recommandation: Уверете се, че имате адекватен и реактивен модераторски екип преди да отворите регистриранията за всеки!
         preamble: Управлява кой може да създава акаунт на сървъра ви.
         title: Регистрации
       registrations_mode:
@@ -774,6 +779,7 @@ bg:
           approved: Изисква се одобрение за регистриране
           none: Никой не може да се регистрира
           open: Всеки може да се регистрира
+        warning_hint: Препоръчваме употребата на „Изисква се одобрение за регистриране“, освен ако сте уверени, че екипът ви за модериране може да се справи със спама и зловредните регистрирания своевременно.
       security:
         authorized_fetch: Изисква се удостоверяване от федеративни сървъри
         authorized_fetch_hint: Изискването удостоверяване от феративните сървъри позволява по-строго прилагане на блокирания както на ниво потребител, така и на ниво сървър. Това обаче снижава производителността, намалява обхвата на вашите отговори и може да възникнат проблеми със съвместимостта с някои федеративни услуги. Освен това, то не пречи на посветени участници да извличат вашите обществени публикации и акаунти.
@@ -804,7 +810,7 @@ bg:
         remove_from_report: Премахване от доклада
         report: Докладване
       deleted: Изтрито
-      favourites: Любими
+      favourites: Харесвани
       history: История на версиите
       in_reply_to: Отговор до
       language: Език
@@ -840,7 +846,7 @@ bg:
       elasticsearch_health_yellow:
         message_html: Клъстерът Elasticsearch е нездрав (жълто състояние), може да искате да разследвате причината
       elasticsearch_index_mismatch:
-        message_html: Картографиранията на показатели в Elasticsearch са остарели. Пуснете <code>tootctl search deploy --only=%{value}</code>
+        message_html: Речниковите съответствия в Elasticsearch са с изтекла давност. Пуснете <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Преглед на документацията
         message_html: Вашият клъстер в Elasticsearch има повече от един възел, но Mastodon не е настроен да ги употребява.
@@ -905,14 +911,14 @@ bg:
       statuses:
         allow: Позволяване на публикацията
         allow_account: Позволяване на автора
-        description_html: Има публикации, за които сървърът ви знае, че в момента са често споделяни или означавани като любими. Биха помогнали на вашите нови и завръщащи се потребители да открият повече хора за последване. Никоя от публикациите няма да бъде показана публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предлган на другите. Може още да позволявате или отхвърляте отделни публикации.
+        description_html: Това са публикации, за които сървърът ви знае, че са често споделяни или харесвани в момента. Това може да помогне на вашите нови и завръщащи се потребители да открият повече хора за следване. Никоя от публикациите няма да бъде показана публично, докато не одобрите автора и докато авторът не позволи акаунтът му да бъде предлган на другите. Също така можете да позволявате или отхвърляте отделни публикации.
         disallow: Забраняване на публикацията
         disallow_account: Забрана на автора
         no_status_selected: Няма промяна, тъй като няма избрана нашумяла публикация
         not_discoverable: Авторът не е избрал да е откриваем
         shared_by:
-          one: Споделено или сложено веднъж в любими
-          other: Споделено или сложено в любими %{friendly_count} пъти
+          one: Споделено или харесано веднъж
+          other: Споделено или харесано %{friendly_count} пъти
         title: Налагащи се публикации
       tags:
         current_score: Текущ резултат %{score}
@@ -966,6 +972,9 @@ bg:
       title: Уебкуки
       webhook: Уебкука
   admin_mailer:
+    auto_close_registrations:
+      body: Поради липса на скорошна дейност по модериране, регистрациите на %{instance} бяха самодейно превключени в режим, изискващ ръчна проверка, за да се предотврати употребата на %{instance} като платформа за потенциални зложелатели. Може да превключите обратно в режим „отворено регистриране“ по всяко време.
+      subject: Регистриранията за %{instance} са самодейно превключени към изискване на одобрение
     new_appeal:
       actions:
         delete_statuses: за изтриване на публикациите им
@@ -1009,7 +1018,7 @@ bg:
     remove: Разкачвне на псевдонима
   appearance:
     advanced_web_interface: Разширен уеб интерфейс
-    advanced_web_interface_hint: 'Ако желаете да се възползвате от пълната ширина на своя екран, разширеният уеб интерфейс ще ви позволи да настроите най-различни колони, за да виждате едновременно множество информация: Начало, известия, федериран инфопоток, множество списъци и хаштагове.'
+    advanced_web_interface_hint: 'Ако искате да употребявате цялата ширина на екрана си, разширеният уеб интерфейс ви позволява да настроите най-различни колони, за да виждате едновременно множество сведения, колкото искате: Начало, известия, федеративен инфоканал, произволен брой списъци и хаштагове.'
     animations_and_accessibility: Анимация и достъпност
     confirmation_dialogs: Диалогов прозорец за потвърждение
     discovery: Откриване
@@ -1231,13 +1240,13 @@ bg:
     add_new: Добавяне на нов
     errors:
       limit: Вече достигнахте максималния брой хаштагове
-    hint_html: "<strong>Какво представляват актуалните хаштагове?</strong> Те се показват ясно на вашия публичен профил и позволяват на хората да преглеждат публичните ви публикации с тези хаштагове. Те са чудесен инструмент, с който може да се следи творческа работа или дългосрочни проекти."
+    hint_html: "<strong>Изтъкнете най-важните си хаштагове на профила?</strong> Чудесен инструмент за организиране на вашите творби и дългосрочни проекти, изтъкнатите хаштагове са отчетливо видими на вашия профил и позволяват лесен достъп до вашите собствени публикации."
   filters:
     contexts:
       account: Профили
       home: Начало и списъци
       notifications: Известия
-      public: Публични инфопотоци
+      public: Публични хронологии
       thread: Разговори
     edit:
       add_keyword: Добавяне на ключова дума
@@ -1400,11 +1409,11 @@ bg:
       confirmation_html: Наистина ли искате да спрете абонамента от получаването на %{type} за Mastodon в %{domain} към имейла си при %{email}? Може винаги пак да се абонирате от своите <a href="%{settings_path}">настройки за известяване по е-поща</a>.
       emails:
         notification_emails:
-          favourite: е-писма с любими известия
+          favourite: е-писма за харесани известия
           follow: е-писма с известия за последване
           follow_request: е-писма със заявки за следване
           mention: е-писма с известия за споменаване
-          reblog: е-писма с известия за подсилване
+          reblog: е-писма с известия за раздуване
       resubscribe_html: Ако погрешка сте спрели абонамента, то може пак да се абонирате от своите <a href="%{settings_path}">настройки за известия по е-поща</a>.
       success_html: Повече няма да получавате %{type} за Mastodon в %{domain} към имейла си при %{email}.
       title: Спиране на абонамента
@@ -1459,9 +1468,9 @@ bg:
       sign_up:
         subject: "%{name} се регистрира"
     favourite:
-      body: 'Вашата публикация беше добавена в любими от %{name}:'
+      body: 'Вашата публикация беше харесана от %{name}:'
       subject: "%{name} хареса вашата публикация"
-      title: Нова любима публикация
+      title: Нова харесана публикация
     follow:
       body: "%{name} те последва!"
       subject: "%{name} те последва"
@@ -1479,9 +1488,9 @@ bg:
     poll:
       subject: Анкетата от %{name} приключи
     reblog:
-      body: 'Ваша публикация беше подсилена от %{name}:'
-      subject: "%{name} подсили ваша публикация"
-      title: Ново подсилване
+      body: 'Ваша публикация беше раздута от %{name}:'
+      subject: "%{name} разду ваша публикация"
+      title: Ново раздуване
     status:
       subject: "%{name} току-що публикува"
     update:
@@ -1490,7 +1499,6 @@ bg:
     administration_emails: Администраторски известия по имейла
     email_events: Събития за известия по имейл
     email_events_hint: 'Изберете събития, за които искате да получавате известия:'
-    other_settings: Настройки за други известия
   number:
     human:
       decimal_units:
@@ -1530,7 +1538,7 @@ bg:
   preferences:
     other: Друго
     posting_defaults: По подразбиране за публикации
-    public_timelines: Публични инфопотоци
+    public_timelines: Публични хронологии
   privacy:
     hint_html: "<strong>Персонализирайте как искате профилът ви и публикациите ви да се намират.</strong> Разнообразие от функции в Mastodon може да ви помогнат да достигнете по-широка публика, когато е включено. Отделете малко време, за да прегледате тези настройки, за да се уверите, че отговарят на вашия случай на употреба."
     privacy: Поверителност
@@ -1546,6 +1554,9 @@ bg:
     errors:
       limit_reached: Ограничението на различни реакции е достигнат
       unrecognized_emoji: не е разпознато емоджи
+  redirects:
+    prompt: Ако вярвате на тази връзка, то щракнете на нея, за да продължите.
+    title: Напускате %{instance}.
   relationships:
     activity: Дейност на акаунта
     confirm_follow_selected_followers: Наистина ли искате да последвате избраните последователи?
@@ -1608,6 +1619,7 @@ bg:
       unknown_browser: Неизвестен браузър
       weibo: Weibo
     current_session: Текуща сесия
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Това са уеб браузърите, от които в момента сте влезли с вашия Mastodon акаунт.
     ip: IP адрес
@@ -1644,14 +1656,26 @@ bg:
     import: Импортиране
     import_and_export: Импортиране и експортиране
     migrate: Миграция на акаунта
-    notifications: Известия
+    notifications: Известия по имейла
     preferences: Предпочитания
     profile: Профил
     relationships: Последвания и последователи
+    severed_relationships: Прекъснати връзки
     statuses_cleanup: Автоматично изтриване на публикации
     strikes: Модериране на предупреждения
     two_factor_authentication: Двустепенно удостоверяване
     webauthn_authentication: Ключове за сигурност
+  severed_relationships:
+    download: Изтегляне (%{count})
+    event_type:
+      account_suspension: Спиране на акаунта (%{target_name})
+      domain_block: Спиране на сървъра (%{target_name})
+      user_domain_block: Блокирахте %{target_name}
+    lost_followers: Загубени последователи
+    lost_follows: Загубени последвания
+    preamble: Може да загубите последванията и последователите, блокирайки домейн или когато модераторите ви решават да спрат отдалечен сървър. Случавайки се това, вие ще може да изтеглите списъците с прекъснати връзки, които да се проверят и възможно да се внесат на друг сървър.
+    purged: Сведенията за този сървър са били прочистени от администраторите на сървъра ви.
+    type: Събитие
   statuses:
     attached:
       audio:
@@ -1664,7 +1688,7 @@ bg:
       video:
         one: "%{count} видео"
         other: "%{count} видеозаписа"
-    boosted_from_html: Подсилено от %{acct_link}
+    boosted_from_html: Раздуто от %{acct_link}
     content_warning: 'Предупреждение за съдържание: %{warning}'
     default_language: Същият като езика на интерфейса
     disallowed_hashtags:
@@ -1676,10 +1700,10 @@ bg:
     open_in_web: Отвори в уеб
     over_character_limit: прехвърлен лимит от %{max} символа
     pin_errors:
-      direct: Публикациите, които са видими само за споменати потребители не може да се закачат
+      direct: Публикациите, които са видими само за потребители споменати в тях, не могат да бъдат закачани
       limit: Вече сте закачили максималния брой публикации
-      ownership: Публикация на някого другиго не може да се закачи
-      reblog: Подсилване не може да се закача
+      ownership: Публикация на някого другиго не може да бъде закачена
+      reblog: Раздуване не може да бъде закачано
     poll:
       total_people:
         one: "%{count} човек"
@@ -1689,8 +1713,6 @@ bg:
         other: "%{count} гласа"
       vote: Гласуване
     show_more: Покажи повече
-    show_newer: Показване на по-нови
-    show_older: Показване на по-стари
     show_thread: Показване на нишката
     title: "%{name}: „%{quote}“"
     visibilities:
@@ -1700,27 +1722,27 @@ bg:
       public: Публично
       public_long: Всеки ги вижда
       unlisted: Публично, но не показвай в публичния канал
-      unlisted_long: Всеки ги вижда, но са скрити от публичните инфопотоци
+      unlisted_long: Всеки ги вижда, но са скрити от публичните хронологии
   statuses_cleanup:
     enabled: Автоматично изтриване на стари публикации
     enabled_hint: От само себе си трие публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу
     exceptions: Изключения
     explanation: Тъй като изтриването на публикации е скъпа операция, това се прави бавно във времето, когато сървърът иначе не е зает. Поради тази причина публикациите ви може да се изтрият известно време след като достигнат възрастовия праг.
     ignore_favs: Игнориране на харесвания
-    ignore_reblogs: Игнориране на подсилвания
+    ignore_reblogs: Игнориране на раздувания
     interaction_exceptions: Изключения въз основа на взаимодействия
-    interaction_exceptions_explanation: Забележете, че няма гаранция, че публикацията ще се изтрият, ако паднат под прага на брой маркирания като любими/подсилвания, след като са го надвишили.
+    interaction_exceptions_explanation: Забележете, че няма гаранция, че публикациите ще бъдат изтрити, ако паднат под прага на брой маркирания като харесвани или раздувани, след като са го надвишили.
     keep_direct: Запазване на директните съобщения
     keep_direct_hint: Директните ви съобщения не се изтриват
     keep_media: Задържане на публикации с прикачена мултимедия
     keep_media_hint: Не изтрива публикации, които съдържат мултимедийни прикачвания
-    keep_pinned: Запазване на закачените публикации
-    keep_pinned_hint: Не изтрива закачени публикации
+    keep_pinned: Задържане на закачените публикации
+    keep_pinned_hint: Не изтрива закачените ви публикации
     keep_polls: Запазване на запитванията
     keep_polls_hint: Не изтрива запитвания
     keep_self_bookmark: Запазване на публикации, добавени в отметки
     keep_self_bookmark_hint: Не се изтриват ваши публикации, ако сте ги добавили към отметки
-    keep_self_fav: Запазване на публикации, които сте маркирали като любими
+    keep_self_fav: Задържане на публикации, които сте харесали
     keep_self_fav_hint: Не се изтриват публикации, които сте харесали
     min_age:
       '1209600': 2 седмици
@@ -1732,10 +1754,10 @@ bg:
       '63113904': 2 години
       '7889238': 3 месеца
     min_age_label: Възрастов праг
-    min_favs: Запазване на публикации, маркирани като любими поне
-    min_favs_hint: Не се изтриват никоя от публикациите ви, маркирани като любими поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя маркирания като любими
-    min_reblogs: Запазване на публикации с поне толкова споделяния
-    min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от техния брой споделяния
+    min_favs: Запазване на харесани публикации поне
+    min_favs_hint: Не се изтрива никоя от публикациите, които сте харесали поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя харесвания
+    min_reblogs: Запазване на публикации с поне толкова раздувания
+    min_reblogs_hint: Не се изтриват ваши публикации, споделени поне толкова пъти. Оставете празно, за да изтриете публикациите независимо от броя на техния раздувания
   stream_entries:
     sensitive_content: Деликатно съдържание
   strikes:
@@ -1747,6 +1769,7 @@ bg:
     contrast: Mastodon (висок контраст)
     default: Mastodon (тъмно)
     mastodon-light: Mastodon (светло)
+    system: Самодейно (употреба на системната тема)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
@@ -1774,18 +1797,27 @@ bg:
     webauthn: Ключове за сигурност
   user_mailer:
     appeal_approved:
-      action: Към акаунта ви
+      action: Настройки на акаунта
       explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е приета. Вашият акаунт е отново с добра репутация.
       subject: Вашето обжалване от %{date} е било одобрено
+      subtitle: Вашият акаунт още веднъж е в добра репутация.
       title: Одобрено обжалване
     appeal_rejected:
       explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е отхвърлена.
       subject: Вашето обжалване от %{date} е било отхвърлено
+      subtitle: Обжалването ви е отхвърлено.
       title: Отхвърлено обжалване
     backup_ready:
-      explanation: Изискахте пълно резервно копиране на акаунта си в Mastodon. Вече е готово за изтегляне!
+      explanation: Изисквахте пълно резервно копие на акаунта си в Mastodon.
+      extra: Вече е готово за теглене!
       subject: Вашият архив е готов за изтегляне
       title: Сваляне на архива
+    failed_2fa:
+      details: 'Ето подробности на опита за влизане:'
+      explanation: Някой се опита да влезе в акаунта ви, но предостави невалиден втори фактор за удостоверяване.
+      further_actions_html: Ако не бяхте вие, то препоръчваме да направите %{action} незабавно, тъй като може да се злепостави.
+      subject: Неуспешен втори фактор за удостоверяване
+      title: Провал на втория фактор за удостоверяване
     suspicious_sign_in:
       change_password: промяна на паролата ви
       details: 'Ето подробности при вход:'
@@ -1825,13 +1857,44 @@ bg:
         silence: Акаунтът има ограничение
         suspend: Акаунтът е спрян
     welcome:
-      edit_profile_action: Настройване на профила
-      edit_profile_step: Може да настроите профила си, качвайки снимката на профила, променяйки показваното си име и други неща. Може да се включите за преглед на нови последователи преди да бъдат позволени да ви последват.
+      apps_android_action: Вземане от Google Play
+      apps_ios_action: Изтегляне в App Store
+      apps_step: Изтегляне на служебните ни приложения.
+      apps_title: Приложения на Mastodon
+      checklist_subtitle: 'Нека започнем приключение в тази нова социална граница:'
+      checklist_title: Добре дошли при контролния списък
+      edit_profile_action: Персонализиране
+      edit_profile_step: Подсилете взаимодействията си, изграждайки цялостен профил.
+      edit_profile_title: Пригодете профила си
       explanation: Ето няколко стъпки за начало
-      final_action: Начало на публикуване
-      final_step: 'Публикувайте! Дори без последователи, вашите публични публикации ще бъдат видени от други, например в местния инфопоток или под хаштагове. Не забравяйте да се представите с хаштаг #introductions.'
-      full_handle: Пълното ви име
-      full_handle_hint: Ето какво бихте казали на приятелите си, за да могат да ви изпращат съобщения или да ви последват от друг сървър.
+      feature_action: Научете повече
+      feature_audience: Mastodon ви осигурява с неповторимата възможност на управление на публиката ви без посредници. Mastodon се разгръща на ваша собствена инфраструктура, позволяваща ви да следвате и да бъдете последвани от всеки друг сървър на Mastodon в мрежата и не е под ничий контрол освен ваш.
+      feature_audience_title: Изградете публиката си с увереност
+      feature_control: Вие знаете най-добре какво искате да виждате на началния си инфоканал. Няма алгоритми или реклами, за да ви губят времето. Последвате всекиго през всеки сървър на Mastodon от един акаунт и получавате публикациите им в хронологичен ред, а и правете свое кътче в интернет малко по-подобно на вас.
+      feature_control_title: Поддържайте управлението на часовата си ос
+      feature_creativity: Mastodon поддържа публикации със звук, картина и видео, описания на достъпността, анкети, предупреждения за съдържание, анимирани аватари, потребителски емоджита, контрол на изрязване на миниобрази и още, за да ви помогнат да се изразите в мрежата. Независимо дали публикувате свое изкуство, музика или свой подкаст, то Mastodon е там за вас.
+      feature_creativity_title: Несравнимо творчество
+      feature_moderation: Mastodon връща вземането на решения в ръцете ви. Всеки сървър сътворява свои правила и регулации, прилагащи се локално, а не отгоре надолу като корпоративна социална медия, което го прави най-гъвкав в отговор на нуждите на различни групи хора. Присъединете се към сървър, с който сте съгласни, или пък си хоствайте свой.
+      feature_moderation_title: Модерирайте начина, по който трябва да е
+      follow_action: Последване
+      follow_step: Последването на интересни хора е основната цел на Mastodon.
+      follow_title: Персонализиране на началния ви инфоканал
+      follows_subtitle: Следвайте добре известни акаунти
+      follows_title: Кого да се последва
+      follows_view_more: Преглед на още хора за последване
+      hashtags_recent_count:
+        one: "%{people} лице през последните 2 дни"
+        other: "%{people} души през последните 2 дни"
+      hashtags_subtitle: Проучете какво изгрява от последните 2 дни
+      hashtags_title: Изгряващи хаштагове
+      hashtags_view_more: Преглед на още изгряващи хаштагове
+      post_action: Съставяне
+      post_step: Поздравете света с текст, снимки, видео или анкети.
+      post_title: Направете първата си публикация
+      share_action: Споделяне
+      share_step: Позволете на приятелите си да знаят как да ви намират в Mastodon.
+      share_title: Споделете профила си в Mastodon
+      sign_in_action: Вход
       subject: Добре дошли в Mastodon
       title: Добре дошли на борда, %{name}!
   users:
@@ -1839,6 +1902,7 @@ bg:
     go_to_sso_account_settings: Отидете при настройките на акаунта на своя доставчик на идентичност
     invalid_otp_token: Невалиден код
     otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
+    rate_limited: Премного опити за удостоверяване. Опитайте пак по-късно.
     seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
     signed_in_as: 'Влезли като:'
   verification:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8a70a90cfe..03537a5b80 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -3,6 +3,7 @@ br:
   about:
     contact_missing: Andermenet
     contact_unavailable: N'eus ket
+    hosted_on: Servijer Mastodon herberc'hiet war %{domain}
     title: Diwar-benn
   accounts:
     follow: Heuliañ
@@ -135,6 +136,9 @@ br:
     disputes:
       appeals:
         title: Galvoù
+    domain_allows:
+      export: Ezporzhiañ
+      import: Enporzhiañ
     domain_blocks:
       domain: Domani
       new:
@@ -151,6 +155,8 @@ br:
       domain: Domani
       new:
         create: Ouzhpenniñ un domani
+    export_domain_allows:
+      no_file: Restr ebet diuzet
     follow_recommendations:
       status: Statud
       suppressed: Dilamet
@@ -239,6 +245,8 @@ br:
         title: Diwar-benn
       appearance:
         title: Neuz
+      content_retention:
+        danger_zone: Takad dañjer
       discovery:
         title: Dizoloadur
         trends: Luskadoù
@@ -265,10 +273,12 @@ br:
         delete_statuses: Dilamet eo bet toudoù %{target} gant %{name}
     trends:
       allow: Aotren
+      approved: Aprouet
       links:
         allow: Aotren al liamm
       preview_card_providers:
         title: Embannerien·ezed
+      rejected: Nac'het
       statuses:
         allow: Aotren ar c'hannad
       tags:
@@ -297,6 +307,9 @@ br:
         title: Hashtagoù diouzh ar c'hiz
   appearance:
     discovery: Dizoloadur
+    localization:
+      body: Gant tud a-youl vat eo troet Mastodon.
+      guide_link: https://crowdin.com/project/mastodon
   application_mailer:
     view: 'Sellet :'
     view_status: Gwelet ar c'hannad
@@ -373,10 +386,12 @@ br:
         title: Toudoù silet
   generic:
     all: Pep tra
+    changes_saved_msg: Enrollet eo bet ar cheñchamantoù gant berzh!
     copy: Eilañ
     delete: Dilemel
     none: Hini ebet
     order_by: Urzhiañ dre
+    save_changes: Enrollañ ar cheñchamantoù
     today: hiziv
   imports:
     modes:
@@ -443,6 +458,9 @@ br:
   preferences:
     other: All
     posting_defaults: Arventennoù embann dre ziouer
+  redirects:
+    prompt: M'ho peus fiziañs el liamm-mañ, klikit warnañ evit kenderc'hel.
+    title: O kuitaat %{instance} emaoc'h.
   relationships:
     dormant: O kousket
     followers: Heulier·ezed·ien
@@ -471,6 +489,7 @@ br:
       safari: Safari
       uc_browser: UC Browser
       weibo: Weibo
+    date: Deiziad
     description: "%{browser} war %{platform}"
     ip: IP
     platforms:
@@ -484,6 +503,7 @@ br:
   settings:
     account: Kont
     account_settings: Arventennoù ar gont
+    back: Distreiñ da vMastodon
     development: Diorren
     edit_profile: Kemmañ ar profil
     featured_tags: Hashtagoù pennañ
@@ -517,18 +537,23 @@ br:
       '604800': 1 sizhunvezh
       '63113904': 2 vloavezh
   themes:
-    default: Mastodoñ (Teñval)
-    mastodon-light: Mastodoñ (Sklaer)
+    default: Mastodon (Teñval)
+    mastodon-light: Mastodon (Sklaer)
   time:
     formats:
       default: "%d a viz %b %Y, %H:%M"
       month: Miz %b %Y
       time: "%H:%M"
+      with_time_zone: "%d a viz %b %Y, %H:%M %Z"
   two_factor_authentication:
     add: Ouzhpennañ
     disable: Diweredekaat
     edit: Kemmañ
   user_mailer:
+    appeal_approved:
+      action: Arventennoù ar gont
+    backup_ready:
+      extra: Prest eo da vezañ pellgarget!
     warning:
       categories:
         spam: Spam
@@ -537,8 +562,17 @@ br:
       title:
         none: Diwall
     welcome:
-      edit_profile_action: Kefluniañ ar profil
-      subject: Donemat e Mastodoñ
+      apps_android_action: Tapit anezhañ war Google Play
+      apps_ios_action: Pellgargañ war an App Store
+      apps_step: Pellgargit hon arloadoù ofisiel.
+      apps_title: Arloadoù Mastodon
+      edit_profile_action: Personelaat
+      edit_profile_title: Personelaat ho profil
+      feature_action: Gouzout hiroc'h
+      follow_action: Heuliañ
+      share_action: Rannañ
+      sign_in_action: Kevreañ
+      subject: Donemat e Mastodon
       title: Degemer mat e bourzh, %{name}!
   users:
     follow_limit_reached: N'hallit ket heulian muioc'h eget %{limit} a zen
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 25f19ef25f..08fef73642 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -425,7 +425,7 @@ ca:
       view: Veure el bloqueig del domini
     email_domain_blocks:
       add_new: Afegir nou
-      allow_registrations_with_approval: Registre permès amb validació
+      allow_registrations_with_approval: Permet els registres amb validació
       attempts_over_week:
         one: "%{count} intent en la darrera setmana"
         other: "%{count} intents de registre en la darrera setmana"
@@ -597,6 +597,9 @@ ca:
       actions_description_html: Decideix quina acció a prendre per a resoldre aquest informe. Si prens un acció punitiva contra el compte denunciat, se li enviarà una notificació per correu electrònic, excepte quan se selecciona la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
       add_to_report: Afegir més al informe
+      already_suspended_badges:
+        local: Ja és suspès en aquest servidor
+        remote: Ja és suspès al seu servidor
       are_you_sure: Segur?
       assign_to_self: Assigna'm
       assigned: Moderador assignat
@@ -748,6 +751,7 @@ ca:
         desc_html: Això es basa en scripts externs de hCaptcha, que poden ser un problema de privacitat i seguretat. A més, <strong>això pot fer que el procés de registre sigui significativament menys accesible per algunes (especialment discapacitades) persones</strong>. Per aquestes raons, si us plau considera alternatives com ara registre amb aprovació necessària o basada en invitacions.
         title: Demana als nous usuaris que resolguin un CAPTCHA per a confirmar el seu compte
       content_retention:
+        danger_zone: Zona de perill
         preamble: Controla com es desa a Mastodon el contingut generat per l'usuari.
         title: Retenció de contingut
       default_noindex:
@@ -767,6 +771,7 @@ ca:
         disabled: Per a ningú
         users: Per als usuaris locals en línia
       registrations:
+        moderation_recommandation: Assegureu-vos de tenir un equip de moderadors adient i actiu abans d'obrir l'alta de comptes al públic!
         preamble: Controla qui pot crear un compte en el teu servidor.
         title: Registres
       registrations_mode:
@@ -774,6 +779,7 @@ ca:
           approved: Cal l’aprovació per a registrar-se
           none: No es pot registrar ningú
           open: Qualsevol pot registrar-se
+        warning_hint: Recomanem utilitzar l'opció "Es requereix aprovació per a donar-se d'alta" si no teniu un equip de moderadors que puguin gestionar els enviaments de brossa o maliciosos en un temps raonable.
       security:
         authorized_fetch: Requereix autenticació dels servidors federats
         authorized_fetch_hint: Requerir l'autenticació dels servidors federats permet una aplicació més estricta dels bloqueigs a nivell d'usuari i a nivell de servidor. Tanmateix, això provoca una penalització del rendiment, redueix l'abast de les seves respostes i pot introduir problemes de compatibilitat amb alguns serveis federats. A més, això no impedirà que els actors dedicats busquin les teves publicacions i comptes públics.
@@ -966,6 +972,9 @@ ca:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A causa de la manca d'activitat recent dels moderadors, s'ha passat el procés d'alta de %{instance} al mode de revisió manual, a fi d'evitar que malfactors l'utilitzin com a plataforma. Podeu obrir el procés de registre en qualsevol moment.
+      subject: S'ha passat el procés d'alta de %{instance} al mode de validació manual
     new_appeal:
       actions:
         delete_statuses: eliminar els seus tuts
@@ -1046,6 +1055,7 @@ ca:
       clicking_this_link: en clicar aquest enllaç
       login_link: inici de sessió
       proceed_to_login_html: Ara pots passar a %{login_link}.
+      redirect_to_app_html: Se us hauria d'haver redirigit a l'app <strong>%{app_name}</strong>. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
       registration_complete: La teva inscripció a %{domain} ja és completa.
       welcome_title: Hola, %{name}!
       wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
@@ -1109,6 +1119,7 @@ ca:
       functional: El teu compte està completament operatiu.
       pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
       redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
+      self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
       view_strikes: Veure accions del passat contra el teu compte
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
     use_security_key: Usa clau de seguretat
@@ -1488,7 +1499,6 @@ ca:
     administration_emails: Notificacions per correu-e de l'Admin
     email_events: Esdeveniments per a notificacions de correu electrònic
     email_events_hint: 'Selecciona els esdeveniments per als quals vols rebre notificacions:'
-    other_settings: Altres opcions de notificació
   number:
     human:
       decimal_units:
@@ -1544,6 +1554,9 @@ ca:
     errors:
       limit_reached: Límit de diferents reaccions assolit
       unrecognized_emoji: no és un emoji reconegut
+  redirects:
+    prompt: Si confieu en aquest enllaç, feu-hi clic per a continuar.
+    title: Deixeu %{instance}.
   relationships:
     activity: Activitat del compte
     confirm_follow_selected_followers: Segur que vols seguir els seguidors seleccionats?
@@ -1573,13 +1586,14 @@ ca:
   rss:
     content_warning: 'Avís de contingut:'
     descriptions:
-      account: Publicacions des de @%{acct}
+      account: Publicacions públiques de @%{acct}
       tag: 'Tuts etiquetats #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Has superat el límit de %{limit} tuts programats per a avui
     over_total_limit: Has superat el límit de %{limit} tuts programats
     too_soon: La data programada ha de ser futura
   self_destruct:
+    lead_html: Lamentablement, <strong>%{domain}</strong> tanca de forma definitiva. Si hi teníeu un compte, no el podreu continuar utilitzant, però podeu demanar una còpia de les vostres dades.
     title: Aquest servidor tancarà
   sessions:
     activity: Última activitat
@@ -1605,6 +1619,7 @@ ca:
       unknown_browser: Navegador Desconegut
       weibo: Weibo
     current_session: Sessió actual
+    date: Data
     description: "%{browser} de %{platform}"
     explanation: Aquests són els navegadors web que actualment han iniciat la sessió amb el teu compte de Mastodon.
     ip: IP
@@ -1641,14 +1656,26 @@ ca:
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
-    notifications: Notificacions
+    notifications: Notificacions per correu electrònic
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
+    severed_relationships: Relacions eliminades
     statuses_cleanup: Esborrat automàtic de tuts
     strikes: Accions de mediació
     two_factor_authentication: Autenticació de dos factors
     webauthn_authentication: Claus de seguretat
+  severed_relationships:
+    download: Baixa (%{count})
+    event_type:
+      account_suspension: Suspensió del compte (%{target_name})
+      domain_block: Suspensió del servidor (%{target_name})
+      user_domain_block: Heu blocat %{target_name}
+    lost_followers: Seguidors perduts
+    lost_follows: Seguiments perduts
+    preamble: Quan bloqueu un domini o els vostres moderadors decideixen suspendre un servidor remot, podeu perdre seguidors i seguiments. Si passa, podeu baixar la llista de relacions trencades per a revisar-la i, de cas, importar-la a un altre servidor.
+    purged: Els administradors del vostre servidor han purgat la informació relativa a aquest servidor.
+    type: Esdeveniment
   statuses:
     attached:
       audio:
@@ -1686,8 +1713,6 @@ ca:
         other: "%{count} vots"
       vote: Vota
     show_more: Mostra'n més
-    show_newer: Mostra els més nous
-    show_older: Mostra els més vells
     show_thread: Mostra el fil
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1718,7 +1743,7 @@ ca:
     keep_self_bookmark: Mantenir els tuts que has desat a les adreces d'interès
     keep_self_bookmark_hint: No esborra els teus propis tuts si els has desat en les adreces d'interès
     keep_self_fav: Mantenir els tuts que has afavorit
-    keep_self_fav_hint: No esborra els teus propis tuts si les has afavorit
+    keep_self_fav_hint: No esborra les teves publicacions si les has afavorit
     min_age:
       '1209600': 2 setmanes
       '15778476': 6 mesos
@@ -1744,6 +1769,7 @@ ca:
     contrast: Mastodon (alt contrast)
     default: Mastodon (fosc)
     mastodon-light: Mastodon (clar)
+    system: Automàtic (utilitza el tema del sistema)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1771,18 +1797,27 @@ ca:
     webauthn: Claus de seguretat
   user_mailer:
     appeal_approved:
-      action: Ves al teu compte
+      action: Configuració del compte
       explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat aprovada. El teu compte torna a estar en bon estat.
       subject: La teva apel·lació del %{date} ha estat aprovada
+      subtitle: El vostre compte torna a estar correcte.
       title: Apel·lació aprovada
     appeal_rejected:
       explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat rebutjada.
       subject: La teva apel·lació del %{date} ha estat rebutjada
+      subtitle: S'ha rebutjat la vostra apel·lació.
       title: Apel·lació rebutjada
     backup_ready:
-      explanation: Has sol·licitat una copia completa del teu compte Mastodon. Ara ja està a punt per a descàrrega!
+      explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
+      extra: Ja la podeu baixar
       subject: L'arxiu està preparat per a descàrrega
       title: Recollida de l'arxiu
+    failed_2fa:
+      details: 'Aquests són els detalls de l''intent d''accés:'
+      explanation: Algú ha intentat accedir al vostre compte però no ha proporcionat un factor de doble autenticació correcte.
+      further_actions_html: Si no heu estat vosaltres, us recomanem que %{action} immediatament perquè pot estar compromès.
+      subject: Ha fallat el factor de doble autenticació
+      title: Ha fallat l'autenticació de doble factor
     suspicious_sign_in:
       change_password: canvia la teva contrasenya
       details: 'Aquest són els detalls de l''inici de sessió:'
@@ -1822,13 +1857,44 @@ ca:
         silence: Compte limitat
         suspend: Compte suspès
     welcome:
-      edit_profile_action: Configura el perfil
-      edit_profile_step: Pots personalitzar el teu perfil pujant-hi un avatar, canviant el teu nom de visualització i molt més. Si ho prefereixes, pots revisar els seguidors nous abans que et puguin seguir.
+      apps_android_action: Obteniu-lo a Google Play
+      apps_ios_action: Descarregueu-la de la botiga d'aplicacions
+      apps_step: Descarregueu-vos les aplicacions oficials.
+      apps_title: Aplicacions de Mastodon
+      checklist_subtitle: 'Inicieu-vos en aquesta nova frontera social:'
+      checklist_title: Control inicial
+      edit_profile_action: Personalitzeu
+      edit_profile_step: Augmenteu les vostres interaccions amb un perfil complet.
+      edit_profile_title: Personalitzeu el perfil
       explanation: Aquests són alguns consells per a començar
-      final_action: Comença a publicar
-      final_step: 'Comença a publicar! Fins i tot sense seguidors, els altres poden veure els teus missatges públics, per exemple, a la línia de temps local i a les etiquetes. És possible que vulguis presentar-te amb l''etiqueta #introductions.'
-      full_handle: El teu nom d'usuari sencer
-      full_handle_hint: Això és el que has de dir als teus amics perquè puguin enviar-te missatges o seguir-te des d'un altre servidor.
+      feature_action: Per a saber-ne més
+      feature_audience: Mastodon us proporciona una possibilitat única de gestionar la vostra audiència sense intermediaris. Instal·lat a la vostra pròpia infraestructura us permet seguir i ser seguit només per altres servidors Mastodon i ningú més que vosaltres el controla.
+      feature_audience_title: Construïu la vostra audiència en confiança
+      feature_control: Sabeu perfectament què voleu veure a la línia temporal. Sense algorismes ni anuncis que us facin malbaratar el temps. Seguiu qualsevol persona de qualsevol servidor Mastodon des d'un sol compte en ordre cronològic i feu-vos a mida un racó d'internet.
+      feature_control_title: Tingueu el control de la vostra línia temporal
+      feature_creativity: Mastodon us permet de publicar àudio, vídeo i imatges, descripcions d'accessibilitat, enquestes, avisos de contingut, avatars animats, emojis personalitzats, retallar miniatures i més, a fi d'ajudar-vos a expressar-vos en línia. Tant si publiqueu el vostre art, música o un podcast, Mastodon us ajudarà.
+      feature_creativity_title: Creativitat incomparable
+      feature_moderation: Mastodon posa les decisions a les vostres mans. Cada servidor crea les seves pròpies regles, que només s'apliquen als usuaris locals, a diferència de les xarxes socials corporatives, permetent una flexibilitat que s'adapta a tota mena de grups. Uniu-vos a un servidor si esteu d'acord amb les seves regles, o creeu-ne un.
+      feature_moderation_title: Moderant com ha de ser
+      follow_action: Seguiu
+      follow_step: Mastodon va de seguir gent interessant.
+      follow_title: Personalitzeu la pantalla d'inici
+      follows_subtitle: Seguiu comptes populars
+      follows_title: A qui seguir
+      follows_view_more: Més persones a qui seguir
+      hashtags_recent_count:
+        one: "%{people} persona en els 2 últims dies"
+        other: "%{people} persones en els 2 últims dies"
+      hashtags_subtitle: Exploreu què és tendència des de fa 2 dies
+      hashtags_title: Etiquetes en tendència
+      hashtags_view_more: Més etiquetes en tendència
+      post_action: Redacteu
+      post_step: Saludeu el món amb text, fotos, vídeos o enquestes.
+      post_title: Feu la primera publicació
+      share_action: Compartiu
+      share_step: Permeteu als vostres amics de saber com trobar-vos a Mastodon.
+      share_title: Compartiu el perfil
+      sign_in_action: Inicieu sessió
       subject: Et donem la benvinguda a Mastodon
       title: Benvingut a bord, %{name}!
   users:
@@ -1836,6 +1902,7 @@ ca:
     go_to_sso_account_settings: Ves a la configuració del compte del teu proveïdor d'identitat
     invalid_otp_token: El codi de dos factors no és correcte
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
+    rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
     seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
   verification:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 9a974b9ed7..dfa035eca8 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -521,11 +521,14 @@ ckb:
         all: بۆ هەموو کەسێک
         disabled: بۆ هیچ کەسێک
         users: بۆ چوونە ژوورەوەی بەکارهێنەرانی ناوخۆ
+      registrations:
+        moderation_recommandation: تکایە دڵنیابە پێش ئەوەی ناو تۆمارکردن بۆ هەمووان بکەیتەوە، تیمێکی میانڕەوی گونجاو و کاردانەوەتان هەیە!
       registrations_mode:
         modes:
           approved: پەسەندکردنی داواکراو بۆ ناوتۆمارکردن
           none: کەس ناتوانێت خۆی تۆمار بکات
           open: هەر کەسێک دەتوانێت خۆی تۆمار بکات
+        warning_hint: پێشنیار دەکەین "ڕەزامەندی پێویستە بۆ ناو تۆمارکردن" بەکاربهێنیت مەگەر دڵنیا بیت کە تیمی بەڕێوەبردنەکەت دەتوانێت لە کاتی خۆیدا مامەڵە لەگەڵ سپام و تۆمارکردنی زیانبەخشدا بکات.
     site_uploads:
       delete: سڕینەوەی فایلی بارکراو
       destroyed_msg: بارکردنی ماڵپەڕ بە سەرکەوتوویی سڕدراوەتەوە!
@@ -837,7 +840,6 @@ ckb:
   notifications:
     email_events: رووداوەکان بۆ ئاگاداری ئیمەیلی
     email_events_hint: 'ئەو ڕووداوانە دیاریبکە کە دەتەوێت ئاگانامەکان وەربگری بۆ:'
-    other_settings: ڕێکبەندەکانی ئاگانامەکانی تر
   otp_authentication:
     code_hint: کۆدێک داخڵ بکە کە دروست کراوە لەلایەن ئەپی ڕەسەنایەتیەوە بۆ دڵنیابوون
     description_html: ئەگەر تۆ <strong> هاتنەژوورەوەی دوو قۆناغی</strong> بە یارمەتی ئەپێکی پەسەندکردن چالاک بکەن، پێویستە بۆ چوونەژوورەوە ، بە تەلەفۆنەکەتان کە کۆدیکتان بۆ دروستدەکات دەستپێگەیشتنتان هەبێت.
@@ -940,7 +942,6 @@ ckb:
     import: هاوردن
     import_and_export: هاوردەکردن و ناردن
     migrate: گواستنەوەی هەژمارە
-    notifications: ئاگادارییەکان
     preferences: پەسەندەکان
     profile: پرۆفایل
     relationships: شوێنکەوتوو و شوێنکەوتوان
@@ -980,8 +981,6 @@ ckb:
         other: "%{count} دەنگەکان"
       vote: دەنگ
     show_more: زیاتر پیشان بدە
-    show_newer: نوێتر پیشان بدە
-    show_older: پیشاندانی کۆنتر
     show_thread: نیشاندانی ڕشتە
     visibilities:
       private: شوێنکەوتوانی تەنها
@@ -1015,7 +1014,6 @@ ckb:
     webauthn: کلیلەکانی پاراستن
   user_mailer:
     backup_ready:
-      explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
       subject: ئارشیڤی ئێوە ئامادەی داگرتنە
       title: وەرگرتنی ئارشیڤ
     warning:
@@ -1031,11 +1029,7 @@ ckb:
         silence: هەژماری سنووردار
         suspend: هەژمار ڕاگیرا
     welcome:
-      edit_profile_action: پرۆفایلی جێگیرکردن
       explanation: ئەمە چەند ئامۆژگارییەکن بۆ دەست پێکردنت
-      final_action: دەست بکە بە بڵاوکردنەوە
-      full_handle: ناوی بەکارهێنەری تەواوی ئێوە
-      full_handle_hint: ئەمە ئەو شتەیە کە بە هاوڕێکانت دەلێی بۆ ئەوەی پەیام یان لە ڕاژەیەکی دیکەی ترەوە بەدوات بکەون.
       subject: بەخێربیت بۆ ماستۆدۆن
       title: بەخێربێیت، بەکارهێنەر %{name}!
   users:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index e613ea7606..7d8abcd112 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -809,7 +809,6 @@ co:
   notifications:
     email_events: Avvenimenti da nutificà cù l'e-mail
     email_events_hint: 'Selezziunate l''avvenimenti per quelli vulete riceve nutificazione:'
-    other_settings: Altri parametri di nutificazione
   number:
     human:
       decimal_units:
@@ -927,7 +926,6 @@ co:
     import: Impurtazione
     import_and_export: Impurtazione è spurtazione
     migrate: Migrazione di u contu
-    notifications: Nutificazione
     preferences: Priferenze
     profile: Prufile
     relationships: Abbunamenti è abbunati
@@ -967,8 +965,6 @@ co:
         other: "%{count} voti"
       vote: Vutà
     show_more: Vede di più
-    show_newer: Vede i più ricenti
-    show_older: Vede i più anziani
     show_thread: Vede u filu
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1034,7 +1030,6 @@ co:
     webauthn: Chjave di sicurità
   user_mailer:
     backup_ready:
-      explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
       subject: U vostru archiviu hè prontu à scaricà
       title: Archiviu prontu
     warning:
@@ -1049,11 +1044,7 @@ co:
         silence: Contu limitatu
         suspend: Contu suspesu
     welcome:
-      edit_profile_action: Cunfigurazione di u prufile
       explanation: Eccu alcune idee per principià
-      final_action: Principià à pustà
-      full_handle: U vostru identificatore cumplettu
-      full_handle_hint: Quessu ghjè cio chì direte à i vostri amichi per circavi, abbunassi à u vostru contu da altrò, o mandà missaghji.
       subject: Benvenutu·a nant’à Mastodon
       title: Benvenutu·a, %{name}!
   users:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e3e804172a..5693077319 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -439,6 +439,7 @@ cs:
       view: Zobrazit blokaci domény
     email_domain_blocks:
       add_new: Přidat
+      allow_registrations_with_approval: Povolit registrace se schválením
       attempts_over_week:
         few: "%{count} pokusy o registraci za poslední týden"
         many: "%{count} pokusů o registraci za poslední týden"
@@ -620,6 +621,9 @@ cs:
       actions_description_html: Rozhodněte, který krok učinit pro vyřešení tohoto hlášení. Pokud podniknete kárný krok proti nahlášenému účtu, bude mu zasláno e-mailové oznámení, s výjimkou případu, kdy je zvolena kategorie <strong>Spam</strong>.
       actions_description_remote_html: Rozhodněte, co podniknout pro vyřešení tohoto hlášení. Toto ovlivní pouze to, jak <strong>váš</strong> server komunikuje s tímto vzdáleným účtem, a zpracuje jeho obsah.
       add_to_report: Přidat do hlášení další
+      already_suspended_badges:
+        local: Již pozastaveno na tomto serveru
+        remote: Již pozastaveno na jejich serveru
       are_you_sure: Jste si jisti?
       assign_to_self: Přidělit ke mně
       assigned: Přiřazený moderátor
@@ -635,6 +639,7 @@ cs:
       created_at: Nahlášené
       delete_and_resolve: Smazat příspěvky
       forwarded: Přeposláno
+      forwarded_replies_explanation: Toto hlášení je od uživatele z jiného serveru, a je o obsahu z jeho serveru. Byl převeden na vás, protože nahlášený obsah odpovídá jednomu z vašich uživatelů.
       forwarded_to: Přeposláno na %{domain}
       mark_as_resolved: Označit jako vyřešené
       mark_as_sensitive: Označit jako citlivé
@@ -645,7 +650,7 @@ cs:
         create_and_resolve: Vyřešit s poznámkou
         create_and_unresolve: Znovu otevřít s poznámkou
         delete: Smazat
-        placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality…
+        placeholder: Popište, jaké akce byly vykonány, nebo jakékoliv jiné související aktuality...
         title: Poznámky
       notes_description_html: Zobrazit a zanechat poznámky pro ostatní moderátory i sebe v budoucnu
       processed_msg: Nahlášení č.%{id} bylo úspěšně zpracováno
@@ -714,7 +719,7 @@ cs:
         administrator_description: Uživatelé s tímto oprávněním obejdou všechna oprávnění
         delete_user_data: Mazat uživatelská data
         delete_user_data_description: Umožňuje uživatelům bezodkladně mazat data jiných uživatelů
-        invite_users: Zvát uživatele
+        invite_users: Pozvat uživatele
         invite_users_description: Umožňuje uživatelům zvát na server nové lidi
         manage_announcements: Spravovat oznámení
         manage_announcements_description: Umožňuje uživatelům spravovat oznámení na serveru
@@ -774,6 +779,7 @@ cs:
         desc_html: Toto spoléhá na externí skripty z hCaptcha, což může být budit obavy o bezpečnost a soukromí. Navíc <strong>to může způsobit, že proces registrace bude pro některé osoby (zejména se zdravotním postižením) hůře přístupný</strong>. Z těchto důvodů zvažte alternativní přístup, jako je schvalování registrace nebo pozvánky.
         title: Vyžadovat po nových uživatelích, aby vyřešili CAPTCHU pro potvrzení jejich účtu
       content_retention:
+        danger_zone: Nebezpečná zóna
         preamble: Určuje, jak je obsah generovaný uživatelem uložen v Mastodonu.
         title: Uchovávání obsahu
       default_noindex:
@@ -793,22 +799,27 @@ cs:
         disabled: Nikomu
         users: Přihlášeným místním uživatelům
       registrations:
+        moderation_recommandation: Před otevřením registrací všem se ujistěte, že máte vhodný a reaktivní moderační tým!
         preamble: Mějte pod kontrolou, kdo může vytvořit účet na vašem serveru.
         title: Registrace
       registrations_mode:
         modes:
-          approved: Pro registraci je vyžadováno schválení
+          approved: Schválení požadované pro registraci
           none: Nikdo se nemůže registrovat
           open: Kdokoliv se může registrovat
+        warning_hint: Doporučujeme použít "Schválení požadované pro registraci", pokud si nejste jistí, že váš moderační tým dokáže včas zpracovat spam a škodlivé registrace.
       security:
         authorized_fetch: Vyžadovat autentizaci od federovaných serverů
+        authorized_fetch_hint: Vyžadování ověřování pravosti od federalizovaných serverů umožňuje přísnější prosazování uživatelských i serverních bloků. K tomu však dochází k snížení výkonu, snižení dosah vašich odpovědí a můžou se zavést problémy s kompatibilitou s některými federálními službami. Kromě toho to nebude bránit oddaným uživatelům či robotům v načítání vašich veřejných příspěvků a účtů.
         authorized_fetch_overridden_hint: Momentálně nemůžete změnit toto nastavení, protože je přepsáno proměnnou prostředí.
+        federation_authentication: Uplatnění ověřování pravosti federace
       title: Nastavení serveru
     site_uploads:
       delete: Odstranit nahraný soubor
       destroyed_msg: Upload stránky byl úspěšně smazán!
     software_updates:
       critical_update: Kritické — aktualizujte, prosím, co nejdříve
+      description: Doporučujeme udržovat vaši instalaci Mastodonu aktuální, aby se využily nejnovější opravy a funkce. Kromě toho je někdy velmi důležité včas aktualizovat Mastodon, aby se předešlo bezpečnostním problémům. Z těchto důvodů Mastodon kontroluje aktualizace každých 30 minut a bude vás informovat podle nastavení e-mailových oznámení.
       documentation_link: Zjistit více
       release_notes: Poznámky k vydání
       title: Dostupné aktualizace
@@ -997,6 +1008,9 @@ cs:
       title: Webhooky
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Kvůli nedostatku nedávných aktivit od moderátorů byly registrace na %{instance} automaticky přepnuty na vyžadující manuální kontrolu. aby se zabránilo použití %{instance} jako platformy pro potenciálně škodlivých hráčů. Můžete ji kdykoliv přepnout zpět na otevřené registrace.
+      subject: Registrace pro %{instance} byly automaticky přepnuty na vyžadující schválení
     new_appeal:
       actions:
         delete_statuses: smazání jeho příspěvků
@@ -1072,8 +1086,12 @@ cs:
       hint_html: Ještě jedna věc! Musíme potvrdit, že jste člověk (to proto, abychom drželi stranou spam!). Vyřešte CAPTCHA níže a klikněte na "Pokračovat".
       title: Bezpečnostní kontrola
     confirmations:
+      awaiting_review: Vaše e-mailová adresa je potvrzena! Personál %{domain} nyní kontrolují vaši registraci. Pokud váš účet schválí, obdržíte e-mail!
       awaiting_review_title: Vaše registrace se ověřuje
       clicking_this_link: kliknutím na tento odkaz
+      login_link: přihlásit se
+      proceed_to_login_html: Nyní můžete pokračovat do %{login_link}.
+      redirect_to_app_html: Měli byste být přesměrováni do aplikace <strong>%{app_name}</strong>. Pokud se tak nestalo, zkuste %{clicking_this_link} nebo ručně se vrátit do aplikace.
       registration_complete: Vaše registrace na %{domain} je hotová!
       welcome_title: Vítám uživatele %{name}!
       wrong_email_hint: Pokud není e-mail správný, můžete si ho změnit v nastavení účtu.
@@ -1244,7 +1262,7 @@ cs:
       date: Datum
       download: Stáhnout váš archiv
       hint_html: Můžete si vyžádat archiv vašich <strong>příspěvků a nahraných médií</strong>. Exportovaná data budou ve formátu ActivityPub a budou čitelná kterýmkoliv kompatibilním softwarem. Archiv si můžete vyžádat každých 7 dní.
-      in_progress: Kompiluji váš archiv…
+      in_progress: Kompilujeme váš archiv...
       request: Vyžádat váš archiv
       size: Velikost
     blocks: Blokujete
@@ -1354,6 +1372,20 @@ cs:
       merge_long: Ponechat existující záznamy a přidat nové
       overwrite: Přepsat
       overwrite_long: Nahradit aktuální záznamy novými
+    overwrite_preambles:
+      blocking_html: Chystáte se <strong>nahradit váš seznam bloků</strong> s <strong>%{total_items} účtami</strong> od <strong>%{filename}</strong>.
+      bookmarks_html: Chystáte se <strong>nahradit své záložky</strong> s <strong>%{total_items} příspěvků</strong> z <strong>%{filename}</strong>.
+      domain_blocking_html: Chystáte se <strong>nahradit seznam stránek</strong> s <strong>%{total_items} stránek</strong> z <strong>%{filename}</strong>.
+      following_html: Chystáte se <strong>sledovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong> a <strong>přestanete sledovat všechny ostatní</strong>.
+      lists_html: Chystáte se <strong>nahradit své seznamy</strong> obsahem <strong>%{filename}</strong>. Až <strong>%{total_items} účtů</strong> budou přidány do nových seznamů.
+      muting_html: Chystáte se <strong>nahradit seznam skrytých účtů</strong> s <strong>%{total_items} účtami</strong> z <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Chystáte se <strong>blokovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
+      bookmarks_html: Chystáte se přidat až <strong>%{total_items} příspěvků</strong> z <strong>%{filename}</strong> do vašich <strong>záložek</strong>.
+      domain_blocking_html: Chystáte se <strong>blokovat</strong> až <strong>%{total_items} stránek</strong> z <strong>%{filename}</strong>.
+      following_html: Chystáte se <strong>sledovat</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
+      lists_html: Chystáte se přidat <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong> do vaších <strong>seznamů</strong>. Nové seznamy budou vytvořeny, pokud neexistuje žádný seznam, do kterého by bylo možné přidat.
+      muting_html: Chystáte se <strong>skrýt</strong> až <strong>%{total_items} účtů</strong> z <strong>%{filename}</strong>.
     preface: Můžete importovat data, která jste exportovali z jiného serveru, jako například seznam lidí, které sledujete či blokujete.
     recent_imports: Nedávné importy
     states:
@@ -1369,8 +1401,12 @@ cs:
       bookmarks: Import záložek
       domain_blocking: Import blokovaných domén
       following: Import sledovaných účtů
-      muting: Import ztlumených účtů
+      lists: Příjmání seznamů
+      muting: Dovoz skrytých uživatelů
     type: Typ importu
+    type_groups:
+      constructive: Sledování a Záložky
+      destructive: Bloky & skrytí
     types:
       blocking: Seznam blokovaných
       bookmarks: Záložky
@@ -1391,6 +1427,7 @@ cs:
       '86400': 1 den
     expires_in_prompt: Nikdy
     generate: Vygenerovat zvací odkaz
+    invalid: Tato pozvánka není platná
     invited_by: 'Pozval váš uživatel:'
     max_uses:
       few: "%{count} použití"
@@ -1417,6 +1454,21 @@ cs:
     failed_sign_in_html: Neúspěšný pokus o přihlášení %{method} z %{ip} (%{browser})
     successful_sign_in_html: Úspěšné přihlášení %{method} z %{ip} (%{browser})
     title: Historie přihlášení
+  mail_subscriptions:
+    unsubscribe:
+      action: Ano, odeberte odběr
+      complete: Odběr byl odhlášen
+      confirmation_html: Opravdu nechcete dostávat %{type} pro Mastodon na %{domain} na váš e-mail %{email}? Vždy se můžete opět přihlásit do <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
+      emails:
+        notification_emails:
+          favourite: e-mailové oznámení při oblíbení
+          follow: e-mailové oznámení při sledování
+          follow_request: e-mail při žádost o sledování
+          mention: e-mailové oznámení při zmínění
+          reblog: e-mailové oznámení při boostu
+      resubscribe_html: Při omylu se můžete znovu přihlásit do vaších <a href="%{settings_path}">nastavení e-mailových oznámení</a>.
+      success_html: Již nebudete dostávat %{type} pro Mastodon na %{domain} na vaší e-mailové adrese %{email}.
+      title: Odhlásit odběr
   media_attachments:
     validations:
       images_and_video: K příspěvku, který již obsahuje obrázky, nelze připojit video
@@ -1496,9 +1548,9 @@ cs:
     update:
       subject: Uživatel %{name} upravil příspěvek
   notifications:
+    administration_emails: E-mailová oznámení administrátora
     email_events: Události pro e-mailová oznámení
     email_events_hint: 'Vyberte události, pro které chcete dostávat oznámení:'
-    other_settings: Další nastavení oznámení
   number:
     human:
       decimal_units:
@@ -1554,6 +1606,9 @@ cs:
     errors:
       limit_reached: Dosažen limit různých reakcí
       unrecognized_emoji: není známý smajlík
+  redirects:
+    prompt: Pokud tomuto odkazu důvěřujete, klikněte na něj a pokračujte.
+    title: Odcházíte z %{instance}.
   relationships:
     activity: Aktivita účtu
     confirm_follow_selected_followers: Jste si jisti, že chcete sledovat vybrané sledující?
@@ -1616,6 +1671,7 @@ cs:
       unknown_browser: Neznámý prohlížeč
       weibo: Weibo
     current_session: Aktuální relace
+    date: Datum
     description: "%{browser} na systému %{platform}"
     explanation: Tohle jsou webové prohlížeče aktuálně přihlášené na váš účet Mastodon.
     ip: IP adresa
@@ -1652,14 +1708,26 @@ cs:
     import: Import
     import_and_export: Import a export
     migrate: Přesun účtu
-    notifications: Oznámení
+    notifications: E-mailová upozornění
     preferences: Předvolby
     profile: Profil
     relationships: Sledovaní a sledující
+    severed_relationships: Přerušené vztahy
     statuses_cleanup: Automatické mazání příspěvků
     strikes: Moderační prohřešky
     two_factor_authentication: Dvoufázové ověřování
     webauthn_authentication: Bezpečnostní klíče
+  severed_relationships:
+    download: Stáhnout (%{count})
+    event_type:
+      account_suspension: Pozastavení účtu (%{target_name})
+      domain_block: Pozastavení serveru (%{target_name})
+      user_domain_block: Zablokovali jste %{target_name}
+    lost_followers: Ztracení sledující
+    lost_follows: Ztracená sledování
+    preamble: Když zablokujete doménu nebo když se moderátoři rozhodnou pozastavit vzdálený server, můžete přijít o sledování a sledující. Když k tomu dojde, budete si moci stáhnout seznamy přerušených vztahů, abyste je mohli zkontrolovat a případně importovat na jiný server.
+    purged: Informace o tomto serveru byly správci serveru vymazány.
+    type: Událost
   statuses:
     attached:
       audio:
@@ -1709,8 +1777,6 @@ cs:
         other: "%{count} hlasů"
       vote: Hlasovat
     show_more: Zobrazit více
-    show_newer: Zobrazit novější
-    show_older: Zobrazit starší
     show_thread: Zobrazit vlákno
     title: "%{name}: „%{quote}“"
     visibilities:
@@ -1767,13 +1833,16 @@ cs:
     contrast: Mastodon (vysoký kontrast)
     default: Mastodon (tmavý)
     mastodon-light: Mastodon (světlý)
+    system: Automaticky (dle motivu systému)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
+      quota_exceeded: Byla vyčerpaná kvóta pro využívání překládací služby na úrovni serveru.
       too_many_requests: Na překladatelskou službu bylo zasláno v poslední době příliš mnoho požadavků.
   two_factor_authentication:
     add: Přidat
@@ -1792,18 +1861,27 @@ cs:
     webauthn: Bezpečnostní klíče
   user_mailer:
     appeal_approved:
-      action: Přejít do vašeho účtu
+      action: Možnosti Účtu
       explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
       subject: Vaše odvolání ze dne %{date} bylo schváleno
+      subtitle: Váš účet je opět v dobrém stavu.
       title: Odvolání schváleno
     appeal_rejected:
       explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo zamítnuto.
       subject: Vaše odvolání z %{date} bylo zamítnuto
+      subtitle: Vaše odvolání bylo zamítnuto.
       title: Odvolání zamítnuto
     backup_ready:
-      explanation: Vyžádali jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení!
+      explanation: Požádali jste o úplnou zálohu vašeho účtu Mastodon.
+      extra: Nyní je připraven ke stažení!
       subject: Váš archiv je připraven ke stažení
       title: Stažení archivu
+    failed_2fa:
+      details: 'Zde jsou podrobnosti o pokusu o přihlášení:'
+      explanation: Někdo se pokusil přihlásit k vašemu účtu, ale poskytl neplatný token Dvoufázového ověření.
+      further_actions_html: Pokud jste to nebyl, doporučujeme vám okamžitě %{action}, protože váš účet mohl být napaden.
+      subject: Druhý omyl při Dvoufázovém ověření
+      title: Omyl při Dvoufázovém ověření
     suspicious_sign_in:
       change_password: změnit vaše heslo
       details: 'Tady jsou detaily přihášení:'
@@ -1843,13 +1921,46 @@ cs:
         silence: Účet omezen
         suspend: Účet pozastaven
     welcome:
-      edit_profile_action: Nastavit profil
-      edit_profile_step: Váš profil si můžete přizpůsobit nahráním profilového obrázku, změnou zobrazovaného jména a dalším. Můžete se přihlásit k přezkoumání nových následovatelů, než vás budou moci následovat.
+      apps_android_action: Získejte na Google Play
+      apps_ios_action: Stáhnout z App Store
+      apps_step: Stáhněte si naše oficiální aplikace.
+      apps_title: Aplikace Mastodon
+      checklist_subtitle: 'Začněme na této nové sociální hranici:'
+      checklist_title: Uvítací kontrolní seznam
+      edit_profile_action: Přizpůsobit
+      edit_profile_step: Zlepšete své interakce tím, že si vytvoříte komplexní profil.
+      edit_profile_title: Přizpůsobte si svůj profil
       explanation: Zde je pár tipů do začátku
-      final_action: Začít psát
-      final_step: 'Začněte psát příspěvky! I bez sledujících mohou vaše veřejné příspěvky vidět ostatní, například na místní časové ose nebo v hashtagu. Možná se budete chtít představit na hashtagu #představení.'
-      full_handle: Vaše celá adresa profilu
-      full_handle_hint: Tohle je, co byste řekli svým přátelům, aby vám mohli posílat zprávy nebo vás sledovat z jiného serveru.
+      feature_action: Zjistit více
+      feature_audience: Mastodon vám nabízí jedinečnou možnost správy publika bez prostředníků. Mastodon nasazený na vaší vlastní infrastruktuře vám umožňuje sledovat a být sledován z jakéhokoli jiného Mastodon serveru online a není pod kontrolou nikoho jiného než vás.
+      feature_audience_title: Vytvořte si svědomě své publikum
+      feature_control: Sami nejlépe víte, co chcete vidět na svém domovském kanálu. Žádné algoritmy ani reklamy, které by plýtvaly vaším časem. Sledujte kohokoli z libovolného Mastodon serveru z jediného účtu, dostávejte jejich příspěvky v chronologickém pořadí a udělejte si svůj kout internetu trochu více podle sebe.
+      feature_control_title: Mějte pod kontrolou vlastní časovou osu
+      feature_creativity: Mastodon podporuje zvukové, video a obrázkové příspěvky, popisy přístupnosti, ankety, upozornění na obsah, animované avatary, vlastní emotikony, ovládání ořezu miniatur a další funkce, které vám pomohou vyjádřit se online. Ať už publikujete své umění, hudbu nebo podcast, Mastodon je tu pro vás.
+      feature_creativity_title: Bezkonkurenční kreativita
+      feature_moderation: Mastodon dává rozhodování zpět do vašich rukou. Každý server si vytváří svá vlastní pravidla a předpisy, které jsou prosazovány lokálně, nikoli shora jako v případě firemních sociálních médií, díky čemuž lze nejpružněji reagovat na potřeby různých skupin lidí. Připojte se k serveru s pravidly, se kterými souhlasíte, nebo si založte vlastní.
+      feature_moderation_title: Moderování způsobem, jakým by to mělo být
+      follow_action: Sledovat
+      follow_step: Mastodon je o sledování zajimavých lidí.
+      follow_title: Přizpůsobte si svůj domovský kanál
+      follows_subtitle: Sledujte známé účty
+      follows_title: Koho sledovat
+      follows_view_more: Zobrazit více lidí ke sledování
+      hashtags_recent_count:
+        few: "%{people} osoby v posledních 2 dnech"
+        many: "%{people} osob v posledních 2 dnech"
+        one: "%{people} osoba v posledních 2 dnech"
+        other: "%{people} osob v posledních 2 dnech"
+      hashtags_subtitle: Prozkoumejte, co je populární od posledních 2 dnů
+      hashtags_title: Populární hashtagy
+      hashtags_view_more: Zobrazit více populárních hashtagů
+      post_action: Sepsat
+      post_step: Řekněte světu ahoj pomocí textu, fotografií, videí nebo anket.
+      post_title: Vytvořte svůj první příspěvek
+      share_action: Sdílet
+      share_step: Dejte přátelům vědět, jak vás mohou na Mastodonu najít.
+      share_title: Sdílejte svůj Mastodon profil
+      sign_in_action: Přihlásit se
       subject: Vítejte na Mastodonu
       title: Vítejte na palubě, %{name}!
   users:
@@ -1857,10 +1968,13 @@ cs:
     go_to_sso_account_settings: Přejděte do nastavení účtu poskytovatele identity
     invalid_otp_token: Neplatný kód pro dvoufázové ověřování
     otp_lost_help_html: Pokud jste ztratili přístup k oběma, spojte se s %{email}
+    rate_limited: Příliš mnoho pokusů o ověření, zkuste to znovu později.
     seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
     signed_in_as: 'Přihlášeni jako:'
   verification:
+    extra_instructions_html: <strong>Tip:</strong> Odkaz na vaší webové stránce může být neviditelný. Důležitou součástí je <code>rel="me"</code>, která brání proti napodování vás na webových stránkách s obsahem vytvořeným uživatelem. Můžete dokonce použít <code>odkaz</code> v záhlaví stránky místo <code>a</code>, ale HTML musí být přístupné bez spuštění JavaScript.
     here_is_how: Jak na to
+    hint_html: "<strong>Ověření Vaší identity na Mastodonu je pro každého výborné.</strong> Na základě otevřených webových standardů, nyní a navždy zdarma. Jediné, co potřebujete, je osobní webová stránka, na které vás lidé poznají. Když odkazujete na tuto stránku z vašeho profilu, zkontrolujeme, zda webové stránky odkazují na váš profil a zobrazí na něm vizuální indikátor."
     instructions_html: Zkopírujte a vložte níže uvedený kód do HTML vašeho webu. Poté přidejte adresu vašeho webu do jednoho z extra políček na vašem profilu na záložce "Upravit profil" a uložte změny.
     verification: Ověření
     verified_links: Vaše ověřené odkazy
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 70b994903e..f96068f212 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -21,7 +21,7 @@ cy:
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
     nothing_here: Does dim byd yma!
     pin_errors:
-      following: Rhaid i chi fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
+      following: Rhaid i chi fod yn dilyn yn barod y person rydych am ei gymeradwyo
     posts:
       few: Postiadau
       many: Postiadau
@@ -74,7 +74,7 @@ cy:
       edit: Golygu
       email: E-bost
       email_status: Statws e-bost
-      enable: Dad rewi
+      enable: Dadrewi
       enable_sign_in_token_auth: Galluogi dilysu tocynnau e-bost
       enabled: Wedi ei alluogi
       enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
@@ -85,7 +85,7 @@ cy:
       invite_request_text: Rhesymau dros ymuno
       invited_by: Gwahoddwyd gan
       ip: IP
-      joined: Ymunwyd
+      joined: Wedi ymuno
       location:
         all: Popeth
         local: Lleol
@@ -645,6 +645,9 @@ cy:
       actions_description_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Os byddwch yn cymryd camau cosbol yn erbyn y cyfrif a adroddwyd, bydd hysbysiad e-bost yn cael ei anfon atyn nhw, ac eithrio pan fydd y categori <strong>Sbam</strong> yn cael ei ddewis.
       actions_description_remote_html: Penderfynwch pa gamau i'w cymryd i ddatrys yr adroddiad hwn. Bydd hyn ond yn effeithio ar sut <strong>mae'ch</strong> gweinydd yn cyfathrebu â'r cyfrif hwn o bell ac yn trin ei gynnwys.
       add_to_report: Ychwanegu rhagor i adroddiad
+      already_suspended_badges:
+        local: Wedi atal dros dro ar y gweinydd hwn yn barod
+        remote: Wedi'i atal eisoes ar eu gweinydd
       are_you_sure: Ydych chi'n siŵr?
       assign_to_self: Neilltuo i mi
       assigned: Cymedrolwr wedi'i neilltuo
@@ -804,6 +807,7 @@ cy:
         desc_html: Mae hyn yn dibynnu ar sgriptiau allanol gan hCaptcha, a all fod yn bryder diogelwch a phreifatrwydd. Yn ogystal, <strong>gall hyn wneud y broses gofrestru yn llawer llai hygyrch i rai pobl (yn enwedig yr anabl)</strong>. Am y rhesymau hyn, ystyriwch fesurau eraill fel cofrestru ar sail cymeradwyaeth neu ar sail gwahoddiad.
         title: Ei gwneud yn ofynnol i ddefnyddwyr newydd ddatrys CAPTCHA i gadarnhau eu cyfrif
       content_retention:
+        danger_zone: Parth perygl
         preamble: Rheoli sut mae cynnwys sy'n cael ei gynhyrchu gan ddefnyddwyr yn cael ei storio yn Mastodon.
         title: Cadw cynnwys
       default_noindex:
@@ -823,6 +827,7 @@ cy:
         disabled: I neb
         users: I ddefnyddwyr lleol wedi'u mewngofnodi
       registrations:
+        moderation_recommandation: Gwnewch yn siŵr bod gennych chi dîm cymedroli digonol ac adweithiol cyn i chi agor cofrestriadau i bawb!
         preamble: Rheoli pwy all greu cyfrif ar eich gweinydd.
         title: Cofrestriadau
       registrations_mode:
@@ -830,6 +835,7 @@ cy:
           approved: Mae angen cymeradwyaeth i gofrestru
           none: Nid oes neb yn gallu cofrestru
           open: Gall unrhyw un cofrestru
+        warning_hint: Rydym yn argymell defnyddio “Mae angen cymeradwyaeth ar gyfer cofrestru” oni bai eich bod yn hyderus y gall eich tîm cymedroli ymdrin â chofrestriadau sbam a rhai maleisus mewn modd amserol.
       security:
         authorized_fetch: Mae angen dilysu gan weinyddion ffederal
         authorized_fetch_hint: Mae gofyn am ddilysiad gan weinyddion ffederal yn galluogi gorfodi llymach ar flociau lefel defnyddiwr a lefel gweinydd. Fodd bynnag, daw hyn ar gost perfformiad arafach, mae'n lleihau cyrhaeddiad eich atebion, a gall gyflwyno materion cydnawsedd gyda rhai gwasanaethau ffederal. Yn ogystal, ni fydd hyn yn atal actorion ymroddedig rhag estyn eich postiadau a'ch cyfrifon cyhoeddus.
@@ -1038,6 +1044,9 @@ cy:
       title: Bachau Gwe
       webhook: Bachyn Gwe
   admin_mailer:
+    auto_close_registrations:
+      body: Oherwydd diffyg gweithgarwch cymedrolwr diweddar, mae cofrestriadau ar %{instance} wedi'u newid yn awtomatig i'r angen i gael adolygiad â llaw, er mwyn atal %{instance} rhag cael ei ddefnyddio fel llwyfan ar gyfer actorion drwg posibl. Gallwch ei newid yn ôl i agor cofrestriadau ar unrhyw adeg.
+      subject: Mae cofrestriadau ar gyfer %{instance} wedi'u newid yn awtomatig i'r angen i gael cymeradwyaeth
     new_appeal:
       actions:
         delete_statuses: i ddileu eu postiadau
@@ -1594,7 +1603,6 @@ cy:
     administration_emails: Hysbysiadau e-bost gweinyddol
     email_events: Digwyddiadau ar gyfer hysbysiadau e-bost
     email_events_hint: 'Dewiswch ddigwyddiadau yr ydych am dderbyn hysbysiadau ar eu cyfer:'
-    other_settings: Gosodiadau hysbysiadau arall
   number:
     human:
       decimal_units:
@@ -1650,6 +1658,9 @@ cy:
     errors:
       limit_reached: Cyrhaeddwyd terfyn y gwahanol adweithiau
       unrecognized_emoji: nid yw'n emoji cydnabyddedig
+  redirects:
+    prompt: Os ydych chi'n ymddiried yn y ddolen hon, cliciwch arni i barhau.
+    title: Rydych chi'n gadael %{instance}.
   relationships:
     activity: Gweithgareddau cyfrif
     confirm_follow_selected_followers: Ydych chi'n siŵr eich bod am ddilyn y dilynwyr a ddewiswyd?
@@ -1712,6 +1723,7 @@ cy:
       unknown_browser: Porwr Anhysbys
       weibo: Weibo
     current_session: Sesiwn gyfredol
+    date: Dyddiad
     description: "%{browser} ar %{platform}"
     explanation: Dyma'r porwyr gwe sydd wedi mewngofnodi i'ch cyfrif Mastodon ar hyn o bryd.
     ip: IP
@@ -1748,14 +1760,26 @@ cy:
     import: Mewnforio
     import_and_export: Mewnforio ac allforio
     migrate: Mudo cyfrif
-    notifications: Hysbysiadau
+    notifications: Hysbysiadau e-bost
     preferences: Dewisiadau
     profile: Proffil cyhoeddus
     relationships: Yn dilyn a dilynwyr
+    severed_relationships: Perthynasau wedi'u torri
     statuses_cleanup: Dileu postiadau'n awtomatig
     strikes: Rhybuddion cymedroli
     two_factor_authentication: Dilysu dau-ffactor
     webauthn_authentication: Allweddi diogelwch
+  severed_relationships:
+    download: Llwytho i lawr (%{count})
+    event_type:
+      account_suspension: Atal cyfrif (%{target_name})
+      domain_block: Ataliad gweinydd (%{target_name})
+      user_domain_block: Rydych wedi rhwystro %{target_name}
+    lost_followers: Dilynwyr coll
+    lost_follows: Yn dilyn coll
+    preamble: Efallai y byddwch yn colli dilynwyr a'r rhai rydych yn eu dilyn pan fyddwch yn rhwystro parth neu pan fydd eich cymedrolwyr yn penderfynu atal gweinydd o bell. Pan fydd hynny'n digwydd, byddwch yn gallu llwytho i lawr rhestrau o berthnasoedd wedi'u torri, i'w harchwilio ac o bosibl eu mewnforio ar weinydd arall.
+    purged: Mae gwybodaeth am y gweinydd hwn wedi'i dynnu gan weinyddwyr eich gweinydd.
+    type: Digwyddiad
   statuses:
     attached:
       audio:
@@ -1817,8 +1841,6 @@ cy:
         zero: "%{count} o bleidleisiau"
       vote: Pleidlais
     show_more: Dangos mwy
-    show_newer: Dangos y diweddaraf
-    show_older: Dangos pethau hŷn
     show_thread: Dangos edefyn
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1875,6 +1897,7 @@ cy:
     contrast: Mastodon (Cyferbyniad uchel)
     default: Mastodon (Tywyll)
     mastodon-light: Mastodon (Golau)
+    system: Awtomatig (defnyddio thema system)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1902,18 +1925,27 @@ cy:
     webauthn: Allweddi diogelwch
   user_mailer:
     appeal_approved:
-      action: Ewch i'ch cyfrif
+      action: Gosodiadau Cyfrif
       explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i chymeradwyo. Mae eich cyfrif unwaith eto yn gadarnhaol.
       subject: Mae eich apêl gan %{date} wedi'i chymeradwyo
+      subtitle: Mae eich cyfrif unwaith eto mewn sefyllfa dda.
       title: Cymeradwywyd yr apêl
     appeal_rejected:
       explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
       subject: Mae eich apêl ar %{date} wedi'i gwrthod
+      subtitle: Mae eich apêl wedi'i gwrthod.
       title: Mae'r apêl wedi'i gwrthod
     backup_ready:
-      explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
+      explanation: Rydych wedi gofyn am gopi wrth gefn llawn o'ch cyfrif Mastodon.
+      extra: Mae nawr yn barod i'w lwytho i lawr!
       subject: Mae eich archif yn barod i'w lawrlwytho
       title: Allfudo archif
+    failed_2fa:
+      details: 'Dyma fanylion yr ymgais i fewngofnodi:'
+      explanation: Mae rhywun wedi ceisio mewngofnodi i'ch cyfrif ond wedi darparu ail ffactor dilysu annilys.
+      further_actions_html: Os nad chi oedd hwn, rydym yn argymell eich bod yn %{action} ar unwaith oherwydd gall fod o dan fygythiad.
+      subject: Methiant dilysu ail ffactor
+      title: Wedi methu dilysu ail ffactor
     suspicious_sign_in:
       change_password: newidiwch eich cyfrinair
       details: 'Dyma fanylion y mewngofnodi:'
@@ -1953,13 +1985,48 @@ cy:
         silence: Cyfrif cyfyngedig
         suspend: Cyfrif wedi'i atal
     welcome:
-      edit_profile_action: Sefydlu proffil
-      edit_profile_step: Gallwch addasu'ch proffil trwy lwytho llun proffil, newid eich enw dangos a mwy. Gallwch ddewis i adolygu dilynwyr newydd cyn iddyn nhw gael caniatâd i'ch dilyn.
+      apps_android_action: Ar gael ar Google Play
+      apps_ios_action: Ei lwytho i lawr o'r App Store
+      apps_step: Llwythwch i awr ein apiau swyddogol.
+      apps_title: Apiau Mastodon
+      checklist_subtitle: 'Gadewch i ni eich rhoi ar ben ffordd ar y datblygiad cymdeithasol newydd hon:'
+      checklist_title: Rhestr Wirio Croeso
+      edit_profile_action: Personoli
+      edit_profile_step: Rhowch hwb i'ch rhyngweithiadau trwy gael proffil cynhwysfawr.
+      edit_profile_title: Personoli'ch proffil
       explanation: Dyma ambell nodyn i'ch helpu i ddechrau
-      final_action: Dechrau postio
-      final_step: 'Dechreuwch bostio! Hyd yn oed heb ddilynwyr, efallai y bydd eraill yn gweld eich postiadau cyhoeddus, er enghraifft ar y ffrwd leol neu mewn hashnodau. Efallai y byddwch am gyflwyno eich hun ar yr hashnod #cyflwyniadau neu/a #introductions.'
-      full_handle: Eich enw llawn
-      full_handle_hint: Dyma beth fyddech chi'n ei ddweud wrth eich ffrindiau fel y gallant anfon neges neu eich dilyn o weinydd arall.
+      feature_action: Dysgu mwy
+      feature_audience: Mae Mastodon yn rhoi posibilrwydd unigryw i chi reoli'ch cynulleidfa'n ddirwystr. Mae'r Mastodon sy'n cael ei ddefnyddio ar eich seilwaith eich hun yn caniatáu ichi ddilyn a chael eich dilyn o unrhyw weinydd Mastodon arall ar-lein ac nid yw o dan reolaeth neb ond eich un chi.
+      feature_audience_title: Adeiladu eich cynulleidfa gyda hyder
+      feature_control: Chi sy'n gwybod orau beth rydych chi am ei weld ar eich llif cartref. Dim algorithmau na hysbysebion i wastraffu'ch amser. Dilynwch unrhyw un ar draws unrhyw weinydd Mastodon o gyfrif sengl a derbyn eu postiadau mewn trefn gronolegol, a gwnewch eich cornel chi o'r rhyngrwyd ychydig yn debycach i chi.
+      feature_control_title: Cadwch reolaeth ar eich llinell amser eich hun
+      feature_creativity: Mae Mastodon yn cefnogi postiadau sain, fideo a llun, disgrifiadau hygyrchedd, arolygon barn, rhybuddion cynnwys, afatarau animeiddiedig, emojis wedi'u teilwra, rheolaeth lluniau bach a mwy, i'ch helpu chi i fynegi'ch hun ar-lein. P'un a ydych chi'n cyhoeddi'ch celf, eich cerddoriaeth, neu'ch podlediad, mae Mastodon yno i chi.
+      feature_creativity_title: Creadigrwydd heb ei ail
+      feature_moderation: Mae Mastodon yn gosod penderfyniadau'n ôl yn eich dwylo chi. Mae pob gweinydd yn creu eu rheolau a'u rheoliadau eu hunain, sy'n cael eu gorfodi'n lleol ac nid o'r top i lawr fel cyfryngau cymdeithasol corfforaethol, gan ei wneud yn fwyaf hyblyg wrth ymateb i anghenion gwahanol grwpiau o bobl. Ymunwch â gweinydd gyda'r rheolau rydych chi'n cytuno â nhw, neu gwesteiwch eich un chi.
+      feature_moderation_title: Cymedroli'r ffordd y dylai fod
+      follow_action: Dilyn
+      follow_step: Dilyn pobl ddiddorol yw hanfod Mastodon.
+      follow_title: Personoli eich llif cartref
+      follows_subtitle: Dilynwch gyfrifon adnabyddus
+      follows_title: Pwy i ddilyn
+      follows_view_more: Gweld mwy o bobl i ddilyn
+      hashtags_recent_count:
+        few: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        many: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        one: "%{people} person yn ystod y 2 ddiwrnod diwethaf"
+        other: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        two: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+        zero: "%{people} o bobl yn y 2 ddiwrnod diwethaf"
+      hashtags_subtitle: Gweld beth sy'n tueddu dros y 2 ddiwrnod diwethaf
+      hashtags_title: Hashnodau tuedd
+      hashtags_view_more: Gweld mwy o hashnodau tuedd
+      post_action: Creu
+      post_step: Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn.
+      post_title: Creu'ch postiad cyntaf
+      share_action: Rhannu
+      share_step: Gadewch i'ch ffrindiau wybod sut i ddod o hyd i chi ar Mastodon.
+      share_title: Rhannwch eich proffil Mastodon
+      sign_in_action: Mewngofnodi
       subject: Croeso i Mastodon
       title: Croeso, %{name}!
   users:
@@ -1967,6 +2034,7 @@ cy:
     go_to_sso_account_settings: Ewch i osodiadau cyfrif eich darparwr hunaniaeth
     invalid_otp_token: Côd dau-ffactor annilys
     otp_lost_help_html: Os colloch chi fynediad i'r ddau, mae modd i chi gysylltu a %{email}
+    rate_limited: Gormod o geisiadau dilysu, ceisiwch eto yn nes ymlaen.
     seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
     signed_in_as: 'Wedi mewngofnodi fel:'
   verification:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3d6850ca5e..252d0e2b58 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -500,7 +500,7 @@ da:
         instance_accounts_dimension: Mest fulgte konti
         instance_accounts_measure: gemte konti
         instance_followers_measure: vores følgere dér
-        instance_follows_measure: deres følgere dér
+        instance_follows_measure: deres følgere her
         instance_languages_dimension: Topsprog
         instance_media_attachments_measure: gemte medievedhæftninger
         instance_reports_measure: anmeldelser af dem
@@ -597,6 +597,9 @@ da:
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Træffes en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
       add_to_report: Føj mere til anmeldelse
+      already_suspended_badges:
+        local: Allerede suspenderet på denne server
+        remote: Allerede suspenderet på vedkommendes server
       are_you_sure: Sikker?
       assign_to_self: Tildel til mig
       assigned: Tildelt moderator
@@ -748,6 +751,7 @@ da:
         desc_html: Dette er afhængig af eksterne scripts fra hCaptcha, som kan være en sikkerhed og privatlivets fred. Derudover kan <strong>dette gøre registreringsprocessen betydeligt mindre tilgængelig for nogle (især deaktiveret) personer</strong>. Af disse grunde bedes De overveje alternative foranstaltninger såsom godkendelsesbaseret eller inviteret til at blive registreret.
         title: Kræv nye brugere for at løse en CAPTCHA for at bekræfte deres konto
       content_retention:
+        danger_zone: Farezone
         preamble: Styr, hvordan Mastodon gemmer brugergenereret indhold.
         title: Indholdsopbevaring
       default_noindex:
@@ -767,6 +771,7 @@ da:
         disabled: Til ingen
         users: Til indloggede lokale brugere
       registrations:
+        moderation_recommandation: Sørg for, at der er et tilstrækkeligt og reaktivt moderationsteam, før registrering åbnes for alle!
         preamble: Styr, hvem der kan oprette en konto på serveren.
         title: Registreringer
       registrations_mode:
@@ -774,6 +779,7 @@ da:
           approved: Tilmeldingsgodkendelse kræves
           none: Ingen kan tilmelde sig
           open: Alle kan tilmelde sig
+        warning_hint: Brug af "Godkendelse kræves ved tilmelding" anbefales, medmindre man er sikker på, at moderationsteamet kan håndtere spam og ondsindede registreringer i tide.
       security:
         authorized_fetch: Kræver godkendelse fra fødererede servere
         authorized_fetch_hint: Krav om godkendelse fra fødererede servere muliggør strengere håndhævelse af både bruger- og serverniveaublokeringer. Omkostningen er dog en ydelsesreduktion, reduceret udstrækning af dine svar samt potentielle kompatibilitetsproblemer med visse fødererede tjenester. Derudover vil dette ikke hindre målrettede aktører i at hente dine offentlige indlæg og konti.
@@ -966,6 +972,9 @@ da:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Grundet manglende nylig moderatoraktivitet er registreringsproceduren på %{instance} automatisk ændret til at kræve manuel gennemgang for at forhindre, at %{instance} bruges som platform for potentielle dårlige aktører. Proceduren kan til enhver tid ændre igen til åbne registreringer.
+      subject: Registreringsproceduren for %{instance} er automatisk ændret til at kræve godkendelse
     new_appeal:
       actions:
         delete_statuses: for sletning af vedkommendes indlæg
@@ -1440,7 +1449,7 @@ da:
       before: 'Inder der fortsættes, læs venligst disse notater omhyggeligt:'
       cooldown: Efter flytningen er der en venteperiode, hvor kontoen ikke kan flyttes igen
       disabled_account: Efterfølgende er din nuværende konto ikke fuldt funktionsdygtig, der er dog adgang til dataeksport samt genaktivering.
-      followers: Denne handling vil flytte alle følgere fra den aktuelle konto til den nye ditto
+      followers: Denne handling vil flytte alle følgere fra den aktuelle konto til den nye konto
       only_redirect_html: Alternativt kan du <a href="%{path}">oprette en omdirigering for din profil alene</a>.
       other_data: Ingen øvrige data flyttes automatisk
       redirect: Din nuværende kontoprofil opdateres med en omdirigeringsnotits og ekskluderes fra søgninger
@@ -1490,7 +1499,6 @@ da:
     administration_emails: Admin e-mailnotifikationer
     email_events: Begivenheder for e-mailnotifikationer
     email_events_hint: 'Vælg begivenheder, for hvilke notifikationer skal modtages:'
-    other_settings: Andre notifikationsindstillinger
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ da:
     errors:
       limit_reached: Grænse for forskellige reaktioner nået
       unrecognized_emoji: er ikke en genkendt emoji
+  redirects:
+    prompt: Er der tillid til dette link, så klik på det for at fortsætte.
+    title: Nu forlades %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Sikker på, at de valgte følgere skal følges?
@@ -1608,6 +1619,7 @@ da:
       unknown_browser: Ukendt browser
       weibo: Weibo
     current_session: Aktuelle session
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Disse webbrowsere er pt. logget ind på din Mastodon-konto.
     ip: IP
@@ -1644,14 +1656,25 @@ da:
     import: Import
     import_and_export: Import og eksport
     migrate: Kontomigrering
-    notifications: Notifikationer
+    notifications: E-mailnotifikationer
     preferences: Præferencer
     profile: Offentlig profil
     relationships: Følger og følgere
+    severed_relationships: Afbrudte forhold
     statuses_cleanup: Auto-indlægssletning
     strikes: Moderationsadvarsler
     two_factor_authentication: Tofaktorgodkendelse
     webauthn_authentication: Sikkerhedsnøgler
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Kontosuspendering (%{target_name})
+      domain_block: Serversuspendering (%{target_name})
+      user_domain_block: "%{target_name} blev blokeret"
+    lost_followers: Tabte følgere
+    preamble: Der kan mistes fulgte objekter og følgere, når et domæne blokeres eller moderatorerne beslutter at suspendere en ekstern server. Når det sker, kan der downloades lister over afbrudte relationer til inspektion og mulig import på anden server.
+    purged: Oplysninger om denne server er blevet renset af serveradministratoreren.
+    type: Begivenhed
   statuses:
     attached:
       audio:
@@ -1689,8 +1712,6 @@ da:
         other: "%{count} stemmer"
       vote: Stem
     show_more: Vis flere
-    show_newer: Vis nyere
-    show_older: Vis ældre
     show_thread: Vis tråd
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,6 +1768,7 @@ da:
     contrast: Mastodon (høj kontrast)
     default: Mastodont (mørkt)
     mastodon-light: Mastodon (lyst)
+    system: Automatisk (benyt systemtema)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
@@ -1774,18 +1796,27 @@ da:
     webauthn: Sikkerhedsnøgler
   user_mailer:
     appeal_approved:
-      action: Gå til din konto
+      action: Kontoindstillinger
       explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet godkendt. Din kontostatus er igen god.
       subject: Din appel pr. %{date} er godkendt
+      subtitle: Dit kontoomdømme er nu igen godt.
       title: Appel godkendt
     appeal_rejected:
       explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet afvist.
       subject: Din appel pr. %{date} er afvist
+      subtitle: Din appel er afvist.
       title: Appel afvist
     backup_ready:
-      explanation: Den anmodede fulde sikkerhedskopi af din Mastodon-konto er nu klar til download!
+      explanation: Der er anmodet om en fuld sikkerhedskopi af din Mastodon-konto.
+      extra: Sikkerhedskopien kan nu downloades!
       subject: Dit arkiv er klar til download
       title: Arkiv download
+    failed_2fa:
+      details: 'Her er detaljerne om login-forsøget:'
+      explanation: Nogen har forsøgt at logge ind på kontoen, men har angivet en ugyldig anden godkendelsesfaktor.
+      further_actions_html: Var dette ikke dig, anbefales det straks at %{action}, da den kan være kompromitteret.
+      subject: Anden faktor godkendelsesfejl
+      title: Fejlede på anden faktor godkendelse
     suspicious_sign_in:
       change_password: ændrer din adgangskode
       details: 'Her er nogle detaljer om login-forsøget:'
@@ -1825,13 +1856,44 @@ da:
         silence: Konto begrænset
         suspend: Konto suspenderet
     welcome:
-      edit_profile_action: Opsæt profil
-      edit_profile_step: Man kan tilpasse sin profil ved at uploade profilfoto, overskrift, ændre visningsnavn mv. Ønskes nye følgere vurderet, før de må følge dig, kan kontoen låses.
+      apps_android_action: Hent den fra Google Play
+      apps_ios_action: Download i App Store
+      apps_step: Download vores officielle apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Kom i gang på denne nye sociale frontløber:'
+      checklist_title: Velkomsttjekliste
+      edit_profile_action: Personliggør
+      edit_profile_step: Andre er mere tilbøjelige til at interagere med brugere med udfyldte profiler.
+      edit_profile_title: Personliggør din profil
       explanation: Her er nogle råd for at få dig i gang
-      final_action: Begynd at poste
-      final_step: 'Begynd at poste! Selv uden følgere vil offentlige indlæg kunne ses af andre f.eks. på den lokale tidslinje og i hashtags. Man kan introducere sig selv via hastagget #introductions.'
-      full_handle: Dit fulde brugernavn
-      full_handle_hint: Dette er, hvad du oplyser til dine venner, så de kan sende dig beskeder eller følge dig fra andre servere.
+      feature_action: Læs mere
+      feature_audience: Mastodon giver brugeren en unik mulighed for at styre sit publikum uden mellemled. Mastodon udrullet på egen infrastruktur giver mulighed for at følge og blive fulgt fra enhver anden Mastodon-server online, kontrolleret/styret alene af brugen selv.
+      feature_audience_title: Opbyg et publikum i tillid
+      feature_control: Man ved selv bedst, hvad man ønsker at se på sit hjemmefeed. Ingen algoritmer eller annoncer til at spilde tiden. Følg alle på tværs af enhver Mastodon-server fra en enkelt konto og modtag deres indlæg i kronologisk rækkefølge, og gør dette hjørne af internet lidt mere personligt.
+      feature_control_title: Hold styr på egen tidslinje
+      feature_creativity: Mastodon understøtter indlæg med lyd, video og billede, tilgængelighedsbeskrivelser, meningsmålinger, indhold advarsler, animerede avatarer, tilpassede emojis, miniaturebeskæringskontrol og mere, for at gøre det lettere at udtrykke sig online. Uanset om man udgiver sin kunst, musik eller podcast, så står Mastodon til rådighed.
+      feature_creativity_title: Uovertruffen kreativitet
+      feature_moderation: Mastodon lægger beslutningstagning tilbage i brugerens hænder. Hver server opretter deres egne regler og reguleringer, som håndhæves lokalt og ikke ovenfra som virksomhedernes sociale medier, hvilket gør det til den mest fleksible mht. at reagere på behovene hos forskellige persongrupper. Deltag på en server med de regler, man er enige med, eller driv en egen server.
+      feature_moderation_title: Moderering af måden, tingene bør være på
+      follow_action: Følg
+      follow_step: At følge interessante personer, det er, hvad Mastodon handler om.
+      follow_title: Personliggør hjemmefeedet
+      follows_subtitle: Følg velkendte konti
+      follows_title: Hvem, som skal følges
+      follows_view_more: Vis nogle personer at følge
+      hashtags_recent_count:
+        one: "%{people} person de seneste 2 dage"
+        other: "%{people} personer de seneste 2 dage"
+      hashtags_subtitle: Udforsk de seneste 2 dages tendenser
+      hashtags_title: Populære hashtags
+      hashtags_view_more: Se flere populære hashtags
+      post_action: Skriv
+      post_step: Sig hej til verden med tekst, fotos, videoer eller afstemninger.
+      post_title: Opret det første indlæg
+      share_action: Del
+      share_step: Lad vennerne vide, hvor man kan findes på Mastodon.
+      share_title: Del Mastodon-profilen
+      sign_in_action: Log ind
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
@@ -1839,6 +1901,7 @@ da:
     go_to_sso_account_settings: Gå til identitetsudbyderens kontoindstillinger
     invalid_otp_token: Ugyldig tofaktorkode
     otp_lost_help_html: Har du mistet adgang til begge, kan du kontakte %{email}
+    rate_limited: For mange godkendelsesforsøg. Prøv igen senere.
     seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
     signed_in_as: 'Logget ind som:'
   verification:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4542871d80..b19315e394 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -425,7 +425,7 @@ de:
       view: Domain-Sperre ansehen
     email_domain_blocks:
       add_new: Neue hinzufügen
-      allow_registrations_with_approval: Registrierungen mit Genehmigung erlauben
+      allow_registrations_with_approval: Registrierungen mit Genehmigung zulassen
       attempts_over_week:
         one: "%{count} Registrierungsversuch in der vergangenen Woche"
         other: "%{count} Registrierungsversuche in der vergangenen Woche"
@@ -597,6 +597,9 @@ de:
       actions_description_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Wenn du eine Strafmaßnahme gegen das gemeldete Konto ergreifst, wird eine E-Mail-Benachrichtigung an dieses gesendet, außer wenn die <strong>Spam</strong>-Kategorie ausgewählt ist.
       actions_description_remote_html: Entscheide, welche Maßnahmen du zum Klären dieser Meldung ergreifen möchtest. Dies wirkt sich lediglich darauf aus, wie <strong>dein</strong> Server mit diesem externen Konto kommuniziert und dessen Inhalt handhabt.
       add_to_report: Meldung ergänzen
+      already_suspended_badges:
+        local: Auf diesem Server bereits gesperrt
+        remote: Auf dem anderen Server bereits gesperrt
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
       assigned: Zugewiesene*r Moderator*in
@@ -612,7 +615,7 @@ de:
       created_at: Gemeldet
       delete_and_resolve: Beiträge löschen
       forwarded: Weitergeleitet
-      forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an Dich weitergeleitet, weil er eine Antwort auf ein bei Dir registriertes Profil ist.
+      forwarded_replies_explanation: Diese Meldung stammt von einem externen Profil und betrifft einen externen Inhalt. Der Inhalt wurde an dich weitergeleitet, weil er eine Antwort auf ein bei dir registriertes Profil ist.
       forwarded_to: Weitergeleitet an %{domain}
       mark_as_resolved: Als geklärt markieren
       mark_as_sensitive: Mit einer Inhaltswarnung versehen
@@ -748,6 +751,7 @@ de:
         desc_html: Dies beruht auf externen Skripten von hCaptcha, die ein Sicherheits- und Datenschutzproblem darstellen könnten. Darüber hinaus <strong>kann das den Registrierungsprozess für manche Menschen (insbesondere für Menschen mit Behinderung) erheblich erschweren</strong>. Aus diesen Gründen solltest du alternative Maßnahmen in Betracht ziehen, z. B. eine Registrierung basierend auf einer Einladung oder auf Genehmigungen.
         title: Neue Nutzer*innen müssen ein CAPTCHA lösen, um das Konto zu bestätigen
       content_retention:
+        danger_zone: Gefahrenzone
         preamble: Lege fest, wie lange Inhalte von Nutzer*innen auf deinem Mastodon-Server gespeichert bleiben.
         title: Cache & Archive
       default_noindex:
@@ -767,6 +771,7 @@ de:
         disabled: Niemandem
         users: Für angemeldete lokale Benutzer*innen
       registrations:
+        moderation_recommandation: Bitte vergewissere dich, dass du ein geeignetes und reaktionsschnelles Moderationsteam hast, bevor du die Registrierungen uneingeschränkt zulässt!
         preamble: Lege fest, wer auf deinem Server ein Konto erstellen darf.
         title: Registrierungen
       registrations_mode:
@@ -774,6 +779,7 @@ de:
           approved: Registrierung muss genehmigt werden
           none: Niemand darf sich registrieren
           open: Alle können sich registrieren
+        warning_hint: Wir empfehlen die Einstellung „Registrierung muss genehmigt werden“ zu verwenden, es sei denn, du bist dir sicher, dass dein Moderationsteam Spam und böswillige Registrierungen rechtzeitig bearbeiten kann.
       security:
         authorized_fetch: Authentisierung von föderierten Servern erforderlich machen
         authorized_fetch_hint: Das Anfordern einer Authentisierung von föderierten Servern ermöglicht ein strengeres Durchsetzen von Sperren sowohl auf Ebene der Benutzer*innen als auch des Servers. Allerdings ist das mit Leistungseinbußen verbunden, reduziert die Reichweite deiner Antworten und kann zu Kompatibilitätsproblemen mit einigen föderierten Diensten führen. Darüber hinaus wird das Abrufen deiner öffentlichen Beiträge und Konten durch spezialisierte Akteur*innen nicht verhindert.
@@ -966,6 +972,9 @@ de:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Aufgrund fehlender Aktivität von Moderator*innen müssen neue Registrierungen auf %{instance} jetzt manuell genehmigt werden. Dies wurde automatisch umgestellt, damit %{instance} nicht als Plattform für Böswillige missbraucht werden kann. Du kannst jederzeit auf uneingeschränkte Registrierungen zurückwechseln.
+      subject: Registrierungen auf %{instance} müssen ab jetzt manuell genehmigt werden (automatisch umgestellt)
     new_appeal:
       actions:
         delete_statuses: das Löschen der Beiträge
@@ -979,7 +988,7 @@ de:
       next_steps: Du kannst dem Einspruch zustimmen, um die Moderationsentscheidung rückgängig zu machen, oder ihn ignorieren.
       subject: "%{username} hat Einspruch gegen eine Moderationsentscheidung auf %{instance} erhoben"
     new_critical_software_updates:
-      body: Kritische Updates wurden für Mastodon veröffentlicht – du solltest so schnell wie möglich aktualisieren!
+      body: ein neues Sicherheitsupdate wurde veröffentlicht. Du solltest Mastodon so schnell wie möglich aktualisieren!
       subject: Kritische Mastodon-Updates sind für %{instance} verfügbar!
     new_pending_account:
       body: Die Details von diesem neuem Konto sind unten. Du kannst die Anfrage akzeptieren oder ablehnen.
@@ -1023,7 +1032,7 @@ de:
     salutation: "%{name},"
     settings: 'E-Mail-Einstellungen ändern: %{link}'
     unsubscribe: Abbestellen
-    view: 'Hier überprüfen:'
+    view: 'Siehe:'
     view_profile: Profil anzeigen
     view_status: Beitrag anschauen
   applications:
@@ -1038,7 +1047,7 @@ de:
     apply_for_account: Konto beantragen
     captcha_confirmation:
       help_html: Falls du Probleme beim Lösen des CAPTCHA hast, dann kannst uns über %{email} kontaktieren und wir werden versuchen, dir zu helfen.
-      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Weiter“.
+      hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Fortfahren“.
       title: Sicherheitsüberprüfung
     confirmations:
       awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
@@ -1441,7 +1450,7 @@ de:
       cooldown: Nach dem Umzug wird es eine Weile dauern, bis du erneut umziehen darfst
       disabled_account: Dein altes Konto ist nur noch eingeschränkt nutzbar. Du kannst jedoch deine Daten exportieren und das Konto wieder reaktivieren.
       followers: Alle Follower werden vom alten zum neuen Konto übertragen
-      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Profil</a> einrichten, ohne die Follower zu übertragen.
+      only_redirect_html: Alternativ kannst du auch <a href="%{path}">nur eine Weiterleitung zu deinem neuen Konto</a> einrichten, ohne die Follower zu übertragen.
       other_data: Keine anderen Daten werden automatisch zum neuen Konto übertragen
       redirect: Dein altes Konto wird einen Hinweis erhalten, dass du umgezogen bist. Außerdem wird das Profil von Suchanfragen ausgeschlossen
   moderation:
@@ -1490,7 +1499,6 @@ de:
     administration_emails: Admin-E-Mail-Benachrichtigungen
     email_events: Benachrichtigungen per E-Mail
     email_events_hint: 'Bitte die Ereignisse auswählen, für die du Benachrichtigungen per E-Mail erhalten möchtest:'
-    other_settings: Weitere Benachrichtigungseinstellungen
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ de:
     errors:
       limit_reached: Limit für verschiedene Reaktionen erreicht
       unrecognized_emoji: ist ein unbekanntes Emoji
+  redirects:
+    prompt: Wenn du diesem Link vertraust, dann klicke ihn an, um fortzufahren.
+    title: Du verlässt %{instance}.
   relationships:
     activity: Kontoaktivität
     confirm_follow_selected_followers: Möchtest du den ausgewählten Followern folgen?
@@ -1608,6 +1619,7 @@ de:
       unknown_browser: Unbekannter Browser
       weibo: Weibo
     current_session: Aktuelle Sitzung
+    date: Datum
     description: "%{browser} auf %{platform}"
     explanation: Dies sind die Webbrowser, die derzeit mit deinem Mastodon-Konto verbunden sind.
     ip: IP-Adresse
@@ -1644,14 +1656,26 @@ de:
     import: Importieren
     import_and_export: Importieren und exportieren
     migrate: Kontoumzug
-    notifications: Benachrichtigungen
+    notifications: E-Mail-Benachrichtigungen
     preferences: Einstellungen
     profile: Öffentliches Profil
     relationships: Follower und Folge ich
+    severed_relationships: Getrennte Beziehungen
     statuses_cleanup: Automatische Löschung
     strikes: Maßnahmen
     two_factor_authentication: Zwei-Faktor-Authentisierung (2FA)
     webauthn_authentication: Sicherheitsschlüssel
+  severed_relationships:
+    download: Herunterladen (%{count})
+    event_type:
+      account_suspension: Kontosperre (%{target_name})
+      domain_block: Serversperre (%{target_name})
+      user_domain_block: Du hast %{target_name} blockiert
+    lost_followers: Verlorene Follower
+    lost_follows: Konten entfolgt
+    preamble: Möglicherweise verlierst du Follower und entfolgst Konten, wenn du eine Domain blockierst oder Moderator*innen externe Server sperren. Sollte das der Fall sein, wirst du eine Liste mit den getrennten Beziehungen herunterladen können. Dadurch kannst du die Änderungen einsehen oder die Liste auf einen anderen Server importieren.
+    purged: Informationen über diesen Server wurden von deinen Server-Administrator*innen entfernt.
+    type: Ereignis
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ de:
         other: "%{count} Stimmen"
       vote: Abstimmen
     show_more: Mehr anzeigen
-    show_newer: Neuere anzeigen
-    show_older: Ältere anzeigen
     show_thread: Thread anzeigen
     title: "%{name}: „%{quote}“"
     visibilities:
@@ -1747,6 +1769,7 @@ de:
     contrast: Mastodon (Hoher Kontrast)
     default: Mastodon (Dunkel)
     mastodon-light: Mastodon (Hell)
+    system: Automatisch (mit System synchronisieren)
   time:
     formats:
       default: "%d. %b %Y, %H:%M Uhr"
@@ -1774,20 +1797,29 @@ de:
     webauthn: Sicherheitsschlüssel
   user_mailer:
     appeal_approved:
-      action: Dein Konto aufrufen
-      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in gutem Zustand.
+      action: Kontoeinstellungen
+      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in Ordnung.
       subject: Dein Einspruch vom %{date} wurde angenommen
+      subtitle: Dein Konto ist wieder in Ordnung.
       title: Einspruch angenommen
     appeal_rejected:
       explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde abgelehnt.
       subject: Dein Einspruch vom %{date} wurde abgelehnt
+      subtitle: Dein Einspruch wurde abgelehnt.
       title: Einspruch abgelehnt
     backup_ready:
-      explanation: Du hast eine vollständige Sicherung deines Mastodon-Kontos angefordert. Die Sicherung kann jetzt heruntergeladen werden!
+      explanation: Du hast eine vollständige Datensicherung deines Mastodon-Kontos angefordert.
+      extra: Sie ist jetzt zum Herunterladen bereit!
       subject: Dein persönliches Archiv kann heruntergeladen werden
       title: Archiv-Download
+    failed_2fa:
+      details: 'Details zum Anmeldeversuch:'
+      explanation: Jemand hat versucht, sich bei deinem Konto anzumelden, aber die Zwei-Faktor-Authentisierung schlug fehl.
+      further_actions_html: Solltest du das nicht gewesen sein, empfehlen wir dir, sofort %{action}, da dein Konto möglicherweise kompromittiert ist.
+      subject: Zwei-Faktor-Authentisierung fehlgeschlagen
+      title: Zwei-Faktor-Authentisierung fehlgeschlagen
     suspicious_sign_in:
-      change_password: dein Passwort ändern
+      change_password: dein Passwort zu ändern
       details: 'Hier sind die Details zu den Anmeldeversuchen:'
       explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
       further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.
@@ -1814,7 +1846,7 @@ de:
         mark_statuses_as_sensitive: Deine Beiträge von %{acct} wurden mit einer Inhaltswarnung versehen
         none: Warnung für %{acct}
         sensitive: Deine Beiträge von %{acct} werden künftig mit einer Inhaltswarnung versehen
-        silence: Dein Konto %{acct} wurde stummgeschaltet
+        silence: Dein Konto %{acct} wurde eingeschränkt
         suspend: Dein Konto %{acct} wurde gesperrt
       title:
         delete_statuses: Beiträge entfernt
@@ -1825,13 +1857,44 @@ de:
         silence: Konto stummgeschaltet
         suspend: Konto gesperrt
     welcome:
-      edit_profile_action: Profil einrichten
-      edit_profile_step: Du kannst dein Profil anpassen, indem du ein Profilbild hochlädst, deinen Anzeigenamen änderst und vieles mehr. Du kannst dich dafür entscheiden, neue Follower zu überprüfen, bevor sie dir folgen dürfen.
+      apps_android_action: Aus dem Google Play Store herunterladen
+      apps_ios_action: Im App Store herunterladen
+      apps_step: Lade unsere offiziellen Apps herunter.
+      apps_title: Mastodon-Apps
+      checklist_subtitle: 'Fangen wir an, diese neue soziale Dimension zu erkunden:'
+      checklist_title: Willkommensleitfaden
+      edit_profile_action: Personalisieren
+      edit_profile_step: Mit einem vollständigen Profil interagieren andere eher mit dir.
+      edit_profile_title: Personalisiere dein Profil
       explanation: Hier sind ein paar Tipps, um loszulegen
-      final_action: Mit erstem Beitrag starten
-      final_step: 'Fang jetzt an zu posten! Selbst ohne Follower werden deine öffentlichen Beiträge von anderen gesehen, zum Beispiel in der lokalen Timeline oder über die Hashtags. Möglicherweise möchtest du dich allen mit dem Hashtag #neuhier vorstellen.'
-      full_handle: Dein vollständiger Profilname
-      full_handle_hint: Deinen vollständigen Profilnamen kannst du deinen Freund*innen mitteilen, damit sie dich anschreiben oder dir von einem anderen Server folgen können.
+      feature_action: Mehr erfahren
+      feature_audience: Mastodon bietet dir eine einzigartige Möglichkeit, deine Reichweite ohne Mittelsperson zu verwalten. Auf deiner eigenen Infrastruktur bereitgestellt, ermöglicht Mastodon es dir, jedem anderen Mastodon-Server zu folgen und von jedem anderen Server aus gefolgt zu werden. Ebenso steht Mastodon unter deiner Kontrolle.
+      feature_audience_title: Baue deine Reichweite mit Vertrauen auf
+      feature_control: Du weißt am besten, was du auf deiner Startseite sehen möchtest. Keine Algorithmen oder Werbung, die deine Zeit verschwenden. Folge Nutzer*innen von jedem Mastodon-Server von einem einzelnen Konto aus und empfange deren Beiträge in chronologischer Reihenfolge. Mache Mastodon zu deinem ganz persönlichen Fleckchen im Internet.
+      feature_control_title: Behalte die Kontrolle über deine eigene Timeline
+      feature_creativity: Mastodon unterstützt Audio-, Video- und Bildbeiträge, Beschreibungen, Umfragen, Inhaltswarnungen, animierte Avatare, benutzerdefinierte Emojis, das Zuschneiden von Vorschaubildern und vieles mehr, um dir zu helfen, dich online zu entfalten. Egal, ob du deine Kunst, deine Musik oder deinen Podcast veröffentlichst – Mastodon ist für dich da.
+      feature_creativity_title: Einzigartige Kreativität
+      feature_moderation: Mastodon legt die Entscheidungskraft zurück in deine Hände. Jeder Server erstellt eigene Regeln und Vorschriften, die nur lokal, pro einzelnem Server durchgesetzt werden – und nicht von oben herab, wie es bei den kommerziellen sozialen Medien der Fall ist. Dadurch ist Mastodon viel anpassungsfähiger für verschiedene Gruppen von Menschen. Registriere dich bei einem Server, dessen Regeln du magst, oder hoste deinen eigenen Server.
+      feature_moderation_title: Moderation so, wie sie sein sollte
+      follow_action: Folgen
+      follow_step: Interessanten Profilen zu folgen ist das, was Mastodon ausmacht.
+      follow_title: Personalisiere deine Startseite
+      follows_subtitle: Folge bekannten Profilen
+      follows_title: Empfohlene Profile
+      follows_view_more: Weitere Profile zum Folgen entdecken
+      hashtags_recent_count:
+        one: "%{people} Profil in den vergangenen 2 Tagen"
+        other: "%{people} Profile in den vergangenen 2 Tagen"
+      hashtags_subtitle: Entdecke, was in den vergangenen 2 Tagen angesagt war
+      hashtags_title: Angesagte Hashtags
+      hashtags_view_more: Weitere angesagte Hashtags entdecken
+      post_action: Verfassen
+      post_step: Begrüße die Welt mit Text, Fotos, Videos oder Umfragen.
+      post_title: Erstelle deinen ersten Beitrag
+      share_action: Teilen
+      share_step: Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.
+      share_title: Teile dein Mastodon-Profil
+      sign_in_action: Anmelden
       subject: Willkommen bei Mastodon!
       title: Willkommen an Bord, %{name}!
   users:
@@ -1839,6 +1902,7 @@ de:
     go_to_sso_account_settings: Kontoeinstellungen des Identitätsanbieters aufrufen
     invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung (2FA)
     otp_lost_help_html: Wenn du beides nicht mehr weißt, melde dich bitte bei uns unter der E-Mail-Adresse %{email}
+    rate_limited: Zu viele Authentisierungsversuche. Bitte versuche es später noch einmal.
     seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
     signed_in_as: 'Angemeldet als:'
   verification:
diff --git a/config/locales/devise.an.yml b/config/locales/devise.an.yml
index f179f915dc..4be18845cc 100644
--- a/config/locales/devise.an.yml
+++ b/config/locales/devise.an.yml
@@ -47,11 +47,9 @@ an:
         subject: 'Mastodon: Instruccions pa reiniciar clau'
         title: Reiniciar clau
       two_factor_disabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau deshabilitada. Agora puetz connectar-te nomás usando l'adreza de correu electronico y la clau.
         subject: 'Mastodon: L''autenticación de dos factors ye deshabilitada'
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau habilitada. Se requiere un token chenerau per l'aplicación TOTP emparellada pa ingresar.
         subject: 'Mastodon: L''autenticación de dos factors ye habilitada'
         title: 2FA activada
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ an:
           subject: 'Mastodon: Clau de seguranza eliminada'
           title: Una d'as tuyas claus de seguranza ha estau eliminada
       webauthn_disabled:
-        explanation: L'autenticación con claus de seguranza ha estau deshabilitada pa la tuya cuenta. Agora l'inicio de sesión nomás ye posible utilizando lo token chenerau per l'aplicación TOTP emparellada.
         subject: 'Mastodon: Autenticación con claus de seguranza deshabilitada'
         title: Claus de seguranza deshabilitadas
       webauthn_enabled:
-        explanation: L'autenticación con clau de seguranza ha estau habilitada pa la tuya cuenta. Agora la tuya clau de seguranza puede estar utilizada pa iniciar sesión.
         subject: 'Mastodon: Autenticación de clau de seguranza habilitada'
         title: Claus de seguranza habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 97d1710edf..e8b6ff7d93 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -12,6 +12,7 @@ ar:
       last_attempt: بإمكانك إعادة المحاولة مرة واحدة قبل أن يتم قفل حسابك.
       locked: إن حسابك مقفل.
       not_found_in_database: "%{authentication_keys} أو كلمة سر خاطئة."
+      omniauth_user_creation_failure: خطأ في إنشاء حساب لهذه الهُوِيَّة.
       pending: إنّ حسابك في انتظار مراجعة.
       timeout: لقد انتهت مدة صَلاحِيَة جلستك. قم بتسجيل الدخول من جديد للمواصلة.
       unauthenticated: يجب عليك تسجيل الدخول أو إنشاء حساب قبل المواصلة.
@@ -47,16 +48,19 @@ ar:
         subject: 'ماستدون: تعليمات استعادة كلمة المرور'
         title: إعادة تعيين كلمة السر
       two_factor_disabled:
-        explanation: تم تعطيل المصادقة بخطوتين لحسابك الخاص. إنّ الولوج ممكن الآن باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
+        explanation: أصبح الولوج الآن ممكنا باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
         subject: 'ماستدون: نظام المصادقة بخطوتين مُعطّل'
+        subtitle: تم تعطيل المصادقة بعاملين لحسابك.
         title: إنّ 2FA معطّل
       two_factor_enabled:
-        explanation: تم تفعيل المصادقة بخطوتين على حسابك. سيُطلب منك رمز تم توليده بواسطة تطبيق TOTP المقترن للولوج.
+        explanation: سيتعين استخدام رمز يتم إنشاؤه بواسطة تطبيق TOTP المقترن لتسجيل الدخول.
         subject: 'ماستدون: تم تفعيل نظام المصادقة بخطوتين'
-        title: إنّ 2FA نشِط
+        subtitle: تم تفعيل المصادقة الثنائية لحسابك.
+        title: الاستيثاق الثنائي 2FA مُفعّل
       two_factor_recovery_codes_changed:
         explanation: لقد تم إلغاء رموز الاسترداد السابقة وأنشئت رموز جديدة.
         subject: 'ماستدون: تم إعادة توليد رموز استرجاع المصادقة بخطوتين'
+        subtitle: تم إبطال رموز الاسترداد السابقة وإنشاء رموز جديدة.
         title: تم استبدال رموز استرجاع 2FA
       unlock_instructions:
         subject: 'ماستدون: تعليمات فك القفل'
@@ -70,11 +74,13 @@ ar:
           subject: 'ماستدون: تم حذف مفتاح الأمان'
           title: تم حذف أحد مفاتيح الأمان الخاصة بك
       webauthn_disabled:
-        explanation: تم تعطيل الاستيثاق مع مفاتيح الأمان لحسابك. تسجيل الدخول الآن ممكن باستخدام الرمز (token) الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن.
+        explanation: تم تعطيل المصادقة باستخدام مفاتيح الأمان لحسابك.
+        extra: يمكن الآن تسجيل الدخول باستخدام الرمز المميز الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن فقط.
         subject: 'ماستدون: الاستيثاق مع مفاتيح الأمان معطلة'
         title: مفاتيح الأمان معطلة
       webauthn_enabled:
-        explanation: تم تفعيل استيثاق مفتاح الأمان للحساب الخاص بك. يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
+        explanation: تم تمكين مصادقة مفتاح الأمان لحسابك.
+        extra: يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
         subject: 'ماستدون: تم تفعيل نظام استيثاق مفتاح الأمان'
         title: مفاتيح الأمان مفعلة
     omniauth_callbacks:
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index a4378dee92..47372c2f07 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -42,11 +42,9 @@ ast:
         subject: 'Mastodon: instrucciones pa camudar la contraseña'
         title: Cambéu de la contaseña
       two_factor_disabled:
-        explanation: Desactivóse l'autenticación en dos pasos na cuenta. Agora ye posible aniciar la sesión cola direición de corréu electrónicu ya la contraseña.
         subject: 'Mastodon: desactivóse l''autenticación en dos pasos'
         title: Autenticación de dos pasos activada
       two_factor_enabled:
-        explanation: Activóse l'autenticación en dos pasos na cuenta. Agora los pases que xenere l'aplicación TOTP empareyada son obligatorios p'aniciar la sesión.
         subject: 'Mastodon: activóse l''autenticación en dos pasos'
         title: Autenticación de dos pasos desactivada
       two_factor_recovery_codes_changed:
@@ -62,11 +60,9 @@ ast:
         deleted:
           title: Desanicióse una de les to llaves de seguranza
       webauthn_disabled:
-        explanation: Desactivóse l'autenticación con llaves de seguranza na cuenta. Agora namás ye posible aniciar la sesión col pase xeneráu pola aplicación TOTP empareyada.
         subject: 'Mastodon: desactivóse l''autenticación con llaves de seguranza'
         title: Llaves de seguranza desactivaes
       webauthn_enabled:
-        explanation: Activóse l'autenticación con llaves de seguranza na cuenta. Agora pues usar la llave p'aniciar la sesión.
         subject: 'Mastodon: activóse l''autenticación con llaves de seguranza'
         title: Llaves de seguranza activaes
     passwords:
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index e5e8aea91e..81f3120a88 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -12,6 +12,7 @@ be:
       last_attempt: У вас ёсць яшчэ адна спроба, перш чым ваш рахунак будзе заблакаваны
       locked: Ваш уліковы запіс заблакіраваны.
       not_found_in_database: Няправільны %{authentication_keys} або пароль.
+      omniauth_user_creation_failure: Памылка пры стварэнні ўліковага запісу для гэтай асобы.
       pending: Ваш уліковы запіс яшчэ разглядаецца.
       timeout: Ваш сеанс скончыўся. Каб працягнуць, увайдзіце яшчэ раз.
       unauthenticated: Вам патрэбна зайсьці альбо зарэгістравацца, каб працягнуць
@@ -47,16 +48,19 @@ be:
         subject: 'Mastodon: Інструкцыі па скіданню пароля'
         title: Скіданне пароля
       two_factor_disabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была адключана. Цяпер для ўваходу патрэбны толькі электронная пошта і пароль.
+        explanation: Уваход у сістэму цяпер магчымы толькі з выкарыстаннем адраса электроннай пошты і пароля.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
+        subtitle: Двухфактарная аўтэнтыфікацыя для вашага ўліковага запісу была адключаная.
         title: двухэтапнае спраўджанне адключана
       two_factor_enabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была ўключана. Цяпер для ўваходу ў сістэму патрэбны токен, згенераваны даданай TOTP праграмай.
+        explanation: Для ўваходу ў сістэму патрабуецца токен, згенераваны спалучанай праграмай TOTP.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
+        subtitle: Для вашага ўліковага запісу была ўключаная двухфактарная аўтэнтыфікацыя.
         title: двухэтапнае спраўджанне уключана
       two_factor_recovery_codes_changed:
         explanation: Папярэднія коды аднаўлення былі ануляваны і створаны новыя.
         subject: 'Mastodon: створаны новыя коды аднаўлення'
+        subtitle: Папярэднія коды аднаўлення былі ануляваны і замест іх створаны новыя.
         title: 2FA коды аднаўлення былі зменены
       unlock_instructions:
         subject: 'Mastodon: інструкцыя па разблакаванні'
@@ -70,11 +74,13 @@ be:
           subject: 'Mastodon: ключ бяспекі выдалены'
           title: Адзін з вашых ключоў бяспекі быў выдалены
       webauthn_disabled:
-        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключана для вашага ўліковага запісу. Уваход цяпер магчымы толькі з токенам, згенераваным спалучаным TOTP прыкладаннем.
+        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключаная для вашага ўліковага запісу.
+        extra: Зараз уваход у сістэму магчымы толькі з выкарыстаннем токена, згенераванага спалучанай праграмай TOTP.
         subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
         title: Ключы бяспекі адключаны
       webauthn_enabled:
-        explanation: Аўтэнтыфікацыя праз ключ бяспекі была ўключана для вашага ўліковага запісу. Цяпер вы можаце выкарыстоўваць ваш ключ бяспекі для ўваходу.
+        explanation: Для вашага ўліковага запісу ўключана аўтэнтыфікацыя па ключу бяспекі.
+        extra: Цяпер ваш ключ бяспекі можна выкарыстоўваць для ўваходу ў сістэму.
         subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
         title: Ключы бяспекі ўключаны
     omniauth_callbacks:
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index 5046771340..116939762c 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -12,13 +12,14 @@ bg:
       last_attempt: Разполагате с още един опит преди акаунтът ви да се заключи.
       locked: Вашият акаунт е заключен.
       not_found_in_database: Невалиден %{authentication_keys} или парола.
+      omniauth_user_creation_failure: Грешка, сътворявайки акаунт за тази самоличност.
       pending: Вашият акаунт все още е в процес на проверка.
       timeout: Заседанието ви изтече. Влезте пак, за да продължите.
       unauthenticated: Преди да продължите, трябва да влезете или да се регистрирате.
       unconfirmed: Преди да продължите, трябва да потвърдите адреса на имейла си.
     mailer:
       confirmation_instructions:
-        action: Потвърдете адреса на имейла
+        action: Потвърждаване на адреса на имейла
         action_with_app: Потвърдете и се върнете към %{app}
         explanation: Създали сте акаунт на %{host} с този имейл адрес. Само на едно щракване разстояние сте от активирането му. Ако това не сте били вие, моля, игнорирайте този имейл.
         explanation_when_pending: Кандидатствахте за покана до %{host} с този имейл адрес. След като потвърдите своя имейл адрес, ние ще разгледаме вашето заявление. Можете да влезете, за да промените данните си или да изтриете акаунта си, но нямате достъп до повечето функции, докато акаунтът ви не бъде одобрен. Ако вашето заявление бъде отхвърлено, вашите данни ще бъдат премахнати, така че няма да се изискват допълнителни действия от вас. Ако това не сте били вие, моля, игнорирайте този имейл.
@@ -39,7 +40,7 @@ bg:
         explanation: Потвърдете новия адрес, за да промените имейла си.
         extra: Ако тази промяна не е започната от вас, то пренебрегнете този имейл. Адресът на имейла за акаунта в Mastodon няма да се промени, докато не влезете в горната връзка.
         subject: 'Mastodon: Потвърдете имейла за %{instance}'
-        title: Потвърдете своя имейл адрес
+        title: Потвърждаване на адреса на имейла
       reset_password_instructions:
         action: Промяна на паролата
         explanation: Поискахте нова парола за акаунта си.
@@ -47,16 +48,19 @@ bg:
         subject: 'Mastodon: Указания за задаване на нова парола'
         title: Нулиране на парола
       two_factor_disabled:
-        explanation: Двуфакторното удостоверяване за вашия акаунт е деактивирано. Влизането вече е възможно, като се използват само имейл адрес и парола.
+        explanation: Влизането вече е възможно, употребявайки само адрес на имейла и парола.
         subject: 'Mastodon: Двуфакторното удостоверяване е деактивирано'
+        subtitle: Двуфакторното удостоверяване за акаунта ви е изключено.
         title: Двуфакторното изключено
       two_factor_enabled:
-        explanation: За акаунта ви е включено двуфакторно удостоверяване. Отсега нататък ще ви трябва и временен код от сдвоеното приложение за удостоверяване TOTP, за да влезете.
+        explanation: Породени токени от сдвоено приложение TOTP ще се изискват за вход.
         subject: 'Mastodon: Включено двуфакторно удостоверяване'
+        subtitle: Двуфакторното удостоверяване е включено за акаунта ви.
         title: 2FA активирано
       two_factor_recovery_codes_changed:
         explanation: Предишните кодове за възстановяване са анулирани и се пораждат нови.
         subject: 'Mastodon: Породени пак са двуфакторни кодове за възстановяване'
+        subtitle: Предишните кодове за възстановяване са обезсилени и се пораждат нови.
         title: Кодове за 2 факт. удост. за възстановяване са променени
       unlock_instructions:
         subject: 'Mastodon: указания за отключване'
@@ -70,11 +74,13 @@ bg:
           subject: 'Mastodon: Ключът за сигурност е изтрит'
           title: Един от ключовете ви за сигурност е изтрит
       webauthn_disabled:
-        explanation: Удостоверяването с ключове за сигурност е изключено за акаунта ви. Влизането вече е възможно, използвайки само ключа, породен от сдвоеното приложение TOTP.
+        explanation: Удостоверяването на ключовете за сигурност е изключено за акаунта ви.
+        extra: Влизането вече е възможно, употребявайки само породени токени от сдвоено приложение TOTP.
         subject: 'Mastodon: Изключено удостоверяване с ключове за сигурност'
         title: Изключени ключове за сигурност
       webauthn_enabled:
-        explanation: Удостоверяването с ключ за сигурност е активирано за вашия акаунт. Вашият ключ за сигурност вече може да се използва за вход.
+        explanation: Удостоверяването на ключа за сигурност е включено за акаунта ви.
+        extra: Вашият ключ за сигурност вече може да се употребява за вход.
         subject: 'Mastodon: Включено удостоверяване с ключ за сигурност'
         title: Включени ключове за сигурност
     omniauth_callbacks:
@@ -82,8 +88,8 @@ bg:
       success: Успешно упълномощаване от акаунт на %{kind}.
     passwords:
       no_token: Не можете да осъществите достъп до тази страница, ако не сте я отворили чрез линк от получен имейл за възстановяване на паролата. Ако сте отворили линка за възстановяване на паролата от имейл, моля, уверете се, че сте използвали целия предоставен URL адрес.
-      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
-      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
       updated: Паролата ви беше променена успешно. Сега сте влезли.
       updated_not_active: Паролата ви беше променена успешно.
     registrations:
@@ -101,7 +107,7 @@ bg:
       signed_out: Успешно излизане.
     unlocks:
       send_instructions: Ще получите имейл с указания как да отключите акаунта си до няколко минути. Проверете папката си за спам, ако не сте получили такъв имейл.
-      send_paranoid_instructions: Ако вашият акаунт съществува, ще получите имейл с указания за отключването му до няколко минути. Проверете спам папката си, ако не сте получили такъв имейл.
+      send_paranoid_instructions: Ако акаунта ви съществува, то ще получите е-писмо с указания за отключването му до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
       unlocked: Акаунтът ви е успешно отключен. Влезте, за да продължите.
   errors:
     messages:
diff --git a/config/locales/devise.bn.yml b/config/locales/devise.bn.yml
index e0d83613e8..b046289039 100644
--- a/config/locales/devise.bn.yml
+++ b/config/locales/devise.bn.yml
@@ -47,11 +47,9 @@ bn:
         subject: 'মাস্টাডন: পাসওয়ার্ড বদলানোর নির্দেশনা'
         title: পাসওয়ার্ড বদলানো
       two_factor_disabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ অক্ষম করা হয়েছে। লগইন এখন কেবলমাত্র ইমেল ঠিকানা এবং পাসওয়ার্ড ব্যবহার করে সম্ভব।
         subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ অক্ষম'
         title: 2FA অক্ষম
       two_factor_enabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ সক্ষম করা হয়েছে। জোড়যুক্ত TOTP অ্যাপ্লিকেশন দ্বারা উত্পাদিত একটি টোকেন লগইনের জন্য প্রয়োজন হবে।
         subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ সক্ষম হয়েছে'
         title: 2FA সক্ষম
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 4a16157f81..cb406e5f5e 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -19,7 +19,7 @@ br:
     mailer:
       confirmation_instructions:
         action: Gwiriekaat ar chomlec'h postel
-        action_with_app: Kadarnaat ha distroiñ da %{app}
+        action_with_app: Kadarnaat ha distreiñ da %{app}
         explanation: Krouet ho peus ur c'hont war %{host} gant ar chomlec'h-postel-mañ. N'eus nemet ur c'hlik evit bevaat anezhañ. Ma ne oa ket krouet ganeoc'h, dianavezit ar postel-se.
         explanation_when_pending: Enskrivañ ho peus d'ur c'hemennad da %{host} gant ar chomlec'h-postel-se. Pa vo kadarnaet ho chomlec'h-postel, hoc'h enskrivadur a vo asantet. Gallout a rit mont-tre evit kemmañ munudoù ho kont pe skarzhañ anezhañ, met ne c'hellit ket implijout ul lod eus an aezamantoù par ma n'eo ket asantet ho kont. Ma vefe hoc'h enskrivadur nac'het, ho keloù a vefe skarzhet, neuze ne vo ket ret deoc'h ober netra ken. Ma ne oa ket ac'hanoc'h, dianavezit ar postel-se.
         extra_html: Mar plij, gwiriit ivez <a href="%{terms_path}"> reolennoù ar servijer</a> ha <a href="%{policy_path}"> hon divizoù-implij</a>.
@@ -47,11 +47,9 @@ br:
         subject: 'Mastodon: Adkorañ kemennoù ar ger-tremen'
         title: Adderaouekaat ar ger-tremen
       two_factor_disabled:
-        explanation: Dilesadur dre eil-elfenn a zo bet nac'het. Gallout a reer mont-tre en ur implijout nemet ur chomlec'h-postel hag ur ger-tremen.
         subject: 'Mastodon: dilesadur dre eil-elfenn nac''het'
         title: 2FA diweredekaet
       two_factor_enabled:
-        explanation: Dilesadur dre eil-elfenn a zo aotreet evit ho kont. Ret a vo implij ur jedouer krouet gant an app TOTP koublet evit mont-tre.
         subject: 'Mastodon: dilesadur dre eil-elfenn aotreet'
         title: 2FA gweredekaet
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ br:
           subject: 'Mastodon: alc''hwezioù surentez dilamet'
           title: Unan eus hoc'h alc'hwezioù surentez a zo bet dilamet
       webauthn_disabled:
-        explanation: Dilezadur dre alc'hwezioù surentel a zo bet nac'het evit ho kont. Gallout a reer mont-tre en ur implijout ar jedouer krouet gant app TOTP koublet.
         subject: 'Mastodon: dilesadur dre alc''hwezioù surentez nac''het'
         title: Alc'hwezioù surentez nac'het
       webauthn_enabled:
-        explanation: Dilesadur dre alc'hwez surentez a zo bet aotreet evit ho kont. Hoc'h alc'hwez surentez a c'hell bezañ implijet evit mont-tre.
         subject: 'Mastodon: dilesadur dre alc''hwezioù surentez aotreet'
         title: Alc'hwezioù surentez aotreet
     omniauth_callbacks:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 6ebdafb9ec..9b4ccccff7 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -14,6 +14,7 @@ ca:
       last_attempt: Tens un intent més abans no es bloqui el teu compte.
       locked: El teu compte s'ha blocat.
       not_found_in_database: "%{authentication_keys} o contrasenya no són vàlids."
+      omniauth_user_creation_failure: S'ha produït un error en crear un compte per a aquesta identitat.
       pending: El teu compte encara està en revisió.
       timeout: La teva sessió ha expirat. Torna a iniciar-la per a continuar.
       unauthenticated: Necessites iniciar sessió o registrar-te abans de continuar.
@@ -49,16 +50,19 @@ ca:
         subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
         title: Contrasenya restablerta
       two_factor_disabled:
-        explanation: L'autenticació de doble factor per al teu compte s'ha desactivat. Ara només pots iniciar la sessió fent servir la teva adreça de correu-e i la contrasenya.
+        explanation: Ara es pot accedir amb només compte de correu i contrasenya.
         subject: 'Mastodon: Autenticació de doble factor desactivada'
+        subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
         title: A2F desactivada
       two_factor_enabled:
-        explanation: L'autenticació de doble factor s'ha habilitat per al teu compte. Per a iniciar la sessió es requerirà un token generat per l'aplicació TOTP que hi hagis emparellat.
+        explanation: Per accedir cal un token generat per l'aplicació TOTP aparellada.
         subject: 'Mastodon: Autenticació de doble factor activada'
+        subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
         title: A2F activada
       two_factor_recovery_codes_changed:
         explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
         subject: 'Mastodon: codis de recuperació de doble factor regenerats'
+        subtitle: S'han invalidat els codis de recuperació anteriors i se n'han generat de nous.
         title: Codis de recuperació A2F canviats
       unlock_instructions:
         subject: 'Mastodon: Instruccions per a desblocar'
@@ -72,11 +76,13 @@ ca:
           subject: 'Mastodon: Clau de seguretat esborrada'
           title: Una de les teves claus de seguretat ha estat esborrada
       webauthn_disabled:
-        explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. Ara només pots iniciar la sessió usant el token generat per l'aplicació TOTP.
+        explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
+        extra: Ara es pot accedir amb només el token generat amb l'aplicació TOTP aparellada.
         subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
         title: Claus de seguretat desactivades
       webauthn_enabled:
-        explanation: S'ha activat l'autenticació amb claus de seguretat. Ja pots usar la teva clau de seguretat per a iniciar sessió.
+        explanation: S'ha habilitat l'accés amb clau de seguretat al vostre compte.
+        extra: Ara podeu accedir amb la vostra clau de seguretat.
         subject: 'Mastodon: Autenticació amb clau de seguretat activada'
         title: Claus de seguretat activades
     omniauth_callbacks:
diff --git a/config/locales/devise.ckb.yml b/config/locales/devise.ckb.yml
index 1261ebb648..f33959d76c 100644
--- a/config/locales/devise.ckb.yml
+++ b/config/locales/devise.ckb.yml
@@ -47,11 +47,9 @@ ckb:
         subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
         title: گەڕانەوەی تێپەڕوشە
       two_factor_disabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
         subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
         title: 2FA ناچالاک کرا
       two_factor_enabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
         subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
         title: 2FA چالاک کرا
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ckb:
           subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
           title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
       webauthn_disabled:
-        explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
         subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
         title: کلیلە پارستنەکان ناچالاک کراون
       webauthn_enabled:
-        explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
         subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
         title: کلیلە کانی پاراستن چالاک کرا
     omniauth_callbacks:
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml
index 8409cfad9b..d661637875 100644
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@@ -47,11 +47,9 @@ co:
         subject: 'Mastodon: Cambià a chjave d’accessu'
         title: Cambià a chjave
       two_factor_disabled:
-        explanation: L'autentificazione à dui fattori per u vostru contu hè stata disattivata. A cunnessione hè avà pussibule cù l'usu solu di u vostru e-mail è di a chjave d'accessu.
         subject: 'Mastodon: Autentificazione à dui fattori disattivata'
         title: A2F disattivata
       two_factor_enabled:
-        explanation: L'autentificazione à dui fattori hè stata attivata per u vostru contu. Un codice, o fiscia, generata da l'applicazione TOTP assuciata sarà dumandata per cunnettavvi.
         subject: 'Mastodon: Autentificazione à dui fattori attivata'
         title: A2F attivata
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ co:
           subject: 'Mastodon: Chjave di sicurità sguassata'
           title: Una di e vostre chjave di sicurità hè stata sguassata
       webauthn_disabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata disattivata per u vostru contu. Avà pudete solu cunnettavi cù u codice di cunnessione generatu da l'applicazione TOTP appaghjata.
         subject: 'Mastodon: Autentificazione cù chjave di sicurità disattivata'
         title: Chjave di sicurità disattivate
       webauthn_enabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata attivata per u vostru contu. Avà a vostra chjave pò esse utilizata per cunnettavi.
         subject: 'Mastodon: Identificazione cù chjave di sicurità attivata'
         title: Chjave di sicurità attivate
     omniauth_callbacks:
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index 32a1ed2c67..4dbc2e08bf 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -12,6 +12,7 @@ cs:
       last_attempt: Máte ještě jeden pokus, než bude váš účet uzamčen.
       locked: Váš účet je uzamčen.
       not_found_in_database: Neplatné %{authentication_keys} nebo heslo.
+      omniauth_user_creation_failure: Při vytvoření účtu pro tuto identitu se nastala chyba.
       pending: Váš účet je stále posuzován.
       timeout: Vaše relace vypršela. Pro pokračování se prosím přihlaste znovu.
       unauthenticated: Před pokračováním se musíte přihlásit nebo zaregistrovat.
@@ -47,17 +48,20 @@ cs:
         subject: 'Mastodon: Instrukce pro obnovení hesla'
         title: Obnovení hesla
       two_factor_disabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení vám nyní stačí pouze e-mailová adresa a heslo.
+        explanation: Přihlášení je nyní možné pouze pomocí emailové adresy a hesla.
         subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
-        title: 2FA bylo vypnuto
+        subtitle: Dvoufaktorové ověřování vašeho účtu bylo vypnuto.
+        title: Dvoufázové ověření bylo vypnuto
       two_factor_enabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet zapnuto. Pro přihlášení bude vyžadován token vygenerovaný spárovanou TOTP aplikací.
+        explanation: Pro přihlášení bude vyžadován token generovaný spárovanou TOTP aplikací.
         subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
-        title: 2FA bylo zapnuto
+        subtitle: Dvoufaktorové ověřování vašeho účtu bylo zapnuto.
+        title: Dvoufázové ověření bylo zapnuto
       two_factor_recovery_codes_changed:
         explanation: Předchozí záložní kódy byly zrušeny a byly vygenerovány nové.
-        subject: 'Mastodon: Dvoufázové záložní kódy byly znovu vygenerovány'
-        title: Záložní kódy pro 2FA byly změněny
+        subject: 'Mastodon: Záložní kódy pro dvoufázové ověření byly znovu vygenerovány'
+        subtitle: Předchozí záložní kódy byly zrušeny a byly vygenerovány nové.
+        title: Záložní kódy pro dvoufázové ověření byly změněny
       unlock_instructions:
         subject: 'Mastodon: Instrukce pro odemčení účtu'
       webauthn_credential:
@@ -70,11 +74,13 @@ cs:
           subject: 'Mastodon: Bezpečnostní klíč byl smazán'
           title: Jeden z vašich bezpečnostních klíčů byl smazán
       webauthn_disabled:
-        explanation: Pro váš účet bylo vypnuto ověření bezpečnostními klíči. Přihlášení je nyní možné pouze s tokenem vygenerovaným spárovanou TOTP aplikací.
-        subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
+        explanation: 'Mastodon: Přihlašování pomocí bezpečnostními klíčemi bylo pro váš účet vypnuto.'
+        extra: Přihlášení je nyní možné pouze pomocí tokenem vygenerovaný spárovanou TOTP aplikací.
+        subject: 'Mastodon: Přihlašování pomocí bezpečnostními klíčemi bylo vypnuto'
         title: Bezpečnostní klíče byly zakázány
       webauthn_enabled:
-        explanation: Pro váš účet bylo povoleno ověření bezpečnostními klíči. Nyní můžete svůj bezpečnostní klíč použít pro přihlášení.
+        explanation: 'Mastodon: Přihlašování bezpečnostními klíči bylo pro váš účet povoleno.'
+        extra: Váš bezpečnostní klíč nyní může být použit pro přihlášení.
         subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
         title: Bezpečnostní klíče byly povoleny
     omniauth_callbacks:
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index 44c09153ff..523ae70b04 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -12,6 +12,7 @@ cy:
       last_attempt: Mae gennych un cyfle arall cyn i'ch cyfrif gael ei gloi.
       locked: Mae eich cyfrif wedi ei gloi.
       not_found_in_database: "%{authentication_keys} neu gyfrinair annilys."
+      omniauth_user_creation_failure: Gwall wrth greu cyfrif ar gyfer yr hunaniaeth hon.
       pending: Mae eich cyfrif dal o dan adolygiad.
       timeout: Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto i barhau.
       unauthenticated: Mae angen i chi fewngofnodi neu gofrestru cyn parhau.
@@ -47,16 +48,19 @@ cy:
         subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
         title: Ailosod cyfrinair
       two_factor_disabled:
-        explanation: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi. Mae modd mewngofnodi nawr gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
+        explanation: Mae modd mewngofnodi nawr gan ddefnyddio dim ond cyfeiriad e-bost a chyfrinair.
         subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi.
         title: Dilysu dau ffactor yn anabl
       two_factor_enabled:
-        explanation: Mae dilysu dau ffactor wedi'i alluogi ar gyfer eich cyfrif. Bydd angen tocyn a gynhyrchir gan yr ap TOTP pâr i fewngofnodi.
+        explanation: Bydd angen tocyn wedi'i gynhyrchu gan yr ap TOTP pâr i fewngofnodi.
         subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor wedi'i alluogi ar gyfer eich cyfrif.
         title: Mae dilysu dau ffactor wedi'i alluogi
       two_factor_recovery_codes_changed:
         explanation: Mae'r codau adfer blaenorol wedi'u hannilysu a chynhyrchwyd rhai newydd.
         subject: 'Mastodon: Mae codau adfer dau ffactor wedi''u hadfywio'
+        subtitle: Mae'r codau adfer blaenorol wedi'u hannilysu a rhai newydd wedi'u cynhyrchu.
         title: Newidiodd codau adfer 2FA
       unlock_instructions:
         subject: 'Mastodon: Cyfarwyddiadau datgloi'
@@ -70,11 +74,13 @@ cy:
           subject: 'Mastodon: Allwedd ddiogelwch wedi''i dileu'
           title: Mae un o'ch allweddi diogelwch wedi'i ddileu
       webauthn_disabled:
-        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif. Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn a gynhyrchir gan yr ap TOTP pâr yn unig.
+        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif.
+        extra: Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn wedi'i gynhyrchu gan yr ap TOTP pâr yn unig.
         subject: 'Mastodon: Dilysiad gydag allweddi diogelwch wedi''i analluogi'
         title: Allweddi diogelwch wedi'u hanalluogi
       webauthn_enabled:
-        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif. Gellir defnyddio'ch allwedd ddiogelwch nawr ar gyfer mewngofnodi.
+        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif.
+        extra: Mae modd defnyddio'ch allwedd ddiogelwch nawr i fewngofnodi.
         subject: 'Mastodon: Dilysiad allwedd diogelwch wedi''i alluogi'
         title: Allweddi diogelwch wedi'u galluogi
     omniauth_callbacks:
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 17593be3fd..c472242ba7 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -12,6 +12,7 @@ da:
       last_attempt: Du har ét forsøg mere, før din konto bliver låst.
       locked: Din konto er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller adgangskode.
+      omniauth_user_creation_failure: Fejl under oprettelse af konto for denne identitet.
       pending: Din konto er stadig under revision.
       timeout: Session udløbet. Log ind igen for at fortsætte.
       unauthenticated: Log ind eller tilmeld dig for at fortsætte.
@@ -47,16 +48,19 @@ da:
         subject: 'Mastodon: Instruktioner til adgangskodenulstilling'
         title: Adgangskodenulstilling
       two_factor_disabled:
-        explanation: Tofaktorgodkendelse for kontoen er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
+        explanation: Indlogning er nu mulig via kun e-mailadresse og adgangskode.
         subject: 'Mastodon: Tofaktorgodkendelse deaktiveret'
+        subtitle: Tofaktorgodkendelse for kontoen er blevet deaktiveret.
         title: 2FA deaktiveret
       two_factor_enabled:
-        explanation: Tofaktorgodkendelse er blevet aktiveret for kontoen. Indlogning vil kærve et token genereret af den parrede TOTP-app.
+        explanation: Token genereret af parret TOTP-app vil være nødvendig for indlogning.
         subject: 'Mastodon: Tofaktorgodkendelse aktiveret'
+        subtitle: Tofaktorgodkendelse er blevet aktiveret for kontoen.
         title: 2FA aktiveret
       two_factor_recovery_codes_changed:
         explanation: De tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
         subject: 'Mastodan: Tofaktorgendannelseskoder genereret igen'
+        subtitle: Tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
         title: 2FA gendannelseskoder skiftet
       unlock_instructions:
         subject: 'Mastodon: Oplåsningsinstruktioner'
@@ -70,11 +74,13 @@ da:
           subject: 'Mastodon: Sikkerhedsnøgle slettet'
           title: En af dine sikkerhedsnøgler er blevet slettet
       webauthn_disabled:
-        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
+        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen.
+        extra: Indlogning er nu mulig kun via tokenet genereret af parret TOTP-app.
         subject: 'Mastodon: Godkendelse med sikkerhedsnøgler deaktiveret'
         title: Sikkerhedsnøgler deaktiveret
       webauthn_enabled:
-        explanation: Sikkerhedsnøglegodkendelse er aktiveret for kontoen. Din sikkerhedsnøgle kan nu bruges til indlogning.
+        explanation: Sikkerhedsnøglegodkendelse er blevet aktiveret for kontoen.
+        extra: Sikkerhedsnøglen kan nu bruges til indlogning.
         subject: 'Mastodon: Sikkerhedsnøglegodkendelse aktiveret'
         title: Sikkerhedsnøgler aktiveret
     omniauth_callbacks:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index a77240dabe..032132cf5c 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -12,6 +12,7 @@ de:
       last_attempt: Du hast nur noch einen Versuch, bevor dein Zugang gesperrt wird.
       locked: Dein Konto ist gesperrt.
       not_found_in_database: "%{authentication_keys} oder Passwort ungültig."
+      omniauth_user_creation_failure: Fehler beim Erstellen eines Kontos für diese Identität.
       pending: Dein Konto wird weiterhin überprüft.
       timeout: Deine Sitzung ist abgelaufen. Bitte melde dich erneut an, um fortzufahren.
       unauthenticated: Du musst dich anmelden oder registrieren, bevor du fortfahren kannst.
@@ -24,15 +25,15 @@ de:
         explanation_when_pending: Du hast dich für eine Einladung bei %{host} mit dieser E-Mail-Adresse beworben. Sobald du deine E-Mail-Adresse bestätigt hast, werden wir deine Anfrage überprüfen. Du kannst dich in dieser Zeit nicht anmelden. Wenn deine Anfrage abgelehnt wird, werden deine Daten entfernt – von dir ist keine weitere Handlung notwendig. Wenn du das nicht warst, dann kannst du diese E-Mail ignorieren.
         extra_html: Bitte beachte auch die <a href="%{terms_path}">Serverregeln</a> und <a href="%{policy_path}">unsere Datenschutzerklärung</a>.
         subject: 'Mastodon: Anleitung zum Bestätigen deines Kontos auf %{instance}'
-        title: Verifiziere E-Mail-Adresse
+        title: Verifiziere deine E-Mail-Adresse
       email_changed:
         explanation: 'Die E-Mail-Adresse deines Kontos wird geändert zu:'
-        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
+        extra: Wenn du deine E-Mail-Adresse nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
         subject: 'Mastodon: E-Mail-Adresse geändert'
         title: Neue E-Mail-Adresse
       password_change:
         explanation: Das Passwort für dein Konto wurde geändert.
-        extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Serververwaltung, wenn du aus deinem Konto ausgesperrt bist.
+        extra: Wenn du dein Passwort nicht geändert hast, ist es wahrscheinlich, dass sich jemand Zugang zu deinem Konto verschafft hat. Bitte ändere sofort dein Passwort oder kontaktiere die Administrator*innen des Servers, wenn du aus deinem Konto ausgesperrt bist.
         subject: 'Mastodon: Passwort geändert'
         title: Passwort geändert
       reconfirmation_instructions:
@@ -47,16 +48,19 @@ de:
         subject: 'Mastodon: Anleitung zum Zurücksetzen deines Passworts'
         title: Passwort zurücksetzen
       two_factor_disabled:
-        explanation: Zwei-Faktor-Authentisierung (2FA) für dein Konto wurde deaktiviert. Eine Anmeldung ist jetzt nur noch mit E-Mail-Adresse und Passwort möglich.
+        explanation: Das Anmelden ist jetzt nur noch mit einer E-Mail-Adresse und einem Passwort möglich.
         subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) deaktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto deaktiviert.
         title: 2FA deaktiviert
       two_factor_enabled:
-        explanation: Die Zwei-Faktor-Authentisierung (2FA) wurde für dein Konto aktiviert. Das zeitbasierte Einmalpasswort, das von deiner TOTP-App generiert wird, muss bei jeder Anmeldung zusätzlich eingegeben werden.
+        explanation: Für das Anmelden wird ein Token benötigt, das von der hinterlegten TOTP-App generiert wird.
         subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) aktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto aktiviert.
         title: 2FA aktiviert
       two_factor_recovery_codes_changed:
         explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
         subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu erstellt'
+        subtitle: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
         title: 2FA-Wiederherstellungscodes geändert
       unlock_instructions:
         subject: 'Mastodon: Anleitung zum Entsperren deines Kontos'
@@ -70,11 +74,13 @@ de:
           subject: 'Mastodon: Sicherheitsschlüssel entfernt'
           title: Einer deiner Sicherheitsschlüssel wurde entfernt
       webauthn_disabled:
-        explanation: Das Authentisieren mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert. Die Anmeldung ist jetzt nur noch mit dem zeitbasierten Einmalpasswort möglich, das von deiner TOTP-App generiert wird.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert.
+        extra: Das Anmelden ist jetzt nur noch mit Token aus der TOTP-App möglich, die im Konto hinterlegt wurde.
         subject: 'Mastodon: Authentisierung mit Sicherheitsschlüsseln deaktiviert'
         title: Sicherheitsschlüssel deaktiviert
       webauthn_enabled:
-        explanation: Die Authentisierung mit Sicherheitsschlüssel wurde für dein Konto aktiviert. Dein Sicherheitsschlüssel kann nun für die Anmeldung verwendet werden.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto aktiviert.
+        extra: Dein Sicherheitsschlüssel kann jetzt zum Anmelden verwendet werden.
         subject: 'Mastodon: Authentisierung mit Sicherheitsschlüssel aktiviert'
         title: Sicherheitsschlüssel aktiviert
     omniauth_callbacks:
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 13daa4b97a..52674dc849 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -47,16 +47,19 @@ el:
         subject: 'Mastodon: Οδηγίες επαναφοράς συνθηματικού'
         title: Επαναφορά συνθηματικού
       two_factor_disabled:
-        explanation: Η επαλήθευση 2 βημάτων (2FA) έχει απενεργοποιηθεί για το λογαριασμό σου. Η σύνδεση γίνεται απλά με το email και το συνθηματικό.
+        explanation: Η σύνδεση είναι τώρα δυνατή χρησιμοποιώντας μόνο τη διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης.
         subject: 'Mastodon: Απενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων για τον λογαριασμό σας έχει απενεργοποιηθεί.
         title: Επαλήθευση 2 βημάτων ανενεργή (2FA)
       two_factor_enabled:
-        explanation: Έχει ενεργοποιηθεί η πιστοποίηση 2 παραγόντων για το λογαριασμό σου (2FA). Για να συνδεθείς θα απαιτηθεί πιστοποιημένο τεκμήριο από κάποια ζευγαρωμένη εφαρμογή.
+        explanation: Ένα διακριτικό που δημιουργείται από τη συνδεδεμένη εφαρμογή TOTP θα απαιτείται για τη σύνδεση.
         subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων έχει ενεργοποιηθεί για τον λογαριασμό σας.
         title: Επαλήθευση 2 βημάτων ενεργή (2FA)
       two_factor_recovery_codes_changed:
         explanation: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
         subject: 'Mastodon: Δημιουργήθηκαν νέοι κωδικοί ανάκτησης'
+        subtitle: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
         title: Οι κωδικοί ανάκτησης επαλήθευσης 2 βημάτων (2FA) άλλαξαν
       unlock_instructions:
         subject: 'Mastodon: Οδηγίες ξεκλειδώματος'
@@ -70,11 +73,13 @@ el:
           subject: 'Mastodon: Διαγράφηκε ένα κλειδί ασφαλείας'
           title: Ένα από τα κλειδιά ασφαλείας σου διαγράφηκε
       webauthn_disabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας. Η σύνδεση είναι τώρα εφικτή μόνο με τη χρήση κλειδιού που δημιουργημένου με την συνδεδεμένη εφαρμογή TOTP.
+        explanation: Ο έλεγχος ταυτότητας με κλειδιά ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Η σύνδεση είναι πλέον δυνατή χρησιμοποιώντας μόνο το διακριτικό που δημιουργείται από την εφαρμογή TOTP.
         subject: 'Mastodon: Η αυθεντικοποίηση με χρήση κλειδιών ασφαλείας απενεργοποιήθηκε'
         title: Τα κλειδιά ασφαλείας απενεργοποιήθηκαν
       webauthn_enabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας. Μπορείτε να το χρησιμοποιήσετε για να συνδεθείτε.
+        explanation: Ο έλεγχος ταυτότητας κλειδιού ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Το κλειδί ασφαλείας σας μπορεί τώρα να χρησιμοποιηθεί για τη σύνδεση.
         subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση με κλειδί ασφαλείας'
         title: Τα κλειδιά ασφαλείας ενεργοποιήθηκαν
     omniauth_callbacks:
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
index e7ab9462dc..3e8a534e1f 100644
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@@ -12,6 +12,7 @@ en-GB:
       last_attempt: You have one more attempt before your account is locked.
       locked: Your account is locked.
       not_found_in_database: Invalid %{authentication_keys} or password.
+      omniauth_user_creation_failure: Error creating an account for this identity.
       pending: Your account is still under review.
       timeout: Your session expired. Please log in again to continue.
       unauthenticated: You need to log in or sign up before continuing.
@@ -47,16 +48,19 @@ en-GB:
         subject: 'Mastodon: Reset password instructions'
         title: Password reset
       two_factor_disabled:
-        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
+        explanation: Login is now possible using only e-mail address and password.
         subject: 'Mastodon: Two-factor authentication disabled'
+        subtitle: Two-factor authentication for your account has been disabled.
         title: 2FA disabled
       two_factor_enabled:
-        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
+        explanation: A token generated by the paired TOTP app will be required for login.
         subject: 'Mastodon: Two-factor authentication enabled'
+        subtitle: Two-factor authentication has been enabled for your account.
         title: 2FA enabled
       two_factor_recovery_codes_changed:
         explanation: The previous recovery codes have been invalidated and new ones generated.
         subject: 'Mastodon: Two-factor recovery codes re-generated'
+        subtitle: The previous recovery codes have been invalidated and new ones generated.
         title: 2FA recovery codes changed
       unlock_instructions:
         subject: 'Mastodon: Unlock instructions'
@@ -70,11 +74,13 @@ en-GB:
           subject: 'Mastodon: Security key deleted'
           title: One of your security keys has been deleted
       webauthn_disabled:
-        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
+        explanation: Authentication with security keys has been disabled for your account.
+        extra: Login is now possible using only the token generated by the paired TOTP app.
         subject: 'Mastodon: Authentication with security keys disabled'
         title: Security keys disabled
       webauthn_enabled:
-        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
+        explanation: Security key authentication has been enabled for your account.
+        extra: Your security key can now be used for login.
         subject: 'Mastodon: Security key authentication enabled'
         title: Security keys enabled
     omniauth_callbacks:
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index eef8214817..63a59229fe 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -12,6 +12,7 @@ en:
       last_attempt: You have one more attempt before your account is locked.
       locked: Your account is locked.
       not_found_in_database: Invalid %{authentication_keys} or password.
+      omniauth_user_creation_failure: Error creating an account for this identity.
       pending: Your account is still under review.
       timeout: Your session expired. Please login again to continue.
       unauthenticated: You need to login or sign up before continuing.
@@ -47,16 +48,19 @@ en:
         subject: 'Mastodon: Reset password instructions'
         title: Password reset
       two_factor_disabled:
-        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
+        explanation: Login is now possible using only e-mail address and password.
         subject: 'Mastodon: Two-factor authentication disabled'
+        subtitle: Two-factor authentication for your account has been disabled.
         title: 2FA disabled
       two_factor_enabled:
-        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
+        explanation: A token generated by the paired TOTP app will be required for login.
         subject: 'Mastodon: Two-factor authentication enabled'
+        subtitle: Two-factor authentication has been enabled for your account.
         title: 2FA enabled
       two_factor_recovery_codes_changed:
         explanation: The previous recovery codes have been invalidated and new ones generated.
         subject: 'Mastodon: Two-factor recovery codes re-generated'
+        subtitle: The previous recovery codes have been invalidated and new ones generated.
         title: 2FA recovery codes changed
       unlock_instructions:
         subject: 'Mastodon: Unlock instructions'
@@ -70,11 +74,13 @@ en:
           subject: 'Mastodon: Security key deleted'
           title: One of your security keys has been deleted
       webauthn_disabled:
-        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
+        explanation: Authentication with security keys has been disabled for your account.
+        extra: Login is now possible using only the token generated by the paired TOTP app.
         subject: 'Mastodon: Authentication with security keys disabled'
         title: Security keys disabled
       webauthn_enabled:
-        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
+        explanation: Security key authentication has been enabled for your account.
+        extra: Your security key can now be used for login.
         subject: 'Mastodon: Security key authentication enabled'
         title: Security keys enabled
     omniauth_callbacks:
@@ -88,6 +94,7 @@ en:
       updated_not_active: Your password has been changed successfully.
     registrations:
       destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon.
+      sign_up_failed_because_reach_limit: You cannot create account because reaching limit.
       signed_up: Welcome! You have signed up successfully.
       signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
       signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 1c13490e53..193fecc757 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -12,6 +12,7 @@ eo:
       last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
       locked: Via konto estas ŝlosita.
       not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
+      omniauth_user_creation_failure: Eraro okazis kreinte konton por ĉi tiu identeco.
       pending: Via konto ankoraŭ estas kontrolata.
       timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
       unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
@@ -39,7 +40,7 @@ eo:
         explanation: Retajpu la novan adreson por ŝanĝi vian retpoŝtadreson.
         extra: Se ĉi tiu ŝanĝo ne estis komencita de vi, bonvolu ignori ĉi tiun retmesaĝon. La retadreso por la Mastodon-konto ne ŝanĝiĝos se vi ne aliras la supran ligilon.
         subject: 'Mastodon: Konfirmi retpoŝton por %{instance}'
-        title: Kontrolu retpoŝtadreson
+        title: Kontroli retpoŝtadreson
       reset_password_instructions:
         action: Ŝanĝi pasvorton
         explanation: Vi petis novan pasvorton por via konto.
@@ -47,11 +48,9 @@ eo:
         subject: 'Mastodon: Instrukcioj por ŝanĝi pasvorton'
         title: Pasvorto restarigita
       two_factor_disabled:
-        explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
         subject: 'Mastodon: dufaktora aŭtentigo malebligita'
         title: 2FA estas malŝaltita
       two_factor_enabled:
-        explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
         subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
         title: 2FA aktivigita
       two_factor_recovery_codes_changed:
@@ -70,11 +69,9 @@ eo:
           subject: 'Mastodon: sekureca ŝlosilo forigita'
           title: Unu el viaj sekurecaj ŝlosiloj estis forigita
       webauthn_disabled:
-        explanation: Aŭtentikigo per sekurecaj ŝlosiloj estis malebligita por via konto. Ensaluto nun eblas per nur la signo generita de la parigita TOTP-programo.
         subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
         title: Sekurecaj ŝlosiloj malaktivigitaj
       webauthn_enabled:
-        explanation: Sekureca ŝlosila aŭtentokontrolo estis ebligita por via konto. Via sekureca ŝlosilo nun uzeblas por ensaluti.
         subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
         title: Sekurecaj ŝlosiloj aktivigitaj
     omniauth_callbacks:
diff --git a/config/locales/devise.es-AR.yml b/config/locales/devise.es-AR.yml
index d9c922ed86..6249294597 100644
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@@ -12,6 +12,7 @@ es-AR:
       last_attempt: Tenés un intento más antes de que se bloquee tu cuenta.
       locked: Se bloqueó tu cuenta.
       not_found_in_database: "%{authentication_keys} o contraseña no válidas."
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Tu cuenta todavía está bajo revisión.
       timeout: Venció tu sesión. Por favor, volvé a iniciar sesión para continuar.
       unauthenticated: Necesitás iniciar sesión o registrarte antes de continuar.
@@ -47,16 +48,19 @@ es-AR:
         subject: 'Mastodon: instrucciones para cambiar la contraseña'
         title: Cambiar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta está deshabilitada. Ahora el inicio de sesión sólo es posible usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando sólo la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: autenticación de dos factores, deshabilitada'
+        subtitle: Se deshabilitó la autenticación de dos factores para tu cuenta.
         title: 2FA deshabilitada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta está habilitada. Se requiere una clave generada por la aplicación TOTP asociada para iniciar sesión.
+        explanation: Para iniciar sesión, se requerirá una clave numérica ("token") generada por la aplicación TOTP emparejada.
         subject: 'Mastodon: autenticación de dos factores, habilitada'
+        subtitle: Se habilitó la autenticación de dos factores para tu cuenta.
         title: 2FA habilitada
       two_factor_recovery_codes_changed:
         explanation: Los códigos anteriores de recuperación fueron invalidados y se generaron unos nuevos.
         subject: 'Mastodon: códigos de recuperación de dos factores, regenerados'
+        subtitle: Los códigos de recuperación anteriores ya no son válidos y se generaron códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: instrucciones de desbloqueo'
@@ -70,11 +74,13 @@ es-AR:
           subject: 'Mastodon: llave de seguridad eliminada'
           title: Se eliminó una de tus llaves de seguridad
       webauthn_disabled:
-        explanation: Se deshabilitó la autenticación con llaves de seguridad en tu cuenta. El inicio de sesión ahora es posible usando sólo la clave generada por la aplicación TOTP asociada.
+        explanation: Se deshabilitó la autenticación con claves de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando sólo la clave numérica ("token") generada por la aplicación TOTP emparejada.
         subject: 'Mastodon: autenticación con llaves de seguridad, deshabilitada'
         title: Llaves de seguridad deshabilitadas
       webauthn_enabled:
-        explanation: Se habilitó la autenticación de llave de seguridad en tu cuenta. Ahora tu llave de seguridad se puede usar para iniciar sesión.
+        explanation: Se habilitó la autenticación con llave de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando tu llave de seguridad.
         subject: 'Mastodon: autenticación con llaves de seguridad, habilitada'
         title: Llaves de seguridad habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.es-MX.yml b/config/locales/devise.es-MX.yml
index 83b425d441..ac90412e85 100644
--- a/config/locales/devise.es-MX.yml
+++ b/config/locales/devise.es-MX.yml
@@ -12,6 +12,7 @@ es-MX:
       last_attempt: Tiene un intento más antes de que tu cuenta sea bloqueada.
       locked: Tu cuenta está bloqueada.
       not_found_in_database: Incorrecto %{authentication_keys} o contraseña.
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Su cuenta aun se encuentra bajo revisión.
       timeout: Su sesión ha expirado. Por favor inicie sesión de nuevo para continuar.
       unauthenticated: Necesita iniciar sesión o registrarse antes de continuar.
@@ -47,16 +48,19 @@ es-MX:
         subject: 'Mastodon: Instrucciones para reiniciar contraseña'
         title: Reiniciar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando solamente la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
         subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
         title: 2FA activada
       two_factor_recovery_codes_changed:
         explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
         subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +74,13 @@ es-MX:
           subject: 'Mastodon: Clave de seguridad eliminada'
           title: Una de sus claves de seguridad ha sido eliminada
       webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta. El inicio de sesión es ahora posible únicamente utilizando el token generado por la aplicación emparejada TOTP.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
         subject: 'Mastodon: Autenticación con claves de seguridad desactivada'
         title: Claves de seguridad desactivadas
       webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para su cuenta. Su clave de seguridad ahora puede ser usada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
         subject: 'Mastodon: Autenticación con clave de seguridad activada'
         title: Claves de seguridad activadas
     omniauth_callbacks:
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index ef6a70ee4f..0fc329e0b6 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -12,6 +12,7 @@ es:
       last_attempt: Tiene un intento más antes de que tu cuenta sea bloqueada.
       locked: Tu cuenta está bloqueada.
       not_found_in_database: Incorrecto %{authentication_keys} o contraseña.
+      omniauth_user_creation_failure: Error al crear una cuenta para esta identidad.
       pending: Su cuenta aun se encuentra bajo revisión.
       timeout: Tu sesión expiró. Por favor, inicia sesión nuevamente para continuar.
       unauthenticated: Necesitas iniciar sesión o registrarte antes de continuar.
@@ -31,8 +32,8 @@ es:
         subject: 'Mastodon: Correo electrónico cambiado'
         title: Nueva dirección de correo electrónico
       password_change:
-        explanation: La contraseña de su cuenta a sido cambiada.
-        extra: Si usted no a cambiado su contraseña. es probable que alguien a conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte a el administrador de la instancia si usted esta bloqueado de su cuenta.
+        explanation: La contraseña de su cuenta ha sido cambiada.
+        extra: Si usted no ha cambiado su contraseña, es probable que alguien a conseguido acceso a su cuenta. Por favor cambie su contraseña inmediatamente o contacte al administrador de la instancia si usted está bloqueado de su cuenta.
         subject: 'Mastodon: Contraseña cambiada'
         title: Contraseña cambiada
       reconfirmation_instructions:
@@ -47,16 +48,19 @@ es:
         subject: 'Mastodon: Instrucciones para reiniciar contraseña'
         title: Reiniciar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando únicamente la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
         subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
         title: 2FA activada
       two_factor_recovery_codes_changed:
         explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
         subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +74,13 @@ es:
           subject: 'Mastodon: Clave de seguridad eliminada'
           title: Una de tus claves de seguridad ha sido eliminada
       webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido deshabilitada para tu cuenta. Ahora el inicio de sesión solo es posible utilizando el token generado por la aplicación TOTP emparejada.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
         subject: 'Mastodon: Autenticación con claves de seguridad deshabilitada'
         title: Claves de seguridad deshabilitadas
       webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta. Ahora tu clave de seguridad puede ser utilizada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
         subject: 'Mastodon: Autenticación de clave de seguridad habilitada'
         title: Claves de seguridad habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index da1cc989d2..76fbf619cc 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -12,6 +12,7 @@ et:
       last_attempt: Sul on veel üks katse, enne kui konto lukustatakse.
       locked: Konto on lukustatud.
       not_found_in_database: Valed %{authentication_keys} või salasõna.
+      omniauth_user_creation_failure: Sellele identiteedile konto loomine nurjus.
       pending: Sinu konto on siiani läbivaatamisel.
       timeout: Sinu sessioon on aegunud. Jätkamiseks palun sisene uuesti.
       unauthenticated: Pead sisenema või looma konto enne kui jätkad.
@@ -47,16 +48,19 @@ et:
         subject: 'Mastodon: salasõna lähtestamisjuhendid'
         title: Salasõna lähtestamine
       two_factor_disabled:
-        explanation: Kontol on kaheastmeline autentimine välja lülitatud. Sisenemine on võimalik ainult kasutades e-postiaadressi ja salasõna.
+        explanation: Sisselogimine on nüüd võimalik vaid e-postiaadressi ja salasõnaga.
         subject: 'Mastodon: Kaheastmeline autentimine välja lülitatud'
+        subtitle: Kaheastmeline autoriseerimine on sinu konto jaoks nüüd välja lülitatud.
         title: 2FA keelatud
       two_factor_enabled:
-        explanation: Kontol on sisse lülitatud kaheastmeline autentimine. Sisenemiseks on vajalik ühekordne aeguv võti TOTP-rakenduse poolt.
+        explanation: Sisenemiseks on vaja seotud kaheastmelise autoriseerimise äpi genereeritud võtit.
         subject: 'Mastodon: kaheastmeline autentimine sisse lülitatud'
+        subtitle: Sinu konto jaoks on kaheastmeline autoriseerimine sisse lülitatud.
         title: 2FA lubatud
       two_factor_recovery_codes_changed:
         explanation: Eelmised taastekoodid on nüüd kehtetud ning loodud uued.
         subject: 'Mastodon: Kaheastmelise autentimise taastuskoodid taasloodud'
+        subtitle: Eelmised taastekoodid on tühistatud ja uued genereeritud.
         title: 2FA taastekoodid muudetud
       unlock_instructions:
         subject: 'Mastodon: Lahti lukustamis juhendid'
@@ -70,11 +74,13 @@ et:
           subject: 'Mastodon: turvavõti kustutatud'
           title: Üks sinu turvavõtmetest on kustutatud
       webauthn_disabled:
-        explanation: Autentimine turvavõtmetega on kontol välja lülitatud. Sisse logimine on nüüd võimalik ainult kasutades seotud TOTP rakenduse poolt genereeritud võtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks välja lülitatud.
+        extra: Sisenemine on nüüd võimalik vaid seotud kaheastmelise autoriseerimise äpi genereeritud võtmega.
         subject: 'Mastodon: autentimine turvavõtmega on välja lülitatud'
         title: Turvavõtmed on välja lülitatud
       webauthn_enabled:
-        explanation: Turvavõtmega autentimine on nüüd kontol sisse lülitatud. Nüüd saab kasutada sisse logimiseks sinu turvavõtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks nüüd sisse lülitatud.
+        extra: Nüüd saab sisselogimiseks kasutada sinu turvavõtit.
         subject: 'Mastodon: turvavõtme autentimine sisse lülitatud'
         title: Turvavõtmed on sisse lülitatud
     omniauth_callbacks:
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index eb23e06d4a..3e675659fe 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -12,6 +12,7 @@ eu:
       last_attempt: Saiakera bat geratzen zaizu zure kontua giltzapetu aurretik.
       locked: Zure kontua giltzapetuta dago.
       not_found_in_database: Baliogabeko %{authentication_keys} edo pasahitza.
+      omniauth_user_creation_failure: Errorea identitate honen kontu bat sortzean.
       pending: Zure kontua oraindik berrikusteke dago.
       timeout: Zure saioa iraungitu da. Hasi saioa berriro jarraitzeko.
       unauthenticated: Saioa hasi edo izena eman behar duzu jarraitu aurretik.
@@ -47,16 +48,19 @@ eu:
         subject: 'Mastodon: Pasahitza berrezartzeko argibideak'
         title: Pasahitza berrezartzea
       two_factor_disabled:
-        explanation: Bi faktoreetako autentifikazioa desgaitu da zure kontuan. Orain saioa hasi daiteke e-mail helbidea eta pasahitza bakarrik erabilita.
+        explanation: Orain posible da helbide elektronikoa eta pasahitza erabiliz saioa hastea.
         subject: 'Mastodon: Bi faktoreetako autentifikazioa desgaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa desgaitu da.
         title: 2FA desgaituta
       two_factor_enabled:
-        explanation: Bi faktoreetako autentifikazioa gaitu da zure kontuan. Token bat sortu du lotutako TOTP aplikazioak eta saioa hasteko eskatuko da.
+        explanation: Parekatutako TOTP aplikazioak sortutako tokena beharko da saioa hasteko.
         subject: 'Mastodon: Bi faktoreetako autentifikazioa gaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa gaitu da.
         title: 2FA gaituta
       two_factor_recovery_codes_changed:
         explanation: Aurreko kodeak baliogabetu dira eta berriak sortu dira.
         subject: 'Mastodon: Bi faktoreetako berreskuratze kodeak birsortuta'
+        subtitle: Aurreko berreskuratze-kodeak baliogabetu eta berriak sortu dira.
         title: 2FA berreskuratze kodeak aldatuta
       unlock_instructions:
         subject: 'Mastodon: Desblokeatzeko argibideak'
@@ -70,11 +74,13 @@ eu:
           subject: 'Mastodon: Segurtasun gakoa ezabatu da'
           title: Zure segurtasun gakoetako bat ezabatu da
       webauthn_disabled:
-        explanation: Segurtasun gako bidezko autentifikazioa desgaitu da zure kontuan. Saioa hasteko modu bakarra parekatutako TOTP aplikazioak sortutako tokena erabiltzea da orain.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa desgaitu da.
+        extra: Parekatutako TOTP aplikazioak sortutako tokena erabiliz bakarrik has daiteke saioa orain.
         subject: 'Mastodon: Segurtasun gakoekin autentifikatzea desgaituta'
         title: Segurtasun gakoak desgaituta
       webauthn_enabled:
-        explanation: Segurtasun gako bidezko autentifikazioa gaitu da zure kontuan. Orain zure segurtasun gakoa erabil dezakezu saioa hasteko.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa gaitu da.
+        extra: Orain, segurtasun-gakoa erabil daiteke saioa hasteko.
         subject: 'Mastodon: Segurtasun gako bidezko autentifikazioa gaituta'
         title: Segurtasun gakoak gaituta
     omniauth_callbacks:
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index 07db5395da..c441e346a2 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -2,16 +2,17 @@
 fa:
   devise:
     confirmations:
-      confirmed: نشانی ایمیل شما با موفقیت تأیید شد.
-      send_instructions: تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید نشانی ایمیل خود را تأیید کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      send_paranoid_instructions: اگر ایمیل شما در پایگاه دادهٔ ما موجود باشد، تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید نشانی ایمیل خود را تأیید کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      confirmed: نشانی رایانامه‌تان با موفقیت تأیید شد.
+      send_instructions: تا دقایقی دیگر رایانامه‌ای با دستورالعمل تأیید نشانی رایانامه‌تان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      send_paranoid_instructions: اگر نشانی رایانامه‌تان در پایگاه داده‌مان وجود داشته باشد، تا دقایقی دیگر تا دقایقی دیگر رایانامه‌ای با دستورالعمل تأیید نشانی رایانامه‌تان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
     failure:
-      already_authenticated: همین الآن هم وارد شده‌اید.
-      inactive: حساب شما هنوز فعال نشده است.
+      already_authenticated: از پیش وارد شده‌اید.
+      inactive: هنوز حسابتان فعّال نشده.
       invalid: "%{authentication_keys} یا گذرواژه نامعتبر."
       last_attempt: پیش از آن که حساب شما قفل شود، یک فرصت دیگر دارید.
-      locked: حساب شما قفل شده است.
+      locked: حسابتان قفل شده.
       not_found_in_database: "%{authentication_keys} یا گذرواژه نامعتبر."
+      omniauth_user_creation_failure: خطای ایجاد حسابی برای این هویت.
       pending: حساب شما همچنان در دست بررسی است.
       timeout: مهلت این ورود شما به سر رسید. برای ادامه، دوباره وارد شوید.
       unauthenticated: برای ادامه باید وارد شوید یا ثبت نام کنید.
@@ -24,39 +25,42 @@ fa:
         explanation_when_pending: شما با این نشانی ایمیل برای %{host} درخواست دعوت‌نامه داده‌اید. اگر ایمیل خود را تأیید کنید، ما درخواست شما را بررسی خواهیم کرد. تا وقتی بررسی تمام نشده، شما نمی‌توانید به حساب خود وارد شوید. اگر درخواست شما رد شود، ما اطلاعاتی را که از شما داریم پاک خواهیم کرد پس نیازی به کاری از سمت شما نخواهد بود. اگر شما چنین درخواستی نداده‌اید، لطفاً این ایمیل را نادیده بگیرید.
         extra_html: لطفاً همچنین <a href="%{terms_path}">قوانین کارساز</a> و <a href="%{policy_path}">شرایط خدمتمان</a> را بررسی کنید.
         subject: 'ماستودون: دستورالعمل تأیید برای %{instance}'
-        title: تأیید نشانی ایمیل
+        title: تأیید نشانی رایانامه
       email_changed:
-        explanation: 'نشانی ایمیل حساب شما تغییر می‌کند به:'
-        extra: اگر شما ایمیل خود را عوض نکردید، شاید کسی به حساب شما دسترسی پیدا کرده است. در این صورت لطفاً هر چه زودتر گذرواژه حسابتان را عوض کنید. اگر گذرواژه‌تان دیگر کار نمی‌کند، لطفاً با مدیر سرور تماس بگیرید.
-        subject: 'ماستودون: نشانی ایمیل عوض شد'
-        title: نشانی ایمیل تازه
+        explanation: 'نشانی رایانامهٔ حسابتان تغییر می‌کند به:'
+        extra: اگر رایانامه‌تان را عوض نکرده‌اید، ممکن است کسی به حسابتان دسترسی پیدا کرده باشد. لطفاً فوراُ گذرواژه‌تان را عوض کرده و اگر از حسابتان بیرون مانده‌اید با مدیر کارساز تماس بگیرید.
+        subject: 'ماستودون: رایانامه عوض شد'
+        title: نشانی جدید رایانامه
       password_change:
-        explanation: گذرواژه حساب شما تغییر کرد.
-        extra: اگر شما گذرواژه حسابتان را تغییر ندادید، شاید کسی به حساب شما دسترسی پیدا کرده است. در این صورت لطفاً هر چه زودتر گذرواژه حسابتان را عوض کنید. اگر گذرواژه‌تان دیگر کار نمی‌کند، لطفاً با مدیر سرور تماس بگیرید.
-        subject: 'ماستودون: گذرواژه‌تان عوض شد'
-        title: گذرواژه‌تان عوض شد
+        explanation: گذرواژهٔ حسابتان عوض شده.
+        extra: اگر گذرواژه‌تان را عوض نکرده‌اید، ممکن است کسی به حسابتان دسترسی پیدا کرده باشد. لطفاً فوراُ گذرواژه‌تان را عوض کرده و اگر از حسابتان بیرون مانده‌اید با مدیر کارساز تماس بگیرید.
+        subject: 'ماستودون: گذرواژه عوض شد'
+        title: گذرواژه عوض شد
       reconfirmation_instructions:
-        explanation: نشانی تازه را تأیید کنید تا ایمیل‌تان عوض شود.
-        extra: اگر شما باعث این تغییر نبودید، لطفاً این ایمیل را نادیده بگیرید. تا زمانی که شما پیوند بالا را باز نکنید، نشانی ایمیل مربوط به حساب شما عوض نخواهد شد.
+        explanation: برای تغییر رایانامه‌تان نشانی جدید را تأیید کنید.
+        extra: اگر خودتان چنین درخواستی نداده‌اید لطفاً از این رایانامه چشم بپوشید. نشانی رایانامهٔ حساب ماستودون تا وقتی به پیوند بالا دسترسی پیدا نکنید عوض نخواهد شد.
         subject: 'ماستودون: تأیید رایانامه برای %{instance}'
-        title: تأیید نشانی ایمیل
+        title: تأیید نشانی رایانامه
       reset_password_instructions:
         action: تغییر گذرواژه
-        explanation: شما گذرواژه تازه‌ای برای حسابتان درخواست کردید.
-        extra: اگر شما چنین درخواستی نکردید، لطفاً این ایمیل را نادیده بگیرید. تا زمانی که شما پیوند بالا را باز نکنید و گذرواژه تازه‌ای نسازید، گذرواژه شما عوض نخواهد شد.
-        subject: 'ماستودون: راهنمایی برای بازنشانی گذرواژه'
+        explanation: درخواست گذرواژه‌ای تازه‌ای برای حسابتان کرده‌اید.
+        extra: اگر خودتان چنین درخواستی نداده‌اید لطفاً از این رایانامه چشم بپوشید. گذرواژه‌تان تا وقتی به پیوند بالا دسترسی پیدا نکرده و گذرواژهٔ جدیدی نسازید عوض نخواهد شد.
+        subject: 'ماستودون: دستورالعمل‌های بازنشانی گذرواژه'
         title: بازنشانی گذرواژه
       two_factor_disabled:
-        explanation: ورود دومرحله‌ای برای حساب شما غیرفعال شده است. از الان می‌توانید تنها با نشانی ایمیل و گذرواژه وارد حساب خود شوید.
-        subject: 'ماستودون: تأیید هویت دو مرحله‌ای از کار افتاد'
-        title: ورود دومرحله‌ای غیرفعال
+        explanation: ورود اکنون تنها با نشانی رایانامه و گذرواژه ممکن است.
+        subject: 'ماستودون: هویت‌سنجی دو مرحله‌ای از کار افتاده'
+        subtitle: هویت‌سنجی دو مرحله‌ای برای حسابتان از کار افتاده.
+        title: ورود دومرحله‌ای از کار افتاده
       two_factor_enabled:
-        explanation: ورود دومرحله‌ای برای حساب شما فعال شده است. برای ورود به کدی نیاز خواهید داشت که نرم‌افزار TOTP از پیش تنظیم شده برایتان می‌سازد.
-        subject: 'ماستودون: تأیید هویت دومرحله‌ای به کار افتاد'
-        title: ورود دومرحله‌ای فعال
+        explanation: ورود نیازمند ژتونی تولید شده به دست کارهٔ TOTP جفت‌شده است.
+        subject: 'ماستودون: هویت‌سنجی دومرحله‌ای به کار افتاده'
+        subtitle: هویت‌سنجی دو عاملی برای حسابتان به کار افتاده.
+        title: ورود دومرحله‌ای به کار افتاده
       two_factor_recovery_codes_changed:
         explanation: کدهای بازیابی پیشین نامعتبر شده و کدهای جدیدی ساخته شدند.
         subject: 'ماستودون: کدهای بازیابی برای تأیید هویت دو مرحله‌ای دوباره ساخته شدند'
+        subtitle: کدهای بازیابی پیشین از اعتبار ساقط شده و کدهایی جدید ایجاد شدند.
         title: کدهای بازیابی تأیید هویت دو مرحله‌ای عوض شده‌اند
       unlock_instructions:
         subject: 'ماستودون: دستورالعمل‌های قفل‌گشایی'
@@ -70,11 +74,13 @@ fa:
           subject: 'ماستودون: کلید امنیتی حذف شد'
           title: یکی از کلیدهای امنیتیتان حذف شد
       webauthn_disabled:
-        explanation: تأیید هویت با کلیدهای امنیتی برای حسابتان از کار افتاده است. ورود اکنون فقط با ژتون ایجاد شده با کارهٔ TOTP جفت‌شده امکان‌پذیر است.
+        explanation: هویت‌سنجی با کلیدهای امنیتی برای حسابتان از کار افتاده.
+        extra: ورود اکنون تنها با ژتون تولید شده به دست کارهٔ TOTP جفت‌شده ممکن است.
         subject: 'ماستودون: تأیید هویت با کلیدهای امنیتی از کار افتاد'
         title: کلیدهای امنیتی از کار افتادند
       webauthn_enabled:
-        explanation: تأیید هویت با کلید امنیتی برای حسابتان به کار افتاده است. اکنون کلید امنیتیتان می‌تواند برای ورود استفاده شود.
+        explanation: هویت‌سنجی با کلیدهای امنیتی برای حسابتان به کار افتاده.
+        extra: کلید امنیتیتان اکنون می‌تواند برای ورود استفاده شود.
         subject: 'ماستودون: تأیید هویت با کلید امنیتی به کار افتاد'
         title: کلیدهای امنیتی به کار افتادند
     omniauth_callbacks:
@@ -90,22 +96,22 @@ fa:
       destroyed: بدرود! حساب شما با موفقیت لغو شد. امیدواریم دوباره شما را ببینیم.
       signed_up: خوش آمدید! شما با موفقیت ثبت نام کردید.
       signed_up_but_inactive: خوش آمدید! با موفقیت ثبت نام کردید. ولی هنوز وارد نشده‌اید؛ چرا که حسابتان هنوز فعال نشده است.
-      signed_up_but_locked: خوش آمدید! با موفقیت ثبت نام کردید. ولی هنوز وارد نشده‌اید؛ چرا که حسابتان قفل است.
-      signed_up_but_pending: پیغامی که دارای یک پیوند برای تأیید است به نشانی ایمیل شما فرستاده شده. پس از این‌که پیوند را باز کردید، ما درخواست شما را بررسی خواهیم کرد. اگر درخواست شما پذیرفته شود، به شما خواهیم گفت.
-      signed_up_but_unconfirmed: پیامی با یک پیوند تأیید به نشانی ایمیل شما فرستاده شده. لطفاً پیوند موجود در ایمیل را دنبال کنید تا حسابتان فعال شود. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      update_needs_confirmation: شما با موفقیت حسابتان را به‌روز کردید، ولی لازم است که ما نشانی ایمیل تازهٔ شما را تأیید کنیم. لطفاً ایمیل خود را ببینید و پیوند موجود در ایمیل را دنبال کنید تا تا نشانی ایمیل تازهٔ شما تأیید شود. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      updated: حسابتان با موفقبت به‌روز شد.
+      signed_up_but_locked: با موفّقیت ثبت‌نام کرده‌اید. با این حال نمی‌توان واردتان کرد؛ چرا که حسابتان قفل است.
+      signed_up_but_pending: پیامی با پیوند تأیید به نشانی رایانامه‌تان فرستاده شده. پس از زدن پیوند درخواستتان را بازبینی خواهیم کرد. در صورت پذیرش آگاه خواهید شد.
+      signed_up_but_unconfirmed: پیامی با پیوند تأیید به نشانی رایانامه‌تان فرستاده شده. لطفاً برای فعّال کردن حسابتان پیوند را بزنید. اگر این رایانامه را نگرفته‌اید شاخهٔ هرزنامه‌ها را بررسی کنید.
+      update_needs_confirmation: حسابتان را با موفّقیت به‌روز کردید؛‌ ولی باید نشانی رایانامهٔ جدیتان را تأیید کنیم. لطفاً رایانامه‌تان را بررسی کرده و برای تأیید نشانی رایانهٔ جدیدتان پیوند را بزنید. اگر این رایانامه را نگرفته‌اید شاخهٔ هرزنامه‌ها را بررسی کنید.
+      updated: حسابتان با موفّقیت به‌روز شد.
     sessions:
-      already_signed_out: با موفقیت خارج شدید.
-      signed_in: با موفقیت وارد شدید.
-      signed_out: با موفقیت خارج شدید.
+      already_signed_out: با موفّقیت خارج شدید.
+      signed_in: با موفّقیت وارد شدید.
+      signed_out: با موفّقیت خارج شدید.
     unlocks:
-      send_instructions: تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید قفل حساب خود را باز کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      send_paranoid_instructions: اگر حساب شما موجود باشد، تا دقایقی دیگر ایمیلی خواهید گرفت که به شما می‌گوید چگونه باید قفل آن را باز کنید. اگر این ایمیل نیامد، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
-      unlocked: قفل حساب شما با موفقیت باز شد. لطفاً برای ادامه وارد سیستم شوید.
+      send_instructions: تا دقایقی دیگر رایانامه‌ای با دستورالعمل قفل‌گشایی حسابتان دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      send_paranoid_instructions: اگر حسابتان وجود داشته باشد تا دقایقی دیگر رایانامه‌ای با دستورالعمل قفل‌گشاییش دریافت خواهید کرد. اگر این رایانامه را نگرفتید، لطفاً پوشهٔ هرزنامه‌هایتان را بررسی کنید.
+      unlocked: حسابتان با موفّقیت قفل‌گشایی شد. لطفاً برای ادامه وارد شوید.
   errors:
     messages:
-      already_confirmed: تأیید شده، لطفاً وارد شوید
+      already_confirmed: از پیش تأیید شده. لطفاً ورود را بیازمایید
       confirmation_period_expired: باید ظرف %{period} تأیید شود، لطفاً دوباره درخواست دهید
       expired: مهلتش به سر رسید، لطفاً دوباره درخواست دهید
       not_found: پیدا نشد
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 7846ebd8c2..8963bf5a45 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -12,33 +12,34 @@ fi:
       last_attempt: Sinulla on vielä yksi yritys ennen kuin tilisi lukitaan.
       locked: Tilisi on lukittu.
       not_found_in_database: Virheellinen %{authentication_keys} tai salasana.
+      omniauth_user_creation_failure: Virhe luotaessa tiliä tälle henkilöllisyydelle.
       pending: Tilisi on vielä tarkistamatta.
-      timeout: Istuntosi on umpeutunut. Jatka kirjautumalla uudelleen sisään.
+      timeout: Istuntosi on vanhentunut. Jatkaaksesi käyttöä, kirjaudu uudelleen.
       unauthenticated: Sinun on kirjauduttava tai rekisteröidyttävä ennen kuin voit jatkaa.
       unconfirmed: Vahvista sähköpostiosoitteesi, ennen kuin jatkat.
     mailer:
       confirmation_instructions:
         action: Vahvista sähköpostiosoite
         action_with_app: Vahvista ja palaa %{app}
-        explanation: Olet luonut tilin palvelimelle %{host} käyttäen tätä sähköpostiosoitetta. Olet painalluksen päässä tilin aktivoinnista. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
+        explanation: Olet luonut käyttäjätilin palvelimelle %{host} tätä sähköpostiosoitetta käyttäen. Olet painalluksen päässä tilin aktivoinnista. Jos et luonut tiliä itse, voit jättää tämän viestin huomiotta.
         explanation_when_pending: Teit hakemuksen kutsusta palvelimelle %{host} tällä sähköpostiosoitteella. Kun olet vahvistanut sähköpostiosoitteesi, tarkistamme hakemuksesi. Voit kirjautua sisään muuttaaksesi hakemuksen sisältöä tai poistaaksesi tilin, mutta et voi käyttää suurinta osaa toiminnallisuudesta ennen kuin hakemuksesi on hyväksytty. Jos hakemuksesi hylätään, tietosi poistetaan eikä sinulta tarvita enempää toimia. Jos sinä et tehnyt hakemusta, voit jättää tämän viestin huomiotta.
         extra_html: Tutustu myös <a href="%{terms_path}">palvelimen sääntöihin</a> ja <a href="%{policy_path}">palveluehtoihimme</a>.
         subject: 'Mastodon: Vahvistusohjeet instanssille %{instance}'
         title: Vahvista sähköpostiosoite
       email_changed:
         explanation: 'Tilin sähköpostiosoitteeksi vaihdetaan:'
-        extra: Jos et vaihtanut sähköpostiosoitettasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitäjään, jos et pääse kirjautumaan tilillesi.
+        extra: Jos et vaihtanut sähköpostiosoitettasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, ellet pääse sisään käyttäjätilillesi.
         subject: 'Mastodon: Sähköpostiosoite vaihdettu'
         title: Uusi sähköpostiosoite
       password_change:
         explanation: Tilisi salasana on vaihdettu.
-        extra: Jos et vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitäjään, jos et pääse kirjautumaan tilillesi.
+        extra: Ellet vaihtanut salasanaasi, joku muu on todennäköisesti päässyt käyttäjätilillesi. Vaihda salasanasi viipymättä, tai ota yhteys palvelimen ylläpitoon, jos kirjautuminen käyttäjätilillesi ei onnistu.
         subject: 'Mastodon: salasana vaihdettu'
         title: Salasana vaihdettu
       reconfirmation_instructions:
         explanation: Vahvista uusi sähköpostiosoite, niin muutos astuu voimaan.
         extra: Jos et tehnyt muutosta itse, voit jättää tämän viestin huomiotta. Mastodon-tilin sähköpostiosoitetta ei vaihdeta, ennen kuin klikkaat yllä olevaa linkkiä.
-        subject: 'Mastodon: vahvista sähköpostiosoite: %{instance}'
+        subject: 'Mastodon: Vahvista sähköpostiosoite palvelimelle %{instance}'
         title: Vahvista sähköpostiosoite
       reset_password_instructions:
         action: Vaihda salasana
@@ -47,54 +48,59 @@ fi:
         subject: 'Mastodon: ohjeet salasanan vaihtoon'
         title: Salasanan vaihto
       two_factor_disabled:
-        explanation: Tilisi kaksivaiheinen todennus poistettiin käytöstä. Kirjautuminen onnistuu nyt pelkällä sähköpostiosoitella ja salasanalla.
+        explanation: Sisäänkirjautuminen on nyt mahdollista pelkällä sähköpostiosoitteella ja salasanalla.
         subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
+        subtitle: Kaksivaiheinen todennus on poistettu käytöstä tililtäsi.
         title: 2-vaiheinen todennus pois käytöstä
       two_factor_enabled:
-        explanation: Kaksivaiheinen todennus on otettu käyttöön tilillesi. Kirjautumiseen tarvitaan kaksivaiheisen todennuksen sovelluksesta saatu koodi.
+        explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
-        title: 2-vaiheinen todennus käytössä
+        subtitle: Kaksivaiheinen todennus on otettu käyttöön tilillesi.
+        title: Kaksivaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
-        explanation: Uudet palautuskoodit on nyt luotu ja vanhat on mitätöity.
-        subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
+        explanation: Uudet palautuskoodit on nyt luotu ja vanhat mitätöity.
+        subject: 'Mastodon: Kaksivaihetodennuksen palautuskoodit luotiin uudelleen'
+        subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
         subject: 'Mastodon: lukituksen poistamisen ohjeet'
       webauthn_credential:
         added:
           explanation: Seuraava suojausavain on lisätty tilillesi
-          subject: 'Mastodon: uusi suojausavain'
+          subject: 'Mastodon: Uusi suojausavain'
           title: Uusi suojausavain on lisätty
         deleted:
           explanation: Seuraava suojausavain on poistettu tililtäsi
-          subject: 'Mastodon: suojausavain poistettu'
+          subject: 'Mastodon: Suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
-        explanation: Suojausavaimilla todennus on poistettu käytöstä tililtäsi. Kirjautuminen on nyt mahdollista vain paritetun TOTP-sovelluksen luomaa koodia käyttämällä.
-        subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
+        explanation: Turva-avaimin kirjautuminen tilillesi on kytketty pois käytöstä.
+        extra: Olet nyt mahdollistanut sisäänkirjautumisen käyttäjätilillesi pelkästään palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
+        subject: 'Mastodon: Turva-avaintodennus on poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
-        explanation: Todennus suojausavaimella on otettu käyttöön tilillesi. Suojausavaintasi voidaan nyt käyttää kirjautumiseen.
+        explanation: Turva-avaimella kirjautuminen on otettu käyttöön tilillesi.
+        extra: Voit nyt kirjautua sisään turva-avaimellasi.
         subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
       failure: Tunnistautuminen lähteestä %{kind} ei onnistunut, koska "%{reason}".
       success: Tunnistautuminen tililtä %{kind} onnistui.
     passwords:
-      no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi salasananvaihtoviestin kautta, varmista, että käytät koko viestissä mainittua URL-osoitetta.
-      send_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian linkki salasanan vaihtoon. Jos et saa viestiä, tarkista roskapostikansio.
-      send_paranoid_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian linkki salasanan vaihtoon. Jos et saa viestiä, tarkista roskapostikansio.
+      no_token: Tälle sivulle pääsee vain salasananvaihtoviestin kautta. Jos tiedät tulevasi sen kautta, varmista, että käytät viestissä mainittua URL-osoitetta kokonaisuudessaan.
+      send_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      send_paranoid_instructions: Jos sähköpostiosoite on tietokannassamme, siihen lähetetään pian viesti, jossa on linkki salasanan vaihtamiseksi. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
       updated: Salasanan vaihto onnistui. Olet nyt kirjautunut sisään.
       updated_not_active: Salasanan vaihto onnistui.
     registrations:
-      destroyed: Tilisi on poistettu. Näkemiin ja tervetuloa uudelleen!
+      destroyed: Tilisi on poistettu. Näkemiin ja tervetuloa uudelleen.
       signed_up: Tervetuloa! Rekisteröityminen onnistui.
-      signed_up_but_inactive: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä tiliäsi ei ole vielä aktivoitu.
-      signed_up_but_locked: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä tilisi on lukittu.
-      signed_up_but_pending: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Kun olet klikannut linkkiä, tarkistamme hakemuksesi. Sinulle tiedotetaan jos se hyväksytään.
-      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi tili seuraamalla linkkiä. Jos et saanut viestiä, tarkista roskapostikansio.
-      update_needs_confirmation: Tilin päivitys onnistui, mutta uusi sähköpostiosoite on vahvistettava. Tarkista sähköpostisi ja vahvista uusi sähköpostiosoite seuraamalla vahvistuslinkkiä. Jos et saanut viestiä, tarkista roskapostikansio.
-      updated: Tilin päivitys onnistui.
+      signed_up_but_inactive: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätiliäsi ei ole vielä aktivoitu.
+      signed_up_but_locked: Rekisteröityminen onnistui. Emme kuitenkaan voi kirjata sinua sisään, sillä käyttäjätilisi on lukittuna.
+      signed_up_but_pending: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Sen avattuasi tarkistamme hakemuksesi, ja ilmoitamme hyväksynnästä.
+      signed_up_but_unconfirmed: Sähköpostiosoitteeseesi on lähetetty vahvistuslinkki. Aktivoi käyttäjätilisi seuraamalla linkkiä. Mikäli sitä ei kuulu, tarkista myös roskapostisi.
+      update_needs_confirmation: Tilin päivitys onnistui. Uusi sähköpostiosoite on kuitenkin vahvistettava. Tarkista saapuneet viestisi, ja vahvista uusi sähköpostiosoitteesi vahvistuslinkkiä seuraten. Mikäli viestiä ei kuulu, tarkista myös roskapostisi.
+      updated: Käyttäjätilisi tietojen päivittäminen onnistui.
     sessions:
       already_signed_out: Uloskirjautuminen onnistui.
       signed_in: Sisäänkirjautuminen onnistui.
diff --git a/config/locales/devise.fo.yml b/config/locales/devise.fo.yml
index 35fa0954f4..30f83ba0da 100644
--- a/config/locales/devise.fo.yml
+++ b/config/locales/devise.fo.yml
@@ -12,6 +12,7 @@ fo:
       last_attempt: Tú kanst royna einaferð afturat áðrenn kontan verður stongd.
       locked: Kontan hjá tær er læst.
       not_found_in_database: Ogyldigur %{authentication_keys} ella loyniorð.
+      omniauth_user_creation_failure: Feilur í sambandi við, at ein konta fyri hendan samleikan bleiv stovnað.
       pending: Kontan hjá tær verður kannað enn.
       timeout: Tín innritan er útgingin. Innrita av nýggjum, fyri at hada fram.
       unauthenticated: Tú mást skriva teg inn aftur fyri at halda fram.
@@ -47,16 +48,19 @@ fo:
         subject: 'Mastodon: Vegleiðing at skifta loyniorð'
         title: Skift loyniorð
       two_factor_disabled:
-        explanation: Tvey-faktor samgildi (2FA) fyri tína kontu er gjørt óvirkið. Nú er møguligt at rita inn við einans at nýta teldupost og loyniorð.
+        explanation: Innritan er nú møgulig við einans at brúka teldupost og loyniorð.
         subject: 'Mastodon: Váttan í tveimum stigum er gjørd óvirkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd óvirkin fyri tína kontu.
         title: 2FA óvirkið
       two_factor_enabled:
-        explanation: Váttan í tveimum stigum er gjørd virkin fyri tína kontu. Eitt merki framleitt av paraðu TOTP appini verður framyvir kravt fyri at rita inn.
+        explanation: Eitt tekin, sum er gjørt við eini paraðari TOTP app, verður kravt fyri at rita inn.
         subject: 'Mastodon: Váttan í tveimum stigum er virkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd virkin fyri tína kontu.
         title: 2FA virkið
       two_factor_recovery_codes_changed:
         explanation: Undanfarnu endurskapanarkodurnar eru ógildaðar og nýggjar eru framleiddar.
         subject: 'Mastodon: Endurskapanarkodurnar til váttan í tveimum stigum eru framleiddar umaftur'
+        subtitle: Undanfarnu kodur til endurgerð eru nú óvirknar og nýggjar eru gjørdar.
         title: 2FA endurskapanarkodur eru broyttar
       unlock_instructions:
         subject: 'Mastodon: Vegleiðing í at læsa upp'
@@ -70,11 +74,13 @@ fo:
           subject: 'Mastodon: Trygdarlykilin strikaður'
           title: Ein av trygdarlyklunum hjá tær er strikaður
       webauthn_disabled:
-        explanation: Váttan við trygdarlyklum er gjørd óvirkin fyri tína kontu. Nú ber til at rita inn einans við teknum, sum eru framleidd av paraðu TOTP appini.
+        explanation: Samgildi við trygdarlyklum er gjørt óvirkið fyri tína kontu.
+        extra: Innritan er nú møgulig við einans at brúka teknið, sum er gjørt við paraðu TOTP appini.
         subject: 'Mastodon: Váttan við trygdarlyklum er gjørd óvirkin'
         title: Trygdarlyklar óvirknir
       webauthn_enabled:
-        explanation: Váttan við trygdarlyklum er gjørd virkin á tínari kontu. Nú kann tín trygdarlykil nýtast at rita inn við.
+        explanation: Trygdarlyklasamgildi er gjørt virkið fyri tína kontu.
+        extra: Trygdarlyklarnir hjá tær kunnu nú brúkast til innritan.
         subject: 'Mastodon: Váttan við trygdarlykli gjørd virkin'
         title: Trygdarlyklar gjørdir virknir
     omniauth_callbacks:
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index e9f09a6980..69ee177e33 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -12,6 +12,7 @@ fr-CA:
       last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
       locked: Votre compte est verrouillé.
       not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
+      omniauth_user_creation_failure: Erreur lors de la création d'un compte pour cette identité.
       pending: Votre compte est toujours en cours d'approbation.
       timeout: Votre session a expiré. Veuillez vous reconnecter pour continuer.
       unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
@@ -47,16 +48,19 @@ fr-CA:
         subject: 'Mastodon: Instructions pour changer votre mot de passe'
         title: Réinitialisation du mot de passe
       two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
         subject: 'Mastodon: authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
         title: A2F désactivée
       two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
         subject: 'Mastodon: authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
         title: A2F activée
       two_factor_recovery_codes_changed:
         explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
         subject: 'Mastodon: codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
         title: Codes de récupération A2F modifiés
       unlock_instructions:
         subject: 'Mastodon: Instructions pour déverrouiller votre compte'
@@ -70,11 +74,13 @@ fr-CA:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
+        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+        extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
+        explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+        extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 8eb744d94c..631a2eee6f 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -12,6 +12,7 @@ fr:
       last_attempt: Vous avez droit à une dernière tentative avant que votre compte ne soit verrouillé.
       locked: Votre compte est verrouillé.
       not_found_in_database: "%{authentication_keys} ou mot de passe invalide."
+      omniauth_user_creation_failure: Erreur lors de la création d'un compte pour cette identité.
       pending: Votre compte est toujours en cours d'approbation.
       timeout: Votre session a expiré. Veuillez vous reconnecter pour continuer.
       unauthenticated: Vous devez vous connecter ou vous inscrire pour continuer.
@@ -47,16 +48,19 @@ fr:
         subject: 'Mastodon : Instructions pour changer votre mot de passe'
         title: Réinitialisation du mot de passe
       two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
         subject: 'Mastodon : authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
         title: 2FA désactivée
       two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
         subject: 'Mastodon : authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
         title: A2F activée
       two_factor_recovery_codes_changed:
         explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
         subject: 'Mastodon : codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
         title: Codes de récupération A2F modifiés
       unlock_instructions:
         subject: 'Mastodon : Instructions pour déverrouiller votre compte'
@@ -70,11 +74,13 @@ fr:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
+        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+        extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
+        explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+        extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.fy.yml b/config/locales/devise.fy.yml
index 910d2d3094..c8a04a7405 100644
--- a/config/locales/devise.fy.yml
+++ b/config/locales/devise.fy.yml
@@ -12,6 +12,7 @@ fy:
       last_attempt: Jo hawwe noch ien besykjen oer eardat jo account blokkearre wurdt.
       locked: Jo account is blokkearre.
       not_found_in_database: "%{authentication_keys} of wachtwurd ûnjildich."
+      omniauth_user_creation_failure: Flater by it oanmeitsjen fan in account foar dizze identiteit.
       pending: Jo account moat noch hieltyd beoardiele wurde.
       timeout: Jo sesje is ferrûn. Meld jo opnij oan om troch te gean.
       unauthenticated: Jo moatte oanmelde of registrearje.
@@ -49,16 +50,19 @@ fy:
         subject: 'Mastodon: Wachtwurd opnij ynstelle'
         title: Wachtwurd opnij ynstelle
       two_factor_disabled:
-        explanation: Twa-stapsferifikaasje foar jo account is útskeakele. Jo kinne no allinnich oanmelde mei in e-mailadres en wachtwurd.
+        explanation: Jo kinne no oanmelde mei allinnich in e-mailadres en wachtwurd.
         subject: 'Mastodon: Twa-stapsferifikaasje útskeakele'
+        subtitle: Twastapsferifikaasje foar jo account is útskeakele.
         title: Twa-stapsferifikaasje útskeakele
       two_factor_enabled:
-        explanation: Twa-stapsferifikaasje foar jo account is ynskeakele. Om oanmelde te kinnen is in troch in twa-stapsferifikaasje-app generearre tagongskoade nedich.
+        explanation: Jo hawwe in troch de autentikaasje-app genearre tagongskoade nedich om oan te melden.
         subject: 'Mastodon: Twa-stapsferifikaasje ynskeakele'
+        subtitle: Twastapsferifikaasje is foar jo account ynskeakele.
         title: Twa-stapsferifikaasje ynskeakele
       two_factor_recovery_codes_changed:
         explanation: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
         subject: 'Mastodon: Twa-staps-werstelkoaden binne opnij oanmakke'
+        subtitle: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
         title: Werstelkoaden twa-stapsferifikaasje wizige
       unlock_instructions:
         subject: 'Mastodon: Ynstruksjes foar ûntskoatteljen'
@@ -72,11 +76,13 @@ fy:
           subject: 'Mastodon: Befeiligingskaai fuortsmiten'
           title: Ien fan jo befeiligingskaaien is fuortsmiten
       webauthn_disabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is útskeakele foar jo account. Oanmelden is no allinnich mooglik mei it gebrûk fan in troch in keppele TOTP-app generearre kaai.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account útskeakele.
+        extra: It is no allinnich mooglik om oan te melden mei in troch de autentikaasje-app genearre tagongskoade.
         subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is útskeakele'
         title: Befeiligingskaaien útskeakele
       webauthn_enabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is ynskeakele foar jo account. Jo befeiligingskaai kin no brûkt wurde om oan te melden.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account ynskeakele.
+        extra: Jo befeiligingskaai kin no brûkt wurde om oan te melden.
         subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is ynskeakele'
         title: Befeiligingskaaien ynskeakele
     omniauth_callbacks:
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index 0949e140d1..6e6bd0a013 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -1,9 +1,23 @@
 ---
 ga:
   devise:
+    confirmations:
+      confirmed: D'éirigh le deimhniú do ríomhphost.
+      send_instructions: Gheobhaidh tú r-phost go gairid ina mbeidh treoracha faoi conas do sheoladh r-phost a dheimhniú. Féach i d'fhillteán turscair mura bhfuair tú an r-phost seo.
+      send_paranoid_instructions: Más ann do do r-phost inár mbonneagar, gheobhaidh tú r-phost i gceann cúpla nóiméad faoi conas do sheoladh r-phost a dheimhniú. Féach i d'fhillteán turscair mura bhfuair tú an r-phost seo.
     failure:
+      already_authenticated: Tá tú sínithe isteach cheana.
+      inactive: Níl do chuntas gníomhachtaithe fós.
+      invalid: "%{authentication_keys} nó pasfhocal neamhbhailí."
+      last_attempt: Tá iarracht amháin eile agat sula gcuirtear do chuntas faoi ghlas.
       locked: Tá do chuntas faoi ghlas.
+      pending: Tá do chuntas fós faoi athbhreithniú.
+      unauthenticated: Ní mór duit lógáil isteach nó síniú suas roimh leanúint leat.
+      unconfirmed: Caithfidh tú do r-phost a dheimhniú roimh leanúint leat.
     mailer:
+      confirmation_instructions:
+        action: Deimhnigh seoladh r-phost
+        action_with_app: Deimhnigh agus fill ar %{app}
       email_changed:
         title: Seoladh ríomhphoist nua
       password_change:
diff --git a/config/locales/devise.gd.yml b/config/locales/devise.gd.yml
index c8a34054cf..ca9dcc4969 100644
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@@ -12,6 +12,7 @@ gd:
       last_attempt: Tha aon oidhirp eile agad mus dèid an cunntas agad a ghlasadh.
       locked: Tha an cunntas agad glaiste.
       not_found_in_database: "%{authentication_keys} no facal-faire mì-dhligheach."
+      omniauth_user_creation_failure: Thachair mearachd le cruthachadh cunntais dhan dearbh-aithne seo.
       pending: Tha an cunntas agad fo lèirmheas fhathast.
       timeout: Dh’fhalbh an ùine air an t-seisean agad. Clàraich a-steach a-rithist airson leantainn air adhart.
       unauthenticated: Feumaidh tu clàradh a-steach no clàradh leinn mus lean thu air adhart.
@@ -47,16 +48,19 @@ gd:
         subject: 'Mastodon: Stiùireadh air ath-shuidheachadh an fhacail-fhaire'
         title: Ath-shuidheachadh an fhacail-fhaire
       two_factor_disabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis.
+        explanation: "’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis."
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach à comas'
+        subtitle: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad.
         title: Dearbhadh dà-cheumnach à comas
       two_factor_enabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad. Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
+        explanation: Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach an comas'
+        subtitle: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad.
         title: Dearbhadh dà-cheumnach an comas
       two_factor_recovery_codes_changed:
         explanation: Tha na còdan aisig a bh’ agad cheana mì-dhligheach a-nis agus chaidh feadhainn ùra a ghintinn.
         subject: 'Mastodon: Chaidh còdan aisig dà-cheumnach ath-ghintinn'
+        subtitle: Tha na còdan aisig a bh’ agad cheana mì-dhligheach a-nis agus chaidh feadhainn ùra a ghintinn.
         title: Dh’atharraich còdan aisig an dearbhaidh dà-cheumnaich
       unlock_instructions:
         subject: 'Mastodon: Stiùireadh neo-ghlasaidh'
@@ -70,11 +74,13 @@ gd:
           subject: 'Mastodon: Chaidh iuchair tèarainteachd a sguabadh às'
           title: Chaidh tè dhe na h-iuchraichean tèarainteachd agad a sguabadh às
       webauthn_disabled:
-        explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis.
+        explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad.
+        extra: "’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis."
         subject: 'Mastodon: Tha dearbhadh le iuchraichean tèarainteachd à comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur à comas
       webauthn_enabled:
-        explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad. ’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis.
+        explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad.
+        extra: "’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis."
         subject: 'Mastodon: Tha dearbhadh le iuchair tèarainteachd an comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur an comas
     omniauth_callbacks:
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index b392f4642c..00b1824808 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -12,6 +12,7 @@ gl:
       last_attempt: Tes un intento máis antes de que a túa conta fique bloqueada.
       locked: A túa conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou contrasinal non válidos."
+      omniauth_user_creation_failure: Erro ao crear unha conta para esta identidade.
       pending: A túa conta aínda está baixo revisión.
       timeout: A túa sesión caducou. Accede outra vez para continuar.
       unauthenticated: Precisas iniciar sesión ou rexistrarte antes de continuar.
@@ -47,16 +48,19 @@ gl:
         subject: 'Mastodon: Instrucións para restabelecer o contrasinal'
         title: Restabelecer contrasinal
       two_factor_disabled:
-        explanation: A autenticación de dobre factor para a túa conta foi desactivada. É agora posíbel acceder só co teu enderezo de email e contrasinal.
+        explanation: Agora xa podes acceder usando simplemente o correo e contrasinal.
         subject: 'Mastodon: Autenticación de dobre factor desactivada'
+        subtitle: Desactivouse o segundo factor de autenticación.
         title: 2FA desactivado
       two_factor_enabled:
-        explanation: A autenticación de dobre factor foi activada para a túa conta. Un token, xerado pola aplicación TOTP emparellada, será necesario para acceder.
+        explanation: Vai ser preciso usar un código creado pola app TOTP emparellada.
         subject: 'Mastodon: Activouse a autenticación de dobre factor'
+        subtitle: Activouse o segundo factor de autenticación para a conta.
         title: 2FA activado
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperación anteriores fican anulados e os novos foron xerados.
         subject: 'Mastodon: Xerados novos códigos de recuperación de dobre factor'
+        subtitle: Os anteriores códigos de recuperación quedaron desactivados e crearonse uns novos.
         title: Códigos de recuperación 2FA mudados
       unlock_instructions:
         subject: 'Mastodon: Instrucións para desbloquear'
@@ -70,11 +74,13 @@ gl:
           subject: 'Mastodon: Chave de seguridade eliminada'
           title: Eliminouse unha das túas chaves de seguridade
       webauthn_disabled:
-        explanation: Desactivouse para a túa conta a autenticación con chaves de seguridade. Agora a conexión é posible usando só o token creado pola app TOTP emparellada.
+        explanation: Desactivouse para a conta a autenticación con chaves de seguridade.
+        extra: Agora só se pode acceder usando o código creado pola app TOTP emparellada.
         subject: 'Mastodon: Desactivouse a autenticación con chave de seguridade'
         title: Chaves de seguridade desactivadas
       webauthn_enabled:
-        explanation: Activouse para a conta a autenticación con chave de seguridade. Xa podes usar a chave de seguridade para contectar.
+        explanation: Activouse para a conta a autenticación con chave de seguridade.
+        extra: Xa podes usar a chave de seguridade para acceder.
         subject: 'Mastodon: Autenticación con chave de seguridade activada'
         title: Chaves de seguridade activas
     omniauth_callbacks:
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index e45f62b031..02e307ae1c 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -12,6 +12,7 @@ he:
       last_attempt: יש לך עוד ניסיון אחד לפני נעילת החשבון.
       locked: חשבון זה נעול.
       not_found_in_database: "%{authentication_keys} או סיסמה לא נכונים."
+      omniauth_user_creation_failure: שגיאה ביצירת חשבון לזהות הזו.
       pending: חשבונך נמצא עדיין בבדיקה.
       timeout: פג תוקף השהיה בחשבון. נא להכנס מחדש על מנת להמשיך.
       unauthenticated: יש להרשם או להכנס לחשבון על מנת להמשיך.
@@ -47,16 +48,19 @@ he:
         subject: 'מסטודון: הוראות לאיפוס סיסמה'
         title: איפוס סיסמה
       two_factor_disabled:
-        explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+        explanation: החיבור כרגע אפשרי בעזרת שם משתמש וסיסמא ותו לא.
         subject: 'מסטודון: אימות דו גורמי מושבת'
+        subtitle: אימות דו-שלבי כובה לחשבון זה.
         title: אימות דו-גורמי הושעה
       two_factor_enabled:
-        explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+        explanation: כדי להתחבר דרוש קוד חד פעמי מיישומון TOTP ששידכת לחשבון זה.
         subject: 'מסטודון: אימות דו גורמי הופעל'
+        subtitle: אימות דו־שלבי הופעל לחשבונך.
         title: אימות דו־גורמי הופעל
       two_factor_recovery_codes_changed:
         explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
         subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+        subtitle: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
         title: צפני אחזור דו-גורמי השתנו
       unlock_instructions:
         subject: 'מסטודון: הוראות לביטול נעילה'
@@ -70,11 +74,13 @@ he:
           subject: 'מסטודון: מפתח האבטחה נמחק'
           title: אחד ממפתחות האבטחה שלך נמחק
       webauthn_disabled:
-        explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+        explanation: אימות במפתחות אבטחה כובה לחשבונך.
+        extra: חיבור כעת ניתן רק על ידי הקוד שיוצר על ידי יישומון TOTP ששודך.
         subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
         title: מפתחות אבטחה הושעו
       webauthn_enabled:
-        explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+        explanation: אימות מפתח בטחון הופעל בחשבונך.
+        extra: ניתן להשתמש כעת במפתח האבטחה שלך כדי להתחבר.
         subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
         title: מפתחות אבטחה אופשרו
     omniauth_callbacks:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 6eb1524ed1..d8958d5fb0 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -12,6 +12,7 @@ hu:
       last_attempt: Már csak egy próbálkozásod maradt, mielőtt a fiókodat zároljuk.
       locked: A fiókodat zároltuk.
       not_found_in_database: Helytelen %{authentication_keys} vagy jelszó.
+      omniauth_user_creation_failure: Hiba történt a fiók létrehozása során ehhez az identitáshoz.
       pending: A fiókod még engedélyezésre vár.
       timeout: A munkameneted lejárt. A folytatáshoz jelentkezz be újra.
       unauthenticated: A folytatás előtt be kell jelentkezned vagy regisztrálnod kell.
@@ -42,21 +43,24 @@ hu:
         title: Emailcím megerősítése
       reset_password_instructions:
         action: Jelszó módosítása
-        explanation: A fiókodhoz tartozó jelszó módosítását kezdeményezted.
-        extra: Amennyiben nem te kezdeményezted a módosítást, kérjük tekintsd ezt az emailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti linkre kattintva.
+        explanation: Új jelszót kértél a fiókodhoz.
+        extra: Ha nem te kérted, tekintsd ezt az e-mailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti hivatkozásra kattintva.
         subject: 'Mastodon: Jelszóvisszaállítási utasítások'
         title: Jelszó visszaállítása
       two_factor_disabled:
-        explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges.
-        subject: Kétlépcsős azonosítás kikapcsolva
+        explanation: A bejelentkezés most már csupán email címmel és jelszóval lehetséges.
+        subject: 'Mastodon: kétlépcsős hitelesítés letiltva'
+        subtitle: A kétlépcsős hitelesítés a fiókodhoz ki lett kapcsolva.
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
-        explanation: A kétlépcsős hitelesítést engedélyeztük a fiókodban. A bejelentkezéshez a párosított TOTP alkalmazás által generált tokenre lesz szükség.
-        subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
+        explanation: Egy párosított TOTP appal generált tokenre lesz szükség a bejelentkezéshez.
+        subject: 'Mastodon: kétlépcsős hitelesítés engedélyezve'
+        subtitle: A kétlépcsős hitelesítés a fiókodhoz aktiválva lett.
         title: Kétlépcsős hitelesítés engedélyezve
       two_factor_recovery_codes_changed:
         explanation: A korábbi helyreállítási kódok letiltásra és újragenerálásra kerültek.
         subject: 'Mastodon: Kétlépcsős helyreállítási kódok újból előállítva'
+        subtitle: A korábbi helyreállítási kódokat letiltottuk, és újakat generáltunk.
         title: A kétlépcsős kódok megváltoztak
       unlock_instructions:
         subject: 'Mastodon: Feloldási utasítások'
@@ -70,11 +74,13 @@ hu:
           subject: 'Mastodon: A biztonsági kulcs törlésre került'
           title: Az egyik biztonsági kulcsodat törölték
       webauthn_disabled:
-        explanation: A biztonsági kulccsal történő hitelesítést letiltottuk a fiókodon. Bejelentkezni csak a párosított TOTP app által generált tokennel lehet.
+        explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz ki lett kapcsolva.
+        extra: A bejelentkezés most már csak TOTP app által generált tokennel lehetséges.
         subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
         title: A biztonsági kulcsok letiltásra kerültek
       webauthn_enabled:
-        explanation: A biztonsági kulccsal történő hitelesítést engedélyeztük a fiókodon. A biztonsági kulcsodat mostantól használhatod bejelentkezésre.
+        explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz aktiválva lett.
+        extra: A biztonsági kulcsodat mostantól lehet bejelentkezésre használni.
         subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
         title: A biztonsági kulcsok engedélyezésre kerültek
     omniauth_callbacks:
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index 2d235c0af1..ee23163f51 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -47,11 +47,9 @@ hy:
         subject: Մաստոդոն․ Գաղտնաբառի վերականգնման նկարագրութիւններ
         title: Վերականգնել գաղտնաբառը
       two_factor_disabled:
-        explanation: 2FA֊ն քո հաշուի համար անջատուեց։ Մուտքն այժմ հնարաւոր է միայն էլ․ փոտի եւ գաղտնաբառի միջոցով։
         subject: Մաստոդոն․ 2FA֊ն անջատուեց
         title: 2FA անջատուած է
       two_factor_enabled:
-        explanation: 2FA֊ն քո հաշուի համար միացուած է։ TOTP ծրագրի միջոցով գեներացուած token֊ը պէտք է օգտագործես մուտք գործելու համար։
         subject: Մաստոդոն․ 2FA-ն միացուեց
         title: 2FA միացուած է
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ hy:
           subject: Մաստոդոն․ Անվտանգութեան բանալին ջնջուել է
           title: Անվտանգութեան բանալիներիցդ մեկը ջնջուել է
       webauthn_disabled:
-        explanation: Անվտանգութեան բանալիներով նոյնականացումը քո հաշուից կասեցուել է։ Մուտք գործելն այժմ հնարաւոր է՝ օգտագործելով միայն զուգաւորուած TOTP յաւելուածից գեներացուած կտրօնը։
         subject: Մաստոդոն․ Նոյնականացումն անվտանգութեան բանալիներով կասեցուած է
         title: Անվտանգութեան բանալիները կասեցուել են
       webauthn_enabled:
-        explanation: Անվտանգութեան բանալիով նոյնականացումը քո հաշուի համար միացուած է։ Քո անվտանգութեան բանալին այժմ կարող է օգտագործուել մուտք գործելու համար։
         subject: Մաստոդոն․ Անվտանգութեան բանալիով նոյնականացումը միացուած է
         title: Անվտանգութեան բանալիները միացուել են
     omniauth_callbacks:
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index c45994160c..c68efddd07 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -1,31 +1,98 @@
 ---
 ia:
   devise:
+    confirmations:
+      confirmed: Tu conto de e-mail ha essite confirmate con successo.
+      send_instructions: Tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
+      send_paranoid_instructions: Si tu adresse de e-mail existe in nostre base de datos, tu recipera un e-mail con instructiones pro confirmar tu adresse de e-mail in poc minutas. Per favor verifica tu dossier de spam si tu non lo recipe.
     failure:
+      already_authenticated: Tu jam initiava le session.
+      inactive: Tu conto ancora non es activate.
+      invalid: "%{authentication_keys} o contrasigno non valide."
+      last_attempt: Tu ha solmente un altere tentativa ante que tu conto es serrate.
       locked: Tu conto es blocate.
+      not_found_in_database: "%{authentication_keys} o contrasigno non valide."
+      omniauth_user_creation_failure: Error creante un conto pro iste identitate.
+      pending: Tu conto es ancora sub revision.
+      timeout: Tu session ha expirate. Per favor reaperi session pro continuar.
+      unauthenticated: Es necessari aperir session o crear un conto ante de continuar.
+      unconfirmed: Es necessari confirmar tu adresse de e-mail ante de continuar.
     mailer:
       confirmation_instructions:
         action: Verificar adresse de e-mail
         action_with_app: Confirmar e retornar a %{app}
+        explanation: Tu ha create un conto sur %{host} con iste adresse de e-mail. Tu es a un sol clic de activar lo. Si isto non esseva tu, per favor ignora iste e-mail.
+        explanation_when_pending: Tu ha sollicitate un invitation a %{host} con iste adresse de e-mail. Post que tu confirma tu adresse de e-mail, nos va revider tu demanda. Tu pote aperir session pro cambiar tu detalios o eliminar tu conto, ma tu non pote acceder al majoritate del functiones usque tu conto es approbate. Si tu demanda es rejectate, tu datos essera removite e nulle action ulterior essera requirite de te. Si isto non esseva tu, per favor ignora iste message de e-mail.
+        extra_html: Per favor consulta tamben <a href="%{terms_path}">le regulas del servitor</a> e <a href="%{policy_path}">nostre conditiones de servicio</a>.
+        subject: 'Mastodon: Instructiones de confirmation pro %{instance}'
         title: Verificar adresse de e-mail
       email_changed:
+        explanation: 'Le adresse de e-mail pro tu conto essera cambiate a:'
+        extra: Si tu non ha cambiate de adresse de e-mail, es probabile que alcuno ha ganiate le accesso a tu conto. Per favor cambia immediatemente tu contrasigno o contacta le administrator del servitor si tu non pote acceder a tu conto.
+        subject: 'Mastodon: E-mail cambiate'
         title: Nove adresse de e-mail
       password_change:
+        explanation: Le contrasigno de tu conto ha essite cambiate.
+        extra: Si tu non ha cambiate tu contrasigno, es probabile que alcuno ha ganiate le accesso a tu conto. Per favor cambia immediatemente tu contrasigno o contacta le administrator del servitor si tu non pote acceder a tu conto.
+        subject: 'Mastodon: Contrasigno cambiate'
         title: Contrasigno cambiate
       reconfirmation_instructions:
+        explanation: Confirma le nove adresse pro cambiar tu email.
+        extra: Si non es tu qui ha initiate iste cambiamento, per favor ignora iste e-mail. Le adresse de e-mail pro le conto de Mastodon non cambiara usque tu accede al ligamine hic supra.
+        subject: 'Mastodon: Confirmar e-mail pro %{instance}'
         title: Verificar adresse de e-mail
       reset_password_instructions:
         action: Cambiar contrasigno
+        explanation: Tu ha requestate un nove contrasigno pro tu conto.
+        extra: Si tu non ha requestate isto, per favor ignora iste e-mail. Tu contrasigno non cambiara usque tu accede al ligamine hic supra e crea un nove.
+        subject: 'Mastodon: Instructiones pro reinitialisar le contrasigno'
         title: Reinitialisar contrasigno
       two_factor_disabled:
+        explanation: Ora es possibile aperir session con solmente le adresse de e-mail e contrasigno.
+        subject: 'Mastodon: Authentication bifactorial disactivate'
+        subtitle: Le authentication bifactorial ha essite disactivate pro tu conto.
         title: 2FA disactivate
       two_factor_enabled:
+        explanation: Pro le apertura de session essera necessari un token generate per le application TOTP accopulate.
+        subject: 'Mastodon: Authentication bifactorial activate'
+        subtitle: Le authentication bifactorial ha essite activate pro tu conto.
         title: 2FA activate
+      two_factor_recovery_codes_changed:
+        explanation: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
+        subject: 'Mastodon: Codices de recuperation regenerate'
+        subtitle: Le ancian codices de recuperation ha essite invalidate e nove codices ha essite generate.
+        title: Codices de recuperation cambiate
+      unlock_instructions:
+        subject: 'Mastodon: Instructiones pro disblocar'
+      webauthn_credential:
+        added:
+          explanation: Le sequente clave de securitate esseva addite a tu conto
+          subject: 'Mastodon: Nove clave de securitate'
+          title: Un nove clave de securitate esseva addite
+        deleted:
+          explanation: Le sequente clave de securitate esseva delite de tu conto
+          subject: 'Mastodon: Clave de securitate delite'
+          title: Un de tu claves de securitate ha essite delite
+      webauthn_disabled:
+        explanation: Le authentication con claves de securitate ha essite disactivate pro tu conto.
+        extra: Ora es possibile aperir session usante solmente le token generate per le application TOTP accopulate.
+        subject: 'Mastodon: Le authentication con claves de securitate es disactivate'
+        title: Claves de securitate disactivate
+      webauthn_enabled:
+        explanation: Le authentication con claves de securitate ha essite activate pro tu conto.
+        extra: Tu clave de securitate pote ora esser usate pro aperir session.
+        title: Claves de securitate activate
     registrations:
+      destroyed: A revider! Tu conto esseva cancellate con successo. Nos spera vider te novemente tosto.
+      signed_up_but_pending: Un message con un ligamine de confirmation esseva inviate a tu conto de email. Post que tu clicca le ligamine, nos revidera tu application. Tu essera notificate si illo es approbate.
       updated: Tu conto ha essite actualisate con successo.
+    sessions:
+      signed_in: Connexe con successo.
+      signed_out: Disconnexe con successo.
     unlocks:
       unlocked: Tu conto ha essite disblocate con successo. Initia session a continuar.
   errors:
     messages:
       already_confirmed: jam esseva confirmate, tenta initiar session
       not_found: non trovate
+      not_locked: non era blocate
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 2e51a69dc2..c0dede95aa 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -47,11 +47,9 @@ id:
         subject: 'Mastodon: Petunjuk mereset kata sandi'
         title: Reset kata sandi
       two_factor_disabled:
-        explanation: Otentifikasi dua-faktor untuk akun Anda dimatikan. Kini Masuk dapat dilakukan hanya dengan alamat email dan kata sandi.
         subject: 'Mastodon: Otentifikasi dua-faktor dimatikan'
         title: 2FA dimatikan
       two_factor_enabled:
-        explanation: Otentifikasi dua-faktor telah dimatikan untuk Akun Anda. Token yang dibuat menggunakan aplikasi TOTP berpasangan akan diperlukan untuk masuk.
         subject: 'Mastodon: Otentifikasi dua-faktor diaktifkan'
         title: 2FA diaktifkan
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ id:
           subject: 'Mastodon: Kunci keamanan dihapus'
           title: Salah satu dari kunci keamanan Anda telah dihapus
       webauthn_disabled:
-        explanation: Autentikasi dengan kunci keamanan telah dinonaktifkan untuk akun ini. Proses masuk akun hanya mungkin menggunakan token yang dibuat dengan aplikasi TOTP.
         subject: 'Mastodon: Autentikasi dengan kunci keamanan dinoaktifkan'
         title: Kunci keamanan dinonaktifkan
       webauthn_enabled:
-        explanation: Autentikasi kunci keamanan telah diaktifkan untuk akun Anda. Kunci keamanan Anda kini dapat dipakai untuk masuk.
         subject: 'Mastodon: Autentikasi kunci keamanan aktif'
         title: Kunci keamanan aktif
     omniauth_callbacks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 05a41147d8..9c82bd4529 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -12,6 +12,7 @@ ie:
       last_attempt: Hay solmen un prova ante que tui conto deveni serrat.
       locked: Tui conto es serrat.
       not_found_in_database: Ínvalid %{authentication_keys} o passa-parol.
+      omniauth_user_creation_failure: Errore in li creation de un conto por ti-ci identitá.
       pending: Tui conto es ancor sub revision.
       timeout: Tui session ha expirat. Ples reintrar denov por continuar.
       unauthenticated: Tu deve intrar o registrar te ante continuar.
@@ -47,16 +48,19 @@ ie:
         subject: 'Mastodon: Instructiones por reiniciar li passa-parol'
         title: Reiniciar passa-parol
       two_factor_disabled:
-        explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+        explanation: Aperter session es nu possibil solmen per email-adresse e passa-parol.
         subject: 'Mastodon: 2-factor autentication desactivat'
+        subtitle: 2-factor autentication por tui conto ha esset desactivisat.
         title: 2FA desvalidat
       two_factor_enabled:
-        explanation: 2-factor autentication ha esset activat por tui conto. Un gage generat per li acuplat apli TOTP va esser besonat por intrar.
+        explanation: Un clave generat del acuplat TOTP-aplication nu va esser besonat por aperter session.
         subject: 'Mastodon: 2-factor autentication activat'
+        subtitle: 2-factor autentication ha esset activisat por tui conto.
         title: 2FA permisset
       two_factor_recovery_codes_changed:
         explanation: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
         subject: 'Mastodon: 2-factor codes de recuperation regenerat'
+        subtitle: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
         title: 2FA codes de recuperation changeat
       unlock_instructions:
         subject: 'Mastodon: Desserral instructiones'
@@ -70,11 +74,13 @@ ie:
           subject: 'Mastodon: Clave de securitá deletet'
           title: Un ex tui claves de securitá ha esset deletet
       webauthn_disabled:
-        explanation: Autentication per claves de securitá ha esset desactivat por tui conto. Ja on posse intrar solmen con li gage generat per li acuplat apli TOTP.
+        explanation: Autentication per clave de securitá ha esset desactivisat por tui conto.
+        extra: Aperter session es nu possibil solmen per li clave generat del acuplat TOTP-aplication.
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
       webauthn_enabled:
-        explanation: Autentication per clave de securitá ha esset activat por tui conto. Ja li clave de securitá posse esser usat por intrar.
+        explanation: Autentication per clave de securitá ha esset activisat por tui conto.
+        extra: Tui clave de securitá nu posse esser usat por aperter session.
         subject: 'Mastodon: Autentication per clave de securitá activat'
         title: Claves de securitá activisat
     omniauth_callbacks:
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index fb90c08c7f..6bf0b52cef 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -47,11 +47,9 @@ io:
         subject: Instrucioni por chanjar la pasvorto
         title: Richanjo di pasvorto
       two_factor_disabled:
-        explanation: 2-faktorverifiko por vua konto deaktivigesis. Eniro esas nun posible per nur retpostadreso e pasvorto.
         subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
         title: 2FA deaktivigesis
       two_factor_enabled:
-        explanation: 2-faktorverifiko aktivigesis por vua konto. Fisho quo facesis da parigita softwaro TOTP bezonesos por eniro.
         subject: 'Mastodon: 2-faktorverifiko aktivigesis'
         title: 2FA aktivigesis
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ io:
           subject: 'Mastodon: Sekurklefo efacesis'
           title: 1 de vua sekurklefi efacesis
       webauthn_disabled:
-        explanation: Verifiko per sekurklefi deaktivigesis por vua konto. Eniro nun esas posibla per nur ficho quo facesis da parita softwaro TOTP.
         subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
         title: Sekurklefi deaktivigesis
       webauthn_enabled:
-        explanation: Sekurklefverifiko aktivigesis por vua konto. Vua sekurklefo nun povas uzesar por eniro.
         subject: 'Mastodon: Sekurklefverifiko aktivigesis'
         title: Sekurklefi aktivigesis
     omniauth_callbacks:
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 3b7cf10987..a045bdd80c 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -12,6 +12,7 @@ is:
       last_attempt: Þú getur reynt einu sinni í viðbót áður en aðgangnum þínum verður læst.
       locked: Notandaaðgangurinn þinn er læstur.
       not_found_in_database: Ógilt %{authentication_keys} eða lykilorð.
+      omniauth_user_creation_failure: Villa við að útbúa aðgang fyrir þetta auðkenni.
       pending: Notandaaðgangurinn þinn er enn til yfirferðar.
       timeout: Setan þín er útrunnin. Skráðu þig aftur inn til að halda áfram.
       unauthenticated: Þú þarft að skrá þig inn eða nýskrá þig áður en lengra er haldið.
@@ -47,16 +48,19 @@ is:
         subject: 'Mastodon: Leiðbeiningar til að endurstilla lykilorð'
         title: Endurstilling lykilorðs
       two_factor_disabled:
-        explanation: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk. Núna er einungis hægt að skrá inn með tölvupóstfangi og lykilorði.
+        explanation: Innskráning er núna möguleg með því að nota aðeins tölvupóstfang og lykilorð.
         subject: 'Mastodon: Tveggja-þátta auðkenning er óvirk'
+        subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk.
         title: 2FA tveggja-þátta auðkenning er óvirk
       two_factor_enabled:
-        explanation: Tveggja-þátta auðkenning hefur verið gerð virk fyrir aðganginn þinn. Krafist er teikns útbúnu af paraða TOTP-forritinu til að skrá inn.
+        explanation: Teikn sem útbúið hefur verið af pöruðu TOTP-forriti verður nauðsynlegt til innskráningar.
         subject: 'Mastodon: Tveggja-þátta auðkenning er virk'
+        subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð virk.
         title: 2FA tveggja-þátta auðkenning er virk
       two_factor_recovery_codes_changed:
         explanation: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
         subject: 'Mastodon: Endurheimtukóðar tveggja-þátta auðkenningar voru endurnýjaðir'
+        subtitle: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
         title: Endurheimtukóðar tveggja-þátta auðkenningar breyttust
       unlock_instructions:
         subject: 'Mastodon: Leiðbeiningar til að aflæsa'
@@ -70,11 +74,13 @@ is:
           subject: 'Mastodon: Öryggislykli eytt'
           title: Einum af öryggilyklunum þínum hefur verið eytt
       webauthn_disabled:
-        explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn. Innskráning er núna einungis möguleg með teikni útbúnu af paraða TOTP-forritinu.
+        explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn.
+        extra: Innskráning er núna möguleg með því að nota einungis teikn útbúnu af paraða TOTP-forritinu.
         subject: 'Mastodon: Auðkenning með öryggislyklum er óvirk'
         title: Öryggislyklar eru óvirkir
       webauthn_enabled:
-        explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn. Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
+        explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn.
+        extra: Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
         subject: 'Mastodon: Auðkenning með öryggislykli er virk'
         title: Öryggislyklar eru virkir
     omniauth_callbacks:
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 5ea3aeac47..8aaea3c15b 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,6 +12,7 @@ it:
       last_attempt: Hai un altro tentativo, prima che il tuo profilo venga bloccato.
       locked: Il tuo profilo è bloccato.
       not_found_in_database: "%{authentication_keys} o password non valida."
+      omniauth_user_creation_failure: Errore nella creazione di un account per questa identità.
       pending: Il tuo profilo è ancora in revisione.
       timeout: La tua sessione è scaduta. Sei pregato di accedere nuovamente per continuare.
       unauthenticated: Devi accedere o registrarti, per continuare.
@@ -47,16 +48,19 @@ it:
         subject: 'Mastodon: Istruzioni di ripristino della password'
         title: Ripristino della password
       two_factor_disabled:
-        explanation: L'autenticazione a due fattori per il tuo profilo è stata disabilitata. L'accesso è ora possibile utilizzando solo l'indirizzo email e la password.
+        explanation: Il login è ora possibile utilizzando solo un indirizzo e-mail e una password.
         subject: 'Mastodon: Autenticazione a due fattori disabilitata'
+        subtitle: L'autenticazione a due fattori per il tuo account è stata disabilitata.
         title: A2F disabilitata
       two_factor_enabled:
-        explanation: L'autenticazione a due fattori è stata abilitata per il tuo profilo. Un token, generato dall'app TOTP collegata, sarà richiesto per l'accesso.
+        explanation: Un token generato dall'app TOTP accoppiata sarà richiesto per il login.
         subject: 'Mastodon: Autenticazione a due fattori abilitata'
+        subtitle: L'autenticazione a due fattori è stata abilitata per il tuo account.
         title: A2F abilitata
       two_factor_recovery_codes_changed:
         explanation: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
         subject: 'Mastodon: Codici di recupero a due fattori rigenerati'
+        subtitle: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
         title: Codici di recupero A2F cambiati
       unlock_instructions:
         subject: 'Mastodon: Istruzioni di sblocco'
@@ -70,11 +74,13 @@ it:
           subject: 'Mastodon: Chiave di sicurezza eliminata'
           title: Una delle tue chiavi di sicurezza è stata eliminata
       webauthn_disabled:
-        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo profilo. L'accesso è ora possibile utilizzando solo il token, generato dall'app TOTP associata.
+        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo account.
+        extra: Il login è ora possibile utilizzando solo il token generato dall'app TOTP accoppiata.
         subject: 'Mastodon: Autenticazione con chiavi di sicurezza disabilitata'
         title: Chiavi di sicurezza disabilitate
       webauthn_enabled:
-        explanation: L'autenticazione con chiavi di sicurezza è stata abilitata per il tuo profilo. La tua chiave di sicurezza è ora utilizzabile per l'accesso.
+        explanation: L'autenticazione della chiave di sicurezza è stata abilitata per il tuo account.
+        extra: La tua chiave di sicurezza può ora essere utilizzata per il login.
         subject: 'Mastodon: Autenticazione con chiavi di sicurezza abilitata'
         title: Chiavi di sicurezza abilitate
     omniauth_callbacks:
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index ca8ac05847..40a42de587 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -12,6 +12,7 @@ ja:
       last_attempt: あと1回失敗するとアカウントがロックされます。
       locked: アカウントはロックされました。
       not_found_in_database: "%{authentication_keys}かパスワードが誤っています。"
+      omniauth_user_creation_failure: 指定されたIDに対応するアカウントを作成できませんでした。
       pending: あなたのアカウントはまだ承認待ちです。
       timeout: セッションの有効期限が切れました。続行するには再度ログインしてください。
       unauthenticated: 続行するにはログインするか、アカウントを作成してください。
@@ -47,16 +48,19 @@ ja:
         subject: 'Mastodon: パスワード再発行'
         title: パスワード再発行
       two_factor_disabled:
-        explanation: あなたのアカウントの二要素認証が無効化されました。メールとパスワードのみでログインできます。
+        explanation: メールアドレスとパスワードのみでログイン可能になりました。
         subject: 'Mastodon: 二要素認証が無効になりました'
+        subtitle: 今後、アカウントへのログインに二要素認証を要求しません。
         title: 二要素認証が無効化されました
       two_factor_enabled:
-        explanation: あなたのアカウントの二要素認証が有効化されました。ログインするには TOTP アプリで生成されたコードが必要です。
+        explanation: ログインには設定済みのTOTPアプリが生成したトークンが必要です。
         subject: 'Mastodon: 二要素認証が有効になりました'
+        subtitle: 今後、アカウントへのログインに二要素認証が必要になります。
         title: 二要素認証が有効化されました
       two_factor_recovery_codes_changed:
         explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
         subject: 'Mastodon: 二要素認証のリカバリーコードが再生成されました'
+        subtitle: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
         title: 二要素認証のリカバリーコードが変更されました
       unlock_instructions:
         subject: 'Mastodon: アカウントのロックの解除'
@@ -70,11 +74,13 @@ ja:
           subject: 'Mastodon: セキュリティキーが削除されました'
           title: セキュリティキーが削除されました
       webauthn_disabled:
-        explanation: アカウントのセキュリティキーによる認証が無効になりました。ペアリングされたTOTPアプリによって生成されたトークンのみを使用してログインが可能になりました。
+        explanation: セキュリティキー認証が無効になりました。
+        extra: 設定済みのTOTPアプリが生成したトークンのみでログインできるようになりました。
         subject: 'Mastodon: セキュリティキー認証が無効になりました'
         title: セキュリティキーは無効になっています
       webauthn_enabled:
-        explanation: あなたのアカウントでセキュリティキー認証が有効になりました。セキュリティキーをログインに使用できるようになりました。
+        explanation: セキュリティキー認証が有効になりました。
+        extra: ログインにセキュリティキーを使用できるようになりました。
         subject: 'Mastodon: セキュリティキー認証が有効になりました'
         title: セキュリティキーは有効になっています
     omniauth_callbacks:
@@ -88,6 +94,7 @@ ja:
       updated_not_active: パスワードは正常に更新されました。
     registrations:
       destroyed: アカウントの作成はキャンセルされました。またのご利用をお待ちしています。
+      sign_up_failed_because_reach_limit: 制限に到達しているため、アカウントを作成できません。
       signed_up: アカウントの作成が完了しました。Mastodonへようこそ。
       signed_up_but_inactive: アカウントの作成が完了しました。しかし、アカウントが有効化されていないためログインできませんでした。
       signed_up_but_locked: アカウントの作成が完了しました。しかし、アカウントがロックされているためログインできませんでした。
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index eb599e55e8..438c1df2b9 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -13,13 +13,13 @@ kab:
       locked: Amiḍan-ik yettwargel.
       not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
       pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
-      timeout: Tiγimit n tuqqna tezri. Ma ulac aγilif ɛiwed tuqqna akken ad tkemmleḍ.
-      unauthenticated: Ilaq ad teqqneḍ neγ ad tjerrḍeḍ akken ad tkemmelḍ.
+      timeout: Tiɣimit n tuqqna tezri. Ma ulac aɣilif ɛiwed tuqqna akken ad tkemmleḍ.
+      unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ akken ad tkemmelḍ.
       unconfirmed: Ilaq ad wekdeḍ tansa-inek imayl akken ad tkemmelḍ.
     mailer:
       confirmation_instructions:
         action: Senqed tansa-inek imayl
-        action_with_app: Wekked sakkin uγal γer %{app}
+        action_with_app: Sentem sakkin uɣal ɣer %{app}
         explanation: Aqla-k terniḍ amiḍan deg %{host} s tansa imayl-agi. Mazal-ak yiwen utekki akken ad t-tremdeḍ. Ma mačči d kečč i yessutren ay-agi, ttxil-k ssinef izen-a.
         explanation_when_pending: Tsutreḍ-d ajerred deg %{host} s tansa-agi imayl. Ad nγeṛ asuter-ik ticki tsentmeḍ tansa-ik imayl. Send asentem, ur tezmireḍ ara ad teqqneḍ γer umiḍan-ik. Ma yella nugi asuter-ik, isefka-ik ad ttwakksen seg uqeddac, ihi ulac tigawt-nniḍen ara k-d-yettuqeblen. Ma mačči d kečč i yellan deffir n usuter-agi, ttxil-k ssinef izen-agi.
         extra_html: Ttxil-k ẓer daγen <a href="%{terms_path}">ilugan n uqeddac</a> akked <a href="%{policy_path}">twetlin n useqdec-nneγ</a>.
@@ -47,11 +47,9 @@ kab:
         subject: 'Mastodon: Iwellihen n uwennez n wawal uffir'
         title: Aɛiwed n wawal uffir
       two_factor_disabled:
-        explanation: Asesṭeb s snat n tarayin insa i umiḍan-ik·im. Tzemreḍ ad teqnneḍ tura s imayl d wawal uffir kan.
         subject: 'Mastodon: Asesteb s snat n tarrayin yensa'
         title: Asesteb s snat n tarrayin insa
       two_factor_enabled:
-        explanation: Asesṭeb s snat n tarayin yermed i umiḍan-ik·im. anekcum isra tangalt akken ad yeddu.
         subject: 'Mastodon: Asesteb s snat n tarrayin yermed'
         title: Asesteb s snat n tarrayin irmed
       two_factor_recovery_codes_changed:
@@ -83,13 +81,13 @@ kab:
       update_needs_confirmation: Tleqmeḍ akken iwata amiḍan-ik·im, maca nesra ad nsenqed tansa-ik·im imayl tamaynut. Ttxil-k·m senqed imayl-k·m sakin ḍfer aseɣwen i usentem n n tansa imayl tamaynut. Ttxil senqed akaram n spam ma yella ur tufiḍ ara imayl-nni.
       updated: Amiḍan-ik·im yettwalqem akken iwata.
     sessions:
-      already_signed_out: Aqla-k teffγeḍ.
+      already_signed_out: Aqla-k teffɣeḍ.
       signed_in: Aqla-k teqqneḍ.
-      signed_out: Aqla-k teffγeḍ.
+      signed_out: Aqla-k teffɣeḍ.
     unlocks:
       send_instructions: Deg kra n tesdatin, ad teṭṭfeḍ imayl deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
       send_paranoid_instructions: Ma yella umiḍan-ik·im yella, ad teṭṭfeḍ imayl deg tesdatin i d-iteddun, deg-s iwellihen i yilaqen i userreḥ n umiḍan-ik·im. Ma yella ur tufiḍ ara izen-agi, ttxil-k·m ẓer deg ukaram spam.
-      unlocked: Iserreḥ umiḍan-ik·im akken iwata. ttxil qqen akken ad tkemleḍ.
+      unlocked: Iserreḥ umiḍan-ik·im akken iwata. Ttxil qqen akken ad tkemleḍ.
   errors:
     messages:
       already_confirmed: ittwasentem yakan, ttxil εreḍ ad teqneḍ
diff --git a/config/locales/devise.kk.yml b/config/locales/devise.kk.yml
index 7ddeb86047..06fad30aec 100644
--- a/config/locales/devise.kk.yml
+++ b/config/locales/devise.kk.yml
@@ -47,11 +47,9 @@ kk:
         subject: 'Mastodon: Құпиясөзді қалпына келтіру нұсқаулықтары'
         title: Құпиясөзді қалпына келтіру
       two_factor_disabled:
-        explanation: Екі факторлы аутентификация сіздің аккаунтыңыз үшін жабық. Email адресіңіз және құпиясөзіңіз арқылы кіруіңізге болады.
         subject: 'Mastodon: Екі факторлы аутентификация жабық'
         title: 2FA жабық
       two_factor_enabled:
-        explanation: Екі факторлы аутентификация аккаунтыңызға қосылды. TOTP арқылы жасалған токен міндетті кіруіңіз үшін.
         subject: 'Mastodon: Екі факторлы аутентификация ашық'
         title: 2FA ашық
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 65f660f105..198d44a4f7 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -12,6 +12,7 @@ ko:
       last_attempt: 계정이 잠기기까지 한 번의 시도가 남았습니다.
       locked: 계정이 잠겼습니다.
       not_found_in_database: 올바르지 않은 %{authentication_keys} 혹은 암호입니다.
+      omniauth_user_creation_failure: 이 신원으로 계정을 만드는데 실패했습니다.
       pending: 이 계정은 아직 검토 중입니다.
       timeout: 세션이 만료되었습니다. 다시 로그인 하세요.
       unauthenticated: 계속 하려면 로그인을 해야 합니다.
@@ -47,16 +48,19 @@ ko:
         subject: 'Mastodon: 암호 재설정 설명'
         title: 암호 재설정
       two_factor_disabled:
-        explanation: 당신의 계정에 설정된 이중 인증이 비활성화 되었습니다. 이제 이메일과 암호만으로 로그인이 가능합니다.
+        explanation: 이제 이메일과 암호만 이용해서 로그인이 가능합니다.
         subject: '마스토돈: 이중 인증 비활성화'
+        subtitle: 계정에 대한 2단계 인증이 비활성화되었습니다.
         title: 2FA 비활성화 됨
       two_factor_enabled:
-        explanation: 당신의 계정에 이중 인증이 활성화되었습니다. 로그인시 페어링된 T-OTP 앱에서 생성된 토큰이 필요합니다.
+        explanation: 로그인 하기 위해서는 짝이 되는 TOTP 앱에서 생성한 토큰이 필요합니다.
         subject: '마스토돈: 이중 인증 활성화'
+        subtitle: 계정에 대한 2단계 인증이 활성화되었습니다.
         title: 2FA 활성화 됨
       two_factor_recovery_codes_changed:
         explanation: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다
         subject: '마스토돈: 이중 인증 복구 코드 재생성 됨'
+        subtitle: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다.
         title: 2FA 복구 코드 변경됨
       unlock_instructions:
         subject: '마스토돈: 잠금 해제 방법'
@@ -70,11 +74,13 @@ ko:
           subject: '마스토돈: 보안 키 삭제'
           title: 보안 키가 삭제되었습니다
       webauthn_disabled:
-        explanation: 보안 키를 이용한 인증이 당신의 계정에 대해 비활성화 되어 있습니다. TOTP 앱의 토큰만으로 로그인 할 수 있습니다.
+        explanation: 계정의 보안 키 인증이 비활성화되었습니다
+        extra: 이제 TOTP 앱에서 생성한 토큰을 통해서만 로그인 가능합니다.
         subject: '마스토돈: 보안 키를 이용한 인증이 비활성화 됨'
         title: 보안 키 비활성화 됨
       webauthn_enabled:
-        explanation: 보안 키 인증이 당신의 계정에 대해 활성화 되어 있습니다. 보안 키를 통해 로그인 할 수 있습니다.
+        explanation: 계정에 대한 보안키 인증이 활성화되었습니다.
+        extra: 로그인시 보안키가 사용됩니다.
         subject: '마스토돈: 보안 키 인증 활성화 됨'
         title: 보안 키 활성화 됨
     omniauth_callbacks:
diff --git a/config/locales/devise.ku.yml b/config/locales/devise.ku.yml
index 6debd96e05..33a868a8a5 100644
--- a/config/locales/devise.ku.yml
+++ b/config/locales/devise.ku.yml
@@ -51,11 +51,9 @@ ku:
         subject: 'Mastodon: rêwerzên jê birina pêborîn'
         title: Borînpeyv ji nû ve saz bike
       two_factor_disabled:
-        explanation: Ji bo ajimêrê te piştrastkirina du-faktorî hat asteng kirin. Niha tu tenê bi navnîşana e-name û borînpeyva xwe dikarî têketinê bikî.
         subject: 'Mastodon: piştrastkirina du- faktorî neçalak bike'
         title: 2FA Neçalak e
       two_factor_enabled:
-        explanation: Piştrastkirinê du-faktorî ya ajimêrê te hat çalak kirin. Ji bo têketinê ji alî sepanê cotkirî TOTP ve hewceyî nîşanderek heye.
         subject: 'Mastodon: piştrastkirina du-faktorî hat çalak kirin'
         title: 2FA Çalak e
       two_factor_recovery_codes_changed:
@@ -74,11 +72,9 @@ ku:
           subject: 'Mastodon: Kilîta ewlehiyê hate jêbirin'
           title: Yek ji kilîta ewlehiyê yên te hate jêbirin
       webauthn_disabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn. Têketin niha gengaz e ku mirov tenê nîşana ku ji hêla sepana cotkirî ya TOTP ve hatî avakirin bi kar bîne.
         subject: 'Mastodon: Rastandin bi kilîta ewlehiyê re nehate çalakirin'
         title: Kilîta ewlehiyê neçalak e
       webauthn_enabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn.
         subject: 'Mastodon: Rastandina kilîta ewlehiyê hate çalakkirin'
         title: Kilîta ewlehiyê çalak e
     omniauth_callbacks:
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index 63933b80fc..7d447140f4 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -3,7 +3,7 @@ lad:
   devise:
     confirmations:
       confirmed: Tu adreso de posta elektronika tyene sido konfirmado korektamente.
-      send_instructions: Risiviras una posta elektronika kon instruksyones para konfirmar tu adreso de posta elektronika en unos minutos. Por favor, komprova tu kuti de spam si no risivites esta posta elektronika.
+      send_instructions: Risiviras una mesaj de posta elektronika kon instruksyones para konfirmar tu adreso de posta elektronika en unos minutos. Por favor, komprova tu kuti de spam si no risivites esta posta elektronika.
       send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras una posta elektronika kon instruksyones sobre komo konfirmar tu adreso de posta elektronika en pokos minutos.
     failure:
       already_authenticated: Ya te konektates kon tu kuento.
@@ -12,7 +12,8 @@ lad:
       last_attempt: Aprova una vez mas antes de ke tu kuento sea blokado.
       locked: Tu kuento esta blokado.
       not_found_in_database: Inkorekto %{authentication_keys} o kod.
-      pending: Tu ainda esta basho revizyon.
+      omniauth_user_creation_failure: Ay un error en kriyar un kuento para esta identita.
+      pending: Tu kuento ainda esta basho revizyon.
       timeout: Tu sesyon tiene kadukado. Por favor konektate kon tu kuento de muevo para kontinuar.
       unauthenticated: Kale konektarte kon tu kuento o enregistrarte antes de kontinuar.
       unconfirmed: Tyenes ke konfirmar tu adreso de posta elektronika antes de kontinuar.
@@ -45,18 +46,21 @@ lad:
         explanation: Solisitates un muevo kod para tu kuento.
         extra: Si no solisitates esto, por favor ignora esta posta. Tu kod no trokara asta ke tu aksedas al atadijo arriva i kriyes un muevo.
         subject: 'Mastodon: Instruksyones para reinisyar kod'
-        title: Reinisyar kod
+        title: Reinisya kod
       two_factor_disabled:
-        explanation: La autentifikasyon de dos pasos para tu kuento a sido inkapasitada. Agora puedes konektarte solamente uzando el adreso de posta elektronika i el kod.
+        explanation: Agora puedes konektarte kon tu kuento uzando solo tu adreso de posta i kod.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
-        title: Autentifikasyon 2FA inkapasitada
+        subtitle: La autentifikasyon en dos pasos para tu kuento tiene sido inkapasitada.
+        title: Autentifikasyon de dos pasos inkapasitada
       two_factor_enabled:
-        explanation: La autentifikasyon de dos pasos para tu kuento a sido kapasitada. Se rekiere un token djenerado por la aplikasyon TOTP konektada para entrar.
+        explanation: Se rekierira un token djenerado por la aplikasyon TOTP konektada para entrar.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
-        title: Autentifikasyon 2FA aktivada
+        subtitle: La autentifikasyon de dos pasos para tu kuento tiene sido kapasitada.
+        title: Autentifikasyon de dos pasos aktivada
       two_factor_recovery_codes_changed:
         explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
         subject: 'Mastodon: Los kodiches de rekuperasyon de dos pasos fueron rejenerados'
+        subtitle: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
         title: Kodiches de rekuperasyon 2FA trokados
       unlock_instructions:
         subject: 'Mastodon: Instruksyones para dezblokar'
@@ -66,15 +70,17 @@ lad:
           subject: 'Mastodon: Mueva yave de sigurita'
           title: Se tiene adjustado una mueva yave de sigurita
         deleted:
-          explanation: La sigiente yave de sigurita a sido supremida de tu kuento
+          explanation: La sigiente yave de sigurita a sido suprimida de tu kuento
           subject: 'Mastodon: Yave de sigurita supremida'
-          title: Una de tus yaves de sigurita tiene sido supremida
+          title: Una de tus yaves de sigurita tiene sido suprimida
       webauthn_disabled:
-        explanation: La autentifikasyon kon yaves de sigurita a sido inkapasitada para tu kuento. Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
+        explanation: La autentifikasyon kon yaves de sigurita tiene sido inkapasitada para tu kuento.
+        extra: Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
         subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
         title: Yaves de sigurita inkapasitadas
       webauthn_enabled:
-        explanation: La autentifikasyon kon yave de sigurita a sido kapasitada para tu kuento. Agora tu yave de sigurita puede ser utilizada para inisyar sesyon.
+        explanation: La autentifikasyon kon yave de sigurita tiene sido kapasitada para tu kuento.
+        extra: Agora tu yave de sigurita puede ser utilizada para konektarte kon tu kuento.
         subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
         title: Yaves de sigurita kapasitadas
     omniauth_callbacks:
@@ -84,25 +90,25 @@ lad:
       no_token: No puedes akseder a esta pajina si no vienes dizde una posta elektronika de restablesimyento de kod. Si vienes dizde una posta elektronika de restablesimyento de kod, por favor asigurate de utilizar el URL kompleto embiado.
       send_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
       send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta no deseado si no risives akeya posta elektronika.
-      updated: Tu kod a sido trokado kon reusho. Tinenes entrado en kuento.
-      updated_not_active: Tu kod se tiene trokado kon reusho.
+      updated: Tu kod a sido trokado kon reushita. Tyenes entrado en kuento.
+      updated_not_active: Tu kod se tiene trokado kon reushita.
     registrations:
-      destroyed: Tu kuento a sido efasado kon reusho. Asperamos verte de muevo pronto.
+      destroyed: Tu kuento a sido efasado kon reushita. Asperamos verte de muevo pronto.
       signed_up: Bienvenido! Te tienes enrejistrado djustamente.
-      signed_up_but_inactive: Te tienes enrejistrado kon reusho. Entanto, no se pudio inisyar sesyon porke tu kuento ainda no esta aktivado.
-      signed_up_but_locked: Te tienes enrejistrado kon reusho. Entanto, no pudites konektarte kon tu kuento porke tu kuento esta blokado.
+      signed_up_but_inactive: Te tienes enrejistrado kon reushita. Entanto, no se pudio inisyar sesyon porke tu kuento ainda no esta aktivado.
+      signed_up_but_locked: Te tienes enrejistrado kon reushita. Entanto, no pudites konektarte kon tu kuento porke tu kuento esta blokado.
       signed_up_but_pending: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Dempues de klikar en el atadijo, revizaremos tu solisitud. Seras avizado si se acheta.
       signed_up_but_unconfirmed: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Por favor, sigue el atadijo para aktivar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
-      update_needs_confirmation: Tienes aktualizado tu kuento kon reusho, pero kale verifikar tu muevo adreso de posta elektronika. Por favor, komprova tu posta elektronika i sige el atadijo de konfirmasyon para konfirmar tu muevo adreso de posta elektronika. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
-      updated: Tu kuento se aktualizo kon reusho.
+      update_needs_confirmation: Tienes aktualizado tu kuento kon reushita, pero kale verifikar tu muevo adreso de posta elektronika. Por favor, komprova tu posta elektronika i sige el atadijo de konfirmasyon para konfirmar tu muevo adreso de posta elektronika. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      updated: Tu kuento se aktualizo kon reushita.
     sessions:
-      already_signed_out: Salites del kuento kon reusho.
-      signed_in: Konektates kon tu kuento kon reusho.
-      signed_out: Salites del kuento kon reusho.
+      already_signed_out: Salites del kuento kon reushita.
+      signed_in: Konektates kon tu kuento kon reushita.
+      signed_out: Salites del kuento kon reushita.
     unlocks:
       send_instructions: En unos minutos risiviras una posta elektronika kon instruksyones para dezblokar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
       send_paranoid_instructions: Si tu kuento existe, en unos minutos risiviras una posta elektronika kon instruksyones para dezblokarlo. Por favor, reviza tu kuti de posta spam si no risives akeya posta elektronika.
-      unlocked: Tu kuento fue dezblokado kon reusho. Por favor, konektate kon tu kuento para kontinuar.
+      unlocked: Tu kuento fue dezblokado kon reushita. Por favor, konektate kon tu kuento para kontinuar.
   errors:
     messages:
       already_confirmed: ya estaba konfirmado, por favor aprova konektarte kon tu kuento
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 5429b217d0..ec5b852727 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -12,6 +12,7 @@ lt:
       last_attempt: Turi dar vieną bandymą, kol tavo paskyra bus užrakinta.
       locked: Tavo paskyra užrakinta.
       not_found_in_database: Netinkami %{authentication_keys} arba slaptažodis.
+      omniauth_user_creation_failure: Klaida kuriant šios tapatybės paskyrą.
       pending: Tavo paskyra vis dar peržiūrima.
       timeout: Tavo seansas baigėsi. Norėdamas (-a) tęsti, prisijunk dar kartą.
       unauthenticated: Prieš tęsdamas (-a) turi prisijungti arba užsiregistruoti.
@@ -47,16 +48,19 @@ lt:
         subject: 'Mastodon: slaptažodžio keitimo instrukcijos'
         title: Slaptažodžio keitimas
       two_factor_disabled:
-        explanation: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas. Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
+        explanation: Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
         subject: 'Mastodon: dviejų tapatybės patikrinimas išjungtas'
+        subtitle: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas.
         title: 2FA išjungta
       two_factor_enabled:
-        explanation: Tavo paskyrai įgalintas dvejų tapatybės patikrinimas. Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
-        subject: 'Mastodon: dviejų tapatybės patikrinimas įgalintas'
-        title: 2FA įgalinta
+        explanation: Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
+        subject: 'Mastodon: dviejų tapatybės patvirtinimas įjungtas'
+        subtitle: Tavo paskyrai įjungtas dviejų tapatybės patikrinimas.
+        title: 2FA įjungta
       two_factor_recovery_codes_changed:
         explanation: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
         subject: 'Mastodon: dviejų tapatybės atkūrimo kodai iš naujo sugeneruoti'
+        subtitle: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
         title: Pakeisti 2FA atkūrimo kodai
       unlock_instructions:
         subject: 'Mastodon: atrakinimo instrukcijos'
@@ -70,13 +74,15 @@ lt:
           subject: 'Mastodon: saugumo raktas ištrintas'
           title: Vienas iš tavo saugumo raktų buvo ištrintas
       webauthn_disabled:
-        explanation: Tavo paskyrai buvo išjungtas tapatybės nustatymas naudojant saugumo raktus. Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
+        explanation: Tavo paskyrai išjungtas tapatybės nustatymas naudojant saugumo raktus.
+        extra: Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
         subject: 'Mastodon: tapatybės nustatymas naudojant saugumo raktai išjungta'
         title: Saugumo raktai išjungti
       webauthn_enabled:
-        explanation: Saugumo rakto tapatybės nustatymas tavo paskyrai įgalintas. Dabar prisijungimui galima naudoti saugumo raktą.
-        subject: 'Mastodon: saugumo rakto tapatybės nustatymas įgalintas'
-        title: Saugumo raktai įgalinti
+        explanation: Tavo paskyrai įjungtas saugumo rakto tapatybės nustatymas.
+        extra: Tavo saugumo raktą dabar galima naudoti prisijungimui.
+        subject: 'Mastodon: saugumo rakto tapatybės nustatymas įjungtas'
+        title: Saugumo raktai įjungti
     omniauth_callbacks:
       failure: Nepavyko nustatyti tapatybės iš %{kind}, nes „%{reason}“.
       success: Sėkmingai nustatyta tapatybė iš %{kind} paskyros.
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index e61e1b7fd9..94b4774b60 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -6,12 +6,13 @@ lv:
       send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
     failure:
-      already_authenticated: Jau esi pierakstījies.
+      already_authenticated: Tu jau esi pieteicies.
       inactive: Tavs konts vēl nav aktivizēts.
       invalid: Nederīga %{authentication_keys} vai parole.
       last_attempt: Tev ir vēl viens mēģinājums, pirms tavs konts tiks bloķēts.
       locked: Tavs konts ir bloķēts.
       not_found_in_database: Nederīga %{authentication_keys} vai parole.
+      omniauth_user_creation_failure: Kļūda šīs identitātes konta izveidošanā.
       pending: Tavs konts joprojām tiek pārskatīts.
       timeout: Tava sesija ir beigusies. Lūdzu, pieraksties vēlreiz, lai turpinātu.
       unauthenticated: Lai turpinātu, tev ir jāpierakstās vai jāreģistrējas.
@@ -21,7 +22,7 @@ lv:
         action: Apstiprini savu e-pasta adresi
         action_with_app: Apstiprināt un atgriezties %{app}
         explanation: Ar šo e-pasta adresi esi izveidojis kontu vietnē %{host}. Tu esi viena klikšķa attālumā no tā aktivizēšanas. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pierakstīties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
+        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pieteikties, lai mainītu savu informāciju vai izdzēstu savu kontu, taču Tu nevari piekļūt lielākajai daļai iespēju, kamēr Tavs konts nav apstiprināts. Ja Tavs pieteikums tiks noraidīts, Tavi dati tiks noņemti, tāpēc Tev nebūs jāveic nekādas darbības. Ja tas nebiji Tu, lūgums neņemt vērā šo e-pasta ziņojumu.
         extra_html: Lūdzu, pārskati arī <a href="%{terms_path}">servera noteikumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumus</a>.
         subject: 'Mastodon: Apstiprināšanas norādījumi %{instance}'
         title: Apstiprini savu e-pasta adresi
@@ -37,7 +38,7 @@ lv:
         title: Parole nomainīta
       reconfirmation_instructions:
         explanation: Apstiprini jauno adresi, lai mainītu savu e-pastu.
-        extra: Ja šīs izmaiņas neesi veicis tu, lūdzu, ignorē šo e-pasta ziņojumu. Mastodon konta e-pasta adrese nemainīsies, kamēr nebūsi piekļuvis iepriekš norādītajai saitei.
+        extra: Ja šīs izmaiņas neveici Tu, lūgums neņemt vērā šo e-pasta ziņojumu. Mastodon konta e-pasta adrese netiks mainīta, līdz Tu izmantosi augstāk esošo saiti.
         subject: 'Mastodon: Apstiprini e-pastu %{instance}'
         title: Apstiprini e-pasta adresi
       reset_password_instructions:
@@ -47,16 +48,19 @@ lv:
         subject: 'Mastodon: Norādījumi paroles atiestatīšanai'
         title: Paroles atiestatīšana
       two_factor_disabled:
-        explanation: Tavam kontam divfaktoru autentifikācija ir atspējota. Pieteikšanās tagad ir iespējama, izmantojot tikai e-pasta adresi un paroli.
+        explanation: Pieteikšanās tagad ir iespējama izmantojot tikai e-pasta adresi un paroli.
         subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
+        subtitle: Tavam kontam tika atspējota divpakāpju autentifikācija.
         title: 2FA atspējota
       two_factor_enabled:
-        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams kods, ko ģenerējusi pārī savienotā TOTP lietotne.
+        explanation: Būs nepieciešams TOTP lietotnes izveidots kods, lai pieteiktos.
         subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
+        subtitle: Tavam kontam tika iespējota divpakāpju autentifikācija.
         title: 2FA iespējota
       two_factor_recovery_codes_changed:
         explanation: Iepriekšējie atkopšanas kodi ir atzīti par nederīgiem un ģenerēti jauni.
         subject: 'Mastodon: Divfaktoru atkopšanas kodi pārģenerēti'
+        subtitle: Iepriekšējie atkopšanas kodi tika padarīti par nederīgiem, un tika izveidoti jauni.
         title: 2FA atkopšanas kodi mainīti
       unlock_instructions:
         subject: 'Mastodon: Norādījumi atbloķēšanai'
@@ -70,11 +74,13 @@ lv:
           subject: 'Mastodon: Drošības atslēga izdzēsta'
           title: Viena no tavām drošības atslēgām tika izdzēsta
       webauthn_disabled:
-        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai kodu, ko ģenerējusi pārī savienotā TOTP lietotne.
+        explanation: Tavam kontam tika atspējota autentifikācija ar drošības atslēgām.
+        extra: Pieteikšanās tagad ir iespējama izmantojot tikai TOTP lietotnes izveidotu kodu.
         subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
         title: Drošības atslēgas atspējotas
       webauthn_enabled:
-        explanation: Tavam kontam ir iespējota drošības atslēgas autentifikācija. Tavu drošības atslēgu tagad var izmantot, lai pieteiktos.
+        explanation: Tavam kontam tika iespējota drošības atslēgas autentifikācija.
+        extra: Drošības atslēgu tagad var izmantot, lai pieteiktos.
         subject: 'Mastodon: Drošības atslēgas autentifikācija iespējota'
         title: Drošības atslēgas iespējotas
     omniauth_callbacks:
@@ -84,7 +90,7 @@ lv:
       no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL.
       send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      updated: Tava parole ir veiksmīgi nomainīta. Tagad tu esi pierakstījies.
+      updated: Tava parole tika veiksmīgi nomainīta. Tu tagad esi pieteicies.
       updated_not_active: Tava parole ir veiksmīgi nomainīta.
     registrations:
       destroyed: Visu labu! Tavs konts ir veiksmīgi atcelts. Mēs ceram tevi drīz atkal redzēt.
@@ -97,7 +103,7 @@ lv:
       updated: Tavs konts ir veiksmīgi atjaunināts.
     sessions:
       already_signed_out: Veiksmīgi izrakstījies.
-      signed_in: Veiksmīgi pierakstījies.
+      signed_in: Veiksmīgi pieteicies.
       signed_out: Veiksmīgi izrakstījies.
     unlocks:
       send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index 30eceb239d..da18d1896e 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -47,11 +47,9 @@ ms:
         subject: 'Mastodon: Arahan set semula kata laluan'
         title: Set semula kata laluan
       two_factor_disabled:
-        explanation: Pengesahan dwifaktor untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan alamat e-mel dan kata laluan.
         subject: 'Mastodon: Pengesahan dwifaktor dilumpuhkan'
         title: 2FA dinyahaktifkan
       two_factor_enabled:
-        explanation: Pengesahan dwifaktor untuk akaun anda telah didayakan. Satu token yang dijanakan oleh aplikasi TOTP diperlukan untuk melog masuk.
         subject: 'Mastodon: Pengesahan dwifaktor didayakan'
         title: 2FA diaktifkan
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ms:
           subject: 'Mastodon: Kunci keselamatan dihapuskan'
           title: Salah satu daripada kunci keselamatan anda telah dihapuskan
       webauthn_disabled:
-        explanation: Pengesahan dengan kunci keselamatan untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan token yang dijanakan oleh aplikasi TOTP.
         subject: 'Mastodon: Pengesahan dengan kunci keselamatan dilumpuhkan'
         title: Kunci keselamatan dilumpuhkan
       webauthn_enabled:
-        explanation: Pengesahan kunci keselamatan untuk akaun anda kini didayakan. Kunci keselamatan anda kini boleh digunakan untuk melog masuk.
         subject: 'Mastodon: Pengesahan kunci keselamatan didayakan'
         title: Kunci keselamatan didayakan
     omniauth_callbacks:
diff --git a/config/locales/devise.my.yml b/config/locales/devise.my.yml
index 04d744cf2b..126ecd7404 100644
--- a/config/locales/devise.my.yml
+++ b/config/locales/devise.my.yml
@@ -47,11 +47,9 @@ my:
         subject: 'Mastodon: စကားဝှက်ညွှန်ကြားချက် ပြန်လည်သတ်မှတ်မည်'
         title: စကားဝှက်ပြန်လည်သတ်မှတ်မည်
       two_factor_disabled:
-        explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ အီးမေးလ်လိပ်စာနှင့် စကားဝှက်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
         subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်'
         title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်
       two_factor_enabled:
-        explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ဖွင့်ထားသည်။ TOTP အက်ပ်မှ ထုတ်ပေးသည့် တိုကင်တစ်ခုမှာ အကောင့်ဝင်ရန်အတွက် လိုအပ်ပါသည်။
         subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်'
         title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ my:
           subject: 'Mastodon: လုံခြုံရေးသော့ချက် ဖျက်လိုက်ပါပြီ'
           title: လုံခြုံရေးသော့ချက်များထဲမှတစ်ခု ဖျက်လိုက်ပါပြီ
       webauthn_disabled:
-        explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီးများဖြင့် အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ TOTP အက်ပ်မှထုတ်ပေးသည့် တိုကင်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
         subject: Mastodon - လုံခြုံရေးကီးများဖြင့် အထောက်အထားစိစစ်ခြင်းကို ပိတ်ထားသည်
         title: လုံခြုံရေးသော့ချက်များ ပိတ်ပြီးပါပြီ
       webauthn_enabled:
-        explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်။ အကောင့်ဝင်ရန်အတွက် သင်၏လုံခြုံရေးကီးကို ယခုအသုံးပြုနိုင်ပါပြီ။
         subject: Mastodon - လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်
         title: လုံခြုံရေးသော့ချက်များ ဖွင့်ပြီးပါပြီ
     omniauth_callbacks:
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 1b5081fe8c..ab6ae84db4 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -12,6 +12,7 @@ nl:
       last_attempt: Je hebt nog één poging over voordat jouw account wordt opgeschort.
       locked: Jouw account is opgeschort.
       not_found_in_database: "%{authentication_keys} of wachtwoord ongeldig."
+      omniauth_user_creation_failure: Fout bij het aanmaken van een account voor deze identiteit.
       pending: Jouw account moet nog steeds worden beoordeeld.
       timeout: Jouw sessie is verlopen, log opnieuw in.
       unauthenticated: Je dient in te loggen of te registreren.
@@ -47,16 +48,19 @@ nl:
         subject: 'Mastodon: Wachtwoord opnieuw instellen'
         title: Wachtwoord opnieuw instellen
       two_factor_disabled:
-        explanation: Tweestapsverificatie voor jouw account is uitgeschakeld. Je kunt nu alleen inloggen met een e-mailadres en wachtwoord.
+        explanation: Je kunt nu inloggen met alleen een e-mailadres en wachtwoord.
         subject: 'Mastodon: Tweestapsverificatie uitgeschakeld'
+        subtitle: Tweestapsverificatie voor je account is uitgeschakeld.
         title: Tweestapsverificatie uitgeschakeld
       two_factor_enabled:
-        explanation: Tweestapsverificatie voor jouw account is ingeschakeld. Om te kunnen inloggen is een door een tweestapsverificatie-app genereerde toegangscode nodig.
+        explanation: Je hebt een door de authenticatie-app gegeneerde toegangscode nodig om in te loggen.
         subject: 'Mastodon: Tweestapsverificatie ingeschakeld'
+        subtitle: Tweestapsverificatie voor je account is ingeschakeld.
         title: Tweestapsverificatie ingeschakeld
       two_factor_recovery_codes_changed:
         explanation: De vorige herstelcodes zijn ongeldig gemaakt en nieuwe zijn aangemaakt.
         subject: 'Mastodon: Tweestaps-herstelcodes zijn opnieuw aangemaakt'
+        subtitle: De vorige herstelcodes zijn ongeldig gemaakt en er zijn nieuwe gegenereerd.
         title: Herstelcodes tweestapsverificatie veranderd
       unlock_instructions:
         subject: 'Mastodon: Instructies om opschorten account ongedaan te maken'
@@ -70,11 +74,13 @@ nl:
           subject: 'Mastodon: Beveiligingssleutel verwijderd'
           title: Een van jouw beveiligingssleutels is verwijderd
       webauthn_disabled:
-        explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor jouw account. Inloggen is nu alleen mogelijk met het gebruik van een door een gepaarde TOTP-app genereerde sleutel.
+        explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor je account.
+        extra: Het is nu alleen mogelijk om in te loggen met een door de authenticatie-app gegeneerde toegangscode.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
         title: Beveiligingssleutels uitgeschakeld
       webauthn_enabled:
-        explanation: Verificatie met beveiligingssleutels is ingeschakeld voor jouw account. Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
+        explanation: Verificatie met beveiligingssleutels is ingeschakeld voor je account.
+        extra: Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is ingeschakeld'
         title: Beveiligingssleutels ingeschakeld
     omniauth_callbacks:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index eee9928475..e9e8e1f6e0 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -12,6 +12,7 @@ nn:
       last_attempt: Du har eitt forsøk igjen før kontoen din vert låst.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
+      omniauth_user_creation_failure: Greidde ikkje laga konto for denne identiteten.
       pending: Kontoen din er vert gjennomgått enno.
       timeout: Økta di er utgått. Logg inn omatt for å halde fram.
       unauthenticated: Du må logge inn eller registere deg før du kan halde fram.
@@ -47,34 +48,39 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
-        explanation: To-faktor-autentisering har vorte slått av for kontoen din. Det går no an logge inn med berre e-postadresse og passord.
+        explanation: No kan du logga inn med berre epostadresse og passord.
         subject: 'Mastodon: To-faktor-autentisering deaktivert'
+        subtitle: Tofaktorinnlogging for denne kontoen er skrudd av.
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: To-faktor-autentisering har vorte slått på for kontoen din. Ein kode frå den samankopla TOTP-appen er kravd for å logge inn.
+        explanation: Du treng ein kode frå den tilkopla tofaktor-appen din for å logga inn.
         subject: 'Mastodon: To-faktor-autentisering aktivert'
+        subtitle: Tofaktorpålogging er skrudd på for kontoen din.
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
         explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
         subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
+        subtitle: Dei førre innloggingskodane er ikkje gyldige lenger, og nye kodar er laga.
         title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
         subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
       webauthn_credential:
         added:
-          explanation: Følgende sikkerhetsnøkkel har blitt lagt til i kontoen din
+          explanation: Denne tryggingsnykjelen er lagt til kontoen din
           subject: 'Mastodon: Ny sikkerheitsnøkkel'
           title: Ein ny sikkerheitsnøkkel har blitt lagt til
         deleted:
-          explanation: Den følgande sikkerheitsnøkkelen har blitt sletta frå kontoen din
+          explanation: Denne tryggingsnykjelen er sletta frå kontoen din
           subject: 'Mastodon: Sikkerheitsnøkkel sletta'
           title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
-        explanation: Du kan ikkje bruke tryggleiksnyklar til å logga inn på kontoen din. Du kan berre logga inn med koden frå tofaktor-appen som er kopla saman med brukarkontoen din.
+        explanation: Innlogging med tryggingsnykjel er skrudd av for kontoen din.
+        extra: No kan du logga inn med berre kodane som er laga av den tilkopla tofaktor-appen din.
         subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
         title: Sikkerheitsnøklar deaktivert
       webauthn_enabled:
-        explanation: Pålogging med tryggleiksnyklar er skrudd på. No kan du bruka nykelen din for å logga på.
+        explanation: Innlogging med tryggingsnyklar er skrudd på for kontoen din.
+        extra: No kan du bruka tryggingsnykjelen din for å logga inn.
         subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
         title: Sikkerheitsnøklar aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index a5d6cad7a1..2cd433c6e0 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -12,6 +12,7 @@
       last_attempt: Du har ett forsøk igjen før kontoen din låses.
       locked: Kontoen din er låst.
       not_found_in_database: Ugyldig %{authentication_keys} eller passord.
+      omniauth_user_creation_failure: Feil ved opprettelse av konto for denne identiteten.
       pending: Kontoen din er fortsatt under gjennomgang.
       timeout: Økten din har utløpt. Logg inn igjen for å fortsette.
       unauthenticated: Du må logge inn eller registrere deg før du kan fortsette.
@@ -47,16 +48,19 @@
         subject: 'Mastodon: Hvordan nullstille passord'
         title: Nullstill passord
       two_factor_disabled:
-        explanation: Tofaktorautentisering for kontoen din har blitt skrudd av. Pålogging er nå mulig ved å bruke kun e-postadresse og passord.
+        explanation: Innlogging er nå mulig med kun e-postadresse og passord.
         subject: 'Mastodon: Tofaktorautentisering deaktivert'
+        subtitle: To-faktor autentisering for din konto har blitt deaktivert.
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: Tofaktorautentisering er aktivert for kontoen din. Et token som er generert av appen for tidsbasert engangspassord (TOTP) som er koblet til kontoen kreves for innlogging.
+        explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
         subject: 'Mastodon: Tofaktorautentisering aktivert'
+        subtitle: Tofaktorautentisering er aktivert for din konto.
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
         explanation: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
         subject: 'Mastodon: Tofaktor-gjenopprettingskoder har blitt generert på nytt'
+        subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
         title: 2FA-gjenopprettingskodene ble endret
       unlock_instructions:
         subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
@@ -70,11 +74,13 @@
           subject: 'Mastodon: Sikkerhetsnøkkel slettet'
           title: En av sikkerhetsnøklene dine har blitt slettet
       webauthn_disabled:
-        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din. Innlogging er nå mulig ved hjelp av kun et token som er generert av engangspassord-appen som er koblet til kontoen.
+        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
+        extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
         subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
         title: Sikkerhetsnøkler deaktivert
       webauthn_enabled:
-        explanation: Sikkerhetsnøkkel-autentisering er aktivert for din konto. Din sikkerhetsnøkkel kan nå brukes til innlogging.
+        explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
+        extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
         subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
         title: Sikkerhetsnøkler aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 16419cd1e3..2640777e00 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -47,11 +47,9 @@ oc:
         subject: Mastodon : consignas per reïnicializar lo senhal
         title: Reïnicializacion del senhal
       two_factor_disabled:
-        explanation: L’autentificacion dos factors per vòstre compte es estada desactivada. La connexion es ara possibla solament amb l’adreça electronica e lo senhal.
         subject: 'Mastodon : autentificacion dos factors desactivada'
         title: 2FA desactivat
       two_factor_enabled:
-        explanation: L’autentificacion dos factors es estada activada per vòstre compte. La connexion demandarà un geton generat per l’aplicacion TOTP associada.
         subject: 'Mastodon : autentificacion dos factor activada'
         title: 2FA activat
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ oc:
           subject: 'Mastodon : clau de seguretat suprimida'
           title: Una de vòstras claus de seguretats es estada suprimida
       webauthn_disabled:
-        explanation: L’autentificacion amb de claus de seguretat foguèt estada desactivada per vòstre compte. L’identificacion es ara possible en utilizan un geton generat per una aplicacion TOTP associada.
         subject: 'Mastodon : autentificacion amb claus de seguretat desactivada'
         title: Claus de seguretat desactivadas
       webauthn_enabled:
-        explanation: L’autentificacion amb de claus de seguretat foguèt estada activada per vòstre compte. Vòstra clau de seguretat pòt ara èsser utilizada per l’identificacion.
         subject: 'Mastodon : autentificacion via clau de seguretat activada'
         title: Claus de seguretat activadas
     omniauth_callbacks:
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index ff086888f3..f34fd04633 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -12,6 +12,7 @@ pl:
       last_attempt: Masz jeszcze jedną próbę; Twoje konto zostanie zablokowane jeśli się nie powiedzie.
       locked: Twoje konto zostało zablokowane.
       not_found_in_database: Nieprawidłowy %{authentication_keys} lub hasło.
+      omniauth_user_creation_failure: Błąd przy tworzeniu konta dla tej tożsamości.
       pending: Twoje konto oczekuje na przegląd.
       timeout: Twoja sesja wygasła. Zaloguj się ponownie, aby kontynuować..
       unauthenticated: Zapisz się lub zaloguj, aby kontynuować.
@@ -47,16 +48,19 @@ pl:
         subject: 'Mastodon: Instrukcje ustawienia nowego hasła'
         title: Przywracanie hasła
       two_factor_disabled:
-        explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało wyłączone. Możesz się teraz logować korzystając z samego adresu e-mail i hasła.
+        explanation: Logowanie teraz możliwe tylko adresem mejlowym i hasłem.
         subject: Mastodon – wyłączono uwierzytelnianie dwustopniowe
+        subtitle: Wyłączono uwierzytelnienie dwuskładnikowe dla twojego konta.
         title: Wyłączono 2FA
       two_factor_enabled:
-        explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało włączone. Logując się, będziesz potrzebować tokenu z połączonej aplikacji TOTP.
+        explanation: Do zalogowanie potrzebny będzie token sparowanej aplikacji TOTP.
         subject: Mastodon – włączono uwierzytelnianie dwustopniowe
+        subtitle: Włączono uwierzytelnienie dwuskładnikowe dla twojego konta.
         title: Włączono 2FA
       two_factor_recovery_codes_changed:
         explanation: Poprzednie kody zapasowe zostały unieważnione, a nowe zostały wygenerowane.
         subject: Mastodon – wygenerowano nowe kody ratunkowe 2FA
+        subtitle: Unieważniono stare kody przywracania i wygenerowano nowe.
         title: Zmieniono kody odzyskiwania 2FA
       unlock_instructions:
         subject: 'Mastodon: Instrukcje odblokowania konta'
@@ -70,11 +74,13 @@ pl:
           subject: 'Mastodon: Klucz bezpieczeństwa usunięty'
           title: Usunięto jeden z twoich kluczy bezpieczeństwa
       webauthn_disabled:
-        explanation: Uwierzytelnianie kluczem bezpieczeństwa zostało wyłączone dla Twojego konta. Logowanie jest teraz możliwe tylko przy użyciu tokenu generowanego przez sparowaną aplikację TOTP.
+        explanation: Wyłączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+        extra: Logowanie teraz możliwe tylko tokenem wygenerowanym przez sparowaną aplikację TOTP.
         subject: 'Mastodon: Wyłączono uwierzytelnianie z kluczami bezpieczeństwa'
         title: Wyłączono klucze bezpieczeństwa
       webauthn_enabled:
-        explanation: Uwierzytelnianie klucza bezpieczeństwa zostało włączone dla Twojego konta. Klucz bezpieczeństwa może być teraz wykorzystywany do logowania.
+        explanation: Włączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+        extra: Twój klucz bezpieczeństwa może być teraz użyty do logowania.
         subject: 'Mastodon: Włączono uwierzytelnianie z kluczami bezpieczeństwa'
         title: Włączono klucze bezpieczeństwa
     omniauth_callbacks:
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 6345a103b8..4a7f346fab 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -12,6 +12,7 @@ pt-BR:
       last_attempt: Você tem mais uma tentativa antes de sua conta ser bloqueada.
       locked: Sua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou senha inválida."
+      omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: Sua conta está sendo revisada.
       timeout: Sua sessão expirou. Por favor, entre novamente para continuar.
       unauthenticated: Você precisa entrar ou criar uma conta antes de continuar.
@@ -47,16 +48,19 @@ pt-BR:
         subject: 'Mastodon: Instruções para alterar senha'
         title: Redefinir senha
       two_factor_disabled:
-        explanation: A autenticação de dois fatores para sua conta foi desativada. Agora é possível entrar apenas com seu endereço de e-mail e senha.
+        explanation: O ‘login’ agora é possível usando apenas o endereço de e-mail e senha.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
+        subtitle: A autenticação de dois fatores foi desativada.
         title: 2FA desativada
       two_factor_enabled:
-        explanation: A autenticação de dois fatores foi ativada para sua conta. Um código gerado no aplicativo TOTP pareado será necessário para entrar.
+        explanation: Será necessário um código gerado pelo aplicativo de autenticação para fazer login.
         subject: 'Mastodon: Autenticação de dois fatores ativada'
+        subtitle: A autenticação de dois fatores foi ativada para sua conta.
         title: 2FA ativada
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos códigos foram gerados.
         subject: 'Mastodon: Novos códigos de recuperação de dois fatores'
+        subtitle: Os códigos de recuperação anteriores foram invalidados, e novos códigos foram gerados.
         title: Códigos de recuperação de dois fatores alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções de desbloqueio'
@@ -70,11 +74,13 @@ pt-BR:
           subject: 'Mastodon: Chave de segurança excluída'
           title: Uma das suas chaves de segurança foi excluída
       webauthn_disabled:
-        explanation: A autenticação por chaves de segurança foi desativada para a sua conta. Agora é possível entrar apenas com seu código gerado no aplicativo TOTP pareado.
+        explanation: A autenticação por chaves de segurança foi desativada para sua conta.
+        extra: O login agora é possível usando o código gerado por um aplicativo de autenticação de dois fatores.
         subject: 'Mastodon: Autenticação por chaves de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: A autenticação por chave de segurança foi ativada para a sua conta. Sua chave de segurança agora pode ser usada para entrar.
+        explanation: Autenticação por chave de segurança foi ativada para sua conta.
+        extra: Sua chave de segurança agora pode ser usada para ‘login’.
         subject: 'Mastodon: Autenticação por chaves de segurança ativada'
         title: Chaves de segurança ativadas
     omniauth_callbacks:
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 0571598ae0..c66181fc5b 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -12,6 +12,7 @@ pt-PT:
       last_attempt: Tem só mais uma tentativa antes da sua conta ser bloqueada.
       locked: A tua conta está bloqueada.
       not_found_in_database: "%{authentication_keys} ou palavra-passe inválida."
+      omniauth_user_creation_failure: Erro ao criar uma conta para esta identidade.
       pending: A sua conta está ainda a aguardar revisão.
       timeout: A tua sessão expirou. Por favor, entra de novo para continuares.
       unauthenticated: Precisas de entrar na tua conta ou de te registares antes de continuar.
@@ -47,16 +48,19 @@ pt-PT:
         subject: 'Mastodon: Instruções para redefinir a palavra-passe'
         title: Solicitar nova palavra-passe
       two_factor_disabled:
-        explanation: A autenticação em duas etapas para a sua conta foi desativada. É agora possível aceder apenas com o seu endereço de e-mail e palavra-passe.
+        explanation: O acesso agora é possível usando apenas o endereço de correio eletrónico e palavra-passe.
         subject: 'Mastodon: Autenticação de duas etapas desativada'
+        subtitle: A autenticação de dois fatores foi desativada para a sua conta.
         title: 2FA desativado
       two_factor_enabled:
-        explanation: A autenticação em duas etapas foi ativada para a sua conta. Um token, gerado pela aplicação TOTP emparelhada, será necessário para aceder.
+        explanation: Um token gerado pelo aplicativo TOTP emparelhado será necessário para login.
         subject: 'Mastodon: Autenticação em duas etapas ativada'
+        subtitle: A autenticação de dois fatores foi habilitada para sua conta.
         title: 2FA ativado
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
         subject: 'Mastodon: Gerados novos códigos de recuperação em duas etapas'
+        subtitle: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
         title: Códigos de recuperação 2FA alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções para desbloquear a tua conta'
@@ -70,11 +74,13 @@ pt-PT:
           subject: 'Mastodon: Chave de segurança eliminada'
           title: Uma das suas chaves de segurança foi eliminada
       webauthn_disabled:
-        explanation: A autenticação com chave de segurança foi desativada para a sua conta. Tornou-se possível aceder à sua conta usando apenas o token gerado pela aplicação TOTP emparelhada.
+        explanation: A autenticação com chaves de segurança foi desativada para sua conta.
+        extra: O login agora é possível usando apenas o token gerado pelo aplicativo TOTP emparelhado.
         subject: 'Mastodon: Autenticação com chave de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: A autenticação com chave de segurança foi ativada para sua conta. A sua chave de segurança pode agora ser utilizada para aceder à sua conta.
+        explanation: A autenticação da chave de segurança foi habilitada para sua conta.
+        extra: Sua chave de segurança agora pode ser usada para login.
         subject: 'Mastodon: Autenticação com chave de segurança ativada'
         title: Chaves de segurança ativadas
     omniauth_callbacks:
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index d25d0f6b3e..868bb4b3a1 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -47,16 +47,19 @@ ro:
         subject: Instrucțiuni pentru resetarea parolei
         title: Resetare parolă
       two_factor_disabled:
-        explanation: Autentificarea în doi pași pentru contul tău a fost dezactivată. Autentificarea este posibilă acum folosind doar adresa de e-mail și parola.
+        explanation: Conectarea este acum posibilă folosind doar adresa de e-mail și parola.
         subject: Autentificare cu doi factori dezactivată
+        subtitle: Autentificarea cu doi factori pentru contul dvs. a fost dezactivată.
         title: 2FA dezactivat
       two_factor_enabled:
-        explanation: Autentificarea în doi pași a fost activată pentru contul dvs. Un token generat de aplicația TOTP împerecheată va fi necesar pentru autentificare.
+        explanation: Pentru autentificare va fi necesar un token generat de aplicația TOTP asociată.
         subject: Autentificare în doi pași activată
+        subtitle: Autentificarea cu doi factori a fost activată pentru contul dvs.
         title: 2FA activat
       two_factor_recovery_codes_changed:
         explanation: Codurile anterioare de recuperare au fost invalidate și unele noi generate.
         subject: Recuperare în doi factori
+        subtitle: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
         title: Coduri de recuperare 2FA modificate
       unlock_instructions:
         subject: Instrucțiuni de deblocare
@@ -70,11 +73,13 @@ ro:
           subject: 'Mastodon: Cheie de securitate ștearsă'
           title: Una dintre cheile tale de securitate a fost ștearsă
       webauthn_disabled:
-        explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul tău. Conectarea este posibilă acum folosind doar token-ul generat de aplicația TOTP.
+        explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul dvs.
+        extra: Conectarea este acum posibilă folosind doar token-ul generat de aplicația TOTP asociată.
         subject: 'Mastodon: Autentificarea cu chei de securitate dezactivată'
         title: Chei de securitate dezactivate
       webauthn_enabled:
-        explanation: Autentificarea cheii de securitate a fost activată pentru contul tău. Cheia ta de securitate poate fi acum folosită pentru conectare.
+        explanation: Autentificarea cu cheie de securitate a fost activată pentru contul dvs.
+        extra: Cheia ta de securitate poate fi acum folosită pentru conectare.
         subject: 'Mastodon: Autentificarea cheii de securitate activată'
         title: Chei de securitate activate
     omniauth_callbacks:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index d2903ce23d..9dd418f2cd 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -47,16 +47,19 @@ ru:
         subject: 'Mastodon: Инструкция по сбросу пароля'
         title: Сброс пароля
       two_factor_disabled:
-        explanation: Для вашей учётной записи была отключена двухфакторная авторизация. Выполнить вход теперь можно используя лишь e-mail и пароль.
+        explanation: Вход в систему теперь возможен только с использованием адреса электронной почты и пароля.
         subject: 'Mastodon: Двухфакторная авторизация отключена'
+        subtitle: Двухфакторная аутентификация для вашей учетной записи была отключена.
         title: 2ФА отключена
       two_factor_enabled:
-        explanation: Для вашей учётной записи была настроена двухфакторная авторизация. Отныне для входа потребуется также временный код из приложения-аутентификатора.
+        explanation: Для входа в систему потребуется токен, сгенерированный сопряженным приложением TOTP.
         subject: 'Mastodon: Настроена двухфакторная авторизация'
+        subtitle: Для вашей учетной записи была включена двухфакторная аутентификация.
         title: 2ФА включена
       two_factor_recovery_codes_changed:
         explanation: Предыдущие резервные коды были аннулированы и созданы новые.
         subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
+        subtitle: Предыдущие коды восстановления были аннулированы и сгенерированы новые.
         title: Коды восстановления 2FA изменены
       unlock_instructions:
         subject: 'Mastodon: Инструкция по разблокировке'
@@ -70,11 +73,13 @@ ru:
           subject: 'Мастодон: Ключ Безопасности удален'
           title: Один из ваших защитных ключей был удален
       webauthn_disabled:
-        explanation: Аутентификация с помощью ключей безопасности отключена для вашей учётной записи. Теперь вход возможен с использованием только токена, сгенерированного в приложении TOTP.
+        explanation: Аутентификация с помощью ключей безопасности была отключена для вашей учетной записи.
+        extra: Теперь вход в систему возможен только с использованием токена, сгенерированного сопряженным приложением TOTP.
         subject: 'Мастодон: Аутентификация с ключами безопасности отключена'
         title: Ключи безопасности отключены
       webauthn_enabled:
-        explanation: Для вашей учётной записи включена аутентификация по ключу безопасности. Теперь ваш ключ безопасности может быть использован для входа.
+        explanation: Для вашей учетной записи включена аутентификация по ключу безопасности.
+        extra: Теперь ваш ключ безопасности можно использовать для входа в систему.
         subject: 'Мастодон: Включена аутентификация по ключу безопасности'
         title: Ключи безопасности включены
     omniauth_callbacks:
diff --git a/config/locales/devise.sc.yml b/config/locales/devise.sc.yml
index 02bcab0d11..5486371a4c 100644
--- a/config/locales/devise.sc.yml
+++ b/config/locales/devise.sc.yml
@@ -47,11 +47,9 @@ sc:
         subject: 'Mastodon: Istrutziones pro resetare sa crae'
         title: Càmbiu de crae
       two_factor_disabled:
-        explanation: S'autenticatzione a duos fatores est istada disativada pro su contu tuo. Immoe podes intrare impreende isceti indiritzu de posta eletrònica e crae.
         subject: 'Mastodon: Autenticatzione a duos fatores disativada'
         title: 2FA disativada
       two_factor_enabled:
-        explanation: S'autenticatzione a duos fatores est istada ativada pro su contu tuo. Pro s'atzessu at èssere rechèdidu unu còdighe de autorizatzione generadu dae s'aplicatzione TOTP.
         subject: 'Mastodon: Autenticatzione a duos fatores ativada'
         title: 2FA ativada
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sc:
           subject: 'Mastodon: Crae de seguresa cantzellada'
           title: Una de is craes de seguresa tuas est istada cantzellada
       webauthn_disabled:
-        explanation: S'autenticatzione cun craes de seguresa est istada disabilitada pro su contu tuo. S'intrada immoe est possìbile impreende isceti su getone ingendradu dae s'aplicatzione TOTP ligada.
         subject: 'Mastodon: Autenticatzione cun craes de seguresa disabilitada'
         title: Craes de seguresa disabilitadas
       webauthn_enabled:
-        explanation: S'autenticatzione cun crae de seguresa est istada abilitada pro su contu tuo. Sa crae de seguresa tua immoe si podet impreare pro intrare.
         subject: 'Mastodon: Autenticatzione cun sa crae de seguresa ativada'
         title: Craes de seguresa abilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.sco.yml b/config/locales/devise.sco.yml
index 8563b4ee24..1db6bbe303 100644
--- a/config/locales/devise.sco.yml
+++ b/config/locales/devise.sco.yml
@@ -47,11 +47,9 @@ sco:
         subject: 'Mastodon: Reset passwird instructions'
         title: Passwird reset
       two_factor_disabled:
-        explanation: Twa factor authentication fir yer accoont haes been turnt aff. Login is noo possible uisin ainly a email address an passwird.
         subject: 'Mastodon: Twa-factor authentication turnt aff'
         title: 2FA turnt aff
       two_factor_enabled:
-        explanation: Twa-factor authentication haes been turnt on fir yer accoont. A token gien bi the pairt TOTP app wull be needit fir login.
         subject: 'Mastodon: Twa-factor authentication turnt on'
         title: 2FA turnt on
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sco:
           subject: 'Mastodon: Security key deletit'
           title: Ane o yer security keys haes been deletit
       webauthn_disabled:
-        explanation: Authentication wi security keys haes been turnt aff on yer accoont. Login is noo possible uisin ainly the token generatit bi the pairt TOTP app.
         subject: 'Mastodon: Authentication wi security keys turnt aff'
         title: Security keys turnt aff
       webauthn_enabled:
-        explanation: Security key authentication haes been turnt on fir yer accoont. Yer security key kin noo be uised fir login.
         subject: 'Mastodon: Security key authentication turnt on'
         title: Security keys turnt on
     omniauth_callbacks:
diff --git a/config/locales/devise.si.yml b/config/locales/devise.si.yml
index 362f97b8a9..d0bfa719bc 100644
--- a/config/locales/devise.si.yml
+++ b/config/locales/devise.si.yml
@@ -44,10 +44,8 @@ si:
         subject: 'මාස්ටඩන්: මුරපදය යළි සැකසීමේ උපදෙස්'
         title: මුරපදය යළි සැකසීම
       two_factor_disabled:
-        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය අබල කර ඇත. විද්‍යුත් තැපැල් ලිපිනය සහ මුරපදය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
         title: ද්විපියවර අබලයි
       two_factor_enabled:
-        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය සක්‍රීය කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනයක් පුරනය වීමට අවශ්‍ය වනු ඇත.
         title: ද්විපියවර සබලයි
       two_factor_recovery_codes_changed:
         explanation: පෙර ප්‍රතිසාධන කේත අවලංගු කර නව ඒවා උත්පාදනය කර ඇත.
@@ -65,10 +63,8 @@ si:
           subject: 'මාස්ටඩන්: ආරක්‍ෂණ යතුර මකා ඇත'
           title: ඔබගේ ආරක්ෂක යතුරු වලින් එකක් මකා ඇත
       webauthn_disabled:
-        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සමඟ සත්‍යාපනය අබල කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
         title: ආරක්‍ෂණ යතුරු අබල කර ඇත
       webauthn_enabled:
-        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සත්‍යාපනය සක්‍රීය කර ඇත. ඔබගේ ආරක්ෂක යතුර දැන් පුරනය වීම සඳහා භාවිතා කළ හැක.
         title: ආරක්‍ෂණ යතුරු සබල කර ඇත
     omniauth_callbacks:
       failure: '"%{reason}" නිසා %{kind} සිට ඔබව සත්‍යාපනය කළ නොහැක.'
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index e11c7f1db3..b36416b317 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -2,62 +2,66 @@
 sk:
   devise:
     confirmations:
-      confirmed: Tvoja emailová adresa bola úspešne overená.
-      send_instructions: O niekoľko minút obdržíš email s pokynmi ako potvrdiť svoj účet. Prosím, skontroluj si aj zložku spam, ak sa k tebe toto potvrdenie nedostalo.
-      send_paranoid_instructions: Ak sa tvoja emailová adresa nachádza v našej databázi, o niekoľko minút obdržíš email s pokynmi ako potvrdiť svoj účet. Prosím, skontroluj aj zložku spam, ak sa k tebe toto potvrdenie nedostalo.
+      confirmed: Vaša e-mailová adresa bola úspešne potvrdená.
+      send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      send_paranoid_instructions: Ak sa vaša e-mailová adresa nachádza v našej databáze, o niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte aj zložku spam, ste tento e-mail nedostali.
     failure:
-      already_authenticated: Už si prihlásený/á.
-      inactive: Tvoj účet ešte nebol potvrdený.
-      invalid: Nesprávny %{authentication_keys}, alebo heslo.
-      last_attempt: Máš posledný pokus pred zamknutím tvojho účtu.
-      locked: Tvoj účet je zamknutý.
-      not_found_in_database: Nesprávny %{authentication_keys}, alebo heslo.
-      pending: Tvoj účet je stále prehodnocovaný.
-      timeout: Tvoja aktívna sezóna vypršala. Pre pokračovanie sa prosím prihlás znovu.
-      unauthenticated: K pokračovaniu sa musíš zaregistrovať alebo prihlásiť.
-      unconfirmed: Pred pokračovaním musíš potvrdiť svoj email.
+      already_authenticated: Už ste sa prihlásili.
+      inactive: Váš účet ešte nie je aktivovaný.
+      invalid: Nesprávny %{authentication_keys} alebo heslo.
+      last_attempt: Máte posledný pokus, potom bude váš účet uzamknutý.
+      locked: Váš účet bol uzamknutý.
+      not_found_in_database: Nesprávny %{authentication_keys} alebo heslo.
+      omniauth_user_creation_failure: Chyba pri vytváraní účtu pre túto identitu.
+      pending: Váš účet stále kontrolujeme.
+      timeout: Vaše aktívne prihlásenie vypršalo. Pre pokračovanie sa, prosím, prihláste znovu.
+      unauthenticated: Pred pokračovaním sa musíte prihlásiť alebo zaregistrovať.
+      unconfirmed: Pred pokračovaním musíte potvrdiť svoj e-mail.
     mailer:
       confirmation_instructions:
-        action: Potvrď emailovú adresu
-        action_with_app: Potvrď a vráť sa na %{app}
-        explanation: S touto emailovou adresou si si vytvoril/a účet na %{host}. Si iba jeden klik od jeho aktivácie. Pokiaľ si to ale nebol/a ty, prosím ignoruj tento email.
+        action: Overiť e-mailovú adresu
+        action_with_app: Potvrdiť a vrátiť sa do %{app}
+        explanation: S touto e-mailovou adresou ste si vytvorili účet na %{host}. Od aktivácie vás delí jediné kliknutie. Ak ste to neboli vy, tento e-mail ignorujte.
         explanation_when_pending: S touto e-mailovou adresou ste požiadali o pozvánku na %{host}. Po potvrdení vašej e-mailovej adresy vašu žiadosť skontrolujeme. Môžete sa prihlásiť, aby ste zmenili svoje údaje alebo vymazali svoje konto, ale kým nebude vaše konto schválené, nebudete mať prístup k väčšine funkcií. Ak bude vaša žiadosť zamietnutá, vaše údaje budú odstránené, takže sa od vás nebudú vyžadovať žiadne ďalšie kroky. Ak ste to neboli vy, tento e-mail ignorujte.
-        extra_html: Prosím, pozri sa aj na <a href="%{terms_path}"> pravidlá tohto servera,</a> a <a href="%{policy_path}"> naše užívaťeľské podiemky</a>.
+        extra_html: Prosím, pozrite sa aj na <a href="%{terms_path}"> pravidlá tohto servera</a> a <a href="%{policy_path}">naše pravidlá používania</a>.
         subject: 'Mastodon: Potvrdzovacie pokyny pre %{instance}'
-        title: Potvrď emailovú adresu
+        title: Overte svoj e-mail
       email_changed:
-        explanation: 'Emailová adresa tvojho účtu bude zmenená na:'
-        extra: Ak si nezmenil/a svoj email, je pravdepodobné, že niekto iný získal prístup k tvojmu účtu. Naliehavo preto prosím zmeň svoje heslo, alebo kontaktuj administrátora tohto serveru, pokiaľ si vymknutý/á zo svojho účtu.
-        subject: 'Mastodon: Emailová adresa bola zmenená'
-        title: Nová emailová adresa
+        explanation: 'E-mailová adresa vášho účtu bude zmenená na:'
+        extra: Ak ste svoj e-mail nezmenili vy, je pravdepodobné, že niekto iný získal prístup k vášmu účtu. Čo najskôr zmeňte svoje heslo alebo, pokiaľ sa neviete prihlásiť, kontaktujte administrátora serveru.
+        subject: 'Mastodon: E-mailová adresa bola zmenená'
+        title: Nová e-mailová adresa
       password_change:
-        explanation: Heslo k tvojmu účtu bolo zmenené.
-        extra: Ak si heslo nezmenil/a, je pravdepodobné, že niekto iný získal prístup k tvojmu účtu. Naliehavo preto prosím zmeň svoje heslo, alebo kontaktuj administrátora tohto serveru, pokiaľ si vymknutý/á zo svojho účtu.
+        explanation: Heslo k vášmu účtu bolo zmenené.
+        extra: Ak ste si heslo nezmenili vy, je pravdepodobné, že niekto iný získal prístup k vášmu účtu. Čo najskôr zmeňte svoje heslo alebo, pokiaľ sa neviete prihlásiť, kontaktujte administrátora serveru.
         subject: 'Mastodon: Heslo bolo zmenené'
         title: Heslo bolo zmenené
       reconfirmation_instructions:
-        explanation: Potvrď novú emailovú adresu na ktorú chceš zmeniť svoj email.
-        extra: Pokiaľ si túto akciu nevyžiadal/a, prosím ignoruj tento email. Emailová adresa pre tvoj Mastodon účet totiž nebude zmenená pokiaľ nepostúpiš na adresu uvedenú vyššie.
-        subject: 'Mastodon: Potvrď email pre %{instance}'
-        title: Over emailovú adresu
+        explanation: E-mail zmeníte potvrdením novej e-mailovej adresy.
+        extra: Pokiaľ ste túto akciu nevyžiadali vy, ignorujte tento email. E-mailová adresa pre váš účet na Mastodone totiž nebude zmenená, pokiaľ neprejdete na odkaz uvedený vyššie.
+        subject: 'Mastodon: Overte e-mail pre %{instance}'
+        title: Overte e-mailovú adresu
       reset_password_instructions:
-        action: Zmeň svoje heslo
-        explanation: Vyžiadal/a si si nové heslo pre svoj účet.
-        extra: Ak si túto akciu nevyžiadal/a, prosím ignoruj tento email. Tvoje heslo nebude zmenené pokiaľ nepostúpiš na adresu uvedenú vyššie a vytvoríš si nové.
+        action: Zmeniť heslo
+        explanation: Vyžiadali ste si pre svoj účet nové heslo.
+        extra: Ak ste túto akciu nevyžiadali vy, ignorujte tento email. Vaše heslo nebude zmenené, pokiaľ neprejdete na odkaz uvedený vyššie a nevytvoríte si nové heslo.
         subject: 'Mastodon: Pokyny pre obnovu hesla'
-        title: Nastav nové heslo
+        title: Obnova hesla
       two_factor_disabled:
-        explanation: Dvojfázové overovanie tvojho účtu bolo vypnuté. Teraz sa môžeš prihlásiť len pomocou emailu a hesla.
+        explanation: Prihlásenie je teraz možné iba pomocou e-mailu a hesla.
         subject: 'Mastodon: Dvojfázové overovanie vypnuté'
-        title: Dvoj-faktorové overovanie vypnuté
+        subtitle: Dvojfázové overenie bolo pre váš účet vypnuté.
+        title: Dvojfaktorové overovanie vypnuté
       two_factor_enabled:
-        explanation: Dvojfázové overovanie bolo zapnuté pre tvoj účet. Pre prihlásenie budeš potrebovať token vygenerovaný pre TOTP aplikáciu, ktorá je spárovaná.
+        explanation: Na prihlásenie budete potrebovať kód vygenerovaný spárovanou aplikáciou pre overovanie.
         subject: 'Mastodon: Dvojfázové overovanie zapnuté'
-        title: Dvoj-faktorové overovanie zapnuté
+        subtitle: Dvojfázové overenie bolo pre váš účet zapnuté.
+        title: Dvojfaktorové overovanie zapnuté
       two_factor_recovery_codes_changed:
-        explanation: Predošlé obnovovacie kódy boli urobené neplatnými a boli vygenerované nové.
-        subject: 'Mastodon: dvojfázové zálohové kódy boli znovu vygenerované'
-        title: Obnovovacie kódy pre dvoj-faktorové overovanie zmenené
+        explanation: Predošlé obnovovacie kódy boli zneplatnené a boli vygenerované nové.
+        subject: 'Mastodon: Dvojfázové obnovovacie kódy boli znovu vygenerované'
+        subtitle: Predošlé obnovovacie kódy boli zneplatnené a boli vygenerované nové.
+        title: Obnovovacie kódy pre dvojfaktorové overovanie zmenené
       unlock_instructions:
         subject: 'Mastodon: Pokyny na odomknutie účtu'
       webauthn_credential:
@@ -70,48 +74,50 @@ sk:
           subject: 'Mastodon: Bezpečnostný kľúč odstránený'
           title: Jeden z vašich bezpečnostných kľúčov bol odstránený
       webauthn_disabled:
-        explanation: Overovanie pomocou bezpečnostných kľúčov bolo pre vaše konto vypnuté. Prihlásenie je teraz možné len pomocou tokenu vygenerovaného spárovanou aplikáciou TOTP.
-        subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
+        explanation: Overenie bezpečnostnými kľúčmi bolo pre váš účet vypnuté.
+        extra: Odteraz sa môžete prihlásiť iba pomocou kódu vygenerovaného spárovanou aplikáciou pre overovanie.
+        subject: 'Mastodon: Overovanie s bezpečnostnými kľúčmi vypnuté'
         title: Bezpečnostné kľúče sú vypnuté
       webauthn_enabled:
-        explanation: Pre vaše konto bolo povolené overovanie bezpečnostným kľúčom. Váš bezpečnostný kľúč teraz môžete použiť na prihlásenie.
-        subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
+        explanation: Overenie bezpečnostnými kľúčmi bolo pre váš účet zapnuté.
+        extra: Odteraz môžete na prihlásenie použiť svoj bezpečnostný kľúč.
+        subject: 'Mastodon: Povolené overovanie bezpečnostným kľúčom'
         title: Povolené bezpečnostné kľúče
     omniauth_callbacks:
-      failure: Nebolo možné ťa overiť z %{kind}, lebo "%{reason}".
+      failure: 'Nebolo možné vás overiť z %{kind}, uvedený dôvod: „%{reason}“.'
       success: Úspešné overenie z účtu %{kind}.
     passwords:
-      no_token: Túto stránku nemôžeš navštíviť, ak neprichádzaš z emailu s pokynmi na obnovu hesla. Pokiaľ prichádzaš z tohto emailu, prosím uisti sa že si použil/a celú URL adresu z emailu.
-      send_instructions: Ak sa tvoja emailová adresa nachádza v databázi, tak o niekoľko minút obdržíš email s pokynmi ako nastaviť nové heslo. Ak máš pocit, že si email neobdržal/a, prosím skontroluj aj svoju spam zložku.
-      send_paranoid_instructions: Ak sa tvoja emailová adresa nachádza v databázi, za chvíľu obdržíš odkaz pre obnovu hesla na svoj email. Skontroluj ale prosím aj svoj spam, ak tento email nevidíš.
-      updated: Tvoje heslo bolo úspešne zmenené. Teraz si prihlásený/á.
-      updated_not_active: Tvoje heslo bolo úspešne zmenené.
+      no_token: Túto stránku nemôžete navštíviť, ak vás sem nepresmeroval e-mail s pokynmi na obnovu hesla. Pokiaľ prichádzate z tohto e-mailu, uistite sa, že ste použili celú adresu URL z e-mailu.
+      send_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      send_paranoid_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      updated: Vaše heslo bolo úspešne zmenené. Teraz ste sa prihlásili.
+      updated_not_active: Vaše heslo bolo úspešne zmenené.
     registrations:
-      destroyed: Dovidenia! Tvoj účet bol úspešne zrušený. Dúfame ale, že ťa tu opäť niekedy uvidíme.
-      signed_up: Vitaj! Tvoja registrácia bola úspešná.
-      signed_up_but_inactive: Registrácia bola úspešná. Avšak, účet ešte nebol aktivovaný, takže ťa nemožno prihlásiť.
-      signed_up_but_locked: Registroval/a si sa úspešné. Avšak, tvoj účet je zamknutý, takže ťa nemožno prihlásiť.
-      signed_up_but_pending: Na tvoj email bola odoslaná správa s odkazom na potvrdenie. Po tom, čo naňho klikneš, bude tvoje uchádzanie posúdené. Budeš informovaný, ak sa tvoja požiadavka schváli.
-      signed_up_but_unconfirmed: Správa s odkazom na potvrdenie registrácie bola odoslaná na tvoj email. Pre aktváciu účtu, následuj prosím daný odkaz. Takisto ale skontroluj aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      update_needs_confirmation: Účet bol úspešne pozmenený, ale ešte potrebujeme overiť tvoju novú emailovú adresu. Pre overenie prosím klikni na link v správe ktorú si dostal/a na email. Takisto ale skontroluj aj svoju spam zložku, ak sa ti zdá, že si tento email nedostal/a.
-      updated: Tvoj účet bol úspešne aktualizovaný.
+      destroyed: Dovidenia! Váš účet bol úspešne zrušený. Dúfame ale, že vás tu opäť niekedy uvidíme.
+      signed_up: Vitajte! Vaša registrácia bola úspešná.
+      signed_up_but_inactive: Registrácia bola úspešná. Avšak váš účet ešte nebol aktivovaný, takže sa nemôžete prihlásiť.
+      signed_up_but_locked: Registrácia bola úspešná. Avšak váš účet je zamknutý, takže sa nemôžete prihlásiť.
+      signed_up_but_pending: Na váš e-mail bola odoslaná správa s odkazom na overenie. Po kliknutí na odkaz vašu prihlášku skontrolujeme. O jej schválení vás budeme informovať.
+      signed_up_but_unconfirmed: Na váš e-mail bola odoslaná správa s odkazom na overenie. Svoj účet aktivujte kliknutím na odkaz. Ak ste e-mail nedostali, skontrolujte svoj priečinok pre spam.
+      update_needs_confirmation: Váš účet bol úspešne zmenený, ale ešte potrebujeme overiť vašu novú e-mailovú adresu. Overíte ju kliknutím na potvrdzovací odkaz zaslaný na váš e-mail. Ak ste e-mail nedostali, skontrolujte svoj priečinok pre spam.
+      updated: Váš účet bol úspešne aktualizovaný.
     sessions:
-      already_signed_out: Už si sa úspešne odhlásil/a.
-      signed_in: Prihlásil/a si sa úspešne.
-      signed_out: Odhlásil/a si sa úspešne.
+      already_signed_out: Úspešne ste sa odhlásili.
+      signed_in: Úspešne ste sa prihlásili.
+      signed_out: Úspešne ste sa odhlásili.
     unlocks:
-      send_instructions: O niekoľko minút obdržíš email s pokynmi, ako nastaviť nové heslo. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      send_paranoid_instructions: Ak tvoj účet existuje, o niekoľko minút obdržíš email s pokynmi ako si ho odomknúť. Prosím, skontroluj ale aj svoju spam zložku, pokiaľ sa ti zdá, že si tento email nedostal/a.
-      unlocked: Tvoj účet bol úspešne odomknutý. Pre pokračovanie sa prosím prihlás.
+      send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na odomknutie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      send_paranoid_instructions: Ak váš účet existuje, o niekoľko minút obdržíte e-mail s pokynmi na jeho odomknutie. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
+      unlocked: Váš účet bol úspešne odomknutý. Ak chcete pokračovať, prihláste sa.
   errors:
     messages:
-      already_confirmed: bol už potvrdený, skús sa prihlásiť
-      confirmation_period_expired: musí byť potvrdený do %{period}, prosím požiadaj o nový
-      expired: vypŕšal, prosím, vyžiadaj si nový
+      already_confirmed: bol už potvrdený, skúste sa prihlásiť
+      confirmation_period_expired: musí byť potvrdený do %{period}, požiadajte o nový
+      expired: vypršal, vyžiadajte si nový
       not_found: nenájdený
       not_locked: nebol zamknutý
       not_saved:
-        few: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
-        many: "%{count} chýb zabránilo uloženiu tohto %{resource}:"
-        one: '1 chyba zabránila uloženiu tohto %{resource}:'
-        other: "%{count} chyby zabránili uloženiu tohto %{resource}:"
+        few: "%{count} chyby zabránili uloženiu tohto parametra %{resource}:"
+        many: "%{count} chýb zabránilo uloženiu tohto parametra %{resource}:"
+        one: '1 chyba zabránila uloženiu parametra %{resource}:'
+        other: "%{count} chýb zabránilo uloženiu tohto parametra %{resource}:"
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index be0f98ae11..0eb9b6330a 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -12,6 +12,7 @@ sl:
       last_attempt: Pred zaklepom računa imate še en poskus.
       locked: Vaš račun je zaklenjen.
       not_found_in_database: Neveljavno %{authentication_keys} ali geslo.
+      omniauth_user_creation_failure: Napaka pri ustvarjanju računa za to identiteto.
       pending: Vaš račun je še vedno pod drobnogledom.
       timeout: Vaša seja je potekla. Če želite nadaljevati, se znova prijavite.
       unauthenticated: Pred nadaljevanjem se morate prijaviti ali vpisati.
@@ -47,16 +48,19 @@ sl:
         subject: 'Mastodon: navodila za ponastavitev gesla'
         title: Ponastavitev gesla
       two_factor_disabled:
-        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun onemogočeno. Prijava je zdaj možna le z e-poštnim naslovom in geslom.
+        explanation: Prijava je sedaj mogoče le z uporabo e-poštnega naslova in gesla.
         subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
+        subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo onemogočeno.
         title: 2FA onemogočeno
       two_factor_enabled:
-        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun omogočeno. Žeton, izdelan z aplikacijo TOTP, bo zahtevan zs prijavo.
+        explanation: Za prijavo bo zahtevan žeton, ustvarjen s povezano aplikacijo TOTP.
         subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
+        subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo omogočeno.
         title: 2FA omogočeno
       two_factor_recovery_codes_changed:
         explanation: Prejšnje obnovitvene kode so postale neveljavne in ustvarjene so bile nove.
         subject: 'Mastodon: varnostne obnovitvene kode za dvojno preverjanje pristnosti so ponovno izdelane'
+        subtitle: Prejšnje kode za obnovitev so bile razveljavljene, ustvarjene pa so bile nove.
         title: obnovitvene kode 2FA spremenjene
       unlock_instructions:
         subject: 'Mastodon: navodila za odklepanje'
@@ -70,11 +74,13 @@ sl:
           subject: 'Mastodon: varnostna koda izbrisana'
           title: Ena od vaših varnostnih kod je bila izbrisana
       webauthn_disabled:
-        explanation: Overjanje pristnosti z varnostnimi kodami je za vaš račun onemogočeno. Prijava je zdaj možna le z uporabo žetona, ki ga izdela oparjena aplikacija TOTP.
+        explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo onemogočeno.
+        extra: Prijava je sedaj mogoče le z uporabo žetona, ustvarjenega s povezano aplikacijo TOTP.
         subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
         title: Varnostne kode onemogočene
       webauthn_enabled:
-        explanation: Overjanje z varnostno kodo je za vaš račun omogočeno. Svojo varnostno kodo lahko zdaj uporabite za prijavo.
+        explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo omogočeno.
+        extra: Za prijavo sedaj lahko uporabite svoj varnostni ključ.
         subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
         title: Varnostne kode omogočene
     omniauth_callbacks:
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 6e2f1b4113..76dd493245 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -12,6 +12,7 @@ sq:
       last_attempt: Mund të provoni edhe një herë, përpara se llogaria juaj të kyçet.
       locked: Llogaria juaj është e kyçur.
       not_found_in_database: "%{authentication_keys} ose fjalëkalim i pavlefshëm."
+      omniauth_user_creation_failure: Gabim në krijim llogarie për këtë identitet.
       pending: Llogaria juaj është ende nën shqyrtim.
       timeout: Sesioni juaj ka skaduar. Ju lutemi, që të vazhdohet, ribëni hyrjen.
       unauthenticated: Përpara se të vazhdohet më tej, lypset të bëni hyrjen ose të regjistroheni.
@@ -47,16 +48,19 @@ sq:
         subject: 'Mastodon: Udhëzime ricaktimi fjalëkalimi'
         title: Ricaktim fjalëkalimi
       two_factor_disabled:
-        explanation: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar. Hyrja tanimë është e mundur vetëm duke përdorur adresën email dhe fjalëkalimin.
+        explanation: Hyrja tanimë është e mundshme duke përdorur vetëm adresë email dhe fjalëkalim.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi dyfaktorësh'
+        subtitle: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar.
         title: 2FA u çaktivizua
       two_factor_enabled:
-        explanation: Mirëfilltësimi dyfaktorësh është aktivizuar për llogarinë tuaj. Për hyrje, do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
+        explanation: Për të kryer hyrjen do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U aktivizua mirëfilltësimi dyfaktorësh'
+        subtitle: Për llogarinë tuaj është aktivizuar mirëfilltësmi dyfaktorësh.
         title: 2FA u aktivizua
       two_factor_recovery_codes_changed:
         explanation: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
         subject: 'Mastodon: U riprodhuan kode rikthimi dyfaktorësh'
+        subtitle: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
         title: Kodet e rikthimit 2FA u ndryshuan
       unlock_instructions:
         subject: 'Mastodon: Udhëzime shkyçjeje'
@@ -70,11 +74,13 @@ sq:
           subject: 'Mastodon: Fshirje kyçi sigurie'
           title: Një nga kyçet tuaj të sigurisë është fshirë
       webauthn_disabled:
-        explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj. Hyrja tani është e mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
+        explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj.
+        extra: Hyrjet tani janë të mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi me kyçe sigurie'
         title: U çaktivizuan kyçe sigurie
       webauthn_enabled:
-        explanation: Mirëfilltësimi përmes kyçesh sigurie është aktivizuar për llogarinë tuaj. Tani, për hyrje mund të përdoren kyçet tuaj të sigurisë.
+        explanation: Mirëfilltësimi me kyçe sigurie është aktivizuar për këtë llogari.
+        extra: Kyçi juaj i sigurisë tanimë mund të përdoret për hyrje.
         subject: 'Mastodon: U aktivizua mirëfilltësim me kyçe sigurie'
         title: U aktivizuan kyçe sigurie
     omniauth_callbacks:
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index 40f3d51c30..3947b2d84f 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -12,6 +12,7 @@ sr-Latn:
       last_attempt: Imate još jedan pokušaj pre nego što Vaš nalog bude zaključan.
       locked: Vaš nalog je zaključan.
       not_found_in_database: Neispravna %{authentication_keys} ili lozinka.
+      omniauth_user_creation_failure: Greška pri kreiranju naloga za ovaj identitet.
       pending: Vaš račun je još uvek u pregledu.
       timeout: Vreme trajanja Vaše sesije je isteklo. Za nastavak prijavite se ponovo.
       unauthenticated: Za nastavak se morate prijaviti ili registrovati.
@@ -47,16 +48,19 @@ sr-Latn:
         subject: 'Mastodont: Uputstvo za resetovanje lozinke'
         title: Lozinka resetovana
       two_factor_disabled:
-        explanation: Dvofaktorska autentifikacija za vaš nalog je onemogućena. Prijava je sada moguća samo pomoću imejla i lozinke.
+        explanation: Prijavljivanje je sada moguće koristeći samo adresu e-pošte i lozinku.
         subject: 'Mastodon: Dvofaktorska autentifikacija je onemogućena'
+        subtitle: Dvofaktorska autentifikacija za vaš nalog je onemogućena.
         title: 2FA isključena
       two_factor_enabled:
-        explanation: Dvofaktorska autentifikacija je omogućena za vaš nalog. Za prijavu će biti potreban token koji generiše uparena TOTP aplikacija.
+        explanation: Za prijavljivanje će biti potreban token koji generiše uparena aplikacija TOTP.
         subject: 'Mastodon: Dvofaktorska autentifikacija je omogućena'
+        subtitle: Dvofaktorska autentifikacija je omogućena za vaš nalog.
         title: 2FA uključena
       two_factor_recovery_codes_changed:
         explanation: Prethodni kodovi za oporavak su poništeni i generisani su novi.
         subject: 'Mastodon: Ponovo su generisani kodovi za oporavak'
+        subtitle: Prethodni kodovi za oporavak su poništeni i generisani su novi.
         title: 2FA kodovi oporavka promenjeni
       unlock_instructions:
         subject: 'Mastodont: Uputstvo za otključavanje korisničkog naloga'
@@ -70,11 +74,13 @@ sr-Latn:
           subject: 'Mastodon: Sigurnosni ključ je izbrisan'
           title: Jedan od vaših bezbednosnih ključeva je izbrisan
       webauthn_disabled:
-        explanation: Autentifikacija pomoću bezbednosnih ključeva je onemogućena za vaš nalog. Prijava je sada moguća samo pomoću tokena koji generiše uparena TOTP aplikacija.
+        explanation: Potvrda identiteta pomoću bezbednosnih ključeva je onemogućena za vaš nalog.
+        extra: Prijavljivanje je sada moguće koristeći samo token koji generiše uparena aplikacija TOTP.
         subject: 'Mastodon: Autentifikacija sa sigurnosnim ključevima onemogućena'
         title: Sigurnosni ključevi su onemogućeni
       webauthn_enabled:
-        explanation: Autentifikacija sa bezbednosnim ključem je omogućena za vaš nalog. Vaš sigurnosni ključ se sada može koristiti za prijavljivanje.
+        explanation: Autentifikacija pomoću bezbednosnog ključa je omogućena za vaš nalog.
+        extra: Vaš bezbednosni ključ se sada može koristiti za prijavljivanje.
         subject: 'Mastodon: Omogućena autentifikacija sa bezbednim ključem'
         title: Sigurnosni ključevi su omogućeni
     omniauth_callbacks:
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index f61431de60..a4c08dfaf0 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -12,6 +12,7 @@ sr:
       last_attempt: Имате још један покушај пре него што Ваш налог буде закључан.
       locked: Ваш налог је закључан.
       not_found_in_database: Неисправна %{authentication_keys} или лозинка.
+      omniauth_user_creation_failure: Грешка при креирању налога за овај идентитет.
       pending: Ваш налог се још увек прегледа.
       timeout: Ваша сесија је истекла. Пријавите се поново да бисте наставили.
       unauthenticated: Морате да се пријавите или региструјете пре него што наставите.
@@ -47,16 +48,19 @@ sr:
         subject: 'Mastodon: Упутство за ресетовање лозинке'
         title: Лозинка ресетована
       two_factor_disabled:
-        explanation: Двофакторска аутентификација за ваш налог је онемогућена. Пријава је сада могућа само помоћу имејла и лозинке.
+        explanation: Пријављивање је сада могуће користећи само адресу е-поште и лозинку.
         subject: 'Mastodon: Двофакторска аутентификација је онемогућена'
+        subtitle: Двофакторска аутентификација за ваш налог је онемогућена.
         title: 2FA искључена
       two_factor_enabled:
-        explanation: Двофакторска аутентификација је омогућена за ваш налог. За пријаву ће бити потребан токен који генерише упарена ТОТП апликација.
+        explanation: За пријављивање ће бити потребан токен који генерише упарена апликација TOTP.
         subject: 'Mastodon: Двофакторска аутентификација је омогућена'
+        subtitle: Двофакторска аутентификација је омогућена за ваш налог.
         title: 2FA укључена
       two_factor_recovery_codes_changed:
         explanation: Претходни кодови за опоравак су поништени и генерисани су нови.
         subject: 'Mastodon: Поново су генерисани кодови за опоравак'
+        subtitle: Претходни кодови за опоравак су поништени и генерисани су нови.
         title: 2FA кодови опоравка промењени
       unlock_instructions:
         subject: 'Mastodon: Упутство за откључавање корисничког налога'
@@ -70,11 +74,13 @@ sr:
           subject: 'Mastodon: Сигурносни кључ је избрисан'
           title: Један од ваших безбедносних кључева је избрисан
       webauthn_disabled:
-        explanation: Аутентификација помоћу безбедносних кључева је онемогућена за ваш налог. Пријава је сада могућа само помоћу токена који генерише упарена ТОТП апликација.
+        explanation: Потврда идентитета помоћу безбедносних кључева је онемогућена за ваш налог.
+        extra: Пријављивање је сада могуће користећи само токен који генерише упарена апликација TOTP.
         subject: 'Mastodon: Аутентификација са сигурносним кључевима онемогућена'
         title: Сигурносни кључеви су онемогућени
       webauthn_enabled:
-        explanation: Аутентификација са безбедносним кључем је омогућена за ваш налог. Ваш сигурносни кључ се сада може користити за пријављивање.
+        explanation: Аутентификација помоћу безбедносног кључа је омогућена за ваш налог.
+        extra: Ваш безбедносни кључ се сада може користити за пријављивање.
         subject: 'Mastodon: Омогућена аутентификација са безбедним кључем'
         title: Сигурносни кључеви су омогућени
     omniauth_callbacks:
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index e02983ad5f..27d424f618 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -12,6 +12,7 @@ sv:
       last_attempt: Du har ytterligare ett försök innan ditt konto är låst.
       locked: Ditt konto är låst.
       not_found_in_database: Ogiltigt %{authentication_keys} eller lösenord.
+      omniauth_user_creation_failure: Fel vid skapande av ett konto för denna identitet.
       pending: Ditt konto granskas fortfarande.
       timeout: Din session har avslutats. Vänligen logga in igen för att fortsätta.
       unauthenticated: Du måste logga in eller registrera dig innan du fortsätter.
@@ -47,16 +48,19 @@ sv:
         subject: 'Mastodon: Instruktioner för återställning av lösenord'
         title: Lösenordsåterställning
       two_factor_disabled:
-        explanation: Tvåfaktorsautentisering för ditt konto har inaktiverats. Det är nu möjligt att logga in med enbart e-postadress och lösenord.
+        explanation: Inloggning är nu möjlig med endast e-postadress och lösenord.
         subject: 'Mastodon: Tvåfaktorsautentisering inaktiverad'
+        subtitle: Tvåfaktorsautentisering för ditt konto har inaktiverats.
         title: 2FA inaktiverad
       two_factor_enabled:
-        explanation: Tvåfaktorsautentisering har aktiverats för ditt konto. En token som genereras av en kopplad TOTP-app kommer att krävas vid inloggning.
+        explanation: En token skapad av den parkopplade TOTP-appen kommer att krävas för inloggning.
         subject: 'Mastodon: Tvåfaktorsautentisering aktiverad'
+        subtitle: Tvåfaktorsautentisering har aktiverats för ditt konto.
         title: 2FA aktiverad
       two_factor_recovery_codes_changed:
         explanation: De tidigare återställningskoderna har ogiltigförklarats och nya har genererats.
         subject: Mastodon Tvåfaktors-återställningskoder genererades på nytt
+        subtitle: De tidigare återhämtningskoderna har ogiltigförklarats och nya har skapats.
         title: 2FA-återställningskoder ändrades
       unlock_instructions:
         subject: 'Mastodon: Lås upp instruktioner'
@@ -70,11 +74,13 @@ sv:
           subject: 'Mastodon: Säkerhetsnyckeln borttagen'
           title: En av dina säkerhetsnycklar har raderats
       webauthn_disabled:
-        explanation: Autentisering med säkerhetsnycklar till ditt konto har inaktiverats. Inloggning är nu endast möjligt med den token som genereras av den sammankopplade TOTP-appen.
+        explanation: Autentisering med säkerhetsnycklar har inaktiverats för ditt konto.
+        extra: Inloggning är nu möjligt med endast den token som genereras av den parade TOTP-appen.
         subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
         title: Säkerhetsnycklar inaktiverade
       webauthn_enabled:
-        explanation: Autentisering med säkerhetsnyckel till ditt konto har aktiverats. Din säkerhetsnyckel kan nu användas för inloggning.
+        explanation: Autentisering med säkerhetsnyckel har aktiverats för ditt konto.
+        extra: Din säkerhetsnyckel kan nu användas för inloggning.
         subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
         title: Säkerhetsnycklar aktiverade
     omniauth_callbacks:
diff --git a/config/locales/devise.ta.yml b/config/locales/devise.ta.yml
index d4b4eeefc6..a0e6187ec4 100644
--- a/config/locales/devise.ta.yml
+++ b/config/locales/devise.ta.yml
@@ -47,11 +47,9 @@ ta:
         subject: 'மாஸ்டோடான்: கடவுச்சொல்லை மீட்டமைப்பதற்கான வழிமுறைகள்'
         title: கடவுச்சொல் மீட்டமைப்பு
       two_factor_disabled:
-        explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது. உங்கள் மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல் மூலமாக மட்டுமே தற்பொழுது உள்நுழைய முடியும்.
         subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது'
         title: 2FA உபயோகத்தில் இல்லை
       two_factor_enabled:
-        explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது. இணைக்கப்படும் TOTP செயலியில் ஒரு குறியீடு தோன்றும். உங்கள் கணக்கிற்குள் நுழைய அந்தக் குறியீடு தேவைப்படும்.
         subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது'
         title: 2FA செயல்படுத்தப்பட்டுள்ளது
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index dce498525f..50e2e4b29e 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -12,6 +12,7 @@ th:
       last_attempt: คุณลองได้อีกหนึ่งครั้งก่อนที่จะมีการล็อคบัญชีของคุณ
       locked: มีการล็อคบัญชีของคุณอยู่
       not_found_in_database: "%{authentication_keys} หรือรหัสผ่านไม่ถูกต้อง"
+      omniauth_user_creation_failure: เกิดข้อผิดพลาดในการสร้างบัญชีสำหรับข้อมูลประจำตัวนี้
       pending: บัญชีของคุณยังคงอยู่ระหว่างการตรวจทาน
       timeout: เซสชันของคุณหมดอายุแล้ว โปรดเข้าสู่ระบบอีกครั้งเพื่อดำเนินการต่อ
       unauthenticated: คุณจำเป็นต้องเข้าสู่ระบบหรือลงทะเบียนก่อนดำเนินการต่อ
@@ -47,16 +48,19 @@ th:
         subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
         title: การตั้งรหัสผ่านใหม่
       two_factor_disabled:
-        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้ที่อยู่อีเมลและรหัสผ่านเท่านั้น
+        explanation: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงที่อยู่อีเมลและรหัสผ่านเท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+        subtitle: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
         title: ปิดใช้งาน 2FA แล้ว
       two_factor_enabled:
-        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
+        explanation: จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+        subtitle: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
         title: เปิดใช้งาน 2FA แล้ว
       two_factor_recovery_codes_changed:
-        explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสใหม่แล้ว
+        explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
         subject: 'Mastodon: สร้างรหัสกู้คืนสองปัจจัยใหม่แล้ว'
+        subtitle: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
         title: เปลี่ยนรหัสกู้คืน 2FA แล้ว
       unlock_instructions:
         subject: 'Mastodon: คำแนะนำการปลดล็อค'
@@ -70,11 +74,13 @@ th:
           subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
           title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
       webauthn_disabled:
-        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
+        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+        extra: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
       webauthn_enabled:
-        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
+        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+        extra: ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
     omniauth_callbacks:
diff --git a/config/locales/devise.tok.yml b/config/locales/devise.tok.yml
new file mode 100644
index 0000000000..d15ecd21b2
--- /dev/null
+++ b/config/locales/devise.tok.yml
@@ -0,0 +1 @@
+tok:
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index 86b1c951f7..e709d3fff1 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -12,6 +12,7 @@ tr:
       last_attempt: Hesabınız kilitlenmeden önce bir kez daha denemeniz gerekir.
       locked: Hesabınız kilitlendi.
       not_found_in_database: Geçersiz %{authentication_keys} ya da parola.
+      omniauth_user_creation_failure: Bu kimlik için hesap oluşturmada hata.
       pending: Hesabınız hala inceleniyor.
       timeout: Oturum süreniz sona erdi. Lütfen devam etmek için tekrar giriş yapınız.
       unauthenticated: Devam etmeden önce oturum açmanız veya kayıt olmanız gerek.
@@ -47,16 +48,19 @@ tr:
         subject: 'Mastodon: Parola sıfırlama talimatları'
         title: Parola sıfırlama
       two_factor_disabled:
-        explanation: Hesabınız için iki-adımlı kimlik doğrulama devre dışı bırakıldı. Şimdi sadece e-posta adresi ve parola kullanarak giriş yapabilirsiniz.
+        explanation: Oturum açma şimdi sadece e-posta adresi ve parola ile mümkün.
         subject: 'Mastodon: İki-adımlı kimlik doğrulama devre dışı bırakıldı'
+        subtitle: Hesabınız için iki aşamalı kimlik doğrulama devre dışı bırakılmıştır.
         title: 2FA devre dışı bırakıldı
       two_factor_enabled:
-        explanation: Hesabınız için iki-adımlı kimlik doğrulama etkinleştirildi. Giriş yapmak için eşleştirilmiş TOTP uygulaması tarafından oluşturulan bir belirteç gereklidir.
+        explanation: Oturum açmanız için eşlenmiş TOTP uygulaması tarafından oluşturulmuş bir tokene ihtiyaç var.
         subject: 'Mastodon: İki adımlı kimlik doğrulama etkinleştirildi'
+        subtitle: Hesabınız için iki aşamalı kimlik doğrulama etkinleştirilmiştir.
         title: 2FA etkinleştirildi
       two_factor_recovery_codes_changed:
         explanation: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
         subject: 'Mastodon: İki adımlı kurtarma kodları yeniden oluşturuldu'
+        subtitle: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
         title: 2FA kurtarma kodları değiştirildi
       unlock_instructions:
         subject: 'Mastodon: Kilit açma talimatları'
@@ -70,11 +74,13 @@ tr:
           subject: 'Mastodon: Güvenlik anahtarı silindi'
           title: Güvenlik anahtarlarınızdan biri silindi
       webauthn_disabled:
-        explanation: Hesabınız için güvenlik anahtarlarıyla kimlik doğrulama devre dışı bırakıldı. Artık yalnızca eşleştirilmiş TOTP uygulaması tarafından oluşturulan kodu kullanarak giriş yapmak mümkündür.
+        explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama devre dışı bırakılmıştır.
+        extra: Oturum açma şimdi sadece eşlenmiş TOTP uygulaması tarafından oluşturulmuş token ile mümkündür.
         subject: 'Mastodon: Güvenlik anahtarlarıyla kimlik doğrulama devre dışı'
         title: Güvenlik anahtarları devre dışı
       webauthn_enabled:
-        explanation: Hesabınız için güvenlik anahtarı doğrulaması etkinleştirildi. Güvenlik anahtarınız artık giriş yapmak için kullanılabilir.
+        explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama etkinleştirilmiştir.
+        extra: Güvenlik anahtarınız şimdi oturum açma için kullanılabilir.
         subject: 'Mastodon: Güvenlik anahtarı doğrulaması etkinleştirildi'
         title: Güvenlik anahtarları etkin
     omniauth_callbacks:
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index bb81a2a1b8..65e89a274f 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -12,6 +12,7 @@ uk:
       last_attempt: У вас залишилась ще одна спроба, після якої ваш обліковий запис буде заблоковано.
       locked: Ваш обліковий запис заблоковано.
       not_found_in_database: Неправильний %{authentication_keys} або пароль.
+      omniauth_user_creation_failure: Помилка створення облікового запису для цієї особи.
       pending: Ваш обліковий запис ще перебуває на розгляді.
       timeout: Час сеансу минув. Будь ласка, увійдіть знову, щоб продовжити.
       unauthenticated: Щоб продовжити, увійдіть або зареєструйтеся.
@@ -47,16 +48,19 @@ uk:
         subject: 'Mastodon: Інструкції для скидання паролю'
         title: Скидання пароля
       two_factor_disabled:
-        explanation: Двофакторну аутентифікацію для вашого облікового запису відключено. Тепер ви можете увійти за допомогою лише адреси електронної пошти та пароля.
+        explanation: Вхід можливий лише за допомогою адреси електронної пошти та пароля.
         subject: 'Mastodon: двофакторну авторизацію вимкнено'
+        subtitle: Двоетапна перевірка для вашого облікового запису вимкнена.
         title: Двофакторна автентифікація вимкнена
       two_factor_enabled:
-        explanation: Двофакторну аутентифікацію для вашого облікового запису було увімкнено. Для входу до системи буде потрібний токен, згенерований спареним застосунком TOTP.
+        explanation: Для входу необхідний токен створений пов'язаним застосунком TOTP.
         subject: 'Mastodon: двофакторну авторизацію увімкнено'
+        subtitle: Двоетапна перевірка увімкнена для вашого облікового запису.
         title: Двофакторна автентифікація увімкнена
       two_factor_recovery_codes_changed:
         explanation: Попередні коди відновлення були анульовані і генеруються нові.
         subject: 'Mastodon: коди двофакторного відновлення повторно згенеровано'
+        subtitle: Попередні коди відновлення анульовані та генеруються нові.
         title: Коди двофакторного відновлення змінено
       unlock_instructions:
         subject: 'Mastodon: Інструкції для розблокування'
@@ -70,11 +74,13 @@ uk:
           subject: 'Mastodon: Ключ безпеки видалено'
           title: Один з ваших ключів безпеки було видалено
       webauthn_disabled:
-        explanation: Авторизацію з ключами безпеки було відключено для вашого облікового запису. Вхід тепер можливий лише через токен, згенерований додатком TOTP.
+        explanation: Автентифікація з ключами безпеки була вимкнена для вашого облікового запису.
+        extra: Тепер можна ввійти використовуючи лише токен, згенерований застосунком TOTP.
         subject: 'Mastodon: Аутентифікація за допомогою ключів безпеки вимкнена'
         title: Ключі безпеки вимкнуто
       webauthn_enabled:
-        explanation: Авторизація ключа безпеки була увімкнена для вашого облікового запису. Ваш ключ безпеки тепер можна використовувати для входу.
+        explanation: Вхід за допомогою ключів безпеки ввімкнено для вашого облікового запису.
+        extra: Тепер ви можете використовувати ваш ключ безпеки для входу.
         subject: 'Mastodon: Авторизація ключа безпеки увімкнена'
         title: Ключі безпеки увімкнено
     omniauth_callbacks:
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 904cc51fe9..6ae78f83cc 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -12,6 +12,7 @@ vi:
       last_attempt: Nếu thử sai lần nữa, tài khoản của bạn sẽ bị khóa.
       locked: Tài khoản của bạn bị khóa.
       not_found_in_database: "%{authentication_keys} không có trong dữ liệu."
+      omniauth_user_creation_failure: Xảy ra lỗi khi tạo tài khoản này.
       pending: Tài khoản của bạn vẫn đang được xem xét.
       timeout: Phiên của bạn đã hết hạn. Vui lòng đăng nhập lại để tiếp tục.
       unauthenticated: Bạn cần đăng nhập để tiếp tục.
@@ -47,16 +48,19 @@ vi:
         subject: 'Mastodon: Hướng dẫn đổi lại mật khẩu'
         title: Đổi lại mật khẩu
       two_factor_disabled:
-        explanation: Đã vô hiệu hóa xác minh 2 bước cho tài khoản của bạn. Bây giờ chỉ có thể đăng nhập bằng địa chỉ email và mật khẩu.
+        explanation: Đăng nhập bây giờ chỉ có thể sử dụng địa chỉ email và mật khẩu.
         subject: 'Mastodon: Xác minh 2 bước đã bị vô hiệu hóa'
+        subtitle: Xác minh hai bước cho tài khoản của bạn đã bị vô hiệu hóa.
         title: Vô hiệu hóa xác minh 2 bước
       two_factor_enabled:
-        explanation: Tài khoản của bạn đã kích hoạt xác minh 2 bước. Lần đăng nhập tới sẽ cần thêm mã đăng nhập được tạo bởi ứng dụng TOTP.
+        explanation: Cần có mã token được tạo bởi ứng dụng TOTP được ghép nối để đăng nhập.
         subject: 'Mastodon: Kích hoạt xác minh 2 bước'
+        subtitle: Xác minh hai bước đã được bật cho tài khoản của bạn.
         title: Kích hoạt xác minh 2 bước
       two_factor_recovery_codes_changed:
         explanation: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         subject: 'Mastodon: Mã khôi phục xác thực hai yếu tố đã được tạo lại'
+        subtitle: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         title: Mã khôi phục xác thực hai yếu tố đã thay đổi
       unlock_instructions:
         subject: 'Mastodon: Hướng dẫn mở khóa'
@@ -70,11 +74,13 @@ vi:
           subject: 'Mastodon: Xóa khóa bảo mật'
           title: Một trong những khóa bảo mật của bạn vừa bị xóa
       webauthn_disabled:
-        explanation: Bạn vừa vô hiệu hóa xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, bạn sẽ dùng ứng dụng TOTP để tạo token đăng nhập.
+        explanation: Xác minh bằng khóa bảo mật đã bị vô hiệu hóa đối với tài khoản của bạn.
+        extra: Hiện tại, bạn chỉ có thể đăng nhập bằng cách sử dụng mã token được tạo bởi ứng dụng TOTP được ghép nối.
         subject: 'Mastodon: Vô hiệu hóa xác thực bằng khóa bảo mật'
         title: Đã vô hiệu hóa khóa bảo mật
       webauthn_enabled:
-        explanation: Bạn vừa kích hoạt xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, khóa bảo mật của bạn sẽ được dùng để đăng nhập.
+        explanation: Khóa bảo mật đã được bật cho tài khoản của bạn.
+        extra: Hiện bạn đã có thể dùng khóa bảo mật để đăng nhập.
         subject: 'Mastodon: Kích hoạt xác minh bằng khóa bảo mật'
         title: Đã kích hoạt khóa bảo mật
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index e46c433530..3eb722b961 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -12,6 +12,7 @@ zh-CN:
       last_attempt: 你只有最后一次尝试机会，若未通过，帐号将被锁定。
       locked: 你的账户已被锁定。
       not_found_in_database: "%{authentication_keys}或密码错误。"
+      omniauth_user_creation_failure: 为此身份创建账户时出错。
       pending: 你的账号仍在审核中。
       timeout: 你的会话已过期。请重新登录再继续操作。
       unauthenticated: 继续操作前请注册或者登录。
@@ -47,16 +48,19 @@ zh-CN:
         subject: Mastodon：重置密码说明
         title: 重置密码
       two_factor_disabled:
-        explanation: 账号的双因素认证已禁用。现在仅使用邮箱和密码即可登录。
+        explanation: 目前只能通过电子邮件地址和密码登录。
         subject: Mastodon：双因素认证已禁用
+        subtitle: 您账户的双因素认证已被停用。
         title: 双因素认证已停用
       two_factor_enabled:
-        explanation: 账号双因素认证已启用。登录时将需要来自已配对的 TOTP 应用生成的验证码。
+        explanation: 登录时需要输入先前配对好的TOTP应用生成的令牌。
         subject: Mastodon：双因素认证已启用
+        subtitle: 您账户的双因素认证已被启用。
         title: 双因素认证已启用
       two_factor_recovery_codes_changed:
         explanation: 新恢复码已生成，同时旧恢复码已失效。
         subject: Mastodon：双因素认证恢复码已重新生成
+        subtitle: 新恢复码已生成，同时旧恢复码已失效。
         title: 双因素认证恢复码已更改
       unlock_instructions:
         subject: Mastodon：账户解锁信息
@@ -70,11 +74,13 @@ zh-CN:
           subject: Mastodon：安全密钥已删除
           title: 你的安全密钥之一已被删除
       webauthn_disabled:
-        explanation: 你的帐户已禁用安全密钥认证。现在只能使用配对的 TOTP 应用程序生成的令牌登录。
+        explanation: 您账户的安全密钥身份认证已被停用。
+        extra: 目前只能用先前配对的TOTP应用生成的令牌登录。
         subject: Mastodon：安全密钥认证已禁用
         title: 安全密钥已禁用
       webauthn_enabled:
-        explanation: 你的账户已启用安全密钥身份验证。你的安全密钥现在可以用于登录。
+        explanation: 您账户的安全密钥身份认证已被启用。
+        extra: 您的安全密钥现在可用于登录。
         subject: Mastodon：安全密钥认证已启用
         title: 已启用安全密钥
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index 2d9e8ddead..a2620a8e4a 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -12,6 +12,7 @@ zh-HK:
       last_attempt: 若你再一次嘗試失敗，我們將鎖定你的帳號，以策安全。
       locked: 你的帳號已被鎖定。
       not_found_in_database: 不正確的%{authentication_keys}或密碼。
+      omniauth_user_creation_failure: 為此身份建立帳號時出錯。
       pending: 你的帳號仍在審核中
       timeout: 你的登入階段已經過期，請重新登入以繼續使用。
       unauthenticated: 你必須先登入或登記，以繼續使用。
@@ -47,16 +48,19 @@ zh-HK:
         subject: 'Mastodon: 重設密碼'
         title: 重設密碼
       two_factor_disabled:
-        explanation: 帳號的雙重認證已被停用。現在只需使用電郵地址和密碼，即可登入。
+        explanation: 現在只需使用電郵地址和密碼即可登入。
         subject: Mastodon：已關閉雙重認證
+        subtitle: 你帳號的雙重認證已被停用。
         title: 已關閉雙重認證
       two_factor_enabled:
-        explanation: 賬號的雙重認證已被啟用。登錄時，將需要已配對 TOTP 應用程式生成的驗證碼。
+        explanation: 登入時將需要由配對的一次性密碼應用程式生成的憑證。
         subject: Mastodon：已啟用雙重認證
+        subtitle: 你的帳號已啟用雙重認證。
         title: 已啟用雙重認證
       two_factor_recovery_codes_changed:
         explanation: 之前的恢復碼失效了，新的已生成。
         subject: Mastodon：已產生新的雙重認證恢復碼
+        subtitle: 先前的恢復碼已經無效，並且已生成新的恢復碼。
         title: 雙重認證恢復碼已更改
       unlock_instructions:
         subject: 'Mastodon: 解除帳號鎖定'
@@ -70,11 +74,13 @@ zh-HK:
           subject: 'Mastodon: 安全鑰匙已移除'
           title: 你其中的一個安全鑰匙已經被移除了
       webauthn_disabled:
-        explanation: 你的帳號的安全鑰匙身份驗證已經停用。你只可以用過去已經配對好的基於時間一次性密碼程式生成的密碼來登錄。
+        explanation: 你的帳號已停用安全密鑰認證。
+        extra: 現在只能使用配對的一次性密碼應用程式生成的憑證登入。
         subject: 'Mastodon: 安全鑰匙身份驗證已經停用'
         title: 已停用安全鑰匙
       webauthn_enabled:
-        explanation: 安全鑰匙身份驗證已啟用。你的安全鑰匙現在可以用來登錄。
+        explanation: 你的帳號已啟用安全密鑰認證。
+        extra: 你現在可以使用安全密鑰來登入。
         subject: 'Mastodon: 安全鑰匙身份驗證已啟用'
         title: 已啟用安全鑰匙
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index de977426f2..7ead831e4f 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -12,6 +12,7 @@ zh-TW:
       last_attempt: 帳號鎖定前，您還有最後一次嘗試機會。
       locked: 已鎖定您的帳號。
       not_found_in_database: 無效的 %{authentication_keys} 或密碼。
+      omniauth_user_creation_failure: 以此身分新增帳號時發生錯誤。
       pending: 您的帳號仍在審核中。
       timeout: 登入階段逾時。請重新登入以繼續。
       unauthenticated: 您必須先登入或註冊才能繼續使用。
@@ -47,16 +48,19 @@ zh-TW:
         subject: Mastodon：重設密碼指引
         title: 重設密碼
       two_factor_disabled:
-        explanation: 您帳號的兩階段驗證已停用。現在只使用電子郵件及密碼登入。
+        explanation: 目前僅可使用電子郵件地址與密碼登入。
         subject: Mastodon：已停用兩階段驗證
+        subtitle: 您帳號之兩階段驗證已停用。
         title: 已停用兩階段驗證
       two_factor_enabled:
-        explanation: 已對您的帳號啟用兩階段驗證。登入時將需要已配對的 TOTP 應用程式所產生之 Token。
+        explanation: 登入時需要配對的 TOTP 應用程式產生之 token。
         subject: Mastodon：已啟用兩階段驗證
+        subtitle: 您的帳號之兩階段驗證已啟用。
         title: 已啟用兩階段驗證
       two_factor_recovery_codes_changed:
         explanation: 之前的備用驗證碼已經失效，且已產生新的。
         subject: Mastodon：兩階段驗證備用驗證碼已經重新產生
+        subtitle: 之前的備用驗證碼已經失效，且已產生新的。
         title: 兩階段驗證備用驗證碼已變更
       unlock_instructions:
         subject: Mastodon：解鎖指引
@@ -70,11 +74,13 @@ zh-TW:
           subject: Mastodon：安全密鑰已移除
           title: 您的一支安全密鑰已經被移除
       webauthn_disabled:
-        explanation: 您的帳號已停用安全密鑰認證。只能透過已配對的 TOTP 應用程式所產生之 Token 登入。
+        explanation: 您的帳號已停用安全金鑰身份驗證。
+        extra: 現在僅可使用配對的 TOTP 應用程式產生之 token 登入。
         subject: Mastodon：安全密鑰認證方式已停用
         title: 已停用安全密鑰
       webauthn_enabled:
-        explanation: 您的帳號已啟用安全密鑰認證。您可以使用安全密鑰登入了。
+        explanation: 您的帳號已啟用安全金鑰身分驗證。
+        extra: 您的安全金鑰現在已可用於登入。
         subject: Mastodon：已啟用安全密鑰認證
         title: 已啟用安全密鑰
     omniauth_callbacks:
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index 4524dd707e..5f0536c8da 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -132,7 +132,7 @@ be:
         follow: Падпіскі, ігнараванне і блакіроўка
         follows: Падпіскі
         lists: Спісы
-        media: Мультымедыйныя ўкладанні
+        media: Мультымедыйныя далучэнні
         mutes: Ігнараваныя
         notifications: Апавяшчэнні
         push: Push-апавяшчэнні
@@ -174,6 +174,7 @@ be:
       read:filters: бачыць свае фільтры
       read:follows: бачыць свае падпіскі
       read:lists: бачыць свае спісы
+      read:me: чытайце толькі базавую інфармацыю аб сваім уліковым запісе
       read:mutes: бачыць свае ігнараванні
       read:notifications: бачыць свае абвесткі
       read:reports: бачыць свае скаргі
diff --git a/config/locales/doorkeeper.bg.yml b/config/locales/doorkeeper.bg.yml
index 8e026794ee..7633156d78 100644
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@@ -174,6 +174,7 @@ bg:
       read:filters: преглед на вашите филтри
       read:follows: преглед на вашите последвания
       read:lists: преглед на вашите списъци
+      read:me: четене само на основните сведения за акаунта ви
       read:mutes: преглед на вашите заглушавания
       read:notifications: преглед на вашите известия
       read:reports: преглед на вашите докладвания
diff --git a/config/locales/doorkeeper.ca.yml b/config/locales/doorkeeper.ca.yml
index 9706f3db70..80827a87da 100644
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@@ -174,6 +174,7 @@ ca:
       read:filters: mira els teus filtres
       read:follows: mira els teus seguiments
       read:lists: mira les teves llistes
+      read:me: llegir només la informació bàsica del vostre compte
       read:mutes: mira els teus silenciats
       read:notifications: mira les teves notificacions
       read:reports: mira els teus informes
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index ba2100edfd..9719a9a246 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -84,7 +84,7 @@ cs:
         credential_flow_not_configured: Proud Resource Owner Password Credentials selhal, protože Doorkeeper.configure.resource_owner_from_credentials nebylo nakonfigurováno.
         invalid_client: Ověření klienta selhalo kvůli neznámému klientovi, chybějící klientské autentizaci či nepodporované autentizační metodě.
         invalid_grant: Poskytnuté oprávnění je neplatné, vypršela jeho platnost, bylo odvoláno, neshoduje se s URI přesměrování použitým v požadavku o autorizaci, nebo bylo uděleno jinému klientu.
-        invalid_redirect_uri: URI pro přesměrování není platné.
+        invalid_redirect_uri: Zahrnutá přesměrovací URI není platná.
         invalid_request:
           missing_param: 'Chybí potřebný parametr: %{value}.'
           request_not_authorized: Požadavek musí být autorizován. Potřebný parametr pro autorizaci požadavku chybí nebo není platný.
@@ -174,6 +174,7 @@ cs:
       read:filters: vidět vaše filtry
       read:follows: vidět vaše sledování
       read:lists: vidět vaše seznamy
+      read:me: číst pouze základní informace vašeho účtu
       read:mutes: vidět vaše skrytí
       read:notifications: vidět vaše oznámení
       read:reports: vidět vaše hlášení
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
index e79aa0359f..88cd2b9d53 100644
--- a/config/locales/doorkeeper.cy.yml
+++ b/config/locales/doorkeeper.cy.yml
@@ -174,6 +174,7 @@ cy:
       read:filters: gweld eich hidlwyr
       read:follows: gweld eich dilynwyr
       read:lists: gweld eich rhestrau
+      read:me: darllen dim ond manylion elfennol eich cyfrif
       read:mutes: gweld eich anwybyddiadau
       read:notifications: gweld eich hysbysiadau
       read:reports: gweld eich adroddiadau
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 2c8b0d13e1..ed10e14e24 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -174,6 +174,7 @@ da:
       read:filters: se dine filtre
       read:follows: se dine følger
       read:lists: se dine lister
+      read:me: læs kun kontoens basisoplysninger
       read:mutes: se dine tavsgørelser
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 552dfeba37..80d612255b 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -174,6 +174,7 @@ de:
       read:filters: deine Filter einsehen
       read:follows: sehen, wem du folgst
       read:lists: deine Listen sehen
+      read:me: nur deine grundlegenden Kontoinformationen lesen
       read:mutes: deine Stummschaltungen einsehen
       read:notifications: deine Benachrichtigungen sehen
       read:reports: deine Meldungen sehen
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
index b3ceffb13f..2e537c5301 100644
--- a/config/locales/doorkeeper.en-GB.yml
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -174,6 +174,7 @@ en-GB:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
+      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 0432a5e3fb..98776f2193 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -174,6 +174,7 @@ en:
       read:filters: see your filters
       read:follows: see your follows
       read:lists: see your lists
+      read:me: read only your account's basic information
       read:mutes: see your mutes
       read:notifications: see your notifications
       read:reports: see your reports
diff --git a/config/locales/doorkeeper.es-AR.yml b/config/locales/doorkeeper.es-AR.yml
index 532db1f30d..47cfc451aa 100644
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@@ -174,6 +174,7 @@ es-AR:
       read:filters: ver tus filtros
       read:follows: ver qué cuentas seguís
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver qué cuentas silenciaste
       read:notifications: ver tus notificaciones
       read:reports: ver tus denuncias
diff --git a/config/locales/doorkeeper.es-MX.yml b/config/locales/doorkeeper.es-MX.yml
index 082d656bc5..e56e0df3ba 100644
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@@ -174,6 +174,7 @@ es-MX:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.es.yml b/config/locales/doorkeeper.es.yml
index 002f813b32..44e165a215 100644
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@@ -174,6 +174,7 @@ es:
       read:filters: ver tus filtros
       read:follows: ver a quién sigues
       read:lists: ver tus listas
+      read:me: leer solo la información básica de tu cuenta
       read:mutes: ver a quién has silenciado
       read:notifications: ver tus notificaciones
       read:reports: ver tus informes
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 9886e034b0..88a63f698b 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -97,7 +97,7 @@ eu:
           unknown: Sarbide token-a baliogabea da
         resource_owner_authenticator_not_configured: Baliabidearen jabearen bilaketak huts egin du Doorkeeper.configure.resource_owner_authenticator konfiguratu gabe dagoelako.
         server_error: Autorizatze zerbitzariak eskaera betetzea eragotzi duen ustekabeko baldintza bat aurkitu du.
-        temporarily_unavailable: Autorizatze zerbitzariak ezin du orain eskaera bete  une batez zerbitzariak gainezka egin duelako edo mantentze lanetan dagoelako.
+        temporarily_unavailable: Baimen-zerbitzariak ezin du orain eskaera bete, une batez zerbitzariak gainezka egin duelako edo mantentze lanetan dagoelako.
         unauthorized_client: Bezeroak ez du eskaera hau metodo hau erabiliz egiteko baimenik.
         unsupported_grant_type: Autorizatze mota ez da onartzen autorizatze zerbitzarian.
         unsupported_response_type: Autorizatze zerbitzari honek ez du onartzen erantzun mota hau.
@@ -174,6 +174,7 @@ eu:
       read:filters: ikusi zure iragazkiak
       read:follows: ikusi zuk jarraitutakoak
       read:lists: ikusi zure zerrendak
+      read:me: irakurri soilik zure kontuaren oinarrizko informazioa
       read:mutes: ikusi zuk mutututakoak
       read:notifications: ikusi zure jakinarazpenak
       read:reports: ikusi zure salaketak
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index fea01d1076..ae8963c76f 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -174,6 +174,7 @@ fi:
       read:filters: katso suodattimiasi
       read:follows: katso seurattujasi
       read:lists: katso listojasi
+      read:me: lue tilisi perustietoja
       read:mutes: katso mykistyksiäsi
       read:notifications: katso ilmoituksiasi
       read:reports: katso raporttejasi
diff --git a/config/locales/doorkeeper.fo.yml b/config/locales/doorkeeper.fo.yml
index 78f8701ae9..4f5cc5a645 100644
--- a/config/locales/doorkeeper.fo.yml
+++ b/config/locales/doorkeeper.fo.yml
@@ -174,6 +174,7 @@ fo:
       read:filters: síggja tíni filtur
       read:follows: síggja hvørji tú fylgir
       read:lists: síggja tínar listar
+      read:me: les bara grundleggjandi upplýsingar av tínari kontu
       read:mutes: síggja tínar doyvingar
       read:notifications: síggja tínar fráboðanir
       read:reports: síggja tínar meldingar
diff --git a/config/locales/doorkeeper.fy.yml b/config/locales/doorkeeper.fy.yml
index a43defc427..51f0055ff6 100644
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@@ -174,6 +174,7 @@ fy:
       read:filters: jo filters besjen
       read:follows: de accounts dy’tsto folgest besjen
       read:lists: jo listen besjen
+      read:me: allinnich de basisgegevens fan jo account lêze
       read:mutes: jo negearre brûkers besjen
       read:notifications: jo meldingen besjen
       read:reports: jo rapportearre berjochten besjen
diff --git a/config/locales/doorkeeper.gl.yml b/config/locales/doorkeeper.gl.yml
index 57ee4777c9..d34c58decc 100644
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@@ -151,9 +151,9 @@ gl:
       admin:read:accounts: ler información sensible de todas as contas
       admin:read:canonical_email_blocks: ler a información sensíbel de tódolos bloqueos de correos electrónicos canónicos
       admin:read:domain_allows: ler a información sensible de todos os dominios permitidos
-      admin:read:domain_blocks: ler a información sensible de tódolos bloqueos de dominio
+      admin:read:domain_blocks: ler a información sensible de todos os bloqueos de dominio
       admin:read:email_domain_blocks: ler a información sensible de tódolos dominios de correo electrónico
-      admin:read:ip_blocks: ler a información sensible de tódolos bloqueos de IP
+      admin:read:ip_blocks: ler a información sensible de todos os bloqueos de IP
       admin:read:reports: ler información sensible de todos os informes e contas denunciadas
       admin:write: modificar todos os datos no servidor
       admin:write:accounts: executar accións de moderación nas contas
@@ -174,6 +174,7 @@ gl:
       read:filters: ver os filtros
       read:follows: ver a quen segues
       read:lists: ver as tuas listaxes
+      read:me: ler só a información básica da túa conta
       read:mutes: ver a quen tes acalado
       read:notifications: ver as notificacións
       read:reports: ver as túas denuncias
@@ -184,7 +185,7 @@ gl:
       write:blocks: bloquear contas e dominios
       write:bookmarks: marcar publicacións
       write:conversations: acalar e eliminar conversas
-      write:favourites: marcar como favorita
+      write:favourites: favorecer publicacións
       write:filters: crear filtros
       write:follows: seguir usuarias
       write:lists: crear listaxes
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index 9030e45e0c..a6376fa4c1 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -174,6 +174,7 @@ he:
       read:filters: צפייה במסננים
       read:follows: צפייה בנעקבים
       read:lists: צפיה ברשימותיך
+      read:me: לקריאה בלבד של פרטי חשבונך הבסיסיים
       read:mutes: צפיה במושתקיך
       read:notifications: צפיה בהתראותיך
       read:reports: צפיה בדוחותיך
diff --git a/config/locales/doorkeeper.hu.yml b/config/locales/doorkeeper.hu.yml
index 4559dcbd31..28ce283ffa 100644
--- a/config/locales/doorkeeper.hu.yml
+++ b/config/locales/doorkeeper.hu.yml
@@ -38,12 +38,12 @@ hu:
         application: Alkalmazás
         callback_url: Visszahívási URL
         delete: Eltávolítás
-        empty: Nincsenek saját alkalmazások.
+        empty: Nincsenek saját alkalmazásaid.
         name: Név
         new: Új alkalmazás
         scopes: Hatókörök
         show: Megjelenítés
-        title: Alkalmazásaid
+        title: Saját alkalmazások
       new:
         title: Új alkalmazás
       show:
@@ -77,7 +77,7 @@ hu:
         never_used: Soha sem volt használva
         scopes: Jogosultságok
         superapp: Belső
-        title: Hitelesített alkalmazásaid
+        title: Hitelesített saját alkalmazások
     errors:
       messages:
         access_denied: Az erőforrás tulajdonosa vagy az engedélyező kiszolgáló elutasította a kérést.
@@ -129,7 +129,7 @@ hu:
         crypto: Végpontok közti titkosítás
         favourites: Kedvencek
         filters: Szűrők
-        follow: Követések, Némítások és Letiltások
+        follow: Követések, némítások és letiltások
         follows: Követések
         lists: Listák
         media: Médiamellékletek
@@ -174,6 +174,7 @@ hu:
       read:filters: szűrök megtekintése
       read:follows: követések megtekintése
       read:lists: listák megtekintése
+      read:me: csak a fiókod alapvető adatainak elolvasása
       read:mutes: némítások megtekintése
       read:notifications: értesítések megtekintése
       read:reports: bejelentések megtekintése
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index ec85df24fc..dc96599681 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -4,12 +4,21 @@ ia:
     attributes:
       doorkeeper/application:
         name: Nomine de application
+        scopes: Ambitos
         website: Sito web de application
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              invalid_uri: debe esser un URI valide.
   doorkeeper:
     applications:
       buttons:
+        authorize: Autorisar
         cancel: Cancellar
         edit: Modificar
+        submit: Submitter
       confirmations:
         destroy: Es tu secur?
       edit:
@@ -17,23 +26,39 @@ ia:
       index:
         application: Application
         delete: Deler
+        empty: Tu non ha applicationes.
         name: Nomine
         new: Nove application
+        scopes: Ambitos
         show: Monstrar
         title: Tu applicationes
       new:
         title: Nove application
       show:
         actions: Actiones
+        application_id: Clave del cliente
+        scopes: Ambitos
         title: 'Application: %{name}'
     authorizations:
+      buttons:
+        authorize: Autorisar
+        deny: Negar
       error:
         title: Ocurreva un error
+      new:
+        review_permissions: Revisionar le permissos
+        title: Autorisation necessari
     authorized_applications:
+      buttons:
+        revoke: Revocar
       confirmations:
         revoke: Es tu secur?
       index:
+        authorized_at: Autorisate le %{date}
+        last_used_at: Ultime uso in %{date}
+        never_used: Nunquam usate
         scopes: Permissiones
+        superapp: Interne
         title: Tu applicationes autorisate
     flash:
       applications:
@@ -43,16 +68,32 @@ ia:
           notice: Application delite.
         update:
           notice: Application actualisate.
+      authorized_applications:
+        destroy:
+          notice: Application revocate.
     grouped_scopes:
+      access:
+        read: Accesso de sol lectura
+        read/write: Accesso de lectura e scriptura
+        write: Accesso de sol scriptura
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
+        admin/all: Tote le functiones administrative
+        admin/reports: Gestion de reportos
+        all: Accesso plen a tu conto de Mastodon
+        blocks: Blocadas
         bookmarks: Marcapaginas
         conversations: Conversationes
         favourites: Favoritos
+        filters: Filtros
+        follows: Sequites
         lists: Listas
+        media: Annexos multimedial
+        mutes: Silentiates
         notifications: Notificationes
         push: Notificationes push
+        reports: Reportos
         search: Cercar
         statuses: Messages
     layouts:
@@ -61,8 +102,32 @@ ia:
           applications: Applicationes
           oauth2_provider: Fornitor OAuth2
     scopes:
+      admin:read: leger tote le datos in le servitor
+      admin:read:accounts: leger information sensibile de tote le contos
+      admin:write: modificar tote le datos in le servitor
+      follow: modificar relationes del contos
+      read: leger tote le datos de tu conto
+      read:accounts: vider informationes de conto
+      read:bookmarks: vider tu marcapaginas
+      read:favourites: vider tu favoritos
+      read:filters: vider tu filtros
+      read:follows: vider tu sequites
+      read:lists: vider tu listas
+      read:me: leger solmente le information basic de tu conto
+      read:notifications: vider tu notificationes
+      read:reports: vider tu reportos
+      read:statuses: vider tote le messages
+      write: modificar tote le datos de tu conto
       write:accounts: modificar tu profilo
+      write:blocks: blocar contos e dominios
+      write:bookmarks: adder messages al marcapaginas
+      write:conversations: silentiar e deler conversationes
       write:favourites: messages favorite
+      write:filters: crear filtros
+      write:follows: sequer personas
       write:lists: crear listas
+      write:media: incargar files de medios
+      write:mutes: silentiar personas e conversationes
       write:notifications: rader tu notificationes
+      write:reports: signalar altere personas
       write:statuses: publicar messages
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index 0119f3573f..fc8132c926 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -174,6 +174,7 @@ ie:
       read:filters: vider tui filtres
       read:follows: vider tui sequitores
       read:lists: vider tui listes
+      read:me: leer solmen li basic information de tui conto
       read:mutes: vider tui silentias
       read:notifications: vider tui notificationes
       read:reports: vider tui raportes
diff --git a/config/locales/doorkeeper.is.yml b/config/locales/doorkeeper.is.yml
index c1e2d4cfc3..995d507f5b 100644
--- a/config/locales/doorkeeper.is.yml
+++ b/config/locales/doorkeeper.is.yml
@@ -174,6 +174,7 @@ is:
       read:filters: skoða síurnar þínar
       read:follows: sjá hverjum þú fylgist með
       read:lists: skoða listana þína
+      read:me: lesa einungis grunnupplýsingar aðgangsins þíns
       read:mutes: skoða hverja þú þaggar
       read:notifications: sjá tilkynningarnar þínar
       read:reports: skoða skýrslurnar þína
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 3fd998fc4a..f39f784665 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -174,6 +174,7 @@ it:
       read:filters: visualizzare i tuoi filtri
       read:follows: visualizzare i tuoi seguiti
       read:lists: visualizzare i tuoi elenchi
+      read:me: leggi solo le informazioni di base del tuo account
       read:mutes: visualizzare i tuoi silenziamenti
       read:notifications: visualizzare le tue notifiche
       read:reports: visualizzare le tue segnalazioni
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 62f2a3eb0a..af61dbdcb7 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -174,6 +174,7 @@ ja:
       read:filters: フィルターの読み取り
       read:follows: フォローの読み取り
       read:lists: リストの読み取り
+      read:me: 自分のアカウントの基本的な情報の読み取りのみ
       read:mutes: ミュートの読み取り
       read:notifications: 通知の読み取り
       read:reports: 通報の読み取り
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index fe1a8d9c50..1b1a7df957 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -12,7 +12,7 @@ kab:
           attributes:
             redirect_uri:
               fragment_present: ur yezmir ad yegber afrur.
-              invalid_uri: ilaq ad tili d tansa URL tameγtut.
+              invalid_uri: ilaq ad tili d tansa URL tameɣtut.
               relative_uri: ilaq ad yili d URI amagdaz.
               secured_uri: ilaq URI ad yili HTTPS/SSL.
   doorkeeper:
@@ -36,11 +36,11 @@ kab:
         application: Asnas
         callback_url: URL n tririt n wawal
         delete: Kkes
-        empty: Ulac γur-ek·em isnasen.
+        empty: Ulac ɣur-k·m isnasen.
         name: Isem
         new: Asnas amaynut
         show: Ẓer
-        title: Isnasen-ik
+        title: Isnasen-ik·im
       new:
         title: Asnas amaynut
       show:
@@ -57,13 +57,15 @@ kab:
       new:
         title: Tlaq tsiregt
       show:
-        title: Nγel tangalt n wurag sakkin senteḍ-itt deg usnas.
+        title: Nɣel tangalt n wurag sakkin senteḍ-itt deg usnas.
     authorized_applications:
       buttons:
         revoke: Ḥwi
       confirmations:
         revoke: Tetḥeqqeḍ?
       index:
+        description_html: Ha-t-an yisnasen i izemren ad kecmen ɣer umiḍan-ik·im, s useqdec n API. Ma llan yisnasen ur teεqileḍ ara da, neɣ kra n wesnas ur iteddu ara akken ilaq, tzemreḍ ad tekkseḍ anekcum-is.
+        last_used_at: Yettwaseqdec i tikkelt taneggarut ass n %{date}
         title: Isnasen-ik·im yettusirgen
     errors:
       messages:
@@ -98,7 +100,7 @@ kab:
       application:
         title: Tlaq tsiregt n OAuth
     scopes:
-      admin:read: γeṛ akk isefka γef uqeddac
+      admin:read: ad iɣeṛ akk isefka ɣef uqeddac
       admin:write: ẓreg akk isefka γef uqeddac
       follow: beddel assaγen n umiḍan
       push: ṭṭef-d tilγa-ik yettwademren
@@ -106,20 +108,20 @@ kab:
       read:accounts: ẓer isallen n yimiḍanen
       read:blocks: ẓer imiḍanen i tesḥebseḍ
       read:bookmarks: ẓer ticraḍ-ik
-      read:filters: ẓer imsizedgen-ik
+      read:filters: ad iẓer imsizdigen-ik·im
       read:follows: ẓer imeḍfaṛen-ik
       read:lists: ẓer tibdarin-ik·im
       read:mutes: ẓer wid i tesgugmeḍ
-      read:notifications: ẓer tilγa-ik
+      read:notifications: ad ẓer tilɣa-inek·inem
       read:reports: ẓer ineqqisen-ik·im
       read:search: anadi deg umkan-ik·im
-      read:statuses: ẓer meṛṛa tisuffaγ
+      read:statuses: ẓer meṛṛa tisuffaɣ
       write: beddel meṛṛa isefka n umiḍan-ik
-      write:accounts: ẓreg amaγnu-ik
+      write:accounts: ad iẓreg amaɣnu-ik·im
       write:blocks: seḥbes imiḍanen d tγula
-      write:bookmarks: ad yernu tisuffγin γer ticraḍ
-      write:filters: rnu-d imsizedgen
+      write:bookmarks: ad yernu tisuffaɣ ɣer ticraḍ
+      write:filters: ad isnulfu imsizedgen
       write:follows: ḍfeṛ imdanen
       write:lists: ad yesnulfu tibdarin
-      write:media: ad yessali ifayluyen n teγwalt
+      write:media: ad yessali ifuyla n umidya
       write:notifications: sfeḍ tilɣa-k·m
diff --git a/config/locales/doorkeeper.ko.yml b/config/locales/doorkeeper.ko.yml
index 4721e3acdb..12674cc125 100644
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@@ -174,6 +174,7 @@ ko:
       read:filters: 필터 보기
       read:follows: 팔로우 보기
       read:lists: 리스트 보기
+      read:me: 내 계정의 기본 정보만을 읽습니다
       read:mutes: 뮤트 보기
       read:notifications: 알림 보기
       read:reports: 신고 보기
diff --git a/config/locales/doorkeeper.lad.yml b/config/locales/doorkeeper.lad.yml
index f52bac39c2..b2c140b9c2 100644
--- a/config/locales/doorkeeper.lad.yml
+++ b/config/locales/doorkeeper.lad.yml
@@ -130,7 +130,7 @@ lad:
         favourites: Favoritos
         filters: Filtros
         follow: Segimientos, silensiasyones i blokos
-        follows: Segimientos
+        follows: Segimyentos
         lists: Listas
         media: Aneksos de multimedia
         mutes: Silensiasyones
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index 1012160f62..82695d8ba6 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -19,7 +19,7 @@ lt:
   doorkeeper:
     applications:
       buttons:
-        authorize: Įgalinti
+        authorize: Leisti
         cancel: Atšaukti
         destroy: Sunaikinti
         edit: Redaguoti
@@ -31,8 +31,8 @@ lt:
       form:
         error: Ups! Patikrink, ar formoje nėra galimų klaidų.
       help:
-        native_redirect_uri: Naudoti %{native_redirect_uri} vietiniams bandymams
-        redirect_uri: Naudoti po vieną eilutę kiekvienam URI
+        native_redirect_uri: Naudok %{native_redirect_uri} vietiniams bandymams.
+        redirect_uri: Naudok po vieną eilutę kiekvienam URI.
         scopes: Atskirk aprėptis tarpais. Palik tuščią, jei nori naudoti numatytąsias aprėtis.
       index:
         application: Programėlė
@@ -55,16 +55,16 @@ lt:
         title: 'Programėlė: %{name}'
     authorizations:
       buttons:
-        authorize: Įgalinti
+        authorize: Leisti
         deny: Atmesti
       error:
         title: Įvyko klaida.
       new:
-        prompt_html: "%{client_name} norėtų gauti leidimą prieigos prie tavo paskyros. Tai trečiosios šalies programėlė. <strong>Jei ja nepasitiki, neturėtum jai leisti.</strong>"
+        prompt_html: "%{client_name} norėtų gauti leidimą prieigos prie tavo paskyros. Tai trečiosios šalies programėlė. <strong>Jei ja nepasitiki, neturėtum leisti.</strong>"
         review_permissions: Peržiūrėti leidimus
-        title: Reikalingas įgaliojimas
+        title: Reikalingas leidimas
       show:
-        title: Nukopijuok šį įgaliojimo kodą ir įklijuok jį į programėlę.
+        title: Nukopijuok šį tapatybės patvirtinimo kodą ir įklijuok jį į programėlę.
     authorized_applications:
       buttons:
         revoke: Naikinti
@@ -77,7 +77,7 @@ lt:
         never_used: Niekada nenaudotas
         scopes: Leidimai
         superapp: Vidinis
-        title: Tavo įgaliotos programėlės
+        title: Tavo leidžiamos programėlės
     errors:
       messages:
         access_denied: Išteklių savininkas (-ė) arba įgaliojimų serveris atmetė užklausą.
@@ -90,7 +90,7 @@ lt:
           request_not_authorized: Užklausą reikia įgalioti. Reikalingo parametro užklausai įgalioti trūksta arba jis netinkamas.
           unknown: Užklausoje trūksta privalomo parametro, turi nepalaikomą parametro reikšmę arba yra kitaip netinkamai suformuota.
         invalid_resource_owner: Pateikti išteklių savininko įgaliojimai yra netinkami arba išteklių savininko negalima surasti.
-        invalid_scope: Užklausos aprėptis yra netinkama, nežinoma arba netinkamai suformuota.
+        invalid_scope: Užklausos aprėptis yra netinkama, nežinoma arba netaisyklingas.
         invalid_token:
           expired: Baigėsi prieigos rakto galiojimas.
           revoked: Prieigos raktas buvo panaikintas.
@@ -126,16 +126,16 @@ lt:
         blocks: Blokavimai
         bookmarks: Žymės
         conversations: Pokalbiai
-        crypto: Galo iki galo užšifravimas
+        crypto: Visapusis šifravimas
         favourites: Mėgstami
         filters: Filtrai
         follow: Sekimai, nutildymai ir blokavimai
         follows: Sekimai
         lists: Sąrašai
         media: Medijos priedai
-        mutes: Užtildymai
+        mutes: Nutildymai
         notifications: Pranešimai
-        push: Stumdomieji pranešimai
+        push: Tiesioginiai pranešimai
         reports: Ataskaitos
         search: Paieška
         statuses: Įrašai
@@ -145,35 +145,36 @@ lt:
           applications: Programėlės
           oauth2_provider: OAuth2 teikėjas
       application:
-        title: Reikalingas OAuth įgaliojimas
+        title: Reikalingas OAuth leidimas
     scopes:
-      admin:read: skaityti visus serveryje esančius duomenis
-      admin:read:accounts: skaityti neskelbtiną visų paskyrų informaciją
-      admin:read:canonical_email_blocks: skaityti neskelbtiną visų kanoninių el. laiško blokavimų informaciją
-      admin:read:domain_allows: skaityti neskelbtiną visų domeno leidimus informaciją
-      admin:read:domain_blocks: skaityti neskelbtiną visų domeno blokavimų informaciją
-      admin:read:email_domain_blocks: skaityti neskelbtiną visų el. laiško domeno blokavimų informaciją
-      admin:read:ip_blocks: skaityti neskelbtiną visų IP blokavimų informaciją
-      admin:read:reports: skaityti neskelbtiną visų ataskaitų ir praneštų paskyrų informaciją
-      admin:write: modifikuoti visus serveryje esančius duomenis
+      admin:read: skaityti visus duomenis serveryje
+      admin:read:accounts: skaityti slaptą visų paskyrų informaciją
+      admin:read:canonical_email_blocks: skaityti slaptą visų kanoninių el. laiško blokavimų informaciją
+      admin:read:domain_allows: skaityti slaptą visų domeno leidimus informaciją
+      admin:read:domain_blocks: skaityti slaptą visų domeno blokavimų informaciją
+      admin:read:email_domain_blocks: skaityti slaptą visų el. laiško domeno blokavimų informaciją
+      admin:read:ip_blocks: skaityti slaptą visų IP blokavimų informaciją
+      admin:read:reports: skaityti slaptą visų ataskaitų ir praneštų paskyrų informaciją
+      admin:write: modifikuoti visus duomenis serveryje
       admin:write:accounts: atlikti paskyrų prižiūrėjimo veiksmus
       admin:write:canonical_email_blocks: atlikti kanoninių el. laiško blokavimų prižiūrėjimo veiksmus
-      admin:write:domain_allows: atlikti prižiūrėjimo veiksmus su domeno leidimais
-      admin:write:domain_blocks: atlikti prižiūrėjimo veiksmus su domenų blokavimais
-      admin:write:email_domain_blocks: atlikti prižiūrėjimo veiksmus su el. laiško domenų blokavimais
-      admin:write:ip_blocks: atlikti prižiūrėjimo veiksmus su IP blokavimais
-      admin:write:reports: atlikti paskyrų prižiūrėjimo veiksmus atsakaitams
-      crypto: naudoti galo iki galo šifravimą
-      follow: modifikuoti paskyros santykius
-      push: gauti tavo stumiamuosius pranešimus
-      read: skaityti tavo visus paskyros duomenis
+      admin:write:domain_allows: atlikti domeno leidimų prižiūrėjimo veiksmus
+      admin:write:domain_blocks: atlikti domeno blokavimų prižiūrėjimo veiksmus
+      admin:write:email_domain_blocks: atlikti el. laiško domenų blokavimų prižiūrėjimo veiksmus
+      admin:write:ip_blocks: atlikti IP blokavimų prižiūrėjimo veiksmus
+      admin:write:reports: atlikti ataskaitų prižiūrėjimo veiksmus
+      crypto: naudoti visapusį šifravimą
+      follow: modifikuoti paskyros sąryšius
+      push: gauti tiesioginius pranešimus
+      read: skaityti visus paskyros duomenis
       read:accounts: matyti paskyrų informaciją
       read:blocks: matyti tavo blokavimus
       read:bookmarks: matyti tavo žymes
-      read:favourites: matyti tavo mėgstamiausius
+      read:favourites: matyti tavo mėgstamus
       read:filters: matyti tavo filtrus
       read:follows: matyti tavo sekimus
       read:lists: matyti tavo sąrašus
+      read:me: skaityti tik pagrindinę paskyros informaciją
       read:mutes: matyti tavo nutildymus
       read:notifications: matyti tavo pranešimus
       read:reports: matyti tavo ataskaitas
@@ -182,14 +183,14 @@ lt:
       write: modifikuoti visus tavo paskyros duomenis
       write:accounts: modifikuoti tavo profilį
       write:blocks: blokuoti paskyras ir domenus
-      write:bookmarks: įrašyti įrašus
+      write:bookmarks: pridėti į žymes įrašus
       write:conversations: nutildyti ir ištrinti pokalbius
-      write:favourites: mėgti įrašai
+      write:favourites: pamėgti įrašus
       write:filters: sukurti filtrus
       write:follows: sekti žmones
       write:lists: sukurti sąrašus
       write:media: įkelti medijos failus
       write:mutes: nutildyti žmones ir pokalbius
       write:notifications: išvalyti tavo pranešimus
-      write:reports: pranešti kitus asmenus
+      write:reports: pranešti apie kitus žmones
       write:statuses: skelbti įrašus
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 0356c22ecb..5aa5daef3f 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -22,12 +22,12 @@ lv:
         authorize: Autorizēt
         cancel: Atcelt
         destroy: Iznīcināt
-        edit: Rediģēt
+        edit: Labot
         submit: Apstiprināt
       confirmations:
         destroy: Vai esi pārliecināts?
       edit:
-        title: Rediģēt pieteikumu
+        title: Labot lietotni
       form:
         error: Hmm! Pārbaudi, vai tavā veidlapā nav kļūdu
       help:
@@ -72,7 +72,7 @@ lv:
         revoke: Vai esi pārliecināts?
       index:
         authorized_at: Autorizētas %{date}
-        description_html: Šīs ir lietojumprogrammas, kas var piekļūt tavam kontam, izmantojot API. Ja ir lietojumprogrammas, kuras šeit neatpazīsti, vai lietojumprogramma nedarbojas pareizi, vari atsaukt tām piekļuvi.
+        description_html: Šīs ir lietotnes, kas var piekļūt Tavam kontam ar API. Ja šeit ir lietotnes, kuras neatpazīsti, vai lietotne darbojas ne tā, kā paredzēts, vari atsaukt tās piekļuvi.
         last_used_at: Pēdējo reizi lietotas %{date}
         never_used: Nekad nav lietotas
         scopes: Atļaujas
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 65e2bfcb7a..9554c0ee6f 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -164,7 +164,7 @@ nl:
       admin:write:ip_blocks: moderatieacties op geblokkeerde IP-adressen uitvoeren
       admin:write:reports: moderatieacties op rapportages uitvoeren
       crypto: end-to-end-encryptie gebruiken
-      follow: relaties tussen accounts bewerken
+      follow: volgrelaties tussen accounts bewerken
       push: jouw pushmeldingen ontvangen
       read: alle gegevens van jouw account lezen
       read:accounts: informatie accounts bekijken
@@ -174,6 +174,7 @@ nl:
       read:filters: jouw filters bekijken
       read:follows: de accounts die jij volgt bekijken
       read:lists: jouw lijsten bekijken
+      read:me: alleen de basisgegevens van jouw account lezen
       read:mutes: jouw genegeerde gebruikers bekijken
       read:notifications: jouw meldingen bekijken
       read:reports: jouw gerapporteerde berichten bekijken
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 66dd0f9093..ab0380c6fa 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -92,9 +92,9 @@ nn:
         invalid_resource_owner: Ressurseigardetaljane er ikkje gyldige, eller så er det ikkje mogleg å finna eigaren
         invalid_scope: Det etterspurte omfanget er ugyldig, ukjent eller har feil struktur.
         invalid_token:
-          expired: Tilgangsbeviset har gått ut på dato
-          revoked: Tilgangsbeviset har blitt oppheva
-          unknown: Tilgangsbeviset er ugyldig
+          expired: Innloggingsnykelen har gått ut på dato
+          revoked: Innloggingsnykelen er oppheva
+          unknown: Innloggngsnykelen er ugyldig
         resource_owner_authenticator_not_configured: Ressurseigar kunne ikkje finnast fordi Doorkeeper.configure.resource_owner_authenticator ikkje er konfigurert.
         server_error: Autoriseringstenaren støtte på ei uventa hending som hindra han i å svara på førespurnaden.
         temporarily_unavailable: Autoriseringstenaren kan ikkje hansama førespurnaden grunna kortvarig overbelastning eller tenarvedlikehald.
@@ -129,11 +129,11 @@ nn:
         crypto: Ende-til-ende-kryptering
         favourites: Favorittar
         filters: Filter
-        follow: Dei du fylgjer, målbind og blokkerer
+        follow: Dei du fylgjer, dempar og blokkerer
         follows: Fylgjer
         lists: Lister
         media: Mediavedlegg
-        mutes: Målbindingar
+        mutes: Dempingar
         notifications: Varsel
         push: Pushvarsel
         reports: Rapportar
@@ -174,6 +174,7 @@ nn:
       read:filters: sjå filtera dine
       read:follows: sjå fylgjarane dine
       read:lists: sjå listene dine
+      read:me: les berre kontoen din sin grunnleggjande informasjon
       read:mutes: sjå kven du har målbunde
       read:notifications: sjå varsla dine
       read:reports: sjå rapportane dine
@@ -183,13 +184,13 @@ nn:
       write:accounts: redigera profilen din
       write:blocks: blokker kontoar og domene
       write:bookmarks: bokmerk innlegg
-      write:conversations: målbind og slett samtalar
+      write:conversations: demp og slett samtalar
       write:favourites: favorittmarker innlegg
       write:filters: lag filter
       write:follows: fylg folk
       write:lists: lag lister
       write:media: last opp mediefiler
-      write:mutes: målbind folk og samtalar
+      write:mutes: demp folk og samtalar
       write:notifications: tøm varsla dine
       write:reports: rapporter andre folk
       write:statuses: publiser innlegg
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 226c0d403c..eefca2de65 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -174,6 +174,7 @@ pl:
       read:filters: dostęp do filtrów
       read:follows: dostęp do listy obserwowanych
       read:lists: dostęp do Twoich list
+      read:me: odczytaj tylko podstawowe informacje o koncie
       read:mutes: dostęp do listy wyciszonych
       read:notifications: możliwość odczytu powiadomień
       read:reports: dostęp do Twoich zgłoszeń
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index d7e9353b59..150b4339e4 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -174,6 +174,7 @@ pt-BR:
       read:filters: ver seus filtros
       read:follows: ver quem você segue
       read:lists: ver suas listas
+      read:me: ler só as informações básicas da sua conta
       read:mutes: ver seus silenciados
       read:notifications: ver suas notificações
       read:reports: ver suas denúncias
diff --git a/config/locales/doorkeeper.pt-PT.yml b/config/locales/doorkeeper.pt-PT.yml
index 31f6e46278..0457190cda 100644
--- a/config/locales/doorkeeper.pt-PT.yml
+++ b/config/locales/doorkeeper.pt-PT.yml
@@ -174,6 +174,7 @@ pt-PT:
       read:filters: ver os seus filtros
       read:follows: ver quem você segue
       read:lists: ver as suas listas
+      read:me: ler apenas as informações básicas da sua conta
       read:mutes: ver os utilizadores que silenciou
       read:notifications: ver as suas notificações
       read:reports: ver as suas denúncias
diff --git a/config/locales/doorkeeper.sk.yml b/config/locales/doorkeeper.sk.yml
index 91c9430b30..face9db966 100644
--- a/config/locales/doorkeeper.sk.yml
+++ b/config/locales/doorkeeper.sk.yml
@@ -5,7 +5,7 @@ sk:
       doorkeeper/application:
         name: Názov aplikácie
         redirect_uri: Presmerovacia URI
-        scopes: Pôsobnosť
+        scopes: Povolenia
         website: Webstránka aplikácie
     errors:
       models:
@@ -19,85 +19,85 @@ sk:
   doorkeeper:
     applications:
       buttons:
-        authorize: Autorizuj
-        cancel: Zruš
+        authorize: Povoliť
+        cancel: Zrušiť
         destroy: Zničiť
-        edit: Uprav
-        submit: Pošli
+        edit: Upraviť
+        submit: Odoslať
       confirmations:
-        destroy: Si si istý/á?
+        destroy: Naozaj chcete pokračovať?
       edit:
-        title: Uprav aplikáciu
+        title: Upraviť aplikáciu
       form:
-        error: No teda! Skontroluj formulár pre prípadné chyby
+        error: Ups! Skontrolujte formulár pre prípadné chyby
       help:
-        native_redirect_uri: Použi %{native_redirect_uri} pre lokálne testy
-        redirect_uri: Použi jeden riadok pre každú URI
-        scopes: Oprávnenia oddeľuj medzerami. Nechaj prázdne pre štandardné oprávnenia.
+        native_redirect_uri: Použite %{native_redirect_uri} pre lokálne testy
+        redirect_uri: Použite jeden riadok pre každú URI
+        scopes: Povolenia oddeľujte medzerami. Nechajte prázdne pre štandardné povolenia.
       index:
         application: Aplikácia
         callback_url: Návratová URL
-        delete: Vymaž
+        delete: Vymazať
         empty: Nemáte žiadne aplikácie.
         name: Názov
         new: Nová aplikácia
-        scopes: Oprávnenia
-        show: Ukáž
-        title: Tvoje aplikácie
+        scopes: Povolenia
+        show: Zobraziť
+        title: Vaše aplikácie
       new:
         title: Nová aplikácia
       show:
-        actions: Úkony
+        actions: Akcie
         application_id: Kľúč klienta
-        callback_urls: Návratové URL adresy
-        scopes: Oprávnenia
+        callback_urls: Návratové adresy URL
+        scopes: Povolenia
         secret: Tajné slovo klienta
         title: 'Aplikácia: %{name}'
     authorizations:
       buttons:
-        authorize: Over
-        deny: Zamietni
+        authorize: Povoliť
+        deny: Zakázať
       error:
         title: Nastala chyba
       new:
-        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju autorizovať.</strong>"
+        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju povoliť.</strong>"
         review_permissions: Preskúmať povolenia
-        title: Je potrebná autorizácia
+        title: Je potrebné schválenie
       show:
-        title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
+        title: Skopírujte tento overovací kód a vložte ho do aplikácie.
     authorized_applications:
       buttons:
         revoke: Zrušiť oprávnenie
       confirmations:
-        revoke: Si si istý?
+        revoke: Naozaj chcete pokračovať?
       index:
-        authorized_at: Autorizované dňa %{date}
+        authorized_at: Povolené dňa %{date}
         description_html: Ide o aplikácie, ktoré môžu pristupovať k vášmu účtu pomocou rozhrania API. Ak sa tu nachádzajú aplikácie, ktoré nepoznáte, alebo ak sa niektorá aplikácia správa nesprávne, môžete jej zrušiť prístup.
         last_used_at: Posledne použitý dňa %{date}
         never_used: Nikdy nepoužité
-        scopes: Oprávnenia
-        superapp: Interný
-        title: Tvoje povolené aplikácie
+        scopes: Povolenia
+        superapp: Interné
+        title: Vaše povolené aplikácie
     errors:
       messages:
-        access_denied: Prístup zamietnutý.
-        credential_flow_not_configured: Resource Owner Password Credentials zlyhal lebo Doorkeeper.configure.resource_owner_from_credentials nebol nakonfigurovaný.
-        invalid_client: Overenie klienta zlyhalo. Neznámy klient, chýbajú údaje o klientovi alebo nepodporovaná metóda overovania.
-        invalid_grant: Dané oprávnenie je neplatné, vypršané, zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke, alebo bolo vydané pre iný klient.
+        access_denied: Vlastník zdroja alebo autorizačný server žiadosť zamietol.
+        credential_flow_not_configured: Protokol poverení vlastníka prostriedkov narazil na chybu z dôvodu nesprávnej konfigurácie Doorkeeper.configure.resource_owner_from_credentials.
+        invalid_client: Overenie klienta zlyhalo z dôvodu neznámeho klienta, nebolo zahrnuté overenie klienta alebo nie je podporovaná metóda overovania.
+        invalid_grant: Dané povolenie je neplatné, vypršalo, bolo zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke alebo bolo vydané pre iného klienta.
         invalid_redirect_uri: Presmerovacia URI je neplatná.
         invalid_request:
           missing_param: 'Chýba požadovaný parameter: %{value}.'
-          request_not_authorized: Žiadosť je potrebné autorizovať. Chýba požadovaný parameter pre autorizáciu žiadosti alebo je neplatný.
+          request_not_authorized: Žiadosť je potrebné schváliť. Chýba požadovaný parameter pre schválenie žiadosti alebo je neplatný.
           unknown: V požiadavke chýba požadovaný parameter, obsahuje nepodporovanú hodnotu parametra alebo je inak chybne vytvorená.
         invalid_resource_owner: Uvedené prihlasovacie údaje sú neplatné alebo nenájdené
         invalid_scope: Požadovaný rozsah je neplatný, neznámy alebo poškodený.
         invalid_token:
           expired: Prístupový token expiroval
-          revoked: Prístupový token bol odňatý
+          revoked: Prístupový token bol odvolaný
           unknown: Prístupový token je neplatný
-        resource_owner_authenticator_not_configured: Resource Owner zlyhal pretože Doorkeeper.configure.resource_owner_authenticator nebol nakonfigurovaný.
-        server_error: Nastala neočakávaná chyba na autorizačnom serveri ktorá zabránila vykonať požiadavku.
-        temporarily_unavailable: Autorizačný server ťa teraz nemôže obslúžiť, pretože prebieha údržba alebo je dočasne preťažený.
+        resource_owner_authenticator_not_configured: Vyhľadávanie vlastníkov zdrojov zlyhalo, pretože Doorkeeper.configure.resource_owner_authenticator nie je nakonfigurovaný.
+        server_error: Nastala neočakávaná chyba na autorizačnom serveri, ktorá zabránila vykonať požiadavku.
+        temporarily_unavailable: Autorizačný server požiadavku teraz nemôže spracovať, pretože prebieha údržba alebo je dočasne preťažený.
         unauthorized_client: Klient nie je autorizovaný vykonať danú požiadavku týmto spôsobom.
         unsupported_grant_type: Tento typ oprávnenia nie je podporovaný autorizačným serverom.
         unsupported_response_type: Overovací server nepodporuje tento druh odpovede.
@@ -122,22 +122,22 @@ sk:
         admin/accounts: Správa účtov
         admin/all: Všetky administratívne funkcie
         admin/reports: Správa reportov
-        all: Plný prístup k tvojmu Mastodon účtu
+        all: Plný prístup k vášmu Mastodon účtu
         blocks: Blokovania
         bookmarks: Záložky
         conversations: Konverzácie
-        crypto: Šifrovanie End-to-end
-        favourites: Obľúbené
+        crypto: Šifrovanie end-to-end
+        favourites: Ohviezdičkované
         filters: Filtre
-        follow: Sledovanie, stlmenie a blokovanie
+        follow: Sledovania, stíšenia a blokovania
         follows: Sledovania
         lists: Zoznamy
         media: Mediálne prílohy
-        mutes: Nevšímané
-        notifications: Oznámenia
-        push: Push notifikácie
-        reports: Reporty
-        search: Hľadať
+        mutes: Stíšenia
+        notifications: Upozornenia
+        push: Upozornenia push
+        reports: Hlásenia
+        search: Vyhľadávanie
         statuses: Príspevky
     layouts:
       admin:
@@ -145,51 +145,51 @@ sk:
           applications: Aplikácie
           oauth2_provider: Poskytovateľ OAuth2
       application:
-        title: Požadovaná OAuth autorizácia
+        title: Požadovaná autorizácia OAuth
     scopes:
-      admin:read: prezeraj všetky dáta na serveri
-      admin:read:accounts: prezeraj chúlostivé informácie na všetkých účtoch
+      admin:read: čítať všetky dáta na serveri
+      admin:read:accounts: čítať citlivé informácie všetkých účtov
       admin:read:canonical_email_blocks: čítať citlivé informácie všetkých kanonických e-mailových blokov
       admin:read:domain_allows: čítať citlivé informácie zo všetkých povolených domén
       admin:read:domain_blocks: čítať citlivé informácie zo všetkých blokov domén
-      admin:read:email_domain_blocks: čítať citlivé informácie zo všetkých blokov emailových domén
+      admin:read:email_domain_blocks: čítať citlivé informácie zo všetkých blokov e-mailových domén
       admin:read:ip_blocks: čítať citlivé informácie zo všetkých blokov IP
-      admin:read:reports: čítaj chulostivé informácie o všetkých hláseniach a nahlásených účtoch
-      admin:write: uprav všetky dáta na serveri
-      admin:write:accounts: urob moderovacie úkony na účtoch
-      admin:write:canonical_email_blocks: vykonať akcie moderácie na kanonických emailových blokoch
-      admin:write:domain_allows: vykonať akcie moderácie na povolených doménach
-      admin:write:domain_blocks: vykonať akcie moderácie na doménových blokoch
-      admin:write:email_domain_blocks: vykonať akcie moderácie na blokoch emailových domén
-      admin:write:ip_blocks: vykonať akcie moderácie na blokoch IP
-      admin:write:reports: urob moderovacie úkony voči hláseniam
-      crypto: používať end-to-end šifrovanie
-      follow: uprav vzťahy svojho účtu
-      push: dostávaj oboznámenia ohľadom tvojho účtu na obrazovku
-      read: prezri si všetky dáta ohľadom svojho účetu
-      read:accounts: prezri si informácie o účte
-      read:blocks: prezri svoje bloky
-      read:bookmarks: pozri svoje záložky
-      read:favourites: zobraziť vaše obľúbené
-      read:filters: prezri svoje filtrovanie
-      read:follows: prezri si svoje sledovania
-      read:lists: prezri si svoje zoznamy
-      read:mutes: prezri svoje utíšenia
-      read:notifications: zhliadni svoje oboznámenia
-      read:reports: prezri svoje reporty
-      read:search: vyhľadvávaj v rámci seba
-      read:statuses: zhliadni všetky príspevky
-      write: upraviť všetky dáta tvojho účtu
-      write:accounts: uprav svoj profil
-      write:blocks: blokuj účty a domény
-      write:bookmarks: pridaj si príspevky k záložkám
-      write:conversations: stíš a vymaž konverzácie
-      write:favourites: obľúbené príspevky
-      write:filters: vytvor roztriedenie
-      write:follows: následuj ľudí
-      write:lists: vytvor listy
-      write:media: nahraj mediálne súbory
-      write:mutes: stíš diskusie, aj zapojených užívateľov
-      write:notifications: vyčisti oboznámenia
-      write:reports: nahlás iných užívateľov
-      write:statuses: publikuj príspevky
+      admin:read:reports: čítať citlivé informácie o všetkých hláseniach a nahlásených účtoch
+      admin:write: upravovať všetky dáta na serveri
+      admin:write:accounts: vykonávať moderovacie úkony na účtoch
+      admin:write:canonical_email_blocks: vykonávať moderovacie akcie na kanonických e-mailových blokoch
+      admin:write:domain_allows: vykonávať moderovacie akcie na povolených doménach
+      admin:write:domain_blocks: vykonávať moderovacie akcie na doménových blokoch
+      admin:write:email_domain_blocks: vykonávať moderovacie akcie na blokoch e-mailových domén
+      admin:write:ip_blocks: vykonávať moderovacie akcie na blokoch IP
+      admin:write:reports: vykonávať moderovacie akcie voči hláseniam
+      crypto: používať šifrovanie end-to-end
+      follow: upravovať vzťahy medzi účtami
+      push: dostávať vaše upozornenia push
+      read: čítať všetky údaje vášho účtu
+      read:accounts: čítať informácie o účtoch
+      read:blocks: čítať blokovania
+      read:bookmarks: čítať vaše záložky
+      read:favourites: čítať vaše ohviezdičkované
+      read:filters: čítať vaše filtre
+      read:follows: čítať vaše sledovania
+      read:lists: čítať vaše zoznamy
+      read:mutes: čítať vaše stíšenia
+      read:notifications: čítať vaše upozornenia
+      read:reports: čítať vaše hlásenia
+      read:search: vyhľadávať vo vašom mene
+      read:statuses: čítať všetky príspevky
+      write: upravovať všetky údaje vášho účtu
+      write:accounts: upravovať váš profil
+      write:blocks: blokovať účty a domény
+      write:bookmarks: pridávať príspevky k záložkám
+      write:conversations: stíšiť a mazať konverzácie
+      write:favourites: hviezdičkovať príspevky
+      write:filters: vytvárať filtre
+      write:follows: sledovať účty
+      write:lists: vytvárať zoznamy
+      write:media: nahrávať mediálne súbory
+      write:mutes: stíšiť účty a konverzácie
+      write:notifications: vyčistiť vaše upozornenia
+      write:reports: nahlasovať ostatných
+      write:statuses: zverejňovať príspevky
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index a613308b28..55e00ff96d 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -174,6 +174,7 @@ sl:
       read:filters: oglejte si svoje filtre
       read:follows: oglejte si svoje sledilce
       read:lists: oglejte si svoje sezname
+      read:me: preberi le osnovne podatke računa
       read:mutes: oglejte si svoje utišane
       read:notifications: oglejte si svoja obvestila
       read:reports: oglejte si svoje prijave
diff --git a/config/locales/doorkeeper.sq.yml b/config/locales/doorkeeper.sq.yml
index 308a5429a6..793819c597 100644
--- a/config/locales/doorkeeper.sq.yml
+++ b/config/locales/doorkeeper.sq.yml
@@ -174,6 +174,7 @@ sq:
       read:filters: të shohë filtrat tuaj
       read:follows: të shohë ndjekësit tuaj
       read:lists: të shohë listat tuaja
+      read:me: të shohë vetëm hollësi elementare të llogarisë tuaj
       read:mutes: të shohë ç’keni heshtuar
       read:notifications: të shohë njoftimet tuaja
       read:reports: të shohë raportimet tuaja
diff --git a/config/locales/doorkeeper.sr-Latn.yml b/config/locales/doorkeeper.sr-Latn.yml
index a4eb7bd33e..58ed5e8b68 100644
--- a/config/locales/doorkeeper.sr-Latn.yml
+++ b/config/locales/doorkeeper.sr-Latn.yml
@@ -174,6 +174,7 @@ sr-Latn:
       read:filters: pogledaj svoje filtere
       read:follows: pogledaj koga pratiš
       read:lists: pogledaj svoje liste
+      read:me: čita samo osnovne informacije o vašem nalogu
       read:mutes: pogledaj ignorisanja
       read:notifications: pogledaj svoja obaveštenja
       read:reports: pogledaj svoje prijave
diff --git a/config/locales/doorkeeper.sr.yml b/config/locales/doorkeeper.sr.yml
index a0439d6060..f40a05e90d 100644
--- a/config/locales/doorkeeper.sr.yml
+++ b/config/locales/doorkeeper.sr.yml
@@ -22,12 +22,12 @@ sr:
         authorize: Ауторизуј
         cancel: Поништи
         destroy: Уништи
-        edit: Измени
+        edit: Уреди
         submit: Пошаљи
       confirmations:
         destroy: Да ли сте сигурни?
       edit:
-        title: Измени апликацију
+        title: Уреди апликацију
       form:
         error: Опс! Проверите формулар за евентуалне грешке
       help:
@@ -174,6 +174,7 @@ sr:
       read:filters: погледај своје филтере
       read:follows: погледај кога пратиш
       read:lists: погледај своје листе
+      read:me: чита само основне информације о вашем налогу
       read:mutes: погледај игнорисања
       read:notifications: погледај своја обавештења
       read:reports: погледај своје пријаве
diff --git a/config/locales/doorkeeper.sv.yml b/config/locales/doorkeeper.sv.yml
index f2c8bd34b8..d336f08c56 100644
--- a/config/locales/doorkeeper.sv.yml
+++ b/config/locales/doorkeeper.sv.yml
@@ -174,6 +174,7 @@ sv:
       read:filters: se dina filter
       read:follows: se vem du följer
       read:lists: se dina listor
+      read:me: läs endast den grundläggande informationen för ditt konto
       read:mutes: se dina tystningar
       read:notifications: se dina notiser
       read:reports: se dina rapporter
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index 3c2c75565b..8a28566a0d 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -156,13 +156,13 @@ th:
       admin:read:ip_blocks: อ่านข้อมูลที่ละเอียดอ่อนของการปิดกั้น IP ทั้งหมด
       admin:read:reports: อ่านข้อมูลที่ละเอียดอ่อนของรายงานและบัญชีที่ได้รับการรายงานทั้งหมด
       admin:write: ปรับเปลี่ยนข้อมูลทั้งหมดในเซิร์ฟเวอร์
-      admin:write:accounts: ทำการกระทำการควบคุมบัญชี
-      admin:write:canonical_email_blocks: ทำการกระทำการควบคุมการปิดกั้นอีเมลมาตรฐาน
-      admin:write:domain_allows: ทำการกระทำการควบคุมการอนุญาตโดเมน
-      admin:write:domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมน
-      admin:write:email_domain_blocks: ทำการกระทำการควบคุมการปิดกั้นโดเมนอีเมล
-      admin:write:ip_blocks: ทำการกระทำการควบคุมการปิดกั้น IP
-      admin:write:reports: ทำการกระทำการควบคุมรายงาน
+      admin:write:accounts: ทำการกระทำการกลั่นกรองต่อบัญชี
+      admin:write:canonical_email_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นอีเมลมาตรฐาน
+      admin:write:domain_allows: ทำการกระทำการกลั่นกรองต่อการอนุญาตโดเมน
+      admin:write:domain_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นโดเมน
+      admin:write:email_domain_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้นโดเมนอีเมล
+      admin:write:ip_blocks: ทำการกระทำการกลั่นกรองต่อการปิดกั้น IP
+      admin:write:reports: ทำการกระทำการกลั่นกรองต่อรายงาน
       crypto: ใช้การเข้ารหัสแบบต้นทางถึงปลายทาง
       follow: ปรับเปลี่ยนความสัมพันธ์ของบัญชี
       push: รับการแจ้งเตือนแบบผลักของคุณ
@@ -174,6 +174,7 @@ th:
       read:filters: ดูตัวกรองของคุณ
       read:follows: ดูการติดตามของคุณ
       read:lists: ดูรายการของคุณ
+      read:me: อ่านเฉพาะข้อมูลพื้นฐานของบัญชีของคุณเท่านั้น
       read:mutes: ดูการซ่อนของคุณ
       read:notifications: ดูการแจ้งเตือนของคุณ
       read:reports: ดูรายงานของคุณ
diff --git a/config/locales/doorkeeper.tok.yml b/config/locales/doorkeeper.tok.yml
new file mode 100644
index 0000000000..6aef4fb34b
--- /dev/null
+++ b/config/locales/doorkeeper.tok.yml
@@ -0,0 +1,51 @@
+---
+tok:
+  doorkeeper:
+    applications:
+      buttons:
+        cancel: o pini
+        destroy: o weka
+        edit: o ante
+        submit: o awen
+      confirmations:
+        destroy: ni li pona ala pona?
+      edit:
+        title: o ante e ilo nanpa
+      form:
+        error: 'pakala a! o lukin e ni: lipu sina li jo ala jo e pakala.'
+      index:
+        delete: o weka
+        empty: sina li jo e ilo nanpa ala.
+        name: nimi
+        new: o pali e ilo nanpa sin
+        title: ilo nanpa sina
+      new:
+        title: o pali e ilo nanpa sin
+      show:
+        title: ilo nanpa pi nimi %{name}
+    authorizations:
+      error:
+        title: pakala li lon.
+    authorized_applications:
+      confirmations:
+        revoke: ni li pona ala pona?
+      index:
+        scopes: ken
+    errors:
+      messages:
+        invalid_request:
+          missing_param: o pana e sona "%{value}".
+    flash:
+      applications:
+        create:
+          notice: sina pali e ilo nanpa.
+        destroy:
+          notice: sina weka e ilo nanpa.
+        update:
+          notice: sina ante e ilo nanpa.
+      authorized_applications:
+        destroy:
+          notice: sina weka e ilo nanpa tawa sina.
+    grouped_scopes:
+      access:
+        read: lukin taso
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index fce8c646e8..f5ebbc5fd8 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -15,7 +15,7 @@ tr:
               fragment_present: parça içeremez.
               invalid_uri: geçerli bir URL olmalıdır.
               relative_uri: mutlaka bir URL olmalıdır.
-              secured_uri: HTTPS/SSL URL olması gerekir.
+              secured_uri: bir HTTPS/SSL URI olması gerekir.
   doorkeeper:
     applications:
       buttons:
@@ -84,7 +84,7 @@ tr:
         credential_flow_not_configured: Kaynak Sahibi Parolası Kimlik Bilgileri akışı Doorkeeper.configure.resource_owner_from_credentials 'ın yapılandırılmamış olması nedeniyle başarısız oldu.
         invalid_client: İstemcinin kimlik doğrulaması bilinmeyen istemci, istemci kimlik doğrulamasının dahil olmaması veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
         invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URL'siyle eşleşmiyor veya başka bir istemciye verilmiş.
-        invalid_redirect_uri: Dahil edilmiş yönlendirme URL'si geçersiz.
+        invalid_redirect_uri: Dahil edilmiş yönlendirme uri'si geçersiz.
         invalid_request:
           missing_param: 'Gerekli parametre eksik: %{value}.'
           request_not_authorized: İsteğin yetkilendirilmesi gerekiyor. İsteği yetkilendirmek için gereken parametre eksik veya geçersiz.
@@ -128,7 +128,7 @@ tr:
         conversations: Sohbetler
         crypto: Uçtan uca şifreleme
         favourites: Favoriler
-        filters: Filtreler
+        filters: Süzgeçler
         follow: Takipler, Sessizler ve Engeller
         follows: Takip edilenler
         lists: Listeler
@@ -161,7 +161,7 @@ tr:
       admin:write:domain_allows: alan adı izinleri için denetleme eylemleri gerçekleştirin
       admin:write:domain_blocks: alan adı engellemeleri için denetleme eylemleri gerçekleştirin
       admin:write:email_domain_blocks: e-posta alan adı engellemeleri için denetleme eylemleri gerçekleştirin
-      admin:write:ip_blocks: IP engellemeleri için denetleme eylemleri gerçekleştirin
+      admin:write:ip_blocks: ıp blokları üzerinde moderasyon eylemleri gerçekleştir
       admin:write:reports: raporlarda denetleme eylemleri gerçekleştirin
       crypto: uçtan uca şifreleme kullan
       follow: hesap ilişkilerini değiştirin
@@ -171,9 +171,10 @@ tr:
       read:blocks: engellemelerinizi görün
       read:bookmarks: yer imlerinizi görün
       read:favourites: favorilerinizi görün
-      read:filters: filtrelerinizi görün
+      read:filters: süzgeçlerinizi görün
       read:follows: takip ettiklerinizi görün
       read:lists: listelerinizi görün
+      read:me: hesabınızın sadece temel bilgilerini okuma
       read:mutes: sessize aldıklarınızı görün
       read:notifications: bildirimlerinizi görün
       read:reports: raporlarınızı görün
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index 8af404a736..ac7fbbe15d 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -180,6 +180,7 @@ uk:
       read:filters: бачити Ваші фільтри
       read:follows: бачити Ваші підписки
       read:lists: бачити Ваші списки
+      read:me: читайте лише основну інформацію вашого облікового запису
       read:mutes: бачити ваші нехтування
       read:notifications: бачити Ваші сповіщення
       read:reports: бачити Ваші скарги
diff --git a/config/locales/doorkeeper.vi.yml b/config/locales/doorkeeper.vi.yml
index 8375795273..624db9aff7 100644
--- a/config/locales/doorkeeper.vi.yml
+++ b/config/locales/doorkeeper.vi.yml
@@ -61,7 +61,7 @@ vi:
         title: Một lỗi đã xảy ra
       new:
         prompt_html: "%{client_name} yêu cầu truy cập tài khoản của bạn. Đây là ứng dụng của bên thứ ba. <strong>Nếu không tin tưởng, đừng cho phép nó.</strong>"
-        review_permissions: Xem lại quyền cho phép
+        review_permissions: Quyền truy cập
         title: Yêu cầu truy cập
       show:
         title: Sao chép mã này và dán nó vào ứng dụng.
@@ -122,7 +122,7 @@ vi:
         admin/accounts: Quản trị tài khoản
         admin/all: Mọi chức năng quản trị
         admin/reports: Quản trị báo cáo
-        all: Toàn quyền truy cập vào tài khoản Mastodon của bạn
+        all: Toàn quyền truy cập tài khoản Mastodon
         blocks: Chặn
         bookmarks: Tút đã lưu
         conversations: Thảo luận
@@ -174,6 +174,7 @@ vi:
       read:filters: xem bộ lọc
       read:follows: xem những người theo dõi
       read:lists: xem danh sách
+      read:me: chỉ đọc thông tin cơ bản tài khoản
       read:mutes: xem những người đã ẩn
       read:notifications: xem thông báo
       read:reports: xem báo cáo của bạn
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 36c7fb8127..73f1f9725c 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -174,6 +174,7 @@ zh-CN:
       read:filters: 查看你的过滤器
       read:follows: 查看你的关注
       read:lists: 查看你的列表
+      read:me: 只读取你账户的基本信息
       read:mutes: 查看你的隐藏列表
       read:notifications: 查看你的通知
       read:reports: 查看你的举报
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index 79629b12fe..76d13a74a5 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -174,6 +174,7 @@ zh-HK:
       read:filters: 檢視你的過濾條件
       read:follows: 檢視你關注的人
       read:lists: 檢視你的清單
+      read:me: 僅讀取帳號的基本資訊
       read:mutes: 檢視被你靜音的人
       read:notifications: 檢視你的通知
       read:reports: 檢視你的檢舉
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index 8ceaf36f3c..86827a7122 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -104,7 +104,7 @@ zh-TW:
     flash:
       applications:
         create:
-          notice: 已建立應用程式。
+          notice: 已新增應用程式。
         destroy:
           notice: 已刪除應用程式。
         update:
@@ -130,7 +130,7 @@ zh-TW:
         favourites: 最愛
         filters: 過濾器
         follow: 跟隨、靜音與封鎖
-        follows: 跟隨的使用者
+        follows: 正在跟隨
         lists: 列表
         media: 多媒體附加檔案
         mutes: 靜音
@@ -172,8 +172,9 @@ zh-TW:
       read:bookmarks: 檢視您的書籤
       read:favourites: 檢視您收藏之最愛嘟文
       read:filters: 檢視您的過濾條件
-      read:follows: 檢視您跟隨的人
+      read:follows: 檢視您跟隨之使用者
       read:lists: 檢視您的列表
+      read:me: 僅讀取您的帳號基本資訊
       read:mutes: 檢視您靜音的人
       read:notifications: 檢視您的通知
       read:reports: 檢視您的檢舉
@@ -185,9 +186,9 @@ zh-TW:
       write:bookmarks: 書籤狀態
       write:conversations: 靜音及刪除對話
       write:favourites: 加到最愛
-      write:filters: 建立過濾條件
+      write:filters: 新增過濾條件
       write:follows: 跟隨其他人
-      write:lists: 建立列表
+      write:lists: 新增列表
       write:media: 上傳媒體檔案
       write:mutes: 靜音使用者及對話
       write:notifications: 清除您的通知
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4c31bfdde0..2e7ac87463 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -309,6 +309,7 @@ el:
       unpublish: Αναίρεση δημοσίευσης
       unpublished_msg: Επιτυχής ακύρωση δημοσίευσης ανακοίνωσης!
       updated_msg: Επιτυχής ενημέρωση ανακοίνωσης!
+    critical_update_pending: Κρίσιμη ενημέρωση σε αναμονή
     custom_emojis:
       assign_category: Ανάθεση κατηγορίας
       by_domain: Τομέας
@@ -382,6 +383,15 @@ el:
       undo: Αφαίρεση συναλλαγής με τον τομέα
     domain_blocks:
       add_new: Προσθήκη νέου αποκλεισμού τομέα
+      confirm_suspension:
+        cancel: Άκυρο
+        confirm: Αναστολή
+        permanent_action: Η κατάργηση της αναστολής δε θα αποκαταστήσει καθόλου δεδομένα ή σχέση.
+        preamble_html: Πρόκειται να αναστείλετε το <strong>%{domain}</strong> και τους υποτομείς του.
+        remove_all_data: Αυτό θα αφαιρέσει όλο το περιεχόμενο, τα μέσα και τα δεδομένα προφίλ για τους λογαριασμούς αυτού του τομέα από το διακομιστή σας.
+        stop_communication: Ο διακομιστής σας θα σταματήσει να επικοινωνεί με αυτούς τους διακομιστές.
+        title: Επιβεβαίωση αποκλεισμού τομέα για %{domain}
+        undo_relationships: Αυτό θα αναιρέσει οποιαδήποτε σχέση ακολουθίας μεταξύ των λογαριασμών αυτών των διακομιστών και των δικών σας.
       created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
       destroyed_msg: Ο αποκλεισμός τομέα αναιρέθηκε
       domain: Τομέας
@@ -415,6 +425,7 @@ el:
       view: Εμφάνιση αποκλεισμού τομέα
     email_domain_blocks:
       add_new: Προσθήκη νέου
+      allow_registrations_with_approval: Να επιτρέπονται εγγραφές με έγκριση
       attempts_over_week:
         one: "%{count} προσπάθεια την τελευταία εβδομάδα"
         other: "%{count} προσπάθειες εγγραφής την τελευταία εβδομάδα"
@@ -524,6 +535,7 @@ el:
       total_reported: Αναφορές προς εκείνους
       total_storage: Συνημμένα πολυμέσα
       totals_time_period_hint_html: Τα σύνολα που εμφανίζονται παρακάτω περιλαμβάνουν στοιχεία από την αρχή.
+      unknown_instance: Προς το παρόν δεν υπάρχει καμία εγγραφή αυτού του τομέα σε αυτόν το διακομιστή.
     invites:
       deactivate_all: Απενεργοποίηση όλων
       filter:
@@ -600,6 +612,7 @@ el:
       created_at: Αναφέρθηκε
       delete_and_resolve: Διαγραφή αναρτήσεων
       forwarded: Προωθημένα
+      forwarded_replies_explanation: Αυτή η αναφορά είναι από απομακρυσμένο χρήστη και για απομακρυσμένο περιεχόμενο. Σας έχει διαβιβαστεί, επειδή το αναφερόμενο περιεχόμενο απαντά σε έναν από τους χρήστες σας.
       forwarded_to: Προώθημένα προς %{domain}
       mark_as_resolved: Σημείωση ως επιλυμένο
       mark_as_sensitive: Σήμανση ως ευαίσθητο
@@ -1370,7 +1383,6 @@ el:
   notifications:
     email_events: Συμβάντα για ειδοποιήσεις μέσω email
     email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
-    other_settings: Άλλες ρυθμίσεις ειδοποιήσεων
   number:
     human:
       decimal_units:
@@ -1475,6 +1487,7 @@ el:
       unknown_browser: Άγνωστος φυλλομετρητής
       weibo: Weibo
     current_session: Τρέχουσα συνεδρία
+    date: Ημερομηνία
     description: "%{browser} σε %{platform}"
     explanation: Αυτοί είναι οι φυλλομετρητές που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
     ip: IP
@@ -1511,7 +1524,6 @@ el:
     import: Εισαγωγή
     import_and_export: Εισαγωγή και εξαγωγή
     migrate: Μετακόμιση λογαριασμού
-    notifications: Ειδοποιήσεις
     preferences: Προτιμήσεις
     profile: Προφίλ
     relationships: Ακολουθείς και σε ακολουθούν
@@ -1556,8 +1568,6 @@ el:
         other: "%{count} ψήφοι"
       vote: Ψήφισε
     show_more: Δείξε περισσότερα
-    show_newer: Εμφάνιση νεότερων
-    show_older: Εμφάνιση παλαιότερων
     show_thread: Εμφάνιση νήματος
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1636,16 +1646,19 @@ el:
     webauthn: Κλειδιά ασφαλείας
   user_mailer:
     appeal_approved:
-      action: Μετάβαση στον λογαριασμό σου
+      action: Ρυθμίσεις Λογαριασμού
       explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει εγκριθεί. Ο λογαριασμός σου είναι και πάλι σε καλή κατάσταση.
       subject: Η έφεση σου από τις %{date} έχει εγκριθεί
+      subtitle: Ο λογαριασμός σας είναι για άλλη μια φορά σε καλή κατάσταση.
       title: Έφεση εγκρίθηκε
     appeal_rejected:
       explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει απορριφθεί.
       subject: Η έφεση σου από τις %{date} έχει απορριφθεί
+      subtitle: Η έφεση σου απορρίφθηκε.
       title: Έφεση απορρίφθηκε
     backup_ready:
-      explanation: Είχες ζητήσει εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για λήψη!
+      explanation: Ζητήσατε ένα πλήρες αντίγραφο ασφαλείας του λογαριασμού σας Mastodon.
+      extra: Είναι τώρα έτοιμο για λήψη!
       subject: Το αρχείο σου είναι έτοιμο για λήψη
       title: Λήψη εφεδρικού αρχείου
     suspicious_sign_in:
@@ -1687,13 +1700,7 @@ el:
         silence: Περιορισμένος λογαριασμός
         suspend: Λογαριασμός σε αναστολή
     welcome:
-      edit_profile_action: Στήσιμο προφίλ
-      edit_profile_step: Μπορείς να προσαρμόσεις το προφίλ σου ανεβάζοντας μια εικόνα προφίλ, αλλάζοντας το εμφνιζόμενο όνομα και άλλα. Μπορείς να επιλέξεις να αξιολογείς νέους ακόλουθους πριν τους επιτραπεί να σε ακολουθήσουν.
       explanation: Μερικές συμβουλές για να ξεκινήσεις
-      final_action: Ξεκίνα να αναρτάς
-      final_step: 'Ξεκίνα να δημοσιεύεις! Ακόμα και χωρίς ακόλουθους τις δημόσιες δημοσιεύσεις σου μπορεί να τις δουν άλλοι, για παράδειγμα στην τοπική ροή ή στις ετικέτες. Ίσως να θέλεις να μας γνωρίσεις τον εαυτό σου με την ετικέτα #introductions.'
-      full_handle: Το πλήρες όνομά σου
-      full_handle_hint: Αυτό θα εδώ θα πεις στους φίλους σου για να σου μιλήσουν ή να σε ακολουθήσουν από άλλο διακομιστή.
       subject: Καλώς ήρθες στο Mastodon
       title: Καλώς όρισες, %{name}!
   users:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a6e74c4836..7e31080dfa 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -425,6 +425,7 @@ en-GB:
       view: View domain block
     email_domain_blocks:
       add_new: Add new
+      allow_registrations_with_approval: Allow registrations with approval
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
@@ -596,6 +597,9 @@ en-GB:
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
+      already_suspended_badges:
+        local: Already suspended on this server
+        remote: Already suspended on their server
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       assigned: Assigned moderator
@@ -747,6 +751,7 @@ en-GB:
         desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.
         title: Require new users to solve a CAPTCHA to confirm their account
       content_retention:
+        danger_zone: Danger zone
         preamble: Control how user-generated content is stored in Mastodon.
         title: Content retention
       default_noindex:
@@ -766,6 +771,7 @@ en-GB:
         disabled: To no one
         users: To logged-in local users
       registrations:
+        moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
         preamble: Control who can create an account on your server.
         title: Registrations
       registrations_mode:
@@ -773,6 +779,7 @@ en-GB:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
+        warning_hint: We recommend using “Approval required for sign up” unless you are confident your moderation team can handle spam and malicious registrations in a timely fashion.
       security:
         authorized_fetch: Require authentication from federated servers
         authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
@@ -965,6 +972,9 @@ en-GB:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Due to a lack of recent moderator activity, registrations on %{instance} have been automatically switched to requiring manual review, to prevent %{instance} from being used as a platform for potential bad actors. You can switch it back to open registrations at any time.
+      subject: Registrations for %{instance} have been automatically switched to requiring approval
     new_appeal:
       actions:
         delete_statuses: to delete their posts
@@ -1489,7 +1499,6 @@ en-GB:
     administration_emails: Admin e-mail notifications
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
-    other_settings: Other notifications settings
   number:
     human:
       decimal_units:
@@ -1545,6 +1554,9 @@ en-GB:
     errors:
       limit_reached: Limit of different reactions reached
       unrecognized_emoji: is not a recognised emoji
+  redirects:
+    prompt: If you trust this link, click it to continue.
+    title: You are leaving %{instance}.
   relationships:
     activity: Account activity
     confirm_follow_selected_followers: Are you sure you want to follow selected followers?
@@ -1607,6 +1619,7 @@ en-GB:
       unknown_browser: Unknown Browser
       weibo: Weibo
     current_session: Current session
+    date: Date
     description: "%{browser} on %{platform}"
     explanation: These are the web browsers currently logged in to your Mastodon account.
     ip: IP
@@ -1643,14 +1656,26 @@ en-GB:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: Notifications
+    notifications: E-mail notifications
     preferences: Preferences
     profile: Profile
     relationships: Follows and followers
+    severed_relationships: Severed relationships
     statuses_cleanup: Automated post deletion
     strikes: Moderation strikes
     two_factor_authentication: Two-factor Auth
     webauthn_authentication: Security keys
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Account suspension (%{target_name})
+      domain_block: Server suspension (%{target_name})
+      user_domain_block: You blocked %{target_name}
+    lost_followers: Lost followers
+    lost_follows: Lost follows
+    preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server.
+    purged: Information about this server has been purged by your server's administrators.
+    type: Event
   statuses:
     attached:
       audio:
@@ -1688,8 +1713,6 @@ en-GB:
         other: "%{count} votes"
       vote: Vote
     show_more: Show more
-    show_newer: Show newer
-    show_older: Show older
     show_thread: Show thread
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1746,6 +1769,7 @@ en-GB:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
+    system: Automatic (use system theme)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1773,18 +1797,27 @@ en-GB:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Go to your account
+      action: Account Settings
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
       subject: Your appeal from %{date} has been approved
+      subtitle: Your account is once again in good standing.
       title: Appeal approved
     appeal_rejected:
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been rejected.
       subject: Your appeal from %{date} has been rejected
+      subtitle: Your appeal has been rejected.
       title: Appeal rejected
     backup_ready:
-      explanation: You requested a full backup of your Mastodon account. It's now ready for download!
+      explanation: You requested a full backup of your Mastodon account.
+      extra: It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    failed_2fa:
+      details: 'Here are details of the sign-in attempt:'
+      explanation: Someone has tried to sign in to your account but provided an invalid second authentication factor.
+      further_actions_html: If this wasn't you, we recommend that you %{action} immediately as it may be compromised.
+      subject: Second factor authentication failure
+      title: Failed second factor authentication
     suspicious_sign_in:
       change_password: change your password
       details: 'Here are details of the login:'
@@ -1824,13 +1857,44 @@ en-GB:
         silence: Account limited
         suspend: Account suspended
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: You can customise your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
+      apps_android_action: Get it on Google Play
+      apps_ios_action: Download on the App Store
+      apps_step: Download our official apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Let''s get you started on this new social frontier:'
+      checklist_title: Welcome Checklist
+      edit_profile_action: Personalise
+      edit_profile_step: Boost your interactions by having a comprehensive profile.
+      edit_profile_title: Personalise your profile
       explanation: Here are some tips to get you started
-      final_action: Start posting
-      final_step: 'Start posting! Even without followers, your public posts may be seen by others, for example on the local timeline or in hashtags. You may want to introduce yourself on the #introductions hashtag.'
-      full_handle: Your full handle
-      full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
+      feature_action: Learn more
+      feature_audience: Mastodon provides you with a unique possibility of managing your audience without middlemen. Mastodon deployed on your own infrastructure allows you to follow and be followed from any other Mastodon server online and is under no one's control but yours.
+      feature_audience_title: Build your audience in confidence
+      feature_control: You know best what you want to see on your home feed. No algorithms or ads to waste your time. Follow anyone across any Mastodon server from a single account and receive their posts in chronological order, and make your corner of the Internet a little more like you.
+      feature_control_title: Stay in control of your own timeline
+      feature_creativity: Mastodon supports audio, video and picture posts, accessibility descriptions, polls, content warnings, animated avatars, custom emojis, thumbnail crop control, and more, to help you express yourself online. Whether you're publishing your art, your music, or your podcast, Mastodon is there for you.
+      feature_creativity_title: Unparalleled creativity
+      feature_moderation: Mastodon puts decision making back in your hands. Each server creates their own rules and regulations, which are enforced locally and not top-down like corporate social media, making it the most flexible in responding to the needs of different groups of people. Join a server with the rules you agree with, or host your own.
+      feature_moderation_title: Moderating the way it should be
+      follow_action: Follow
+      follow_step: Following interesting people is what Mastodon is all about.
+      follow_title: Personalise your home feed
+      follows_subtitle: Follow well-known accounts
+      follows_title: Who to follow
+      follows_view_more: View more people to follow
+      hashtags_recent_count:
+        one: "%{people} person in the past 2 days"
+        other: "%{people} people in the past 2 days"
+      hashtags_subtitle: Explore what’s trending since past 2 days
+      hashtags_title: Trending hashtags
+      hashtags_view_more: View more trending hashtags
+      post_action: Compose
+      post_step: Say hello to the world with text, photos, videos, or polls.
+      post_title: Make your first post
+      share_action: Share
+      share_step: Let your friends know how to find you on Mastodon.
+      share_title: Share your Mastodon profile
+      sign_in_action: Sign in
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
   users:
@@ -1838,6 +1902,7 @@ en-GB:
     go_to_sso_account_settings: Go to your identity provider's account settings
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
+    rate_limited: Too many authentication attempts, try again later.
     seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Logged in as:'
   verification:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50f814a81d..c0b498a1a4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -33,6 +33,8 @@ en:
     accounts:
       add_email_domain_block: Block e-mail domain
       approve: Approve
+      approve_domain: Approve domain
+      approve_remote: Approve remote account
       approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
       avatar: Avatar
@@ -93,6 +95,7 @@ en:
         all: All
         disabled: Disabled
         pending: Pending
+        remote_pending: Pending (Remote)
         silenced: Limited
         suspended: Suspended
         title: Moderation
@@ -116,7 +119,9 @@ en:
       redownload: Refresh profile
       redownloaded_msg: Successfully refreshed %{username}'s profile from origin
       reject: Reject
+      reject_remote: Reject remote account
       rejected_msg: Successfully rejected %{username}'s sign-up application
+      remote_pending_hint_html: This account is currently on hold and temporarily suspended. The account must be approved before it can be made available on this server.
       remote_suspension_irreversible: The data of this account has been irreversibly deleted.
       remote_suspension_reversible_hint_html: The account has been suspended on their server, and the data will be fully removed on %{date}. Until then, the remote server can restore this account without any ill effects. If you wish to remove all of the account's data immediately, you can do so below.
       remove_avatar: Remove avatar
@@ -171,6 +176,7 @@ en:
     action_logs:
       action_types:
         approve_appeal: Approve Appeal
+        approve_remote_account: Approve Remote Account
         approve_user: Approve User
         assigned_to_self_report: Assign Report
         change_email_user: Change E-mail for User
@@ -205,9 +211,12 @@ en:
         enable_custom_emoji: Enable Custom Emoji
         enable_sign_in_token_auth_user: Enable E-mail Token Authentication for User
         enable_user: Enable User
+        force_cw_status: Add CW to Post
+        force_sensitive_status: Add Sensitive Flag to Post
         memorialize_account: Memorialize Account
         promote_user: Promote User
         reject_appeal: Reject Appeal
+        reject_remote_account: Reject Remote Account
         reject_user: Reject User
         remove_avatar_user: Remove Avatar
         reopen_report: Reopen Report
@@ -230,6 +239,7 @@ en:
         update_user_role: Update Role
       actions:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
+        approve_remote_account_html: "%{name} approved %{target} join on this server"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
         change_email_user_html: "%{name} changed the e-mail address of user %{target}"
@@ -264,11 +274,17 @@ en:
         enable_custom_emoji_html: "%{name} enabled emoji %{target}"
         enable_sign_in_token_auth_user_html: "%{name} enabled e-mail token authentication for %{target}"
         enable_user_html: "%{name} enabled login for user %{target}"
+        force_cw_status_html: "%{name} turned post by %{target} cw"
+        force_sensitive_status_html: "%{name} turned post by %{target} sensitive"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
         reject_appeal_html: "%{name} rejected moderation decision appeal from %{target}"
+        reject_remote_account_html: "%{name} rejected %{target} join on this server"
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
+        remove_history_status_html: "%{name} removed post edit histories by %{target}"
+        remove_media_status_html: "%{name} removed post medias by %{target}"
+        remove_status_status_html: "%{name} removed post by %{target}"
         reopen_report_html: "%{name} reopened report %{target}"
         resend_user_html: "%{name} resent confirmation e-mail for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
@@ -311,6 +327,8 @@ en:
       updated_msg: Announcement successfully updated!
     critical_update_pending: Critical update pending
     custom_emojis:
+      aliases: Alias names
+      aliases_hint: When searching within the pictogram picker, you can search not only by short code, but also by alias name. You can specify multiple alias names by separating them with "," (comma).
       assign_category: Assign category
       by_domain: Domain
       copied_msg: Successfully created local copy of the emoji
@@ -323,11 +341,17 @@ en:
       disable: Disable
       disabled: Disabled
       disabled_msg: Successfully disabled that emoji
+      domain: Domain
+      edit:
+        label: Edit
+        title: Edit custom emoji
       emoji: Emoji
       enable: Enable
       enabled: Enabled
       enabled_msg: Successfully enabled that emoji
       image_hint: PNG or GIF up to %{size}
+      license: License
+      license_hint: Set license information for custom pictograms. However, many servers do not support the federation of license information, and Misskey also supports license information for local pictograms, but does not reference license information from other servers. Consider that licenses may be ignored.
       list: List
       listed: Listed
       new:
@@ -344,6 +368,7 @@ en:
       update_failed_msg: Could not update that emoji
       updated_msg: Emoji successfully updated!
       upload: Upload
+      visible_in_picker: Visible in emoji picker
     dashboard:
       active_users: active users
       interactions: interactions
@@ -383,6 +408,8 @@ en:
       undo: Disallow federation with domain
     domain_blocks:
       add_new: Add new domain block
+      block_trends: Reject trends
+      block_trends_hint: Reject trends in the future
       confirm_suspension:
         cancel: Cancel
         confirm: Suspend
@@ -394,11 +421,20 @@ en:
         undo_relationships: This will undo any follow relationship between accounts of these servers and yours.
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
+      detect_invalid_subscription: Mark as a server with unauthorized subscriptions
+      detect_invalid_subscription_hint: Misskey, Calckey, and others pick up unfollowed posts from unfollowed users with the subscribe feature. Servers that mark these can refuse delivery at the user's discretion. This has nothing to do with suspension.
       domain: Domain
       edit: Edit domain block
       existing_domain_block: You have already imposed stricter limits on %{name}.
       existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
       export: Export
+      headers:
+        disagreement: Political disagreement
+        harassment: Harassment or spam
+        invalid_privacy: Privacy is not protected
+        mastodon_default: Original Mastodon supports
+      hidden: Hide
+      hidden_hint: You may choose to make this domain block private if disclosure would jeopardize the security of this server.
       import: Import
       new:
         create: Create block
@@ -417,10 +453,24 @@ en:
       private_comment_hint: Comment about this domain limitation for internal use by the moderators.
       public_comment: Public comment
       public_comment_hint: Comment about this domain limitation for the general public, if advertising the list of domain limitations is enabled.
+      reject_favourite: Reject favorites
+      reject_favourite_hint: Reject favorites or emoji-reaction in the future
+      reject_friend: Reject friend server applications
+      reject_friend_hint: Reject friend server application in the future
+      reject_hashtag: Reject hashtags
+      reject_hashtag_hint: Reject hashtags in the future
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
+      reject_new_follow: Reject follows
+      reject_new_follow_hint: Reject follows in the future
+      reject_reply_exclude_followers: Reject mentions/quotes exclude followers
+      reject_reply_exclude_followers_hint: Reject replies exclude followers in the future
       reject_reports: Reject reports
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
+      reject_send_sensitive: Do not deliver sensitive postings
+      reject_send_sensitive_hint: Fetches from the other server may not be prevented. It has nothing to do with outages.
+      reject_straight_follow: Reject straight follow
+      reject_straight_follow_hint: The server accounts must be authenticated when follow our accounts
       undo: Undo domain block
       view: View domain block
     email_domain_blocks:
@@ -467,6 +517,35 @@ en:
       suppressed: Suppressed
       title: Follow recommendations
       unsuppress: Restore follow recommendation
+    friend_servers:
+      accept: Accept
+      add_new: Add and make a new application
+      delete: Delete
+      description_html: "<strong>Friend server</strong> is a system for exchanging posts with each other's local public and local search permissions as they are."
+      disabled: Disabled
+      domain: Domain
+      edit:
+        allow_all_posts: Receive all posts
+        allow_all_posts_hint: Normally, posts from accounts that are not following anyone on your server will be blocked from acceptance, with one exception. You can unblock that block. You can reactivate the block at any time, e.g., if spam occurs.
+        available: Available
+        delivery_local: Deliver without changing public unlisted visibility and searchability
+        delivery_local_hint: Local public posts will be added the friend's global timeline
+        description: A friend server is applied to the other server at the same time as registration.
+        domain: Domain
+        inbox_url: Friend server inbox URL
+        inbox_url_hint: Default value is https://domain/inbox if you input empty (For example, https://example.com/inbox)
+        pseudo_relay: Send all public or searchable posts
+        pseudo_relay_hint: Must be valid for both parties and "Accept submissions from this server unconditionally" must be enabled on the other side
+      edit_friend: Edit
+      enabled: Enabled
+      follow: Request
+      pending: Pending
+      pending_you: Your review requested
+      reject: Reject
+      save_and_enable: Save and enable
+      setup: Add and make a new application
+      status: Status
+      title: Friend server
     instances:
       availability:
         description_html:
@@ -489,8 +568,17 @@ en:
         description_html: You can define content policies that will be applied to all accounts from this domain and any of its subdomains.
         limited_federation_mode_description_html: You can chose whether to allow federation with this domain.
         policies:
+          block_trends: Reject trends
+          detect_invalid_subscription: No subscription privacy
+          reject_favourite: Reject favorite
+          reject_friend: Reject friend server application
+          reject_hashtag: Reject hashtags
           reject_media: Reject media
+          reject_new_follow: Reject follows
+          reject_reply_exclude_followers: Reject reply/quote exclude followers
           reject_reports: Reject reports
+          reject_send_sensitive: No Sensitive Submission Delivery
+          reject_straight_follow: Reject straight follow
           silence: Limit
           suspend: Suspend
         policy: Policy
@@ -559,6 +647,146 @@ en:
         title: Create new IP rule
       no_ip_block_selected: No IP rules were changed as none were selected
       title: IP rules
+    ng_rule_histories:
+      back_to_ng_rule: Back to NG rule
+      back_to_ng_rules: Back to index
+      data:
+        media_count: "%{count} medias"
+        poll_count: "%{count} polls"
+      from_local_user: Local user
+      hidden: Private post
+      moderate_account: Moderate account
+      reason_actions:
+        reaction_emoji_reaction: Emoji reaction
+        reaction_favourite: Favourite
+        reaction_follow: Follow request
+        reaction_reblog: Boost
+        reaction_vote: Vote
+        status_create: Post
+        status_edit: Edit post
+      title: NG Rule History %{title}
+    ng_rules:
+      account_allow_followed_by_local: Check only accounts that are not followed by local users
+      account_allow_followed_by_local_hint: Use this option only if all local users with more than 1 follow are trusted
+      account_avatar_state: Has avatar or not
+      account_display_name: Name
+      account_domain: Domain
+      account_field_name: Field name
+      account_field_value: Field value
+      account_header_state: Has header or not
+      account_include_local: Contains local users
+      account_note: Account note
+      account_username: ID
+      available: Available
+      copy: Copy
+      copy_error: Copy failed.
+      edit:
+        headers:
+          account: Account
+          options: Options
+          reaction: Reaction
+          status: Post
+        helps:
+          generic: Restrictions will be in effect only if all items match the criteria.
+          textarea_html: <strong>Where multiple lines can be entered</strong>, enter conditions separated by line breaks. If any one of the multiple lines is included, the condition is considered a match. You can use a regular expression by starting a line with "?" at the beginning of a line to use a regular expression.
+          threshold_html: <strong>In specifying the upper limit</strong>, specifying "-1" disables the upper limit check. If "0" is specified, the check will pass only if the subject is completely absent. For example, an upper limit of "0" for the number of media is not equivalent to "no media.
+        history: Check the history of this rule's application.
+        summary:
+          account: Set the conditions for the account. This NG rule will be checked when an account matching here posts and reacts. No check is performed when an account is created. By default, all accounts are subject to this rule.
+          reaction: Set the reaction conditions. The account conditions must match at the same time. Please note that by default, not all reactions will match unless you set the "Reaction Type".
+          status: Set the conditions of your submission. The account conditions must match at the same time. Please note that by default, not all posts will be applicable unless you set the "Visibility" and "Searchability".
+        title: Edit NG Rule
+      emoji_reaction_name: Emoji reaction emoji or shortcode
+      emoji_reaction_origin_domain: Custom emoji origin domain
+      emoji_reaction_origin_domain_hint: If a pictogram from another server is used, the domain of the server where the pictogram was originally registered will be used.
+      index:
+        delete: Delete
+        disabled: Disabled
+        edit:
+          title: Edit
+        empty: Empty NG rules
+        empty_title: Empty title
+        hit_count: "%{count} hits on this week"
+        preamble: Some spam inevitably requires specifying conditions that are too loose, making it easier for other normal posts to become involved in the restrictions; NG rules allow you to specify details such as account and posting characteristics to reduce the number of posts that get involved as much as possible. Please consider your settings carefully and check your history regularly to minimize the involvement of normal posts.
+        title: NG Rules
+      new:
+        save: Save new NG rule
+        title: Add new NG Rule
+      reaction_allow_follower: Allow all reactions targeted at followers
+      reaction_allow_follower_hint: If enabled, reactions between other servers are unconditionally allowed
+      reaction_type: Reaction type
+      reaction_types:
+        emoji_reaction: Emoji reaction
+        favourite: Favourite
+        follow: Follow
+        reblog: Boost
+        vote: Vote
+      record_history_also_local: Local users are also subject to history recording
+      rubular: Regular Expression Checker
+      states:
+        needed: have
+        no_needed: Should not have
+        optional: Optional
+      status_allow_follower_mention: Check posts only if they contain mentions/quotes to non-followers
+      status_allow_follower_mention_hint: If enabled, mentions between other servers are unconditionally allowed
+      status_cw_state: Has warning or not
+      status_media_state: Has media or not
+      status_media_threshold: Medias limit
+      status_mention_state: Has mention or not
+      status_mention_threshold: Mentions limit
+      status_poll_state: Has poll or not
+      status_poll_threshold: Poll items limit
+      status_quote_state: Has quote or not
+      status_reference_state: Has quiet quote or not
+      status_reference_threshold: Has quiet quote or not
+      status_reply_state: Is reply or not
+      status_searchability: Searchability
+      status_sensitive_state: Is sensitive or not
+      status_spoiler_text: Content warning
+      status_tag: Tag
+      status_text: Post text
+      status_visibility: Visibility
+      test_error: Regular expression syntax is incorrect.
+      title: NG Rule
+    ng_words:
+      block_unfollow_account_mention: Reject all mentions/quotes from all accounts that do not have followers on your server
+      block_unfollow_account_mention_hint: This setting will be removed. After the setting is removed, the behavior will always be the same as if it were unchecked; please use NG rules instead.
+      deprecated: Will remove settings
+      deprecated_hint: These settings will be removed in the next LTS or kmyblue version 14.0, whichever comes first. Please refer to the description of each setting and replace them with the new settings if possible.
+      edit:
+        add_domain: Add domain
+      hide_local_users_for_anonymous: Hide timeline local user posts from anonymous
+      hide_local_users_for_anonymous_hint: This setting will be removed. After the setting is removed, the behavior will always be the same as if it were unchecked. It can be replaced, though not completely, by "Allow unauthorized access to public timelines" in the "Find" section of the server settings.
+      hold_remote_new_accounts: Hold new remote accounts
+      keywords: Reject keywords
+      keywords_for_stranger_mention: Keywords for stranger mention
+      phrases:
+        regexp_html: "<strong>Reg</strong> - If the <strong>Reg</strong> checkbox is checked, the comparison is performed using regular expressions."
+        regexp_short: Reg
+        stranger_html: "<strong>UE</strong> - Items checked under <strong>Uem</strong> apply only to mentions, replies, quotes, etc. from accounts with which you have no follow relationship."
+        stranger_short: Uem
+      post_hash_tags_max: Hash tags limit of a post
+      post_mentions_max: Mentions limit of a post
+      post_stranger_mentions_max: Mentions limit of a post
+      preamble: This setting is useful for solving problems related to spam that are difficult to address with domain blocking. You can reject posts that meet certain criteria, such as the inclusion of specific keywords. Please consider your settings carefully and check your history regularly to ensure that problem-free posts are not deleted.
+      remote_approval_hint: Newly recognized accounts with unspecified domains will be placed in Suspended status. You can review that list and approve them if necessary. If this setting is not enabled, all remote accounts will be approved immediately.
+      remote_approval_list: List of remote accounts awaiting approval
+      save_error: Has save errors
+      settings: Settings
+      stranger_mention_from_local_ng: NG words for Mention to accounts you do not follow are also applied to posts by local users.
+      stranger_mention_from_local_ng_hint: This setting will be removed. After the setting is removed, the behavior will be the same as if it is always checked. If you do not wish this behavior, please use NG rules instead.
+      test_error: Testing is returned any errors
+      title: NG words and against spams
+      white_list: White list
+      white_list_header: List of domains for immediate approval of remote accounts
+      white_list_hint: Whitelisting can be used as a last resort when exposed to severe attacks. External attacks do not disappear immediately, but they can be reduced gradually and reliably through moderation. In addition, a regular remote account approval process is required.
+    ngword_histories:
+      back_to_ng_words: NG words and against spams
+      target_types:
+        account_name: Account name
+        account_note: Account note
+        status: Post
+      title: NG words history
     relationships:
       title: "%{acct}'s relationships"
     relays:
@@ -589,6 +817,7 @@ en:
       action_taken_by: Action taken by
       actions:
         delete_description_html: The reported posts will be deleted and a strike will be recorded to help you escalate on future infractions by the same account.
+        force_cw_description_html: The sensitive message in the reported posts will be added content warning and a strike will be recorded to help you escalate on future infractions by the same account.
         mark_as_sensitive_description_html: The media in the reported posts will be marked as sensitive and a strike will be recorded to help you escalate on future infractions by the same account.
         other_description_html: See more options for controlling the account's behaviour and customize communication to the reported account.
         resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
@@ -597,6 +826,9 @@ en:
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
+      already_suspended_badges:
+        local: Already suspended on this server
+        remote: Already suspended on their server
       are_you_sure: Are you sure?
       assign_to_self: Assign to me
       assigned: Assigned moderator
@@ -611,6 +843,7 @@ en:
       confirm_action: Confirm moderation action against @%{acct}
       created_at: Reported
       delete_and_resolve: Delete posts
+      force_cw: Add warning
       forwarded: Forwarded
       forwarded_replies_explanation: This report is from a remote user and about remote content. It has been forwarded to you because the reported content is in reply to one of your users.
       forwarded_to: Forwarded to %{domain}
@@ -642,11 +875,13 @@ en:
       summary:
         action_preambles:
           delete_html: 'You are about to <strong>remove</strong> some of <strong>@%{acct}</strong>''s posts. This will:'
+          force_cw_html: 'You are about to <strong>add</strong> some of <strong>@%{acct}</strong>''s posts <strong>warning message</strong>. This will:'
           mark_as_sensitive_html: 'You are about to <strong>mark</strong> some of <strong>@%{acct}</strong>''s posts as <strong>sensitive</strong>. This will:'
           silence_html: 'You are about to <strong>limit</strong> <strong>@%{acct}</strong>''s account. This will:'
           suspend_html: 'You are about to <strong>suspend</strong> <strong>@%{acct}</strong>''s account. This will:'
         actions:
           delete_html: Remove the offending posts
+          force_cw_html: Add the offending posts warning message
           mark_as_sensitive_html: Mark the offending posts' media as sensitive
           silence_html: Severely limit <strong>@%{acct}</strong>'s reach by making their profile and contents only visible to people already following them or manually looking it profile up
           suspend_html: Suspend <strong>@%{acct}</strong>, making their profile and contents inaccessible and impossible to interact with
@@ -702,12 +937,16 @@ en:
         manage_federation_description: Allows users to block or allow federation with other domains, and control deliverability
         manage_invites: Manage Invites
         manage_invites_description: Allows users to browse and deactivate invite links
+        manage_ng_words: Manage NG words
+        manage_ng_words_description: Allows users to manage NG words. We will be very careful in handling this as it is a deligate part of the submission
         manage_reports: Manage Reports
         manage_reports_description: Allows users to review reports and perform moderation actions against them
         manage_roles: Manage Roles
         manage_roles_description: Allows users to manage and assign roles below theirs
         manage_rules: Manage Rules
         manage_rules_description: Allows users to change server rules
+        manage_sensitive_words: Manage Sentive Words
+        manage_sensitive_words_description: Allows users to manage sensitive words. Note that regular expressions are available
         manage_settings: Manage Settings
         manage_settings_description: Allows users to change site settings
         manage_taxonomies: Manage Taxonomies
@@ -732,6 +971,19 @@ en:
       edit: Edit rule
       empty: No server rules have been defined yet.
       title: Server rules
+    sensitive_words:
+      alert: This post contains sensitive words, so alert added
+      auto_warning_text: Custom warning text
+      auto_warning_text_hint: If not specified, the default warning text is used.
+      hint: This keywords is applied to public posts only..
+      phrases:
+        regexp_html: "<strong>Reg</strong> Exp checked items are compared using regular expressions."
+        regexp_short: Reg
+        remote_html: "<strong>Rem</strong> ote checked applies to remote posts as well."
+        remote_short: Rem
+        spoiler_html: "<strong>War</strong> ning checked will also be applied to the content warning statement."
+        spoiler_short: War
+      title: Sensitive words
     settings:
       about:
         manage_rules: Manage server rules
@@ -748,13 +1000,16 @@ en:
         desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.
         title: Require new users to solve a CAPTCHA to confirm their account
       content_retention:
+        danger_zone: Danger zone
         preamble: Control how user-generated content is stored in Mastodon.
         title: Content retention
       default_noindex:
         desc_html: Affects all users who have not changed this setting themselves
         title: Opt users out of search engine indexing by default
       discovery:
+        emoji_reactions: Emoji reaction
         follow_recommendations: Follow recommendations
+        friend_servers: Friend servers
         preamble: Surfacing interesting content is instrumental in onboarding new users who may not know anyone Mastodon. Control how various discovery features work on your server.
         profile_directory: Profile directory
         public_timelines: Public timelines
@@ -762,11 +1017,13 @@ en:
         publish_statistics: Publish statistics
         title: Discovery
         trends: Trends
+        visibilities: Visibilities
       domain_blocks:
         all: To everyone
         disabled: To no one
         users: To logged-in local users
       registrations:
+        moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
         preamble: Control who can create an account on your server.
         title: Registrations
       registrations_mode:
@@ -774,6 +1031,7 @@ en:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
+        warning_hint: We recommend using “Approval required for sign up” unless you are confident your moderation team can handle spam and malicious registrations in a timely fashion.
       security:
         authorized_fetch: Require authentication from federated servers
         authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
@@ -795,9 +1053,22 @@ en:
         minor: Minor release
         patch: Patch release — bugfixes and easy to apply changes
       version: Version
+    special_domains:
+      stop_fetch_activity_domains:
+        preamble: On servers with different domains for Web and Activity, you may not be able to retrieve Activity even if you access Web. In citations, this setting suppresses fetching when such a URL is specified in the body of a post. In most cases, this setting is rarely used.
+        title: Domains do not fetch for quotes
+      stop_link_preview_domains:
+        preamble: If a site temporarily restricts connections from IP addresses that have received many hits, your server may be treated unfavorably. This setting suppresses the process of accessing such sites and generating link previews. In most cases, this setting is rarely used.
+        title: Domains do not fetch for link previews
+      title: Special domains
+    special_instances:
+      emoji_reaction_disallow_domains: Domains we are not permitted emoji reaction
+      emoji_reaction_disallow_domains_hint: If you need to be considerate to your coalition partners, set the domain with a new line separator. It is not possible to put an emoji reaction on a post from a set domain.
+      title: Special servers
     statuses:
       account: Author
       application: Application
+      are_you_sure: Are you sure?
       back_to_account: Back to account page
       back_to_report: Back to report page
       batch:
@@ -805,6 +1076,8 @@ en:
         report: Report
       deleted: Deleted
       favourites: Favorites
+      force_cw: Force CW
+      force_nsfw: Force NSFW
       history: Version history
       in_reply_to: Replying to
       language: Language
@@ -815,6 +1088,9 @@ en:
       open: Open post
       original_status: Original post
       reblogs: Reblogs
+      remove: Remove post
+      remove_history: Remove edit history
+      remove_media: Remove medias
       status_changed: Post changed
       title: Account posts
       trending: Trending
@@ -939,6 +1215,9 @@ en:
           other: Used by %{count} people over the last week
       title: Trends
       trending: Trending
+    update_pendings:
+      major: Major update available
+      patch: Patch update available
     warning_presets:
       add_new: Add new
       delete: Delete
@@ -966,6 +1245,9 @@ en:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Due to a lack of recent moderator activity, registrations on %{instance} have been automatically switched to requiring manual review, to prevent %{instance} from being used as a platform for potential bad actors. You can switch it back to open registrations at any time.
+      subject: Registrations for %{instance} have been automatically switched to requiring approval
     new_appeal:
       actions:
         delete_statuses: to delete their posts
@@ -984,6 +1266,9 @@ en:
     new_pending_account:
       body: The details of the new account are below. You can approve or reject this application.
       subject: New account up for review on %{instance} (%{username})
+    new_pending_friend_server:
+      body: The new friend server %{domain} is waiting for your review. You can approve or reject this application.
+      subject: New friend server up for review on %{instance} (%{domain})
     new_report:
       body: "%{reporter} has reported %{target}"
       body_remote: Someone from %{domain} has reported %{target}
@@ -1007,17 +1292,66 @@ en:
     empty: You have no aliases.
     hint_html: If you want to move from another account to this one, here you can create an alias, which is required before you can proceed with moving followers from the old account to this one. This action by itself is <strong>harmless and reversible</strong>. <strong>The account migration is initiated from the old account</strong>.
     remove: Unlink alias
+  antennas:
+    contexts:
+      account: Accounts
+      domain: Domains
+      keyword: Keywords
+      tag: Tags
+    edit:
+      available: Available
+      description: Antenna is for all public and local public posts recognized by the server, from all accounts that have not refused to subscribe. Detected posts will be added to the specified list.
+      title: Edit antenna
+    errors:
+      duplicate_account: Duplicate account
+      duplicate_domain: Duplicate domain
+      duplicate_keyword: Duplicate keyword
+      duplicate_tag: Duplicate tag
+      empty_contexts: No contexts! You must set any context filters
+      invalid_list_owner: This list is not yours
+      limit:
+        accounts: 登録できるアカウント数の上限に達しています
+        domains: 登録できるドメイン数の上限に達しています
+        keywords: 登録できるキーワード数の上限に達しています
+        tags: 登録できるタグ数の上限に達しています
+      over_limit: You have exceeded the limit of %{limit} antennas
+      over_ltl_limit: You have exceeded the limit of %{limit} ltl antennas
+      over_stl_limit: You have exceeded the limit of %{limit} stl antennas
+      too_short_keyword: Keyword is too short
+    index:
+      accounts:
+        other: "%{count} accounts"
+      contexts: Antennas in %{contexts}
+      delete: Delete
+      disabled: Disabled
+      domains:
+        other: "%{count} domains"
+      empty: You have no antennas.
+      expires_in: Expires in %{distance}
+      expires_on: Expires on %{date}
+      keywords:
+        other: "%{count} keywords"
+      stl: This antenna is in STL mode, ignoring reject-subscription settings.
+      tags:
+        other: "%{count} tags"
+      title: Antennas
   appearance:
     advanced_web_interface: Advanced web interface
     advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.'
     animations_and_accessibility: Animations and accessibility
     confirmation_dialogs: Confirmation dialogs
+    custom_emoji_and_emoji_reactions: Custom emoji and emoji reactions
     discovery: Discovery
     localization:
       body: Mastodon is translated by volunteers.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Everyone can contribute.
+    media: Media
+    quotes: Quotes
+    remote_server_features: Other server features
+    saved_posts: Saving posts
     sensitive_content: Sensitive content
+    status_action_bar: Post menu
   application_mailer:
     notification_preferences: Change e-mail preferences
     salutation: "%{name},"
@@ -1079,6 +1413,9 @@ en:
       saml: SAML
     register: Sign up
     registration_closed: "%{instance} is not accepting new members"
+    registration_limit:
+      hint_html: The maximum number of new registrations allowed, or the time of day, is restricted by the administrator. You will not be able to complete authentication while the restriction is in effect. Please contact the administrator or wait until the restriction is lifted. If you have reached the limit, you will need to register again.
+      title: New registrations are currently restricted
     resend_confirmation: Resend confirmation link
     reset_password: Reset password
     rules:
@@ -1114,6 +1451,9 @@ en:
       view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
+  bookmark_categories:
+    errors:
+      limit: Bookmark category limit
   challenge:
     confirm: Continue
     hint_html: "<strong>Tip:</strong> We won't ask you for your password again for the next hour."
@@ -1180,6 +1520,7 @@ en:
       title_actions:
         delete_statuses: Post removal
         disable: Freezing of account
+        force_cw: Add content-warning to posts
         mark_statuses_as_sensitive: Marking of posts as sensitive
         none: Warning
         sensitive: Marking of account as sensitive
@@ -1235,6 +1576,7 @@ en:
   filters:
     contexts:
       account: Profiles
+      explore: Trends and search results
       home: Home and lists
       notifications: Notifications
       public: Public timelines
@@ -1274,6 +1616,8 @@ en:
       index:
         hint: This filter applies to select individual posts regardless of other criteria. You can add more posts to this filter from the web interface.
         title: Filtered posts
+  footer:
+    trending_now: Trending now
   generic:
     all: All
     all_items_on_page_selected_html:
@@ -1360,11 +1704,14 @@ en:
     delete: Deactivate
     expired: Expired
     expires_in:
+      '1209600': 2 weeks
       '1800': 30 minutes
       '21600': 6 hours
+      '2629746': 1 month
       '3600': 1 hour
       '43200': 12 hours
       '604800': 1 week
+      '7889238': 3 months
       '86400': 1 day
     expires_in_prompt: Never
     generate: Generate invite link
@@ -1458,6 +1805,10 @@ en:
         subject: "%{name} submitted a report"
       sign_up:
         subject: "%{name} signed up"
+    emoji_reaction:
+      body: 'Your post was reacted with emoji by %{name}:'
+      subject: "%{name} reacted your post with emoji"
+      title: New emoji reaction
     favourite:
       body: 'Your post was favorited by %{name}:'
       subject: "%{name} favorited your post"
@@ -1490,7 +1841,6 @@ en:
     administration_emails: Admin e-mail notifications
     email_events: Events for e-mail notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
-    other_settings: Other notifications settings
   number:
     human:
       decimal_units:
@@ -1529,9 +1879,17 @@ en:
       too_few_options: must have more than one item
       too_many_options: can't contain more than %{max} items
   preferences:
+    does_not_search: The full-text search feature is not available on this server. Instead, your posts will be searched according to this setting on other kmyblue servers.
+    dtl: Deep timeline
+    dtl_hint: 'You can join deep timeline with #%{tag} tag. Following settings make convenient to use deep timeline.'
+    emoji_reaction_permitting: Receiving emoji reactions
     other: Other
     posting_defaults: Posting defaults
     public_timelines: Public timelines
+    reaching: Visibility and search
+    search: Search
+    searchability: Searchability of your post
+    visibility: Visibility
   privacy:
     hint_html: "<strong>Customize how you want your profile and your posts to be found.</strong> A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
     privacy: Privacy
@@ -1540,13 +1898,29 @@ en:
     reach_hint_html: Control whether you want to be discovered and followed by new people. Do you want your posts to appear on the Explore screen? Do you want other people to see you in their follow recommendations? Do you want to accept all new followers automatically, or have granular control over each one?
     search: Search
     search_hint_html: Control how you want to be found. Do you want people to find you by what you've publicly posted about? Do you want people outside Mastodon to find your profile when searching the web? Please mind that total exclusion from all search engines cannot be guaranteed for public information.
+    search_kmyblue_hint_html: 'There are two types of post search settings in kmyblue: ''Indexable'' and ''Searchability''. indexable allows all public posts of an account to be searchable by other standard Mastodon, and changes to the setting are retroactive to past posts. Searchability can be specified on a per-post basis, and on kmyblue and Fedibird, this setting takes precedence over Indexable. Past posts cannot be changed.'
     title: Privacy and reach
+  privacy_extra:
+    hint_html: These settings are kmyblue original. You will receive additional privacy benefits by doing this setting.
+    post_processing: Processing posts
+    post_processing_hint_html: Controls additional operations that the system may perform on the information you post. These include settings that involve sending information about your submission to third party sites.
+    stop_deliver: Stop delivery
+    stop_deliver_hint_html: Mastodon posts can be freely searched by other software; privacy settings made within Mastodon will be ignored and your posts may be found by unintended people. Here, you can set up your posts so that they will not be found by other servers or software. However, there is a risk involved.
+    title: Privacy extra settings
+    will_remove_settings: This function will be removed
+    will_remove_settings_hint_html: This function will be removed kb14.0 or next LTS.
   privacy_policy:
     title: Privacy Policy
   reactions:
     errors:
+      banned: Banned reaction from the user
+      disabled: Emoji reaction is disabled on this server
+      duplication: Cannot react same things
       limit_reached: Limit of different reactions reached
       unrecognized_emoji: is not a recognized emoji
+  redirects:
+    prompt: If you trust this link, click it to continue.
+    title: You are leaving %{instance}.
   relationships:
     activity: Account activity
     confirm_follow_selected_followers: Are you sure you want to follow selected followers?
@@ -1578,6 +1952,9 @@ en:
     descriptions:
       account: Public posts from @%{acct}
       tag: 'Public posts tagged #%{hashtag}'
+  scheduled_expiration_statuses:
+    over_daily_limit: You have exceeded the limit of %{limit} scheduled expiration posts for today
+    over_total_limit: You have exceeded the limit of %{limit} scheduled expiration posts
   scheduled_statuses:
     over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
     over_total_limit: You have exceeded the limit of %{limit} scheduled posts
@@ -1609,6 +1986,7 @@ en:
       unknown_browser: Unknown Browser
       weibo: Weibo
     current_session: Current session
+    date: Date
     description: "%{browser} on %{platform}"
     explanation: These are the web browsers currently logged in to your Mastodon account.
     ip: IP
@@ -1645,14 +2023,26 @@ en:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: Notifications
+    notifications: E-mail notifications
     preferences: Preferences
     profile: Public profile
     relationships: Follows and followers
+    severed_relationships: Severed relationships
     statuses_cleanup: Automated post deletion
     strikes: Moderation strikes
     two_factor_authentication: Two-factor Auth
     webauthn_authentication: Security keys
+  severed_relationships:
+    download: Download (%{count})
+    event_type:
+      account_suspension: Account suspension (%{target_name})
+      domain_block: Server suspension (%{target_name})
+      user_domain_block: You blocked %{target_name}
+    lost_followers: Lost followers
+    lost_follows: Lost follows
+    preamble: You may lose follows and followers when you block a domain or when your moderators decide to suspend a remote server. When that happens, you will be able to download lists of severed relationships, to be inspected and possibly imported on another server.
+    purged: Information about this server has been purged by your server's administrators.
+    type: Event
   statuses:
     attached:
       audio:
@@ -1666,6 +2056,7 @@ en:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Boosted from %{acct_link}
+    contains_ng_words: The post contains NG words
     content_warning: 'Content warning: %{warning}'
     default_language: Same as interface language
     disallowed_hashtags:
@@ -1689,24 +2080,52 @@ en:
         one: "%{count} vote"
         other: "%{count} votes"
       vote: Vote
+    searchabilities:
+      direct: Reactionners
+      direct_long: Reacter of this post can find
+      direct_search_long: You can search you reacted posts only
+      limited: Self only
+      limited_long: Nobody can find, but you can
+      limited_search_long: You can search your posts only
+      private: Followers and reactionners
+      private_long: Your followers and reactionners can find
+      private_search_long: You can search you are following or reacted posts only
+      public: Public
+      public_long: Anyone can find
+      public_search_long: You can search all posts permitted to search
+      public_unlisted: Local and followers
+      public_unlisted_long: Local users and followers can find
+      unset: "(Unsupported servers)"
     show_more: Show more
-    show_newer: Show newer
-    show_older: Show older
     show_thread: Show thread
     title: '%{name}: "%{quote}"'
+    too_many_hashtags: Too many hashtags
+    too_many_mentions: Too many mentions
+    violate_rules: Violate NG rules
     visibilities:
+      circle: Circle-only
       direct: Direct
+      limited: Limited
+      login: Login-only
+      login_long: Only logined users
+      mutual: Mutual-only
       private: Followers-only
       private_long: Only show to followers
       public: Public
       public_long: Everyone can see
-      unlisted: Unlisted
+      public_unlisted: Local-public
+      public_unlisted_long: Everyone can see, but not listed on public timelines of other servers
+      reply: Reply
+      unlisted: Quiet Public (Unlisted)
       unlisted_long: Everyone can see, but not listed on public timelines
+      unset: Default
+      unset_long: Following Mastodon default behavior
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below
     exceptions: Exceptions
     explanation: Because deleting posts is an expensive operation, this is done slowly over time when the server is not otherwise busy. For this reason, your posts may be deleted a while after they reach the age threshold.
+    ignore_emojis: Ignore emoji reactions
     ignore_favs: Ignore favorites
     ignore_reblogs: Ignore boosts
     interaction_exceptions: Exceptions based on interactions
@@ -1721,6 +2140,8 @@ en:
     keep_polls_hint: Doesn't delete any of your polls
     keep_self_bookmark: Keep posts you bookmarked
     keep_self_bookmark_hint: Doesn't delete your own posts if you have bookmarked them
+    keep_self_emoji: Keep posts you reacted with emoji
+    keep_self_emoji_hint: Doesn't delete your own posts if you have reacted them with emoji
     keep_self_fav: Keep posts you favorited
     keep_self_fav_hint: Doesn't delete your own posts if you have favorited them
     min_age:
@@ -1733,6 +2154,8 @@ en:
       '63113904': 2 years
       '7889238': 3 months
     min_age_label: Age threshold
+    min_emojis: Keep posts reacted with emoji at least
+    min_emojis_hint: Doesn't delete any of your posts that has received at least this number of emoji reactions. Leave blank to delete posts regardless of their number of emojis
     min_favs: Keep posts favorited at least
     min_favs_hint: Doesn't delete any of your posts that has received at least this number of favorites. Leave blank to delete posts regardless of their number of favorites
     min_reblogs: Keep posts boosted at least
@@ -1747,7 +2170,9 @@ en:
   themes:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
+    full-dark: フルダーク
     mastodon-light: Mastodon (Light)
+    system: Automatic (use system theme)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1775,18 +2200,27 @@ en:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Go to your account
+      action: Account Settings
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
       subject: Your appeal from %{date} has been approved
+      subtitle: Your account is once again in good standing.
       title: Appeal approved
     appeal_rejected:
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been rejected.
       subject: Your appeal from %{date} has been rejected
+      subtitle: Your appeal has been rejected.
       title: Appeal rejected
     backup_ready:
-      explanation: You requested a full backup of your Mastodon account. It's now ready for download!
+      explanation: You requested a full backup of your Mastodon account.
+      extra: It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    failed_2fa:
+      details: 'Here are details of the sign-in attempt:'
+      explanation: Someone has tried to sign in to your account but provided an invalid second authentication factor.
+      further_actions_html: If this wasn't you, we recommend that you %{action} immediately as it may be compromised.
+      subject: Second factor authentication failure
+      title: Failed second factor authentication
     suspicious_sign_in:
       change_password: change your password
       details: 'Here are details of the sign-in:'
@@ -1803,6 +2237,7 @@ en:
       explanation:
         delete_statuses: Some of your posts have been found to violate one or more community guidelines and have been subsequently removed by the moderators of %{instance}.
         disable: You can no longer use your account, but your profile and other data remains intact. You can request a backup of your data, change account settings or delete your account.
+        force_cw: Some of your posts have been added warning (CW) by the moderators of %{instance}. This means that people will need to tap the text in the posts before a preview is displayed. You can add posts warning yourself when posting in the future.
         mark_statuses_as_sensitive: Some of your posts have been marked as sensitive by the moderators of %{instance}. This means that people will need to tap the media in the posts before a preview is displayed. You can mark media as sensitive yourself when posting in the future.
         sensitive: From now on, all your uploaded media files will be marked as sensitive and hidden behind a click-through warning.
         silence: You can still use your account but only people who are already following you will see your posts on this server, and you may be excluded from various discovery features. However, others may still manually follow you.
@@ -1812,6 +2247,7 @@ en:
       subject:
         delete_statuses: Your posts on %{acct} have been removed
         disable: Your account %{acct} has been frozen
+        force_cw: Your posts on %{acct} have been added warning
         mark_statuses_as_sensitive: Your posts on %{acct} have been marked as sensitive
         none: Warning for %{acct}
         sensitive: Your posts on %{acct} will be marked as sensitive from now on
@@ -1820,19 +2256,51 @@ en:
       title:
         delete_statuses: Posts removed
         disable: Account frozen
+        force_cw: Posts added warning
         mark_statuses_as_sensitive: Posts marked as sensitive
         none: Warning
         sensitive: Account marked as sensitive
         silence: Account limited
         suspend: Account suspended
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: You can customize your profile by uploading a profile picture, changing your display name and more. You can opt-in to review new followers before they’re allowed to follow you.
+      apps_android_action: Get it on Google Play
+      apps_ios_action: Download on the App Store
+      apps_step: Download our official apps.
+      apps_title: Mastodon apps
+      checklist_subtitle: 'Let''s get you started on this new social frontier:'
+      checklist_title: Welcome Checklist
+      edit_profile_action: Personalize
+      edit_profile_step: Boost your interactions by having a comprehensive profile.
+      edit_profile_title: Personalize your profile
       explanation: Here are some tips to get you started
-      final_action: Start posting
-      final_step: 'Start posting! Even without followers, your public posts may be seen by others, for example on the local timeline or in hashtags. You may want to introduce yourself on the #introductions hashtag.'
-      full_handle: Your full handle
-      full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
+      feature_action: Learn more
+      feature_audience: Mastodon provides you with a unique possibility of managing your audience without middlemen. Mastodon deployed on your own infrastructure allows you to follow and be followed from any other Mastodon server online and is under no one's control but yours.
+      feature_audience_title: Build your audience in confidence
+      feature_control: You know best what you want to see on your home feed. No algorithms or ads to waste your time. Follow anyone across any Mastodon server from a single account and receive their posts in chronological order, and make your corner of the internet a little more like you.
+      feature_control_title: Stay in control of your own timeline
+      feature_creativity: Mastodon supports audio, video and picture posts, accessibility descriptions, polls, content warnings, animated avatars, custom emojis, thumbnail crop control, and more, to help you express yourself online. Whether you're publishing your art, your music, or your podcast, Mastodon is there for you.
+      feature_creativity_title: Unparalleled creativity
+      feature_moderation: Mastodon puts decision making back in your hands. Each server creates their own rules and regulations, which are enforced locally and not top-down like corporate social media, making it the most flexible in responding to the needs of different groups of people. Join a server with the rules you agree with, or host your own.
+      feature_moderation_title: Moderating the way it should be
+      follow_action: Follow
+      follow_step: Following interesting people is what Mastodon is all about.
+      follow_title: Personalize your home feed
+      follows_subtitle: Follow well-known accounts
+      follows_title: Who to follow
+      follows_view_more: View more people to follow
+      hashtags_recent_count:
+        one: "%{people} person in the past 2 days"
+        other: "%{people} people in the past 2 days"
+      hashtags_subtitle: Explore what’s trending since past 2 days
+      hashtags_title: Trending hashtags
+      hashtags_view_more: View more trending hashtags
+      post_action: Compose
+      post_step: Say hello to the world with text, photos, videos, or polls.
+      post_title: Make your first post
+      share_action: Share
+      share_step: Let your friends know how to find you on Mastodon.
+      share_title: Share your Mastodon profile
+      sign_in_action: Sign in
       subject: Welcome to Mastodon
       title: Welcome aboard, %{name}!
   users:
@@ -1840,6 +2308,7 @@ en:
     go_to_sso_account_settings: Go to your identity provider's account settings
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
+    rate_limited: Too many authentication attempts, try again later.
     seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Signed in as:'
   verification:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8a0033ee6a..749f80687d 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -74,7 +74,7 @@ eo:
       follows: Sekvatoj
       header: Kapa bildo
       inbox_url: Enira URL
-      invite_request_text: 가입하려는 이유
+      invite_request_text: Kialoj por aliĝi
       invited_by: Invitita de
       ip: IP
       joined: Aliĝis
@@ -104,7 +104,7 @@ eo:
       no_role_assigned: Sen rolo
       not_subscribed: Ne abonita
       pending: Pritraktata recenzo
-      perform_full_suspension: Suspendi
+      perform_full_suspension: Haltigi
       previous_strikes: Antaǔaj admonoj
       previous_strikes_description_html:
         one: Ĉi tiu konto havas <strong>unu</strong> admonon.
@@ -121,7 +121,7 @@ eo:
       remote_suspension_reversible_hint_html: La konto estas suspendita, kaj la datumoj estos komplete forigitaj je %{date}. Ĝis tiam, la konto povas esti malsuspendita sen flankefiko. Se vi deziras tuj forigi ĉiujn datumojn de la konto, vi povas fari tion sube.
       remove_avatar: Forigi la profilbildon
       remove_header: Forigi kapan bildon
-      removed_avatar_msg: La rolfiguro de %{username} estas sukcese forigita
+      removed_avatar_msg: La profilbildo de %{username} estas sukcese forigita
       removed_header_msg: Kapbildo de %{username} suksece forigita
       resend_confirmation:
         already_confirmed: Ĉi tiu uzanto jam estas konfirmita
@@ -184,7 +184,7 @@ eo:
         create_domain_block: Krei Blokadon De Domajno
         create_email_domain_block: Krei Blokadon De Retpoŝta Domajno
         create_ip_block: Krei IP-regulon
-        create_unavailable_domain: Krei nehaveblan domajnon
+        create_unavailable_domain: Krei Nehaveblan Domajnon
         create_user_role: Krei Rolon
         demote_user: Malpromocii Uzanton
         destroy_announcement: Forigi Anoncon
@@ -193,9 +193,9 @@ eo:
         destroy_domain_allow: Forigi Domajnan Permeson
         destroy_domain_block: Forigi blokadon de domajno
         destroy_email_domain_block: Forigi blokadon de retpoŝta domajno
-        destroy_instance: Forigi domajnon
+        destroy_instance: Forigi Domajnon
         destroy_ip_block: Forigi IP-regulon
-        destroy_status: Forigi mesaĝon
+        destroy_status: Forigi Afiŝon
         destroy_unavailable_domain: Forigi Nehaveblan Domajnon
         destroy_user_role: Detrui Rolon
         disable_2fa_user: Malebligi 2FA
@@ -285,7 +285,7 @@ eo:
         update_custom_emoji_html: "%{name} ĝisdatigis la emoĝion %{target}"
         update_domain_block_html: "%{name} ĝisdatigis domajnblokon por %{target}"
         update_ip_block_html: "%{name} ŝanĝis regulon por IP %{target}"
-        update_status_html: "%{name} ĝisdatigis mesaĝon de %{target}"
+        update_status_html: "%{name} ĝisdatigis afiŝon de %{target}"
         update_user_role_html: "%{name} ŝanĝis la rolon %{target}"
       deleted_account: forigita konto
       empty: Neniu ĵurnalo trovita.
@@ -309,6 +309,7 @@ eo:
       unpublish: Malpublikigi
       unpublished_msg: Anonco sukcese malpublikigita!
       updated_msg: Anonco sukcese ĝisdatigis!
+    critical_update_pending: Kritika ĝisdatigo pritraktotas
     custom_emojis:
       assign_category: Atribui kategorion
       by_domain: Domajno
@@ -424,6 +425,7 @@ eo:
       view: Vidi domajna blokado
     email_domain_blocks:
       add_new: Aldoni novan
+      allow_registrations_with_approval: Permesi aliĝojn kun aprobo
       attempts_over_week:
         one: "%{count} provo ekde lasta semajno"
         other: "%{count} registroprovoj ekde lasta semajno"
@@ -565,7 +567,7 @@ eo:
       disable: Malebligi
       disabled: Malebligita
       enable: Ebligi
-      enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn mesaĝojn de la servilo al ĝi.
+      enable_hint: Post ebligo, via servilo abonos ĉiujn publikajn mesaĝojn de tiu ripetilo, kaj komencos sendi publikajn afiŝojn de la servilo al ĝi.
       enabled: Ebligita
       inbox_url: URL de la ripetilo
       pending: Atendante aprobon de la ripetilo
@@ -585,7 +587,7 @@ eo:
       action_log: Ĵurnalo de revizo
       action_taken_by: Ago farita de
       actions:
-        delete_description_html: Raportitaj mesaĝoj forigotas kaj admono rekorditas.
+        delete_description_html: Raportitaj afiŝoj estos forigita kaj admono estos rekordita por helpi vin indiki estontajn afiŝojn de la sama konto kontraŭ reguloj.
         mark_as_sensitive_description_html: La audovidaĵo en la raportita mesaĝo markotas kiel sentema kaj admono rekorditas.
         other_description_html: Vidu pli da ebloj por regi la sintenon de la konto kaj por personigi la komunikadon kun la raportita konto.
         resolve_description_html: Nenio okazotas al la raportita konto kaj la raporto fermotas.
@@ -632,7 +634,7 @@ eo:
       resolved: Solvitaj
       resolved_msg: Signalo sukcese solvita!
       skip_to_actions: Salti al agoj
-      status: Mesaĝoj
+      status: Afiŝo
       statuses: Raportita enhavo
       statuses_description_html: Sentema enhavo referencitas kun la raportita konto
       summary:
@@ -770,11 +772,22 @@ eo:
           approved: Bezonas aprobi por aliĝi
           none: Neniu povas aliĝi
           open: Iu povas aliĝi
+      security:
+        authorized_fetch: Devigi aŭtentigon de frataraj serviloj
+      title: Agordoj de la servilo
     site_uploads:
       delete: Forigi elŝutitan dosieron
       destroyed_msg: Reteja alŝuto sukcese forigita!
     software_updates:
+      critical_update: Kritika — bonvolu ĝisdatiĝi rapide
       documentation_link: Lerni pli
+      release_notes: Eldono-notoj
+      title: Disponeblaj ĝisdatigoj
+      type: Tipo
+      types:
+        major: Ĉefa eldono
+        minor: Neĉefa eldono
+      version: Versio
     statuses:
       account: Skribanto
       application: Aplikaĵo
@@ -791,12 +804,12 @@ eo:
       media:
         title: Aŭdovidaĵoj
       metadata: Metadatumoj
-      no_status_selected: Neniu mesaĝo estis ŝanĝita ĉar neniu estis elektita
+      no_status_selected: Neniu afiŝo estis ŝanĝita ĉar neniu estis elektita
       open: Malfermi afiŝojn
       original_status: Originala afiŝo
       reblogs: Reblogaĵoj
       status_changed: Afiŝo ŝanĝiĝis
-      title: Mesaĝoj de la konto
+      title: Afiŝoj de la konto
       trending: Popularaĵoj
       visibility: Videbleco
       with_media: Kun aŭdovidaĵoj
@@ -804,7 +817,7 @@ eo:
       actions:
         delete_statuses: "%{name} forigis afiŝojn de %{target}"
         disable: "%{name} frostigis la konton de %{target}"
-        mark_statuses_as_sensitive: "%{name} markis mesaĝojn de %{target} kiel sentemaj"
+        mark_statuses_as_sensitive: "%{name} markis afiŝojn de %{target} kiel tiklan"
         none: "%{name} sendis averton al %{target}"
         sensitive: "%{name} markis konton de %{target} kiel sentema"
         silence: "%{name} limigis la konton de %{target}"
@@ -815,6 +828,8 @@ eo:
     system_checks:
       database_schema_check:
         message_html: Estas pritraktataj datumbazaj migradoj. Bonvolu ekzekuti ilin por certigi, ke la apliko kondutas kiel atendite
+      elasticsearch_preset:
+        action: Legi dokumentaron
       elasticsearch_running_check:
         message_html: Ne eblas konekti Elasticsearch. Bonvolu kontroli ke ĝi funkcias, aǔ malŝaltu plentekstan serĉon
       elasticsearch_version_check:
@@ -928,7 +943,7 @@ eo:
   admin_mailer:
     new_appeal:
       actions:
-        delete_statuses: por forigi iliajn mesaĝojn
+        delete_statuses: por forigi iliajn afiŝojn
         disable: por frostigi ties konton
         mark_statuses_as_sensitive: por marki iliajn mesaĝojn kiel sentemaj
         none: averto
@@ -979,7 +994,7 @@ eo:
     unsubscribe: Malabonu
     view: 'Vidi:'
     view_profile: Vidi profilon
-    view_status: Vidi mesaĝon
+    view_status: Vidi afiŝon
   applications:
     created: Aplikaĵo sukcese kreita
     destroyed: Aplikaĵo sukcese forigita
@@ -1119,7 +1134,7 @@ eo:
       recipient: Senditas por
       reject_appeal: Malakcepti apelacion
       status: 'Afiŝo #%{id}'
-      status_removed: Mesaĝo jam forigitas de sistemo
+      status_removed: Afiŝo jam estas forigita de sistemo
       title: "%{action} de %{date}"
       title_actions:
         delete_statuses: Forigo de afiŝo
@@ -1187,8 +1202,8 @@ eo:
     edit:
       add_keyword: Aldoni ĉefvorton
       keywords: Ĉefvortoj
-      statuses: Individuaj mesaĝoj
-      statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn mesaĝojn. <a href="%{path}">Kontrolu mesaĝojn de la filtrilo</a>.
+      statuses: Individuaj afiŝoj
+      statuses_hint_html: Ĉi tiu filtrilo kongruas kelkajn afiŝojn. <a href="%{path}">Kontroli afiŝojn de la filtrilo</a>.
       title: Ŝanĝi filtrilojn
     errors:
       deprecated_api_multiple_keywords: Ĉi tiuj parametroj ne povas ŝanĝitis de ĉi tiu programaro. Uzu pli novan programaron.
@@ -1206,8 +1221,8 @@ eo:
         one: "%{count} afiŝo"
         other: "%{count} afiŝoj"
       statuses_long:
-        one: "%{count} mesaĝo kaŝita"
-        other: "%{count} mesaĝoj kaŝita"
+        one: "%{count} afiŝo estas kaŝita"
+        other: "%{count} afiŝoj estas kaŝitaj"
       title: Filtriloj
     new:
       save: Konservi novan filtrilon
@@ -1218,7 +1233,7 @@ eo:
         remove: Forigi de filtrilo
       index:
         hint: Ĉi tiu filtrilo kongruas kelkaj mesaĝoj sendepende de aliaj kriterioj.
-        title: Filtritaj mesaĝoj
+        title: Filtritaj afiŝoj
   generic:
     all: Ĉio
     all_items_on_page_selected_html:
@@ -1259,6 +1274,9 @@ eo:
       overwrite: Anstataŭigi
       overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
     preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
+    states:
+      finished: Finita
+      unconfirmed: Nekonfirmita
     success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite
     titles:
       following: Importado de sekvaj kontoj
@@ -1410,7 +1428,6 @@ eo:
     administration_emails: Admin retpoŝtaj sciigoj
     email_events: Eventoj por retpoŝtaj sciigoj
     email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
-    other_settings: Aliaj agordoj de sciigoj
   number:
     human:
       decimal_units:
@@ -1528,6 +1545,7 @@ eo:
       unknown_browser: Nekonata retumilo
       weibo: Weibo
     current_session: Nuna seanco
+    date: Dato
     description: "%{browser} en %{platform}"
     explanation: Ĉi tiuj estas la retumiloj nun ensalutintaj al via Mastodon-konto.
     ip: IP
@@ -1564,7 +1582,6 @@ eo:
     import: Enporti
     import_and_export: Importi kaj eksporti
     migrate: Konta migrado
-    notifications: Sciigoj
     preferences: Preferoj
     profile: Profilo
     relationships: Sekvatoj kaj sekvantoj
@@ -1609,8 +1626,6 @@ eo:
         other: "%{count} voĉdonoj"
       vote: Voĉdoni
     show_more: Montri pli
-    show_newer: Montri pli novajn
-    show_older: Montri pli malnovajn
     show_thread: Montri la mesaĝaron
     title: "%{name}: “%{quote}”"
     visibilities:
@@ -1632,16 +1647,16 @@ eo:
     interaction_exceptions_explanation: Sciu ke estas neniu garantio ke mesaĝo estos forigita se ĝi iras sub la limo de diskonigoj aŭ stelumoj post atingi ĝin.
     keep_direct: Konservi rektajn mesaĝojn
     keep_direct_hint: Ne forigos viajn rektajn mesagôjn
-    keep_media: Konservi mesaĝojn kun aŭdovidaj aldonaĵoj
+    keep_media: Konservi afiŝojn kun aŭdovidaj aldonaĵoj
     keep_media_hint: Ne forigi mesaĝojn kiuj enhavas aŭdovidajn aldonaĵojn
-    keep_pinned: Konservi alpinglitajn mesaĝojn
+    keep_pinned: Konservi alpinglitajn afiŝojn
     keep_pinned_hint: Ne forigi viajn ajn alpinglitajn mesaĝojn
     keep_polls: Konservi enketojn
     keep_polls_hint: Ne forigi viajn ajn enketojn
-    keep_self_bookmark: Konservi mesaĝojn kiun vi legsignis
+    keep_self_bookmark: Konservi afiŝojn kiun vi legsignis
     keep_self_bookmark_hint: Ne forigi viajn siajn mesaĝojn se vi legsignis ilin
-    keep_self_fav: Konservi mesaĝojn kiujn vi stelumis
-    keep_self_fav_hint: Ne forigi proprajn mesaĝojn se vi stelumis ilin
+    keep_self_fav: Konservi afiŝojn kiujn vi stelumis
+    keep_self_fav_hint: Ne forigi proprajn afiŝojn se vi stelumis ilin
     min_age:
       '1209600': 2 semajnoj
       '15778476': 6 monatoj
@@ -1652,7 +1667,7 @@ eo:
       '63113904': 2 jaroj
       '7889238': 3 monatoj
     min_age_label: Aĝlimo
-    min_favs: Konservi mesaĝojn stelumitajn almenaŭ
+    min_favs: Konservi afiŝojn stelumitajn almenaŭ
     min_favs_hint: Oni ne forigas viajn afiŝojn, kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
     min_reblogs: Konservi diskonitajn mesaĝojn almenau
     min_reblogs_hint: Oni ne forigas viajn afiŝojn kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
@@ -1693,7 +1708,7 @@ eo:
     webauthn: Sekurecaj ŝlosiloj
   user_mailer:
     appeal_approved:
-      action: Iri al via konto
+      action: Konto-agordoj
       explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
       subject: Via apelacio de %{date} aprobitas
       title: Apelacio estis aprobita
@@ -1702,7 +1717,7 @@ eo:
       subject: Via apelacio de %{date} estis malaprobita
       title: Apelacio estis malaprobita
     backup_ready:
-      explanation: Vi petis kompletan arkivon de via Mastodon-konto. Ĝi nun pretas por elŝutado!
+      extra: Estas nun preta por elŝuto!
       subject: Via arkivo estas preta por elŝutado
       title: Arkiva elŝuto
     suspicious_sign_in:
@@ -1726,11 +1741,11 @@ eo:
         silence: Vi ankorau povas uzi vian konton, sed nur personoj kiuj jam sekvas vin vidos viajn mesaĝojn en tiu ĉi servilo, kaj vi eble estos ekskluzive el diversaj malkovrigaj funkcioj. Tamen, aliaj ankoraŭ povas permane eksekvi vin.
         suspend: Vi ne povas uzi vian konton plu, kaj via profilo kaj aliaj datumoj ne estas disponeblaj plu.
       reason: 'Kialo:'
-      statuses: 'Mesaĝoj ripetitaj:'
+      statuses: 'Afiŝoj citataj:'
       subject:
-        delete_statuses: Viaj mesaĝoj ĉe %{acct} forigitas
+        delete_statuses: Viaj afiŝoj ĉe %{acct} estas forigitaj
         disable: Via konto %{acct} estas frostigita
-        mark_statuses_as_sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj
+        mark_statuses_as_sensitive: Viaj afiŝoj ĉe %{acct} estas markitaj kiel tiklemaj
         none: Averto por %{acct}
         sensitive: Viaj mesaĝoj ĉe %{acct} markitas kiel sentemaj malantau ol nun
         silence: Oni limigis vian konton %{acct}
@@ -1744,13 +1759,7 @@ eo:
         silence: Konto limigita
         suspend: Konto suspendita
     welcome:
-      edit_profile_action: Agordi profilon
-      edit_profile_step: Vi povas personecigi vian profilon per alŝuti profilbildon, ŝangi vian montronomo kaj pli.
       explanation: Jen kelkaj konsiloj por helpi vin komenci
-      final_action: Ekmesaĝi
-      final_step: 'Ekmesaĝu! Eĉ sen sekvantoj, viaj publikaj mesaĝoj povas esti vidataj de aliaj, ekzemple en la loka templinio aŭ per kradvortoj. Eble vi ŝatus prezenti vin per la kradvorto #introductions / #konigo.'
-      full_handle: Via kompleta uzantnomo
-      full_handle_hint: Jen kion vi dirus al viaj amikoj, por ke ili mesaĝu aŭ sekvu vin de alia servilo.
       subject: Bonvenon en Mastodon
       title: Bonvenon, %{name}!
   users:
@@ -1758,6 +1767,7 @@ eo:
     go_to_sso_account_settings: Iru al la agordoj de la konto de via identeca provizanto
     invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
+    rate_limited: Estas tro multaj aŭtentigaj provoj, reprovu poste.
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
     signed_in_as: 'Salutinta kiel:'
   verification:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index f214c92d2a..aa3668d92a 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -597,6 +597,9 @@ es-AR:
       actions_description_html: Decidí qué medidas tomar para resolver esta denuncia. Si tomás una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decidí qué medidas tomar para resolver esta denuncia. Esto sólo afectará la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y maneja su contenido.
       add_to_report: Agregar más a la denuncia
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
@@ -748,6 +751,7 @@ es-AR:
         desc_html: Esto depende de scripts externos de hCaptcha, que pueden ser una preocupación de seguridad y privacidad. Además, <strong>esto puede hacer el proceso de registro significativamente menos accesible para algunas personas (especialmente para gente con discapacidades)</strong>. Por estas razones, por favor, considerá medidas alternativas, como el registro basado en la aprobación o la invitación.
         title: Solicitar a los nuevos usuarios que resuelvan una CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona de peligro
         preamble: Controlá cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
@@ -767,6 +771,7 @@ es-AR:
         disabled: A nadie
         users: A usuarios locales con sesiones abiertas
       registrations:
+        moderation_recommandation: Por favor, ¡asegurate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todos!
         preamble: Controlá quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +779,7 @@ es-AR:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de la opción “Se requiere aprobación para registrarse”, a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos de forma oportuna.
       security:
         authorized_fetch: Requiere autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloques de nivel de usuario como de nivel de servidor. Sin embargo, esto se produce a costa de una penalidad en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus mensajes y cuentas públicas.
@@ -966,6 +972,9 @@ es-AR:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido a la falta de actividad reciente por parte de moderadores, los registros en %{instance} fueron cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se use como una plataforma para potenciales malos actores. Podés volver a cambiar esto para abrir los registros en cualquier momento.
+      subject: Los registros de %{instance} se cambiaron automáticamente para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
@@ -1038,7 +1047,7 @@ es-AR:
     apply_for_account: Solicitar una cuenta
     captcha_confirmation:
       help_html: Si tenés problemas resolviendo la CAPTCHA, podés ponerte en contacto con nosotros a través de %{email} y te vamos a ayudar.
-      hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar".
+      hint_html: ¡Solo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resolvé la CAPTCHA abajo y hacé clic en "Continuar".
       title: Comprobación de seguridad
     confirmations:
       awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
@@ -1490,7 +1499,6 @@ es-AR:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Seleccioná los eventos para los que querés recibir notificaciones:'
-    other_settings: Configuración de otras notificaciones
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ es-AR:
     errors:
       limit_reached: Se alcanzó el límite de reacciones diferentes
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confiás en este enlace, dale clic o un toque para continuar.
+    title: Estás dejando %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro que querés seguir a los seguidores seleccionados?"
@@ -1608,6 +1619,7 @@ es-AR:
       unknown_browser: "[Navegador web desconocido]"
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web en los que actualmente iniciaste sesión en tu cuenta de Mastodon.
     ip: Dirección IP
@@ -1644,14 +1656,26 @@ es-AR:
     import: Importar
     import_and_export: Importación y exportación
     migrate: Migración de la cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Configuración
     profile: Perfil público
     relationships: Seguimientos
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación auto. de mensajes
     strikes: Moderación de incumplimientos
     two_factor_authentication: Aut. de dos factores
     webauthn_authentication: Llaves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión de cuenta (%{target_name})
+      user_domain_block: Bloqueaste a %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Podés perder seguidores y cuentas seguidas cuando bloqueás un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, vas a poder descargar listas de relaciones cortadas, que serán inspectadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor fue purgada por los administradores de tu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ es-AR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar hilo
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1718,10 +1740,10 @@ es-AR:
     keep_pinned_hint: No elimina ninguno de tus mensajes fijados
     keep_polls: Conservar encuestas
     keep_polls_hint: No elimina ninguna de tus encuestas
-    keep_self_bookmark: Conservar mensajes que marcaste como favoritos
-    keep_self_bookmark_hint: No elimina tus propios mensajes si los marcaste como favoritos
-    keep_self_fav: Conservar mensajes marcados como favoritos
-    keep_self_fav_hint: No elimina tus propios mensajes si los marcaste como favoritos
+    keep_self_bookmark: Conservar mensajes que enviaste a Marcadores
+    keep_self_bookmark_hint: No elimina tus propios mensajes si los enviaste a Marcadores
+    keep_self_fav: Conservar mensajes que enviaste a Favoritos
+    keep_self_fav_hint: No elimina tus propios mensajes si los enviaste a Favoritos
     min_age:
       '1209600': 2 semanas
       '15778476': 6 meses
@@ -1747,6 +1769,7 @@ es-AR:
     contrast: Alto contraste
     default: Oscuro
     mastodon-light: Claro
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%Y.%b.%d, %H:%M"
@@ -1774,18 +1797,27 @@ es-AR:
     webauthn: Llaves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Configuración de la cuenta
       explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} fue aprobada
+      subtitle: Tu cuenta está, de nuevo, en perfecto estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} fue rechazada
+      subtitle: Se rechazó tu apelación.
       title: Apelación rechazada
     backup_ready:
-      explanation: Solicitaste un resguardo completo de tu cuenta de Mastodon. ¡Ya está listo para descargar!
+      explanation: Solicitaste una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está lista para descargar!"
       subject: Tu archivo historial está listo para descargar
       title: Descargar archivo historial
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien intentó iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación no válido.
+      further_actions_html: Si vos no fuiste, te recomendamos que %{action} inmediatamente, ya que la seguridad de tu cuenta podría estar comprometida.
+      subject: Fallo de autenticación del segundo factor
+      title: Fallo en la autenticación del segundo factor
     suspicious_sign_in:
       change_password: cambiés tu contraseña
       details: 'Acá están los detalles del inicio de sesión:'
@@ -1825,13 +1857,44 @@ es-AR:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Podés personalizar tu perfil subiendo un avatar (imagen de perfil), cambiando tu nombre a mostrar y más. Podés optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Conseguila en Google Play
+      apps_ios_action: Descargala desde la App Store
+      apps_step: Descargá nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones de Mastodon
+      checklist_subtitle: 'Vamos a iniciarte en esta nueva experiencia social:'
+      checklist_title: Repaso de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Completá tu perfil para aumentar las posibilidades de interacción.
+      edit_profile_title: Personalizá tu perfil
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezá a enviar mensajes
-      final_step: "¡Empezá a enviar mensajes! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea temporal local o al usar etiquetas. Capaz que quieras presentarte al mundo con la etiqueta «#presentación»."
-      full_handle: Tu nombre de usuario completo
-      full_handle_hint: Esto es lo que le dirás a tus contactos para que ellos puedan enviarte mensajes o seguirte desde otro servidor.
+      feature_action: Aprendé más
+      feature_audience: Mastodon te ofrece la posibilidad única de gestionar tu audiencia sin intermediarios. Mastodon desplegado en tu propia infraestructura te permite seguir a otras cuentas, y que te sigan desde cualquier otro servidor en línea de Mastodon y no estar bajo el control de nadie más, excepto el tuyo.
+      feature_audience_title: Construí tu audiencia en confianza
+      feature_control: Vos sabés bien que querés tener en tu línea temporal principal. Nada de algoritmos o publicidades que desperdicien tu tiempo. Seguí cualquier cuenta de cualquier servidor de Mastodon desde la tuya propia y recibí sus mensajes en orden cronológico, haciendo tu espacio de Internet un lugar más personalizado.
+      feature_control_title: Tené el control de tu propia línea temporal
+      feature_creativity: Mastodon soporta mensajes con audio, videos e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizables, control de recorte de miniaturas, y más; todo para ayudarte a expresarte en línea. Ya sea que estés publicando tu arte, tu música o tu podcast, Mastodon está ahí para vos.
+      feature_creativity_title: Creatividad sin paralelos
+      feature_moderation: Mastodon vuelve a poner el poder de decisión en tus manos. Cada servidor crea sus propias reglas y regulaciones, las cuales se aplican localmente y no de arriba hacia abajo como las redes sociales corporativas, volviendo a Mastodon la red social más flexible en respuesta a las necesidades de diferentes grupos de personas. Unite a un servidor con cuyas reglas estés de acuerdo, o montá tu propio servidor.
+      feature_moderation_title: Moderando como debería ser
+      follow_action: Seguir
+      follow_step: Seguir cuentas interesantes es de lo que se trata Mastodon.
+      follow_title: Personalizá tu línea de tiempo principal
+      follows_subtitle: Seguí cuentas populares
+      follows_title: A quién seguir
+      follows_view_more: Encontrá más cuentas para seguir
+      hashtags_recent_count:
+        one: "%{people} cuenta en los últimos 2 días"
+        other: "%{people} cuenta en los últimos 2 días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencias
+      post_action: Redactar
+      post_step: Decile "Hola" al mundo con textos, fotos, videos o encuestas.
+      post_title: Escribí tu primer mensaje
+      share_action: Compartir
+      share_step: Hacé que tus amistades sepan cómo encontrarte en Mastodon.
+      share_title: Compartí tu perfil de Mastodon
+      sign_in_action: Iniciá sesión
       subject: Bienvenido a Mastodon
       title: "¡Bienvenido a bordo, %{name}!"
   users:
@@ -1839,6 +1902,7 @@ es-AR:
     go_to_sso_account_settings: Andá a la configuración de cuenta de tu proveedor de identidad
     invalid_otp_token: Código de dos factores no válido
     otp_lost_help_html: Si perdiste al acceso a ambos, podés ponerte en contacto con %{email}
+    rate_limited: Demasiados intentos de autenticación; intentá de nuevo más tarde.
     seamless_external_login: Iniciaste sesión desde un servicio externo, así que la configuración de contraseña y correo electrónico no están disponibles.
     signed_in_as: 'Iniciaste sesión como:'
   verification:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 7f5b282873..6a306b07b0 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -597,6 +597,9 @@ es-MX:
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
       add_to_report: Añadir más al reporte
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
@@ -748,6 +751,7 @@ es-MX:
         desc_html: Esto se basa en scripts externos de hCaptcha, que pueden suponer una preocupación de seguridad y privacidad. Además, <strong>esto puede volver el proceso de registro significativamente menos accesible para algunas personas (especialmente con discapacidades)</strong>. Por estas razones, por favor, considera medidas alternativas como el registro por aprobación manual o con invitación.
         title: Solicita a los nuevos usuarios que resuelvan un CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona peligrosa
         preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
@@ -767,6 +771,7 @@ es-MX:
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
       registrations:
+        moderation_recommandation: "¡Por favor, asegúrate de contar con un equipo de moderación adecuado y activo antes de abrir el registro al público!"
         preamble: Controla quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +779,7 @@ es-MX:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de la "Aprobación requerida para el registro", a menos de que confíes en que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
       security:
         authorized_fetch: Requerir autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloqueos a nivel de usuario como a nivel de servidor. Sin embargo, esto se produce a costa de una penalización en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus cuentas y publicaciones públicas.
@@ -966,6 +972,9 @@ es-MX:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido al faltante de actividad reciente de moderación, los registros en %{instance} han cambiado automáticamente para requerir la revisión manial, para evitar que %{instance} se utilice como una plataforma para potenciales malos actores. Puedes revertir este cambio en los registros en cualquier momento.
+      subject: Los registros para %{instance} han sido cambiados automáticamente para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
@@ -1490,7 +1499,6 @@ es-MX:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
-    other_settings: Otros ajustes de notificaciones
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ es-MX:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confías en este enlace, púlsalo para continuar.
+    title: Estás saliendo de %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
@@ -1608,6 +1619,7 @@ es-MX:
       unknown_browser: Navegador desconocido
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
     ip: IP
@@ -1644,14 +1656,26 @@ es-MX:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación automática de publicaciones
     strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión del servidor (%{target_name})
+      user_domain_block: Bloqueaste %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ es-MX:
         other: "%{count} votos"
       vote: Vota
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1747,6 +1769,7 @@ es-MX:
     contrast: Alto contraste
     default: Mastodon
     mastodon-light: Mastodon (claro)
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
@@ -1774,18 +1797,27 @@ es-MX:
     webauthn: Claves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Ajustes de la cuenta
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} ha sido aprobada
+      subtitle: Tu cuenta se encuentra de nuevo en buen estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} ha sido rechazada
+      subtitle: Tu apelación ha sido rechazada.
       title: Apelación rechazada
     backup_ready:
-      explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+      explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+      further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometido.
+      subject: Fallo de autenticación de segundo factor
+      title: Falló la autenticación de segundo factor
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
@@ -1825,13 +1857,44 @@ es-MX:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Consíguela en Google Play
+      apps_ios_action: Descargar en el App Store
+      apps_step: Descarga nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones de Mastodon
+      checklist_subtitle: 'Comencemos en esta nueva frontera social:'
+      checklist_title: Lista de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta tus interacciones con un perfil completo.
+      edit_profile_title: Personaliza tu perfil
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezar a publicar
-      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
-      full_handle: Su sobrenombre completo
-      full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
+      feature_action: Leer más
+      feature_audience: Mastodon te proporciona una posibilidad única de gestionar tu audiencia sin intermediarios. El despliegue de Mastodon en tu propia infraestructura te permite seguir y ser seguido desde cualquier servidor de Mastodon que se encuentre en línea y no está bajo el control de nadie más que tú.
+      feature_audience_title: Construye tu audiencia con confianza
+      feature_control: Tú sabes mejor lo que quieres ver en tu página principal. Nada de algoritmos o publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
+      feature_control_title: Mantén el control de tu línea de tiempo
+      feature_creativity: Mastodon soporta publicaciones con audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
+      feature_creativity_title: Creatividad inigualable
+      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, las cuales se aplican localmente y no globalmente como en redes sociales corporativas, haciéndolos más flexibles para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas que estés de acuerdo, o aloja el tuyo propio.
+      feature_moderation_title: La moderación como debería ser
+      follow_action: Seguir
+      follow_step: Seguir a personas interesantes es de lo que se trata Mastodon.
+      follow_title: Personaliza tu inicio
+      follows_subtitle: Seguir cuentas conocidas
+      follows_title: A quién seguir
+      follows_view_more: Ver más personas para seguir
+      hashtags_recent_count:
+        one: "%{people} personas en los últimos 2 días"
+        other: "%{people} personas en los últimos 2 días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencia
+      post_action: Redacta
+      post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
+      post_title: Haz tu primera publicación
+      share_action: Comparte
+      share_step: Dile a tus amigos cómo encontrarte en Mastodon.
+      share_title: Comparte tu perfil de Mastodon
+      sign_in_action: Regístrate
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
@@ -1839,6 +1902,7 @@ es-MX:
     go_to_sso_account_settings: Diríjete a la configuración de la cuenta de su proveedor de identidad
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a1e9401f5a..e7db7c8b04 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -31,7 +31,7 @@ es:
       created_msg: "¡Nota de moderación creada con éxito!"
       destroyed_msg: "¡Nota de moderación destruida con éxito!"
     accounts:
-      add_email_domain_block: Poner en lista negra el dominio del correo
+      add_email_domain_block: Bloquear el dominio del correo
       approve: Aprobar
       approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
       are_you_sure: "¿Estás seguro?"
@@ -214,12 +214,12 @@ es:
         resend_user: Reenviar Correo de Confirmación
         reset_password_user: Restablecer Contraseña
         resolve_report: Resolver Reporte
-        sensitive_account: Marcar multimedia en tu cuenta como sensible
+        sensitive_account: Marcar cuenta como sensible
         silence_account: Silenciar Cuenta
         suspend_account: Suspender Cuenta
         unassigned_report: Desasignar Reporte
         unblock_email_account: Desbloquear dirección de correo
-        unsensitive_account: Desmarcar multimedia en tu cuenta como sensible
+        unsensitive_account: Desmarcar cuenta como sensible
         unsilence_account: Dejar de Silenciar Cuenta
         unsuspend_account: Dejar de Suspender Cuenta
         update_announcement: Actualizar Anuncio
@@ -597,6 +597,9 @@ es:
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
       add_to_report: Añadir más al reporte
+      already_suspended_badges:
+        local: Ya suspendido en este servidor
+        remote: Ya suspendido en su servidor
       are_you_sure: "¿Estás seguro?"
       assign_to_self: Asignármela a mí
       assigned: Moderador asignado
@@ -748,6 +751,7 @@ es:
         desc_html: Esto se basa en scripts externos de hCaptcha, que pueden suponer una preocupación de seguridad y privacidad. Además, <strong>esto puede volver el proceso de registro significativamente menos accesible para algunas personas (especialmente con discapacidades)</strong>. Por estas razones, por favor, considera medidas alternativas como el registro por aprobación manual o con invitación.
         title: Solicita a los nuevos usuarios que resuelvan un CAPTCHA para confirmar su cuenta
       content_retention:
+        danger_zone: Zona peligrosa
         preamble: Controlar cómo el contenido generado por el usuario se almacena en Mastodon.
         title: Retención de contenido
       default_noindex:
@@ -767,6 +771,7 @@ es:
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
       registrations:
+        moderation_recommandation: Por favor, ¡asegúrate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todo el mundo!
         preamble: Controla quién puede crear una cuenta en tu servidor.
         title: Registros
       registrations_mode:
@@ -774,6 +779,7 @@ es:
           approved: Se requiere aprobación para registrarse
           none: Nadie puede registrarse
           open: Cualquiera puede registrarse
+        warning_hint: Recomendamos el uso de “Se requiere aprobación para registrarse” a menos que estés seguro de que tu equipo de moderación puede manejar el spam y los registros maliciosos en un tiempo razonable.
       security:
         authorized_fetch: Requerir autenticación de servidores federados
         authorized_fetch_hint: Requerir autenticación de servidores federados permite un cumplimiento más estricto tanto de los bloqueos a nivel de usuario como a nivel de servidor. Sin embargo, esto se produce a costa de una penalización en el rendimiento, reduce el alcance de tus respuestas y puede introducir problemas de compatibilidad con algunos servicios federados. Además, esto no impedirá que actores dedicados obtengan tus cuentas y publicaciones públicas.
@@ -966,6 +972,9 @@ es:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido a la falta de moderadores activos, los registros en %{instance} han sido cambiados automáticamente para requerir revisión manual, para evitar que %{instance} se utilice potencialmente como plataforma por malos actores. Puedes volver a cambiarlo para abrir los registros en cualquier momento.
+      subject: Se ha cambiado automáticamente el registro de %{instance} para requerir aprobación
     new_appeal:
       actions:
         delete_statuses: para eliminar sus mensajes
@@ -1490,7 +1499,6 @@ es:
     administration_emails: Notificaciones de administración por correo electrónico
     email_events: Eventos para notificaciones por correo electrónico
     email_events_hint: 'Selecciona los eventos para los que deseas recibir notificaciones:'
-    other_settings: Otros ajustes de notificaciones
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ es:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confías en este enlace, púlsalo para continuar.
+    title: Vas a salir de %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
@@ -1608,6 +1619,7 @@ es:
       unknown_browser: Navegador Desconocido
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
     ip: IP
@@ -1644,14 +1656,26 @@ es:
     import: Importar
     import_and_export: Importar y exportar
     migrate: Migración de cuenta
-    notifications: Notificaciones
+    notifications: Notificaciones por correo electrónico
     preferences: Preferencias
     profile: Perfil
     relationships: Siguiendo y seguidores
+    severed_relationships: Relaciones cortadas
     statuses_cleanup: Eliminación automática de publicaciones
     strikes: Amonestaciones de moderación
     two_factor_authentication: Autenticación de dos factores
     webauthn_authentication: Claves de seguridad
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión de cuenta (%{target_name})
+      domain_block: Suspensión del servidor (%{target_name})
+      user_domain_block: Bloqueaste %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Cuentas seguidas perdidas
+    preamble: Puedes perder cuentas seguidas y seguidores cuando bloqueas un dominio o cuando tus moderadores deciden suspender un servidor remoto. Cuando esto suceda, podrás descargar listas de relaciones cortadas, para ser inspeccionadas y posiblemente importadas en otro servidor.
+    purged: La información sobre este servidor ha sido purgada por los administradores de tu servidor.
+    type: Suceso
   statuses:
     attached:
       audio:
@@ -1689,17 +1713,15 @@ es:
         other: "%{count} votos"
       vote: Vota
     show_more: Mostrar más
-    show_newer: Mostrar más recientes
-    show_older: Mostrar más antiguos
     show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Directa
       private: Sólo mostrar a seguidores
       private_long: Solo mostrar a tus seguidores
-      public: Público
+      public: Pública
       public_long: Todos pueden ver
-      unlisted: Público, pero no mostrar en la historia federada
+      unlisted: Pública, pero no mostrar en la historia federada
       unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
@@ -1747,6 +1769,7 @@ es:
     contrast: Alto contraste
     default: Mastodon
     mastodon-light: Mastodon (claro)
+    system: Automático (usar tema del sistema)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
@@ -1774,18 +1797,27 @@ es:
     webauthn: Claves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Ajustes de la cuenta
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} ha sido aprobada
+      subtitle: Tu cuenta se encuentra de nuevo en perfecto estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} ha sido rechazada
+      subtitle: Tu apelación ha sido rechazada.
       title: Apelación rechazada
     backup_ready:
-      explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+      explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+      further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometida.
+      subject: Fallo de autenticación del segundo factor
+      title: Fallo en la autenticación del segundo factor
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
@@ -1825,13 +1857,44 @@ es:
         silence: Cuenta limitada
         suspend: Cuenta suspendida
     welcome:
-      edit_profile_action: Configurar el perfil
-      edit_profile_step: Puedes personalizar tu perfil subiendo una foto de perfil, cambiando tu nombre de usuario y mucho más. Puedes optar por revisar a los nuevos seguidores antes de que puedan seguirte.
+      apps_android_action: Consíguela en Google Play
+      apps_ios_action: Descargar en la App Store
+      apps_step: Descarga nuestras aplicaciones oficiales.
+      apps_title: Aplicaciones para Mastodon
+      checklist_subtitle: 'Vamos a empezar en esta nueva frontera social:'
+      checklist_title: Lista de bienvenida
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta tus interacciones completando tu perfil.
+      edit_profile_title: Personaliza tu perfil
       explanation: Aquí hay algunos consejos para empezar
-      final_action: Empezar a publicar
-      final_step: "¡Empieza a publicar! Incluso sin seguidores, tus publicaciones públicas pueden ser vistas por otros, por ejemplo en la línea de tiempo local o en etiquetas. Tal vez quieras presentarte con la etiqueta de #introducciones."
-      full_handle: Su sobrenombre completo
-      full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia.
+      feature_action: Saber más
+      feature_audience: Mastodon te ofrece una posibilidad única de gestionar tu audiencia sin intermediarios. Mastodon desplegado en tu propia infraestructura te permite seguir y ser seguido desde cualquier otro servidor Mastodon en línea y no está bajo el control de ningún tercero.
+      feature_audience_title: Construye tu audiencia con confianza
+      feature_control: Tú sabes lo que quieres ver en tu página principal. Nada de algoritmos y publicidad para desperdiciar tu tiempo. Sigue a quien quieras a través de cualquier servidor de Mastodon y recibe sus publicaciones en orden cronológico. Haz tu rincón de internet un poco más como tú.
+      feature_control_title: Mantente en control de tu línea de tiempo
+      feature_creativity: Mastodon soporta mensajes de audio, vídeo e imágenes, descripciones de accesibilidad, encuestas, advertencias de contenido, avatares animados, emojis personalizados, recortes de miniatura, y más, para ayudarte a expresarte en línea. Ya sea publicando tu arte, tu música o tu podcast, Mastodon está ahí para ti.
+      feature_creativity_title: Creatividad inigualable
+      feature_moderation: Mastodon vuelve a poner la toma de decisiones en tus manos. Cada servidor crea sus propias reglas y reglamentos, que se aplican localmente y no globalmente como en redes sociales corporativas, lo que resulta en la mayor flexibilidad para responder a las necesidades de diferentes grupos de personas. Únete a un servidor con las reglas con las que esté sde acuerdo, o aloja el tuyo propio.
+      feature_moderation_title: La moderación como debería ser
+      follow_action: Seguir
+      follow_step: Seguir a personas interesantes es de lo que trata Mastodon.
+      follow_title: Personaliza tu línea de inicio
+      follows_subtitle: Seguir cuentas conocidas
+      follows_title: A quién seguir
+      follows_view_more: Ver más personas para seguir
+      hashtags_recent_count:
+        one: "%{people} persona en los últimos 2 días"
+        other: "%{people} personas en los últimos 2 días"
+      hashtags_subtitle: Explora las tendencias de los últimos 2 días
+      hashtags_title: Etiquetas en tendencia
+      hashtags_view_more: Ver más etiquetas en tendencia
+      post_action: Redactar
+      post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
+      post_title: Escribe tu primera publicación
+      share_action: Compartir
+      share_step: Dile a tus amigos cómo encontrarte en Mastodon.
+      share_title: Comparte tu perfil de Mastodon
+      sign_in_action: Regístrate
       subject: Bienvenido a Mastodon
       title: Te damos la bienvenida a bordo, %{name}!
   users:
@@ -1839,6 +1902,7 @@ es:
     go_to_sso_account_settings: Diríjase a la configuración de la cuenta de su proveedor de identidad
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 806238431d..a544d8063d 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -597,6 +597,9 @@ et:
       actions_description_html: Otsustus, mida raporti lahendamiseks ette võtta. Karistava tegevuse korral saadetakse e-postiga teade, välja arvatud kategooria <strong>rämpspost</strong> puhul.
       actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
       add_to_report: Lisa raportile juurde
+      already_suspended_badges:
+        local: Juba kustutamisel selles serveris
+        remote: Juba kustutamisel tema serveris
       are_you_sure: Oled kindel?
       assign_to_self: Määra mulle
       assigned: Määratud moderaator
@@ -767,6 +770,7 @@ et:
         disabled: Mitte kellelegi
         users: Sisseloginud kohalikele kasutajatele
       registrations:
+        moderation_recommandation: Enne registreeringute avamist kõigile veendu, et oleks olemas adekvaatne ja reageerimisvalmis modereerijaskond!
         preamble: Kes saab serveril konto luua.
         title: Registreerimised
       registrations_mode:
@@ -774,6 +778,7 @@ et:
           approved: Kinnitus vajalik konto loomisel
           none: Keegi ei saa kontoid luua
           open: Kõik võivad kontoid luua
+        warning_hint: Soovitame liitumisel kasutada heakskiitmise nõuet, kui just pole kindel, et modereerijaskond suudab õigeaegselt käsitleda rämpsu ja pahatahtlikke liitumisi.
       security:
         authorized_fetch: Nõua föderatiivse serveripoolset autoriseerimist
         authorized_fetch_hint: Föderatiivsete serverite poolse autoriseerimise nõudmine võimaldab nii kasutaja- kui ka serveritasandi blokeeringute rangemat jõustamist. See toob aga kaasa jõudluse vähenemise, vähendab vastuste ulatust ja võib tekitada ühilduvusprobleeme mõne ühendatud teenusega. Lisaks ei takista see teatud kasutajatel sinu avalike postituste ja kontode kättesaamist.
@@ -966,6 +971,9 @@ et:
       title: Veebikonksud
       webhook: Veebikonks
   admin_mailer:
+    auto_close_registrations:
+      body: Hiljutise vähese modereerimistegevuse tõttu on %{instance} liitumised automaatselt muudetud heakskiitu nõudvaks, et %{instance} ei muutuks võimalike pahategijate tegevusplatvormiks. Registreerumine on võimalik tagasi avatuks muuta igal ajal.
+      subject: Serveri %{instance} registreeringud on automaatselt muudetud heakskiitu nõudvaks
     new_appeal:
       actions:
         delete_statuses: kustutada postitused
@@ -1490,7 +1498,6 @@ et:
     administration_emails: Admini e-postiteavitused
     email_events: E-posti teadete sündmused
     email_events_hint: 'Vali sündmused, mille kohta soovid teavitusi:'
-    other_settings: Muud teadete sätted
   number:
     human:
       decimal_units:
@@ -1546,6 +1553,9 @@ et:
     errors:
       limit_reached: Jõutud on erinevate reaktsioonide limiidini
       unrecognized_emoji: ei ole tuntud emotikoon
+  redirects:
+    prompt: Kui te usaldate seda linki, klõpsake sellele, et jätkata.
+    title: Te lahkute %{instance}.
   relationships:
     activity: Konto tegevus
     confirm_follow_selected_followers: Oled kindel, et soovid jälgida valitud jälgijaid?
@@ -1608,6 +1618,7 @@ et:
       unknown_browser: Tundmatu veebilehitseja
       weibo: Weibo
     current_session: Praegune seanss
+    date: Kuupäev
     description: "%{browser} platvormil %{platform}"
     explanation: Need veebilehitsejad on praegu su Mastodoni kontole sisse loginud.
     ip: IP
@@ -1644,14 +1655,26 @@ et:
     import: Impordi
     import_and_export: Import / eksport
     migrate: Konto kolimine
-    notifications: Teated
+    notifications: E-postiteavitused
     preferences: Eelistused
     profile: Profiil
     relationships: Jälgitud ja jälgijad
+    severed_relationships: Katkestatud seos
     statuses_cleanup: Automaatne kustutamine
     strikes: Modereerimisjuhtumid
     two_factor_authentication: Kaheastmeline autentimine
     webauthn_authentication: Turvavõtmed
+  severed_relationships:
+    download: Allalaadimine (%{count})
+    event_type:
+      account_suspension: Konto kustutamisel (%{target_name})
+      domain_block: Server kustutamisel (%{target_name})
+      user_domain_block: Blokeerisid %{target_name}
+    lost_followers: Kadunud jälgijad
+    lost_follows: Kaotatud jälgimised
+    preamble: Võid kaotada jälgijaid ja jälgitavaid, kui blokeerid domeeni või kui su moderaatorid otsustavad kustutada kaugserveri. Kui see juhtub, saad alla laadida katkestatud seoste loetelu, et see üle vaadata ja võib-olla teise serverisse üles laadida.
+    purged: Selle serveri info on sinu serveri administraatorite poolt tühjendatud.
+    type: Sündmus
   statuses:
     attached:
       audio:
@@ -1689,8 +1712,6 @@ et:
         other: "%{count} häält"
       vote: Hääleta
     show_more: Näita rohkem
-    show_newer: Uuemate kuvamine
-    show_older: Vanemate kuvamine
     show_thread: Kuva lõim
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1749,6 +1770,7 @@ et:
     contrast: Mastodon (Kõrge kontrast)
     default: Mastodon (Tume)
     mastodon-light: Mastodon (Hele)
+    system: Automaatne (kasuta süsteemi teemat)
   time:
     formats:
       default: "%d. %B, %Y. aastal, kell %H:%M"
@@ -1776,18 +1798,27 @@ et:
     webauthn: Turvavõtmed
   user_mailer:
     appeal_approved:
-      action: Oma kontole
+      action: Konto seaded
       explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on rahuldatud. Konto on ennistatud."
       subject: "%{date} esitatud vaidlustus on rahuldatud"
+      subtitle: Sinu konto on jälle heas seisukorras.
       title: Vaidlustus rahuldatud
     appeal_rejected:
       explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on tagasi lükatud."
       subject: "%{date} esitatud vaidlustus on tagasi lükatud"
+      subtitle: Sinu vaidlustus lükati tagasi.
       title: Vaidlustus tagasi lükatud
     backup_ready:
-      explanation: Taotlesid oma Mastodoni konto varukoopiat. See on nüüd valmis allalaadimiseks!
+      explanation: Taotlesid oma Mastodoni konto täisvarundust.
+      extra: See on nüüd allalaadimiseks valmis!
       subject: Arhiiv on allalaadimiseks valmis
       title: Arhiivi väljavõte
+    failed_2fa:
+      details: 'Sisenemise üksikasjad:'
+      explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale teisese autentimisfaktori.
+      further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla lekkinud.
+      subject: Kaheastmelise autentimise nurjumine
+      title: Kaheastmeline autentimine nurjus
     suspicious_sign_in:
       change_password: muuta oma salasõna
       details: 'Sisenemise üksikasjad:'
@@ -1827,16 +1858,44 @@ et:
         silence: Konto limiteeritud
         suspend: Konto kustutatud
     welcome:
-      edit_profile_action: Seadista oma profiil
-      edit_profile_step: |-
-        Esmalt seadista oma profiil. Saad lisada profiilipildi, muuta ekraaninime, lisada lühikirjelduse ja teha paljut muud. Vaata üle oma konto seaded. Saad ise otsustada, kui nähtav on konto teiste jaoks, mis keeltes postitusi oma ajavoos näha soovid ning kui privaatne peaks konto olema.
-
-        Kui mõni asi arusaamatuks jääb, siis võib vaadata juhendvideot: https://youtu.be/J4ItbTOAw7Q
+      apps_android_action: Google Play poest
+      apps_ios_action: Allalaadimine App Store'ist
+      apps_step: Meie ametlikud rakendused.
+      apps_title: Mastodoni rakendused
+      checklist_subtitle: 'Kuidas sel uudsel sotsiaalmeediarindel pihta hakata:'
+      checklist_title: Millest alustada
+      edit_profile_action: Isikupärasta
+      edit_profile_step: Anna oma tegevustele hoogu, luues põhjalik kasutajaprofiil.
+      edit_profile_title: Isikupärasta oma profiili
       explanation: Siin on mõned nõuanded, mis aitavad alustada
-      final_action: Alusta postitamist
-      final_step: 'Nüüd tee oma esimene postitus. Hea tava on uues kohas ennast tutvustada ning kindlasti kasuta selles postituses ka silti #tutvustus. Isegi kui sul ei ole veel jälgijaid, siis su postitusi näevad kohalikul ajajoonel ka kõik teised serveri kasutajad.'
-      full_handle: Kasutajanimi Mastodon võrgustikus
-      full_handle_hint: Kui jagad kasutajanime väljaspool serverit, siis kasuta kindlasti pikka nime. Erinevates serverites võib olla sama kasutajanimega liikmeid.
+      feature_action: Vaata lisa
+      feature_audience: Mastodon pakub unikaalset võimalust oma jälgijaskonda hallata ilma vahendajateta. Mastodoni käitamine enda serveris võimaldab jälgida kasutajaid ja olla jälgitav ükskõik millisest Mastodoni serverist võrgus ja see pole kellegi teise poolt kontrollitav.
+      feature_audience_title: Kogu enesekindlalt jälgijaid
+      feature_control: Tead ise kõige paremini, mida soovid oma koduvoos näha. Ei aega raiskavaid algoritme ega reklaame. Jälgi ühe kasutajakonto kaudu keda iganes mistahes Mastodoni serveris ja näe postitusi ajalises järjestuses, muutes oma nurgakese Internetist rohkem endale meelepärasemaks.
+      feature_control_title: Säilita oma ajajoone üle kontroll
+      feature_creativity: Mastodon toetab audiot, video- ja pildipostitusi, liigipääsetavuse kirjeldusi, küsitlusi, sisuhoiatusi, animeeritud avatare, kohandatud emotikone, pisipiltide lõikeeelistusi ja enamatki, et end võrgus väljendada. Kas avaldad kunsti, muusikat või taskuhäälingusaadet, Mastodon on mõeldud Sinu jaoks.
+      feature_creativity_title: Võrreldamatu loovus
+      feature_moderation: Mastodon annab otsustusõiguse tagasi Sinu kätte. Igal serveril on oma reeglid ja regulatsioonid, mida hallatakse kohapeal, mitte nagu ülalt-alla korporatiivses sotsiaalmeedias, võimaldades enim paindlikku vastavust erinevate vajadustega gruppide ja inimeste eelistustele. Liitu sobivate reeglitega serveriga, või käivita oma server.
+      feature_moderation_title: Modereerimine, nagu see olema peab
+      follow_action: Jälgi
+      follow_step: Huvipakkuvate inimeste jälgimine ongi Mastodoni olemuseks.
+      follow_title: Isikupärasta oma koduvoogu
+      follows_subtitle: Jälgi teada-tuntud kasutajaid
+      follows_title: Keda jälgida
+      follows_view_more: Vaata lähemalt, keda jälgida
+      hashtags_recent_count:
+        one: "%{people} isikut viimase 2 päeva jooksul"
+        other: "%{people} inimest viimase 2 päeva jooksul"
+      hashtags_subtitle: Avasta, mis viimase 2 päeva jooksul on toimunud
+      hashtags_title: Populaarsed märksõnad
+      hashtags_view_more: Vaata teisi trendikaid märksõnu
+      post_action: Postita
+      post_step: Tervita maailma teksti, fotode, videote või küsitlustega.
+      post_title: Tee oma esimene postitus
+      share_action: Jaga
+      share_step: Anna sõpradele teada, kuidas Sind Mastodonis leida.
+      share_title: Jaga oma Mastodoni profiili
+      sign_in_action: Sisene
       subject: Tere tulemast Mastodoni
       title: Tere tulemast, %{name}!
   users:
@@ -1844,6 +1903,7 @@ et:
     go_to_sso_account_settings: Mine oma idenditeedipakkuja kontosätetesse
     invalid_otp_token: Vale kaheastmeline võti
     otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
+    rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
     seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
     signed_in_as: 'Sisse logitud kasutajana:'
   verification:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 9174b83b43..22ca8135d5 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -336,7 +336,7 @@ eu:
       not_permitted: Ez daukazu ekintza hau burutzeko baimenik
       overwrite: Gainidatzi
       shortcode: Laster-kodea
-      shortcode_hint: Gutxienez 2 karaktere, alfanumerikoak eta azpimarra  besterik ez
+      shortcode_hint: Gutxienez 2 karaktere, alfanumerikoak eta azpimarrak soilik
       title: Emoji pertsonalak
       uncategorized: Kategoriarik gabe
       unlist: Kendu zerrendatik
@@ -597,8 +597,11 @@ eu:
         silence_description_html: Kontua soilik honen jarraitzaile edo espresuki bilatzen dutenentzat izango da ikusgarri, kontuaren irisgarritasuna gogorki mugatzen delarik.
         suspend_description_html: Kontua bera eta honen edukiak eskuraezinak izango dira, eta azkenean, ezabatuak. Kontu honekin erlazionatzea ezinezkoa izango da. Prozesua 30 egunez itzulgarria izango da. Kontu honen aurkako txosten guztiak baztertuko lirateke.
       actions_description_html: Erabaki txosten hau konpontzeko ze ekintza hartu. Salatutako kontuaren aurka zigor ekintza bat hartzen baduzu, eposta jakinarazpen bat bidaliko zaie, <strong>Spam</strong> kategoria hautatzean ezik.
-      actions_description_remote_html: Txosten honi konponbidea aurkitzeko zein ekintza egin hautatu. Hau soilik <strong>zure</strong> zerbitzaria kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
+      actions_description_remote_html: Hautatu txosten honi konponbidea aurkitzeko zein neurri hartu. Hau soilik <strong>zure</strong> zerbitzaria urruneko kontu honekin nola komunikatu eta bere edukia nola maneiatzeko da.
       add_to_report: Gehitu gehiago txostenera
+      already_suspended_badges:
+        local: Dagoeneko kanporatu da zerbitzari honetatik
+        remote: Dagoeneko kanporatu da bere zerbitzaritik
       are_you_sure: Ziur zaude?
       assign_to_self: Esleitu niri
       assigned: Esleitutako moderatzailea
@@ -750,6 +753,7 @@ eu:
         desc_html: Hori egiteko hCaptcha-ko scriptak behar dira, hirugarrenenak izanik, segurtasun eta pribatutasun arazoak ekarri ditzaketeenak. Horrez gain, <strong>script horiengatik nabarmen zailagoa egiten zaie pertsona batzuei izena ematea (batez ere desgaitasunen bat duenei)</strong>. Hori dela eta, hausnartu beste neurri batzuk hartu ditzakezun, esaterako onarpenean oinarritutako izen ematea, edo gonbidapenen bidezkoa.
         title: Eskatu erabiltzaile berriei CAPTCHA bat ebazteko beren kontua berresteko
       content_retention:
+        danger_zone: Eremu arriskutsua
         preamble: Kontrolatu erabiltzaileek sortutako edukia nola biltegiratzen den Mastodonen.
         title: Edukia atxikitzea
       default_noindex:
@@ -769,6 +773,7 @@ eu:
         disabled: Inori ez
         users: Saioa hasita duten erabiltzaile lokalei
       registrations:
+        moderation_recommandation: Mesedez, ziurtatu moderazio-talde egokia eta erreaktiboa duzula erregistroak guztiei ireki aurretik!
         preamble: Kontrolatu nork sortu dezakeen kontua zerbitzarian.
         title: Izen emateak
       registrations_mode:
@@ -776,6 +781,7 @@ eu:
           approved: Izena emateko onarpena behar da
           none: Ezin du inork izena eman
           open: Edonork eman dezake izena
+        warning_hint: "“Izena emateko onarpena behar da” erabiltzea gomendatzen dugu, baldin eta ez badakizu ziur zure moderazio-taldeak spama eta erregistro maltzurrak arrazoizko denboran erantzun ditzakeela."
       security:
         authorized_fetch: Eskatu autentifikazioa federatutako zerbitzarietatik
         authorized_fetch_hint: Zerbitzari federatuen autentifikazioa eskatzeak erabiltzaile-mailako zein zerbitzari-mailako blokeak zorrotzago betearaztea ahalbidetzen du. Hala ere, horrek errendimendu galera dakar, zure erantzunen irismena murrizten du eta baliteke federatutako zerbitzu batzuekin bateragarritasun-arazoak sortu ahal izatea. Horrez gain, horrek ez du eragotziko aktore dedikatuek zure mezu eta kontu publikoak eskuratzea.
@@ -968,6 +974,9 @@ eu:
       title: Webhook-ak
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Duela gutxi moderatzaile gutxi aritu direla eta, %{instance} instantziako izen-emateek eskuzko berrikuspena beharko dute automatikoki, %{instance} instantzia eragile okerren plataforma gisa erabili dadin ekiditeko. Izen-emate irekiak berriro gai ditzakezu nahi duzunean.
+      subject: "%{instance} instantziako izen-emateek onarpena beharko dute orain"
     new_appeal:
       actions:
         delete_statuses: bidalketak ezabatzea
@@ -1233,7 +1242,7 @@ eu:
     add_new: Gehitu berria
     errors:
       limit: Gehienezko traola kopurua erakutsi duzu jada
-    hint_html: "<strong>Zer dira nabarmendutako traolak?</strong> Zure profilean toki nabarmendu batean agertzen dira eta jendeari traola hau daukaten bidalketa publikoak arakatzea ahalbidetzen diote. Sormen lana edo epe luzerako proiektuak jarraitzeko primerakoak dira."
+    hint_html: "<strong>Zer dira nabarmendutako traolak?</strong> Zure profileko toki nabarmendu batean agertzen dira eta jendeari traola haue dituzten bidalketa publikoak arakatzea ahalbidetzen diote. Sormen-lanak edo epe luzerako proiektuak jarraitzeko primerakoak dira."
   filters:
     contexts:
       account: Profilak
@@ -1494,7 +1503,6 @@ eu:
     administration_emails: Administratzailearen posta elektroniko bidezko jakinarazpenak
     email_events: E-mail jakinarazpenentzako gertaerak
     email_events_hint: 'Hautatu jaso nahi dituzun gertaeren jakinarazpenak:'
-    other_settings: Bezte jakinarazpen konfigurazioak
   number:
     human:
       decimal_units:
@@ -1550,6 +1558,9 @@ eu:
     errors:
       limit_reached: Erreakzio desberdinen muga gaindituta
       unrecognized_emoji: ez da emoji ezaguna
+  redirects:
+    prompt: Esteka honetan fidatzen bazara, egin klik jarraitzeko.
+    title: "%{instance} instantziatik zoaz."
   relationships:
     activity: Kontuaren aktibitatea
     confirm_follow_selected_followers: Ziur hautatutako jarraitzaileei jarraitu nahi dituzula?
@@ -1612,6 +1623,7 @@ eu:
       unknown_browser: Nabigatzaile ezezaguna
       weibo: Weibo
     current_session: Uneko saioa
+    date: Data
     description: "%{browser} - %{platform}"
     explanation: Zure Mastodon kontuan saioa hasita duten nabigatzaileak daude.
     ip: IP-a
@@ -1642,20 +1654,32 @@ eu:
     back: Itzuli Mastodon-era
     delete: Kontuaren ezabaketa
     development: Garapena
-    edit_profile: Aldatu profila
+    edit_profile: Editatu profila
     export: Datuen esportazioa
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
-    notifications: Jakinarazpenak
+    notifications: Posta bidezko jakinarazpenak
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
+    severed_relationships: Indartutako erlazioak
     statuses_cleanup: Bidalketak automatikoki ezabatzea
     strikes: Moderazio neurriak
     two_factor_authentication: Bi faktoreetako autentifikazioa
     webauthn_authentication: Segurtasun gakoak
+  severed_relationships:
+    download: Deskargatu (%{count})
+    event_type:
+      account_suspension: Kontua bertan behera uztea (%{target_name})
+      domain_block: Domeinua bertan behera uztea (%{target_name})
+      user_domain_block: "%{target_name} blokeatu duzu"
+    lost_followers: Galdutako jarraitzaileak
+    lost_follows: Jarraitzeari utzi diozun jendea
+    preamble: Jarraitzaileak gal ditzakezu, baita jendea jarraitzeari utzi domeinu bat blokeatzen duzunean edo moderatzaileek urruneko zerbitzari bat bertan behera uztea erabakitzen badute. Hau gertatzean, galdutako erlazioen zerrendak deskargatu ahalko dituzu, aztertzeko eta agian, beste zerbitzari batean inportatzeko.
+    purged: Zerbitzari honen informazioa kendu du zerbitzariko administratzaileak.
+    type: Gertaera
   statuses:
     attached:
       audio:
@@ -1693,14 +1717,12 @@ eu:
         other: "%{count} boto"
       vote: Bozkatu
     show_more: Erakutsi gehiago
-    show_newer: Erakutsi berriagoak
-    show_older: Erakutsi zaharragoak
     show_thread: Erakutsi haria
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Zuzena
-      private: Jarraitzaileak besterik ez
-      private_long: Erakutsi jarraitzaileei besterik ez
+      private: Jarraitzaileak soilik
+      private_long: Erakutsi jarraitzaileei soilik
       public: Publikoa
       public_long: Edonork ikusi dezake
       unlisted: Zerrendatu gabea
@@ -1751,6 +1773,7 @@ eu:
     contrast: Mastodon (Kontraste altua)
     default: Mastodon (Iluna)
     mastodon-light: Mastodon (Argia)
+    system: Automatikoa (erabili sistemaren gaia)
   time:
     formats:
       default: "%Y(e)ko %b %d, %H:%M"
@@ -1778,18 +1801,27 @@ eu:
     webauthn: Segurtasun gakoak
   user_mailer:
     appeal_approved:
-      action: Joan zure kontura
+      action: Kontuaren ezarpenak
       explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa onartu da. Zure kontua egoera onean dago berriro."
       subject: "%{date}(e)ko zure apelazioa onartu da"
+      subtitle: Zure kontua egoera onean dago berriro.
       title: Apelazioa onartuta
     appeal_rejected:
       explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa baztertu da."
       subject: "%{date}(e)ko zure apelazioa baztertu da"
+      subtitle: Zure apelazioa baztertu da.
       title: Apelazioa baztertuta
     backup_ready:
-      explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
+      explanation: Mastodon kontuaren babeskopia osoa eskatu duzu.
+      extra: Deskargatzeko prest!
       subject: Zure artxiboa deskargatzeko prest dago
       title: Artxiboa jasotzea
+    failed_2fa:
+      details: 'Hemen dituzu saio-hasieraren saiakeraren xehetasunak:'
+      explanation: Norbait zure kontuan saioa hasten saiatu da, baina bigarren autentifikazioaren faktore baliogabea eman du.
+      further_actions_html: Ez bazara zu izan, "%{action}" ekintza berehala egitea gomendatzen dugu, kontua arriskarazi daiteke eta.
+      subject: Autentifikazioaren bigarren faktoreak huts egin du
+      title: Huts egin duen autentifikazioaren bigarren faktorea
     suspicious_sign_in:
       change_password: aldatu pasahitza
       details: 'Hemen daude saio hasieraren xehetasunak:'
@@ -1829,13 +1861,44 @@ eu:
         silence: Kontu murriztua
         suspend: Kontu kanporatua
     welcome:
-      edit_profile_action: Ezarri profila
-      edit_profile_step: Pertsonalizatu profila abatar bat igoz, zure pantaila-izena aldatuz eta gehiago. Jarraitzaile berriak onartu aurretik berrikusi nahi badituzu, kontuari giltzarrapoa jarri diezaiokezu.
+      apps_android_action: Eskuratu Google Play-en
+      apps_ios_action: Deskargatu App Store-n
+      apps_step: Deskargatu gure aplikazio ofizialak.
+      apps_title: Mastodon-en aplikazioak
+      checklist_subtitle: 'Murgil zaitez sare sozialen aro berri honetan:'
+      checklist_title: Ongietorrien kontrol-zerrenda
+      edit_profile_action: Pertsonalizatu
+      edit_profile_step: Handiagotu elkarreragina profil ulerkor bat sortuz.
+      edit_profile_title: Pertsonalizatu profila
       explanation: Hona hasteko aholku batzuk
-      final_action: Hasi bidalketak argitaratzen
-      final_step: 'Hasi argitaratzen! Jarraitzailerik ez baduzu ere zure bidalketa publikoak besteek ikusi ditzakete, esaterako denbora-lerro lokalean eta traoletan. Zure burua aurkeztu nahi baduzu #aurkezpenak traola erabili zenezake.'
-      full_handle: Zure erabiltzaile-izen osoa
-      full_handle_hint: Hau da lagunei esango zeniekeena beste zerbitzari batetik zu jarraitzeko edo zuri mezuak bidaltzeko.
+      feature_action: Informazio gehiago
+      feature_audience: Mastodon-ek hartzaileak kudeatzeko aukera paregabea eskaintzen dizu tartean inor egon gabe. Mastodon zeure azpiegituran inplementatua izanik, lineako beste edozein Mastodon zerbitzarko edonor jarrai dezakezu, baita edonork zeu jarraitu ere. Soilik zeure kontrolpean.
+      feature_audience_title: Bildu hartzaileak uste osoarekin
+      feature_control: Aski ondo dakizu zer ikusi nahi duzun hasierako jarioan. Denbora galarazten duten algoritmorik edo iragarkirik gabe. Jarraitu beste Mastodon zerbitzarietako edozein kontu bakarretik eta jaso bere argitalpenak ordena kronologikoan. Zure interneteko txokoa zu bezala izan dadila.
+      feature_control_title: Egon zure denbora-lerroaren kontrolpean
+      feature_creativity: Mastodon-ek audioa, bideoa edo irudia duen argitalpenak, erabilerraztasun-azalpenak, inkestak, edukiaren abisuak, abatar animatuak, emoji pertsonalizatuak, miniaturen mozketaren kontrola eta funtzio gehiago onartzen ditu, linean aditzera eman zaitezen laguntzeko. Artea, musika edo podcastak partekatzen badituzu, Mastodon hortxe duzu.
+      feature_creativity_title: Sormen paregabea
+      feature_moderation: Mastodon-ek erabakiak hartzeko ahalmena dakar bueltan. Zerbitzari bakoitzak bere arau eta murrizketa propioak sortzen ditu, lokalki indarrean jartzen dira eta ez orokorki korporazioen sare-sozialen gisa. Era honetara, jende talde ezberdinen mesedeak asetzeko malguago bilakatzen da. Batu bertako arauekin ados zauden zerbitzari batera edo ostatatu zeurea.
+      feature_moderation_title: Moderazioa behar lukeen bezalaxe
+      follow_action: Jarraitu
+      follow_step: Jende interesgarria jarraitzean datza Mastodon.
+      follow_title: Pertsonalizatu hasierako jarioa
+      follows_subtitle: Jarraitu kontu ospetsuak
+      follows_title: Nor jarraitu
+      follows_view_more: Ikusi jarrai dezakezun jende gehiago
+      hashtags_recent_count:
+        one: Pertson %{people} azken 2 egunetan
+        other: "%{people} pertson azken 2 egunetan"
+      hashtags_subtitle: Arakatu azken 2 egunetan pil-pilean dagoena
+      hashtags_title: Pil-pilean dauden traolak
+      hashtags_view_more: Ikusi pil-pilean dauden traol gehiago
+      post_action: Idatzi
+      post_step: Agurtu munduari testu, argazki, bideo zein inkesta batekin.
+      post_title: Idatzi zeure lehen argitalpena
+      share_action: Partekatu
+      share_step: Esaiezu lagunei nola aurki zaitzaketen Mastodon-en.
+      share_title: Partekatu Mastodon profila
+      sign_in_action: Hasi saioa
       subject: Ongi etorri Mastodon-era
       title: Ongi etorri, %{name}!
   users:
@@ -1843,12 +1906,13 @@ eu:
     go_to_sso_account_settings: Jo zure identitate-hornitzaileko kontuaren ezarpenetara
     invalid_otp_token: Bi faktoreetako kode baliogabea
     otp_lost_help_html: 'Bietara sarbidea galdu baduzu, jarri kontaktuan hemen: %{email}'
+    rate_limited: Autentifikazio saiakera gehiegi, saiatu berriro geroago.
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
-    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code>-etiketa bat ere erabil dezakezu orrialdearen goiburuan, baina HTMLak eskuragarri egon behar du JavaScript exekutatu gabe.
-    here_is_how: Hemen duzu nola
-    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
+    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
+    here_is_how: Argibidea
+    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak Mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
     verified_links: Zure lotura egiaztatuak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f93aac6031..d93d2e7d5f 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -80,7 +80,7 @@ fa:
       joined: عضو شده در
       location:
         all: همه
-        local: محلّی
+        local: محلی
         remote: کارسازهای دیگر
         title: مکان
       login_status: وضعیت ورود
@@ -406,6 +406,7 @@ fa:
           silence: محدود
           suspend: تعلیق
         title: مسدودسازی دامین تازه
+      no_domain_block_selected: هیچ انسداد دامنه‌ای تغییر نکرد زیرا هیچ‌کدامشان انتخاب نشده بودند
       not_permitted: شما مجاز به انجام این عملیات نیستید
       obfuscate: مبهم‌سازی نام دامنهٔ
       obfuscate_hint: در صورت به کار افتاده بودن اعلام فهرست محدودیت‌های دامنه، نام دامنه در فهرست را به صورت جزیی مبهم می‌کند
@@ -414,13 +415,14 @@ fa:
       public_comment: یادداشت عمومی
       public_comment_hint: یادداشتی دربارهٔ محدودیت روی این دامین برای عموم، در صورتی که فهرست دامین‌های محدود شده منتشر شود.
       reject_media: نپذیرفتن پرونده‌های رسانه‌ای
-      reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلّی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلق‌ها
+      reject_media_hint: پرونده‌های رسانه‌ای ذخیره‌شدهٔ محلی را پاک کرده و از بارگیریشان در آینده خودداری می‌کند. بی‌تأثیر روی معلّق‌ها
       reject_reports: نپذیرفتن گزارش‌ها
       reject_reports_hint: گزارش‌هایی را که از این دامنه می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
       undo: واگردانی مسدودسازی دامین
       view: دیدن مسدودسازی دامنه
     email_domain_blocks:
       add_new: افزودن تازه
+      allow_registrations_with_approval: اجازهٔ ثبت‌نام با تأیید
       attempts_over_week:
         one: "%{count} تلاش در هفتهٔ گذشته"
         other: "%{count} تلاش ورود در هفتهٔ گذشته"
@@ -506,7 +508,7 @@ fa:
       private_comment: یادداشت خصوصی
       public_comment: یادداشت عمومی
       purge: پاکسازی
-      title: ارتباط میان‌سروری
+      title: ارتباط همگانی
       total_blocked_by_us: مسدودشده از طرف ما
       total_followed_by_them: ما را پی می‌گیرند
       total_followed_by_us: ما پیگیرشان هستیم
@@ -671,7 +673,7 @@ fa:
         follow_recommendations: پیروی از پیشنهادها
         profile_directory: شاخهٔ نمایه
         public_timelines: خط زمانی‌های عمومی
-        publish_discovered_servers: انتشار سرورهای یافته‌شده
+        publish_discovered_servers: انتشار کارسازهای کشف شده
         publish_statistics: انتشار آمار
         title: کشف
         trends: پرطرفدارها
@@ -896,7 +898,7 @@ fa:
     description:
       prefix_invited_by_user: "@%{name} شما را به عضویت در این کارساز ماستودون دعوت کرده است!"
       prefix_sign_up: همین امروز عضو ماستودون شوید!
-      suffix: با داشتن حساب می‌توانید دیگران را پی بگیرید، نوشته‌های تازه منتشر کنید، و با کاربران دیگر از هر سرور ماستودون دیگری و حتی سرورهای دیگر در ارتباط باشید!
+      suffix: با داشتن حساب می‌توانید دیگران را پی گرفته، نوشته‌هایی منتشر کرده و با کاربرانی از هر کارساز ماستودن دیگری در ارتباط باشید!
     didnt_get_confirmation: یک پیوند تأیید را دریافت نکردید؟
     dont_have_your_security_key: کلید امنیتیتان را ندارید؟
     forgot_password: گذرواژه خود را فراموش کرده‌اید؟
@@ -919,7 +921,7 @@ fa:
       cas: CAS
       saml: SAML
     register: عضو شوید
-    registration_closed: سرور %{instance} عضو تازه‌ای نمی‌پذیرد
+    registration_closed: کارساز %{instance} عضو تازه‌ای نمی‌پذیرد
     resend_confirmation: ارسال مجدد پیوند تایید
     reset_password: بازنشانی گذرواژه
     rules:
@@ -1269,7 +1271,6 @@ fa:
   notifications:
     email_events: رویدادها برای آگاهی‌های رایانامه‌ای
     email_events_hint: 'گزینش رویدادهایی که می‌خواهید برایشان آگاهی دریافت کنید:'
-    other_settings: سایر تنظیمات آگاهی‌ها
   number:
     human:
       decimal_units:
@@ -1415,7 +1416,6 @@ fa:
     import: درون‌ریزی
     import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
-    notifications: آگاهی‌ها
     preferences: ترجیحات
     profile: نمایه
     relationships: پیگیری‌ها و پیگیران
@@ -1460,8 +1460,6 @@ fa:
         other: "%{count} رأی"
       vote: رأی
     show_more: نمایش
-    show_newer: نمایش جدیدتر
-    show_older: نمایش قدیمی‌تر
     show_thread: نمایش رشته
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1540,7 +1538,6 @@ fa:
     webauthn: کلیدهای امنیتی
   user_mailer:
     appeal_approved:
-      action: به حساب خودتان بروید
       explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کرده‌اید، پذیرفته شده است. حساب شما بار دیگر در وضعیت خوبی قرار دارد.
       subject: درخواست تجدیدنظر شما در %{date} پذیرفته شد
       title: درخواست تجدیدنظر پذیرفته شد
@@ -1549,7 +1546,6 @@ fa:
       subject: درخواست تجدیدنظر شما در %{date} رد شده است
       title: درخواست تجدیدنظر رد شد
     backup_ready:
-      explanation: شما یک نسخهٔ پشتیبان کامل از حساب خود را درخواست کردید. این پشتیبان الان آمادهٔ بارگیری است!
       subject: بایگانی شما آمادهٔ دریافت است
       title: گرفتن بایگانی
     suspicious_sign_in:
@@ -1576,13 +1572,7 @@ fa:
         silence: حساب محدود شده است
         suspend: حساب معلق شده است
     welcome:
-      edit_profile_action: تنظیم نمایه
-      edit_profile_step: می‌توانید نمایه‌تان را با بارگذاری تصویر نمایه، تغییر نام نمایشی و بیش از این‌‌ها سفارشی کنید. می‌توانید تعیین کنید که پی‌گیران جدید را پیش‌از این که بتوانند دنبالتان کنند بازبینی کنید.
       explanation: نکته‌هایی که برای آغاز کار به شما کمک می‌کنند
-      final_action: چیزی منتشر کنید
-      final_step: 'چیزی بنویسید! حتا بدون پی‌گیر ممکن است فرسته‌های عمومیتان دیده شود. برای مثال روی خط زمانی محلی یا در برچسب‌ها. شاید بخواهید با برچسب #معرفی خودتان را معرّفی کنید.'
-      full_handle: نام کاربری کامل شما
-      full_handle_hint: این چیزی است که باید به دوستانتان بگویید تا بتوانند از کارسازی دیگر به شما پیام داده یا پی‌گیرتان شوند.
       subject: به ماستودون خوش آمدید
       title: خوش آمدید، کاربر %{name}!
   users:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 75052c949d..5f96f611b4 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -387,7 +387,7 @@ fi:
         cancel: Peruuta
         confirm: Jäädytä
         permanent_action: Jäädytyksen kumoaminen ei palauta mitään tietoja tai suhteita.
-        preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> ja sen aliverkkotunnukset.
+        preamble_html: Olet jäädyttämässä verkkotunnuksen <strong>%{domain}</strong> aliverkkotunnuksineen.
         remove_all_data: Tämä toiminto poistaa palvelimeltasi kaiken sisällön, median ja profiilitiedot tämän palvelun tileiltä.
         stop_communication: Palvelimesi lopettaa viestinnän näiden palvelinten kanssa.
         title: Vahvista verkkotunnuksen %{domain} esto
@@ -597,6 +597,9 @@ fi:
       actions_description_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Jos ryhdyt rangaistustoimeen ilmoitettua tiliä kohtaan, hänelle lähetetään sähköposti-ilmoitus, paitsi jos <strong>Roskaposti</strong>-luokka on valittuna.
       actions_description_remote_html: Päätä, mihin toimiin ryhdyt tämän raportin ratkaisemiseksi. Tämä vaikuttaa vain siihen, miten <strong>palvelimesi</strong> kommunikoi tämän etätilin kanssa ja käsittelee sen sisältöä.
       add_to_report: Lisää raporttiin
+      already_suspended_badges:
+        local: Jäädytetty jo tällä palvelimella
+        remote: Jäädytetty jo tällä palvelimella
       are_you_sure: Oletko varma?
       assign_to_self: Ota tehtäväksi
       assigned: Määritetty valvoja
@@ -748,6 +751,7 @@ fi:
         desc_html: Tämä perustuu ulkoisiin skripteihin hCaptchasta, mikä voi olla turvallisuus- ja yksityisyysongelma. Lisäksi <strong>tämä voi tehdä rekisteröinnin ihmisille huomattavasti (erityisesti vammaisten) helpommaksi</strong>. Harkitse vaihtoehtoisia toimenpiteitä, kuten hyväksymisperusteista tai kutsupohjaista rekisteröintiä.
         title: Vaadi uusia käyttäjiä vahvistaamaan tilinsä ratkaisemalla CAPTCHA-vahvistus
       content_retention:
+        danger_zone: Vaaravyöhyke
         preamble: Määritä, miten käyttäjän luoma sisältö tallennetaan Mastodoniin.
         title: Sisällön säilyttäminen
       default_noindex:
@@ -767,13 +771,15 @@ fi:
         disabled: Ei kenellekkään
         users: Kirjautuneille paikallisille käyttäjille
       registrations:
+        moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin vapautat rekisteröitymismenettelyn kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
         title: Rekisteröityminen
       registrations_mode:
         modes:
-          approved: Rekisteröinti vaatii hyväksynnän
+          approved: Rekisteröityminen vaatii hyväksynnän
           none: Kukaan ei voi rekisteröityä
           open: Kaikki voivat rekisteröityä
+        warning_hint: Suosittelemme käyttämään asetusta ”Rekisteröityminen vaatii hyväksynnän”, ellet ole varma siitä, että moderaattorit ovat valmiina käsittelemään roskapostia ja haittarekisteröitymisiä oikea-aikaisesti.
       security:
         authorized_fetch: Vaadi todennus liittoutuvilta palvelimilta
         authorized_fetch_hint: Todennuksen vaatiminen liittoutuvilta palvelimilta mahdollistaa sekä käyttäjä- että palvelintason estojen tiukemman valvonnan. Tämä tapahtuu kuitenkin suorituskyvyn kustannuksella, vähentää vastauksiesi tavoittavuutta ja voi aiheuttaa yhteensopivuusongelmia joidenkin liittoutuvien palvelujen kanssa. Tämä ei myöskään estä omistautuneita toimijoita hakemasta julkisia julkaisujasi ja tilejäsi.
@@ -831,7 +837,7 @@ fi:
         suspend: "%{name} jäädytti käyttäjän %{target} tilin"
       appeal_approved: Valitti
       appeal_pending: Valitus vireillä
-      appeal_rejected: Muutoksenhaku hylättiin
+      appeal_rejected: Vetoomus hylättiin
     system_checks:
       database_schema_check:
         message_html: Tietokannan siirto on vireillä. Suorita ne varmistaaksesi, että sovellus toimii odotetulla tavalla
@@ -966,6 +972,9 @@ fi:
       title: Webhookit
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Palvelimen %{instance} moderaattorit eivät ole olleet viime aikoina aktiivisia. Tästä syystä rekisteröitymismenettely on automaattisesti vaihdettu erillishyväksyntöjä edellyttäväksi. Näin vähennetään riskiä palvelimen %{instance} käyttöön haitallisten toimijoiden alustana. Voit koska tahansa palauttaa käyttöön vapaat rekisteröitymiset.
+      subject: Rekisteröitymiset palvelimelle %{instance} on automaattisesti vaihdettu vaatimaan hyväksyntää
     new_appeal:
       actions:
         delete_statuses: poistaa hänen julkaisunsa
@@ -1043,10 +1052,10 @@ fi:
     confirmations:
       awaiting_review: Sähköpostiosoitteesi on vahvistettu! Seuraavaksi palvelimen %{domain} ylläpito tarkistaa rekisteröitymisesi, ja saat lopuksi ilmoituksen sähköpostitse, jos tilisi hyväksytään!
       awaiting_review_title: Rekisteröitymisesi on tarkistettavana
-      clicking_this_link: tästä linkistä
+      clicking_this_link: napsauttaa tätä linkkiä
       login_link: kirjautumalla sisään
       proceed_to_login_html: Voit nyt jatkaa %{login_link}.
-      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, yritä avata se %{clicking_this_link} tai palaa sovellukseen manuaalisesti.
+      redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen <strong>%{app_name}</strong>. Jos näin ei tapahtunut, voit %{clicking_this_link} tai palata sovellukseen käsikäyttöisesti.
       registration_complete: Rekisteröitymisesi palvelimelle %{domain} on nyt valmis!
       welcome_title: Tervetuloa, %{name}!
       wrong_email_hint: Jos sähköpostiosoite ei ole oikein, voit muuttaa sen tilin asetuksista.
@@ -1490,7 +1499,6 @@ fi:
     administration_emails: Ylläpitäjän sähköposti-ilmoitukset
     email_events: Sähköposti-ilmoitusten tapahtumat
     email_events_hint: 'Valitse tapahtumat, joista haluat saada ilmoituksia:'
-    other_settings: Muut ilmoitusasetukset
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ fi:
     errors:
       limit_reached: Erilaisten reaktioiden raja saavutettu
       unrecognized_emoji: ei ole tunnistettu emoji
+  redirects:
+    prompt: Jos luotat linkkiin, jatka napsauttamalla sitä.
+    title: Olet poistumassa palvelimelta %{instance}.
   relationships:
     activity: Tilin aktiivisuus
     confirm_follow_selected_followers: Haluatko varmasti seurata valittuja seuraajia?
@@ -1557,7 +1568,7 @@ fi:
     followers: Seuraajat
     following: Seuratut
     invited: Kutsutut
-    last_active: Viimeksi aktiivinen
+    last_active: Viimeksi aktiiviset
     most_recent: Viimeisimmät
     moved: Muuttaneet
     mutual: Seuraatte toisianne
@@ -1608,6 +1619,7 @@ fi:
       unknown_browser: Tuntematon selain
       weibo: Weibo
     current_session: Nykyinen istunto
+    date: Päiväys
     description: "%{browser} alustalla %{platform}"
     explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneena Mastodon-tilillesi.
     ip: IP-osoite
@@ -1644,14 +1656,26 @@ fi:
     import: Tuo
     import_and_export: Tuonti ja vienti
     migrate: Tilin muutto muualle
-    notifications: Ilmoitukset
+    notifications: Sähköposti-ilmoitukset
     preferences: Ominaisuudet
     profile: Julkinen profiili
     relationships: Seuratut ja seuraajat
+    severed_relationships: Katkenneet suhteet
     statuses_cleanup: Autom. julkaisujen poisto
     strikes: Valvontavaroitukset
     two_factor_authentication: Kaksivaiheinen todennus
     webauthn_authentication: Suojausavaimet
+  severed_relationships:
+    download: Lataa (%{count})
+    event_type:
+      account_suspension: Tilin jäädytys (%{target_name})
+      domain_block: Palvelimen jäädytys (%{target_name})
+      user_domain_block: Estit käyttäjän %{target_name}
+    lost_followers: Menetetyt seuraajat
+    lost_follows: Menetetyt seuratut
+    preamble: Voit menettää seurattusi ja seuraajasi, kun estät verkkotunnuksen tai kun valvojasi päättävät jäädyttää etäpalvelimen. Kun näin tapahtuu, voit ladata luetteloita katkenneista suhteista, jotta voit tarkastella niitä ja mahdollisesti viedä ne toiselle palvelimelle.
+    purged: Palvelimesi ylläpitäjät ovat tyhjentäneet tämän palvelimen tiedot.
+    type: Tapahtuma
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ fi:
         other: "%{count} ääntä"
       vote: Äänestä
     show_more: Näytä lisää
-    show_newer: Näytä uudemmat
-    show_older: Näytä vanhempi
     show_thread: Näytä ketju
     title: "%{name}: ”%{quote}”"
     visibilities:
@@ -1744,9 +1766,10 @@ fi:
   tags:
     does_not_match_previous_name: ei vastaa edellistä nimeä
   themes:
-    contrast: Mastodon (Korkea kontrasti)
-    default: Mastodon (Tumma)
-    mastodon-light: Mastodon (Vaalea)
+    contrast: Mastodon (suuri kontrasti)
+    default: Mastodon (tumma)
+    mastodon-light: Mastodon (vaalea)
+    system: Automaattinen (käytä järjestelmän teemaa)
   time:
     formats:
       default: "%d.%m.%Y klo %H.%M"
@@ -1774,18 +1797,27 @@ fi:
     webauthn: Suojausavaimet
   user_mailer:
     appeal_approved:
-      action: Siirry tilillesi
+      action: Tilin asetukset
       explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
       subject: Valituksesi %{date} on hyväksytty
+      subtitle: Tilisi on jälleen normaalissa tilassa.
       title: Valitus hyväksytty
     appeal_rejected:
       explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hylätty.
       subject: Valituksesi %{date} on hylätty
+      subtitle: Vetoomuksesi on hylätty.
       title: Valitus hylätty
     backup_ready:
-      explanation: Pyysit täydellistä varmuuskopiota Mastodon-tilistäsi. Voit nyt ladata sen!
+      explanation: Olet pyytänyt täyden varmuuskopion Mastodon-tilistäsi.
+      extra: Se on nyt valmis ladattavaksi!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
+    failed_2fa:
+      details: 'Sisäänkirjautumispyrkimyksen yksityiskohtaiset tiedot:'
+      explanation: Joku on yrittänyt kirjautua tilillesi antaen väärän toisen todennustunnisteen.
+      further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
+      subject: Kaksivaiheisen todennuksen virhe
+      title: Kaksivaiheisen kirjautumisen toinen vaihe epäonnistui
     suspicious_sign_in:
       change_password: vaihda salasanasi
       details: 'Tässä on tiedot kirjautumisesta:'
@@ -1825,13 +1857,44 @@ fi:
         silence: Tiliä rajoitettu
         suspend: Tili jäädytetty
     welcome:
-      edit_profile_action: Määritä profiili
-      edit_profile_step: Voit mukauttaa profiiliasi muun muassa profiilikuvalla ja uudella näyttönimellä. Voit myös valita, haluatko tarkastaa ja hyväksyä uudet seuraajat itse.
+      apps_android_action: Hanki Google Playstä
+      apps_ios_action: Lataa App Storesta
+      apps_step: Lataa viralliset sovelluksemme.
+      apps_title: Mastodon-sovellukset
+      checklist_subtitle: 'Aloitetaan tällä uudella sosiaalisella seudulla:'
+      checklist_title: Tervetulon tarkistuslista
+      edit_profile_action: Mukauta
+      edit_profile_step: Tehosta vuorovaikutuksiasi täydennetyllä profiililla.
+      edit_profile_title: Mukauta profiiliasi
       explanation: Näillä vinkeillä pääset alkuun
-      final_action: Ala julkaista
-      final_step: 'Ala julkaista! Vaikkei sinulla olisi seuraajia, voivat muut nähdä julkisia julkaisujasi esimerkiksi paikallisella aikajanalla tai aihetunnisteissa. Kannattaa myös esitellä itsensä aihetunnisteella #esittely.'
-      full_handle: Koko käyttäjätunnuksesi
-      full_handle_hint: Kerro tämä kavereillesi, niin he voivat lähettää sinulle viestejä tai seurata sinua toiselta palvelimelta.
+      feature_action: Lue lisää
+      feature_audience: Mastodon tarjoaa sinulle ainutlaatuisen mahdollisuuden hallita yleisöäsi ilman välikäsiä. Omassa infrastruktuurissasi käytössä oleva Mastodon antaa sinulle mahdollisuuden seurata ja tulla seuratuksi miltä tahansa muulta verkon Mastodon-palvelimelta, ja se on vain sinun hallinnassasi.
+      feature_audience_title: Rakenna yleisöäsi luottavaisin mielin
+      feature_control: Tiedät itse parhaiten, mitä haluat nähdä kotisyötteessäsi. Ei algoritmeja eikä mainoksia tuhlaamassa aikaasi. Seuraa yhdellä tilillä ketä tahansa, miltä tahansa Mastodon-palvelimelta, vastaanota heidän julkaisunsa aikajärjestyksessä ja tee omasta internetin nurkastasi hieman enemmän omanlaisesi.
+      feature_control_title: Pidä aikajanasi hallussasi
+      feature_creativity: Mastodon tukee ääni-, video- ja kuvajulkaisuja, saavutettavuuskuvauksia, äänestyksiä, sisältövaroituksia, animoituja avattaria, mukautettuja emojeita, pikkukuvien rajauksen hallintaa ja paljon muuta, mikä auttaa ilmaisemaan itseäsi verkossa. Julkaisetpa sitten taidetta, musiikkia tai podcastia, Mastodon on sinua varten.
+      feature_creativity_title: Luovuutta vertaansa vailla
+      feature_moderation: Mastodon palauttaa päätöksenteon käsiisi. Jokainen palvelin luo omat sääntönsä ja määräyksensä, joita valvotaan paikallisesti eikä ylhäältä alas kuten kaupallisessa sosiaalisessa mediassa, mikä tekee siitä joustavimman vastaamaan eri ihmisryhmien tarpeisiin. Liity palvelimelle, jonka säännöt sopivat sinulle, tai ylläpidä omaa palvelinta.
+      feature_moderation_title: Moderointi niin kuin kuuluukin
+      follow_action: Seuraa
+      follow_step: Mastodonissa on kyse kiinnostavien ihmisten seuraamisesta.
+      follow_title: Mukauta kotisyötettäsi
+      follows_subtitle: Seuraa tunnettuja tilejä
+      follows_title: Ehdotuksia seurattavaksi
+      follows_view_more: Näytä lisää seurattavia henkilöitä
+      hashtags_recent_count:
+        one: "%{people} henkilö viimeisen 2 päivän aikana"
+        other: "%{people} henkilöä viimeisen 2 päivän aikana"
+      hashtags_subtitle: Tutki, mikä on ollut suosittua viimeisenä 2 päivänä
+      hashtags_title: Suositut aihetunnisteet
+      hashtags_view_more: Näytä lisää suosittuja aihetunnisteita
+      post_action: Kirjoita
+      post_step: Tervehdi maailmaa sanoin, kuvin, videoin ja äänestyksin.
+      post_title: Tee ensimmäinen julkaisusi
+      share_action: Jaa
+      share_step: Kerro ystävillesi, kuinka sinut voi löytää Mastodonista.
+      share_title: Jaa Mastodon-profiilisi
+      sign_in_action: Kirjaudu sisään
       subject: Tervetuloa Mastodoniin
       title: Tervetuloa mukaan, %{name}!
   users:
@@ -1839,6 +1902,7 @@ fi:
     go_to_sso_account_settings: Avaa identiteettitarjoajasi tiliasetukset
     invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
     otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyden osoitteeseen %{email}
+    rate_limited: Liian monta todennusyritystä – yritä uudelleen myöhemmin.
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
     signed_in_as: 'Kirjautunut tilillä:'
   verification:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 00fb9c5560..f7303c512a 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -94,7 +94,7 @@ fo:
         disabled: Óvirkið
         pending: Í bíðistøðu
         silenced: Avmarkað
-        suspended: Avbrotin
+        suspended: Gjørt óvirkin
         title: Umsjón
       moderation_notes: Umsjónarviðmerkingar
       most_recent_activity: Feskasta virksemi
@@ -150,7 +150,7 @@ fo:
       strikes: Eldri fráboðanir
       subscribe: Tekna hald
       suspend: Fyribils ikki í gildi
-      suspended: Ikki í gildi
+      suspended: Gjørt óvirkin
       suspension_irreversible: Dáturnar á hesu kontu er endaliga sletttaðar. Tú kann seta hana í gildi, men dáturnar fáast ikki aftur.
       suspension_reversible_hint_html: Kontan er sett úr gildi og dáturnar verða endaliga strikaðar tann %{date}. Inntil tá kann kontan endurskapast uttan fylgjur. Ynskir tú at strika allar dátur hjá kontuni beinan vegin, so kanst tú gera tað niðanfyri.
       title: Kontur
@@ -235,7 +235,7 @@ fo:
         change_email_user_html: "%{name} broytti teldupost addressuna hjá %{target}"
         change_role_user_html: "%{name} broytti leiklutin hjá %{target}"
         confirm_user_html: "%{name} góðtók teldupost addressuna hjá %{target}"
-        create_account_warning_html: "%{name} sendi eina ávarðing til %{target}"
+        create_account_warning_html: "%{name} sendi eina ávaring til %{target}"
         create_announcement_html: "%{name} stovnaði eina fráboðan %{target}"
         create_canonical_email_block_html: "%{name} forðaði telduposti við hash'inum %{target}"
         create_custom_emoji_html: "%{name} legði upp nýtt kenslutekn %{target}"
@@ -597,6 +597,9 @@ fo:
       actions_description_html: Ger av hvør atgerð skal takast fyri at avgreiða hesa meldingina. Revsitiltøk móti meldaðu kontuni føra við sær, at ein teldupostfráboðan verður send teimum, undantikið tá <strong>Ruskpostur</strong> verður valdur.
       actions_description_remote_html: Tak avgerð um hvat skal gerast fyri at avgreiða hesa rapporteringina. Hetta fer einans at ávirka, hvussu <strong>tín</strong> ambætari samskiftir við hesa fjarkontuna og hvussu hann handfer tilfar frá henni.
       add_to_report: Legg meira afturat meldingini
+      already_suspended_badges:
+        local: Longu gjørt óvirkin á hesum ambætaranum
+        remote: Longu gjørt óvirkin á teirra ambætara
       are_you_sure: Er tú vís/ur?
       assign_to_self: Tilluta mær
       assigned: Tilnevnt umsjónarfólk
@@ -612,6 +615,7 @@ fo:
       created_at: Meldað
       delete_and_resolve: Strika postar
       forwarded: Víðarisent
+      forwarded_replies_explanation: Hendan fráboðanin er frá einum fjarbrúkara og er viðvíkjandi tilfari á einum fjarum ambætara. Tað er sent til tín, tí fráboðaða innihaldið er í svari til ein av tínum brúkarum.
       forwarded_to: Víðarisent til %{domain}
       mark_as_resolved: Marka sum loyst
       mark_as_sensitive: Merkt sum viðkvæmt
@@ -747,6 +751,7 @@ fo:
         desc_html: Hetta er bundið at uttanhýsis skriptum frá hCaptcha, sum kann vera ein trygdar- og privatlívsváði. Harafturat, so <strong>kann hetta gera skrásetingartilgongdina munandi minni atkomuliga til summi (brekaði) fólk</strong>. Tískil eigur tú at umhugsa aðrar hættir sosum góðkenningar-grundaða ella innbjóðingar-grundaða skráseting.
         title: Set krav til nýggjar brúkarar at loysa eina CAPTHA fyri at vátta teirra kontu
       content_retention:
+        danger_zone: Vandaøki
         preamble: Stýr hvussu brúkara-skapt tilfar er goymt í Mastodon.
         title: Varðveitsla av tilfari
       default_noindex:
@@ -766,6 +771,7 @@ fo:
         disabled: Til ongan
         users: Fyri lokalum brúkarum, sum eru ritaðir inn
       registrations:
+        moderation_recommandation: Vinarliga tryggja tær, at tú hevur eitt nøktandi og klárt umsjónartoymi, áðreen tú letur upp fyri skrásetingum frá øllum!
         preamble: Stýr, hvør kann stovna eina kontu á tínum ambætara.
         title: Skrásetingar
       registrations_mode:
@@ -773,6 +779,7 @@ fo:
           approved: Góðkenning kravd fyri tilmelding
           none: Eingin kann tilmelda seg
           open: Øll kunnu tilmelda seg
+        warning_hint: Vit mæla til at brúka "Góðkenning kravd fyri tilmelding" uttan so at tú er fullvís/ur í, at umsjónartoymið hjá tær kann handfara ruskpost og óndsinnaðar skrásetingar so hvørt.
       security:
         authorized_fetch: Krev samgildi frá sameindum ambætarum
         authorized_fetch_hint: At krevja samgildi frá sameindum ambætarum ger strangari útinning av blokkum bæði á brúkara- og ambætara-stigi møguliga. Tó so, kostnaðurin er ein avriksstraffur, minkar um hvussu langt svarini hjá tær røkka og kann viðføra sambæristruplleikar við summar sameindar tænastur. Harafturat forðar hetta ikki teimum, ið miðvíst leggja seg eftir at heinta tínar almennu postar og kontur.
@@ -965,6 +972,9 @@ fo:
       title: Webhooks/vevhúkar
       webhook: Webhook/vevhúkur
   admin_mailer:
+    auto_close_registrations:
+      body: Vegna avmarkað virksemi hjá umsjónarfólki eru skrásetingar á %{instance} broyttar sjálvvirkandi til at krevja manuella eftirkanning fyri at forða at %{instance} verður brúktur sum ein pallur fyri ringar aktørar. Tú kanst skifta aftur til opnar skrásetingar tá tú vilt.
+      subject: Skrásetingar á %{instance} eru sjálvvirkandi broyttar soleiðis at tær krevja váttan
     new_appeal:
       actions:
         delete_statuses: at strika teirra postar
@@ -1489,7 +1499,6 @@ fo:
     administration_emails: Fráboðanir um teldupost til umsitarar
     email_events: Hendingar fyri teldupostfráboðanir
     email_events_hint: 'Vel hendingar, sum tú vil hava fráboðanir um:'
-    other_settings: Aðrar fráboðanarstillingar
   number:
     human:
       decimal_units:
@@ -1545,6 +1554,9 @@ fo:
     errors:
       limit_reached: Mark fyri ymisk aftursvar rokkið
       unrecognized_emoji: er ikki eitt kenslutekn, sum kennist aftur
+  redirects:
+    prompt: Um tú lítir á hetta leinkið, so kanst tú klikkja á tað fyri at halda fram.
+    title: Tú fer burtur úr %{instance}.
   relationships:
     activity: Kontuvirksemi
     confirm_follow_selected_followers: Vil tú veruliga fylgja valdu fylgjarunum?
@@ -1607,6 +1619,7 @@ fo:
       unknown_browser: Ókendur kagi
       weibo: Weibo
     current_session: Verandi seta
+    date: Dagfesting
     description: "%{browser} á %{platform}"
     explanation: Hetta eru vevkagarnir, sum í løtuni eru ritaðir inn á tína Mastodon kontu.
     ip: IP
@@ -1643,14 +1656,26 @@ fo:
     import: Innflyt
     import_and_export: Innflyt og útflyt
     migrate: Flyting av kontu
-    notifications: Fráboðanir
+    notifications: Teldupostfráboðanir
     preferences: Stillingar
     profile: Vangi
     relationships: Fylging og fylgjarar
+    severed_relationships: Avbrotin tilknýti
     statuses_cleanup: Sjálvvirkandi striking av postum
     strikes: Umsjónaratsóknir
     two_factor_authentication: Váttan í tveimum stigum
     webauthn_authentication: Trygdarlyklar
+  severed_relationships:
+    download: Niðurtøkur (%{count})
+    event_type:
+      account_suspension: Kontuógilding (%{target_name})
+      domain_block: Ambætara-ógilding (%{target_name})
+      user_domain_block: Tú hevur forðað %{target_name}
+    lost_followers: Mistir fylgjarar
+    lost_follows: Mist fylgi
+    preamble: Tá ið tú forðar einum økisnavni, ella tínir umsitarar velja at avgilda ein fjarambætara, kanst tú missa fylgi og fylgjarar. Um tað hendir, kanst tú taka ein lista av avbrotnum tilknýtum niður, sum tú kanst eftirhyggja og møguliga innflyta á ein nýggjan ambætara.
+    purged: Umsitararnir fyri tín ambætara hava tømt upplýsingar um henda ambætara úr skipanini.
+    type: Tiltak
   statuses:
     attached:
       audio:
@@ -1688,8 +1713,6 @@ fo:
         other: "%{count} atkvøður"
       vote: Atkvøð
     show_more: Vís meira
-    show_newer: Vís nýggjari
-    show_older: Vís eldri
     show_thread: Vís tráð
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1746,6 +1769,7 @@ fo:
     contrast: Mastodon (høgur kontrastur)
     default: Mastodon (myrkt)
     mastodon-light: Mastodon (ljóst)
+    system: Sjálvvirkandi (brúka vanligt uppsetingareyðkenni)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1773,18 +1797,27 @@ fo:
     webauthn: Trygdarlyklar
   user_mailer:
     appeal_approved:
-      action: Far til kontu tína
+      action: Kontustillingar
       explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er góðkend. Konta tín er aftur tignarlig.
       subject: Kæra tín frá %{date} er góðkend
+      subtitle: Kontan hjá tær er aftur í góðari støðu.
       title: Kæra góðkend
     appeal_rejected:
       explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er vrakað.
       subject: Kæra tín frá %{date} er vrakað
+      subtitle: Kæra tín er vrakað.
       title: Kæra vrakað
     backup_ready:
-      explanation: Tú bað um eitt fult trygdaravrit av tíni Mastodon kontu. Tað er nú klárt at taka niður!
+      explanation: Tú hevur biðið um eitt fult trygdaravrit av Mastodon-kontuni hjá tær.
+      extra: Tað er nú klárt at taka niður!
       subject: Savnið hjá tær er tøkt at taka niður
       title: Tak savn niður
+    failed_2fa:
+      details: 'Her eru smálutirnir í innritanarroyndini:'
+      explanation: Onkur hevur roynt at rita inn á tína kontu, men gav eitt ógildugt seinna samgildi.
+      further_actions_html: Um hetta ikki var tú, so skjóta vit upp, at tú %{action} beinan vegin, tí tað kann vera sett í vanda.
+      subject: Seinna samgildi miseydnaðist
+      title: Miseydnað seinna samgildi
     suspicious_sign_in:
       change_password: broyt loyniorðið hjá tær
       details: 'Her eru smálutirnir í innritanini:'
@@ -1802,7 +1835,7 @@ fo:
         delete_statuses: Summir av postum tínum eru staðfestir at vera í stríði við eina ella fleiri av leiðreglunum og eru tí strikaðir av umsjónarfólkunum á %{instance}.
         disable: Tú kanst ikki longur brúka tína kontu, men vangi tín og aðrar dátur eru óskalað. Tú kanst biðja um trygdaravrit av tínum dátum, broyta kontustillingar ella strika tína kontu.
         mark_statuses_as_sensitive: Summir av postum tínum eru merktir sum viðkvæmir av umsjónarfólkunum á %{instance}. Hetta merkir, at fólk mugu trýsta á miðilin í postinum, áðrenn ein undanvísing verður víst. Tú kanst sjálv/ur merkja miðlar viðkvæmar, tá tú postar í framtíðini.
-        sensitive: Frá nú av, so verða allar miðlafílur, sum tú leggur upp, merktar sum viðkvæmar og fjaldar aftan fyri eina ávarðing.
+        sensitive: Frá nú av, so verða allar miðlafílur, sum tú leggur upp, merktar sum viðkvæmar og fjaldar aftan fyri eina ávaring.
         silence: Tú kanst framvegis brúka kontu tína, men einans fólk, sum longu fylgja tær, fara at síggja tínar postar á hesum ambætaranum, og tú kanst vera hildin uttanfyri ymiskar leitihentleikar. Tó so, onnur kunnu framvegis fylgja tær beinleiðis.
         suspend: Tú kanst ikki longur brúka kontu tína og vangin og aðrar dátur eru ikki longur atkomulig. Tú kanst enn rita inn fyri at biðja um eitt trygdaravrit av tínum dátum, inntil dáturnar eru heilt burturbeindar um umleið 30 dagar, men vit varðveita nakrar grundleggjandi dátur fyri at forða tær í at støkka undan ógildingini.
       reason: 'Grund:'
@@ -1824,13 +1857,41 @@ fo:
         silence: Kontoin er avmarkað
         suspend: Konta ógildað
     welcome:
-      edit_profile_action: Set upp vanga
-      edit_profile_step: Tú kanst tillaga vanga tín við at leggja eina vangamynd inn, broyta vísta navnið hjá tær og meira. Tú kanst velja at eftirkanna nýggjar fylgjarar, áðrenn teir sleppa at fylgja tær.
+      apps_android_action: Fá hana á Google Play
+      apps_ios_action: Tak niður á App Store
+      apps_step: Tak okkara almennu appir niður.
+      apps_title: Mastodon appir
+      checklist_subtitle: 'Kom í gongd á hesum nýggja miðli:'
+      checklist_title: Vælkomukekklisti
+      edit_profile_action: Ger persónligt
+      edit_profile_step: Stimbra títt samvirkni við einum fullfíggjaðum vanga.
+      edit_profile_title: Ger vangan hjá tær persónligan
       explanation: Her eru nøkur ráð so tú kann koma gott ígongd
-      final_action: Byrja at posta
-      final_step: 'Byrja at posta! Sjálvt uttan fylgjarar, so kunnu tínir almennu postar vera sæddir av øðrum, til dømis á lokalu tíðarlinjuni ella í frámerkjum. Kanska vilt tú greiða frá um teg sjálva/n við frámerkinum #introductions.'
-      full_handle: Fulla brúkaranavn títt
-      full_handle_hint: Hetta er tað, sum tú fortelur vinum tínum, soleiðis at tey kunnu senda tær boð ella fylgja tær frá einum øðrum ambætara.
+      feature_action: Lær meira
+      feature_audience: Mastodon gevur við ein einastandandi høvi at stýra tínar áskoðarar uttan millumfólk. Mastodon á tínum egnu ambætarum gevur tær høvi at fylgja og at blíva fylgd ella fylgdur frá einum og hvørjum Mastodon ambætara á netinum og er bert undir tínum ræði.
+      feature_audience_title: Uppbygg tína áskoðarafjøld í treysti
+      feature_control: Tú veitst best, hvat tú vilt síggja á tíni heimarás. Ongar algoritmur ella lýsingar at oyðsla tíðina hjá tær við. Fylg hvønn tú vilt á øllum Mastodon ambætarum umvegis eina kontu og móttak teirra postar í tíðarrað, og ger tín part av internetinum eitt sindur meira sum teg.
+      feature_control_title: Varðveit ræði á tíni egnu tíðarrás
+      feature_creativity: Mastodon hevur postar við ljóði, video og myndum, atkomulýsingar, spurnarkanningar, innihaldsávarðingar, livandi avatarar, sergjørd kenslutekn, klipping av smámyndum og annað, sum hjálpir tær at bera teg fram á netinum. Sama um tú útgevur list, tónleik ella poddvarp, Mastodon er har fyri teg.
+      feature_creativity_title: Makaleys skapan
+      feature_moderation: Mastodon leggur avgerðirnar aftur í tínar hendur. Hvør ambætari hevur sínar egnu reglur og fyriskipanir, sum vera útinnaðar lokalt og ikki frá í erva og niðureftir sum sosialir miðlar hjá stórfyritøkum. Hetta ger tað til tað smidliga at svara tørvinum hjá ymsum bólkum av fólki. Luttak á einum ambætara við reglum, sum tú er samd ella samdur við, ella hýs tín egna ambætara.
+      feature_moderation_title: Umsjón, sum hon eigur at vera
+      follow_action: Fylg
+      follow_step: At fylgja áhugaverdum fólki er tað, sum Mastodon snýr seg um.
+      follow_title: Ger tína heimarás persónliga
+      follows_subtitle: Fylg vælkendar kontur
+      follows_title: Hvørji tú átti at fylgt
+      follows_view_more: Sí fleiri fólk at fylgja
+      hashtags_subtitle: Kanna rákið seinastu 2 dagarnar
+      hashtags_title: Vælumtókt frámerki
+      hashtags_view_more: Sí fleiri vælumtókt frámerki
+      post_action: Skriva
+      post_step: Sig hey við verðina við teksti, myndum, video ella spurnarkanningum.
+      post_title: Stovna tín fyrsta post
+      share_action: Deil
+      share_step: Lat vinir tínar vita, hvussu tey finna teg á Mastodon.
+      share_title: Deil tín Mastodon vanga
+      sign_in_action: Rita inn
       subject: Vælkomin til Mastodon
       title: Vælkomin umborð, %{name}!
   users:
@@ -1838,6 +1899,7 @@ fo:
     go_to_sso_account_settings: Far til kontustillingarnar hjá samleikaveitaranum hjá tær
     invalid_otp_token: Ógyldug tvey-stigs koda
     otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
+    rate_limited: Ov nógvar samgildisroyndir, royn aftur seinni.
     seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
     signed_in_as: 'Ritað/ur inn sum:'
   verification:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index c43fa013c7..05d6b8864d 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -425,7 +425,7 @@ fr-CA:
       view: Afficher les blocages de domaines
     email_domain_blocks:
       add_new: Ajouter
-      allow_registrations_with_approval: Autoriser les inscriptions avec approbation
+      allow_registrations_with_approval: Permettre les inscriptions avec l'approuvement
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
@@ -597,6 +597,9 @@ fr-CA:
       actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
+      already_suspended_badges:
+        local: Déjà suspendu sur ce serveur
+        remote: Déjà suspendu sur le serveur distant
       are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
@@ -767,6 +770,7 @@ fr-CA:
         disabled: À personne
         users: Aux utilisateur·rice·s connecté·e·s localement
       registrations:
+        moderation_recommandation: Veuillez vous assurer d'avoir une équipe de modération adéquate et réactive avant d'ouvrir les inscriptions à tout le monde!
         preamble: Affecte qui peut créer un compte sur votre serveur.
         title: Inscriptions
       registrations_mode:
@@ -774,6 +778,7 @@ fr-CA:
           approved: Approbation requise pour s’inscrire
           none: Personne ne peut s’inscrire
           open: N’importe qui peut s’inscrire
+        warning_hint: Nous vous recommandons d’utiliser « Approbation requise pour s’inscrire » à moins que vous n’ayez confiance dans la capacité de votre équipe de modération à gérer les messages indésirables et les inscriptions malveillantes suffisamment rapidement.
       security:
         authorized_fetch: Exiger une authentification de la part des serveurs fédérés
         authorized_fetch_hint: Exiger l’authentification des serveurs fédérés permet une application plus stricte des blocages définis par les utilisateurs et le serveur. Cependant, cela entraîne une baisse des performances, réduit la portée de vos réponses et peut poser des problèmes de compatibilité avec certains services fédérés. En outre, cela n’empêchera pas les acteurs déterminés d’aller chercher vos messages et comptes publics.
@@ -966,6 +971,9 @@ fr-CA:
       title: Points d’ancrage web
       webhook: Point d’ancrage web
   admin_mailer:
+    auto_close_registrations:
+      body: En raison du manque d'activité récente des modérateurs, les inscriptions à %{instance} ont été automatiquement changées pour nécessiter une revue manuelle afin d'éviter que votre instance %{instance} ne soit utilisée comme plate-forme pour des acteurs potentiellement malveillants. Vous pouvez ré-ouvrir les inscriptions à tout moment.
+      subject: Les inscriptions à %{instance} ont été automatiquement changées pour requérir une approbation
     new_appeal:
       actions:
         delete_statuses: effacer les messages
@@ -1490,7 +1498,6 @@ fr-CA:
     administration_emails: Notifications par e-mail de l’admin
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
-    other_settings: Autres paramètres de notifications
   number:
     human:
       decimal_units:
@@ -1546,6 +1553,9 @@ fr-CA:
     errors:
       limit_reached: Limite de réactions différentes atteinte
       unrecognized_emoji: n’est pas un émoji reconnu
+  redirects:
+    prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+    title: Vous quittez %{instance}.
   relationships:
     activity: Activité du compte
     confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1608,6 +1618,7 @@ fr-CA:
       unknown_browser: Navigateur inconnu
       weibo: Weibo
     current_session: Session courante
+    date: Date
     description: "%{browser} sur %{platform}"
     explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
     ip: Adresse IP
@@ -1644,14 +1655,26 @@ fr-CA:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
+    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
+    severed_relationships: Relations rompues
     statuses_cleanup: Suppression automatique de messages
     strikes: Sanctions de modération
     two_factor_authentication: Identification à deux facteurs
     webauthn_authentication: Clés de sécurité
+  severed_relationships:
+    download: Téléchargement (%{count})
+    event_type:
+      account_suspension: Suspension du compte (%{target_name})
+      domain_block: Suspension du serveur (%{target_name})
+      user_domain_block: Vous avez bloqué %{target_name}
+    lost_followers: Abonné·e·s perdu·e·s
+    lost_follows: Abonnements perdus
+    preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur.
+    purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur.
+    type: Evènement
   statuses:
     attached:
       audio:
@@ -1689,8 +1712,6 @@ fr-CA:
         other: "%{count} votes"
       vote: Voter
     show_more: Déplier
-    show_newer: Plus récents
-    show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
@@ -1747,6 +1768,7 @@ fr-CA:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
     mastodon-light: Mastodon (Clair)
+    system: Automatique (utiliser le thème système)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1774,18 +1796,27 @@ fr-CA:
     webauthn: Clés de sécurité
   user_mailer:
     appeal_approved:
-      action: Aller à votre compte
+      action: Paramètres du compte
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
       subject: Votre appel du %{date} a été approuvé
+      subtitle: Votre compte est de nouveau en règle.
       title: Appel approuvé
     appeal_rejected:
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
       subject: Votre appel du %{date} a été rejeté
+      subtitle: Votre appel a été rejeté.
       title: Appel rejeté
     backup_ready:
-      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+      extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
+    failed_2fa:
+      details: 'Voici les détails de la tentative de connexion :'
+      explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+      further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+      subject: Échec de l'authentification à double facteur
+      title: Échec de l'authentification à double facteur
     suspicious_sign_in:
       change_password: changer votre mot de passe
       details: 'Voici les détails de la connexion :'
@@ -1825,13 +1856,44 @@ fr-CA:
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
-      edit_profile_action: Configuration du profil
-      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
+      apps_android_action: Disponible sur Google Play
+      apps_ios_action: Télécharger sur l'App Store
+      apps_step: Téléchargez nos applications officielles.
+      apps_title: Applications Mastodon
+      checklist_subtitle: 'Commencez votre aventure sur le web social:'
+      checklist_title: Premières étapes
+      edit_profile_action: Personnaliser
+      edit_profile_step: Améliorez vos interactions avec un profil plus complet.
+      edit_profile_title: Personnaliser votre profil
       explanation: Voici quelques conseils pour vous aider à démarrer
-      final_action: Commencez à publier
-      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
-      full_handle: Votre identifiant complet
-      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
+      feature_action: En savoir plus
+      feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
+      feature_audience_title: Construisez votre audience en toute confiance
+      feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+      feature_control_title: Gardez le contrôle de votre fil
+      feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
+      feature_creativity_title: Créativité inégalée
+      feature_moderation: Mastodon vous redonne le contrôle. Chaque serveur établit ses propres règles, appliquées localement et non pas de manière verticale comme sur les médias sociaux commerciaux, donnant davantage de souplesse pour répondre aux besoins de différentes communautés. Rejoignez un serveur avec des règles qui vous conviennent, ou bien hébergez le vôtre.
+      feature_moderation_title: La modération comme elle doit être
+      follow_action: Suivre
+      follow_step: Suivre des personnes intéressantes est l'essence de Mastodon.
+      follow_title: Personnaliser votre fil principal
+      follows_subtitle: Suivez des comptes populaires
+      follows_title: Qui suivre
+      follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count:
+        one: "%{people} personne dans les deux derniers jours"
+        other: "%{people} personnes dans les deux derniers jours"
+      hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
+      hashtags_title: Hashtags populaires
+      hashtags_view_more: Voir plus de hashtags populaires
+      post_action: Rédiger
+      post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
+      post_title: Rédiger votre premier message
+      share_action: Partager
+      share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
+      share_title: Partager votre profil Mastodon
+      sign_in_action: Se connecter
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
@@ -1839,6 +1901,7 @@ fr-CA:
     go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+    rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
     seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5c6166ddc3..6ab4208801 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -597,6 +597,9 @@ fr:
       actions_description_html: Décidez des mesures à prendre pour résoudre ce signalement. Si vous prenez des mesures punitives contre le compte signalé, une notification sera envoyée par e-mail, sauf si la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
       add_to_report: Ajouter davantage au rapport
+      already_suspended_badges:
+        local: Déjà suspendu sur ce serveur
+        remote: Déjà suspendu sur le serveur distant
       are_you_sure: Voulez-vous vraiment faire ça ?
       assign_to_self: Me l’assigner
       assigned: Modérateur assigné
@@ -767,6 +770,7 @@ fr:
         disabled: À personne
         users: Aux utilisateur·rice·s connecté·e·s localement
       registrations:
+        moderation_recommandation: Veuillez vous assurer d'avoir une équipe de modération adéquate et réactive avant d'ouvrir les inscriptions à tout le monde!
         preamble: Affecte qui peut créer un compte sur votre serveur.
         title: Inscriptions
       registrations_mode:
@@ -774,6 +778,7 @@ fr:
           approved: Approbation requise pour s’inscrire
           none: Personne ne peut s’inscrire
           open: N’importe qui peut s’inscrire
+        warning_hint: Nous vous recommandons d’utiliser « Approbation requise pour s’inscrire » à moins que vous n’ayez confiance dans la capacité de votre équipe de modération à gérer les messages indésirables et les inscriptions malveillantes suffisamment rapidement.
       security:
         authorized_fetch: Exiger une authentification de la part des serveurs fédérés
         authorized_fetch_hint: Exiger l’authentification des serveurs fédérés permet une application plus stricte des blocages définis par les utilisateurs et le serveur. Cependant, cela entraîne une baisse des performances, réduit la portée de vos réponses et peut poser des problèmes de compatibilité avec certains services fédérés. En outre, cela n’empêchera pas les acteurs déterminés d’aller chercher vos messages et comptes publics.
@@ -966,6 +971,9 @@ fr:
       title: Points d’ancrage web
       webhook: Point d’ancrage web
   admin_mailer:
+    auto_close_registrations:
+      body: En raison du manque d'activité récente des modérateurs, les inscriptions à %{instance} ont été automatiquement changées pour nécessiter une revue manuelle afin d'éviter que votre instance %{instance} ne soit utilisée comme plate-forme pour des acteurs potentiellement malveillants. Vous pouvez ré-ouvrir les inscriptions à tout moment.
+      subject: Les inscriptions à %{instance} ont été automatiquement changées pour requérir une approbation
     new_appeal:
       actions:
         delete_statuses: effacer les messages
@@ -1490,7 +1498,6 @@ fr:
     administration_emails: Notifications par e-mail de l’admin
     email_events: Événements pour les notifications par courriel
     email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
-    other_settings: Autres paramètres de notifications
   number:
     human:
       decimal_units:
@@ -1546,6 +1553,9 @@ fr:
     errors:
       limit_reached: Limite de réactions différentes atteinte
       unrecognized_emoji: n’est pas un émoji reconnu
+  redirects:
+    prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+    title: Vous quittez %{instance}.
   relationships:
     activity: Activité du compte
     confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1608,6 +1618,7 @@ fr:
       unknown_browser: Navigateur inconnu
       weibo: Weibo
     current_session: Session courante
+    date: Date
     description: "%{browser} sur %{platform}"
     explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
     ip: Adresse IP
@@ -1644,14 +1655,26 @@ fr:
     import: Import de données
     import_and_export: Import et export
     migrate: Migration de compte
-    notifications: Notifications
+    notifications: Notifications par mail
     preferences: Préférences
     profile: Profil
     relationships: Abonnements et abonné·e·s
+    severed_relationships: Relations rompues
     statuses_cleanup: Suppression automatique de messages
     strikes: Sanctions de modération
     two_factor_authentication: Authentification à deux facteurs
     webauthn_authentication: Clés de sécurité
+  severed_relationships:
+    download: Téléchargement (%{count})
+    event_type:
+      account_suspension: Suspension du compte (%{target_name})
+      domain_block: Suspension du serveur (%{target_name})
+      user_domain_block: Vous avez bloqué %{target_name}
+    lost_followers: Abonné·e·s perdu·e·s
+    lost_follows: Abonnements perdus
+    preamble: Vous pouvez perdre des abonnés et des abonnements lorsque vous bloquez un domaine ou lorsque vos modérateurs décident de suspendre un serveur distant. Lorsque cela arrive, vous êtes en mesure de télécharger une liste de vos relations rompues, afin de l'inspecter et d'éventuellement l'importer sur un autre serveur.
+    purged: Les informations sur ce serveur ont été purgées par les administrateurs du serveur.
+    type: Evènement
   statuses:
     attached:
       audio:
@@ -1689,8 +1712,6 @@ fr:
         other: "%{count} votes"
       vote: Voter
     show_more: Déplier
-    show_newer: Plus récents
-    show_older: Plus anciens
     show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
@@ -1747,6 +1768,7 @@ fr:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
     mastodon-light: Mastodon (Clair)
+    system: Automatique (utiliser le thème système)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1774,18 +1796,27 @@ fr:
     webauthn: Clés de sécurité
   user_mailer:
     appeal_approved:
-      action: Aller à votre compte
+      action: Paramètres du compte
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
       subject: Votre appel du %{date} a été approuvé
+      subtitle: Votre compte est de nouveau en règle.
       title: Appel approuvé
     appeal_rejected:
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
       subject: Votre appel du %{date} a été rejeté
+      subtitle: Votre appel a été rejeté.
       title: Appel rejeté
     backup_ready:
-      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+      extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
+    failed_2fa:
+      details: 'Voici les détails de la tentative de connexion :'
+      explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+      further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+      subject: Échec de l'authentification à double facteur
+      title: Échec de l'authentification à double facteur
     suspicious_sign_in:
       change_password: changer votre mot de passe
       details: 'Voici les détails de la connexion :'
@@ -1825,13 +1856,44 @@ fr:
         silence: Compte limité
         suspend: Compte suspendu
     welcome:
-      edit_profile_action: Configuration du profil
-      edit_profile_step: Vous pouvez personnaliser votre profil en téléchargeant une photo de profil, en changant votre nom d'utilisateur, etc. Vous pouvez opter pour le passage en revue de chaque nouvelle demande d'abonnement à chaque fois qu'un utilisateur essaie de s'abonner à votre compte.
+      apps_android_action: Disponible sur Google Play
+      apps_ios_action: Télécharger sur l'App Store
+      apps_step: Téléchargez nos applications officielles.
+      apps_title: Applications Mastodon
+      checklist_subtitle: 'Commencez votre aventure sur le web social:'
+      checklist_title: Premières étapes
+      edit_profile_action: Personnaliser
+      edit_profile_step: Améliorez vos interactions avec un profil plus complet.
+      edit_profile_title: Personnaliser votre profil
       explanation: Voici quelques conseils pour vous aider à démarrer
-      final_action: Commencez à publier
-      final_step: 'Commencez à publier ! Même si vous n''avez pas encore d''abonnés, vos publications sont publiques et sont accessibles par les autres, par exemple grâce à la zone horaire locale ou par les hashtags. Vous pouvez vous présenter sur le hashtag #introductions.'
-      full_handle: Votre identifiant complet
-      full_handle_hint: C’est ce que vous diriez à vos ami·e·s pour leur permettre de vous envoyer un message ou vous suivre à partir d’un autre serveur.
+      feature_action: En savoir plus
+      feature_audience: Mastodon vous offre une possibilité unique de gérer votre audience sans intermédiaires. Mastodon peut être déployé sur votre propre infrastructure, ce qui vous permet de suivre et d'être suivi depuis n'importe quel autre serveur Mastodon et de n'être contrôlé par personne d'autre que vous.
+      feature_audience_title: Construisez votre audience en toute confiance
+      feature_control: Vous savez mieux que quiconque ce que vous voulez voir sur votre fil principal. Personne ne veut d'un algorithme qui décide à vote place ou de publicité qui vous fera perdre votre temps. Suivez n'importe qui, sur n'importe quel serveur Mastodon, depuis votre compte. Recevez les publications du monde entier dans l'ordre chronologique et créez-vous votre chez-vous numérique qui vous ressemble.
+      feature_control_title: Gardez le contrôle de votre fil
+      feature_creativity: Mastodon prend en charge les messages audio, vidéo et photo, les descriptions d'accessibilité, les sondages, les avertissements de contenu, les avatars animés, les émojis personnalisés, le contrôle des vignettes et bien plus encore pour vous aider à vous exprimer en ligne. Que vous publiiez votre art, votre musique ou votre podcast, Mastodon est là pour vous.
+      feature_creativity_title: Créativité inégalée
+      feature_moderation: Mastodon vous redonne le contrôle. Chaque serveur établit ses propres règles, appliquées localement et non pas de manière verticale comme sur les médias sociaux commerciaux, donnant davantage de souplesse pour répondre aux besoins de différentes communautés. Rejoignez un serveur avec des règles qui vous conviennent, ou bien hébergez le vôtre.
+      feature_moderation_title: La modération comme elle doit être
+      follow_action: Suivre
+      follow_step: Suivre des personnes intéressantes est l'essence de Mastodon.
+      follow_title: Personnaliser votre fil principal
+      follows_subtitle: Suivez des comptes populaires
+      follows_title: Qui suivre
+      follows_view_more: Voir plus de personnes à suivre
+      hashtags_recent_count:
+        one: "%{people} personne dans les deux derniers jours"
+        other: "%{people} personnes dans les deux derniers jours"
+      hashtags_subtitle: Explorez les tendances depuis les 2 derniers jours
+      hashtags_title: Hashtags populaires
+      hashtags_view_more: Voir plus de hashtags populaires
+      post_action: Rédiger
+      post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
+      post_title: Rédiger votre premier message
+      share_action: Partager
+      share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
+      share_title: Partager votre profil Mastodon
+      sign_in_action: Se connecter
       subject: Bienvenue sur Mastodon
       title: Bienvenue à bord, %{name} !
   users:
@@ -1839,6 +1901,7 @@ fr:
     go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+    rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
     seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 9471c03b92..1f1a27fec4 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -597,6 +597,9 @@ fy:
       actions_description_html: Beslis hokker maatregel nommen wurde moat om dizze rapportaazje op te lossen. Wannear’t jo in (straf)maatregel tsjin it rapportearre account nimme, kriget de account in e-mailmelding, behalve wannear’t de <strong>spam</strong>-kategory keazen is.
       actions_description_remote_html: Beslút hokker aksje nommen wurde moat om dizze rapportaazje ôf te hanneljen. Dit hat allinnich ynfloed op hoe’t <strong>jo</strong> server kommunisearret mei dizze eksterne account en omgiet mei de ynhâld.
       add_to_report: Mear oan de rapportaazje tafoegje
+      already_suspended_badges:
+        local: Al opskoarte op dizze server
+        remote: Al opskoarte op harren server
       are_you_sure: Binne jo wis?
       assign_to_self: Oan my tawize
       assigned: Tawizen moderator
@@ -748,6 +751,7 @@ fy:
         desc_html: Dit is ôfhinklik fan eksterne scripts fan hCaptcha, wat feilichheids- en privacyrisiko’s meibringe kin. Boppe dat kin <strong>dit it registraasjeproses bot minder tagonklik meitsje foar guon (foaral handicapte) minsken</strong>. Om dizze redenen kinne jo it beste alternative maatregels oerweagje, lykas registraasje op basis fan goedkarring of op útnûging.
         title: Nije brûkers moatte in CAPTCHA oplosse om harren account te befêstigjen
       content_retention:
+        danger_zone: Gefaresône
         preamble: Tafersjoch hâlde op hoe’t berjochten en media fan brûkers op Mastodon bewarre wurde.
         title: Bewartermyn berjochten
       default_noindex:
@@ -767,6 +771,7 @@ fy:
         disabled: Oan net ien
         users: Oan oanmelde lokale brûkers
       registrations:
+        moderation_recommandation: Soargje derfoar dat jo in adekwaat en responsyf moderaasjeteam hawwe eardat jo registraasjes foar elkenien iepenstelle!
         preamble: Tafersjoch hâlde op wa’t in account op dizze server registrearje kin.
         title: Registraasjes
       registrations_mode:
@@ -1490,7 +1495,6 @@ fy:
     administration_emails: E-mailmeldingen behearder
     email_events: E-mailmeldingen foar eveneminten
     email_events_hint: 'Selektearje eveneminten wêrfoar’t jo meldingen ûntfange wolle:'
-    other_settings: Oare meldingsynstellingen
   number:
     human:
       decimal_units:
@@ -1546,6 +1550,9 @@ fy:
     errors:
       limit_reached: Limyt fan ferskate emoji-reaksjes berikt
       unrecognized_emoji: is gjin besteande emoji-reaksje
+  redirects:
+    prompt: As jo dizze keppeling fertrouwe, klik der dan op om troch te gean.
+    title: Jo ferlitte %{instance}.
   relationships:
     activity: Accountaktiviteit
     confirm_follow_selected_followers: Binne jo wis dat jo de selektearre folgers folgje wolle?
@@ -1608,6 +1615,7 @@ fy:
       unknown_browser: Unbekende browser
       weibo: Weibo
     current_session: Aktuele sesje
+    date: Datum
     description: "%{browser} op %{platform}"
     explanation: Dit binne de webbrowsers dy’t op dit stuit mei jo Mastodon-account oanmeld binne.
     ip: IP
@@ -1644,14 +1652,24 @@ fy:
     import: Ymportearje
     import_and_export: Ymportearje en eksportearje
     migrate: Accountmigraasje
-    notifications: Meldingen
+    notifications: E-mailmeldingen
     preferences: Ynstellingen
     profile: Profyl
     relationships: Folgers en folgjenden
+    severed_relationships: Ferbrutsen folchrelaasjes
     statuses_cleanup: Automatysk berjochten fuortsmite
     strikes: Fêststelde skeiningen
     two_factor_authentication: Twa-stapsferifikaasje
     webauthn_authentication: Befeiligingskaaien
+  severed_relationships:
+    download: Downloade (%{count})
+    event_type:
+      account_suspension: Accountopskoarting (%{target_name})
+      domain_block: Serveropskoarting (%{target_name})
+      user_domain_block: Jo hawwe %{target_name} blokkearre
+    lost_followers: Ferlerne folgers
+    lost_follows: Ferlerne folge accounts
+    type: Barren
   statuses:
     attached:
       audio:
@@ -1689,8 +1707,6 @@ fy:
         other: "%{count} stimmen"
       vote: Stimme
     show_more: Mear toane
-    show_newer: Nijere toane
-    show_older: Aldere toane
     show_thread: Petear toane
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,6 +1763,7 @@ fy:
     contrast: Mastodon (heech kontrast)
     default: Mastodon (donker)
     mastodon-light: Mastodon (ljocht)
+    system: Automatysk (systeemtema brûke)
   time:
     formats:
       default: "%d %B %Y om %H:%M"
@@ -1774,18 +1791,27 @@ fy:
     webauthn: Befeiligingskaaien
   user_mailer:
     appeal_approved:
-      action: Gean nei jo account
+      action: Accountynstellingen
       explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is goedkard. De earder fêststelde skeining is hjirby net langer jildich.
       subject: Jo beswier fan %{date} is goedkard
+      subtitle: Jo account hat wer in goede reputaasje.
       title: Beswier goedkard
     appeal_rejected:
       explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is ôfwêzen. De fêststelde skeining bliuwt wurdt dêrom net wizige.
       subject: Jo beswier fan %{date} is ôfwêzen
+      subtitle: Jo beswier is ôfwêzen.
       title: Beswier ôfwêzen
     backup_ready:
-      explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account opfrege. It stiet no klear om download te wurden!
+      explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account oanfrege.
+      extra: It stiet no klear om download te wurden!
       subject: Jo argyf stiet klear om download te wurden
       title: Argyf ophelje
+    failed_2fa:
+      details: 'Hjir binne de details fan de oanmeldbesykjen:'
+      explanation: Ien hat probearre om oan te melden op jo account, mar hat in ûnjildige twaddeferifikaasjefaktor opjûn.
+      further_actions_html: As jo dit net wiene, rekommandearje wy jo oan daliks %{action}, omdat it kompromitearre wêze kin.
+      subject: Twaddefaktorautentikaasjeflater
+      title: Twastapsferifikaasje mislearre
     suspicious_sign_in:
       change_password: wizigje jo wachtwurd
       details: 'Hjir binne de details fan oanmeldbesykjen:'
@@ -1825,13 +1851,44 @@ fy:
         silence: Account beheind
         suspend: Account beskoattele
     welcome:
-      edit_profile_action: Profyl ynstelle
-      edit_profile_step: Jo kinne jo profyl oanpasse troch in profylfoto op te laden, jo werjeftenamme oan te passen en mear. Jo kinne it hânmjittich goedkarren fan folgers ynstelle.
+      apps_android_action: Fia Google Play downloade
+      apps_ios_action: Fia de App Store downloade
+      apps_step: Us offisjele apps downloade
+      apps_title: Mastodon-apps
+      checklist_subtitle: 'Litte wy oan dit nije sosjale aventoer begjinne:'
+      checklist_title: Wolkomstkontrôlelist
+      edit_profile_action: Personalisearje
+      edit_profile_step: Wannear’t jo mear oer josels fertelle, krije jo mear ynteraksje mei oare minsken.
+      edit_profile_title: Jo profyl personalisearje
       explanation: Hjir binne inkelde tips om jo op wei te helpen
-      final_action: Begjin mei berjochten te pleatsen
-      final_step: 'Begjin berjochten te pleatsen! Sels sûnder folgers kinne jo iepenbiere berjochten troch oaren besjoen wurde, bygelyks op de lokale tiidline en ûnder hashtags. Jo kinne josels foarstelle mei it gebrûk fan de hashtag #introductions.'
-      full_handle: Jo folsleine Mastodon-adres
-      full_handle_hint: Dit jouwe jo oan jo freonen, sadat se jo berjochten stjoere kinne of (fan in oare Mastodon-server ôf) folgje kinne.
+      feature_action: Mear ynfo
+      feature_audience: Mastodon biedt jo in unike mooglikheid om jo publyk te behearen sûnder tuskenpersoanen. Mastodon, ymplemintearre yn jo eigen ynfrastruktuer, stelt jo yn steat om elke oare Mastodon-server online te folgjen en troch harren folge te wurden, en stiet ûnder kontrôle fan net ien, útsein dy fan jo.
+      feature_audience_title: Bou jo publyk yn fertrouwen op
+      feature_control: Jo witte sels it bêste wat jo op jo tiidline sjen wolle. Gjin algoritmen of advertinsjes om jo tiid te fergriemen. Folgje elkenien op elke Mastodon-server fan ien account ôf en ûntfang harren berjochten yn gronologyske folchoarder, en meitsje jo hoekje op it ynternet in bytsje mear as josels.
+      feature_control_title: Hâld kontrôle oer jo eigen tiidline
+      feature_creativity: Mastodon stipet audio-, fideo- en fotoberjochten, tagonklikheidsbeskriuwingen, enkêten, ynhâldswarskôgingen, animearre avatars, oanpaste emoji, kontrôle oer it bywurkjen fan miniatueren en mear, om jo te helpen josels online te uterjen. Oft jo no jo keunst, muzyk of podcast publisearje, Mastodon stiet foar jo klear.
+      feature_creativity_title: Bjusterbaarlike kreativiteit
+      feature_moderation: Mastodon leit de beslútfoarming wer yn jo hannen. Elke server makket harren eigen rigels en foarskriften, dy’t lokaal hanthavene wurde en net fan boppe ôf, lykas sosjale media fan bedriuwen, wêrtroch it it meast fleksibel is yn it reagearjen op de behoeften fan ferskate groepen minsken. Wurd lid fan in server mei de rigels wêrmei’t jo akkoard geane, of host jo eigen.
+      feature_moderation_title: Moderaasje sa as it heart
+      follow_action: Folgje
+      follow_step: Op Mastodon draait it hielendal om it folgjen fan ynteressante minsken.
+      follow_title: Personalisearje jo starttiidline
+      follows_subtitle: Folgje bekende accounts
+      follows_title: Wa te folgjen
+      follows_view_more: Mear minsken om te folgjen besjen
+      hashtags_recent_count:
+        one: "%{people} persoan yn de ôfrûne 2 dagen"
+        other: "%{people} persoanen yn de ôfrûne 2 dagen"
+      hashtags_subtitle: Wat der yn de ôfrûne 2 dagen bard is ferkenne
+      hashtags_title: Populêre hashtags
+      hashtags_view_more: Mear populêre hashtags besjen
+      post_action: Opstelle
+      post_step: Sis hallo tsjin de wrâld mei tekst, foto’s, fideo’s of peilingen.
+      post_title: Jo earste berjocht meitsje
+      share_action: Diele
+      share_step: Lit jo freonen witte hoe’t jo te finen binne op Mastodon.
+      share_title: Jo Mastodon-profyl diele
+      sign_in_action: Oanmelde
       subject: Wolkom op Mastodon
       title: Wolkom oan board %{name}!
   users:
@@ -1839,6 +1896,7 @@ fy:
     go_to_sso_account_settings: Gean nei de accountynstellingen fan jo identiteitsprovider
     invalid_otp_token: Unjildige twa-stapstagongskoade
     otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
+    rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
     seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
     signed_in_as: 'Oanmeld as:'
   verification:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 527512053b..a3ad293e5b 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -461,7 +461,6 @@ ga:
     development: Forbairt
     edit_profile: Cuir an phróifíl in eagar
     import: Iompórtáil
-    notifications: Fógraí
     preferences: Sainroghanna pearsanta
     profile: Próifíl
     webauthn_authentication: Eochracha slándála
@@ -471,7 +470,6 @@ ga:
     poll:
       vote: Vótáil
     show_more: Taispeáin níos mó
-    show_newer: Taispeáin níos nuaí
     show_thread: Taispeáin snáithe
     visibilities:
       private: Leantóirí amháin
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 965447d4f9..70bace05cf 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -439,6 +439,7 @@ gd:
       view: Seall bacadh na h-àrainne
     email_domain_blocks:
       add_new: Cuir tè ùr ris
+      allow_registrations_with_approval: Ceadaich clàradh le aontachadh
       attempts_over_week:
         few: "%{count} oidhirpean clàraidh rè na seachdain seo chaidh"
         one: "%{count} oidhirp clàraidh rè na seachdain seo chaidh"
@@ -504,14 +505,14 @@ gd:
       by_domain: Àrainn
       confirm_purge: A bheil thu cinnteach gu bheil thu airson an dàta on àrainn seo a sguabadh às gu buan?
       content_policies:
-        comment: Nòta taobh a-staigh
+        comment: Nòta
         description_html: "’S urrainn dhut poileasaidhean susbainte a mhìneachadh a thèid a chur an sàs air a h-uile cunntas on àrainn seo ’s a fo-àrainnean-se."
         limited_federation_mode_description_html: "’S urrainn dhut taghadh an ceadaich thu co-nasgadh leis an àrainn seo gus nach ceadaich."
         policies:
-          reject_media: Diùlt meadhanan
-          reject_reports: Diùlt gearanan
-          silence: Cuingich
-          suspend: Cuir à rèim
+          reject_media: A’ diùltadh meadhanan
+          reject_reports: A’ diùltadh gearanan
+          silence: Cuingichte
+          suspend: À rèim
         policy: Poileasaidh
         reason: Adhbhar poblach
         title: Poileasaidhean susbainte
@@ -620,6 +621,9 @@ gd:
       actions_description_html: Socraich dè a nì thu airson an gearan seo fhuasgladh. Ma chuireas tu peanas air a’ chunntas le gearan air, gheibh iad brath air a’ phost-d mura tagh thu an roinn-seòrsa <strong>Spama</strong>.
       actions_description_remote_html: Cuir romhad dè an gnìomh a ghabhas tu airson an gearan seo fhuasgladh. Cha bheir seo buaidh ach air mar a làimhsicheas am frithealaiche <strong>agadsa</strong> an cunntas cèin seo is mar a nì e conaltradh leis.
       add_to_report: Cuir barrachd ris a’ ghearan
+      already_suspended_badges:
+        local: Chaidh an cur à rèim air an fhrithealaiche seo mu thràth
+        remote: Chaidh an cur à rèim air an fhrithealaiche aca-san mu thràth
       are_you_sure: A bheil thu cinnteach?
       assign_to_self: Iomruin dhomh-sa
       assigned: Maor iomruinte
@@ -635,6 +639,7 @@ gd:
       created_at: Chaidh an gearan a dhèanamh
       delete_and_resolve: Sguab às na postaichean
       forwarded: Chaidh a shìneadh air adhart
+      forwarded_replies_explanation: Tha an gearan seo o chleachdaiche cèin agus mu shusbaint chèin. Chaidh a shìneadh air adhart thugad on as e freagairt do neach-cleachdaidh agad-sa a tha san t-susbaint a tha na cois.
       forwarded_to: Chaidh a shìneadh air adhart gu %{domain}
       mark_as_resolved: Cuir comharra gun deach fhuasgladh
       mark_as_sensitive: Cuir comharra gu bheil e frionasach
@@ -781,10 +786,10 @@ gd:
         title: Thoir air falbh ro-aonta nan cleachdaichean air inneacsadh le einnseanan-luirg mar a’ bhun-roghainn
       discovery:
         follow_recommendations: Molaidhean leantainn
-        preamble: Tha tighinn an uachdar susbainte inntinniche fìor-chudromach airson toiseach-tòiseachaidh an luchd-cleachdaidh ùr nach eil eòlach air duine sam bith air Mastodon, ma dh’fhaoidte. Stiùirich mar a dh’obraicheas gleusan an rannsachaidh air an fhrithealaiche agad.
+        preamble: Tha tighinn an uachdar susbainte inntinniche fìor-chudromach airson toiseach-tòiseachaidh an luchd-cleachdaidh ùr nach eil eòlach air duine sam bith air Mastodon, ma dh’fhaoidte. Stiùirich mar a dh’obraicheas gleusan an rùrachaidh air an fhrithealaiche agad.
         profile_directory: Eòlaire nam pròifil
         public_timelines: Loidhnichean-ama poblach
-        publish_discovered_servers: Foillsich na frithealaichean a chaidh a lorg
+        publish_discovered_servers: Foillsich na frithealaichean a chaidh a rùrachadh
         publish_statistics: Foillsich an stadastaireachd
         title: Rùrachadh
         trends: Treandaichean
@@ -793,6 +798,7 @@ gd:
         disabled: Na seall idir
         users: Dhan luchd-chleachdaidh a clàraich a-steach gu h-ionadail
       registrations:
+        moderation_recommandation: Dèan cinnteach gu bheil sgioba maoir deiseil is deònach agad mus fhosgail thu an clàradh dhan a h-uile duine!
         preamble: Stiùirich cò dh’fhaodas cunntas a chruthachadh air an fhrithealaiche agad.
         title: Clàraidhean
       registrations_mode:
@@ -800,6 +806,7 @@ gd:
           approved: Tha aontachadh riatanach airson clàradh
           none: Chan fhaod neach sam bith clàradh
           open: "’S urrainn do neach sam bith clàradh"
+        warning_hint: Mholamaid gun chleachd thu “Tha aontachadh riatanach airson clàradh” mur eil earbsa agad gur urrainn dhan sgioba agad spama agus clàraidhean droch-rùnach a làimhseachadh gu sgiobalta.
       security:
         authorized_fetch: Iarr dearbhadh o fhrithealaichean co-naisgte
         authorized_fetch_hint: Ma dh’iarras tu dearbhadh o fhrithealaichean cho-naisgte, gheibh thu an comas gus bacaidhean èigneachadh nas teinne an dà chuid air ìre an luchd-cleachdaidh ’s an fhrithealaiche. Gidheadh, ceannaichidh tu an comas seo le dèanadas nas miosa is ruigsinn nas lugha nam freagairtean agad agus dh’fhaoidte gun èirich duilgheadasan co-chòrdalachd le cuid a sheirbheisean cho-naisgte. A bharrachd air sin, cha bhac seo an fheadhainn dian o fhaighinn nam postaichean is cunntasan poblach agad.
@@ -899,7 +906,7 @@ gd:
         message_html: "<strong>Chaidh stòras nan oibseactan agad a dhroch-rèiteachadh. Tha prìobhaideachd an luchd-cleachdaidh agad fo chunnart.</strong>"
     tags:
       review: Dèan lèirmheas air an staid
-      updated_msg: Chaidh roghainnean nan tagaichean hais ùrachadh
+      updated_msg: Chaidh roghainnean an taga hais ùrachadh
     title: Rianachd
     trends:
       allow: Ceadaich
@@ -1000,6 +1007,9 @@ gd:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Ri linn dìth gnìomhachd nam maor o chionn goirid, dh’atharraich Mastodon modh nan clàraidhean aig %{instance} ach am feum cunntasan ùra aontachadh a làimh leis an amas gun dèid %{instance} a dhìon o chleachdadh air dòighean droch-rùnach. ’S urrainn dhut na clàraidhean fhosgladh a-rithist uair sam bith.
+      subject: Feumaidh clàradh le %{instance} aontachadh a-nis
     new_appeal:
       actions:
         delete_statuses: sguabadh às nam postaichean aca
@@ -1075,6 +1085,14 @@ gd:
       hint_html: Dìreach aon rud eile! Feumaidh sinn dearbhadh gu bheil thu daonna (ach am fàg sinn an spama aig an doras!). Fuasgail an CAPTCHA gu h-ìosal is briog air “Lean air adhart”.
       title: Deuchainn tèarainteachd
     confirmations:
+      awaiting_review: Chaidh am post-d agad a dhearbhadh! Nì an sgioba aig %{domain} lèirmheas air a’ chlàradh agad a-nis. Gheibh thu post-d nuair a bhios iad air aontachadh ris a’ chunntas agad!
+      awaiting_review_title: Tha an cunntas agad ’ga sgrùdadh
+      clicking_this_link: briogadh air a’ cheangal seo
+      login_link: clàradh a-steach
+      proceed_to_login_html: "’S urrainn dhut %{login_link} a-nis."
+      redirect_to_app_html: Bu chòir dhuinn d’ ath-stiùireadh gu aplacaid <strong>%{app_name}</strong>. Mur an do dh’obraich sin, feuch %{clicking_this_link} no till dhan aplacaid a làimh.
+      registration_complete: Tha an clàradh agad air %{domain} deiseil a-nis!
+      welcome_title: Fàilte ort, %{name}!
       wrong_email_hint: Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
     delete_account: Sguab às an cunntas
     delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, <a href="%{path}">nì thu an-seo e</a>. Thèid dearbhadh iarraidh ort.
@@ -1194,7 +1212,7 @@ gd:
       appealed_msg: Chaidh an t-ath-thagradh agad a chur a-null. Ma thèid aontachadh ris, gheibh thu brath mu dhèidhinn.
       appeals:
         submit: Cuir a-null an t-ath-thagradh
-      approve_appeal: Zatwierdź odwołanie
+      approve_appeal: Thoir aonta ris an ath-thagradh
       associated_report: An gearan co-cheangailte
       created_at: Ceann-là
       description_html: Seo na gnìomhan a chaidh a ghabhail an aghaidh a’ chunntais agad agus na rabhaidhean a chaidh a chur thugad le luchd-obrach %{instance}.
@@ -1408,6 +1426,7 @@ gd:
       '86400': Latha
     expires_in_prompt: Chan ann idir
     generate: Gin ceangal cuiridh
+    invalid: Chan eil an cuireadh dligheach
     invited_by: 'Fhuair thu cuireadh o:'
     max_uses:
       few: "%{count} cleachdaichean"
@@ -1531,7 +1550,6 @@ gd:
     administration_emails: Brathan puist-d na rianachd
     email_events: Tachartasan nam brathan puist-d
     email_events_hint: 'Tagh na tachartasan dhan a bheil thu airson brathan fhaighinn:'
-    other_settings: Roghainnean eile nam brathan
   number:
     human:
       decimal_units:
@@ -1577,7 +1595,7 @@ gd:
     privacy: Prìobhaideachd
     privacy_hint_html: Stiùirich na tha thu airson foillseachadh do chàch. Gheibh daoine lorg air pròifilean inntinneach is deagh aplacaidean a’ brabhsadh cò tha daoine eile a’ leantainn ’s a’ faicinn nan aplacaidean a chleachdas iad airson postadh ach dh’fhaoidte gum b’ fheàrr leat seo a chumail falaichte.
     reach: Ruigse
-    reach_hint_html: Stiùirich am bu mhiann leat gun lorg ’s gun lean daoine ùra thu gus nach bu mhiann. A bheil thu airson ’s gun nochd na postaichean agad air duilleag an rùrachaidh? No gum faic càch thu am measg nam molaidhean leantainn aca? An gabh thu ri luchd-leantainn ùr sam bith gu fèin-obrachail no an cùm thu fhèin smachd air gach neach fa leth?
+    reach_hint_html: Stiùirich am bu mhiann leat gun rùraich ’s gun lean daoine ùra thu gus nach bu mhiann. A bheil thu airson ’s gun nochd na postaichean agad air duilleag an rùrachaidh? No gum faic càch thu am measg nam molaidhean leantainn aca? An gabh thu ri luchd-leantainn ùr sam bith gu fèin-obrachail no an cùm thu fhèin smachd air gach neach fa leth?
     search: Lorg
     search_hint_html: Stiùirich an dòigh air an dèid do lorg. Am bu mhiann leat gun lorg daoine thu leis na phostaich thu gu poblach? Am bu mhiann leat gun lorg daoine taobh a-muigh Mastodon a’ phròifil agad nuair a bhios iad a lorg an lìn? Thoir an aire nach urrainn dhuinn gealladh le cinnt gun dèid am fiosrachadh poblach agad a dhùnadh a-mach gu tur às gach einnsean-luirg poblach.
     title: Prìobhaideachd ’s ruigse
@@ -1587,6 +1605,9 @@ gd:
     errors:
       limit_reached: Ràinig thu crìoch nam freagairtean eadar-dhealaichte
       unrecognized_emoji: "– chan aithne dhuinn an Emoji seo"
+  redirects:
+    prompt: Ma tha earbsa agad sa cheangal seo, briog airson leantainn air adhart.
+    title: Tha thu a’ fàgail %{instance}.
   relationships:
     activity: Gnìomhachd a’ chunntais
     confirm_follow_selected_followers: A bheil thu cinnteach gu bheil thu airson an luchd-leantainn a thagh thu a leantainn?
@@ -1649,6 +1670,7 @@ gd:
       unknown_browser: Brabhsair nach aithne dhuinn
       weibo: Weibo
     current_session: An seisean làithreach
+    date: Ceann-là
     description: "%{browser} air %{platform}"
     explanation: Seo na bhrabhsairean-lìn a tha clàraichte a-staigh sa chunntas Mastodon agad aig an àm seo.
     ip: IP
@@ -1685,14 +1707,26 @@ gd:
     import: Ion-phortadh
     import_and_export: Ion-phortadh ⁊ às-phortadh
     migrate: Imrich cunntais
-    notifications: Brathan
+    notifications: Brathan puist-d
     preferences: Roghainnean
     profile: Pròifil phoblach
     relationships: Dàimhean leantainn
+    severed_relationships: Dàimhean dealaichte
     statuses_cleanup: Sguabadh às phostaichean
     strikes: Rabhaidhean na maorsainneachd
     two_factor_authentication: Dearbhadh dà-cheumnach
     webauthn_authentication: Iuchraichean tèarainteachd
+  severed_relationships:
+    download: Luchdaich a-nuas (%{count})
+    event_type:
+      account_suspension: Cunntas à rèim (%{target_name})
+      domain_block: Frithealaiche à rèim (%{target_name})
+      user_domain_block: Bhac thu %{target_name}
+    lost_followers: An luchd-leantainn a chaill thu
+    lost_follows: Daoine nach lean thu tuilleadh
+    preamble: Dh’fhaoidte gun chaill thu dàimhean leantainn nuair a bhacas tu àrainn no nuair a chuireas na maoir romhpa gun cuir iad frithealaiche cèin à rèim. Nuair a thachras sin, ’s urrainn dhut liosta de na dàimhean dealaichte a luchdadh a-nuas airson sùil a thoirt orra agus an ion-phortadh gu frithealaiche eile ’s dòcha.
+    purged: Chaidh am fiosrachadh mun fhrithealaiche seo a phurgaideachadh le rianairean an fhrithealaiche agad.
+    type: Tachartas
   statuses:
     attached:
       audio:
@@ -1742,8 +1776,6 @@ gd:
         two: "%{count} bhòt"
       vote: Bhòt
     show_more: Seall barrachd dheth
-    show_newer: Seall feadhainn as ùire
-    show_older: Seall feadhainn as sine
     show_thread: Seall an snàithlean
     title: "%{name}: “%{quote}”"
     visibilities:
@@ -1800,6 +1832,7 @@ gd:
     contrast: Mastodon (iomsgaradh àrd)
     default: Mastodon (dorcha)
     mastodon-light: Mastodon (soilleir)
+    system: Fèin-obrachail (cleachd ùrlar an t-siostaim)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1827,18 +1860,27 @@ gd:
     webauthn: Iuchraichean tèarainteachd
   user_mailer:
     appeal_approved:
-      action: Tadhail air a’ chunntas agad
-      explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha deagh chliù air a’ chunntas agad a-rithist.
+      action: Roghainnean a’ chunntais
+      explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha an cunntas agad ann an deagh-chor a-rithist.
       subject: Chaidh aontachadh ris an ath-thagradh agad o %{date}
+      subtitle: Tha an cunntas agad ann an deagh-chor a-rithist.
       title: Chaidh aontachadh ri ath-thagradh
     appeal_rejected:
       explanation: Chaidh an t-ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date} a dhiùltadh.
       subject: Chaidh an t-ath-thagradh agad o %{date} a dhiùltadh
+      subtitle: Chaidh an t-ath-thagradh agad a dhiùltadh.
       title: Chaidh ath-thagradh a dhiùltadh
     backup_ready:
-      explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad. Tha e deis ri luchdadh a-nuas a-nis!
+      explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad.
+      extra: Tha e deis ri luchdadh a-nuas a-nis!
       subject: Tha an tasg-lann agad deis ri luchdadh a-nuas
       title: Tasg-lann dhut
+    failed_2fa:
+      details: 'Seo mion-fhiosrachadh mun oidhirp air clàradh a-steach:'
+      explanation: Dh’fheuch cuideigin ri clàradh a-steach dhan chunntas agad ach thug iad seachad dàrna ceum mì-dhligheach dhan dearbhadh.
+      further_actions_html: Mur e thu fhèin a bh’ ann, mholamaid gun %{action} sa bhad on a chaidh briseadh a-steach dha ma dh’fhaoidte.
+      subject: Dh’fhàillig dàrna ceum an dearbhaidh
+      title: Dh’fhàillig dàrna ceum an dearbhaidh
     suspicious_sign_in:
       change_password: atharraich thu am facal-faire agad
       details: 'Seo mion-fhiosrachadh mun chlàradh a-steach:'
@@ -1878,13 +1920,46 @@ gd:
         silence: Cunntas cuingichte
         suspend: Cunntas à rèim
     welcome:
-      edit_profile_action: Suidhich a’ phròifil agad
-      edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas dealbh pròifil, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. ’S urrainn dhut lèirmheas a dhèanamh air daoine mus fhaod iad ’gad leantainn ma thogras tu."
+      apps_android_action: Faigh aplacaid air Google Play
+      apps_ios_action: Luchdaich a-nuas aplacaid on App Store
+      apps_step: Luchdaich a-nuas na h-aplacaidean oifigeil againn.
+      apps_title: Aplacaidean Mastodon
+      checklist_subtitle: 'Seo toiseach-tòiseachaidh dhut air an t-saoghal shòisealta ùr:'
+      checklist_title: Liosta-chromagan fàilteachaidh
+      edit_profile_action: Cuir dreach pearsanta air
+      edit_profile_step: Brosnaich an conaltradh a gheibh thu le pròifil shlàn.
+      edit_profile_title: Cuir dreach pearsanta air a’ phròifil agad
       explanation: Seo gliocas no dhà gus tòiseachadh
-      final_action: Tòisich air postadh
-      final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith ’gad leantainn, chì cuid mhath na postaichean poblach agad, can air an loidhne-ama ionadail no le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #fàilte?'
-      full_handle: D’ ainm-cleachdaiche slàn
-      full_handle_hint: Seo na bheir thu dha na caraidean agad ach an urrainn dhaibh teachdaireachd a chur thugad no ’gad leantainn o fhrithealaiche eile.
+      feature_action: Barrachd fiosrachaidh
+      feature_audience: Bheir Mastodon comas sònraichte dhut gun stiùirich thu d’ èisteachd gun eadar-mheadhanaich. Ma ruitheas tu Mastodon air a’ bhun-structar agad fhèin, ’s urrainn dhut frithealaiche Mastodon sam bith a leantainn air loidhne ’s an caochladh agus cha bhi smachd aig duine sam bith air ach agad fhèin.
+      feature_audience_title: Stèidhich d’ èisteachd le misneachd
+      feature_control: Chan eil duine sam bith nas eòlaiche air na bu mhiann leat fhaicinn air do dhachaigh na thu fhèin. Cha chaith algairim no sanasachd d’ ùine. Lean duine sam bith air frithealaiche Mastodon sam bith on aon chunntas agus faigh na postaichean aca ann an òrdugh na h-ama agus cuir dreach nas pearsanta air an oisean agad-sa dhen eadar-lìon.
+      feature_control_title: Cùm smachd air an loidhne-ama agad
+      feature_creativity: Cuiridh Mastodon taic ri postaichean le faidhlichean fuaime, videothan is dealbhan, tuairisgeulan so-ruigsinneachd, cunntasan-bheachd, rabhaidhean susbainte, avataran beòthaichte, emojis gnàthaichte, smachd air bearradh nan dealbhagan is mòran a bharrachd ach an cuir thu do bheachdan an cèill air loidhne. Ge b’ e a bheil thu a’ foillseachadh an obair-ealain, an ceòl no am pod-chraoladh agad, tha Mastodon ri làimh dhut.
+      feature_creativity_title: Cho cruthachail ’s a ghabhas
+      feature_moderation: Cuiridh Mastodon na co-dhùnaidhean ’nad làmhan fhèin. Cruthaichidh gach frithealaiche na riaghailtean aige fhèin a thèid a chur an gnìomh gu h-ionadail seach on àirde mar a thachras air meadhanan sòisealta corporra agus mar sin dheth, ’s urrainnear freagairt gu sùbailte do dh’fheumalachdan choimhearsnachdan eadar-dhealaichte. Faigh ballrachd air frithealaiche far a bheil thu ag aontachadh ris na riaghailtean ann no òstaich fear agad fhèin.
+      feature_moderation_title: Maorsainneachd mar gu chòir
+      follow_action: Lean
+      follow_step: Tha leantainn dhaoine inntinneach air cridhe Mhastodon.
+      follow_title: Cuir dreach pearsanta air do dhachaigh
+      follows_subtitle: Lean cunntasan cliùiteach
+      follows_title: Molaidhean leantainn
+      follows_view_more: Seall barrachd dhaoine ri leantainn
+      hashtags_recent_count:
+        few: "%{people} daoine san 2 latha seo chaidh"
+        one: "%{people} neach san 2 latha seo chaidh"
+        other: "%{people} daoine san 2 latha seo chaidh"
+        two: "%{people} daoine san 2 latha seo chaidh"
+      hashtags_subtitle: Rùraich na tha a’ treandadh san 2 latha seo chaidh
+      hashtags_title: Tagaichean hais a’ treandadh
+      hashtags_view_more: Seall barrachd thagaichean hais a’ treandadh
+      post_action: Sgrìobh
+      post_step: Cuir an aithne air an t-saoghal le teacsa, dealbhan, videothan no cunntasan-bheachd.
+      post_title: Cruthaich a’ chiad phost agad
+      share_action: Co-roinn
+      share_step: Leig fios dha do charaidean mar a gheibh iad grèim ort air Mastodon.
+      share_title: Co-roinn a’ phròifil Mastodon agad
+      sign_in_action: Clàraich a-steach
       subject: Fàilte gu Mastodon
       title: Fàilte air bòrd, %{name}!
   users:
@@ -1892,6 +1967,7 @@ gd:
     go_to_sso_account_settings: Tadhail air roghainnean cunntas solaraiche na dearbh-aithne agad
     invalid_otp_token: Còd dà-cheumnach mì-dhligheach
     otp_lost_help_html: Ma chaill thu an t-inntrigeadh dhan dà chuid diubh, ’s urrainn dhut fios a chur gu %{email}
+    rate_limited: Cus oidhirpean dearbhaidh, feuch ris a-rithist an ceann greis.
     seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
     signed_in_as: 'Chlàraich thu a-steach mar:'
   verification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index cff9427c66..57af7c82c0 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -5,7 +5,7 @@ gl:
     contact_missing: Non establecido
     contact_unavailable: Non dispoñíbel
     hosted_on: Mastodon aloxado en %{domain}
-    title: Acerca de
+    title: Sobre
   accounts:
     follow: Seguir
     followers:
@@ -503,7 +503,7 @@ gl:
         instance_follows_measure: as súas seguidoras aquí
         instance_languages_dimension: Top de idiomas
         instance_media_attachments_measure: anexos multimedia gardados
-        instance_reports_measure: denuncias acerca deles
+        instance_reports_measure: denuncias sobre eles
         instance_statuses_measure: publicacións gardadas
       delivery:
         all: Todo
@@ -597,6 +597,9 @@ gl:
       actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide a acción a tomar para resolver a denuncia. Isto só lle afecta ao xeito en que o <strong>teu</strong> servidor se comunica con esta conta remota e xestiona o seu contido.
       add_to_report: Engadir máis á denuncia
+      already_suspended_badges:
+        local: Xa está suspendida neste servidor
+        remote: Xa está suspendida no seu servidor
       are_you_sure: Tes certeza?
       assign_to_self: Asignarme
       assigned: Moderador asignado
@@ -612,7 +615,7 @@ gl:
       created_at: Denunciado
       delete_and_resolve: Eliminar publicacións
       forwarded: Reenviado
-      forwarded_replies_explanation: Esta denuncia procede dunha usuaria remota e acerca de contido remoto. Enviouseche unha copia porque o contido denunciado é unha resposta a unha das túas usuarias.
+      forwarded_replies_explanation: Esta denuncia procede dunha usuaria remota e sobre contido remoto. Enviouseche unha copia porque o contido denunciado é unha resposta a unha das túas usuarias.
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resolto
       mark_as_sensitive: Marcar como sensible
@@ -737,7 +740,7 @@ gl:
         manage_rules: Xestionar regras do servidor
         preamble: Proporciona información detallada acerca do xeito en que se xestiona, modera e financia o servidor.
         rules_hint: Hai un espazo dedicado para as normas que é de agardar as usuarias acaten.
-        title: Acerca de
+        title: Sobre
       appearance:
         preamble: Personalizar a interface web de Mastodon.
         title: Aparencia
@@ -748,6 +751,7 @@ gl:
         desc_html: Ten dependencia de scripts externos desde hCaptcha, que podería ser un problema de seguridade e privacidade. Ademáis, <strong>pode diminuír a accesiblidade para algunhas persoas (principalmente as discapacitadas)</strong>. Por estas razóns, considera medidas alternativas como o rexistro por convite e a aprobación manual das contas.
         title: Pedirlle ás novas usuarias resolver un CAPTCHA para confirmar a súa conta
       content_retention:
+        danger_zone: Zona perigosa
         preamble: Controla como se gardan en Mastodon os contidos creados polas usuarias.
         title: Retención do contido
       default_noindex:
@@ -767,6 +771,7 @@ gl:
         disabled: Para ninguén
         users: Para usuarias locais conectadas
       registrations:
+        moderation_recommandation: Por favor, pon interese en crear un equipo de moderación competente e reactivo antes de permitir que calquera poida crear unha conta!
         preamble: Xestiona quen pode crear unha conta no teu servidor.
         title: Rexistros
       registrations_mode:
@@ -774,6 +779,7 @@ gl:
           approved: Precisa aprobación para rexistrarse
           none: Rexistro pechado
           open: Rexistro aberto
+        warning_hint: Recomendamos utilizar "Requerir aprobación para o rexistro" a menos que confíes en que o equipo de moderación é quen de xestionar áxilmente o spam e a creación de contas maliciosas.
       security:
         authorized_fetch: Require autenticación desde os servidores federados
         authorized_fetch_hint: Ao requerir autenticación desde os servidores federados activas un reforzamento das políticas de bloqueo a nivel usuaria e nivel servidor. Este proceder ten un custo no rendemento, reducindo o alcance das túas respostas e podería introducir problemas de compatibilidade con algúns servizos federados. Ademais, non evitará que contas con tal propósito vexan as túas publicacións públicas e contas.
@@ -905,7 +911,7 @@ gl:
       statuses:
         allow: Permitir publicación
         allow_account: Permitir autora
-        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
+        description_html: Estas son publicacións que o teu servidor coñece que están sendo compartidas e favorecidas en gran número neste intre. Pode ser útil para as persoas recén chegadas e para as que retornan para que atopen persoas a quen seguir. Non se mostran publicamente a menos que aprobes a autora, e a autora permita que a súa conta sexa suxerida a outras. Tamén podes rexeitar ou aprobar publicacións individuais.
         disallow: Rexeitar publicación
         disallow_account: Rexeitar autora
         no_status_selected: Non se cambiou ningunha publicación en voga xa que non había ningunha seleccionada
@@ -966,6 +972,9 @@ gl:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Debido á falta de actividade recente de moderación, a creación de contas en %{instance} mudou ao modo de revisión manual das solicitudes, para evitar que %{instance} sexa usada como plataforma por actores maliciosos. Podes volver ao rexistro aberto en calquera momento.
+      subject: O modo de creación de contas en %{instance} mudou automáticamente a aprobación manual
     new_appeal:
       actions:
         delete_statuses: borrar as súas publicacións
@@ -1400,7 +1409,7 @@ gl:
       confirmation_html: Tes a certeza de querer retirar a subscrición a Mastodon en %{domain} para recibir %{type} no teu correo electrónico en %{email}? Poderás volver a subscribirte desde os <a href="%{settings_path}">axustes de notificacións por correo</a>.
       emails:
         notification_emails:
-          favourite: notificacións de favoritos
+          favourite: notificacións de favorecidas
           follow: notificacións de seguimentos
           follow_request: notificacións de solicitudes de seguimento
           mention: notificacións de mencións
@@ -1459,7 +1468,7 @@ gl:
       sign_up:
         subject: "%{name} rexistrouse"
     favourite:
-      body: 'A túa publicación foi marcada como favorita por %{name}:'
+      body: 'A túa publicación foi favorecida por %{name}:'
       subject: "%{name} marcou como favorita a túa publicación"
       title: Nova favorita
     follow:
@@ -1490,7 +1499,6 @@ gl:
     administration_emails: Notificacións de Admin por correo electrónico
     email_events: Eventos para os correos de notificación
     email_events_hint: 'Escolle os eventos sobre os que queres recibir notificacións:'
-    other_settings: Outros axustes das notificacións
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ gl:
     errors:
       limit_reached: Acadouse o límite das diferentes reaccións
       unrecognized_emoji: non é unha emoticona recoñecida
+  redirects:
+    prompt: Se confías nesta ligazón, preme nela para continuar.
+    title: Vas saír de %{instance}.
   relationships:
     activity: Actividade da conta
     confirm_follow_selected_followers: Tes a certeza de querer seguir as seguidoras seleccionadas?
@@ -1608,6 +1619,7 @@ gl:
       unknown_browser: Navegador descoñecido
       weibo: Weibo
     current_session: Sesión actual
+    date: Data
     description: "%{browser} en %{platform}"
     explanation: Estos son os navegadores web nos que actualmente tes sesión iniciada.
     ip: IP
@@ -1644,14 +1656,26 @@ gl:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migrar conta
-    notifications: Notificacións
+    notifications: Notificacións por correo
     preferences: Preferencias
     profile: Perfil
     relationships: Seguindo e seguidoras
+    severed_relationships: Relacións cortadas
     statuses_cleanup: Borrado automático da publicación
     strikes: Avisos da moderación
     two_factor_authentication: Validar Dobre Factor
     webauthn_authentication: Chaves de seguridade
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspensión da conta (%{target_name})
+      domain_block: Suspensión do servidor (%{target_name})
+      user_domain_block: Bloqueaches a %{target_name}
+    lost_followers: Seguidoras perdidas
+    lost_follows: Seguimentos perdidos
+    preamble: Pode acontecer que perdas seguidoras e seguimentos ao bloquear un dominio ou cando a Moderación do teu servidor decide suspender un servidor remoto. Se acontecese isto, podes descargar unha lista coas relacións cortadas para revisala e, se queres, importala noutro servidor.
+    purged: A administración do teu servidor purgou a información acerca deste servidor.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ gl:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar máis
-    show_newer: Mostrar o máis novo
-    show_older: Mostrar o máis vello
     show_thread: Amosar fío
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1709,7 +1731,7 @@ gl:
     ignore_favs: Ignorar favoritas
     ignore_reblogs: Ignorar promocións
     interaction_exceptions: Excepcións baseadas en interaccións
-    interaction_exceptions_explanation: Ten en conta de que non hai garantía de que se eliminen as túas publicacións se non superan o límite de promocións e favorecementos aínda que algunha vez o tivesen superado.
+    interaction_exceptions_explanation: Ten en conta que non hai garantía de que se eliminen as túas publicacións se baixan do límite de promocións e favorecementos se nalgún momento o superaron.
     keep_direct: Manter mensaxes directas
     keep_direct_hint: Non borrar ningunha das túas mensaxes directas
     keep_media: Manter publicacións que conteñen multimedia
@@ -1720,7 +1742,7 @@ gl:
     keep_polls_hint: Non eliminar ningunha das túas enquisas
     keep_self_bookmark: Manter as publicacións engadidas a marcadores
     keep_self_bookmark_hint: Non elimina as publicacións se as engadiches aos marcadores
-    keep_self_fav: Manter as publicacións que marcaches como favoritas
+    keep_self_fav: Manter as publicacións que favoreceches
     keep_self_fav_hint: Non elimina as túas propias publicacións se as marcaches como favoritas
     min_age:
       '1209600': 2 semanas
@@ -1732,7 +1754,7 @@ gl:
       '63113904': 2 anos
       '7889238': 3 meses
     min_age_label: Límite temporal
-    min_favs: Manter as publicacións favoritas máis de
+    min_favs: Manter as publicacións favorecidas polo menos
     min_favs_hint: Non elimina ningunha das túas publicacións que recibiron alomenos esta cantidade de favorecementos. Deixa en branco para eliminar publicacións independentemente do número de favorecementos
     min_reblogs: Manter publicacións promovidas máis de
     min_reblogs_hint: Non elimina ningunha das túas publicacións se foron promovidas máis deste número de veces. Deixa en branco para eliminar publicacións independentemente do seu número de promocións
@@ -1747,6 +1769,7 @@ gl:
     contrast: Mastodon (Alto contraste)
     default: Mastodon (Escuro)
     mastodon-light: Mastodon (Claro)
+    system: Automático (seguir ao sistema)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
@@ -1774,18 +1797,27 @@ gl:
     webauthn: Chaves de seguridade
   user_mailer:
     appeal_approved:
-      action: Vai á túa conta
+      action: Axustes da conta
       explanation: A apelación da acción contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi aprobada. A túa conta volve ao estado normal de uso.
       subject: O recurso presentado o %{date} foi aprobado
+      subtitle: A túa conta volve a estar en boa forma.
       title: Apelación aprobada
     appeal_rejected:
       explanation: A apelación contra a acción tomada contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi rexeitada.
       subject: A túa apelación do %{date} foi rexeitada
+      subtitle: A apelación foi rexeitada.
       title: Apelación rexeitada
     backup_ready:
-      explanation: Solicitaches os datos completos da túa conta de Mastodon. Xa está preparados para descargar!
+      explanation: Solicitaches unha copia completa da túa conta Mastodon.
+      extra: Está preparada para descargala!
       subject: O teu ficheiro xa está preparado para descargar
       title: Leve o ficheiro
+    failed_2fa:
+      details: 'Detalles do intento de acceso:'
+      explanation: Alguén intentou acceder á túa conta mais fíxoo cun segundo factor de autenticación non válido.
+      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente xa que a conta podería estar en risco.
+      subject: Fallo co segundo factor de autenticación
+      title: Fallou o segundo factor de autenticación
     suspicious_sign_in:
       change_password: cambia o teu contrasinal
       details: 'Estos son os detalles do acceso:'
@@ -1825,13 +1857,44 @@ gl:
         silence: Conta limitada
         suspend: Conta suspendida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Podes personalizar o teu perfil subindo unha imaxe de perfil, cambiar o nome público e moito máis. Podes elexir revisar as solicitudes de seguimento recibidas antes de permitirlles que te sigan.
+      apps_android_action: Descarga desde Google Play
+      apps_ios_action: Descarga desde App Store
+      apps_step: Descarga as apps oficiais.
+      apps_title: Apps de Mastodon
+      checklist_subtitle: 'Ímoste guiar no comezo nesta nova experiencia social:'
+      checklist_title: Lista de comprobación
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumenta as túas interaccións grazas a un perfil descriptivo.
+      edit_profile_title: Personaliza o teu perfil
       explanation: Aquí tes algunhas endereitas para ir aprendendo
-      final_action: Comeza a publicar
-      final_step: 'Publica! Incluso sen seguidoras, as túas mensaxes públicas serán vistas por outras persoas, por exemplo na cronoloxía local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.'
-      full_handle: O teu alcume completo
-      full_handle_hint: Compárteo coas túas amizades para que poidan seguirte ou enviarche mensaxes desde outros servidores.
+      feature_action: Saber máis
+      feature_audience: Mastodon dache a oportunidade de xestionar sen intermediarios as túas relacións. Incluso se usas o teu propio servidor Mastodon poderás seguir e ser seguida desde calquera outro servidor Mastodon conectado á rede e estará baixo o teu control exclusivo.
+      feature_audience_title: Crea a túa audiencia con tranquilidade
+      feature_control: Sabes mellor ca ninguén o que queres ver na cronoloxía. Non hai algoritmos nin publicidade facéndoche perder o tempo. Sigue cunha soa conta a outras persoas en servidores Mastodon diferentes ao teu, recibirás as publicacións en orde cronolóxica, e farás deste curruchiño de internet un lugar para ti.
+      feature_control_title: Tes o control da túa cronoloxía
+      feature_creativity: Mastodon ten soporte para audio, vídeo e imaxes nas publicacións, descricións para mellorar a accesibilidade, enquisas, avisos sobre o contido, avatares animados, emojis personalizados, control sobre o recorte de miniaturas, e moito máis, para axudarche a expresarte en internet. Tanto se publicas o teu arte, música ou podcast, Mastodon está aquí para ti.
+      feature_creativity_title: Creatividade incomparable
+      feature_moderation: Mastodon pon nas túas mans a toma de decisións. Cada servidor crea as súas propia regras e normas, que son de cumprimento nel e non impostas como nos medios sociais corporativos, facéndoo máis flexible e respondendo ás necesidades dos diferentes grupos de persoas. Únete a un servidor con normas que compartes, ou instala o teu propio servidor.
+      feature_moderation_title: A moderación tal como debe ser
+      follow_action: Seguir
+      follow_step: Mastodon consiste en seguir a persoas interesantes.
+      follow_title: Personaliza a túa cronoloxía
+      follows_subtitle: Sigue estas contas populares
+      follows_title: A quen seguir
+      follows_view_more: Ver máis persoas para seguir
+      hashtags_recent_count:
+        one: "%{people} persoa nos últimos 2 días"
+        other: "%{people} persoas nos últimos 2 días"
+      hashtags_subtitle: Descubre os temas en voga nos últimos 2 días
+      hashtags_title: Cancelos en voga
+      hashtags_view_more: Ver máis cancelos en voga
+      post_action: Escribir
+      post_step: Saúda a todo o mundo con texto, fotos, vídeos ou enquisas.
+      post_title: Escribe a túa primeira publicación
+      share_action: Compartir
+      share_step: Dille ás amizades como poden atoparte en Mastodon.
+      share_title: Comparte o teu perfil en Mastodon
+      sign_in_action: Acceder
       subject: Benvida a Mastodon
       title: Benvida, %{name}!
   users:
@@ -1839,6 +1902,7 @@ gl:
     go_to_sso_account_settings: Ir aos axustes da conta no teu provedor de identidade
     invalid_otp_token: O código do segundo factor non é válido
     otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtao máis tarde.
     seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
     signed_in_as: 'Rexistrada como:'
   verification:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 23a4e0c3a6..14da27ec75 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -621,6 +621,9 @@ he:
       actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
       add_to_report: הוספת פרטים לדיווח
+      already_suspended_badges:
+        local: כבר הודח בשרת זה
+        remote: כבר הודח בשרת שלו
       are_you_sure: 100% על בטוח?
       assign_to_self: הקצה אלי
       assigned: מנחה מוקצה
@@ -776,6 +779,7 @@ he:
         desc_html: אפשרות זו ניסמכת על קטעי קוד חיצוניים של hCaptcha שעלולים להיות סיכון אבטחה ופרטיות. בנוסף, <strong>זה עשוי להפוך את תהליך ההרשמה לבלתי נגיש לא.נשים, במיוחד בעלות ובעלי מוגבלויות</strong>. מסיבות אלו, כדאי לשקול חלופות כמו אשרור מנהלים ידני או הרשמה רק על בסיס הזמנה.
         title: לדרוש פתרון CAPTCHA כדי לאשרר למשתמשים את חשבונם
       content_retention:
+        danger_zone: אזור מסוכן
         preamble: שליטה על דרך אחסון תוכן המשתמשים במסטודון.
         title: תקופת השמירה של תכנים
       default_noindex:
@@ -795,6 +799,7 @@ he:
         disabled: לאף אחד
         users: למשתמשים מקומיים מחוברים
       registrations:
+        moderation_recommandation: יש לוודא שלאתר יש צוות מנחות ומנחי שיחה מספק ושירותי בטרם תבחרו לפתוח הרשמה לכולם!
         preamble: שליטה בהרשאות יצירת חשבון בשרת שלך.
         title: הרשמות
       registrations_mode:
@@ -802,6 +807,7 @@ he:
           approved: נדרש אישור הרשמה
           none: אף אחד לא יכול להרשם
           open: כל אחד יכול להרשם
+        warning_hint: אנו ממליצים להפעיל דרישה לאישור ידני של הרשמה אלא אם אתם מאמינים שצוות הנחיית השיחות שלכם יוכל להסתדר בזריזות עם מפיצי תכנים פוגעניים או פרסומיים על בסיס קבוע.
       security:
         authorized_fetch: לדרוש הזדהות מול שרתים בפדרציה
         authorized_fetch_hint: הדרישה להזדהות מול שרתים בפדרציה מאפשרת חסימה יותר יעילה ברמת המשתמש וברמת שרת. עם זאת, הדרישה באה עם מחיר של נפילת ביצועים, מקטינה את מעגל התפוצה של התשובות שלך, ועשויה ליצור אי תאימות מול שירותים אחרים בפדרציה. בנוסף, זה לא ימנע מצדדים החלטיים לקבל גישת קריאה להודעות ופרופילים ציבוריים.
@@ -1002,6 +1008,9 @@ he:
       title: התליות רשת
       webhook: התליית רשת
   admin_mailer:
+    auto_close_registrations:
+      body: עקב חוסר פעילות מנחים, הרשמות אל %{instance} עברו אוטומטית למצב אישור ידני, כדי למנוע משרת %{instance} לשמש לכר פעילות לגורמים עוינים. ניתן תמיד לחזור להרשמה פתוחה.
+      subject: הרשמות אל %{instance} הועברו אוטומטית לדרישה לאישור ידני
     new_appeal:
       actions:
         delete_statuses: כדי למחוק את הודעותיהם
@@ -1542,7 +1551,6 @@ he:
     administration_emails: התראות לדוא"ל חשבון מנהל
     email_events: ארועים להתראות דוא"ל
     email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
-    other_settings: הגדרות התראות אחרות
   number:
     human:
       decimal_units:
@@ -1598,6 +1606,9 @@ he:
     errors:
       limit_reached: גבול מספר התגובות השונות הושג
       unrecognized_emoji: הוא לא אמוג'י מוכר
+  redirects:
+    prompt: יש ללחוץ על הקישור, אם לדעתך ניתן לסמוך עליו.
+    title: יציאה מתוך %{instance}.
   relationships:
     activity: רמת פעילות
     confirm_follow_selected_followers: האם את/ה בטוח/ה שברצונך לעקוב אחרי החשבונות שסומנו?
@@ -1660,6 +1671,7 @@ he:
       unknown_browser: דפדפן לא מזוהה
       weibo: Weibo
     current_session: חיבור נוכחי
+    date: תאריך
     description: "%{browser} על %{platform}"
     explanation: אלה הם הדפדפנים המחוברים כרגע לחשבון המסטודון שלך.
     ip: IP
@@ -1696,14 +1708,26 @@ he:
     import: יבוא
     import_and_export: יבוא ויצוא
     migrate: הגירת חשבון
-    notifications: התראות
+    notifications: התראות בדואל
     preferences: העדפות
     profile: פרופיל
     relationships: נעקבים ועוקבים
+    severed_relationships: קשרים שנותקו
     statuses_cleanup: מחיקת הודעות אוטומטית
     strikes: עבירות מנהלתיות
     two_factor_authentication: אימות דו-שלבי
     webauthn_authentication: מפתחות אבטחה
+  severed_relationships:
+    download: הורדה (%{count})
+    event_type:
+      account_suspension: השעיית חשבון (%{target_name})
+      domain_block: השעיית שרת (%{target_name})
+      user_domain_block: חסמת את %{target_name}
+    lost_followers: אובדן עוקבים
+    lost_follows: אובדן נעקבים
+    preamble: הנכם עשויים לאבד עוקבים ונעקבים כשתחסמו שרת או כשמנהליכם יחליטו להשעות שרת אחר. במקרה כזה, תוכלו להוריד רשימה של קשרי המעקב שנותקו, כדי לעבור עליהם ואם תרצו לייבא אותם לשרת אחר.
+    purged: מידע על שרת מרוחק זה נמחק על ידי מנהלי השרת שלך.
+    type: אירוע
   statuses:
     attached:
       audio:
@@ -1753,8 +1777,6 @@ he:
         two: "%{count} קולות"
       vote: הצבעה
     show_more: עוד
-    show_newer: הצג חדשים יותר
-    show_older: הצג ישנים יותר
     show_thread: הצג שרשור
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1811,6 +1833,7 @@ he:
     contrast: מסטודון (ניגודיות גבוהה)
     default: מסטודון (כהה)
     mastodon-light: מסטודון (בהיר)
+    system: אוטומטי (לפי המערכת)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1838,18 +1861,27 @@ he:
     webauthn: מפתחות אבטחה
   user_mailer:
     appeal_approved:
-      action: מעבר לחשבונך
+      action: הגדרות חשבון
       explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} התקבל. חשבונך חזר להיות נקי מכל רבב.
       subject: ערעורך מתאריך %{date} התקבל
+      subtitle: חשבונך חזר למצב מאושר.
       title: הערעור התקבל
     appeal_rejected:
       explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} נדחה.
       subject: ערעורך מתאריך %{date} נדחה
+      subtitle: ערעורך נדחה.
       title: הערעור נדחה
     backup_ready:
-      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך. הוא מוכן להורדה!
+      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך.
+      extra: הגיבוי מוכן להורדה!
       subject: הארכיון שלך מוכן להורדה
       title: הוצאת ארכיון
+    failed_2fa:
+      details: 'הנה פרטי נסיון ההתחברות:'
+      explanation: פלוני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
+      further_actions_html: אם הנסיון לא היה שלך, אנו ממליצים על %{action} באופן מיידי כדי שהחשבון לא יפול קורבן.
+      subject: נכשל אימות בגורם שני
+      title: אימות בגורם שני נכשל
     suspicious_sign_in:
       change_password: שינוי הסיסמא שלך
       details: 'הנה פרטי ההתחברות:'
@@ -1889,13 +1921,46 @@ he:
         silence: חשבון מוגבל
         suspend: חשבון מושעה
     welcome:
-      edit_profile_action: הגדרת פרופיל
-      edit_profile_step: תוכל.י להתאים אישית את הפרופיל באמצעות העלאת יצגן (אוואטר), כותרת, שינוי כינוי ועוד. אם תרצה.י לסקור את עוקביך/ייך החדשים לפני שתרשה.י להם לעקוב אחריך/ייך.
+      apps_android_action: זמין ב־Google Play
+      apps_ios_action: זמין ב־App Store
+      apps_step: התקינו את היישומונים הרשמיים.
+      apps_title: יישומונים של מסטודון
+      checklist_subtitle: 'נעזור לך לצאת למסע אל האופק החברתי החדש:'
+      checklist_title: רשימת פריטים לקבלת הפנים
+      edit_profile_action: התאמה אישית
+      edit_profile_step: כדאי להשלים את הפרופיל כדי לעודד אחרים ליצירת קשר.
+      edit_profile_title: התאמה אישית של הפרופיל
       explanation: הנה כמה טיפים לעזור לך להתחיל
-      final_action: התחל/ילי לחצרץ
-      final_step: 'התחל/ילי לחצצר! אפילו ללא עוקבים ייתכן שהחצרוצים הפומביים שלך יראו ע"י אחרים, למשל בציר הזמן המקומי או בתגיות הקבצה (האשתגים). כדאי להציג את עצמך תחת התגית #introductions או #היכרות'
-      full_handle: שם המשתמש המלא שלך
-      full_handle_hint: זה מה שתאמר.י לחברייך כדי שיוכלו לשלוח לך הודעה או לעקוב אחרייך ממופע אחר.
+      feature_action: מידע נוסף
+      feature_audience: מסטודון מספקת לך אפשרות ייחודית של ניהול הקהל ללא מתווכים. מסטודון מותקן על שרת משלך יאפשר לך לעקוב ולהעקב מכל שרת מסטודון ברשת בשליטתך הבלעדית.
+      feature_audience_title: בנו את הקהל שלכםן בבטחה
+      feature_control: אתםן יודעיםות בדיוק מה תרצו לראות בפיד הבית. אין פה פרסומות ואלגוריתמים שיבזבזו את זמנכם. עקבו אחרי כל משתמשי מסטודון משלל שרתים מתוך חשבון אחד וקבלו את ההודעות שלהםן לפי סדר הפרסום, וכך תצרו לכם את פינת האינטרנט המתאימה לכן אישית.
+      feature_control_title: השארו בשליטה על ציר הזמן שלכם
+      feature_creativity: מסטודון תומך בהודעות עם שמע, חוזי ותמונות, עם תאורים למוגבלי ראייה, משאלים, אזהרות תוכן, אווטרים מונפשים, אמוג'י מותאמים אישית, שליטה בחיתוך תמונות מוקטנות ועוד, כדי שתוכלו לבטא את עצמכןם ברשת. בין אם תפרסמו אמנות, מוזיקה או פודקסטים אישיים, מסטודון פה בשבילכם.
+      feature_creativity_title: יצירתיות ללא פשרות
+      feature_moderation: מסטודון מחזיר לידיכן את ההחלטות. כל שרת יוצר לעצמו את חוקיו, שנאכפים מקומית ולא "מלמעלה" כמו באתרים מסחריים, מה שהופך אותו לגמיש ביותר בשירות הרצונות והצרכים של קבוצות שונות. הצטרפו לשרת שאתםן מסכימותים עם חוקיו, או הקימו משלכןם.
+      feature_moderation_title: ניהול דיונים כמו שצריך
+      follow_action: לעקוב
+      follow_step: עקיבה אחרי אנשים מעניינים זו מטרתו של מסטודון.
+      follow_title: התאימו אישית את ציר זמן הבית שלכםן
+      follows_subtitle: לעקיבה אחרי חלשבונות ידועים
+      follows_title: אחרי מי לעקוב
+      follows_view_more: ראו עוד א.נשים לעקוב אחריהן.ם
+      hashtags_recent_count:
+        many: "%{people} אנשים ביומיים האחרונים"
+        one: איש אחד ביומיים האחרונים
+        other: "%{people} אנשים ביומיים האחרונים"
+        two: שני אנשים ביומיים האחרונים
+      hashtags_subtitle: לחקור מהם הנושאים החמים ביומיים האחרונים
+      hashtags_title: תגיות חמות
+      hashtags_view_more: צפיה בעוד תגיות שכרגע חוזרות הרבה
+      post_action: חיבור הודעה
+      post_step: ברכו לשלום את העולם עם מלל, תמונות, חוזי או משאלים.
+      post_title: כתבו את הפוסט הראשון שלכםן
+      share_action: שיתוף
+      share_step: ספרו לחברים איך למצוא אתכם במסטודון.
+      share_title: שיתוף פרופיל מסטודון
+      sign_in_action: התחברות
       subject: ברוכים הבאים למסטודון
       title: ברוך/ה הבא/ה, %{name} !
   users:
@@ -1903,6 +1968,7 @@ he:
     go_to_sso_account_settings: מעבר לאפיוני החשבון שלך בשרת הזהות
     invalid_otp_token: קוד דו-שלבי שגוי
     otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
+    rate_limited: יותר מדי ניסיונות אימות, נסו שוב מאוחר יותר.
     seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
     signed_in_as: 'מחובר בתור:'
   verification:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9b505e5f92..b67de192f2 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -38,6 +38,9 @@ hi:
       upload_check_privacy_error_object_storage:
         action: अधिक जानकारी हेतु यहां क्लिक करें।
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
+  redirects:
+    prompt: अगर आपको इस लिंक पर भरोसा है तो आगे बढ़ने के लिए इसे क्लिक करें
+    title: आप इस %{instance} को छोड़ने वाले हैं
   relationships:
     follow_failure: चुने हुए अकाउंट्स में से कुछ को फ़ॉलो नहीं किया जा सकता
   sessions:
@@ -50,3 +53,9 @@ hi:
   time:
     formats:
       with_time_zone: "%b %d, %Y, %H:%M %Z"
+  user_mailer:
+    failed_2fa:
+      details: 'आपके साइन इन प्रयासों के डिटेल ये रहे:'
+      explanation: किसी ने आपके अकाउंट पर साइन इन करने का प्रयास किया लेकिन दूसरा प्रमाणीकरण विकल्प गलत दिया।
+      further_actions_html: अगर ये आप नहीं थे, तो हम अनुरोध करते हैं कि आप तुरंत %{action} लें क्योंकि ये शायद खतरे में है।
+      subject: दूसरा फैक्टर सत्यापन नाकाम रहा
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 4f6cdf480f..4ea818b301 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -211,7 +211,6 @@ hr:
     featured_tags: Istaknuti hashtagovi
     import: Uvezi
     import_and_export: Uvezi i izvezi
-    notifications: Obavijesti
     preferences: Postavke
     profile: Profil
     statuses_cleanup: Automatsko brisanje postova
@@ -251,7 +250,6 @@ hr:
         silence: Račun je ograničen
         suspend: Račun je suspendiran
     welcome:
-      edit_profile_action: Postavi profil
       subject: Dobro došli na Mastodon
   users:
     invalid_otp_token: Nevažeći dvo-faktorski kôd
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5c8d1cf9a4..c48d527caf 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -25,27 +25,27 @@ hu:
   admin:
     account_actions:
       action: Művelet végrehajtása
-      title: "%{acct} moderálása"
+      title: 'Moderálási művelet végrehajtása ezen: %{acct}'
     account_moderation_notes:
-      create: Új moderációs bejegyzés
-      created_msg: Moderációs bejegyzés létrehozva!
-      destroyed_msg: Moderációs bejegyzés törölve!
+      create: Megjegyzés hagyása
+      created_msg: A moderációs megjegyzés sikeresen létrehozva!
+      destroyed_msg: A moderációs megjegyzés sikeresen törölve!
     accounts:
-      add_email_domain_block: Email domain tiltólistára vétele
+      add_email_domain_block: E-mail-domain tiltólistára vétele
       approve: Jóváhagyás
-      approved_msg: A %{username} fiók regisztrációs kérelmét sikeresen elfogadtuk
+      approved_msg: "%{username} regisztrációja sikeresen elfogadva"
       are_you_sure: Biztos vagy benne?
       avatar: Profilkép
       by_domain: Domain
       change_email:
-        changed_msg: Az emailt sikeresen megváltoztattuk!
-        current_email: Jelenlegi e-mail
-        label: E-mail megváltoztatása
-        new_email: Új e-mail
-        submit: E-mail megváltoztatása
-        title: "%{username} felhasználó e-mail változás"
+        changed_msg: Az e-mail-cím sikeresen megváltozott!
+        current_email: Jelenlegi e-mail-cím
+        label: E-mail-cím megváltoztatása
+        new_email: Új e-mail-cím
+        submit: E-mail-cím megváltoztatása
+        title: "%{username} e-mail-címének megváltoztatása"
       change_role:
-        changed_msg: A szerepet sikeresen megváltoztattuk!
+        changed_msg: A szerep sikeresen megváltoztatva!
         label: Szerep megváltoztatása
         no_role: Nincs szerep
         title: "%{username} szerepének megváltoztatása"
@@ -57,27 +57,27 @@ hu:
       deleted: Törölve
       demote: Lefokozás
       destroyed_msg: A %{username} fiók adatai bekerültek a végleges törlése váró sorba
-      disable: Kikapcsolás
-      disable_sign_in_token_auth: Tokenes e-mail hitelesítés letiltása
+      disable: Befagyasztás
+      disable_sign_in_token_auth: Tokenes e-mail-hitelesítés letiltása
       disable_two_factor_authentication: Kétlépcsős hitelesítés kikapcsolása
-      disabled: Kikapcsolva
-      display_name: Megjelenített név
+      disabled: Befagyasztva
+      display_name: Megjelenítendő név
       domain: Domain
       edit: Szerkesztés
-      email: E-mail
+      email: E-mail-cím
       email_status: E-mail állapot
-      enable: Bekapcsolás
-      enable_sign_in_token_auth: Tokenes e-mail hitelesítés engedélyezése
+      enable: Kiolvasztás
+      enable_sign_in_token_auth: Tokenes e-mail-hitelesítés engedélyezése
       enabled: Bekapcsolva
-      enabled_msg: A %{username} fiók fagyasztását sikeresen visszavontuk
+      enabled_msg: "%{username} fiókja befagyasztása sikeresen visszavonva"
       followers: Követő
       follows: Követett
       header: Fejléc
-      inbox_url: Beérkezett üzenetek URL-je
+      inbox_url: Beérkezett üzenetek webcíme
       invite_request_text: Csatlakozás oka
       invited_by: Meghívta
-      ip: IP
-      joined: Csatlakozott
+      ip: IP-cím
+      joined: Csatlakozva
       location:
         all: Összes
         local: Helyi
@@ -139,7 +139,7 @@ hu:
         only_password: Csak jelszó
         password_and_2fa: Jelszó és kétlépcsős hitelesítés
       sensitive: Kényes
-      sensitized: kényesnek jelölve
+      sensitized: Kényesnek jelölve
       shared_inbox_url: Megosztott bejövő üzenetek URL
       show:
         created_reports: Létrehozott jelentések
@@ -257,7 +257,7 @@ hu:
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
         destroy_unavailable_domain_html: "%{name} újraindította a kézbesítést a %{target} domainbe"
         destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
-        disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős azonosítást %{target} felhasználó fiókján"
+        disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján"
         disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
         disable_sign_in_token_auth_user_html: "%{name} letiltotta a tokenes e-mail hitelesítést %{target} felhasználóra"
         disable_user_html: "%{name} letiltotta %{target} felhasználó bejelentkezését"
@@ -597,6 +597,9 @@ hu:
       actions_description_html: Döntsd el, mit csináljunk, hogy megoldjuk ezt a bejelentést. Ha valamilyen büntető intézkedést hozol a bejelentett fiók ellen, küldünk neki egy figyelmeztetést e-mail-ben, kivéve ha a <strong>Spam</strong> kategóriát választod.
       actions_description_remote_html: Döntsd el, mit tegyünk a bejelentés lezárásának érdekében. Ez csak azt befolyásolja, hogy a <strong>saját</strong> kiszolgálód hogyan kommunikál ezzel a távoli fiókkal és hogyan kezeli annak tartalmait.
       add_to_report: Továbbiak hozzáadása a bejelentéshez
+      already_suspended_badges:
+        local: Már felfüggesztették ezen a szerveren
+        remote: Már felfüggesztették a kiszolgálóján
       are_you_sure: Biztos vagy benne?
       assign_to_self: Magamhoz rendelés
       assigned: Hozzárendelt moderátor
@@ -713,7 +716,7 @@ hu:
         manage_taxonomies: Taxonómiák kezelése
         manage_taxonomies_description: Lehetővé teszi, hogy a felhasználó átnézze a felkapott tartalmakat és frissítse a hashtagek beállításait
         manage_user_access: Felhasználói hozzáférések kezelése
-        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős azonosítását, megváltoztassa az email címüket, és alaphelyzetbe állítsa a jelszavukat
+        manage_user_access_description: Lehetővé teszi, hogy a felhasználó letiltsa mások kétlépcsős hitelesítését, megváltoztassa az e-mail-címüket, és alaphelyzetbe állítsa a jelszavukat
         manage_users: Felhasználók kezelése
         manage_users_description: Lehetővé teszi, hogy a felhasználó megtekintse mások részletes adatait és moderálja őket
         manage_webhooks: Webhookok kezelése
@@ -748,6 +751,7 @@ hu:
         desc_html: Ez hCaptcha-ból származó külső scripteket használ, mely biztonsági vagy adatvédelmi résnek bizonyulhat. Ezen kívül ez <strong>a regisztrációs folyamatot jelentősen megnehezítheti bizonyos (kifejezetten különleges szükségletű) emberek számára</strong>. Emiatt fontold meg más módszerek, mint pl. jóváhagyás-alapú vagy meghívásalapú regisztráció használatát.
         title: Az új felhasználóknak egy CAPTCHA-t kell megoldaniuk, hogy megerősítsék a fiókjuk regisztrációját
       content_retention:
+        danger_zone: Veszélyzóna
         preamble: A felhasználók által előállított tartalom Mastodonon való tárolásának szabályozása.
         title: Tartalom megtartása
       default_noindex:
@@ -767,6 +771,7 @@ hu:
         disabled: Senkinek
         users: Bejelentkezett helyi felhasználóknak
       registrations:
+        moderation_recommandation: Győződj meg arról, hogy megfelelő és gyors reagálású moderátor csapatod van, mielőtt mindenki számára megnyitod a regisztrációt!
         preamble: Szabályozd, hogy ki hozhat létre fiókot a kiszolgálón.
         title: Regisztrációk
       registrations_mode:
@@ -774,9 +779,10 @@ hu:
           approved: A regisztráció engedélyhez kötött
           none: Senki sem regisztrálhat
           open: Bárki regisztrálhat
+        warning_hint: Javasoljuk a "Jóváhagyás szükséges a regisztrációhoz” lehetőség használatát, hacsak nem vagy biztos abban, hogy a moderátor csapatod időben tudja kezelni a szemetet és a rosszindulatú regisztrációkat.
       security:
         authorized_fetch: Hitelesítés szükséges a föderációs kiszolgálóktól
-        authorized_fetch_hint: A föderációs szerverek hitelesítésének szükségessége lehetővé teszi mind a felhasználói mind a szerver szintű blokkok szigorúbb végrehajtását. Ez azonban a teljesítménybüntetés árán jár, csökkenti a válaszok elérhetőségét és kompatibilitási problémákat vethet fel egyes föderációs szolgáltatásokkal. Emellett ez nem akadályozza meg a dedikált szereplőket abban, hogy nyilvános bejegyzéseiket és fiókjaikat letöltsék.
+        authorized_fetch_hint: A hitelesítés megkövetelése föderált kiszolgálók felé lehetővé teszi a felhasználó- és kiszolgáló szintű letiltások szigorúbb kikényszerítését. Azonban ennek az ára teljesítménycsökkenés, a válaszaid elérésének csökkenése, és vezethet kombatibilitási problémákhoz is bizonyos föderációs szolgáltatásokkal. Ráadásul ez nem akadályozza meg, hogy eltökélt aktorok letöltsék a nyilvános bejegyzéseidet és fiókjaidat.
         authorized_fetch_overridden_hint: Jelenleg nem lehet ezt a beállítást megváltoztatni, mert azt egy környezeti változó felülbírálja.
         federation_authentication: Föderációs hitelesítés kikényszerítése
       title: Kiszolgáló-beállítások
@@ -966,6 +972,9 @@ hu:
       title: Webhookok
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A közelmúlt moderátori tevékenységének hiánya miatt a %{instance} regisztrációja automatikusan kézi ellenőrzést igénylőre váltott azért, hogy megakadályozzuk, hogy a %{instance} potenciálisan rossz szándékú szereplők számára szolgálhasson platformként. A nyílt regisztrációt bármikor visszakapcsolhatod.
+      subject: "%{instance} regisztrációja automatikusan átállt jóváhagyást igénylőre"
     new_appeal:
       actions:
         delete_statuses: bejegyzések törléséről
@@ -1049,7 +1058,7 @@ hu:
       redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
       registration_complete: A regisztrációd %{domain} domainen befejeződött!
       welcome_title: Üdvözlet, %{name}!
-      wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
+      wrong_email_hint: Ha az e-mail-cím nem helyes, a fiókbeállításokban megváltoztathatod.
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
@@ -1066,7 +1075,7 @@ hu:
     login: Bejelentkezés
     logout: Kijelentkezés
     migrate_account: Felhasználói fiók költöztetése
-    migrate_account_html: Ha szeretnéd átirányítani ezt a fiókodat egy másikra, a beállításokat <a href="%{path}">itt találod meg</a>.
+    migrate_account_html: Ha át szeretnéd irányítani ezt a fiókodat egy másikra, akkor <a href="%{path}">itt állíthatod be</a>.
     or_log_in_with: Vagy jelentkezz be ezzel
     privacy_policy_agreement_html: Elolvastam és egyetértek az <a href="%{privacy_policy_path}" target="_blank">adatvédemi nyilatkozattal</a>
     progress:
@@ -1125,7 +1134,7 @@ hu:
       invalid_signature: érvénytelen Ed25519 aláírás
   date:
     formats:
-      default: "%Y.%b.%d."
+      default: "%Y. %b %d."
       with_month_name: "%Y. %B %d"
   datetime:
     distance_in_words:
@@ -1215,17 +1224,17 @@ hu:
   exports:
     archive_takeout:
       date: Dátum
-      download: Archív letöltése
-      hint_html: Itt kérhető egy archív az összes <strong>feltöltött bejegyzésedről és médiádról</strong>. Az exportált adatok ActivityPub formátumban lesznek, melyet bármilyen szabványos program tud olvasni. 7 naponként kérhetsz ilyen archívot.
-      in_progress: Archív összeállítása...
-      request: Archív kérése
+      download: Archívum letöltése
+      hint_html: Itt kérhetsz egy archívumot az összes <strong>bejegyzésedről és médiáfájlodról</strong>. Az exportált adatok ActivityPub formátumban lesznek, mely bármilyen szabványos programmal olvasható. 7 naponta kérhetsz ilyen archívumot.
+      in_progress: Archívum összeállítása…
+      request: Archívum kérése
       size: Méret
-    blocks: Tiltólistádon
-    bookmarks: Könyvjelzők
+    blocks: Tiltás
+    bookmarks: Könyvjelző
     csv: CSV
-    domain_blocks: Tiltott domainjeid
-    lists: Listáid
-    mutes: Némításaid
+    domain_blocks: Tiltott domain
+    lists: Lista
+    mutes: Némítás
     storage: Médiatároló
   featured_tags:
     add_new: Új hozzáadása
@@ -1405,7 +1414,7 @@ hu:
           follow_request: követési kérelemről email értesítő
           mention: megemlítésről email értesítő
           reblog: megtolásról email értesítő
-      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">email értesítések beállításainál</a>.
+      resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítések beállításainál</a>.
       success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.'
       title: Leiratkozás
   media_attachments:
@@ -1447,9 +1456,9 @@ hu:
   moderation:
     title: Moderáció
   move_handler:
-    carry_blocks_over_text: Ez a fiók elköltözött innen %{acct}, melyet letiltottatok.
-    carry_mutes_over_text: Ez a fiók elköltözött innen %{acct}, melyet lenémítottatok.
-    copy_account_note_text: 'Ez a fiók elköltözött innen %{acct}, itt vannak a bejegyzéseitek róla:'
+    carry_blocks_over_text: 'Ez a felhasználó elköltözött innen: %{acct}, korábban letiltottad.'
+    carry_mutes_over_text: 'Ez a felhasználó elköltözött innen: %{acct}, korábban lenémítottad.'
+    copy_account_note_text: 'Ez a fiók elköltözött innen: %{acct}, itt vannak a bejegyzéseid róla:'
   navigation:
     toggle_menu: Menü be/ki
   notification_mailer:
@@ -1488,9 +1497,8 @@ hu:
       subject: "%{name} szerkesztett egy bejegyzést"
   notifications:
     administration_emails: Adminisztrátori e-mail-értesítések
-    email_events: Események email értesítésekhez
+    email_events: Az e-mail-értesítések eseményei
     email_events_hint: 'Válaszd ki azokat az eseményeket, melyekről értesítést szeretnél:'
-    other_settings: Értesítések egyéb beállításai
   number:
     human:
       decimal_units:
@@ -1503,7 +1511,7 @@ hu:
           trillion: T
   otp_authentication:
     code_hint: Jóváhagyáshoz írd be a hitelesítő alkalmazás által generált kódot
-    description_html: Ha engedélyezed a <strong>kétlépcsős azonosítást</strong>, a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódot generál számodra.
+    description_html: Ha engedélyezed a <strong>kétlépcsős hitelesítést</strong>, akkor a bejelentkezéshez szükséged lesz a telefonodra és egy alkalmazásra, amely hozzáférési kódokat állít elő a belépéshez.
     enable: Engedélyezés
     instructions_html: "<strong>Olvasd be ezt a QR-kódot a telefonodon futó Google Authenticator vagy egyéb TOTP alkalmazással</strong>. A jövőben ez az alkalmazás fog számodra hozzáférési kódot generálni a belépéshez."
     manual_instructions: 'Ha nem sikerült a QR-kód beolvasása, itt a szöveges kulcs, amelyet manuálisan kell begépelned:'
@@ -1546,6 +1554,9 @@ hu:
     errors:
       limit_reached: A különböző reakciók száma elérte a határértéket
       unrecognized_emoji: nem ismert emodzsi
+  redirects:
+    prompt: Ha megbízol ebben a hivatkozásban, kattints rá a folytatáshoz.
+    title: Elhagyod a(z) %{instance} kiszolgálót.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
@@ -1608,6 +1619,7 @@ hu:
       unknown_browser: Ismeretlen böngésző
       weibo: Weibo
     current_session: Jelenlegi munkamenet
+    date: Dátum
     description: "%{browser} az alábbi platformon: %{platform}"
     explanation: Jelenleg az alábbi böngészőkkel vagy bejelentkezve a fiókodba.
     ip: IP
@@ -1628,10 +1640,10 @@ hu:
     revoke: Visszavonás
     revoke_success: Munkamenet sikeresen visszavonva
     title: Munkamenetek
-    view_authentication_history: Fiókod hitelesítési történetének megtekintése
+    view_authentication_history: Fiók hitelesítési előzményeinek megtekintése
   settings:
     account: Fiók
-    account_settings: Fiók beállítások
+    account_settings: Fiókbeállítások
     aliases: Fiók aliasok
     appearance: Megjelenés
     authorized_apps: Jóváhagyott alkalmazások
@@ -1644,14 +1656,26 @@ hu:
     import: Importálás
     import_and_export: Import és export
     migrate: Fiók átirányítása
-    notifications: Értesítések
+    notifications: E-mail-értesítések
     preferences: Beállítások
     profile: Profil
     relationships: Követések és követők
+    severed_relationships: Megszakított kapcsolatok
     statuses_cleanup: Bejegyzések automatikus törlése
     strikes: Moderációs felrótt vétségek
     two_factor_authentication: Kétlépcsős hitelesítés
     webauthn_authentication: Biztonsági kulcsok
+  severed_relationships:
+    download: Letöltés (%{count})
+    event_type:
+      account_suspension: Fiók felfüggesztése (%{target_name})
+      domain_block: Kiszolgáló felfüggesztése (%{target_name})
+      user_domain_block: 'Blokkoltad ezt: %{target_name}'
+    lost_followers: Elvesztett követők
+    lost_follows: Elvesztett követések
+    preamble: Ha blokkolsz egy domaint, vagy ha a moderátorok úgy döntenek, hogy blokkolnak egy távoli kiszolgálót, akkor követőket és követéseket veszíthetsz. Amikor ez megtörténik, akkor letöltheted a megszakadt kapcsolatokat, hogy átvizsgáld őket, és esetleg egy másik kiszolgálón importáld őket.
+    purged: A kiszolgáló információit a kiszolgálód rendszergazdái véglegesen eltávolították.
+    type: Esemény
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ hu:
         other: "%{count} szavazat"
       vote: Szavazás
     show_more: Több megjelenítése
-    show_newer: Újabbak mutatása
-    show_older: Régebbiek mutatása
     show_thread: Szál mutatása
     title: "%{name}: „%{quote}”"
     visibilities:
@@ -1719,7 +1741,7 @@ hu:
     keep_polls: Szavazások megtartása
     keep_polls_hint: Egyetlen szavazásodat sem törli
     keep_self_bookmark: Általad könyvjelzőzött bejegyzések megtartása
-    keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzővel láttál el
+    keep_self_bookmark_hint: Egyetlen olyan bejegyzésedet sem törli, melyet könyvjelzőztél
     keep_self_fav: Kedvenc bejegyzések megtartása
     keep_self_fav_hint: Nem törli azon bejegyzéseidet, melyeket kedvencnek jelöltél
     min_age:
@@ -1747,6 +1769,7 @@ hu:
     contrast: Mastodon (nagy kontrasztú)
     default: Mastodon (sötét)
     mastodon-light: Mastodon (világos)
+    system: Automatikus (rendszertéma használata)
   time:
     formats:
       default: "%Y. %b %d., %H:%M"
@@ -1760,10 +1783,10 @@ hu:
   two_factor_authentication:
     add: Hozzáadás
     disable: Kikapcsolás
-    disabled_success: A kétlépcsős azonosítást sikeresen letiltottuk
+    disabled_success: A kétlépcsős hitelesítés sikeresen letiltva
     edit: Szerkesztés
-    enabled: Kétlépcsős azonosítás engedélyezve
-    enabled_success: A kétlépcsős azonosítást sikeresen engedélyezted
+    enabled: Kétlépcsős hitelesítés engedélyezve
+    enabled_success: A kétlépcsős hitelesítés sikeresen engedélyezve
     generate_recovery_codes: Visszaállítási kódok generálása
     lost_recovery_codes: A visszaállítási kódok segítségével tudsz belépni, ha elveszítenéd a telefonod. Ha a visszaállítási kódjaidat hagytad el, itt generálhatsz újakat. A régi kódokat ebben az esetben érvénytelenítjük.
     methods: Kétlépcsős eljárások
@@ -1774,18 +1797,27 @@ hu:
     webauthn: Biztonsági kulcsok
   user_mailer:
     appeal_approved:
-      action: Ugrás a fiókodhoz
+      action: Fiók Beállításai
       explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
       subject: A %{date}-i fellebbezésedet jóváhagyták
+      subtitle: A fiókod ismét használható állapotban van.
       title: Fellebbezés jóváhagyva
     appeal_rejected:
       explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i vétségével kapcsolatos, elutasításra került.
       subject: A %{date}-i fellebbezésedet visszautasították
+      subtitle: A fellebbezésedet visszautasították.
       title: Fellebbezés visszautasítva
     backup_ready:
-      explanation: A Mastodon-fiókod teljes mentését kérted. A mentés elkészült, és letölthető.
+      explanation: A Mastodon fiókod teljes biztonsági mentését kérted.
+      extra: Már letöltésre kész!
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
+    failed_2fa:
+      details: 'Itt vannak a bejelentkezési kísérlet részletei:'
+      explanation: Valaki megpróbált bejelentkezni a fiókodba, de a második hitelesítési lépése érvénytelen volt.
+      further_actions_html: Ha ez nem te voltál, azt javasoljuk, hogy azonnal %{action}, mivel lehetséges, hogy az rossz kezekbe került.
+      subject: Második körös hitelesítés sikertelen
+      title: Sikertelen a második körös hitelesítés
     suspicious_sign_in:
       change_password: módosítsd a jelszavad
       details: 'Itt vannak a bejelentkezés részletei:'
@@ -1825,13 +1857,44 @@ hu:
         silence: Lekorlátozott fiók
         suspend: Felfüggesztett fiók
     welcome:
-      edit_profile_action: Készítsd el profilod
-      edit_profile_step: Testreszabhatod a profilod egy profilkép feltöltésével, a megjelenített neved megváltoztatásával és így tovább. Bekapcsolhatod az új követőid jóváhagyását, mielőtt követhetnek.
+      apps_android_action: Beszerzés a Google Play-en
+      apps_ios_action: Letöltés az App Store-ból
+      apps_step: Hivatalos alkalmazásaink letöltése.
+      apps_title: Mastodon alkalmazások
+      checklist_subtitle: 'Indulás a közösségi érintkezés új élvonalába:'
+      checklist_title: Üdvözlő ellenőrzőlista
+      edit_profile_action: Személyre szabás
+      edit_profile_step: Növeld az interakciószámot egy átfogó profillal.
+      edit_profile_title: Profil testreszabása
       explanation: Néhány tipp a kezdeti lépésekhez
-      final_action: Kezdj bejegyzéseket írni
-      final_step: 'Kezdj tülkölni! A nyilvános bejegyzéseid még követők híján is megjelennek másoknak, például a helyi idővonalon vagy a hashtageknél. Kezdd azzal, hogy bemutatkozol a #bemutatkozas vagy az #introductions hashtag használatával.'
-      full_handle: Teljes felhasználóneved
-      full_handle_hint: Ez az, amit megadhatsz másoknak, hogy üzenhessenek neked vagy követhessenek téged más szerverekről.
+      feature_action: További információk
+      feature_audience: A Mastodon egyedülálló lehetőséget biztosít arra, hogy közvetítők nélkül kezeld a közönségedet. A saját infrastruktúrádra telepített Mastodon lehetővé teszi, hogy kövess másokat, és ők is tudjanak követni bármely más online Mastodon-kiszolgálóról, és ez ne legyen saját magadon kívül senki más irányítása alatt.
+      feature_audience_title: Építsd magabiztosan a közönségedet
+      feature_control: Te tudod legjobban, hogy mit szeretnél látni a kezdőlapodon. Nincsenek algoritmusok vagy reklámok, melyek pazarolnák az idődet. Kövess bárkit, bármelyik Mastodon-kiszolgálón, egyetlen fiókkal, és fogadd a bejegyzéseiket időrendi sorrendben, így a saját ízlésednek tetszővé teheted az internet egy kis szegletét.
+      feature_control_title: Vedd kézbe az idővonalad feletti irányítást
+      feature_creativity: A Mastodon támogatja a hangot, a videót és a képeket tartalmazó bejegyzéseket, az akadálymentesítési leírásokat, a szavazásokat, a tartalmi figyelmeztetéseket, az animált profilképeket, az egyéni emodzsikat, a bélyegképek körbevágását és még több mindent, hogy segítsen az online önkifejezésben. Tegyél közzé műalkotásokat, zenét vagy podcastet, a Mastodonra számíthatsz.
+      feature_creativity_title: Páratlan kreativitás
+      feature_moderation: A Mastodon visszaadja a döntést a te kezedbe. Minden kiszolgáló saját szabályokkal rendelkezik, melyeket helyben tartatnak be, és nem központilag, mint a céges közösségi médiánál, így a lehető legrugalmasabban lehet válaszolni emberek különböző csoportjainak igényeire. Csatlakozz egy kiszolgálóhoz, melynek egyetértesz a szabályaival, vagy készíts egy sajátot.
+      feature_moderation_title: Moderálás, ahogy annak lennie kell
+      follow_action: Követés
+      follow_step: A Mastodon az érdekes emberek követéséről szól.
+      follow_title: Saját hírfolyam testreszabása
+      follows_subtitle: Jól ismert fiókok követése
+      follows_title: Kit érdemes követni
+      follows_view_more: További követendő személyek megtekintése
+      hashtags_recent_count:
+        one: "%{people} személy az elmúlt 2 napban"
+        other: "%{people} személy az elmúlt 2 napban"
+      hashtags_subtitle: Fedezd fel, mi felkapott az elmúlt 2 napban
+      hashtags_title: Felkapott hashtagek
+      hashtags_view_more: További felkapott hashtagek megtekintése
+      post_action: Bejegyzés írása
+      post_step: Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal.
+      post_title: Az első bejegyzés létrehozása
+      share_action: Megosztás
+      share_step: Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon.
+      share_title: Oszd meg a Mastodon profilodat
+      sign_in_action: Bejelentkezés
       subject: Üdvözöl a Mastodon
       title: Üdv a fedélzeten, %{name}!
   users:
@@ -1839,6 +1902,7 @@ hu:
     go_to_sso_account_settings: Ugrás az azonosítási szolgáltatód fiókbeállításaihoz
     invalid_otp_token: Érvénytelen ellenőrző kód
     otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
+    rate_limited: Túl sok hiteleítési kísérlet történt. Próbáld újra később.
     seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
     signed_in_as: Bejelentkezve mint
   verification:
@@ -1863,5 +1927,5 @@ hu:
     nickname_hint: Írd be az új biztonsági kulcsod becenevét
     not_enabled: Még nem engedélyezted a WebAuthn-t
     not_supported: Ez a böngésző nem támogatja a biztonsági kulcsokat
-    otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős azonosítást.
+    otp_required: A biztonsági kulcsok használatához először engedélyezd a kétlépcsős hitelesítést.
     registered_on: 'Regisztráció ekkor: %{date}'
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index f3a6392ff0..5042e3f7f0 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -672,7 +672,6 @@ hy:
       subject: "%{name}-ը փոխել է գրառումը"
   notifications:
     email_events_hint: Ընտրիր իրադարձութիւնները, որոնց վերաբերեալ ցանկանում ես ստանալ ծանուցումներ․
-    other_settings: Ծանուցումների այլ կարգաւորումներ
   number:
     human:
       decimal_units:
@@ -779,7 +778,6 @@ hy:
     import: Ներմուծել
     import_and_export: Ներմուծել և արտահանել
     migrate: Հաշուի տեղափոխում
-    notifications: Ծանուցումներ
     preferences: Կարգավորումներ
     profile: Հաշիւ
     relationships: Հետեւումներ և հետեւորդներ
@@ -809,8 +807,6 @@ hy:
         other: "%{count} ձայներ"
       vote: Քուէարկել
     show_more: Աւելին
-    show_newer: Ցուցադրել նորերը
-    show_older: Ցուցադրել հները
     show_thread: Բացել շղթան
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -874,8 +870,6 @@ hy:
         silence: Հաշիւը սահմանափակուած է
         suspend: Հաշիւը արգելափակուած է
     welcome:
-      edit_profile_action: Կարգաւորել հաշիւը
-      final_action: Սկսել գրել
       subject: Բարի գալուստ Մաստոդոն
       title: Բարի գալուստ նաւամատոյց, %{name}
   users:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c4f236881d..68676a09f7 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,103 +1,1562 @@
 ---
 ia:
   about:
+    about_mastodon_html: 'Le rete social del futuro: nulle publicitate, nulle surveliantia corporative, conception ethic, e decentralisation! Mantene le controlo de tu datos con Mastodon!'
     contact_missing: Non definite
+    contact_unavailable: N/D
+    hosted_on: Mastodon albergate sur %{domain}
+    title: A proposito
+  accounts:
+    follow: Sequer
+    followers:
+      one: Sequitor
+      other: Sequitores
+    following: Sequente
+    instance_actor_flash: Iste conto es un agente virtual usate pro representar le servitor mesme e non alcun usator individual. Illo es usate pro le federation e non debe esser suspendite.
+    last_active: ultime activitate
+    link_verified_on: Le proprietate de iste ligamine ha essite verificate le %{date}
+    nothing_here: Il ha nihil ci!
+    pin_errors:
+      following: Tu debe primo sequer le persona que tu vole indorsar
+    posts:
+      one: Message
+      other: Messages
+    posts_tab_heading: Messages
   admin:
+    account_actions:
+      action: Exequer action
+      title: Exequer action de moderation sur %{acct}
+    account_moderation_notes:
+      create: Lassar un nota
+      created_msg: Nota de moderation create con successo!
+      destroyed_msg: Nota de moderation destruite con successo!
     accounts:
+      add_email_domain_block: Blocar dominio de e-mail
+      approve: Approbar
+      approved_msg: Demanda de inscription de %{username} approbate con successo
       are_you_sure: Es tu secur?
+      avatar: Avatar
       by_domain: Dominio
+      change_email:
+        changed_msg: Email cambiate con successo!
+        current_email: E-mail actual
+        label: Cambiar e-mail
+        new_email: Nove e-mail
+        submit: Cambiar e-mail
+        title: Cambiar e-mail pro %{username}
+      change_role:
+        changed_msg: Rolo cambiate con successo!
+        label: Cambiar rolo
+        no_role: Necun rolo
+        title: Cambiar rolo pro %{username}
+      confirm: Confirmar
+      confirmed: Confirmate
+      confirming: In confirmation
       custom: Personalisate
       delete: Deler datos
       deleted: Delite
+      demote: Degradar
+      destroyed_msg: Le datos de %{username} ora es in cauda pro su imminente deletion
+      disable: Gelar
+      disable_sign_in_token_auth: Disactivar le authentication per token in e-mail
       disable_two_factor_authentication: Disactivar 2FA
+      disabled: Gelate
       display_name: Nomine visibile
       domain: Dominio
+      edit: Modificar
+      email: E-mail
+      email_status: Stato de e-mail
+      enable: Disgelar
+      enable_sign_in_token_auth: Activar le authentication per token in e-mail
       enabled: Activate
+      enabled_msg: Conto de %{username} disgelate con successo
+      followers: Sequitores
+      follows: Sequites
+      header: Capite
+      inbox_url: URL de cassa de entrata
+      invite_request_text: Motivos pro le inscription
+      invited_by: Invitate per
+      ip: IP
+      joined: Inscription
       location:
         all: Toto
+        local: Local
+        remote: Remote
         title: Location
+      login_status: Stato de session
+      media_attachments: Annexos multimedial
+      memorialize: Render commemorative
+      memorialized: Conto commemorative
+      memorialized_msg: "%{username} ha essite convertite in un conto commemorative"
       moderation:
+        active: Active
+        all: Toto
         disabled: Disactivate
+        pending: In tractamento
+        silenced: Limitate
+        suspended: Suspendite
+        title: Moderation
+      moderation_notes: Notas de moderation
       most_recent_activity: Activitate plus recente
       most_recent_ip: IP plus recente
+      no_account_selected: Necun conto ha essite cambiate perque necun ha essite seligite
+      no_limits_imposed: Necun limite imponite
+      no_role_assigned: Necun rolo assignate
+      not_subscribed: Non subscribite
+      pending: Attende revision
+      perform_full_suspension: Suspender
+      previous_strikes: Previe admonitiones
+      previous_strikes_description_html:
+        one: Iste conto ha <strong>un</strong> admonition.
+        other: Iste conto ha <strong>%{count}</strong> admonitiones.
+      promote: Promover
+      protocol: Protocollo
       public: Public
+      push_subscription_expires: Subscription PuSH expira le
+      redownload: Actualisar profilo
+      redownloaded_msg: Le profilo de %{username} ha essite actualisate desde le origine
+      reject: Rejectar
+      rejected_msg: Le demanda de inscription de %{username} ha essite rejectate
+      remote_suspension_irreversible: Le datos de iste conto ha essite irreversibilemente delite.
+      remote_suspension_reversible_hint_html: Le conto ha essite suspendite sur su servitor, e le datos essera removite completemente le %{date}. Usque alora, le servitor remote pote restaurar iste conto sin effectos negative. Si tu vole remover immediatemente tote le datos del conto, tu pote facer lo hic infra.
+      remove_avatar: Remover avatar
+      remove_header: Remover capite
+      removed_avatar_msg: Le imagine de avatar de %{username} ha essite removite
+      removed_header_msg: Le imagine de capite de %{username} ha essite removite
+      resend_confirmation:
+        already_confirmed: Iste usator jam es confirmate
+        send: Reinviar ligamine de confirmation
+        success: Ligamine de confirmation inviate con successo!
       reset: Reinitialisar
       reset_password: Reinitialisar contrasigno
+      resubscribe: Resubscriber
+      role: Rolo
       search: Cercar
+      search_same_email_domain: Altere usatores con le mesme dominio de e-mail
+      search_same_ip: Altere usatores con le mesme IP
       security: Securitate
       security_measures:
         only_password: Solmente contrasigno
         password_and_2fa: Contrasigno e 2FA
+      sensitive: Fortiar sensibile
+      sensitized: Marcate como sensibile
+      shared_inbox_url: URL del cassa de entrata condividite
+      show:
+        created_reports: Reportos facite
+        targeted_reports: Signalate per alteres
+      silence: Limitar
+      silenced: Limitate
       statuses: Messages
+      strikes: Previe admonitiones
+      subscribe: Subscriber
+      suspend: Suspender
+      suspended: Suspendite
+      suspension_irreversible: Le datos de iste conto ha essite irreversibilemente delite. Tu pote disfacer le suspension de iste conto pro render lo usabile, ma isto non recuperara alcun datos precedente.
+      suspension_reversible_hint_html: Le conto ha essite suspendite, e le datos essera removite completemente le %{date}. Usque alora, le conto pote esser restaurate sin effectos negative. Si tu vole remover immediatemente tote le datos del conto, tu pote facer lo hic infra.
       title: Contos
+      unblock_email: Disblocar adresse de e-mail
+      unblocked_email_msg: Adresse de e-mail de %{username} disblocate con successo
+      unconfirmed_email: E-mail non confirmate
+      undo_sensitized: Non plus fortiar sensibile
+      undo_silenced: Disfacer le limite
+      undo_suspension: Disfacer le suspension
+      unsilenced_msg: Le limite del conto de %{username} ha essite cancellate
+      unsubscribe: Desubscriber
+      unsuspended_msg: Le suspension del conto %{username} ha essite annullate
       username: Nomine de usator
+      view_domain: Vider summario de dominio
+      warn: Advertir
+      web: Web
+      whitelisted: Permittite pro federation
     action_logs:
       action_types:
+        approve_appeal: Approbar appello
+        approve_user: Approbar usator
+        assigned_to_self_report: Assignar reporto
+        change_email_user: Cambiar e-mail pro le usator
+        change_role_user: Cambiar le rolo del usator
+        confirm_user: Confirmar le usator
+        create_account_warning: Crear un advertimento
+        create_announcement: Crear annuncio
+        create_canonical_email_block: Crear blocada de email
+        create_custom_emoji: Crear emoticone personalisate
+        create_domain_allow: Crear permisso de dominio
+        create_domain_block: Crear blocada de dominio
+        create_email_domain_block: Crear blocada de dominio email
+        create_ip_block: Crear un regula IP
+        create_unavailable_domain: Crear dominio indisponibile
+        create_user_role: Crear un rolo
+        demote_user: Degradar usator
+        destroy_announcement: Deler annuncio
+        destroy_canonical_email_block: Deler blocada de email
+        destroy_custom_emoji: Deler emoticone personalisate
+        destroy_domain_allow: Deler permisso de dominio
+        destroy_domain_block: Deler blocada de dominio
+        destroy_email_domain_block: Crear blocada de dominio email
+        destroy_instance: Purgar dominio
+        destroy_ip_block: Deler le regula IP
+        destroy_status: Deler le message
+        destroy_unavailable_domain: Deler le dominio non disponibile
+        destroy_user_role: Destruer rolo
+        disable_2fa_user: Disactivar 2FA
+        disable_custom_emoji: Disactivar emoji personalisate
+        disable_sign_in_token_auth_user: Disactivar le authentication per testimonio via email pro usator
+        disable_user: Disactivar le usator
+        enable_custom_emoji: Activar emoji personalisate
+        enable_sign_in_token_auth_user: Activar le authentication per testimonio via email pro usator
+        enable_user: Activar le usator
+        memorialize_account: Commemorar conto
+        promote_user: Promover usator
+        reject_appeal: Rejectar appello
+        reject_user: Rejectar usator
+        remove_avatar_user: Remover avatar
+        reopen_report: Reaperir reporto
+        resend_user: Reinviar message de confirmation
         reset_password_user: Reinitialisar contrasigno
+        resolve_report: Resolver reporto
+        sensitive_account: Marcar como sensibile le medios del conto
+        silence_account: Limitar conto
+        suspend_account: Suspender conto
+        unassigned_report: Disassignar reporto
+        unblock_email_account: Disblocar adresse de e-mail
+        unsensitive_account: Dismarcar como sensibile le medios del conto
+        unsilence_account: Disfacer le limite de conto
+        unsuspend_account: Annullar suspension de conto
+        update_announcement: Actualisar annuncio
+        update_custom_emoji: Actualisar emoji personalisate
+        update_domain_block: Actualisar blocada de dominio
+        update_ip_block: Actualisar le regula IP
+        update_status: Actualisar le message
+        update_user_role: Actualisar rolo
+      actions:
+        approve_appeal_html: "%{name} approbava appello del decision de moderation de %{target}"
+        approve_user_html: "%{name} approbava inscription de %{target}"
+        assigned_to_self_report_html: "%{name} assignava reporto %{target} a se mesme"
+        change_email_user_html: "%{name} cambiava le adresse de e-mail address del usator %{target}"
+        change_role_user_html: "%{name} cambiava rolo de %{target}"
+        confirm_user_html: "%{name} confirmava le adresse email del usator %{target}"
+        create_account_warning_html: "%{name} inviava un advertimento a %{target}"
+        create_announcement_html: "%{name} creava un nove annuncio %{target}"
+        create_canonical_email_block_html: "%{name} blocava email con le hash %{target}"
+        create_custom_emoji_html: "%{name} cargava nove emoticone %{target}"
+        create_domain_allow_html: "%{name} permitteva federation con dominio %{target}"
+        create_domain_block_html: "%{name} blocava dominio %{target}"
+        create_email_domain_block_html: "%{name} blocava dominio email %{target}"
+        create_ip_block_html: "%{name} creava regula pro IP %{target}"
+        create_unavailable_domain_html: "%{name} stoppava consignation a dominio %{target}"
+        create_user_role_html: "%{name} creava rolo de %{target}"
+        demote_user_html: "%{name} degradava usator %{target}"
+        destroy_announcement_html: "%{name} deleva annuncio %{target}"
+        destroy_canonical_email_block_html: "%{name} disblocava email con le hash %{target}"
+        destroy_custom_emoji_html: "%{name} deleva emoji %{target}"
+        destroy_domain_allow_html: "%{name} impediva le federation con dominio %{target}"
+        destroy_domain_block_html: "%{name} disblocava dominio %{target}"
+        destroy_email_domain_block_html: "%{name} disblocava le dominio email %{target}"
+        destroy_instance_html: "%{name} purgava le dominio %{target}"
+        destroy_ip_block_html: "%{name} deleva le regula pro IP %{target}"
+        destroy_status_html: "%{name} removeva le message de %{target}"
+        destroy_unavailable_domain_html: "%{name} resumeva le consignation al dominio %{target}"
+        destroy_user_role_html: "%{name} deleva le rolo de %{target}"
+        disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
+        disable_custom_emoji_html: "%{name} disactivava le emoticone %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disactivava authentication per testimonio via email pro %{target}"
+        disable_user_html: "%{name} disactivava le accesso pro le usator %{target}"
+        enable_custom_emoji_html: "%{name} activava le emoticone %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activava le authentication per testimonio via email pro %{target}"
+        enable_user_html: "%{name} activava le accesso pro le usator %{target}"
+        memorialize_account_html: "%{name} mutava le conto de %{target} in un pagina commemorative"
+        promote_user_html: "%{name} promoveva le usator %{target}"
+        reject_appeal_html: "%{name} refusava le appello del decision de moderation de %{target}"
+        reject_user_html: "%{name} refusava le inscription de %{target}"
+        remove_avatar_user_html: "%{name} removeva le avatar de %{target}"
+        reopen_report_html: "%{name} reaperiva le reporto %{target}"
+        resend_user_html: "%{name} reinviava le email de confirmation pro %{target}"
+        reset_password_user_html: "%{name} reinitialisava le contrasigno del usator %{target}"
+        resolve_report_html: "%{name} resolveva le reporto %{target}"
+        sensitive_account_html: "%{name} marcava como sensibile le medios de %{target}"
+        silence_account_html: "%{name} limitava le conto de %{target}"
+        suspend_account_html: "%{name} suspendeva le conto de %{target}"
+        unassigned_report_html: "%{name} de-assignava le reporto %{target}"
+        unblock_email_account_html: "%{name} disblocava le adresse email de %{target}"
+        unsensitive_account_html: "%{name} dismarcava como sensibile le medios de %{target}"
+        unsilence_account_html: "%{name} removeva le limite del conto de %{target}"
+        unsuspend_account_html: "%{name} removeva le suspension del conto de %{target}"
+        update_announcement_html: "%{name} actualisava le annuncio %{target}"
+        update_custom_emoji_html: "%{name} actualisava le emoticone %{target}"
+        update_domain_block_html: "%{name} actualisava le blocada de dominio pro %{target}"
+        update_ip_block_html: "%{name} cambiava le regula pro IP %{target}"
+        update_status_html: "%{name} actualisava le message per %{target}"
+        update_user_role_html: "%{name} cambiava le rolo de %{target}"
+      deleted_account: conto delite
+      empty: Nulle registrationes trovate.
+      filter_by_action: Filtrar per action
+      filter_by_user: Filtrar per usator
+      title: Registro de inspection
     announcements:
+      destroyed_msg: Annuncio delite con successo!
+      edit:
+        title: Modificar annuncio
+      empty: Necun annuncios trovate.
+      live: Al vivo
       new:
         create: Crear annuncio
         title: Nove annuncio
+      publish: Publicar
+      published_msg: Annuncio publicate con successo!
+      scheduled_for: Programmate pro %{time}
+      scheduled_msg: Annuncio programmate pro le publication!
       title: Annuncios
+      unpublish: Depublicar
+      unpublished_msg: Le publication del annuncio ha essite disfacite!
+      updated_msg: Annuncio actualisate con successo!
+    critical_update_pending: Actualisation critic pendente
     custom_emojis:
+      assign_category: Assignar categoria
       by_domain: Dominio
+      copied_msg: Copia local del emoji create con successo
       copy: Copiar
+      copy_failed_msg: Impossibile crear un copia local de ille emoticone
       create_new_category: Crear nove categoria
+      created_msg: Emoji create con successo!
       delete: Deler
+      destroyed_msg: Emoticone destruite con successo destroyed!
       disable: Disactivar
       disabled: Disactivate
+      disabled_msg: Emoji disactivate con successo
+      emoji: Emoticone
+      enable: Activar
+      enabled: Activate
+      enabled_msg: Emoji activate con successo
+      image_hint: PNG o GIF usque %{size}
+      list: Listar
+      listed: Listate
+      new:
+        title: Adder nove emoji personalisate
+      no_emoji_selected: Nulle emoticones ha essite cambiate perque nulle ha essite seligite
+      not_permitted: Tu non es autorisate a exequer iste action
+      overwrite: Superscriber
+      shortcode: Via breve
+      shortcode_hint: Al minus 2 characteres, solo characteres alphanumeric e lineettas basse
+      title: Emojis personalisate
+      uncategorized: Sin categoria
+      unlist: Non listar
+      unlisted: Non listate
+      update_failed_msg: Impossibile actualisar ille emoticone
+      updated_msg: Emoticone actualisate con successo!
+      upload: Incargar
     dashboard:
       active_users: usatores active
+      interactions: interactiones
+      media_storage: Immagazinage de medios
       new_users: nove usatores
+      opened_reports: reportos aperte
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> appello pendente"
+        other: "<strong>%{count}</strong> appellos pendente"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> reporto pendente"
+        other: "<strong>%{count}</strong> reportos pendente"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag pendente"
+        other: "<strong>%{count}</strong> hashtags pendente"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usator pendente"
+        other: "<strong>%{count}</strong> usatores pendente"
+      resolved_reports: reportos resolvite
+      software: Software
+      sources: Fontes de inscription
+      space: Uso de spatio
+      title: Pannello de controlo
+      top_languages: Linguas le plus active
+      top_servers: Servitores le plus active
       website: Sito web
+    disputes:
+      appeals:
+        empty: Nulle appellos trovate.
+        title: Appellos
     domain_allows:
       add_new: Permitter federation con dominio
-    domain_blocks:
-      confirm_suspension:
-        cancel: Cancellar
-      domain: Dominio
+      created_msg: Le dominio ha essite permittite con successo pro federation
+      destroyed_msg: Le dominio ha essite prohibite pro federation
       export: Exportar
       import: Importar
+      undo: Prohiber federation con dominio
+    domain_blocks:
+      add_new: Adder nove blocada de dominio
+      confirm_suspension:
+        cancel: Cancellar
+        confirm: Suspender
+        permanent_action: Disfacer le suspension non restaurara alcun datos o relation.
+        preamble_html: Tu es sur le puncto de suspender <strong>%{domain}</strong> e su subdominios.
+        remove_all_data: Isto removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio.
+        stop_communication: Tu servitor stoppara le communication con iste servitores.
+        title: Confirmar le blocada del dominio %{domain}
+        undo_relationships: Isto disfacera omne relation de sequimento inter le contos de iste servitores e illos del tue.
+      created_msg: Le blocada del dominio es ora in tractamento
+      destroyed_msg: Le blocada del dominio ha essite disfacite
+      domain: Dominio
+      edit: Modificar un blocada de dominio
+      existing_domain_block: Tu ha ja imponite limites plus stricte sur %{name}.
+      existing_domain_block_html: Tu ha ja imponite limites plus stricte sur %{name}; ora es necessari <a href="%{unblock_url}">disblocar lo</a> primo.
+      export: Exportar
+      import: Importar
+      new:
+        create: Crear blocada
+        hint: Le blocada del dominio non impedira le creation de entratas de conto in le base de datos, ma applicara retroactive- e automaticamente le methodos specific de moderation a iste contos.
+        severity:
+          desc_html: "<strong>Limitar</strong> rendera le messages del contos de iste dominio invisibile pro tote persona que non los seque. <strong>Suspender</strong> removera de tu servitor tote le contento, multimedia e datos de profilo del contos de iste dominio. Usa <strong>Necun</strong> si tu solmente vole rejectar le files multimedial."
+          noop: Nemo
+          silence: Limitar
+          suspend: Suspender
+        title: Nove blocada de dominio
+      no_domain_block_selected: Necun blocada de dominio ha essite cambiate perque necun ha essite seligite
+      not_permitted: Tu non es autorisate a exequer iste action
+      obfuscate: Offuscar le nomine de dominio
+      obfuscate_hint: Offuscar partialmente le nomine de dominio in le lista si le diffusion del lista de limitationes del dominio es activate
+      private_comment: Commento private
+      private_comment_hint: Commentar iste limitation de dominio pro uso interne per le moderatores.
+      public_comment: Commento public
+      public_comment_hint: Commentar iste limitation de dominio pro le publico general, si le diffusion del lista de limitationes del dominio es activate.
+      reject_media: Refusar files multimedial
+      reject_media_hint: Remove le files multimedial immagazinate localmente e refusa de discargar tales in futuro. Irrelevante pro le suspensiones
+      reject_reports: Refusar reportos
+      reject_reports_hint: Ignorar tote le reportos proveniente de iste dominio. Irrelevante pro le suspensiones
+      undo: Disfacer blocada de dominio
+      view: Examinar blocada de dominio
     email_domain_blocks:
       add_new: Adder nove
+      allow_registrations_with_approval: Permitter inscriptiones con approbation
+      attempts_over_week:
+        one: "%{count} tentativa de inscription in le ultime septimana"
+        other: "%{count} tentativas de inscription in le ultime septimana"
+      created_msg: Le dominio de e-mail ha essite blocate
       delete: Deler
+      dns:
+        types:
+          mx: Registro MX
+      domain: Dominio
+      new:
+        create: Adder un dominio
+        resolve: Resolver dominio
+        title: Blocar un nove dominio de e-mail
+      no_email_domain_block_selected: Necun blocadas de dominio de e-mail ha essite cambiate perque necun ha essite seligite
+      not_permitted: Non permittite
+      resolved_dns_records_hint_html: Le nomine de dominio se resolve al sequente dominios MX, le quales ha le ultime responsibilitate pro le reception de e-mail. Blocar un dominio MX blocara le inscriptiones de qualcunque adresse de e-mail que usa le mesme dominio MX, mesmo si le nomine de dominio visibile es differente. <strong>Presta attention a evitar de blocar le grande fornitores de e-mail.</strong>
+      resolved_through_html: Resolvite per %{domain}
+      title: Dominios de e-mail blocate
     export_domain_allows:
+      new:
+        title: Importar permissiones de dominio
+      no_file: Necun file seligite
+    export_domain_blocks:
+      import:
+        description_html: Tu es sur le puncto de importar un lista de blocadas de dominio. Per favor revide con grande cura iste lista, particularmente si tu non lo ha scribite tu mesme.
+        existing_relationships_warning: Relationes existente de sequimento
+        private_comment_description_html: 'Pro adjutar te a traciar de ubi proveni le blocadas importate, le blocadas importate essera create con le sequente commento private: <q>%{comment}</q>'
+        private_comment_template: Importate de %{source} le %{date}
+        title: Importar blocadas de dominio
+      invalid_domain_block: 'Un o plus blocadas de dominio ha essite saltate a causa del sequente error(es): %{error}'
+      new:
+        title: Importar blocadas de dominio
       no_file: Necun file seligite
     follow_recommendations:
+      description_html: "<strong>Le recommendationes de sequimento adjuta le nove usatores a trovar rapidemente contento interessante.</strong> Quando un usator non ha un historia sufficiente de interactiones con alteres pro formar recommendationes personalisate de sequimento, iste contos es recommendate. Illos se recalcula cata die a partir de un mixtura de contos con le plus grande numero de ingagiamentos recente e le numero de sequitores local le plus alte pro un lingua date."
       language: Per lingua
       status: Stato
+      suppress: Supprimer recommendation de sequimento
+      suppressed: Supprimite
+      title: Sequer le recommendationes
+      unsuppress: Restaurar recommendation de sequimento
     instances:
+      availability:
+        description_html:
+          one: Si le livration al dominio falle <strong>%{count} die</strong> sin succeder, necun tentativa ulterior de livration essera facite, excepte si es recipite un livration <em>ab</em> le dominio.
+          other: Si le livration al dominio falle durante <strong>%{count} dies differente</strong> sin succeder, necun tentativa ulterior de livration essera facite, excepte si es recipite un livration <em>ab</em> le dominio.
+        failure_threshold_reached: Limine de fallimentos attingite le %{date}.
+        failures_recorded:
+          one: Tentativa fallite durante %{count} die.
+          other: Tentativa fallite durante %{count} dies differente.
+        no_failures_recorded: Necun fallimento cognoscite.
+        title: Disponibilitate
+        warning: Le ultime tentativa de connexion a iste servitor non ha succedite
+      back_to_all: Toto
+      back_to_limited: Limitate
+      back_to_warning: Advertimento
+      by_domain: Dominio
+      confirm_purge: Es tu secur que tu vole deler permanentemente le datos de iste dominio?
+      content_policies:
+        comment: Nota interne
+        description_html: Tu pote definir politicas de contento que se applicara a tote le contos de iste dominio e a qualcunque de su subdominios.
+        limited_federation_mode_description_html: Tu pote decider si permitter le federation con iste dominio.
+        policies:
+          reject_media: Rejectar multimedia
+          reject_reports: Rejectar reportos
+          silence: Limitar
+          suspend: Suspender
+        policy: Politica
+        reason: Ration public
+        title: Politicas de contento
       dashboard:
+        instance_accounts_dimension: Contos le plus sequite
+        instance_accounts_measure: contos immagazinate
+        instance_followers_measure: nostre sequitores illac
+        instance_follows_measure: lor sequitores hic
         instance_languages_dimension: Linguas principal
+        instance_media_attachments_measure: annexos multimedial immagazinate
+        instance_reports_measure: signalationes sur illos
+        instance_statuses_measure: messages immagazinate
       delivery:
+        all: Totes
+        clear: Rader errores de livration
+        failing: Fallente
+        restart: Recomenciar livration
+        stop: Cessar livration
         unavailable: Non disponibile
+      delivery_available: Livration es disponibile
+      delivery_error_days: Dies de errores de livration
+      delivery_error_hint: Si le livration non es possibile durante %{count} dies, illo essera automaticamente marcate como non livrabile.
+      destroyed_msg: Le datos de %{domain} es ora in cauda pro deletion imminente.
       empty: Necun dominios trovate.
+      known_accounts:
+        one: "%{count} conto cognoscite"
+        other: "%{count} contos cognoscite"
+      moderation:
+        all: Toto
+        limited: Limitate
+        title: Moderation
       private_comment: Commento private
       public_comment: Commento public
+      purge: Purgar
+      purge_description_html: Si tu crede que iste dominio es foras de linea pro sempre, tu pote deler de tu immagazinage tote le registros del conto e le datos associate de iste dominio. Isto pote prender un tempore.
+      title: Federation
+      total_blocked_by_us: Blocate per nos
+      total_followed_by_them: Sequite per illes
+      total_followed_by_us: Sequite per nos
+      total_reported: Signalationes sur illes
+      total_storage: Annexos multimedial
+      totals_time_period_hint_html: Le totales monstrate hic infra include le datos de tote le tempore.
+      unknown_instance: Iste dominio non es actualmente cognoscite sur iste servitor.
     invites:
       deactivate_all: Disactivar toto
       filter:
+        all: Toto
         available: Disponibile
+        expired: Expirate
+        title: Filtro
+      title: Invitationes
     ip_blocks:
+      add_new: Crear regula
+      created_msg: Le nove regula IP ha essite addite
       delete: Deler
       expires_in:
         '1209600': 2 septimanas
         '15778476': 6 menses
         '2629746': 1 mense
+        '31556952': 1 anno
         '86400': 1 die
+        '94670856': 3 annos
       new:
         title: Crear un nove regula IP
+      no_ip_block_selected: Necun regula IP ha essite cambiate perque necun ha essite seligite
       title: Regulas IP
+    relationships:
+      title: Relationes de %{acct}
     relays:
+      add_new: Adder nove repetitor
       delete: Deler
+      description_html: Un <strong>repetitor de federation</strong> es un servitor intermediari que excambia grande volumines de messages public inter le servitores que se inscribe e publica a illo. <strong>Illo pote adjutar le servitores micre e medie a discoperir le contento del fediverso</strong>, sin requirer que le usatores local seque manualmente altere personas sur servitores distante.
       disable: Disactivar
       disabled: Disactivate
       enable: Activar
+      enable_hint: Un vice activate, tu servitor se inscribera a tote le messages public de iste repetitor, e comenciara a inviar le messages public de iste servitor a illo.
       enabled: Activate
+      inbox_url: URL del repetitor
+      pending: Attende le approbation del repetitor
+      save_and_enable: Salveguardar e activar
+      setup: Crear un connexion con un repetitor
+      signatures_not_enabled: Le repetitores pote non functionar correctemente durante que le modo secur o le modo de federation limitate es activate
+      status: Stato
+      title: Repetitores
+    report_notes:
+      created_msg: Nota de signalation create con successo!
+      destroyed_msg: Nota de signalation delite con successo!
     reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+      action_log: Registro de inspection
+      action_taken_by: Action prendite per
+      actions:
+        delete_description_html: Le messages signalate essera delite e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
+        mark_as_sensitive_description_html: Le files multimedial in le messages reportate essera marcate como sensibile e un admonition essera registrate pro adjutar te a prender mesuras in caso de futur infractiones proveniente del mesme conto.
+        other_description_html: Vider plus optiones pro controlar le comportamento del conto e personalisar le communication al conto signalate.
+        resolve_description_html: Necun action essera prendite contra le conto signalate, necun admonition registrate, e le signalation essera claudite.
+        silence_description_html: Iste conto essera visibile solmente a qui ja lo seque o manualmente lo cerca, limitante gravemente su portata. Pote sempre esser revertite. Claude tote le signalationes contra iste conto.
+        suspend_description_html: Le conto e tote su contento essera inaccessible e finalmente delite, e interager con illo essera impossibile. Reversibile intra 30 dies. Claude tote le signalationes contra iste conto.
+      actions_description_html: Decide qual action prender pro resolver iste signalation. Si tu prende un action punitive contra le conto signalate, le persona recipera un notification in e-mail, excepte si le categoria <strong>Spam</strong> es seligite.
+      actions_description_remote_html: Decide qual action prender pro resolver iste signalation. Isto affectara solmente le maniera in que <strong>tu</strong> servitor communica con iste conto remote e gere su contento.
+      add_to_report: Adder plus al reporto
+      already_suspended_badges:
+        local: Ja suspendite sur iste servitor
+        remote: Ja suspendite sur su servitor
       are_you_sure: Es tu secur?
+      assign_to_self: Assignar a me
+      assigned: Moderator assignate
+      by_target_domain: Dominio del conto signalate
       cancel: Cancellar
+      category: Categoria
+      category_description_html: Le motivo pro le qual iste conto e/o contento ha essite signalate essera citate in le communication con le conto signalate
+      comment:
+        none: Necun
+      comment_description_html: 'Pro fornir plus information, %{name} ha scribite:'
+      confirm: Confirmar
+      confirm_action: Confirmar le action de moderation contra %{acct}
+      created_at: Signalate
+      delete_and_resolve: Deler le messages
+      forwarded: Reexpedite
+      forwarded_replies_explanation: Iste signalation proveni de un usator remote e concerne contento remote. Illo te ha essite reexpedite perque le contento signalate es in responsa a un usator tue.
+      forwarded_to: Reexpedite a %{domain}
+      mark_as_resolved: Marcar como resolvite
+      mark_as_sensitive: Marcar como sensibile
+      mark_as_unresolved: Marcar como non resolvite
+      no_one_assigned: Nemo
+      notes:
+        create: Adder un nota
+        create_and_resolve: Resolver con nota
+        create_and_unresolve: Reaperir con nota
+        delete: Deler
+        placeholder: Describe le actiones prendite, o insere altere information pertinente...
+        title: Notas
+      notes_description_html: Vider e lassar notas pro altere moderatores e pro tu proprie futuro
+      processed_msg: 'Reporto #%{id} elaborate con successo'
+      quick_actions_description_html: 'Face un rapide action o rola a basso pro vider le contento reportate:'
+      remote_user_placeholder: le usator remote ab %{instance}
+      reopen: Reaperir reporto
+      report: 'Reporto #%{id}'
+      reported_account: Conto signalate
+      reported_by: Signalate per
+      resolved: Resolvite
+      resolved_msg: Reporto resolvite con successo!
+      skip_to_actions: Saltar al actiones
+      status: Stato
+      statuses: Contento signalate
+      statuses_description_html: Le contento offensive sera citate in communication con le conto reportate
+      summary:
+        action_preambles:
+          delete_html: 'Tu va <strong>remover</strong> parte de messages de <strong>@%{acct}</strong>. Isto ira:'
+          mark_as_sensitive_html: 'Tu va <strong>marcar</strong> parte de messages de <strong>@%{acct}</strong> como <strong>sensibile</strong>. Isto ira:'
+          silence_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
+          suspend_html: 'Tu va <strong>limitar</strong> le conto de <strong>@%{acct}</strong>. Isto ira:'
+        actions:
+          delete_html: Remover le messages offensive
+          mark_as_sensitive_html: Marcar le medios de messages offensive como sensibile
+          silence_html: Limitar gravemente le portata de <strong>@%{acct}</strong> rendente le profilo e contento visibile solmente a qui ja lo seque o lo cerca manualmente
+          suspend_html: Suspender <strong>@%{acct}</strong>, rendente le profilo e contento inaccessibile e le interaction con illo impossibile
+        close_report: Marcar le signalation №%{id} como resolvite
+        close_reports_html: Marcar <strong>tote</strong> le signalationes contra <strong>@%{acct}</strong> como resolvite
+        delete_data_html: Deler le profilo e contento de <strong>@%{acct}</strong> in 30 dies excepte si le suspension es disfacite intertanto
+        preview_preamble_html: "<strong>@%{acct}</strong> recipera un advertimento con le sequente contento:"
+        record_strike_html: Registrar un admonition contra <strong>@%{acct}</strong> pro adjutar te a imponer sanctiones in caso de futur violationes de iste conto
+        send_email_html: Inviar un e-mail de advertimento a <strong>@%{acct}</strong>
+        warning_placeholder: Motivation supplementari facultative pro le action de moderation.
+      target_origin: Origine del conto signalate
+      title: Reportos
+      unassign: Disassignar
+      unknown_action_msg: 'Action incognite: %{action}'
+      unresolved: Non resolvite
+      updated_at: Actualisate
+      view_profile: Vider profilo
+    roles:
+      add_new: Adder rolo
+      assigned_users:
+        one: "%{count} usator"
+        other: "%{count} usatores"
+      categories:
+        administration: Administration
+        devops: DevOps
+        invites: Invitationes
+        moderation: Moderation
+        special: Special
+      delete: Deler
+      description_html: Le <strong>rolos de usator</strong> permitte personalisar le functiones e areas de Mastodon al quales le usator pote acceder.
+      edit: Modificar le rolo '%{name}'
+      everyone: Permissiones predefinite
+      everyone_full_description_html: Iste es le <strong>rolo de base</strong> que affecta <strong>tote le usatores</strong>, mesmo illes sin rolo assignate. Tote le altere rolos heredita le permissiones de illo.
+      permissions_count:
+        one: "%{count} permission"
+        other: "%{count} permissiones"
+      privileges:
+        administrator: Administrator
+        administrator_description: Le usatores con iste permission pote contornar tote permission
+        delete_user_data: Deler le datos de usator
+        delete_user_data_description: Permitte que usatores dele immediatemente le datos de altere usatores
+        invite_users: Invitar usatores
+        invite_users_description: Permitte que usatores invita nove personas al servitor
+        manage_announcements: Gerer le annuncios
+        manage_announcements_description: Permitte que usatores genere annuncios sur le servitor
+        manage_appeals: Gerer appellos
+        manage_appeals_description: Permitte que usatores revide appellos contra actiones de moderation
+        manage_blocks: Gerer blocadas
+        manage_blocks_description: Permitter que usatores bloca le fornitores de e-mail e le adresses IP
+        manage_custom_emojis: Gerer emojis personalisate
+        manage_custom_emojis_description: Permitte que usatores gere emojis personalisate sur le servitor
+        manage_federation: Gerer federation
+        manage_federation_description: Permitte que le usatores bloca o permitte le federation con altere dominios, e controla le livration
+        manage_invites: Gerer le invitationes
+        manage_invites_description: Permitte que usatores examina e deactiva ligamines de invitation
+        manage_reports: Gerer le reportos
+        manage_reports_description: Permitte que usatores revide signalationes e exeque actiones de moderation a base de illos
+        manage_roles: Gerer le rolos
+        manage_roles_description: Permitte que usatores gere e assigna rolos inferior a lor privilegios actual
+        manage_rules: Gerer le regulas
+        manage_rules_description: Permitte que usatores cambia le regulas del servitor
+        manage_settings: Gerer le parametros
+        manage_settings_description: Permitte que usatores cambia le parametros del sito
+        manage_taxonomies: Gerer taxonomias
+        manage_taxonomies_description: Permitte que usatores revide contento in tendentias e actualisa le parametros de hashtag
+        manage_user_access: Gerer le accessos de usator
+        manage_user_access_description: Permitte que usatores disactiva le authentication bifactorial de altere usatores, cambia lor adresses de e-mail, e reinitialisa lor contrasigno
+        manage_users: Gerer usatores
+        manage_users_description: Permitte que usatores vide le detalios de altere usatores e exeque actiones de moderation contra illes
+        manage_webhooks: Gerer Webhooks
+        manage_webhooks_description: Permitte que usatores installa “webhooks” pro eventos administrative
+        view_audit_log: Vider le registro de inspection
+        view_audit_log_description: Permitte que usatores vide un historia de actiones administrative sur le servitor
+        view_dashboard: Vider le tabuliero de instrumentos
+        view_dashboard_description: Permitte que usatores accede al tabuliero de instrumentos e a varie statisticas
+        view_devops: DevOps
+        view_devops_description: Permitte que usatores accede al tabulieros de instrumentos de Sidekiq e pgHero
+      title: Rolos
+    rules:
+      add_new: Adder regula
+      delete: Deler
+      description_html: Ben que multes affirma de haber legite e acceptate le conditiones de servicio, generalmente le gente non los lege completemente usque un problema surge. <strong>Facilita le visibilitate del regulas de tu servitor in un colpo de oculo forniente los in un lista a punctos.</strong> Tenta mantener le regulas individual curte e simple, ma sin divider los in multe punctos separate.
+      edit: Modificar regula
+      empty: Necun regula del servitor ha essite definite ancora.
+      title: Regulas del servitor
+    settings:
+      about:
+        manage_rules: Gerer le regulas del servitor
+        preamble: Fornir information detaliate sur le functionamento, moderation e financiamento del servitor.
+        rules_hint: Il ha un area dedicate al regulas que tu usatores debe acceptar.
+        title: A proposito de
+      appearance:
+        preamble: Personalisar le interfacie web de Mastodon.
+        title: Apparentia
+      branding:
+        preamble: Le marca de tu servitor lo differentia de altere servitores in le rete. Iste information pote esser monstrate in diverse ambientes, como le interfacie web de Mastodon, applicationes native, in previsualisationes de ligamines sur altere sitos web, in applicationes de messageria, etc. Pro iste ration, il es melior mantener iste information clar, breve e concise.
+        title: Marca
+      captcha_enabled:
+        desc_html: Iste depende de scripts externe de hCaptcha, que pote esser un problema de securitate e vita private. De plus, <strong>isto pote render le processo de inscription multo minus accessibile a certe personas (particularmente personas con discapacitates)</strong>. Pro iste rationes, considera altere mesuras como le inscription basate sur approbation o invitation.
+        title: Require que nove usatores solve un CAPTCHA pro confirmar lor conto
+      content_retention:
+        danger_zone: Zona periculose
+        preamble: Controlar como contento generate per le usator es immagazinate in Mastodon.
+        title: Retention de contento
+      default_noindex:
+        desc_html: Affice tote le usatores qui non ha cambiate iste parametro per se mesme
+        title: Refusar de ordinario le indexation del usatores per le motores de recerca
+      discovery:
+        follow_recommendations: Sequer le recommendationes
+        preamble: Presentar contento interessante es instrumental in introducer nove usatores qui pote non cognoscer alcuno de Mastodon.
+        profile_directory: Directorio de profilos
+        public_timelines: Chronologias public
+        publish_discovered_servers: Publicar servitores discoperite
+        publish_statistics: Publicar statistica
+        title: Discoperi
+        trends: Tendentias
+      domain_blocks:
+        all: A omnes
+        disabled: A necuno
+        users: A usators local in session
+      registrations:
+        moderation_recommandation: Per favor verifica que tu ha un adequate e reactive equipa de moderation ante que tu aperi registrationes a quicunque!
+        preamble: Controla qui pote crear un conto sur tu servitor.
+        title: Registrationes
+      registrations_mode:
+        modes:
+          approved: Approbation necessari pro le inscription
+          none: Nemo pote inscriber se
+          open: Quicunque pote inscriber se
+        warning_hint: Nos consilia usar “Approbation necessari pro le inscription” si tu non crede que tu equipa de moderation pote tractar spam e registrationes maligne in un modo opportun.
+      security:
+        authorized_fetch: Require authentication ab servitores federate
+        authorized_fetch_hint: Requirer authentication de servitores federate permitte un application plus stricte de blocadas a nivello de usator e de servitor. Nonobstante, isto diminue le prestationes del servitor, reduce le portata de tu responsas e pote introducer problemas de compatibilitate con certe servicios federate. In plus, isto non impedira le actores dedicate a recuperar tu messages public e tu contos.
+        authorized_fetch_overridden_hint: Tu actualmente non pote cambiar iste parametros perque il es superate per un variabile de ambiente.
+        federation_authentication: Application del authentication de federation
+      title: Parametros de servitor
+    site_uploads:
+      delete: Deler file incargate
+      destroyed_msg: Incarga de sito delite con successo!
+    software_updates:
+      critical_update: Critic! Actualisa tosto
+      description: Il es recommendate de mantener actualisate tu installation de Mastodon pro beneficiar del ultime reparationes e functiones. In ultra, il es aliquando critic actualisar Mastodon in maniera opportun pro evitar problemas de securitate. Pro iste rationes, Mastodon controla pro actualisationes cata 30 minutas, e te notificara secundo tu preferentias de notificationes per email.
+      documentation_link: Pro saper plus
+      release_notes: Notas de version
+      title: Actualisationes disponibile
+      type: Typo
+      types:
+        major: Version major
+        minor: Version minor
+        patch: 'Version de pecias: remedios de bugs e cambiamentos facile a applicar'
+      version: Version
+    statuses:
+      account: Autor
+      application: Application
+      back_to_account: Retro al pagina de conto
+      back_to_report: Retro al pagina de reporto
+      batch:
+        remove_from_report: Remover ab reporto
+        report: Reporto
+      deleted: Delite
+      favourites: Favoritos
+      history: Chronologia del versiones
+      in_reply_to: Replicante a
+      language: Lingua
+      media:
+        title: Medios
+      metadata: Metadatos
+      no_status_selected: Nulle messages era cambiate perque necun era seligite
+      open: Aperir message
+      original_status: Message original
+      reblogs: Promotiones
+      status_changed: Messages cambiate
+      title: Messages del conto
+      trending: Tendentias
+      visibility: Visibilitate
+      with_media: Con medios
+    strikes:
+      actions:
+        delete_statuses: "%{name} ha delite le messages de %{target}"
+        disable: "%{name} ha gelate le conto de %{target}"
+        mark_statuses_as_sensitive: "%{name} ha marcate le messages de %{target} como sensibile"
+        none: "%{name} ha inviate un advertimento a %{target}"
+        sensitive: "%{name} ha marcate le conto de %{target} como sensibile"
+        silence: "%{name} ha limitate le conto de %{target}"
+        suspend: "%{name} ha suspendite le conto de %{target}"
+      appeal_approved: Appello facite
+      appeal_pending: Appello pendente
+      appeal_rejected: Appello rejectate
+    system_checks:
+      database_schema_check:
+        message_html: Il ha migrationes de base de datos pendente. Per favor exeque los pro assecurar que le application se comporta como expectate
+      elasticsearch_health_red:
+        message_html: Le aggregation Elasticsearch es malsan (stato rubie), le functiones de recerca es indisponibile
+      elasticsearch_health_yellow:
+        message_html: Le aggregation Elasticsearch es malsan (stato jalne), tu poterea voler investigar le ration
+      elasticsearch_index_mismatch:
+        message_html: Le mappas de indice Elasticsearch es obsolete. Per favor exeque <code>tootctl search deploy --only=%{value}</code>
+      elasticsearch_preset:
+        action: Vide documentation
+        message_html: Tu aggregation Elasticsearch ha plus que un nodo, ma Mastodon non es configurate a usar los.
+      elasticsearch_preset_single_node:
+        action: Vide documentation
+        message_html: Tu aggregation Elasticsearch ha un sol nodo, <code>ES_PRESET</code> deberea esser predefinite a <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Le indexation de tu systema Elasticsearch es obsolete per un cambio de configuration. Per cfavor exeque <code>tootctl search deploy --reset-chewy</code> pro actualisar lo.
+      elasticsearch_running_check:
+        message_html: Impossibile connecter se a Elasticsearch. Verifica que illo flue, o disactiva le recerca a plen texto
+      elasticsearch_version_check:
+        message_html: 'Version de Elasticsearch incompatibile: %{value}'
+        version_comparison: Elasticsearch %{running_version} es currente dum %{required_version} es necesse
+      rules_check:
+        action: Gerer le regulas del servitor
+        message_html: Tu non ha definite ulle regulas de servitor.
+      sidekiq_process_check:
+        message_html: Nulle processo Sidekiq currente pro le %{value} cauda(s). Controla tu configuration de Sidekiq
+      software_version_critical_check:
+        action: Vider le actualisationes disponibile
+        message_html: Un actualisation critic de Mastodon es disponibile, actualisa lo le plus rapide possibile.
+      software_version_patch_check:
+        action: Vider le actualisationes disponibile
+        message_html: Un actualisation de remedio de bug pro Mastodon es disponibile.
+      upload_check_privacy_error:
+        action: Verifica hic pro plus de information
+        message_html: "<strong>Tu servitor de web es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Verifica hic pro plus de information
+        message_html: "<strong>Tu immagazinage de objectos es mal-configurate. Le confidentialitate de tu usatores es a risco.</strong>"
+    tags:
+      review: Revide le stato
+      updated_msg: Parametros de hashtag actualisate con successo
+    title: Administration
+    trends:
+      allow: Permitter
+      approved: Approbate
+      disallow: Impedir
+      links:
+        allow: Permitter ligamine
+        allow_provider: Permitter editor
+        description_html: Istos es ligamines que es actualmente multo compartite per contos de que tu servitor vide messages. Illo pote adjutar tu usatores a discoperir lo que eveni in le mundo. Nulle ligamines es monstrate publicamente usque tu non approba le editor. Tu alsi pote permitter o rejectar ligamines singule.
+        disallow: Impedir ligamine
+        disallow_provider: Impedir editor
+        no_link_selected: Nulle ligamine era cambiate perque nulle era seligite
+        publishers:
+          no_publisher_selected: Nulle editores era cambiate perque nemo era seligite
+        shared_by_over_week:
+          one: Compartite per un persona le septimana passate
+          other: Compartite per %{count} personas le septimana passate
+        title: Ligamines de tendentia
+        usage_comparison: Compartite %{today} vices hodie, comparate al %{yesterday} de heri
+      not_allowed_to_trend: Non permittite haber tendentia
+      only_allowed: Solo permittite
+      pending_review: Attende revision
+      preview_card_providers:
+        allowed: Ligamines ab iste editor pote haber tendentia
+        description_html: Il ha dominios ab que ligamines es sovente compartite sur tu servitor. Ligamines non habera publicamente tendentia salvo que le dominio del ligamine es approbate. Tu approbation (o rejection) se extende al sub-dominios.
+        rejected: Ligamines ab iste editor non habera tendentia
+        title: Editores
+      rejected: Rejectate
+      statuses:
+        allow: Permitter message
+        allow_account: Permitter autor
+        description_html: Istos es messages que tu servitor cognosce perque illos es al momento multo compartite e favorite. Isto pote adjutar tu nove e renovate usatores a trovar altere personas a sequer. Nulle messages es monstrate publicamente usque tu approba le autor, e le autor permitte que su conto es suggerite a alteres. Tu alsi pote permitter o rejectar messages singule.
+        disallow: Impedir message
+        disallow_account: Impedir autor
+        no_status_selected: Nulle messages era cambiate perque nulle era seligite
+        not_discoverable: Le autor non ha optate pro esser detectabile
+        shared_by:
+          one: Compartite e favorite un tempore
+          other: Compartite e favorite %{friendly_count} tempores
+        title: Messages de tendentia
+      tags:
+        current_score: Punctuage actual %{score}
+        dashboard:
+          tag_accounts_measure: usos unic
+          tag_languages_dimension: Linguas principal
+          tag_servers_dimension: Servitores principal
+          tag_servers_measure: servitores differente
+          tag_uses_measure: usos total
+        description_html: Istos es hashtags que actualmente appare in tante messages que tu servitor vide. Illo pote adjutar tu usatores a discoperir re que le personas parla plus al momento. Nulle hashtags es monstrate publicamente usque tu los approba.
+        listable: Pote esser suggerite
+        no_tag_selected: Nulle placas era cambiate perque nulle era seligite
+        not_listable: Non sera suggerite
+        not_trendable: Non apparera sub tendentias
+        not_usable: Non pote esser usate
+        peaked_on_and_decaying: Habeva un picco %{date}, ora decade
+        title: Hashtags de tendentia
+        trendable: Pote apparer sub tendentias
+        trending_rank: 'De tendentia #%{rank}'
+        usable: Pote esser usate
+        usage_comparison: Usate %{today} vices hodie, al contrario del %{yesterday} de heri
+        used_by_over_week:
+          one: Usate per un persona le ultime septimana
+          other: Usate per %{count} personas le ultime septimana
+      title: Tendentias
+      trending: Tendentias
+    warning_presets:
+      add_new: Adder nove
+      delete: Deler
+      edit_preset: Rediger aviso predefinite
+      empty: Tu non ha ancora definite alcun avisos predefinite.
+      title: Gerer avisos predefinite
+    webhooks:
+      add_new: Adder terminal
+      delete: Deler
+      description_html: Un <strong>croc web</strong> habilita Mastodon a transmitter <strong>notificationes in tempore real</strong> re eventos seligite pro tu pro activar application, assi tu application pote <strong>automaticamente discatenar reactiones</strong>.
+      disable: Disactivar
+      disabled: Disactivate
+      edit: Rediger terminal
+      empty: Tu ancora non ha configurate alcun punctos final de web croc.
+      enable: Activar
+      enabled: Active
+      enabled_events:
+        one: 1 evento activate
+        other: "%{count} eventos activate"
+      events: Eventos
+      new: Nove croc web
+      rotate_secret: Rotar secrete
+      secret: Firmante secrete
+      status: Stato
+      title: Crocs web
+      webhook: Crocs web
+  admin_mailer:
+    auto_close_registrations:
+      subject: Le registrationes pro %{instance} ha essite automaticamente mutate a besoniante de approbation
+    new_appeal:
+      actions:
+        delete_statuses: pro deler lor messages
+        disable: pro gelar lor conto
+        mark_statuses_as_sensitive: pro marcar lor messages como sensibile
+        none: pro advertir
+        sensitive: a marcar lor conto como sensibile
+        silence: pro limitar lor conto
+        suspend: pro suspender lor conto
+      body: "%{target} appella un decision de moderation per %{action_taken_by} ab le %{date}, que era %{type}. Ille scribeva:"
+      next_steps: Tu pote approbar le appello a disfacer le decision de moderation, o ignorar lo.
+      subject: "%{username} appella un decision de moderation sur %{instance}"
+    new_critical_software_updates:
+      body: Nove versiones critic de Mastodon ha essite publicate, tu poterea voler actualisar al plus tosto possibile!
+      subject: Actualisationes critic de Mastodon es disponibile pro %{instance}!
+    new_pending_account:
+      body: Le detalios del nove conto es infra.
+      subject: Nove conto preste a revider sur %{instance} (%{username})
+    new_report:
+      body: "%{reporter} ha reportate %{target}"
+      body_remote: Alcuno de %{domain} ha reportate %{target}
+      subject: Nove reporto pro %{instance} (#%{id})
+    new_software_updates:
+      body: Nove versiones de Mastodon ha essite publicate, tu poterea voler actualisar!
+      subject: Nove versiones de Mastodon es disponibile pro %{instance}!
+    new_trends:
+      body: 'Le sequente elementos besoniar de un recension ante que illos pote esser monstrate publicamente:'
+      new_trending_links:
+        title: Ligamines de tendentia
+      new_trending_statuses:
+        title: Messages de tendentia
+      new_trending_tags:
+        title: Hashtags de tendentia
+      subject: Nove tendentias pro recenser sur %{instance}
+  aliases:
+    add_new: Crear alias
+    created_msg: Create con successo un nove alias. Ora tu pote initiar le motion ab le vetere conto.
+    deleted_msg: Removite con successo le alias. Mover de ille conto a isto non sera plus possibile.
+    empty: Tu non ha aliases.
+    hint_html: Si tu desira mover ab un altere conto a isto, ci tu pote crear un alias, que es requirite ante que tu pote continuar con mover sequaces ab le vetere conto a isto. Iste action per se mesme es <strong>innocue e reversibile</strong>. <strong>Le migration de conto es initiate ab le vetere conto</strong>.
+    remove: Disligar alias
+  appearance:
+    advanced_web_interface: Interfacie web avantiate
+    advanced_web_interface_hint: 'Si tu desira facer uso de tu integre largessa de schermo, le interfacie web avantiate te permitte de configurar plure columnas differente pro vider al mesme tempore tante informationes como tu vole: pagina principal, notificationes, chronogramma federate, ulle numero de listas e hashtags.'
+    animations_and_accessibility: Animationes e accessibilitate
+    confirmation_dialogs: Dialogos de confirmation
+    discovery: Discoperta
+    localization:
+      body: Mastodon es traducite per voluntarios.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Totes pote contribuer.
+    sensitive_content: Contento sensibile
+  application_mailer:
+    notification_preferences: Cambiar preferentias de e-mail
+    salutation: "%{name},"
+    settings: 'Cambiar preferentias de e-mail: %{link}'
+    unsubscribe: Desubscriber
+    view: 'Vider:'
+    view_profile: Vider profilo
+    view_status: Vider message
+  applications:
+    created: Application create con successo
+    destroyed: Application delite con successo
+    logout: Clauder le session
+    regenerate_token: Regenerar testimonio de accesso
+    token_regenerated: Testimonio de accesso regenerate con successo
+    warning: Sia multo attente con iste datos. Jammais compartir los con quicunque!
+    your_token: Tu testimonio de accesso
+  auth:
+    apply_for_account: Peter un conto
+    captcha_confirmation:
+      help_html: Si tu ha problemas a solver le CAPTCHA, tu pote contactar nos per %{email} e nos pote assister te.
+      hint_html: Justo un altere cosa! Nos debe confirmar que tu es un human (isto es assi proque nos pote mantener foras le spam!). Solve le CAPTCHA infra e clicca "Continuar".
+      title: Controlo de securitate
+    confirmations:
+      awaiting_review: Tu adresse email es confirmate! Le personal de %{domain} ora revide tu registration. Tu recipera un email si illes approba tu conto!
+      awaiting_review_title: Tu registration es revidite
+      clicking_this_link: cliccante iste ligamine
+      login_link: acceder
+      proceed_to_login_html: Ora tu pote continuar a %{login_link}.
+      welcome_title: Benvenite, %{name}!
+    delete_account: Deler le conto
+    description:
+      prefix_sign_up: Inscribe te sur Mastodon hodie!
+    didnt_get_confirmation: Non recipeva tu un ligamine de confirmation?
+    dont_have_your_security_key: Non ha tu le clave de securitate?
+    forgot_password: Contrasigno oblidate?
+    invalid_reset_password_token: Pete un nove.
+    link_to_webauth: Usa tu apparato clave de securitate
+    log_in_with: Accede con
+    login: Accede
+    logout: Clauder le session
+    migrate_account: Move a un conto differente
+    or_log_in_with: O accede con
+    privacy_policy_agreement_html: Io ha legite e acceptar le <a href="<a href="%{privacy_policy_path}" target="_blank">politica de confidentialitate</a>
+    progress:
+      confirm: Confirma le email
+      details: Tu detalios
+      review: Nostre revision
+      rules: Accepta le regulas
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Inscribe te
+    registration_closed: "%{instance} non accepta nove membros"
+    resend_confirmation: Reinviar ligamine de confirmation
+    reset_password: Remontar le contrasigno
+    rules:
+      accept: Acceptar
+      back: Retro
+      invited_by: 'Tu pote junger te a %{domain} gratias al invitation que tu ha recipite de:'
+      preamble: Illos es predefinite e fortiarte per le moderatores de %{domain}.
+      preamble_invited: Ante que tu continua, considera le regulas base definite per le moderatores de %{domain}.
+      title: Alcun regulas base.
+      title_invited: Tu ha essite invitate.
+    security: Securitate
+    set_new_password: Definir un nove contrasigno
+    setup:
+      email_below_hint_html: Verifica tu plica de spam, o pete un altero. Tu pote corriger tu adresse email si illo es errate.
+      email_settings_hint_html: Clicca le ligamine que nos te inviava pro verificar %{email}.
+      link_not_received: Non obteneva tu un ligamine?
+      new_confirmation_instructions_sent: Tu recipera un nove email con le ligamine de confirmation in alcun minutas!
+      title: Verifica tu cassa de ingresso
+    sign_in:
+      preamble_html: Accede con tu <strong>%{domain}</strong> credentiales. Si tu conto es hospite sur un differente servitor, tu non potera authenticar te ci.
+      title: Acceder a %{domain}
+    sign_up:
+      manual_review: Le inscriptiones sur %{domain} passa per revision manual de nostre moderatores. Pro adjutar nos a processar tu registration, scribe un poco re te mesme e perque tu vole un conto sur %{domain}.
+      preamble: Con un conto sur iste servitor de Mastodon, tu potera sequer ulle altere persona in rete, sin reguardo de ubi lor conto es hospite.
+      title: Lassa que nos te configura sur %{domain}.
+    status:
+      account_status: Stato del conto
+      confirming: Attendente esser completate email de confirmation.
+      functional: Tu conto es plenmente operative.
+      pending: Tu application es pendente de revision per nostre personal. Isto pote prender alcun tempore. Tu recipera un email si tu application es approbate.
+      redirecting_to: Tu conto es inactive perque illo es actualmente re-adressa a %{acct}.
+      self_destruct: Dum %{domain} va clauder, tu solo habera accesso limitate a tu conto.
+      view_strikes: Examinar le admonitiones passate contra tu conto
+    too_fast: Formulario inviate troppo velocemente, retenta.
+    use_security_key: Usar clave de securitate
+  challenge:
+    confirm: Continuar
+    hint_html: "<strong>Consilio:</strong> Nos non te demandara tu contrasigno ancora pro le proxime hora."
+    invalid_password: Contrasigno non valide
+    prompt: Confirma le contrasigno pro continuar
+  crypto:
+    errors:
+      invalid_key: non es un clave Ed25519 o Curve25519 valide
+      invalid_signature: non es un valide firma Ed25519
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_months: "%{count}me"
+      about_x_years: "%{count}a"
+      almost_x_years: "%{count}a"
+      half_a_minute: Justo ora
+      less_than_x_minutes: "%{count} m"
+      less_than_x_seconds: Justo ora
+      over_x_years: "%{count}a"
+      x_days: "%{count}d"
+      x_minutes: "%{count} m"
+      x_months: "%{count}me"
+      x_seconds: "%{count}s"
+  deletes:
+    challenge_not_passed: Le informationes que tu ha inserite non era correcte
+    confirm_password: Insere tu contrasigno actual pro verificar tu identitate
+    confirm_username: Insere tu actual contrasigno pro verificar tu identitate
+    proceed: Deler le conto
+    success_msg: Tu conto esseva delite con successo
+    warning:
+      before: 'Insere tu nomine de usator pro confirmar le procedura:'
+      caches: Contente que ha essite in cache per altere servitores pote persister
+      data_removal: Tu messages e altere datos essera removite permanentemente
+      email_change_html: Tu pote <a href="%{path}">cambiar tu adresse de e-mail</a> sin deler tu conto
+      email_contact_html: Si illo ancora non arriva, tu pote inviar email a <a href="mailto:%{email}">%{email}</a> pro peter adjuta
+      email_reconfirmation_html: Si tu non recipe le email de confirmation, tu pote <a href="%{path}>requirer lo ancora</a>
+      irreversible: Tu non potera restaurar o reactivar tu conto
+      more_details_html: Pro altere detalios, vide le <a href="%{terms_path}">politica de confidentialitate</a>.
+      username_available: Tu nomine de usator essera disponibile novemente
+      username_unavailable: Tu nomine de usator remanera indisponibile
+  disputes:
+    strikes:
+      action_taken: Action prendite
+      appeal: Facer appello
+      appeal_approved: Iste admonition ha essite annullate in appello e non es plus valide
+      appeal_rejected: Le appello ha essite rejectate
+      appeal_submitted_at: Appello submittite
+      appealed_msg: Tu appello ha essite submittite. Si es approbate, tu recipera notification.
+      appeals:
+        submit: Submitter appello
+      approve_appeal: Approbar apello
+      associated_report: Signalation associate
+      created_at: Del data
+      description_html: Istes es le actiones prendite contra tu conto e le advertimentos que te ha essite inviate per le personal de %{instance}.
+      recipient: Adressate a
+      reject_appeal: Rejectar appello
+      status: Message №%{id}
+      status_removed: Le message ha ja essite removite del systema
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Elimination de messages
+        disable: Gelamento del conto
+        mark_statuses_as_sensitive: Marcation de messages como sensibile
+        none: Advertimento
+        sensitive: Marcation del conto como sensibile
+        silence: Limitation del conto
+        suspend: Suspension del conto
+      your_appeal_approved: Tu appello ha essite approbate
+      your_appeal_pending: Tu ha submittite un appello
+      your_appeal_rejected: Tu appello ha essite rejectate
+  domain_validator:
+    invalid_domain: non es un nomine de dominio valide
+  edit_profile:
+    basic_information: Information basic
+    other: Alteres
+  errors:
+    '400': Le requesta que tu inviava era non valide o mal formate.
+    '403': Tu non ha le permisso pro acceder a iste pagina.
+    '404': Le pagina que tu cerca non es ci.
+    '406': Iste pagina non es disponibile in le formato requirite.
+    '410': Le pagina que tu cercava non plus existe ci.
+    '422':
+      content: Le verification de securitate ha fallite. Bloca tu le cookies?
+      title: Falleva le verification de securitate
+    '429': Troppe requestas
+    '500':
+      content: Nos lo regretta, ma alco errate eveniva sur nostre extremo.
+      title: Iste pagina non es correcte
+    '503': Le pagina non poteva esser servite per un panna de servitor temporari.
+    noscript_html: A usar le application web Mastodon, activa JavaScript. In alternativa, tenta un del <a href="%{apps_path}">apps native</a> de Mastodon pro tu platteforma.
+  existing_username_validator:
+    not_found: impossibile trovar un usator local con ille nomine de usator
+    not_found_multiple: non poteva trovar %{usernames}
+  exports:
+    archive_takeout:
+      date: Data
+      download: Discargar tu archivo
+      hint_html: Tu pote requirer un archivo de tu <strong>messages e medios cargate</strong>. Le datos exportate sera in le formato ActivityPub, legibile per ulle software conforme.
+      in_progress: Compilante tu archivo...
+      request: Pete tu archivo
+      size: Dimension
+    blocks: Tu ha blocate
+    bookmarks: Marcapaginas
+    csv: CSV
+    domain_blocks: Blocadas de dominio
+    lists: Listas
+    mutes: Tu ha silentiate
+    storage: Immagazinage de medios
+  featured_tags:
+    add_new: Adder nove
+    errors:
+      limit: Tu ha jam consiliate le maxime numero de hashtags
+  filters:
+    contexts:
+      account: Profilos
+      home: Pagina de initio e listas
+      notifications: Notificationes
+      public: Chronologias public
+      thread: Conversationes
+    edit:
+      add_keyword: Adder parola clave
+      keywords: Parolas clave
+      statuses: Messages individual
+      title: Modificar filtro
+    errors:
+      invalid_context: Nulle o non valide contexto supplite
+    index:
+      contexts: Filtros in %{contexts}
+      delete: Deler
+      empty: Tu non ha filtros.
+      expires_in: Expira in %{distance}
+      expires_on: Expira le %{date}
+      keywords:
+        one: "%{count} parola clave"
+        other: "%{count} parolas clave"
+      statuses:
+        one: "%{count} message"
+        other: "%{count} messages"
+      statuses_long:
+        one: "%{count} singule message celate"
+        other: "%{count} singule messages celate"
+      title: Filtros
+    new:
+      save: Salveguardar nove filtro
+      title: Adder nove filtro
+    statuses:
+      back_to_filter: Retro al filtro
+      batch:
+        remove: Remover ab filtro
+      index:
+        hint: Iste filtro se applica pro seliger messages singule sin reguardo de altere criterios. Tu pote adder altere messages a iste filtro ab le interfacie web.
+        title: Messages filtrate
+  generic:
+    all: Toto
+    cancel: Cancellar
+    changes_saved_msg: Cambios salveguardate con successo!
+    confirm: Confirmar
+    copy: Copiar
+    delete: Deler
+    deselect: Deseliger toto
+    none: Nemo
+    order_by: Ordinar per
+    save_changes: Salvar le cambios
+    select_all_matching_items:
+      one: Selige %{count} elemento concordante tu recerca.
+      other: Selige %{count} elementos concordante tu recerca.
+    today: hodie
+    validation_errors:
+      one: Alco non es multo bon ancora! Controla le error infra
+      other: Alco non es multo bon ancora! Controla %{count} errores infra
+  imports:
+    errors:
+      empty: File CSV vacue
+      incompatible_type: Incompatibile con le typo de importation seligite
+      invalid_csv_file: 'File CSV non valide. Error: %{error}'
+      over_rows_processing_limit: contine plus que %{count} rangos
+      too_large: Le file es troppo longe
+    failures: Fallimentos
+    imported: Importate
+    mismatched_types_warning: Il appare que tu pote haber seligite le typo errate pro iste importation, controla duo vices.
+    modes:
+      overwrite_long: Reimplaciar registros actual con le noves
+    overwrite_preambles:
+      blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas</strong> per usque a <strong>%{total_items} contos</strong> proveniente de <strong>%{filename}</strong>.
+      domain_blocking_html: Tu es sur le puncto de <strong>reimplaciar tu lista de blocadas de dominio</strong> per usque a <strong>%{total_items} dominios</strong> proveniente de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} contos</strong> a partir de <strong>%{filename}</strong>.
+      domain_blocking_html: Tu es sur le puncto de <strong>blocar</strong> usque a <strong>%{total_items} dominios</strong> a partir de <strong>%{filename}</strong>.
+    preface: Tu pote importar datos que tu ha exportate de un altere servitor, como un lista de personas que tu seque o bloca.
+    recent_imports: Importationes recente
+    states:
+      finished: Terminate
+      in_progress: In curso
+      scheduled: Planificate
+      unconfirmed: Non confirmate
+    status: Stato
+    success: Tu datos era cargate con successo e sera processate in tempore debite
+    time_started: Initiate le
+    titles:
+      blocking: Importation de contos blocate
+      bookmarks: Importation de marcapaginas
+      domain_blocking: Importation de dominios blocate
+      following: Importation de contos sequite
+      lists: Importation de listas
+      muting: Importation de contos silentiate
+    type: Typo de importation
+    type_groups:
+      constructive: Sequites e marcapaginas
+      destructive: Blocadas e silentiamentos
+    types:
+      blocking: Lista de blocadas
+      bookmarks: Marcapaginas
+      domain_blocking: Lista de dominios blocate
+      following: Sequente lista
+      lists: Listas
+      muting: Lista del silentiates
+    upload: Incargar
+  invites:
+    delete: Disactivar
+    expired: Expirate
+    expires_in:
+      '1800': 30 minutas
+      '21600': 6 horas
+      '3600': 1 hora
+      '43200': 12 horas
+      '604800': 1 septimana
+      '86400': 1 die
+    expires_in_prompt: Nunquam
+    generate: Generar ligamine de invitation
+    invalid: Iste invitation non es valide
+    max_uses:
+      one: un uso
+      other: "%{count} usos"
+    table:
+      expires_at: Expira
+    title: Invitar personas
+  login_activities:
+    authentication_methods:
+      password: contrasigno
+      webauthn: claves de securitate
+  mail_subscriptions:
+    unsubscribe:
+      action: Si, desubscriber
+      complete: Desubscribite
+      confirmation_html: Es tu secur de voler cancellar le subscription al %{type} de Mastodon sur %{domain} pro tu adresse de e-mail %{email}? Tu pote sempre resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      emails:
+        notification_emails:
+          favourite: notificationes de favorites in e-mail
+          follow: notificationes de sequimento in e-mail
+          follow_request: requestas de sequimento in e-mail
+          mention: notificationes de mentiones in e-mail
+          reblog: notificationes de impulsos in e-mail
+      resubscribe_html: Si tu ha cancellate le subscription in error, tu pote resubscriber te a partir del <a href="%{settings_path}">parametros de notification in e-mail</a>.
+      success_html: Tu non recipera plus %{type} pro Mastodon sur %{domain} a tu adresse de e-mail %{email}.
+      title: Desubcriber
+  migrations:
+    errors:
+      move_to_self: non pote esser le conto actual
+      not_found: non poterea esser trovate
+  moderation:
+    title: Moderation
+  move_handler:
+    carry_blocks_over_text: Iste usator ha cambiate de conto desde %{acct}, que tu habeva blocate.
+  notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} se ha inscribite"
+    follow:
+      title: Nove sequitor
+    follow_request:
+      title: Nove requesta de sequimento
+    mention:
+      action: Responder
+      title: Nove mention
+    poll:
+      subject: Un inquesta de %{name} ha finite
+  otp_authentication:
+    enable: Activar
+    setup: Configurar
+  pagination:
+    next: Sequente
+    prev: Previe
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tu jam ha votate in iste sondage
+      duplicate_options: contine elementos duplicate
+      duration_too_long: il es troppo lontan in le futuro
+      duration_too_short: il es troppo tosto
+      expired: Le sondage ha jam finite
+      invalid_choice: Le option de voto eligite non existe
+      over_character_limit: non pote esser plus longe que %{max} characteres cata un
+      self_vote: Tu non pote vota in tu proprie sondages
+      too_few_options: debe haber plus que un elemento
+      too_many_options: non pote continer plus que %{max} elementos
+  preferences:
+    other: Altere
+    posting_defaults: Publicationes predefinite
+    public_timelines: Chronologias public
+  privacy:
+    privacy: Confidentialitate
+    reach: Portata
+    search: Cercar
+    title: Confidentialitate e portata
+  privacy_policy:
+    title: Politica de confidentialitate
+  reactions:
+    errors:
+      limit_reached: Limite de reactiones differente attingite
+      unrecognized_emoji: non es un emoticone recognoscite
+  redirects:
+    prompt: Si tu te fide de iste ligamine, clicca lo pro continuar.
+    title: Tu va lassar %{instance}.
+  relationships:
+    activity: Activitate del conto
+    confirm_follow_selected_followers: Desira tu vermente remover le sequaces seligite?
+    confirm_remove_selected_followers: Desira tu vermente remover le sequaces seligite?
+    confirm_remove_selected_follows: Desira tu vermente remover le sequaces seligite?
+    dormant: Dormiente
+    follow_failure: Impossibile sequer alcun del contos seligite.
+    follow_selected_followers: Sequer le sequaces seligite
+    followers: Sequaces
+    following: Sequente
+    invited: Invitate
+    last_active: Ultimo active
+    most_recent: Plus recente
+    moved: Movite
+    mutual: Mutue
+    primary: Primari
+    relationship: Relation
+    remove_selected_domains: Remover tote le sequaces ab le dominios seligite
+    remove_selected_followers: Remover le sequaces seligite
+    remove_selected_follows: Non plus sequer le usatores seligite
+    status: Stato del conto
+  remote_follow:
+    missing_resource: Impossibile trovar le requirite re-adresse URL pro tu conto
+  reports:
+    errors:
+      invalid_rules: non referentia regulas valide
+  rss:
+    content_warning: 'Advertimento de contento:'
+    descriptions:
+      account: Messages public de @%{acct}
+      tag: 'Messages public plachettate #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tu ha excedite le limite de %{limit} messages programmate pro hodie
+    over_total_limit: Tu ha excedite le limite de %{limit} messages programmate
+    too_soon: Le data programmate debe esser in le futuro
+  self_destruct:
+    lead_html: Infortunatemente, <strong>%{domain}</strong> va clauder permanentemente. Si tu habeva un conto illac, tu non potera continuar a usar lo, ma tu pote ancora peter un salveguarda de tu datos.
+    title: Iste servitor va clauder
+  sessions:
+    activity: Ultime activitate
+    browser: Navigator
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Navigator incognite
+      huawei_browser: Huawei Browser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Navigator de Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      unknown_browser: Navigator Incognite
+      weibo: Weibo
+    current_session: Session actual
+    date: Data
+    description: "%{browser} sur %{platform}"
+    explanation: Il ha navigatores del web actualmente connexe a tu conto Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      kai_os: KaiOS
+      linux: Linux
+      mac: macOS
+      unknown_platform: Platteforma incognite
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Revocar
+    revoke_success: Session revocate con successo
+    title: Sessiones
+    view_authentication_history: Vider chronologia de authentication de tu conto
+  settings:
+    account: Conto
+    account_settings: Parametros de conto
+    aliases: Aliases de conto
+    appearance: Apparentia
+    authorized_apps: Apps autorisate
+    delete: Deletion de conto
+    development: Disveloppamento
+    edit_profile: Modificar profilo
+    featured_tags: Hashtags eminente
+    import: Importar
+    migrate: Migration de conto
+    notifications: Notificationes de e-mail
+    preferences: Preferentias
+    profile: Profilo public
+    relationships: Sequites e sequitores
+    strikes: Admonitiones de moderation
+  severed_relationships:
+    download: Discargar (%{count})
+    event_type:
+      account_suspension: Suspension del conto (%{target_name})
+      domain_block: Suspension del servitor (%{target_name})
+      user_domain_block: Tu ha blocate %{target_name}
+    preamble: Tu pote perder sequites e sequitores quando tu bloca un dominio o quando tu moderatores decide suspender un servitor remote. Quando isto occurre, tu potera discargar listas de relationes rumpite, a inspectar e eventualmente importar in un altere servitor.
+    type: Evento
+  statuses:
+    open_in_web: Aperir in le web
+    poll:
+      vote: Votar
+    show_more: Monstrar plus
+    visibilities:
+      direct: Directe
+      private_long: Solmente monstrar a sequitores
+      public: Public
   statuses_cleanup:
+    keep_pinned_hint: Non dele alcuno de tu messages appunctate
+    keep_polls: Mantener sondages
+    keep_polls_hint: Non dele ulle de tu sondages
+    keep_self_bookmark: Mantener messages que tu marcava con marcapaginas
+    keep_self_bookmark_hint: Non dele tu proprie messages si tu los ha marcate con marcapaginas
+    keep_self_fav: Mantene messages que tu favoriva
+    keep_self_fav_hint: Non dele tu proprie messages si tu los ha favorite
     min_age:
       '1209600': 2 septimanas
       '15778476': 6 menses
@@ -107,16 +1566,66 @@ ia:
       '604800': 1 septimana
       '63113904': 2 annos
       '7889238': 3 menses
+    min_age_label: Limine de etate
+  stream_entries:
+    sensitive_content: Contento sensibile
+  strikes:
+    errors:
+      too_late: Es troppo tarde pro facer appello contra iste admonition
   themes:
+    contrast: Mastodon (Alte contrasto)
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Clar)
+    system: Automatic (usar thema del systema)
   two_factor_authentication:
     add: Adder
     disable: Disactivar 2FA
+    edit: Modificar
+    generate_recovery_codes: Generar codices de recuperation
   user_mailer:
     appeal_approved:
-      action: Vader a tu conto
+      action: Parametros de conto
+      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite approbate. Tu conto ha de novo un bon reputation.
+    appeal_rejected:
+      explanation: Le appello contra le admonition contra tu conto del %{strike_date}, que tu ha submittite le %{appeal_date}, ha essite rejectate.
+    warning:
+      appeal: Submitter un appello
+      categories:
+        spam: Spam
+      subject:
+        disable: Tu conto %{acct} ha essite gelate
+        mark_statuses_as_sensitive: Tu messages sur %{acct} ha essite marcate como sensibile
+        none: Advertimento pro %{acct}
+        sensitive: Tu messages sur %{acct} essera marcate como sensibile a partir de ora
+        silence: Tu conto %{acct} ha essite limitate
+        suspend: Tu conto %{acct} ha essite suspendite
+      title:
+        delete_statuses: Messages removite
+        disable: Conto gelate
+        mark_statuses_as_sensitive: Messages marcate como sensibile
+        none: Advertimento
+        sensitive: Conto marcate como sensibile
+        silence: Conto limitate
+        suspend: Conto suspendite
     welcome:
+      apps_android_action: Obtene lo sur Google Play
+      apps_ios_action: Discargar sur le App Store
+      apps_step: Discarga nostre applicationes official.
+      apps_title: Applicationes de Mastodon
+      edit_profile_action: Personalisar
+      edit_profile_step: Impulsa tu interactiones con un profilo comprehensive.
+      edit_profile_title: Personalisar tu profilo
+      explanation: Ecce alcun consilios pro initiar
+      feature_action: Apprender plus
+      feature_audience_title: Crea tu auditorio in fiducia
+      feature_moderation_title: Moderation como deberea esser
+      follow_action: Sequer
+      post_title: Face tu prime message
+      share_action: Compartir
+      share_title: Compartir tu profilo de Mastodon
       subject: Benvenite in Mastodon
+  verification:
+    verified_links: Tu ligamines verificate
   webauthn_credentials:
+    add: Adder un nove clave de securitate
     delete: Deler
diff --git a/config/locales/id.yml b/config/locales/id.yml
index c231fea576..bee282fa83 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1257,7 +1257,6 @@ id:
   notifications:
     email_events: Event untuk notifikasi email
     email_events_hint: 'Pilih event yang ingin Anda terima notifikasinya:'
-    other_settings: Pengaturan notifikasi lain
   number:
     human:
       decimal_units:
@@ -1390,7 +1389,6 @@ id:
     import: Impor
     import_and_export: Impor dan ekspor
     migrate: Pemindahan akun
-    notifications: Notifikasi
     preferences: Pilihan
     profile: Profil
     relationships: Ikuti dan pengikut
@@ -1429,8 +1427,6 @@ id:
         other: "%{count} memilih"
       vote: Pilih
     show_more: Tampilkan selengkapnya
-    show_newer: Tampilkan lebih baru
-    show_older: Tampilkan lebih lama
     show_thread: Tampilkan utas
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1508,7 +1504,6 @@ id:
     webauthn: Kunci keamanan
   user_mailer:
     appeal_approved:
-      action: Ke akun Anda
       explanation: Banding peringatan terhadap akun Anda pada %{strike_date} yang Anda kirim pada %{appeal_date} telah disetujui. Akun Anda akan kembali ditandai sebagai akun bagus.
       subject: Banding Anda dari %{date} telah disetujui
       title: Banding disetujui
@@ -1517,7 +1512,6 @@ id:
       subject: Banding Anda dari %{date} telah ditolak
       title: Banding ditolak
     backup_ready:
-      explanation: Cadangan penuh akun Mastodon Anda sudah dapat diunduh!
       subject: Arsip Anda sudah siap diunduh
       title: Ambil arsip
     suspicious_sign_in:
@@ -1559,13 +1553,7 @@ id:
         silence: Akun dibatasi
         suspend: Akun ditangguhkan
     welcome:
-      edit_profile_action: Siapkan profil
-      edit_profile_step: Anda dapat mengubah profil Anda dengan mengunggah sebuah foto profil, mengubah nama tampilan Anda dan lain-lain. Anda dapat memilih untuk meninjau pengikut baru sebelum mereka diperbolehkan untuk mengikuti Anda.
       explanation: Beberapa tips sebelum Anda memulai
-      final_action: Mulai mengirim
-      final_step: 'Mulai mengirim! Bahkan tanpa pengikut, kiriman publik Anda dapat dilihat oleh orang lain, misalkan di linimasa lokal atau dalam tagar. Anda dapat memperkenalkan diri Anda dalam tagar #introductions.'
-      full_handle: Penanganan penuh Anda
-      full_handle_hint: Ini yang dapat Anda sampaikan kepada teman agar mereka dapat mengirim pesan atau mengikuti Anda dari server lain.
       subject: Selamat datang di Mastodon
       title: Selamat datang, %{name}!
   users:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c85e97b51d..473d7b750f 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -597,6 +597,9 @@ ie:
       actions_description_html: Decider quel action a far por soluer ti raporte. Si tu fa un punitiv action contra li raportat conto, li usator va reciver un notification per email, except in li casu que li <strong>Spam</strong> categorie es selectet.
       actions_description_remote_html: Decider quel action a far por soluer ti raporte. It va afecter solmen qualmen <strong>vor</strong> servitor comunica con ti lontan conto e tractar su contenete.
       add_to_report: Adjunter plu al raporte
+      already_suspended_badges:
+        local: Ja suspendet sur ti-ci servitor
+        remote: Ja suspendet sur su servitor
       are_you_sure: Es tu cert?
       assign_to_self: Assignar it a me
       assigned: Assignat moderator
@@ -748,6 +751,7 @@ ie:
         desc_html: To ci usa extern scrites de hCaptcha, quel posse esser ínquietant pro rasones de securitá e privatie. In plu, <strong>it posse far li processu de registration mult plu desfacil (particularimen por tis con deshabilitás)</strong>. Pro ti rasones, ples considerar alternativ mesuras, tales quam registration per aprobation o invitation.
         title: Exige que nov usatores solue un CAPTCHA por confirmar lor conto
       content_retention:
+        danger_zone: Zone de dangere
         preamble: Decider qualmen usator-generat contenete es inmagasinat in Mastodon.
         title: Retention de contenete
       default_noindex:
@@ -767,6 +771,7 @@ ie:
         disabled: A necun
         users: A local usatores qui ha initiat session
       registrations:
+        moderation_recommandation: Ples assecurar que tu have un equip de moderation quel es adequat e reactiv ante que tu aperte registrationes a omnes!
         preamble: Decider qui posse crear un conto che vor servitor.
         title: Registrationes
       registrations_mode:
@@ -774,6 +779,7 @@ ie:
           approved: Aprobation besonat por adhesion
           none: Nequi posse registrar se
           open: Quicunc posse registrar se
+        warning_hint: Noi recomanda usar "Aprobation besonat por inscrir" si tu ne es confident que tui equip de moderation posse gerer spam e maliciosi registrationes in un curt témpor.
       security:
         authorized_fetch: Postular autentication de federat servitores
         authorized_fetch_hint: Postular autentication de federat servitores possibilisa plu strict infortiament de ambi usatori e servitori bloccas. Támen, ti fórsan va limitar li potentie de vor servitor, reducter li atingement de vor responses, e possibilmen introducter problemas de compatibilitá con quelc federat servicies. Additionalmen, ti ne va preventer dedicat actores de accesser vor public postas e contos.
@@ -966,6 +972,9 @@ ie:
       title: Webcrocs
       webhook: Webcroc
   admin_mailer:
+    auto_close_registrations:
+      body: Pro un manca de recent activitá moderatori, registrationes sur %{instance} ha esset automaticmen changeat al mode quel besona un manual recension, por que %{instance} ne mey esser usat quam un platform por malfatores. Tu posse rechangear a apert registrationes quandecunc.
+      subject: Registrationes por %{instance} ha esset automaticmen changeat al mode quel besona aprobation
     new_appeal:
       actions:
         delete_statuses: deleter su postas
@@ -1490,7 +1499,6 @@ ie:
     administration_emails: Email-notificationes pri administration
     email_events: Evenimentes por email-notificationes
     email_events_hint: 'Selecte li evenimentes pri queles tu vole reciver notificationes:'
-    other_settings: Parametres pri altri notificationes
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ ie:
     errors:
       limit_reached: Límite de diferent reactiones atinget
       unrecognized_emoji: ne es un reconosset emoji
+  redirects:
+    prompt: Si tu fide ti ligament, clicca it por continuar.
+    title: Tu exea de %{instance}.
   relationships:
     activity: Activitá de conto
     confirm_follow_selected_followers: Esque tu vermen vole sequer selectet sequitores?
@@ -1608,6 +1619,7 @@ ie:
       unknown_browser: Ínconosset navigator
       weibo: Weibo
     current_session: Actual session
+    date: Date
     description: "%{browser} in %{platform}"
     explanation: Tis-ci es li navigatores queles actualmen ha initiat sessiones a tui Mastodon-conto.
     ip: IP
@@ -1644,14 +1656,26 @@ ie:
     import: Importar
     import_and_export: Importation e exportation
     migrate: Migration de conto
-    notifications: Notificationes
+    notifications: E-postal notificationes
     preferences: Preferenties
     profile: Public profil
     relationships: Sequetes e sequitores
+    severed_relationships: Detranchat relationes
     statuses_cleanup: Automatisat deletion de postas
     strikes: Admonimentes moderatori
     two_factor_authentication: 2-factor autentication
     webauthn_authentication: Claves de securitá
+  severed_relationships:
+    download: Descargar (%{count})
+    event_type:
+      account_suspension: Suspension del conto (%{target_name})
+      domain_block: Suspension del servitor (%{target_name})
+      user_domain_block: Tu bloccat %{target_name}
+    lost_followers: Perdit sequitores
+    lost_follows: Perdit sequetes
+    preamble: Tu posse perdir tis queles tu seque e tui sequitores quande tu blocca un domonia o quande tui moderatores decide suspender un lontan servitor. Tande, tu va posser descargar listes de dejuntet relationes, a inspecter e possibilmen importar sur un altri servitor.
+    purged: Information pri ti-ci servitor ha esset purgat per li administratores de tui servitor.
+    type: Eveniment
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ ie:
         other: "%{count} votes"
       vote: Votar
     show_more: Monstrar plu
-    show_newer: Monstrar plu nov
-    show_older: Monstrar plu old
     show_thread: Monstrar fil
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1747,6 +1769,7 @@ ie:
     contrast: Mastodon (Alt contraste)
     default: Mastodon (Obscur)
     mastodon-light: Mastodon (Luminosi)
+    system: Automatic (usar tema del sistema)
   time:
     formats:
       default: "%d.%m.%Y ye %H:%M"
@@ -1774,18 +1797,27 @@ ie:
     webauthn: Claves de securitá
   user_mailer:
     appeal_approved:
-      action: Ear a tui conto
+      action: Parametres del Conto
       explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset aprobat. Tui conto retorna a esser in bon statu.
       subject: Tui apelle de %{date} ha esset aprobat
+      subtitle: Tui conto denov es in bon statu.
       title: Apelle aprobat
     appeal_rejected:
       explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset rejectet.
       subject: Tui apelle de %{date} ha esset rejectet
+      subtitle: Tui apelle ha esset rejectet.
       title: Apelle rejectet
     backup_ready:
-      explanation: Tu solicitat un complet archive de tui Mastodon-conto. Nu it es pret por descargar!
+      explanation: Tu petit un complet archive de tui conto de Mastodon.
+      extra: It es ja pret a descargar!
       subject: Tui archive es pret por descargar
       title: Descargar archive
+    failed_2fa:
+      details: 'Vi li detallies del prova de intrar:'
+      explanation: Alqui provat accesser tui conto ma usat un ínvalid duesim factor de autentication.
+      further_actions_html: Si it ne esset tu, noi recomanda que tu strax %{action} nam li conto posse esser compromisset.
+      subject: Falliment de autentication de duesim factor
+      title: Fallit autentication de duesim factor
     suspicious_sign_in:
       change_password: changear tui passa-parol
       details: 'Vi li detallies del apertion de session:'
@@ -1825,13 +1857,44 @@ ie:
         silence: Conto limitat
         suspend: Conto suspendet
     welcome:
-      edit_profile_action: Configuration de profil
-      edit_profile_step: Tu posse personalisar tui profil por cargar un profil-image, changear tui monstrat nómine e plu. Tu posse optar tractar nov sequitores ante que ili es permisset sequer te.
+      apps_android_action: Obtener it sur Google Play
+      apps_ios_action: Descargar sur li App Store
+      apps_step: Descargar nor aplis oficial.
+      apps_title: Aplis de Mastodon
+      checklist_subtitle: 'Lass nos auxiliar te comensar sur ti-ci frontiera social:'
+      checklist_title: Lista de benevenit
+      edit_profile_action: Personalisar
+      edit_profile_step: Agranda tui interactiones per un profil detalliat.
+      edit_profile_title: Personalisar tui profil
       explanation: Vi quelc suggestiones por que tu mey comensar
-      final_action: Comensar postar
-      final_step: 'Comensa a postar! Mem sin sequitores, tui public postas posse esser videt de altres, per exemple in li local témpor-linea o in hashtags. Tu fórsan vole introducter te per li hashtag #introductions.'
-      full_handle: Tui plen usator-nómine
-      full_handle_hint: Ti-ci es ti quel tu vell dir a tui amics por que ili mey inviar missages a te o sequer te de un altri servitor.
+      feature_action: Aprender plu
+      feature_audience: Mastodon te da un possibilitá unic de administrar tui audientie sin intervenitores. Mastodon, desplegat che tui propri servitor, permisse que tu sequeye e esseye sequet de quelcunc altri Mastodon-servitores in li internet, e ne es controlat de quicunc quam tu.
+      feature_audience_title: Agrandar tui audientie in confidentie
+      feature_control: Tu save max bon ti quel tu vole vider sur tui initial témpor-linea. Null algoritmes o reclames por prodigar tui témpor. Seque quicunc che quelcunc Mastodon-servitor de un singul conto e recive lor postas in órdine cronologic, e fa que tui parte del internet esseye un poc plu quam tu.
+      feature_control_title: Resta in control de tui propri témpor-linea
+      feature_creativity: Mastodon permisse postas con audio, video e images, descriptiones de accessibilitá, avises de contenete, animat profil-images, personalisat emojis, control del acurtation de images de previse, a plu, por auxiliar te expresser te. Si tu publica tui art, tui musica, o tui podcast, Mastodon va apoyar te.
+      feature_creativity_title: Ínparalelat creativitá
+      feature_moderation: Mastodon retromette li potentie de far decisiones in tui manus. Chascun servitor crea su propri regules, queles es infortiat localmen e ne universalmen quam che social medies corporat, dunc it es li max flexibil pri responder al besones de diferent gruppes de gente. Adhere a un servitor con regules con queles tu concorda, o mantene tui propri.
+      feature_moderation_title: Moderandi moderation
+      follow_action: Sequer
+      follow_step: Sequer interessant gente es to quo importa in Mastodon.
+      follow_title: Personalisar tui hemal témpor-linea
+      follows_subtitle: Sequer famosi contos
+      follows_title: Persones a sequer
+      follows_view_more: Vider plu persones a sequer
+      hashtags_recent_count:
+        one: "%{people} person in li passat 2 dies"
+        other: "%{people} persones in li passat 2 dies"
+      hashtags_subtitle: Explorar li postas de tendentie durant li passat 2 dies
+      hashtags_title: Populari hashtags
+      hashtags_view_more: Vider plu hashtags in tendentie
+      post_action: Composir
+      post_step: Saluta li munde con textu, images, videos o balotationes.
+      post_title: Crear tui unesim posta
+      share_action: Compartir
+      share_step: Informar tui amics qualmen trovar te che Mastodon.
+      share_title: Partir tui profil Mastodon
+      sign_in_action: Intrar
       subject: Benevenit a Mastodon
       title: Benevenit, %{name}!
   users:
@@ -1839,6 +1902,7 @@ ie:
     go_to_sso_account_settings: Ear al parametres de conto de tui provisor de identification
     invalid_otp_token: Ínvalid 2-factor code
     otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email}
+    rate_limited: Tro mult de provas de autentication, ples provar denov plu tard.
     seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
     signed_in_as: 'Session apertet quam:'
   verification:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index eb5fcc709d..ed0d0d6345 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1472,7 +1472,6 @@ io:
     administration_emails: Jerala retpostonotifiki
     email_events: Eventi por retpostoavizi
     email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
-    other_settings: Altra avizopcioni
   number:
     human:
       decimal_units:
@@ -1622,7 +1621,6 @@ io:
     import: Importacar
     import_and_export: Importaco e exportaco
     migrate: Kontomigro
-    notifications: Avizi
     preferences: Preferi
     profile: Profilo
     relationships: Sequati e sequanti
@@ -1667,8 +1665,6 @@ io:
         other: "%{count} voti"
       vote: Votez
     show_more: Montrar plue
-    show_newer: Montrez plu nova kozo
-    show_older: Montrez plu olda kozo
     show_thread: Montrez postaro
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,7 +1743,6 @@ io:
     webauthn: Sekuresklefi
   user_mailer:
     appeal_approved:
-      action: Irez a vua konto
       explanation: Apelo di streko kontre vua konto en %{strike_date} quale vu sendis en %{appeal_date} aprobesis. Vua konto itere standas bone.
       subject: Vua apelo de %{date} aprobesis
       title: Apelo aprobesis
@@ -1756,7 +1751,6 @@ io:
       subject: Vua apelo de %{date} refuzesis
       title: Apelo refuzesis
     backup_ready:
-      explanation: Vu demandis kompleta kopiur di vua konto di Mastodon. Ol esas nun pronte deschargebla!
       subject: Vua arkivo pronte deschargebla
       title: Arkivekpreno
     suspicious_sign_in:
@@ -1798,13 +1792,7 @@ io:
         silence: Konto limitizesis
         suspend: Konto restriktigesis
     welcome:
-      edit_profile_action: Facez profilo
-      edit_profile_step: Vu povas kustumizar vua profilo per adchargar profilimajo, chanjesar vua montronomo e plue. Vu povas selektas kontrolar nova sequanti ante oli permisesas sequar vu.
       explanation: Subo esas guidilo por helpar vu komencar
-      final_action: Komencez postigar
-      final_step: 'Jus postigez! Mem sen sequanti, vua publika posti povas videsar da altra personi, exemplo es en lokala tempolineo e en hashtagi. Vu povas anke introduktar su en #introductions hashtagi.'
-      full_handle: Vua kompleta profilnomo
-      full_handle_hint: Co esas quon vu dicos a amiki por ke oli povas mesajigar o sequar vu de altra servilo.
       subject: Bonveno a Mastodon
       title: Bonveno, %{name}!
   users:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7083a226dd..2eeba976bc 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -597,6 +597,9 @@ is:
       actions_description_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Ef þú ákveður að refsa kærða notandaaðgangnum, verður viðkomandi send tilkynning í tölvupósti, nema ef flokkurinn <strong>Ruslpóstur</strong> sé valinn.
       actions_description_remote_html: Ákveddu til hvaða aðgerða eigi að taka til að leysa þessa kæru. Þetta mun aðeins hafa áhrif á hvernig <strong>netþjónninn þinn</strong> meðhöndlar þennan fjartengda aðgang og efnið á honum.
       add_to_report: Bæta fleiru í kæru
+      already_suspended_badges:
+        local: Þegar frystur á þessum netþjóni
+        remote: Þegar frystur á hinum netþjóninum
       are_you_sure: Ertu viss?
       assign_to_self: Úthluta mér
       assigned: Úthlutaður umsjónarmaður
@@ -750,6 +753,7 @@ is:
           Aukinheldur <strong> gæti þetta gert nýskráningarferlið óaðgengilegra sumum (sérstaklega fyrir fatlaða)</strong>. Þess vegna er rétt að skoða aðra valmöguleika svo sem nýskráningar háðar samþykki eða boði.
         title: Nýir notendur munu þurfa að standast Turing skynpróf til að staðfesta notendaaðganginn
       content_retention:
+        danger_zone: Hættusvæði
         preamble: Stýrðu hvernig efni frá notendum sé geymt í Mastodon.
         title: Geymsla efnis
       default_noindex:
@@ -769,6 +773,7 @@ is:
         disabled: Til engra
         users: Til innskráðra staðværra notenda
       registrations:
+        moderation_recommandation: Tryggðu að þú hafir hæft og aðgengilegt umsjónarteymi til taks áður en þú opnar á skráningar fyrir alla!
         preamble: Stýrðu því hverjir geta útbúið notandaaðgang á netþjóninum þínum.
         title: Nýskráningar
       registrations_mode:
@@ -776,6 +781,7 @@ is:
           approved: Krafist er samþykkt nýskráningar
           none: Enginn getur nýskráð sig
           open: Allir geta nýskráð sig
+        warning_hint: Við mælum með því að nota "Krafist er samþykkt nýskráningar" nema ef þú sért viss um að umsjónarteymið þitt geti brugðist tímanlega við ruslpósti og skráningum í misjöfnum tilgangi.
       security:
         authorized_fetch: Krefjast auðkenningar frá netþjónum í skýjasambandi
         authorized_fetch_hint: Að krefjast auðkenningar frá netþjónum í skýjasambandi kallar fram strangari útfærslu á útilokunum, bæði varðandi notendur og netþjóna. Hins vegar kemur þetta niður á afköstum, minnkar útbreiðslu á svörum þínum og gæti valdið samhæfnivandamálum við sumar sambandsþjónustur. Að auki kemur þetta ekki í veg fyrir að aðilar sem ætla sér að ná í opinberar færslur og notendaaðganga frá þér geri það.
@@ -968,6 +974,9 @@ is:
       title: Webhook-vefkrækjur
       webhook: Webhook-vefkrækja
   admin_mailer:
+    auto_close_registrations:
+      body: Vegna skorts á virkni umsjónaraðila að undanförnu, hafa nýskráningar á %{instance} sjálfkrafa verið stilltar á að þarfnast samþykktar umsjónaraðila, til að koma í veg fyrir að %{instance} verði mögulega misnotað af óprúttnum aðilum. Þú getur skipt hvenær sem er aftur yfir í opnar nýskráningar.
+      subject: Nýskráningar á %{instance} hafa sjálfkrafa verið stilltar á að krefjast samþykktar
     new_appeal:
       actions:
         delete_statuses: að eyða færslum viðkomandi
@@ -1494,7 +1503,6 @@ is:
     administration_emails: Kerfisstjórnunartilkynningar í tölvupósti
     email_events: Atburðir fyrir tilkynningar í tölvupósti
     email_events_hint: 'Veldu þá atburði sem þú vilt fá tilkynningar í tölvupósti þegar þeir koma upp:'
-    other_settings: Aðrar stillingar varðandi tilkynningar
   number:
     human:
       decimal_units:
@@ -1550,6 +1558,9 @@ is:
     errors:
       limit_reached: Hámarki mismunandi viðbragða náð
       unrecognized_emoji: er ekki þekkt tjáningartákn
+  redirects:
+    prompt: Ef þú treystir þessum tengli, geturðu smellt á hann til að halda áfram.
+    title: Þú ert að yfirgefa %{instance}.
   relationships:
     activity: Virkni aðgangs
     confirm_follow_selected_followers: Ertu viss um að þú viljir fylgjast með völdum fylgjendum?
@@ -1612,6 +1623,7 @@ is:
       unknown_browser: Óþekktur vafri
       weibo: Weibo
     current_session: Núverandi seta
+    date: Dagsetning
     description: "%{browser} á %{platform}"
     explanation: Þetta eru vafrarnir sem núna eru skráðir inn á Mastodon-aðganginn þinn.
     ip: IP-vistfang
@@ -1648,14 +1660,26 @@ is:
     import: Flytja inn
     import_and_export: Inn- og útflutningur
     migrate: Yfirfærsla notandaaðgangs
-    notifications: Tilkynningar
+    notifications: Tilkynningar í tölvupósti
     preferences: Kjörstillingar
     profile: Notandasnið
     relationships: Fylgist með og fylgjendur
+    severed_relationships: Rofin tengsl
     statuses_cleanup: Sjálfvirk eyðing færslna
     strikes: Umsýsla refsinga
     two_factor_authentication: Tveggja-þátta auðkenning
     webauthn_authentication: Öryggislyklar
+  severed_relationships:
+    download: Sækja (%{count})
+    event_type:
+      account_suspension: Frysting notandaaðgangsins (%{target_name})
+      domain_block: Frysting netþjónsins (%{target_name})
+      user_domain_block: Þú útilokaðir %{target_name}
+    lost_followers: Tapaðir fylgjendur
+    lost_follows: Tapað sem þú fylgist með
+    preamble: Þú gætir misst einhverja sem þú fylgist með og eins fylgjendur þegar þú útilokar lén eða þegar umsjónarmenn netþjónsins þíns ákveða að frysta fjartengdan netþjón. Þegar slíkt gerist, geturðu sótt lista yfir slík skemmd tengsl, til að yfirfara og mögulega flytja inn á öðrum netþjóni.
+    purged: Upplýsingum um þennan netþjón hefur verið eytt af stjórnendum netþjónsins þíns.
+    type: Atburður
   statuses:
     attached:
       audio:
@@ -1693,8 +1717,6 @@ is:
         other: "%{count} atkvæði"
       vote: Greiða atkvæði
     show_more: Sýna meira
-    show_newer: Sýna nýrri
-    show_older: Sýna eldri
     show_thread: Birta þráð
     title: "%{name}: „%{quote}‟"
     visibilities:
@@ -1751,6 +1773,7 @@ is:
     contrast: Mastodon (mikil birtuskil)
     default: Mastodon (dökkt)
     mastodon-light: Mastodon (ljóst)
+    system: Sjálfvirkt (nota þema kerfis)
   time:
     formats:
       default: "%d. %b, %Y, %H:%M"
@@ -1778,18 +1801,27 @@ is:
     webauthn: Öryggislyklar
   user_mailer:
     appeal_approved:
-      action: Farðu inn á notandaaðganginn þinn
+      action: Stillingar notandaaðgangs
       explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið samþykkt. Notandaaðgangurinn þinn er aftur í góðu lagi.
       subject: Áfrýjun þín frá %{date} hefur verið samþykkt
+      subtitle: Notandaaðgangurinn þinn er í góðu lagi.
       title: Áfrýjun samþykkt
     appeal_rejected:
       explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið hafnað.
       subject: Áfrýjun þinni frá %{date} hefur verið hafnað
+      subtitle: Áfrýjun þinni hefur verið hafnað.
       title: Áfrýjun hafnað
     backup_ready:
-      explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum. Það er núna tilbúið til niðurhals!
+      explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum.
+      extra: Það er núna tilbúið til niðurhals!
       subject: Safnskráin þín er tilbúin til niðurhals
       title: Taka út í safnskrá
+    failed_2fa:
+      details: 'Hér eru nánari upplýsingar um innskráningartilraunina:'
+      explanation: Einhver reyndi að skrá sig inn á aðganginn þinn en gaf upp ógild gögn seinna þrepi auðkenningar.
+      further_actions_html: Ef þetta varst ekki þú, þá mælum við eindregið með því að þú %{action} samstundis, þar sem það gæti verið berskjaldað.
+      subject: Bilun í seinna þrepi auðkenningar
+      title: Seinna þrep auðkenningar brást
     suspicious_sign_in:
       change_password: breytir lykilorðinu þínu
       details: 'Hér eru nánari upplýsingar um innskráninguna:'
@@ -1829,13 +1861,44 @@ is:
         silence: Notandaaðgangur takmarkaður
         suspend: Notandaaðgangur í frysti
     welcome:
-      edit_profile_action: Setja upp notandasnið
-      edit_profile_step: Þú getur sérsniðið notandasniðið þitt með því að setja inn auðkennismynd þína, breyta birtingarnafninu þínu og ýmislegt fleira. Þú getur valið að yfirfara nýja fylgjendur áður en þú leyfir þeim að fylgjast með þér.
+      apps_android_action: Fáðu það á Google Play
+      apps_ios_action: Sækja í App Store
+      apps_step: Sæktu opinberu forritin okkar.
+      apps_title: Mastodon-forrit
+      checklist_subtitle: 'Komum þér í gang á þessum nýja samfélagsmiðli:'
+      checklist_title: Til minnis í upphafi
+      edit_profile_action: Sérsníða
+      edit_profile_step: Annað fólk er líklegra til að eiga samskipti við þig ef þý setur einhverjar áhugaverðar upplýsingar í notandasniðið þitt.
+      edit_profile_title: Sérsníddu notandasniðið þitt
       explanation: Hér eru nokkrar ábendingar til að koma þér í gang
-      final_action: Byrjaðu að skrifa
-      final_step: 'Byrjaðu að tjá þig! Jafnvel án fylgjenda geta aðrir séð opinberar færslur frá þér, til dæmis á staðværu tímalínunni eða í myllumerkjum. Þú gætir jafnvel viljað kynna þig á myllumerkinu #introductions.'
-      full_handle: Fullt auðkenni þitt
-      full_handle_hint: Þetta er það sem þú myndir gefa upp við vini þína svo þeir geti sent þér skilaboð eða fylgst með þér af öðrum netþjóni.
+      feature_action: Kanna nánar
+      feature_audience: Mastodon gefur þér einstakt tækifæri til að eiga í samskiptum við áhorfendur þína milliliðalaust. Mastodon-netþjónn sem settur er upp á þínu eigin kerfi er ekki undir neins stjórn nema þinnar og gerir þér kleift að fylgjast með og eiga fylgjendur á hverjum þeim Mastodon-netþjóni sem er tengdur við internetið.
+      feature_audience_title: Byggðu upp orðspor þitt og áheyrendafjölda
+      feature_control: Þú veist best hvað þú vilt sjá í heimastreyminu þínu. Engin reiknirit eða auglýsingar að þvælast fyrir. Fylgstu af einum aðgangi með hverjum sem er á milli Mastodon-netþjóna og fáðu færslurnar þeirra í tímaröð, þannig geturðu útbúið þitt eigið lítið horn á internetinu þar sem hlutirnir eru að þínu skapi.
+      feature_control_title: Hafðu stjórn á þinni eigin tímalínu
+      feature_creativity: Mastodon styður færslur með hljóði, myndum og myndskeiðum, lýsingum fyrir aukið aðgengi, kannanir, aðvörunum vegna efnis, hreyanlegum auðkennismyndum, sérsniðnum tjáningartáknum, utanskurði smámynda ásamt fleiru; til að hjálpa þér við að tjá þig á netinu. Hvort sem þú sért að gefa út listina þína, tónlist eða hlaðvarp, þá er Mastodon til staðar fyrir þig.
+      feature_creativity_title: Óviðjafnanleg sköpunargleði
+      feature_moderation: Mastodon setur ákvarðanatökur aftur í þínar hendur. Hver netþjónn býr til sínar eigin reglur og venjur, sem gilda fyrir þann netþjón en eru ekki boðaðar með valdi að ofan og niður líkt og á samfélagsnetum stórfyrirtækja. Á þennan hátt svarar samfélagsmiðillinn þörfum mismunandi hópa. Taktu þátt á netþjóni með reglum sem þú samþykkir, eða hýstu þinn eigin.
+      feature_moderation_title: Umsjón með efni eins og slík á að vera
+      follow_action: Fylgjast með
+      follow_step: Að fylgjast með áhugaverðu fólki er það sem Mastodon snýst um.
+      follow_title: Aðlagaðu heimastreymið þitt eftir þínu höfði
+      follows_subtitle: Fylgstu með vel þekktum notendum
+      follows_title: Hverjum ætti að fylgjast með
+      follows_view_more: Skoða fleira fólk til að fylgjast með
+      hashtags_recent_count:
+        one: "%{people} aðili síðustu 2 daga"
+        other: "%{people} manns á síðustu 2 dögum"
+      hashtags_subtitle: Skoðaðu hvað sé búið að vera í umræðunni síðustu 2 dagana
+      hashtags_title: Vinsæl myllumerki
+      hashtags_view_more: Sjá fleiri vinsæl myllumerki
+      post_action: Skrifa
+      post_step: Heilsaðu heiminum með texta, ljósmyndum, myndskeiðum eða könnunum.
+      post_title: Gerðu fyrstu færsluna þína
+      share_action: Deila
+      share_step: Láttu vini þína vita hvernig þeir geta fundið þig á Mastodon.
+      share_title: Deildu notandasniðinu þínu
+      sign_in_action: Skrá inn
       subject: Velkomin í Mastodon
       title: Velkomin/n um borð, %{name}!
   users:
@@ -1843,6 +1906,7 @@ is:
     go_to_sso_account_settings: Fara í stillingar aðgangsins hjá auðkennisveitunni þinni
     invalid_otp_token: Ógildur tveggja-þátta kóði
     otp_lost_help_html: Ef þú hefur misst aðganginn að hvoru tveggja, geturðu sett þig í samband við %{email}
+    rate_limited: Of margar tilraunir til auðkenningar, prófaðu aftur síðar.
     seamless_external_login: Innskráning þín er í gegnum utanaðkomandi þjónustu, þannig að stillingar fyrir lykilorð og tölvupóst eru ekki aðgengilegar.
     signed_in_as: 'Skráð inn sem:'
   verification:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 16b327f3e1..bda681ac08 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -597,6 +597,9 @@ it:
       actions_description_html: Decidete quali azioni intraprendere per risolvere la segnalazione. Se si intraprende un'azione punitiva contro l'account segnalato, gli sarà inviata una notifica via e-mail, tranne quando è selezionata la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decide quali azioni intraprendere per risolvere la relazione. Questo influenzerà solo come <strong>il tuo</strong> server comunica con questo account remoto e ne gestisce il contenuto.
       add_to_report: Aggiungi altro al report
+      already_suspended_badges:
+        local: Già sospeso su questo server
+        remote: Già sospeso sul loro server
       are_you_sure: Sei sicuro?
       assign_to_self: Assegna a me
       assigned: Moderatore assegnato
@@ -748,6 +751,7 @@ it:
         desc_html: Questo si basa su script esterni da hCaptcha, che possono rappresentare un problema di sicurezza e privacy. Inoltre, <strong>questo può rendere il processo di registrazione significativamente meno accessibile ad alcune persone (soprattutto disabili)</strong>. Per questi motivi, prendi in considerazione misure alternative come la registrazione basata su approvazione o su invito.
         title: Richiedi ai nuovi utenti di risolvere un CAPTCHA per confermare il loro account
       content_retention:
+        danger_zone: Zona pericolosa
         preamble: Controlla come vengono memorizzati i contenuti generati dall'utente in Mastodon.
         title: Conservazione dei contenuti
       default_noindex:
@@ -767,6 +771,7 @@ it:
         disabled: A nessuno
         users: Agli utenti locali connessi
       registrations:
+        moderation_recommandation: Assicurati di avere un team di moderazione adeguato e reattivo prima di aprire le registrazioni a tutti!
         preamble: Controlla chi può creare un account sul tuo server.
         title: Registrazioni
       registrations_mode:
@@ -774,6 +779,7 @@ it:
           approved: Approvazione richiesta per le iscrizioni
           none: Nessuno può iscriversi
           open: Chiunque può iscriversi
+        warning_hint: Ti consigliamo di utilizzare “Approvazione richiesta per la registrazione” a meno che tu non sia sicuro che il tuo team di moderazione possa gestire lo spam e le registrazioni dannose in modo tempestivo.
       security:
         authorized_fetch: Richiede l'autenticazione dai server federati
         authorized_fetch_hint: La richiesta di autenticazione da server federati consente un'applicazione più rigorosa dei blocchi sia a livello di utente che a livello di server. Tuttavia, ciò comporta una riduzione delle prestazioni, riduce la portata delle tue risposte e potrebbe introdurre problemi di compatibilità con alcuni servizi federati. Inoltre, ciò non impedirà agli attori dedicati di recuperare i tuoi post pubblici e account.
@@ -966,6 +972,9 @@ it:
       title: Webhook
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: A causa della mancanza di attività recente da parte dei moderatori, le registrazioni su %{instance} sono passate automaticamente alla richiesta di revisione manuale, per evitare che %{instance} venga utilizzata come piattaforma per potenziali malintenzionati. Puoi ripristinarlo per aprire le registrazioni in qualsiasi momento.
+      subject: Le registrazioni per %{instance} sono passate automaticamente alla richiesta di approvazione
     new_appeal:
       actions:
         delete_statuses: per cancellare i loro post
@@ -1226,7 +1235,7 @@ it:
     bookmarks: Segnalibri
     csv: CSV
     domain_blocks: Blocchi di dominio
-    lists: Liste
+    lists: Elenchi
     mutes: Stai silenziando
     storage: Archiviazione media
   featured_tags:
@@ -1492,7 +1501,6 @@ it:
     administration_emails: Notifiche email amministratore
     email_events: Eventi per notifiche via email
     email_events_hint: 'Seleziona gli eventi per i quali vuoi ricevere le notifiche:'
-    other_settings: Altre impostazioni delle notifiche
   number:
     human:
       decimal_units:
@@ -1548,6 +1556,9 @@ it:
     errors:
       limit_reached: Raggiunto il limite di reazioni diverse
       unrecognized_emoji: non è un emoji riconosciuto
+  redirects:
+    prompt: Se ti fidi di questo collegamento, fai clic su di esso per continuare.
+    title: Stai lasciando %{instance}.
   relationships:
     activity: Attività dell'account
     confirm_follow_selected_followers: Sei sicuro di voler seguire i follower selezionati?
@@ -1610,6 +1621,7 @@ it:
       unknown_browser: Browser sconosciuto
       weibo: Weibo
     current_session: Sessione corrente
+    date: Data
     description: "%{browser} su %{platform}"
     explanation: Questi sono i browser da cui attualmente è avvenuto l'accesso al tuo account Mastodon.
     ip: IP
@@ -1646,14 +1658,26 @@ it:
     import: Importa
     import_and_export: Importa ed esporta
     migrate: Migrazione dell'account
-    notifications: Notifiche
+    notifications: Notifiche e-mail
     preferences: Preferenze
     profile: Profilo
     relationships: Follows e followers
+    severed_relationships: Relazioni interrotte
     statuses_cleanup: Cancellazione automatica dei post
     strikes: Sanzioni di moderazione
     two_factor_authentication: Autenticazione a due fattori
     webauthn_authentication: Chiavi di sicurezza
+  severed_relationships:
+    download: Scarica (%{count})
+    event_type:
+      account_suspension: Sospensione dell'account (%{target_name})
+      domain_block: Sospensione del server (%{target_name})
+      user_domain_block: Hai bloccato %{target_name}
+    lost_followers: Seguaci persi
+    lost_follows: Account seguiti persi
+    preamble: Potresti perdere account seguiti e seguaci quando blocchi un dominio o quando i tuoi moderatori decidono di sospendere un server remoto. Quando ciò accadrà, potrai scaricare liste di relazioni interrotte, da consultare ed eventualmente importare su un altro server.
+    purged: Le informazioni su questo server sono state eliminate dagli amministratori del tuo server.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1691,8 +1715,6 @@ it:
         other: "%{count} voti"
       vote: Vota
     show_more: Mostra di più
-    show_newer: Mostra più nuovi
-    show_older: Mostra più vecchi
     show_thread: Mostra thread
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1749,6 +1771,7 @@ it:
     contrast: Mastodon (contrasto elevato)
     default: Mastodon (scuro)
     mastodon-light: Mastodon (chiaro)
+    system: Automatico (usa il tema di sistema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1776,18 +1799,27 @@ it:
     webauthn: Chiavi di sicurezza
   user_mailer:
     appeal_approved:
-      action: Vai al tuo account
+      action: Impostazioni account
       explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato approvato. Il tuo account ha riottenuto la buona reputazione.
       subject: Il tuo appello del %{date} è stato approvato
+      subtitle: Il tuo account è ancora una volta in buona posizione.
       title: Appello approvato
     appeal_rejected:
       explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato respinto.
       subject: Il tuo appello del %{date} è stato respinto
+      subtitle: Il tuo appello è stato respinto.
       title: Appello respinto
     backup_ready:
-      explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato!
+      explanation: Hai richiesto un backup completo del tuo account Mastodon.
+      extra: Ora è pronto per il download!
       subject: Il tuo archivio è pronto per essere scaricato
       title: Esportazione archivio
+    failed_2fa:
+      details: 'Questi sono i dettagli del tentativo di accesso:'
+      explanation: Qualcuno ha tentato di accedere al tuo account ma ha fornito un secondo fattore di autenticazione non valido.
+      further_actions_html: Se non eri tu, ti consigliamo di %{action} immediatamente poiché potrebbe essere compromesso.
+      subject: Errore di autenticazione del secondo fattore
+      title: Autenticazione del secondo fattore non riuscita
     suspicious_sign_in:
       change_password: cambiare la tua password
       details: 'Questi sono i dettagli del tentativo di accesso:'
@@ -1827,13 +1859,44 @@ it:
         silence: Account limitato
         suspend: Account sospeso
     welcome:
-      edit_profile_action: Configura profilo
-      edit_profile_step: Puoi personalizzare il tuo profilo caricando un'immagine del profilo, cambiare il tuo nome e altro ancora. Puoi scegliere di esaminare i nuovi seguaci prima che loro siano autorizzati a seguirti.
+      apps_android_action: Scaricalo da Google Play
+      apps_ios_action: Scarica dall'App Store
+      apps_step: Scarica le nostre app ufficiali.
+      apps_title: App di Mastodon
+      checklist_subtitle: 'Iniziamo su questa nuova frontiera sociale:'
+      checklist_title: Lista di controllo di Benvenuto
+      edit_profile_action: Personalizza
+      edit_profile_step: Gli altri hanno maggiori probabilità di interagire con te se completi il tuo profilo.
+      edit_profile_title: Personalizza il tuo profilo
       explanation: Ecco alcuni suggerimenti per iniziare
-      final_action: Inizia a pubblicare
-      final_step: 'Inizia a pubblicare! Anche senza seguaci, i tuoi post pubblici possono essere visti da altri, ad esempio sulla timeline locale o negli hashtag. Potresti presentarti con l''hashtag #presentazione.'
-      full_handle: Il tuo nome utente completo
-      full_handle_hint: Questo è ciò che diresti ai tuoi amici in modo che possano seguirti o contattarti da un altro server.
+      feature_action: Scopri di più
+      feature_audience: Mastodon ti offre una possibilità unica di gestire il tuo pubblico senza intermediari. Mastodon, distribuito sulla tua stessa infrastruttura, ti permette di seguire e di essere seguito da qualsiasi altro server Mastodon online, e non è controllato da nessun altro, eccetto te.
+      feature_audience_title: Costruisci il tuo pubblico in sicurezza
+      feature_control: Tu sai cosa sia meglio vedere sul tuo home feed. Nessun algoritmo o annunci che sprechino il tuo tempo. Segui chiunque attraverso qualsiasi server Mastodon da un singolo account e ricevi i loro messaggi in ordine cronologico, e rendi il tuo angolo di internet un po' più come te.
+      feature_control_title: Rimani in controllo della tua timeline
+      feature_creativity: Mastodon supporta audio, filmati e post, descrizioni di accessibilità, sondaggi, avvisi di contenuto, avatar animati, emoji personalizzate, controllo del ritaglio delle miniature e altro ancora, per aiutarti a esprimerti online. Che tu stia pubblicando la tua arte, la tua musica o il tuo podcast, Mastodon è lì per te.
+      feature_creativity_title: Creatività senza precedenti
+      feature_moderation: Mastodon rimette il processo decisionale nelle tue mani. Ogni server crea le proprie regole che vengono applicate localmente e non dall'alto verso il basso come i social media aziendali, rendendo più flessibile il rispondere alle esigenze di diversi gruppi di persone. Unisciti a un server con regole con cui sei d'accordo o ospita il tuo.
+      feature_moderation_title: Moderazione come dovrebbe essere
+      follow_action: Segui
+      follow_step: Seguire persone interessanti è ciò che fa Mastodon.
+      follow_title: Personalizza il tuo home feed
+      follows_subtitle: Segui account ben noti
+      follows_title: Chi seguire
+      follows_view_more: Visualizza più persone da seguire
+      hashtags_recent_count:
+        one: "%{people} persona negli ultimi 2 giorni"
+        other: "%{people} persone negli ultimi 2 giorni"
+      hashtags_subtitle: Esplora le tendenze degli ultimi 2 giorni
+      hashtags_title: Hashtag di tendenza
+      hashtags_view_more: Visualizza altri hashtag di tendenza
+      post_action: Scrivi
+      post_step: Salutate il mondo con testo, foto, video o sondaggi.
+      post_title: Scrivi il tuo primo post
+      share_action: Condividi
+      share_step: Fai sapere ai tuoi amici come trovarti su Mastodon.
+      share_title: Condividi il tuo profilo Mastodon
+      sign_in_action: Accedi
       subject: Benvenuto/a su Mastodon
       title: Benvenuto a bordo, %{name}!
   users:
@@ -1841,6 +1904,7 @@ it:
     go_to_sso_account_settings: Vai alle impostazioni dell'account del tuo provider di identità
     invalid_otp_token: Codice d'accesso non valido
     otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
+    rate_limited: Troppi tentativi di autenticazione, per favore riprova più tardi.
     seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
     signed_in_as: 'Hai effettuato l''accesso come:'
   verification:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 97ec886112..4ed8521220 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -31,6 +31,8 @@ ja:
     accounts:
       add_email_domain_block: メールドメインブロックに追加
       approve: 承認
+      approve_domain: ドメインを承認
+      approve_remote: リモートアカウントを承認
       approved_msg: "%{username}さんの登録申請を承認しました"
       are_you_sure: 本当に実行しますか？
       avatar: アイコン
@@ -91,6 +93,7 @@ ja:
         all: すべて
         disabled: 無効化済み
         pending: 承認待ち
+        remote_pending: 承認待ち (リモート)
         silenced: 制限
         suspended: 停止済み
         title: モデレーション
@@ -113,7 +116,9 @@ ja:
       redownload: プロフィールを更新
       redownloaded_msg: "%{username}のプロフィールを正常に更新しました"
       reject: 却下
+      reject_remote: リモートアカウントを却下
       rejected_msg: "%{username}さんの登録申請を却下しました"
+      remote_pending_hint_html: このアカウントは現在保留中で、一時的にサスペンド状態になっています。このサーバーで利用可能にするためには、アカウントを承認する必要があります。
       remote_suspension_irreversible: このアカウントのデータは不可逆的に削除されました。
       remote_suspension_reversible_hint_html: このアカウントは停止されており、データは%{date} 日で完全に削除されます。それまでは悪影響なしにアカウントを復旧させることができます。アカウントを即座に削除したい場合は、以下から行うことができます。
       remove_avatar: アイコンを削除
@@ -168,6 +173,7 @@ ja:
     action_logs:
       action_types:
         approve_appeal: 抗議を承認
+        approve_remote_account: リモートアカウントの承認
         approve_user: ユーザーの承認
         assigned_to_self_report: 通報の担当者に設定
         change_email_user: ユーザーのメールアドレスを変更
@@ -202,9 +208,12 @@ ja:
         enable_custom_emoji: カスタム絵文字を有効化
         enable_sign_in_token_auth_user: メールトークンのユーザー認証を有効にする
         enable_user: ユーザーを有効化
+        force_cw_status: 投稿に警告文を追加
+        force_sensitive_status: 投稿を閲覧注意に変更
         memorialize_account: 追悼アカウント化
         promote_user: ユーザーを昇格
         reject_appeal: 抗議を却下
+        reject_remote_account: リモートアカウントを拒否
         reject_user: ユーザーを拒否
         remove_avatar_user: アイコンを削除
         reopen_report: 未解決に戻す
@@ -227,6 +236,7 @@ ja:
         update_user_role: ロールを更新
       actions:
         approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました"
+        approve_remote_account_html: "%{name}さんが%{target}さんの参加を承認しました"
         approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
         assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
         change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました"
@@ -261,11 +271,17 @@ ja:
         enable_custom_emoji_html: "%{name}さんがカスタム絵文字 %{target}を有効化しました"
         enable_sign_in_token_auth_user_html: "%{name}さんが%{target}さんのメールトークン認証を有効にしました"
         enable_user_html: "%{name}さんが%{target}さんのログインを有効化しました"
+        force_cw_status_html: "%{name}さんが%{target}さんの投稿を強制的にCWにしました"
+        force_sensitive_status_html: "%{name}さんが%{target}さんの投稿を強制的に閲覧注意にしました"
         memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました"
         promote_user_html: "%{name}さんが%{target}さんを昇格しました"
         reject_appeal_html: "%{name}さんが%{target}からの抗議を却下しました"
+        reject_remote_account_html: "%{name}さんが%{target}さんの参加を却下しました"
         reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました"
         remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました"
+        remove_history_status_html: "%{name}さんが%{target}さんの投稿の編集履歴を削除しました"
+        remove_media_status_html: "%{name}さんが%{target}さんの投稿のメディアを削除しました"
+        remove_status_status_html: "%{name}さんが%{target}さんの投稿を削除しました"
         reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
         resend_user_html: "%{name}さんが%{target}の確認メールを再送信しました"
         reset_password_user_html: "%{name}さんが%{target}さんのパスワードをリセットしました"
@@ -308,6 +324,8 @@ ja:
       updated_msg: お知らせを更新しました
     critical_update_pending: 重要な更新が保留中です
     custom_emojis:
+      aliases: エイリアス名
+      aliases_hint: 絵文字ピッカー内で検索する際、ショートコードだけでなくエイリアス名でも検索できます。「,」（カンマ）で区切ることで、複数指定が可能です。
       assign_category: カテゴリーを割り当て
       by_domain: ドメイン
       copied_msg: 絵文字のコピーをローカルに作成しました
@@ -320,11 +338,17 @@ ja:
       disable: 無効化
       disabled: 無効
       disabled_msg: 絵文字を無効化しました
+      domain: ドメイン
+      edit:
+        label: 編集
+        title: カスタム絵文字の編集
       emoji: 絵文字
       enable: 有効化
       enabled: 有効
       enabled_msg: 絵文字を有効化しました
       image_hint: "%{size}までのPNGまたはGIF画像を利用できます"
+      license: ライセンス
+      license_hint: カスタム絵文字のライセンス情報を設定します。ただしライセンス情報の連合に対応していないサーバーも多く、Misskeyもローカル絵文字のライセンス情報には対応しますが他のサーバーのライセンス情報は参照しません。ライセンスは無視される場合があることを考慮してください。
       list: 表示
       listed: 表示
       new:
@@ -341,6 +365,7 @@ ja:
       update_failed_msg: 絵文字を更新できませんでした
       updated_msg: 絵文字の更新に成功しました！
       upload: アップロード
+      visible_in_picker: 絵文字ピッカーで表示
     dashboard:
       active_users: アクティブユーザー
       interactions: 交流
@@ -376,6 +401,8 @@ ja:
       undo: 連合許可を外す
     domain_blocks:
       add_new: ドメインブロックを追加
+      block_trends: トレンド掲載を拒否
+      block_trends_hint: 今後の投稿のトレンド掲載を拒否します。反映には時間がかかります。停止とは無関係です
       confirm_suspension:
         cancel: キャンセル
         confirm: 停止
@@ -387,11 +414,20 @@ ja:
         undo_relationships: この操作により、このサーバーと対象サーバーのアカウント間のフォロー関係はすべて解除されます。
       created_msg: ドメインブロック処理を完了しました
       destroyed_msg: ドメインブロックを外しました
+      detect_invalid_subscription: 不正な購読を行うサーバーとしてマークする
+      detect_invalid_subscription_hint: 未フォローユーザーの未収載投稿が自由に購読・検索できるサーバーとしてマークします。Misskeyサーバーはこのチェックに関係なく、自動で制限が有効とみなされます。各ユーザーはそれぞれのプライバシー追加設定でMisskeyサーバーへの配送制限を有効にすることで、これらのサーバーへローカル公開・未収載投稿を鍵付きで配信できるようになります。停止とは無関係です
       domain: ドメイン
       edit: ドメインブロックを編集
       existing_domain_block: あなたは既に%{name}さんに厳しい制限を課しています。
       existing_domain_block_html: 既に%{name}に対して、より厳しい制限を課しています。先に<a href="%{unblock_url}">その制限を解除</a>する必要があります。
       export: エクスポート
+      headers:
+        disagreement: 意見の相違
+        harassment: 嫌がらせまたはスパム
+        invalid_privacy: プライバシーが守られていない
+        mastodon_default: 本家Mastodonの設定項目
+      hidden: 非公開にする
+      hidden_hint: 公開することで当サーバーの安全が脅かされる場合、このドメインブロックを非公開にすることができます。
       import: インポート
       new:
         create: ブロックを作成
@@ -410,10 +446,24 @@ ja:
       private_comment_hint: このコメントは同じサーバーのモデレーターも閲覧できます。
       public_comment: コメント (公開)
       public_comment_hint: ドメインブロックの公開を有効にしている場合、このコメントも公開されます。
+      reject_favourite: お気に入り、絵文字リアクションを拒否
+      reject_favourite_hint: 今後のお気に入り、絵文字リアクションを拒否します。停止とは無関係です
+      reject_friend: フレンドサーバー申請を拒否
+      reject_friend_hint: 今後のフレンドサーバー申請を全て拒否します。停止とは無関係です
+      reject_hashtag: ハッシュタグを拒否
+      reject_hashtag_hint: ハッシュタグで検索できなくなり、トレンドにも影響しなくなります。停止とは無関係です
       reject_media: メディアファイルを拒否
       reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
+      reject_new_follow: 新規フォローを拒否
+      reject_new_follow_hint: 今後の新規フォローを拒否します。停止とは無関係です
+      reject_reply_exclude_followers: フォロー相手以外からのメンションと引用を拒否
+      reject_reply_exclude_followers_hint: 今後のリプライを拒否します。停止とは無関係です
       reject_reports: 通報を拒否
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
+      reject_send_sensitive: センシティブな投稿を配送しない
+      reject_send_sensitive_hint: 相手サーバーからのフェッチは防げない可能性があります。停止とは無関係です
+      reject_straight_follow: フォローを強制的に審査制にする
+      reject_straight_follow_hint: 相手からのフォローは当サーバーのアカウントの承認が必須になります
       undo: ドメインブロックを戻す
       view: ドメインブロックを表示
     email_domain_blocks:
@@ -459,6 +509,35 @@ ja:
       suppressed: 非表示
       title: おすすめフォロー
       unsuppress: おすすめフォローを復元
+    friend_servers:
+      accept: 相手の申請を承認する
+      add_new: フレンドサーバーを追加・申請
+      delete: 削除
+      description_html: "<strong>フレンドサーバー</strong>とは、お互いのローカル公開・ローカル検索許可の投稿をそのまま交換するシステムです。"
+      disabled: 無効
+      domain: ドメイン
+      edit:
+        allow_all_posts: このサーバーからの投稿を無条件で受け入れる
+        allow_all_posts_hint: 通常は自分のサーバーの誰もフォローしていないアカウントの投稿は例外を除き受け入れがブロックされます。そのブロックを解除します。スパムが発生した場合など、いつでもブロックを再開できます。
+        available: 有効にする
+        delivery_local: ローカル公開の公開範囲・検索許可を持った投稿をそのまま相手と共有する
+        delivery_local_hint: ローカル公開投稿は、通常は非収載に変換されて配送されます。その処理をせず、相手サーバーにもローカル公開と認識されるようにします。相手の連合タイムラインに掲載されます
+        description: フレンドサーバーは、登録と同時に相手方のサーバーへ申請されます。
+        domain: ドメイン
+        inbox_url: フレンドサーバーの inbox URL
+        inbox_url_hint: 空欄にした場合、自動で「https://ドメイン名/inbox」に設定されます。（例：https://example.com/inbox）相手のサーバーがinbox URLを特別に指定している場合、入力してください。
+        pseudo_relay: 全ての公開・ローカル公開・非収載かつ検索可能な投稿を送信する
+        pseudo_relay_hint: お互いに有効で、かつ相手側で「このサーバーからの投稿を無条件で受け入れる」が有効になっている必要があります
+      edit_friend: 編集
+      enabled: 有効
+      follow: こちらから申請する
+      pending: 承認待ち
+      pending_you: あなたの承認が必要
+      reject: 相手からの申請を却下する
+      save_and_enable: 保存して有効にする
+      setup: フレンドサーバーを追加・申請
+      status: ステータス
+      title: フレンドサーバー
     instances:
       availability:
         description_html:
@@ -479,8 +558,17 @@ ja:
         description_html: このドメインとそのサブドメインのすべてのアカウントに適用されるコンテンツポリシーを定義できます。
         limited_federation_mode_description_html: このドメインとの連合を許可するかどうかを選択できます。
         policies:
+          block_trends: トレンドへの掲載を拒否
+          detect_invalid_subscription: 購読のプライバシーなし
+          reject_favourite: お気に入りを拒否
+          reject_friend: フレンドサーバー申請を拒否
+          reject_hashtag: ハッシュタグを拒否
           reject_media: メディアを拒否する
+          reject_new_follow: 新規フォローを拒否
+          reject_reply_exclude_followers: フォロー相手以外からのメンション・引用を拒否
           reject_reports: 通報を拒否
+          reject_send_sensitive: センシティブ投稿配送なし
+          reject_straight_follow: フォローを制限
           silence: 制限
           suspend: サスペンド
         policy: ポリシー
@@ -548,6 +636,144 @@ ja:
         title: 新規IPルール
       no_ip_block_selected: 何も選択されていないためIPルールを変更しませんでした
       title: IPルール
+    ng_rule_histories:
+      back_to_ng_rule: NGルール設定に戻る
+      back_to_ng_rules: 一覧に戻る
+      data:
+        media_count: "%{count} のメディア"
+        poll_count: 項目 %{count} の投票
+      from_local_user: ローカルユーザー
+      hidden: 非公開投稿
+      moderate_account: アカウントをモデレートする
+      reason_actions:
+        reaction_emoji_reaction: 絵文字リアクション
+        reaction_favourite: お気に入りに登録
+        reaction_follow: フォローリクエスト
+        reaction_reblog: ブースト
+        reaction_vote: 投票
+        status_create: 投稿
+        status_edit: 投稿を編集
+      title: NGルール「%{title}」の履歴
+    ng_rules:
+      account_allow_followed_by_local: ローカルユーザーからフォローされていないアカウントのみチェックする
+      account_allow_followed_by_local_hint: 1以上のフォローを持つ全てのローカルユーザーが信頼できる場合にのみこのオプションを使用してください
+      account_avatar_state: アイコンの有無
+      account_display_name: 名前
+      account_domain: ドメイン
+      account_field_name: フィールド名
+      account_field_value: フィールド値
+      account_header_state: ヘッダーの有無
+      account_include_local: ローカルユーザーを含む
+      account_note: アカウントの説明文
+      account_username: ID
+      available: 有効にする
+      copy: 複製
+      copy_error: 複製に失敗しました。
+      edit:
+        headers:
+          account: アカウント
+          options: オプション
+          reaction: リアクション
+          status: 投稿
+        helps:
+          generic: 全ての項目が条件にマッチしている場合のみ、制限が有効になります。
+          textarea_html: "<strong>複数行入力可能な箇所</strong>では、改行区切りで条件を入力します。複数行のうちどれか1つが含まれている場合、条件にマッチしたと判断されます。行頭を「?」で始めると正規表現を利用できます。"
+          threshold_html: "<strong>上限の指定</strong>では、「-1」を指定すると上限チェックが無効になります。「0」を指定した場合、その対象が全く無い状態に限りチェックを通過します。例えばメディア数の上限「0」は、「メディア無し」と等価ではありません。"
+        history: このルールが適用された履歴を確認する
+        summary:
+          account: アカウントの条件を設定します。ここでマッチしたアカウントが投稿・リアクションする場合に、このNGルールのチェックが行われます。アカウント作成時のチェックは行いません。初期状態では全てのアカウントが対象になります。
+          reaction: リアクションの条件を設定します。アカウントの条件も同時に一致しなければいけません。初期状態では、「リアクションの種類」を設定しない限り全てのリアクションが該当しませんので、ご注意ください。
+          status: 投稿の条件を設定します。アカウントの条件も同時に一致しなければいけません。初期状態では、「公開範囲」「検索許可」を設定しない限り全ての投稿が該当しませんので、ご注意ください。
+        title: NGルールを編集
+      emoji_reaction_name: 絵文字リアクションで使われる絵文字またはショートコード
+      emoji_reaction_origin_domain: 絵文字リアクションで使われたカスタム絵文字のドメイン
+      emoji_reaction_origin_domain_hint: 他のサーバーの絵文字に相乗りした場合、その絵文字がもともと登録されていたサーバーのドメインが使用されます
+      index:
+        delete: 削除
+        disabled: 無効
+        edit:
+          title: 編集
+        empty: NGルールが空です
+        empty_title: 空のタイトル
+        hit_count: ここ一週間で %{count} 件の検出
+        preamble: "「NGワードとスパム」機能においてどうしても緩すぎる条件を指定しなければならず、他の正常な投稿が規制に巻き込まれやすくなる場合があります。NGルールではアカウントや投稿の特徴などを詳細に指定して、巻き込まれる投稿を少しでも減らすことができます。設定は慎重に検討し、正常な投稿の巻き込みが最小限になるよう定期的に履歴を確認してください。"
+        title: NGルール
+      new:
+        save: 新規NGルールを保存
+        title: 新規NGルールを追加
+      reaction_allow_follower: フォロワー以外に対するリアクションのみチェックする
+      reaction_allow_follower_hint: これを有効にすると、他のサーバー同士のリアクションは無条件で許可されます
+      reaction_type: リアクションの種類
+      reaction_types:
+        emoji_reaction: 絵文字リアクション
+        favourite: お気に入り
+        follow: フォロー
+        reblog: ブースト
+        vote: 投票
+      record_history_also_local: ローカルユーザーも履歴記録の対象とする
+      rubular: 正規表現チェッカー
+      states:
+        needed: 有り
+        no_needed: 無し
+        optional: 不問
+      status_allow_follower_mention: フォロワー以外へのメンション・引用を含む場合のみ投稿をチェックする
+      status_allow_follower_mention_hint: これを有効にすると、他のサーバー同士のメンションは無条件で許可されます
+      status_cw_state: 警告文の有無
+      status_media_state: メディアの有無
+      status_media_threshold: メディア数の上限
+      status_mention_state: メンションの有無
+      status_mention_threshold: メンション数の上限
+      status_poll_state: 投票の有無
+      status_poll_threshold: 投票項目数の上限
+      status_quote_state: 引用の有無
+      status_reference_state: ひかえめな引用の有無
+      status_reference_threshold: ひかえめな引用数の上限
+      status_reply_state: 返信の有無
+      status_searchability: 検索許可
+      status_sensitive_state: センシティブフラグの有無
+      status_spoiler_text: 投稿警告文
+      status_tag: タグ
+      status_text: 投稿本文
+      status_visibility: 公開範囲
+      test_error: 正規表現の文法が誤っています
+      title: NGルール
+    ng_words:
+      block_unfollow_account_mention: 自分のサーバーのフォロワーを持たない全てのアカウントからのメンション・引用を全て拒否する
+      block_unfollow_account_mention_hint: この設定は削除予定です。設定削除後は、常にチェックをつけていない場合と同じ挙動になります。NGルールで代替してください。
+      deprecated: 新しいバージョンで削除する予定の設定
+      deprecated_hint: これらの設定は、次回のLTS、またはkmyblueバージョン14.0のどちらか早い方で削除する予定です。それぞれの設定の説明を参照して、可能であれば新しい設定に置き換えてください。
+      edit:
+        add_domain: ドメインを追加
+      hide_local_users_for_anonymous: ログインしていない状態でローカルユーザーの投稿をタイムラインから取得できないようにする
+      hide_local_users_for_anonymous_hint: この設定は削除予定です。設定削除後は、常にチェックをつけていない場合と同じ挙動になります。サーバー設定の「見つける」にある「公開タイムラインへの未認証のアクセスを許可する」で、完全ではありませんが代替可能です。
+      hold_remote_new_accounts: リモートの新規アカウントを保留する
+      keywords: 拒否するキーワード
+      phrases:
+        regexp_html: "<strong>正規</strong> 表現 にチェックの入っている項目は、正規表現を用いての比較となります。"
+        regexp_short: 正規
+        stranger_html: "<strong>無関</strong> 係のフォロワーからのメンション にチェックの入っている項目は、フォロー関係にないアカウントからのメンション、返信、引用などのみに適用されます。"
+        stranger_short: 無関
+      post_hash_tags_max: 投稿に設定可能なハッシュタグの最大数
+      post_mentions_max: 投稿に設定可能なメンションの最大数
+      post_stranger_mentions_max: 投稿に設定可能なメンションの最大数 (メンション先にフォロワー以外を1人でも含む場合)
+      preamble: ドメインブロックでは対処の難しいスパムに関する問題の解決に、この設定が役に立ちます。特定キーワードが含まれているなどの条件を満たした投稿を拒否することができます。問題のない投稿が削除されないよう設定は慎重に検討し、定期的に履歴を確認してください。
+      remote_approval_hint: 指定されていないドメインで新しく認識されたアカウントはサスペンド状態になります。その一覧を確認し、必要であれば承認を行うことができます。この設定が有効でない場合、全てのリモートアカウントが即座に承認されます。
+      remote_approval_list: 承認待ちのリモートアカウント一覧
+      settings: 詳細設定
+      stranger_mention_from_local_ng: フォローしていないアカウントへのメンションのNGワードを、ローカルユーザーによる投稿にも適用する
+      stranger_mention_from_local_ng_hint: この設定は削除予定です。設定削除後は、常にチェックをつけている場合と同じ挙動になります。この動作を希望しない場合は、NGルールで代替してください。
+      test_error: NGワードのテストに失敗しました。正規表現のミスが含まれているかもしれません
+      title: NGワードとスパム
+      white_list: ホワイトリスト
+      white_list_header: リモートアカウントを即座に承認するドメイン一覧
+      white_list_hint: 激しい攻撃に晒された場合の最終手段として、ホワイトリストが利用できます。外部からの攻撃が即座に消えるわけではありませんが、モデレーションを進めることで徐々に確実に減らすことができます。また、定期的なリモートアカウント承認作業が求められます。
+    ngword_histories:
+      back_to_ng_words: NGワードとスパム
+      target_types:
+        account_name: アカウントの名前
+        account_note: アカウントの説明文
+        status: 投稿
+      title: NGワード検出履歴
     relationships:
       title: "%{acct} さんのフォロー・フォロワー"
     relays:
@@ -577,6 +803,7 @@ ja:
       action_taken_by: 通報処理者
       actions:
         delete_description_html: 報告された投稿は削除され、ストライクが記録されます。同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
+        force_cw_description_html: 報告された投稿には強制的に警告文が追加され、ストライクが記録され、同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
         mark_as_sensitive_description_html: 報告された投稿のメディアは閲覧注意となり、ストライクが記録され、同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
         other_description_html: アカウントの動作を制御するためのオプションや、報告されたアカウントへの通信をカスタマイズするためのオプションを確認してください。
         resolve_description_html: 報告されたアカウントに対していかなる措置も取られず、ストライクも記録されず、報告は終了します。
@@ -585,6 +812,9 @@ ja:
       actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されますが<strong>スパム</strong>カテゴリが選択されている場合を除きます。
       actions_description_remote_html: この通報を解決するためのアクションを選択してください。これは<strong>あなたの</strong>サーバーがこのリモートアカウントと通信し、そのコンテンツを処理する時のみ影響します。
       add_to_report: 通報にさらに追加
+      already_suspended_badges:
+        local: このサーバーで停止済み
+        remote: リモートのサーバーで停止済み
       are_you_sure: 本当に実行しますか？
       assign_to_self: 担当になる
       assigned: 担当者
@@ -599,6 +829,7 @@ ja:
       confirm_action: "@%{acct} さんに対するアクション"
       created_at: 通報日時
       delete_and_resolve: 投稿を削除
+      force_cw: 強制的にCWにする
       forwarded: 転送済み
       forwarded_replies_explanation: これはリモートユーザーによる、リモートコンテンツについての報告です。問題のコンテンツはあなたのサーバー利用者への返信なので、こちらにも転送されて来ました。
       forwarded_to: "%{domain}に転送されました"
@@ -630,11 +861,13 @@ ja:
       summary:
         action_preambles:
           delete_html: "<strong>@%{acct}</strong>さんの投稿を<strong>削除</strong>します。この操作は:"
+          force_cw_html: "<strong>@%{acct}</strong>さんの投稿に<strong>警告文</strong>を<strong>追加</strong>します。この操作は:"
           mark_as_sensitive_html: "<strong>@%{acct}</strong>さんの投稿を<strong>閲覧注意</strong>として<strong>マーク</strong>します。この操作は:"
           silence_html: "<strong>@%{acct}</strong>さんのアカウントを<strong>制限 (サイレンス) </strong>します。この操作は:"
           suspend_html: "<strong>@%{acct}</strong>さんのアカウントを<strong>停止 (サスペンド) </strong>します。この操作は:"
         actions:
           delete_html: 当該の投稿を削除します
+          force_cw_html: 当該の投稿に警告文を強制的に追加します
           mark_as_sensitive_html: 当該の投稿に含まれるメディアを閲覧注意にします
           silence_html: "<strong>@%{acct}</strong>さんのプロフィールとコンテンツの表示範囲をフォロー中の人や意図的にプロフィールにアクセスした人のみに制限することで、アカウントを発見されにくくします"
           suspend_html: "<strong>@%{acct}</strong>さんのアカウントが凍結され、プロフィールとコンテンツへのアクセス、および投稿ができなくなります"
@@ -688,12 +921,16 @@ ja:
         manage_federation_description: ユーザーが他のドメインとの連合をブロックまたは許可したり、配信を制御したりできます。
         manage_invites: 招待を管理
         manage_invites_description: 招待リンクの閲覧・解除を可能にする。
+        manage_ng_words: NGワードを管理
+        manage_ng_words_description: NGワードの管理を可能にします。投稿の受け入れ可否に関わるデリゲートな部分のため、扱いは慎重にします
         manage_reports: レポートの管理
         manage_reports_description: ユーザーがレポートを確認したり、モデレーションアクションを実行したりできます。
         manage_roles: ロールの管理
         manage_roles_description: ユーザーが自分より下の役割を管理し、割り当てることができます。
         manage_rules: ルールの管理
         manage_rules_description: ユーザーがサーバールールを変更できるようにします
+        manage_sensitive_words: センシティブワードを管理
+        manage_sensitive_words_description: センシティブワードの管理を可能にします。正規表現の利用が可能であるため、注意が必要です
         manage_settings: 設定の管理
         manage_settings_description: ユーザーがサイト設定を変更できるようにします
         manage_taxonomies: 分類の管理
@@ -718,6 +955,19 @@ ja:
       edit: ルールを編集
       empty: サーバーのルールが定義されていません。
       title: サーバーのルール
+    sensitive_words:
+      alert: この投稿にはセンシティブなキーワードが含まれるため、警告文が追加されました
+      auto_warning_text: カスタム警告文
+      auto_warning_text_hint: 指定しなかった場合は、各言語のデフォルト警告文が使用されます
+      hint: センシティブなキーワードの設定は、当サーバーのローカルユーザーによる公開範囲「公開」「ローカル公開」「ログインユーザーのみ」に対して適用されます。
+      phrases:
+        regexp_html: "<strong>正規</strong> 表現 にチェックの入っている項目は、正規表現を用いての比較となります。"
+        regexp_short: 正規
+        remote_html: "<strong>リモ</strong> ート にチェックの入っている項目は、リモートからの投稿にも適用されます。"
+        remote_short: リモ
+        spoiler_html: "<strong>警告</strong> 文 にチェックの入っている項目は、コンテンツ警告文にも適用されます。"
+        spoiler_short: 警告
+      title: センシティブ単語と設定
     settings:
       about:
         manage_rules: サーバーのルールを管理
@@ -734,13 +984,16 @@ ja:
         desc_html: この機能は hCaptcha による外部スクリプトを使用しますが、hCaptcha にはセキュリティとプライバシーの懸念が考えられます。また、<strong>CAPTCHAにより新規登録のアクセシビリティが大幅に損なわれる可能性があり、身体および精神障害者においては特に顕著です。</strong>以上の理由から、承認制や招待制を基本とするなど、代わりの登録手順を提供することを検討してください。
         title: 新規ユーザーのアカウント確認にCHAPCHAを要求する
       content_retention:
+        danger_zone: 危険な操作
         preamble: ユーザーが生成したコンテンツがどのように Mastodon に保存されるかを管理します。
         title: コンテンツの保持
       default_noindex:
         desc_html: この設定を自分で変更していない全ユーザーに影響します
         title: デフォルトで検索エンジンによるインデックスを拒否する
       discovery:
+        emoji_reactions: 絵文字リアクション
         follow_recommendations: おすすめフォロー
+        friend_servers: フレンドサーバー
         preamble: Mastodon を知らないユーザーを取り込むには、興味深いコンテンツを浮上させることが重要です。サーバー上で様々なディスカバリー機能がどのように機能するかを制御します。
         profile_directory: ディレクトリ
         public_timelines: 公開タイムライン
@@ -748,11 +1001,13 @@ ja:
         publish_statistics: 統計情報を公開する
         title: 見つける
         trends: トレンド
+        visibilities: 公開範囲
       domain_blocks:
         all: 誰にでも許可
         disabled: 誰にも許可しない
         users: ログイン済みローカルユーザーのみ許可
       registrations:
+        moderation_recommandation: 登録受付を開始する前に、迅速かつ適切にモデレーションを行うチームを編成しましょう！
         preamble: あなたのサーバー上でアカウントを作成できるユーザーを制御します。
         title: アカウント作成
       registrations_mode:
@@ -760,6 +1015,7 @@ ja:
           approved: 登録には承認が必要
           none: 誰にも許可しない
           open: 誰でも登録可
+        warning_hint: モデレーションチームがスパムや悪意のある登録を迅速に処理できる自信がない限り、サインアップを承認制にすることをお勧めします。
       security:
         authorized_fetch: 連合サーバーによる署名なしでの情報取得を拒否する
         authorized_fetch_hint: ほかの連合サーバーから受け付けるリクエストに署名を必須にすることで、ユーザーによるブロックおよびドメインブロック両方の効果をより強力にします。ただし連合の処理コストが増えてパフォーマンス面で不利になるほか、このサーバーから送られた反応が届く範囲が狭まったり、連合における互換性の問題を招く可能性もあります。また、この機能は公開投稿やプロフィールへのアクセスをブロックした相手から完全に遮断できるものではありません。
@@ -781,9 +1037,22 @@ ja:
         minor: マイナーリリース
         patch: パッチ (バグ修正のみ)
       version: バージョン
+    special_domains:
+      stop_fetch_activity_domains:
+        preamble: WebとActivityでドメインの異なるサーバーでは、WebにアクセスしてもActivityが取得できない場合があります。引用において、投稿本文内でそのようなURLが指定された場合のフェッチを抑止します。ドメインは改行区切りで複数指定できます。多くの場合、この設定を利用する機会はほとんどありません。
+        title: 引用でフェッチを行わないドメイン
+      stop_link_preview_domains:
+        preamble: 多くのアクセスがあったIPアドレスからの接続を一時的に制限するサイトがある場合、自分のサーバーが不利に扱われる場合があります。そのようなサイトにアクセスしてリンクプレビューを生成する処理を抑制します。ドメインは改行区切りで複数指定できます。多くの場合、この設定を利用する機会はほとんどありません。
+        title: リンクのプレビューを行わないドメイン
+      title: 特殊なドメイン
+    special_instances:
+      emoji_reaction_disallow_domains: 自分のサーバーが絵文字リアクションをすることを許可しないドメイン
+      emoji_reaction_disallow_domains_hint: 連合先に配慮する必要がある場合、ドメインを改行区切りで設定します。設定されたドメインの投稿に絵文字リアクションを付けることはできません。
+      title: 特殊なサーバー
     statuses:
       account: 作成者
       application: アプリ
+      are_you_sure: 本当に実行しますか？
       back_to_account: アカウントページに戻る
       back_to_report: 通報ページに戻る
       batch:
@@ -791,6 +1060,8 @@ ja:
         report: 通報
       deleted: 削除済み
       favourites: お気に入り
+      force_cw: 強制CW
+      force_nsfw: 強制NSFW
       history: 更新履歴
       in_reply_to: 返信先
       language: 言語
@@ -801,6 +1072,9 @@ ja:
       open: 投稿を開く
       original_status: オリジナルの投稿
       reblogs: ブースト
+      remove: 投稿を削除
+      remove_history: 編集履歴を削除
+      remove_media: メディアを削除
       status_changed: 投稿を変更しました
       title: 投稿一覧
       trending: トレンド
@@ -922,6 +1196,9 @@ ja:
           other: 週間%{count}人に使用されました
       title: トレンド
       trending: トレンド
+    update_pendings:
+      major: メジャーアップデートあり
+      patch: パッチアップデートあり
     warning_presets:
       add_new: 追加
       delete: 削除
@@ -948,6 +1225,9 @@ ja:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: "%{instance} のモデレーターによる活動がしばらくなかったため、%{instance} のアカウント作成は手動での承認を必要とするように自動的に変更されました。これには %{instance} が悪意ある者の踏み台として使われることを防ぐ役割があります。アカウント作成は必要に応じていつでも再び開放できます。"
+      subject: "%{instance} のアカウント作成は自動的に承認制に変更されました"
     new_appeal:
       actions:
         delete_statuses: 投稿を削除する
@@ -966,6 +1246,9 @@ ja:
     new_pending_account:
       body: 新しいアカウントの詳細は以下の通りです。この申請を承認または却下することができます。
       subject: "%{instance}で新しいアカウント (%{username}) が承認待ちです"
+    new_pending_friend_server:
+      body: 新しいフレンドサーバー %{domain} の申請が届いています。この申請を承認または却下することができます。
+      subject: "%{instance}で新しいフレンドサーバー (%{domain}) が承認待ちです"
     new_report:
       body: "%{reporter}さんが%{target}さんを通報しました"
       body_remote: "%{domain}の誰かが%{target}さんを通報しました"
@@ -989,17 +1272,62 @@ ja:
     empty: エイリアスがありません。
     hint_html: 他のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。エイリアス自体は<strong>無害で、取り消す</strong>ことができます。<strong>引っ越しは以前のアカウント側から開始する必要があります</strong>。
     remove: エイリアスを削除
+  antennas:
+    contexts:
+      account: アカウント
+      domain: ドメイン
+      keyword: キーワード
+      tag: ハッシュタグ
+    edit:
+      available: 有効
+      description: アンテナは、サーバーが認識した全ての公開・ローカル公開投稿のうち、購読を拒否していないすべてのアカウントからの投稿が対象です。検出された投稿は、指定したリストに追加されます。
+      title: アンテナを編集
+    errors:
+      empty_contexts: 絞り込み条件が1つも指定されていないため無効です（除外条件はカウントされません）
+      invalid_list_owner: これはあなたのリストではありません
+      limit:
+        accounts: 登録できるアカウント数の上限に達しています
+        domains: 登録できるドメイン数の上限に達しています
+        keywords: 登録できるキーワード数の上限に達しています
+        tags: 登録できるタグ数の上限に達しています
+      over_limit: 所持できるアンテナ数 %{limit}を超えています
+      over_ltl_limit: 所持できるLTLモード付きアンテナ数 (ホーム/リストそれぞれにつき%{limit}) を超えています
+      over_stl_limit: 所持できるSTLモード付きアンテナ数 (ホーム/リストそれぞれにつき%{limit}) を超えています
+      too_short_keyword: キーワードが短すぎます
+    index:
+      accounts:
+        other: "%{count}件のアカウント"
+      contexts: "%{contexts}のアンテナ"
+      delete: 削除
+      disabled: 無効
+      domains:
+        other: "%{count}件のドメイン"
+      empty: アンテナはありません。
+      expires_in: "%{distance}で期限切れ"
+      expires_on: 有効期限 %{date}
+      keywords:
+        other: "%{count}件のキーワード"
+      stl: STLモードが適用されます。購読拒否設定は無視されます。
+      tags:
+        other: "%{count}件のタグ"
+      title: アンテナ
   appearance:
     advanced_web_interface: 上級者向けUI
     advanced_web_interface_hint: ディスプレイを幅いっぱいまで活用したい場合、上級者向け UI をおすすめします。ホーム、通知、連合タイムライン、更にはリストやハッシュタグなど、様々な異なるカラムから望む限りの情報を一度に受け取れるような設定が可能になります。
     animations_and_accessibility: アニメーションとアクセシビリティー
     confirmation_dialogs: 確認ダイアログ
+    custom_emoji_and_emoji_reactions: カスタム絵文字と絵文字リアクション
     discovery: 見つける
     localization:
       body: Mastodonは有志によって翻訳されています。
       guide_link: https://ja.crowdin.com/project/mastodon
       guide_link_text: 誰でも参加することができます。
+    media: メディア
+    quotes: 引用
+    remote_server_features: 他のサーバーの機能
+    saved_posts: 投稿の記録
     sensitive_content: 閲覧注意コンテンツ
+    status_action_bar: 投稿のメニュー
   application_mailer:
     notification_preferences: メール設定の変更
     salutation: "%{name}さん"
@@ -1061,6 +1389,9 @@ ja:
       saml: SAML
     register: 登録する
     registration_closed: "%{instance}は現在、新規登録停止中です"
+    registration_limit:
+      hint_html: 新規登録可能な上限人数、もしくは時間帯は、管理者によって制限されています。制限中は認証を完了することができません。管理者に問い合わせるか、制限が解除されるまでお待ちください。なお認証期限に達した場合は、再度新規登録を行う必要があります。
+      title: 新規登録は現在制限中です
     resend_confirmation: 確認メールを再送
     reset_password: パスワードを再発行
     rules:
@@ -1162,6 +1493,7 @@ ja:
       title_actions:
         delete_statuses: 投稿の削除
         disable: アカウント凍結
+        force_cw: 投稿に警告文を追加
         mark_statuses_as_sensitive: 投稿を閲覧注意としてマーク
         none: 警告
         sensitive: アカウントを閲覧注意としてマーク
@@ -1217,6 +1549,7 @@ ja:
   filters:
     contexts:
       account: プロフィール
+      explore: トレンド・検索
       home: ホームおよびリスト
       notifications: 通知
       public: 公開タイムライン
@@ -1335,11 +1668,14 @@ ja:
     delete: 無効化
     expired: 期限切れ
     expires_in:
+      '1209600': 2週間
       '1800': 30分
       '21600': 6時間
+      '2629746': 1ヶ月
       '3600': 1時間
       '43200': 12時間
       '604800': 1週間
+      '7889238': 3ヶ月
       '86400': 1日
     expires_in_prompt: 無期限
     generate: 招待リンクを作成
@@ -1432,6 +1768,10 @@ ja:
         subject: "%{name}さんがレポートを送信しました"
       sign_up:
         subject: "%{name}さんがサインアップしました"
+    emoji_reaction:
+      body: "%{name}さんに絵文字をつけられた、あなたの投稿があります:"
+      subject: "%{name}さんに絵文字をつけられました"
+      title: 新たな絵文字リアクション
     favourite:
       body: "%{name}さんにお気に入り登録された、あなたの投稿があります:"
       subject: "%{name}さんにお気に入りに登録されました"
@@ -1464,7 +1804,6 @@ ja:
     administration_emails: 管理にかかわるメール通知
     email_events: メールによる通知
     email_events_hint: '受信する通知を選択:'
-    other_settings: その他の通知設定
   number:
     human:
       decimal_units:
@@ -1502,9 +1841,17 @@ ja:
       too_few_options: は複数必要です
       too_many_options: は%{max}個までです
   preferences:
+    does_not_search: このサーバーでは全文検索機能を利用できません。代わりに、他のkmyblueサーバーであなたの投稿がこの設定に従って検索されます。
+    dtl: ディープタイムライン
+    dtl_hint: "#%{tag} ハッシュタグに参加することで、ディープタイムラインに投稿できます。ここではディープタイムラインを利用しやすくするための設定ができます。"
+    emoji_reaction_permitting: 絵文字リアクションの受け入れ
     other: その他
     posting_defaults: デフォルトの投稿設定
     public_timelines: 公開タイムライン
+    reaching: 公開範囲と検索
+    search: 検索
+    searchability: あなたの投稿の検索許可
+    visibility: 公開範囲
   privacy:
     hint_html: "<strong>プロフィールの見えかたや、ほかのユーザーからの見つかりやすさを設定します。</strong>Mastodonには自分のアカウントのことをより多くの人に知ってもらうためのさまざまな機能があり、有効・無効をそれぞれ切り換えられます。使いかたや好みに合わせて調節しましょう。"
     privacy: プライバシー
@@ -1513,13 +1860,29 @@ ja:
     reach_hint_html: ほかのユーザーからの見つかりやすさと、フォローされる方法についての設定項目です。「エクスプローラー」やおすすめのユーザーに掲載するか、また新しいフォロワーをどのように受け入れるかをここで変更できます。
     search: 被検索性
     search_hint_html: 検索での見つかりやすさに関する設定項目です。公開投稿を検索できるようにするかや、Mastodonの外からweb検索でたどり着けるようにするかをここで変更できます。ただし検索エンジンのなかには、この設定に従わずに公開されている情報を利用するものがあるかもしれません。
+    search_kmyblue_hint_html: kmyblueの投稿検索設定には「Indexable」と「検索許可」の2種類があります。Indexableはアカウントのすべての公開投稿を他の標準のMastodonで検索できるようにするもので、設定変更は過去投稿に遡及します。検索許可は投稿ごとに指定可能なもので、kmyblue・Fedibirdではこの設定がIndexableより優先されます。過去の投稿を変更することはできません。
     title: プライバシーとつながりやすさ
+  privacy_extra:
+    hint_html: これらはkmyblue独自のプライバシー設定項目です。この機能を利用することで、あなたは追加の恩恵を受けることができます。なおこれらの設定の一部は他のサーバーにも送信されますが、kmyblue以外で対応するソフトウェアは現在確認できていません。他のサーバーではこれらの設定は無視されること、ご了承ください。
+    post_processing: 投稿の処理
+    post_processing_hint_html: 投稿された情報に対して、システムが追加で行うことができる操作を制御します。これらには、第三者のサイトへあなたの投稿に関する情報の送信を伴う設定も含まれます。
+    stop_deliver: 配送制限
+    stop_deliver_hint_html: Mastodonの投稿を、他のソフトウェアでは自由に検索することができます。Mastodon内で行ったプライバシーの設定は無視され、あなたの投稿が意図しない人に見つかるおそれがあります。ここでは、他のサーバーやソフトウェアであなたの投稿が見つからないようにする設定が可能です。ただしリスクは伴います。
+    title: プライバシー追加設定
+    will_remove_settings: 削除予定の設定
+    will_remove_settings_hint_html: これらの設定は、慎重に検討を重ねた結果、バージョン14または次のLTSのどちらか早い方で削除される予定です。代替の設定はありませんので、ご承知おきください。
   privacy_policy:
     title: プライバシーポリシー
   reactions:
     errors:
+      banned: 指定ユーザーからのリアクションは禁止されています
+      disabled: このサーバーでは絵文字リアクション機能は無効になっています
+      duplication: 同じリアクションを複数行おうとしました
       limit_reached: リアクションの種類が上限に達しました
       unrecognized_emoji: は絵文字として認識されていません
+  redirects:
+    prompt: リンク先を確かめ、信用できる場合のみリンクをクリックしてください。
+    title: "%{instance} から別のサーバーに移動します。"
   relationships:
     activity: 活動
     confirm_follow_selected_followers: 選択したフォロワーをフォローしてもよろしいですか？
@@ -1582,6 +1945,7 @@ ja:
       unknown_browser: 不明なブラウザ
       weibo: Weibo
     current_session: 現在のセッション
+    date: 日時
     description: "%{platform}上の%{browser}"
     explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
     ip: IP
@@ -1618,14 +1982,26 @@ ja:
     import: データのインポート
     import_and_export: インポート・エクスポート
     migrate: アカウントの引っ越し
-    notifications: 通知
+    notifications: メール通知
     preferences: ユーザー設定
     profile: プロフィール
     relationships: フォロー・フォロワー
+    severed_relationships: 途切れたフォロー関係
     statuses_cleanup: 投稿の自動削除
     strikes: モデレーションストライク
     two_factor_authentication: 二要素認証
     webauthn_authentication: セキュリティキー
+  severed_relationships:
+    download: 取り出す (%{count}件)
+    event_type:
+      account_suspension: アカウントの停止 (%{target_name})
+      domain_block: 管理者によるサーバーの停止 (%{target_name})
+      user_domain_block: ユーザーによるドメインブロック (%{target_name})
+    lost_followers: 解除されたフォロワー
+    lost_follows: 解除されたフォロー
+    preamble: ドメインをブロックしたりモデレーターによってリモートのサーバーが停止された場合、巻き込みでフォロー・フォロワー関係が失われることがあります。このようにして解除されたフォロー・フォロワーはリスト形式で取り出して内容を確認したり、対応している場合は他のサーバーでインポートできます。
+    purged: 管理者がサーバーの情報を削除したため表示できません。
+    type: 理由
   statuses:
     attached:
       audio:
@@ -1636,6 +2012,7 @@ ja:
       video:
         other: "%{count}本の動画"
     boosted_from_html: "%{acct_link}からブースト"
+    contains_ng_words: 投稿できない単語が含まれています
     content_warning: '閲覧注意: %{warning}'
     default_language: UIの表示言語
     disallowed_hashtags:
@@ -1656,24 +2033,52 @@ ja:
       total_votes:
         other: "%{count}票"
       vote: 投票
+    searchabilities:
+      direct: 反応者
+      direct_long: この投稿に反応した人しか検索できません
+      direct_search_long: あなたが反応した投稿のみが検索されます
+      limited: 自分のみ
+      limited_long: この投稿はあなたしか検索できません
+      limited_search_long: あなたの投稿のみが検索されます
+      private: フォロワーと反応者
+      private_long: この投稿はフォロワーと反応者のみが検索できます
+      private_search_long: あなたのフォロー相手またはあなたが反応した投稿のみが検索されます
+      public: 誰でも
+      public_long: この投稿は誰でも検索できます
+      public_search_long: 検索が許可された全ての投稿が検索できます
+      public_unlisted: ローカルとフォロワー
+      public_unlisted_long: ローカル・フォロワー・反応者のみが検索できます
+      unset: "(未対応サーバー)"
     show_more: もっと見る
-    show_newer: 新しいものを表示
-    show_older: 古いものを表示
     show_thread: スレッドを表示
     title: '%{name}: "%{quote}"'
+    too_many_hashtags: ハッシュタグが多すぎます
+    too_many_mentions: メンションが多すぎます
+    violate_rules: サーバールールに違反するため投稿できません
     visibilities:
+      circle: サークル限定
       direct: ダイレクト
+      limited: 限定投稿
+      login: ログインユーザーのみ
+      login_long: ログインしたユーザーのみが見ることができます
+      mutual: 相互限定
       private: フォロワー限定
       private_long: フォロワーにのみ表示されます
       public: 公開
       public_long: 誰でも見ることができ、かつ公開タイムラインに表示されます
-      unlisted: 非収載
+      public_unlisted: ローカル公開
+      public_unlisted_long: 誰でも見ることができますが、他のサーバーの連合タイムラインには表示されません
+      reply: 返信
+      unlisted: ひかえめな公開 (非収載)
       unlisted_long: 誰でも見ることができますが、公開タイムラインには表示されません
+      unset: 設定なし
+      unset_long: デフォルトの挙動に従います
   statuses_cleanup:
     enabled: 古い投稿を自動的に削除する
     enabled_hint: 設定した期間を過ぎた投稿は、以下の例外に該当しない限り、自動的に削除されます
     exceptions: 例外
     explanation: 投稿の削除はサーバーに負荷がかかるため、サーバーが混み合っていないときに時間をかけて行われます。
+    ignore_emojis: 設定しない
     ignore_favs: 設定しない
     ignore_reblogs: 設定しない
     interaction_exceptions: インタラクションに基づく例外
@@ -1688,6 +2093,8 @@ ja:
     keep_polls_hint: アンケート付きの投稿を削除せずに残します
     keep_self_bookmark: ブックマークした投稿を保持
     keep_self_bookmark_hint: 自分自身でブックマークした投稿を削除せずに残します
+    keep_self_emoji: 絵文字をつけた投稿を保持
+    keep_self_emoji_hint: 自分自身で絵文字をつけた投稿を削除せずに残します
     keep_self_fav: お気に入りに登録した投稿を保持
     keep_self_fav_hint: 自分自身でお気に入りに登録した投稿を削除せずに残します
     min_age:
@@ -1700,6 +2107,8 @@ ja:
       '63113904': 2年
       '7889238': 3ヶ月
     min_age_label: 投稿を保持する期間
+    min_emojis: 絵文字リアクションの基準値
+    min_emojis_hint: この数以上、絵文字をつけられた投稿を削除せずに残します。空白にしておくと、数に関わらず投稿を削除します。
     min_favs: お気に入りの基準値
     min_favs_hint: この数以上、お気に入り登録された投稿を削除せずに残します。空白にしておくと、お気に入りの数に関わらず投稿を削除します。
     min_reblogs: ブーストの基準値
@@ -1714,7 +2123,9 @@ ja:
   themes:
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
+    full-dark: フルダーク
     mastodon-light: Mastodon (ライト)
+    system: 自動 (システムのテーマを使用)
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
@@ -1742,18 +2153,27 @@ ja:
     webauthn: セキュリティキー
   user_mailer:
     appeal_approved:
-      action: アカウントへ
+      action: アカウント設定
       explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては承認されました。アカウントは正常な状態に戻りました。"
       subject: "%{date}の申し立てが承認されました"
+      subtitle: あなたのアカウントは正常な状態に戻りました。
       title: 申し立てが承認されました。
     appeal_rejected:
       explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては却下されました。"
       subject: "%{date}の申し立てが拒否されました"
+      subtitle: 申し立ては拒否されました。
       title: 却下された抗議
     backup_ready:
-      explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます！
+      explanation: Mastodonアカウントの完全バックアップをリクエストしました。
+      extra: ダウンロードの準備ができました！
       subject: アーカイブの準備ができました
       title: アーカイブの取り出し
+    failed_2fa:
+      details: '試行されたログインの詳細は以下のとおりです:'
+      explanation: アカウントへのログインが試行されましたが、二要素認証で不正な回答が送信されました。
+      further_actions_html: このログインに心当たりがない場合は、ただちに%{action}してください。
+      subject: 二要素認証に失敗しました
+      title: 二要素認証に失敗した記録があります
     suspicious_sign_in:
       change_password: パスワードを変更
       details: 'ログインの詳細は以下のとおりです:'
@@ -1770,7 +2190,8 @@ ja:
       explanation:
         delete_statuses: あなたの投稿のいくつかは、1つ以上のコミュニティガイドラインに違反していることが判明し、%{instance}のモデレータによって削除されました。
         disable: アカウントは使用できませんが、プロフィールやその他のデータはそのまま残ります。 データのバックアップをリクエストしたり、アカウント設定を変更したり、アカウントを削除したりできます。
-        mark_statuses_as_sensitive: あなたのいくつかの投稿は、%{instance}のモデレータによって閲覧注意としてマークされています。これは、プレビューが表示される前にユーザが投稿内のメディアをタップする必要があることを意味します。あなたは将来投稿する際に自分自身でメディアを閲覧注意としてマークすることができます。
+        force_cw: あなたのいくつかの投稿は、%{instance}のモデレータによって閲覧注意としてマークされています。これは、投稿本文が表示される前にユーザが投稿内のボタンをタップする必要があることを意味します。あなたはこの投稿を削除する必要はありませんが、将来同様の投稿をする際に自分自身で文章に警告を追加してください。
+        mark_statuses_as_sensitive: あなたのいくつかの投稿は、%{instance}のモデレータによって閲覧注意としてマークされています。これは、プレビューが表示される前にユーザが投稿内のメディアをタップする必要があることを意味します。あなたはこの投稿を削除する必要はありませんが、将来同様の投稿をする際に自分自身でメディアを閲覧注意としてマークしてください。
         sensitive: 今後、アップロードされたすべてのメディアファイルは閲覧注意としてマークされ、クリック解除式の警告で覆われるようになります。
         silence: アカウントが制限されています。このサーバーでは既にフォローしている人だけがあなたの投稿を見ることができます。 様々な発見機能から除外されるかもしれません。他の人があなたを手動でフォローすることは可能です。
         suspend: アカウントは使用できなくなり、プロフィールなどのデータにもアクセスできなくなります。約30日後にデータが完全に削除されるまでは、ログインしてデータのバックアップを要求することができますが、アカウントの停止回避を防ぐために一部の基本データを保持します。
@@ -1779,6 +2200,7 @@ ja:
       subject:
         delete_statuses: "%{acct}さんの投稿が削除されました"
         disable: あなたのアカウント %{acct}は凍結されました
+        force_cw: あなたの%{acct}の投稿はCWとして警告文が追加されました
         mark_statuses_as_sensitive: あなたの%{acct}の投稿は閲覧注意としてマークされました
         none: "%{acct}に対する警告"
         sensitive: あなたの%{acct}の投稿はこれから閲覧注意としてマークされます
@@ -1787,21 +2209,50 @@ ja:
       title:
         delete_statuses: 投稿が削除されました
         disable: アカウントが凍結されました
+        force_cw: 閲覧注意として警告が追加された投稿
         mark_statuses_as_sensitive: 閲覧注意としてマークされた投稿
         none: 警告
         sensitive: 閲覧注意としてマークされたアカウント
         silence: アカウントがサイレンスにされました
         suspend: アカウントが停止されました
     welcome:
-      edit_profile_action: プロフィールを設定
-      edit_profile_step: |-
-        プロフィール画像をアップロードしたり、表示名を変更したりして、プロフィールをカスタマイズできます。
-        新しいフォロワーからフォローリクエストを承認する前に、オプトインで確認できます。
+      apps_android_action: Google Play で手に入れよう
+      apps_ios_action: App Store からダウンロード
+      apps_step: 公式アプリのダウンロード
+      apps_title: Mastodon アプリ
+      checklist_subtitle: 新世代のSNSが始まります
+      checklist_title: 最初のステップはここから
+      edit_profile_action: プロフィール設定
+      edit_profile_step: ほかのユーザーが親しみやすいように、プロフィールを整えましょう。
+      edit_profile_title: プロフィールを設定しましょう
       explanation: 始めるにあたってのアドバイスです
-      final_action: 始めましょう
-      final_step: 'さあ、始めましょう！ たとえフォロワーがまだいなくても、あなたの公開した投稿はローカルタイムラインやハッシュタグなどを通じて誰かの目にとまるはずです。自己紹介をしたいときには #introductions ハッシュタグが便利かもしれません。'
-      full_handle: あなたの正式なユーザーID
-      full_handle_hint: 別のサーバーの友達とフォローやメッセージをやり取りする際には、これを伝えることになります。
+      feature_action: もっと詳しく
+      feature_audience: Mastodonでは、誰の仲介もなく、あなた自身でオーディエンスの管理を行うことができます。あなたのインフラストラクチャー上にデプロイされたMastodon上でも、ほかのどんなMastodonサーバーのアカウントをフォローすることも、フォローされることもでき、それらはもちろんあなた自身で制御できます。
+      feature_audience_title: 自信を持ってオーディエンスを構築
+      feature_control: ホームフィードで見たいものは、あなたが一番よく知っています。時間を無駄にするアルゴリズムや広告はありません。ひとつのアカウントからすべてのMastodonサーバーの投稿を時系列で受け取り、インターネットの隅っこをもう少しあなたらしくしましょう。
+      feature_control_title: 自分のタイムラインを管理
+      feature_creativity: Mastodonでは、自己表現を多様にするため、音声・動画・画像の投稿や、アクセシビリティ用説明、投票・コンテンツ警告・動くアバター・カスタム絵文字・サムネイル切り抜き設定などをサポートしています。アートや音楽、ポッドキャストを投稿したいあなたにもMastodonはピッタリです。
+      feature_creativity_title: 比類なきクリエイティビティ
+      feature_moderation: Mastodonでは意思決定はあなたの手にあります。それぞれのサーバーで適用されるルールや規則を策定できます。これらは、企業運営のソーシャルメディアとは違いサーバー単位でローカルに適用されるため、さまざまなグループのニーズに最も柔軟に対応することができるのです。
+      feature_moderation_title: サーバー運営をあるべき姿で
+      follow_action: フォロー
+      follow_step: ユーザーをフォローしてみましょう。これがMastodonを楽しむ基本です。
+      follow_title: 自分のホームタイムラインを作る
+      follows_subtitle: 人気アカウントをフォロー
+      follows_title: フォローを増やしてみませんか？
+      follows_view_more: フォローするユーザーを探す
+      hashtags_recent_count:
+        other: 過去 2 日間で %{people} 人が共有
+      hashtags_subtitle: 過去2日間のトレンドを見る
+      hashtags_title: トレンドのハッシュタグ
+      hashtags_view_more: トレンドのハッシュタグをもっと見る
+      post_action: 作成
+      post_step: 試しになにか書いてみましょう。写真、ビデオ、アンケートなど、なんでも大丈夫です.
+      post_title: はじめての投稿
+      share_action: 共有
+      share_step: Mastodon アカウントをほかの人に紹介しましょう。
+      share_title: プロフィールをシェアする
+      sign_in_action: ログイン
       subject: Mastodonへようこそ
       title: ようこそ、%{name}さん！
   users:
@@ -1809,6 +2260,7 @@ ja:
     go_to_sso_account_settings: 外部サービスアカウントの設定はこちらで行ってください
     invalid_otp_token: 二要素認証コードが間違っています
     otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
+    rate_limited: 認証に失敗した回数が多すぎます。時間をおいてからログインしてください。
     seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
     signed_in_as: '下記でログイン中:'
   verification:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index d67f432688..c92fd98a7c 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -419,7 +419,6 @@ ka:
     export: მონაცემის ექსპორტი
     import: იმპორტი
     migrate: ანგარიშის მიგრაცია
-    notifications: შეტყობინებები
     preferences: პრეფერენციები
     two_factor_authentication: მეორე-ფაქტორის აუტენტიფიკაცია
   statuses:
@@ -467,15 +466,10 @@ ka:
     recovery_instructions_html: თუ როდესმე დაკარგავთ წვდომას თქვენს ტელეფონთან, შეგიძლიათ ქვემოთ მოცემული აღდგენის კოდები გამოიყენოთ, რათა მოიპოვოთ ხელმეორე წვდომა თქვენი ანგარიშისადმი. <strong>იქონიეთ აღდგენის კოდები დაცულად</strong>. მაგალითისთვის, შეგიძლიათ ამობეჭდოთ და შეინახოთ სხვა საბუთებთან ერთად.
   user_mailer:
     backup_ready:
-      explanation: თქვენ მოითხოვეთ თქვენი მასტოდონის ანგარიშის სრული რეზერვაცია. ის ახლა უკვე მზადაა გადმოსაწერად!
       subject: თქვენი არქივი გადმოსაწერად მზადაა
       title: არქივის მიღება
     welcome:
-      edit_profile_action: პროფილის მოწყობა
       explanation: აქ რამდენიმე რჩევაა დასაწყისისთვის
-      final_action: დაიწყე პოსტვა
-      full_handle: თქვენი სრული სახელური
-      full_handle_hint: ეს არის ის რასაც ეტყვით თქვენს მეგობრებს, რათა მოგწერონ ან გამოგყვნენ სხვა ინსტანციიდან.
       subject: კეთილი იყოს თქვენი მობრძანება მასტოდონში
       title: კეთილი იყოს თქვენი მობრძანება, %{name}!
   users:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index eeb8f16ae4..b2fc9d8477 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -5,19 +5,19 @@ kab:
     contact_missing: Ur yettusbadu ara
     contact_unavailable: Wlac
     hosted_on: Maṣṭudun yersen deg %{domain}
-    title: Γef
+    title: Ɣef
   accounts:
     follow: Ḍfeṛ
     followers:
       one: Umeḍfaṛ
       other: Imeḍfaṛen
-    following: Yeṭafaṛ
+    following: Yeṭṭafaṛ
     last_active: armud aneggaru
     nothing_here: Ulac kra da!
     posts:
-      one: Tajewwiqt
-      other: Tijewwiqin
-    posts_tab_heading: Tijewwiqin
+      one: Tasuffeɣt
+      other: Tisuffaɣ
+    posts_tab_heading: Tisuffaɣ
   admin:
     account_actions:
       action: Eg tigawt
@@ -47,7 +47,7 @@ kab:
       disable_two_factor_authentication: Gdel 2FA
       disabled: Yensa
       display_name: Isem ara d-yettwaskanen
-      domain: Taγult
+      domain: Taɣult
       edit: Ẓreg
       email: Imayl
       email_status: Addad n imayl
@@ -61,7 +61,7 @@ kab:
       invite_request_text: Timental n tmerna
       invited_by: Inced-it-id
       ip: Tansa IP
-      joined: Ikcemed deg
+      joined: Izeddi da seg ass n
       location:
         all: Akk
         local: Adigan
@@ -95,6 +95,7 @@ kab:
       remove_header: Kkes tacacit
       resend_confirmation:
         already_confirmed: Amseqdac-agi yettwasentem yakan
+        send: Ɛawed-iyi-d aseɣwen n usentem
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
@@ -111,7 +112,7 @@ kab:
         targeted_reports: Yettwazen uneqqis sɣur wiyaḍ
       silence: Sgugem
       silenced: Yettwasgugem
-      statuses: Tisuffɣin
+      statuses: Tisuffaɣ
       subscribe: Jerred
       suspended: Yeḥbes
       title: Imiḍanen
@@ -203,22 +204,22 @@ kab:
     announcements:
       destroyed_msg: Tamselɣut tettwakkes akken iwata!
       edit:
-        title: Ẓreg ulγu
-      empty: Ulac kra n ulγuyen.
+        title: Ẓreg ulɣu
+      empty: Ulac kra n yilɣa yettwafen.
       live: Srid
       new:
-        create: Rnu-d ulγu
-        title: Ulγu amaynut
+        create: Snlufu-d ulɣu
+        title: Ulɣu amaynut
       publish: Sufeɣ
       published_msg: Tamselɣut tettwasufeɣ-d akken iwata!
       scheduled_for: Yettusɣiwsen i %{time}
       scheduled_msg: Tamselɣut tettusɣiwes i usufeɣ!
-      title: Ulγuyen
+      title: Ilɣa
     custom_emojis:
       assign_category: Efk taggayt
-      by_domain: Taγult
+      by_domain: Taɣult
       copied_msg: Takna tadigant n imuji yettwarna-d mebla ugur
-      copy: Nγel
+      copy: Nɣel
       create_new_category: Rnu-d taggayt tamaynut
       created_msg: Imuji yettwarna-d mebla ugur!
       delete: Kkes
@@ -229,7 +230,8 @@ kab:
       enable: Rmed
       enabled: Yermed
       enabled_msg: Imuji yermed mebla ugur
-      list: Umuγ
+      image_hint: PNG neɣ GIF arma d %{size}
+      list: Tabdart
       new:
         title: Timerna n imuji udmawan amaynut
       overwrite: Semselsi
@@ -250,13 +252,14 @@ kab:
       add_new: Timerna n taɣult ɣer tabdert tamellalt
       created_msg: Taγult-a tettwarna γer wumuγ amellal mebla ugur
       destroyed_msg: Taγult-a tettwakkes seg umuγ amellal
+      export: Sifeḍ
       import: Kter
       undo: Kkes seg tebdart tamellalt
     domain_blocks:
       add_new: Rni iḥder amaynut n taɣult
       confirm_suspension:
         cancel: Sefsex
-      domain: Taγult
+      domain: Taɣult
       export: Sifeḍ
       import: Kter
       new:
@@ -274,11 +277,13 @@ kab:
     email_domain_blocks:
       add_new: Rnu amaynut
       delete: Kkes
-      domain: Taγult
+      domain: Taɣult
       new:
-        create: Rnu taγult
+        create: Rnu taɣult
         title: Timerna n taɣult tamaynut n imayl ɣer tebdart taberkant
       title: Tabdart taberkant n imayl
+    export_domain_blocks:
+      no_file: Ulac afaylu yettwafernen
     follow_recommendations:
       language: I tutlayt
       status: Addad
@@ -286,10 +291,12 @@ kab:
     instances:
       back_to_all: Akk
       back_to_limited: Ɣur-s talast
-      back_to_warning: Γur-wat
-      by_domain: Taγult
+      back_to_warning: Ɣur-wat
+      by_domain: Taɣult
       content_policies:
         policy: Tasertit
+      dashboard:
+        instance_languages_dimension: Tutlayin ifazen
       delivery:
         all: Akk
         clear: Sfeḍ tuccḍiwin n usiweḍ
@@ -306,7 +313,7 @@ kab:
       private_comment: Awennit uslig
       public_comment: Awennit azayez
       title: Tamatut
-      total_blocked_by_us: Ttwasḥebsen sγur-neγ
+      total_blocked_by_us: Ttwasḥebsen sɣur-neɣ
       total_followed_by_them: Ṭtafaṛen-t
       total_followed_by_us: Neṭṭafaṛ-it
       total_reported: Ineqqisen fell-asen
@@ -354,12 +361,15 @@ kab:
           other: "%{count} n timawin"
       action_taken_by: Tigawt yettwaṭṭfen sɣur
       are_you_sure: Tetḥaq-eḍ?
+      cancel: Sefsex
       category: Taggayt
       comment:
         none: Ula yiwen
       confirm: Sentem
+      delete_and_resolve: Kkes tisuffaɣ
       mark_as_resolved: Creḍ-it yefra
       mark_as_unresolved: Creḍ-it ur yefra ara
+      no_one_assigned: Ula yiwen
       notes:
         create: Rnu tazmilt
         create_and_resolve: Fru s tamawt
@@ -378,8 +388,10 @@ kab:
     roles:
       categories:
         administration: Tadbelt
+        invites: Iɛeṛṛuḍen
         moderation: Aseɣyed
       delete: Kkes
+      everyone: Tisirag timezwura
       privileges:
         administrator: Anedbal
     rules:
@@ -390,37 +402,59 @@ kab:
       title: Ilugan n uqeddac
     settings:
       about:
-        title: Γef
+        title: Ɣef
       appearance:
         title: Udem
       discovery:
-        profile_directory: Akaram n imaγnuten
+        profile_directory: Akaram n imaɣnuten
         trends: Ayen mucaɛen
       domain_blocks:
         all: I medden akk
-        disabled: Γef ula yiwen
-        users: Γef yimseqdacen idiganen i yeqqnen
+        disabled: Ɣef ula yiwen
+        users: Ɣef yimseqdacen idiganen i yeqqnen
       registrations:
         title: Ajerred
       registrations_mode:
         modes:
           none: Yiwen·t ur yzmir ad izeddi
           open: Zemren akk ad jerden
+      title: Iɣewwaṛen n uqeddac
     site_uploads:
       delete: Kkes afaylu yulin
+    software_updates:
+      documentation_link: Issin ugar
+      type: Anaw
+      version: Lqem
     statuses:
+      account: Ameskar
       application: Asnas
-      back_to_account: Tuγalin γer usebter n umiḍan
+      back_to_account: Tuɣalin ɣer usebter n umiḍan
       deleted: Yettwakkes
       favourites: Imenyafen
       language: Tutlayt
       media:
-        title: Taγwalt
-      title: Tisuffiγin n umiḍan
-      with_media: S taγwalt
+        title: Amidya
+      open: Ldi tasuffeɣt
+      title: Tisuffaɣ n umiḍan
+      trending: Ayen mucaɛen
+      visibility: Abani
+      with_media: S umidya
+    system_checks:
+      rules_check:
+        action: Sefrek ilugan n uqeddac
+      software_version_critical_check:
+        action: Wali ileqqman yellan
+      software_version_patch_check:
+        action: Wali ileqqman yellan
     title: Tadbelt
     trends:
       allow: Sireg
+      statuses:
+        title: Tisuffaɣ mucaɛen
+      tags:
+        dashboard:
+          tag_languages_dimension: Tutlayin ifazen
+      trending: Ayen mucaɛen
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
@@ -431,9 +465,14 @@ kab:
     new_report:
       body: "%{reporter} yettwazen ɣef %{target}"
       subject: Aneqqis amaynut i %{instance} (#%{id})
+    new_trends:
+      new_trending_statuses:
+        title: Tisuffaɣ mucaɛen
   appearance:
+    advanced_web_interface: Agrudem n web leqqayen
     discovery: Asnirem
     localization:
+      body: Mastodon suqqlen-t-id yiwiziwen.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Yal yiwen·t y·tezmer a ttekki.
     sensitive_content: Agbur amḥulfu
@@ -443,38 +482,76 @@ kab:
     view_profile: Ssken-d amaɣnu
     view_status: Ssken-d tasuffiɣt
   applications:
+    created: Yennulfa-d wesnas akken iwata
+    destroyed: Yettwakkes wesnas-nni akken iwata
     logout: Ffeɣ
     token_regenerated: Ajuṭu n unekcum yettusirew i tikkelt-nniḍen akken iwata
     your_token: Ajiṭun-ik·im n unekcum
   auth:
     apply_for_account: Suter amiḍan
+    captcha_confirmation:
+      title: Asefqed n tɣellist
+    confirmations:
+      clicking_this_link: tekki ɣef wassaɣ-a
+      proceed_to_login_html: Tzemreḍ tura ad tkemmleḍ ɣer %{login_link}.
+      welcome_title: Ansuf yessek·em, %{name}!
     delete_account: Kkes amiḍan
     description:
       prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
       prefix_sign_up: Zeddi di Maṣṭudun assa!
+      suffix: S umiḍan, tzemreḍ ad tḍefreḍ imdanen, ad d-tessufɣeḍ tisuffaɣ d wembadal n yiznan akked yiseqdacen n yal aqeddac Mastodon d wayen-nniḍen!
+    didnt_get_confirmation: Ur d-teṭṭifeḍ ara aseɣwen n usentem ?
+    dont_have_your_security_key: Ulac ɣur-k·m tasarut-ik·im n tɣellist?
     forgot_password: Tettud awal-ik uffir?
     log_in_with: Qqen s
     login: Qqen
-    logout: Ffeγ
-    migrate_account: Gujj γer umiḍan nniḍen
-    or_log_in_with: Neγ eqqen s
+    logout: Ffeɣ
+    migrate_account: Gujj ɣer umiḍan nniḍen
+    or_log_in_with: Neɣ eqqen s
+    privacy_policy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
+    progress:
+      confirm: Sentem imayl
+      details: Isalli-inek
+      review: Tamuɣli-nneɣ
+      rules: Qbel ilugan
     providers:
       cas: CAS
       saml: SAML
     register: Jerred
     registration_closed: "%{instance} ur yeqbil ara imttekkiyen imaynuten"
+    resend_confirmation: Ɛawed-iyi-d aseɣwen n usentem
     reset_password: Wennez awal uffir
     rules:
+      accept: Qbel
       back: Tuɣalin
-    security: Taγellist
+      invited_by: 'Tzemreḍ ad tkecmeḍ ɣer %{domain} s tanemmirt i tinnubga i d-teṭṭfeḍ sɣur :'
+      preamble_invited: Uqbel ad tkemmleḍ, ttxil-k·m ẓer ilugan i d-sbedden yimkariyen n %{domain}.
+      title: Kra n yilugan igejdanen.
+      title_invited: Tettwaɛerḍeḍ.
+    security: Taɣellist
     set_new_password: Egr-d awal uffir amaynut
+    setup:
+      email_below_hint_html: Ssefqed akaram-inek·inem n uspam neɣ ssuter wayeḍ. Tzemreḍ ad tesseɣtiḍ tansa-inek·inem imayl ma yella ur tṣeḥḥa ara.
+      email_settings_hint_html: Sit ɣef useɣwen i ak-d-nceyyeε akken ad tesfeqdeḍ %{email}. Ad nerǧu da kan.
+      link_not_received: Ur k-id-iṣaḥ ara wassaɣ ?
+      new_confirmation_instructions_sent: Ad d-teṭṭfeḍ imayl amaynut s useɣwen n usentem ssya ɣef kra n ddqayeq!
+    sign_in:
+      preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
+      title: Akeččum ɣer %{domain}
+    sign_up:
+      preamble: S umiḍan deg uqeddac-a n Mastodon, ad tizmireḍ ad tḍefreḍ win i ak·kem-yehwan deg uẓeṭṭa, anida yebɣu yili umiḍan-nnsen.
+      title: Iyya ad d-nessewjed tiɣawsiwin i %{domain}.
     status:
       account_status: Addad n umiḍan
+      functional: Amiḍan-inek·inem yetteddu s lekmal-is.
     use_security_key: Seqdec tasarut n teɣlist
   challenge:
     confirm: Kemmel
     invalid_password: Yir awal uffir
     prompt: Sentem awal uffir send ad tkemleḍ
+  crypto:
+    errors:
+      invalid_key: maci d tasarut tameɣtut n Ed25519 neɣ Curve25519
   date:
     formats:
       default: "%d %b %Y"
@@ -494,20 +571,30 @@ kab:
       x_months: "%{count}agu"
       x_seconds: "%{count}tas"
   deletes:
+    challenge_not_passed: Ur iṣeḥḥa ara yisalli-nni i teskecmeḍ
+    confirm_password: Sekcem awal-ik·im uffir n tura akken ad tesfeqdeḍ tamagit-ik·im
     proceed: Kkes amiḍan
     warning:
       username_available: Isem-ik·im n useqdac ad yuɣal yella i tikkelt-nniḍen
       username_unavailable: Isem-ik·im n useqdac ad yeqqim ulac-it
+  disputes:
+    strikes:
+      status: 'Tasuffeɣt #%{id}'
+      title_actions:
+        none: Ɣur-wat
+  edit_profile:
+    basic_information: Talɣut tamatut
+    hint_html: "<strong>Mudd udem i wayen ttwalin medden deg umaɣnu-inek azayez ɣer yidis n yiznan-ik.</strong> Imdanen niḍen zemren ad k-ḍefren yernu ad gen assaɣ yid-k mi ara tesɛuḍ amaɣnu yeccuṛen ed tugna n umaɣnu."
   errors:
     '500':
-      title: Asebter-ayi d arameγtu
+      title: Asebter-ayi d arameɣtu
   existing_username_validator:
     not_found_multiple: ur yezmir ara ad yaf %{usernames}
   exports:
     archive_takeout:
       date: Azemz
       download: Sider-d aḥraz-ik·im
-      size: Teγzi
+      size: Teɣzi
     bookmarks: Ticraḍ
     csv: CSV
     lists: Tibdarin
@@ -516,14 +603,19 @@ kab:
     add_new: Rnu amaynut
   filters:
     contexts:
-      account: Imuγna
-      notifications: Tilγa
+      account: Imeɣna
+      notifications: Ilɣa
       thread: Idiwenniyen
     edit:
+      add_keyword: Rnu awal tasarut
+      keywords: Awalen n tsarut
       title: Ẓreg amzizdig
     index:
       delete: Kkes
       empty: Ur tesɛid ara imzizdigen.
+      statuses:
+        one: "%{count} n tsuffeɣt"
+        other: "%{count} n tsuffaɣ"
       title: Imzizdigen
     new:
       save: Sekles amsizdeg amaynut
@@ -534,13 +626,20 @@ kab:
         remove: Kkes seg umsizdeg
   generic:
     all: Akk
+    cancel: Sefsex
     changes_saved_msg: Ttwaskelsen ibelliden-ik·im akken ilaq!
-    copy: Nγel
+    confirm: Sentem
+    copy: Nɣel
     delete: Kkes
+    none: Ula yiwen
     order_by: Sizwer s
     save_changes: Sekles ibeddilen
     today: ass-a
   imports:
+    errors:
+      empty: Afaylu CSV d ilem
+      too_large: Bezzaf meqqer ufaylu
+    failures: Tuccḍiwin
     modes:
       merge: Smezdi
       overwrite: Semselsi
@@ -548,6 +647,7 @@ kab:
       blocking: Tabdart n yimiḍanen iweḥlen
       bookmarks: Ticraḍ
       following: Tabdert n wid teṭṭafareḍ
+      lists: Tibdarin
       muting: Tabdert n wid tesgugmeḍ
     upload: Sali
   invites:
@@ -561,11 +661,14 @@ kab:
       '604800': 1 umalas
       '86400': 1 wass
     expires_in_prompt: Werǧin
+    generate: Slaled aseɣwen n uɛraḍ
+    invalid: Aneɛruḍ-a ur iṣeḥḥa ara
     invited_by: 'Tettwaɛraḍeḍ s ɣur:'
     max_uses:
       one: 1 uuseqdec
       other: "%{count} yiseqdac"
     max_uses_prompt: Ulac talast
+    prompt: Slaled rnu bḍu assaɣen d wiyaḍ akken ad kecmen ɣer uqeddac-a
     table:
       expires_at: Ad ifat di
     title: Ɛreḍ-d kra n yimdanen
@@ -575,7 +678,7 @@ kab:
       sign_in_token: tangalt n tɣellist n tansa imayl
       webauthn: tisura n tɣellist
   migrations:
-    acct: Ibeddel γer
+    acct: Ibeddel ɣer
     incoming_migrations: Tusiḍ-d seg umiḍan nniḍen
     proceed_with_move: Awid imeḍfaṛen-ik
   moderation:
@@ -596,8 +699,6 @@ kab:
       subject: Yuder-ik·ikem-id %{name}
     reblog:
       subject: "%{name} yesselha addad-ik·im"
-  notifications:
-    other_settings: Iγewwaṛen nniḍen n tilγa
   number:
     human:
       decimal_units:
@@ -611,29 +712,39 @@ kab:
     setup: Sbadu
   pagination:
     newer: Amaynut
-    next: Γer zdat
+    next: Ɣer zdat
     older: Aqbuṛ
     prev: Win iɛeddan
   preferences:
     other: Wiyaḍ
+  privacy:
+    privacy: Tabaḍnit
+    search: Anadi
   privacy_policy:
     title: Tasertit tabaḍnit
+  redirects:
+    prompt: Ma tumneḍ aseɣwen-a, sit fell-as akken ad tkemmleḍ.
+    title: Aql-ik·em ad teffɣeḍ seg %{instance}.
   relationships:
     activity: Armud n umiḍan
     followers: Imeḍfaṛen
-    following: Yeṭafaṛ
+    following: Yeṭṭafaṛ
     invited: Yettwancad
     last_active: Armud aneggaru
     most_recent: Melmi kan
     moved: Igujj
     primary: Agejdan
     relationship: Assaɣ
+    remove_selected_follows: Ur ṭṭafar ara iseqdacen yettwafernen
     status: Addad n umiḍan
+  rss:
+    content_warning: 'Alɣu n ugbur :'
   sessions:
     activity: Armud aneggaru
     browser: Iminig
     browsers:
       alipay: Alipay
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
@@ -647,38 +758,43 @@ kab:
       phantom_js: PhantomJS
       qq: Iminig QQ
       safari: Safari
+      unknown_browser: Iminig arussin
       weibo: Weibo
-    current_session: Tiγimit tamirant
+    current_session: Tiɣimit tamirant
+    date: Azemz
     description: "%{browser} s %{platform}"
+    explanation: Ha-t-en yiminigen web ikecmen akka tura ɣer umiḍan-ik·im Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
       android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
       windows: Windows
       windows_mobile: Windows Mobile
-      windows_phone: Tiliγri Windows Phone
+      windows_phone: Tiliɣri Windows Phone
     revoke: Ḥwi
     title: Tiɣimiyin
   settings:
     account: Amiḍan
-    account_settings: Iγewwaṛen n umiḍan
+    account_settings: Iɣewwaṛen n umiḍan
     appearance: Udem
     authorized_apps: Isnasen yettussirgen
-    back: Uγal γer Maṣṭudun
+    back: Uɣal ɣer Maṣṭudun
     delete: Tukksa n umiḍan
     development: Taneflit
-    edit_profile: Ẓreg amaγnu
+    edit_profile: Ẓreg amaɣnu
     export: Taktert n yisefka
     import: Kter
     import_and_export: Taktert d usifeḍ
     migrate: Tunigin n umiḍan
-    notifications: Tilγa
     preferences: Imenyafen
-    profile: Ameγnu
+    profile: Ameɣnu
     relationships: Imeḍfaṛen akked wid i teṭṭafaṛeḍ
     statuses_cleanup: Tukksa tawurmant n tsuffaɣ
     two_factor_authentication: Asesteb s snat n tarrayin
@@ -705,7 +821,6 @@ kab:
         other: "%{count} n yedɣaren"
       vote: Dɣeṛ
     show_more: Ssken-d ugar
-    show_newer: Ssken-d timaynutin
     show_thread: Ssken-d lxiḍ
     title: '%{name} : "%{quote}"'
     visibilities:
@@ -735,6 +850,8 @@ kab:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
   two_factor_authentication:
     add: Rnu
     disable: Gdel
@@ -746,23 +863,36 @@ kab:
     webauthn: Tisura n teɣlist
   user_mailer:
     appeal_approved:
-      action: Ddu ɣer umiḍan-ik·im
+      action: Iɣewwaṛen n umiḍan
     warning:
       categories:
         spam: Aspam
       title:
         disable: Amiḍan i igersen
-        none: Γur-wat
+        none: Ɣur-wat
         silence: Amiḍan yesɛa talast
         suspend: Amiḍan yettwaḥbas
     welcome:
-      final_action: Bdu asuffeɣ
-      full_handle: Tansa umiḍan-ik takemmalit
-      subject: Ansuf γer Maṣṭudun
+      apps_android_action: Awi-t-id seg Google Play
+      apps_ios_action: Sader-it-id seg App Store
+      apps_step: Zdem-d isnasen-nneɣ unṣiben.
+      apps_title: Isnasen n Mastodon
+      feature_action: Issin ugar
+      follow_action: Ḍfeṛ
+      follows_title: Anwa ara ḍefṛeḍ
+      follows_view_more: Ssken-d ugar n medden ay tzemred ad tḍefred
+      post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
+      post_title: Aru tasuffeɣt-inek·inem tamezwarut
+      share_action: Bḍu
+      share_step: Init-asen i yimeddukal-nwen amek ara ken-id-afen deg Mastodon.
+      share_title: Bḍu amaɣnu-inek·inem n Mastodon
+      sign_in_action: Qqen
+      subject: Ansuf ɣer Maṣṭudun
       title: Ansuf yessek·em, %{name}!
   users:
     signed_in_as: 'Teqqneḍ amzun d:'
   verification:
+    here_is_how: Ha-t-a amek
     verification: Asenqed
   webauthn_credentials:
     add: Rnu tasarut n teɣlist tamaynut
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 98fe37f296..f08d8ead1a 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -539,7 +539,6 @@ kk:
   notifications:
     email_events: E-mail ескертпелеріне шаралар
     email_events_hint: 'Ескертпе болып келетін шараларды таңда:'
-    other_settings: Ескертпелердің басқа баптаулары
   number:
     human:
       decimal_units:
@@ -644,7 +643,6 @@ kk:
     import: Импорт
     import_and_export: Импорт/экспорт
     migrate: Аккаунт көшіру
-    notifications: Ескертпелер
     preferences: Баптаулар
     profile: Профиль
     relationships: Жазылымдар және оқырмандар
@@ -705,7 +703,6 @@ kk:
     recovery_instructions_html: Егер сіз телефонға кіруді жоғалтсаңыз, тіркелгіңізге кіру үшін төмендегі қалпына келтіру кодтарының бірін пайдалануға болады. <strong>Қалпына келтіру кодтарын қауіпсіз ұстаңыз </strong>. Мысалы, оларды басып шығарып, оларды басқа маңызды құжаттармен сақтауға болады.
   user_mailer:
     backup_ready:
-      explanation: Сіз Mastodon аккаунтыңыздың толық мұрағатын сұрадыңыз. Қазір жүктеуге дайын!
       subject: Мұрағатыңыз түсіріп алуға дайын
       title: Мұрағатты алу
     warning:
@@ -720,11 +717,7 @@ kk:
         silence: Аккаунт шектеулі
         suspend: Аккаунт тоқтатылды
     welcome:
-      edit_profile_action: Профиль өңдеу
       explanation: Мына кеңестерді шолып өтіңіз
-      final_action: Жазба жазу
-      full_handle: Желі тұтқасы
-      full_handle_hint: This is what you would tell your friends so they can message or follow you frоm another server.
       subject: Mastodon Желісіне қош келдіңіз
       title: Ортаға қош келдің, %{name}!
   users:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 76bb3bd9f1..f3f3e3a8fb 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,7 +1,7 @@
 ---
 ko:
   about:
-    about_mastodon_html: '미래의 소셜 네트워크: 광고 없음, 기업 감시 없음, 윤리적 설계, 탈중앙화! 여러분만의 데이터를 Mastodon으로 소유하세요!'
+    about_mastodon_html: '미래의 소셜 네트워크: 광고 없음, 기업 감시 없음, 윤리적 설계, 탈중앙화! 여러분만의 데이터를 Mastodon으로 보호하고 누리세요!'
     contact_missing: 미설정
     contact_unavailable: 없음
     hosted_on: "%{domain}에서 호스팅 되는 마스토돈"
@@ -67,7 +67,7 @@ ko:
       enable: 동결 해제
       enable_sign_in_token_auth: 이메일 토큰 인증 활성화
       enabled: 활성
-      enabled_msg: "%{username}의 계정을 성공적으로 얼리기 해제하였습니다"
+      enabled_msg: "%{username}의 동결을 성공적으로 해제 했습니다."
       followers: 팔로워
       follows: 팔로우
       header: 헤더
@@ -75,7 +75,7 @@ ko:
       invite_request_text: 가입하려는 이유
       invited_by: 초대자
       ip: IP
-      joined: 가입
+      joined: 가입 날짜
       location:
         all: 전체
         local: 로컬
@@ -93,7 +93,7 @@ ko:
         pending: 대기 중
         silenced: 제한됨
         suspended: 정지
-        title: 중재
+        title: 관리
       moderation_notes: 중재 참고사항
       most_recent_activity: 최근 활동
       most_recent_ip: 최근 IP
@@ -103,7 +103,7 @@ ko:
       not_subscribed: 구독하지 않음
       pending: 심사 대기
       perform_full_suspension: 정지
-      previous_strikes: 이전의 처벌들
+      previous_strikes: 과거 처벌
       previous_strikes_description_html:
         other: 이 계정에는 <strong>%{count}</strong>번의 처벌이 있었습니다.
       promote: 승급
@@ -116,7 +116,7 @@ ko:
       rejected_msg: 성공적으로 %{username}의 가입 신청서를 반려하였습니다
       remote_suspension_irreversible: 이 계정의 데이터는 되돌릴 수 없도록 삭제되었습니다.
       remote_suspension_reversible_hint_html: 이 계정은 계정이 속한 서버에서 정지되었습니다, 그리고 %{date}에 데이터가 완전히 삭제될 것입니다. 그 때까지는 해당 서버에서 계정을 그대로 복구할 수 있습니다. 만약 지금 당장 이 계정의 모든 데이터를 삭제하고 싶다면, 아래에서 실행할 수 있습니다.
-      remove_avatar: 아바타 지우기
+      remove_avatar: 아바타 삭제
       remove_header: 헤더 삭제
       removed_avatar_msg: 성공적으로 %{username}의 아바타 이미지를 삭제하였습니다
       removed_header_msg: 성공적으로 %{username}의 헤더 이미지를 삭제하였습니다
@@ -525,7 +525,7 @@ ko:
       total_followed_by_us: 우리가 한 팔로우
       total_reported: 이들에 대한 신고
       total_storage: 미디어 첨부
-      totals_time_period_hint_html: 아래에 표시된 총계에는 모든 시간에 대한 데이터가 포함됩니다.
+      totals_time_period_hint_html: 아래에 표시된 총계는 역대 데이터에 대한 것입니다.
       unknown_instance: 현재 이 서버에서 해당 도메인에 대한 기록은 없습니다.
     invites:
       deactivate_all: 전부 비활성화
@@ -587,6 +587,9 @@ ko:
       actions_description_html: 이 신고를 해결하기 위해 취해야 할 조치를 지정해주세요. 신고된 계정에 대해 처벌 조치를 취하면, <strong>스팸</strong> 카테고리가 선택된 경우를 제외하고 해당 계정으로 이메일 알림이 전송됩니다.
       actions_description_remote_html: 이 신고를 해결하기 위해 실행할 행동을 결정하세요. 이 결정은 이 원격 계정과 그 콘텐츠를 다루는 방식에 대해 <strong>이 서버</strong>에서만 영향을 끼칩니다
       add_to_report: 신고에 더 추가하기
+      already_suspended_badges:
+        local: 이 서버에서 이미 정지되었습니다
+        remote: 저 서버에서 이미 정지되었습니다
       are_you_sure: 확실합니까?
       assign_to_self: 나에게 할당하기
       assigned: 할당된 중재자
@@ -736,6 +739,7 @@ ko:
         desc_html: 이것은 hCaptcha의 외부 스크립트에 의존합니다, 이것은 개인정보 보호에 위협을 가할 수도 있습니다. 추가적으로, <strong>이것은 몇몇 사람들(특히나 장애인들)에게 가입 절차의 접근성을 심각하게 떨어트릴 수 있습니다</strong>. 이러한 이유로, 대체제로 승인 전용이나 초대제를 통한 가입을 고려해보세요.
         title: 새로운 사용자가 계정 확인을 위해서는 CAPTCHA를 풀어야 하도록 합니다
       content_retention:
+        danger_zone: 위험한 영역
         preamble: 마스토돈에 저장된 사용자 콘텐츠를 어떻게 다룰지 제어합니다.
         title: 콘텐츠 보존기한
       default_noindex:
@@ -755,6 +759,7 @@ ko:
         disabled: 아무에게도 안 함
         users: 로그인 한 사용자에게
       registrations:
+        moderation_recommandation: 모두에게 가입을 열기 전에 적절하고 반응이 빠른 중재 팀을 데리고 있는지 확인해 주세요!
         preamble: 누가 이 서버에 계정을 만들 수 있는지 제어합니다.
         title: 가입
       registrations_mode:
@@ -762,6 +767,7 @@ ko:
           approved: 가입하려면 승인이 필요함
           none: 아무도 가입 할 수 없음
           open: 누구나 가입 할 수 있음
+        warning_hint: 당신의 중재 팀이 스팸이나 악의적인 가입을 시기적절하게 처리할 수 있다고 자신할 수 없다면 "가입이 승인을 요구하도록" 설정하는 것을 추천합니다.
       security:
         authorized_fetch: 연합된 서버들에게서 인증 필수
         authorized_fetch_hint: 연합된 서버들에게서 인증을 요구하는 것은 사용자 레벨과 서버 레벨의 차단을 좀 더 확실하게 해줍니다. 한편으로는 성능적인 페널티, 답글의 전달 범위 감소, 몇몇 연합된 서비스들과의 호환성 문제가 있을 가능성이 있습니다. 추가적으로 이 기능은 전용 액터가 공개된 게시물이나 계정을 페치하는 것은 막지 않습니다.
@@ -950,6 +956,9 @@ ko:
       title: 웹훅
       webhook: 웹훅
   admin_mailer:
+    auto_close_registrations:
+      body: 최근 모더레이터 활동 부족으로, %{instance}가 안좋은 일에 사용되는 것을 방지하기 위해 %{instance}의 가입이 수동 심사를 요구하도록 자동으로 변경되었습니다. 언제든지 가입을 다시 열 수 있습니다.
+      subject: "%{instance}의 가입이 승인을 필요로 하도록 자동으로 변경되었습니다"
     new_appeal:
       actions:
         delete_statuses: 게시물을 삭제하는 것
@@ -971,7 +980,7 @@ ko:
     new_report:
       body: "%{reporter} 님이 %{target}를 신고했습니다"
       body_remote: "%{domain}의 누군가가 %{target}을 신고했습니다"
-      subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+      subject: "%{instance}의 새로운 신고(#%{id})"
     new_software_updates:
       body: 새 마스토돈 버전이 릴리스되었습니다. 업데이트 할 수 있습니다!
       subject: "%{instance}에 대해 새 마스토돈 버전이 사용 가능합니다!"
@@ -1110,7 +1119,7 @@ ko:
   date:
     formats:
       default: "%Y-%m-%d"
-      with_month_name: "%Y년 %f월 %e일"
+      with_month_name: "%Y년 %B %d일"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}시간"
@@ -1466,7 +1475,6 @@ ko:
     administration_emails: 관리자 이메일 알림
     email_events: 이메일 알림에 대한 이벤트
     email_events_hint: '알림 받을 이벤트를 선택해주세요:'
-    other_settings: 기타 알림 설정
   number:
     human:
       decimal_units:
@@ -1522,6 +1530,9 @@ ko:
     errors:
       limit_reached: 리액션 갯수 제한에 도달했습니다
       unrecognized_emoji: 인식 되지 않은 에모지입니다
+  redirects:
+    prompt: 이 링크를 믿을 수 있다면, 클릭해서 계속하세요.
+    title: "%{instance}를 떠나려고 합니다."
   relationships:
     activity: 계정 활동
     confirm_follow_selected_followers: 정말로 선택된 팔로워들을 팔로우하시겠습니까?
@@ -1584,6 +1595,7 @@ ko:
       unknown_browser: 알 수 없는 브라우저
       weibo: 웨이보
     current_session: 현재 세션
+    date: 날짜
     description: "%{platform}의 %{browser}"
     explanation: 내 마스토돈 계정에 로그인되어 있는 웹 브라우저 목록입니다.
     ip: IP
@@ -1620,14 +1632,26 @@ ko:
     import: 데이터 가져오기
     import_and_export: 가져오기 & 내보내기
     migrate: 계정 이동
-    notifications: 알림
+    notifications: 이메일 알림
     preferences: 환경설정
     profile: 공개 프로필
     relationships: 팔로잉과 팔로워
+    severed_relationships: 단절된 관계들
     statuses_cleanup: 게시물 자동 삭제
     strikes: 중재 기록
     two_factor_authentication: 2단계 인증
     webauthn_authentication: 보안 키
+  severed_relationships:
+    download: 다운로드 (%{count})
+    event_type:
+      account_suspension: 계정 정지 (%{target_name})
+      domain_block: 서버 정지 (%{target_name})
+      user_domain_block: 내가 %{target_name}을 차단했습니다
+    lost_followers: 잃은 팔로워
+    lost_follows: 잃은 팔로우
+    preamble: 내가 도메인을 차단하거나 중재진이 다른 서버를 정지하기로 결정했다면 내 팔로우와 팔로워를 잃게 됩니다. 그런 일이 일어났다면 그로 인해 단절된 관계들의 목록을 다운로드 받아 확인하고 다른 서버에서 불러올 수 있습니다.
+    purged: 이 서버에 대한 정보는 관리자에 의해 삭제되었습니다.
+    type: 이벤트
   statuses:
     attached:
       audio:
@@ -1659,8 +1683,6 @@ ko:
         other: "%{count}명 투표함"
       vote: 투표
     show_more: 더 보기
-    show_newer: 새로운 것 표시
-    show_older: 오래된 것 표시
     show_thread: 글타래 보기
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1687,7 +1709,7 @@ ko:
     keep_pinned: 고정된 게시물 유지
     keep_pinned_hint: 고정 게시물을 삭제하지 않습니다
     keep_polls: 설문 유지
-    keep_polls_hint: 설문을 삭제하지 않았음
+    keep_polls_hint: 설문을 삭제하지 않습니다
     keep_self_bookmark: 북마크한 게시물 유지
     keep_self_bookmark_hint: 북마크한 본인의 게시물을 삭제하지 않습니다
     keep_self_fav: 내가 좋아요한 게시물 유지
@@ -1717,10 +1739,11 @@ ko:
     contrast: 마스토돈 (고대비)
     default: 마스토돈 (어두움)
     mastodon-light: 마스토돈 (밝음)
+    system: 자동 선택 (시스템 테마 이용)
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
-      month: "%Y년 %f월"
+      month: "%Y년 %b"
       time: "%H:%M"
       with_time_zone: "%Y-%m-%d %H:%M %Z"
   translation:
@@ -1744,18 +1767,27 @@ ko:
     webauthn: 보안 키
   user_mailer:
     appeal_approved:
-      action: 내 계정으로 가기
+      action: 계정 설정
       explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
       subject: 귀하가 %{date}에 작성한 소명이 승낙되었습니다
+      subtitle: 계정이 다시 정상적인 상태입니다.
       title: 소명이 받아들여짐
     appeal_rejected:
       explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했지만 반려되었습니다."
       subject: "%{date}에 작성한 소명이 반려되었습니다."
+      subtitle: 소명이 기각되었습니다.
       title: 이의 제기가 거절되었습니다
     backup_ready:
-      explanation: 마스토돈 계정의 전체 백업을 요청하셨지요. 이제 다운로드할 수 있습니다!
+      explanation: 마스토돈 계정에 대한 전체 백업을 요청했습니다
+      extra: 다운로드 할 준비가 되었습니다!
       subject: 아카이브를 다운로드할 수 있습니다
       title: 아카이브 테이크아웃
+    failed_2fa:
+      details: '로그인 시도에 대한 상세 정보입니다:'
+      explanation: 누군가가 내 계정에 로그인을 시도했지만 2차인증에 올바른 값을 입력하지 못했습니다.
+      further_actions_html: 만약 당신이 한 게 아니었다면 유출의 가능성이 있으니 가능한 빨리 %{action} 하시기 바랍니다.
+      subject: 2차 인증 실패
+      title: 2차 인증에 실패했습니다
     suspicious_sign_in:
       change_password: 암호 변경
       details: '로그인에 대한 상세 정보입니다:'
@@ -1795,13 +1827,43 @@ ko:
         silence: 계정 제한 됨
         suspend: 계정 정지 됨
     welcome:
-      edit_profile_action: 프로필 설정
-      edit_profile_step: 프로필 사진을 업로드하거나 사람들에게 표시할 이름을 바꾸는 것 등으로 자신의 프로필을 커스텀 할 수 있습니다. 새로운 팔로워를 검토 후에 허용하도록 할 수도 있습니다.
+      apps_android_action: Google Play에서 다운로드
+      apps_ios_action: App Store에서 다운로드
+      apps_step: 공식 앱을 다운로드해보세요.
+      apps_title: Mastodon 앱
+      checklist_subtitle: '이 새로운 소셜미디어를 시작해봅시다:'
+      checklist_title: 환영 체크리스트
+      edit_profile_action: 개인 맞춤
+      edit_profile_step: 의미있는 프로필을 작성해 상호작용을 늘려보세요.
+      edit_profile_title: 프로필 꾸미기
       explanation: 시작하기 전에 몇가지 팁들을 준비했습니다
-      final_action: 포스팅 시작하기
-      final_step: '게시물을 올리세요! 팔로워가 없더라도, 공개 게시물들은 다른 사람에게 보여질 수 있습니다, 예를 들자면 로컬이나 연합 타임라인 등이 있습니다. 사람들에게 자신을 소개하고 싶다면 #툿친소 해시태그를 이용해보세요.'
-      full_handle: 당신의 풀 핸들은 다음과 같습니다
-      full_handle_hint: 이것을 당신의 친구들에게 알려주면 다른 서버에서 팔로우 하거나 메시지를 보낼 수 있습니다.
+      feature_action: 더 알아보기
+      feature_audience: 마스토돈은 중개자 없이 청중을 관리할 수 있는 특별한 가능성을 제공합니다. 자체 인프라에 배포된 마스토돈을 사용하면 온라인에 있는 다른 마스토돈 서버에도 팔로우하거나 팔로우할 수 있으며, 본인 외에는 누구의 통제도 받지 않습니다.
+      feature_audience_title: 신뢰 있는 청중 구축
+      feature_control: 내가 홈 피드에서 무엇을 보고 싶은지는 내가 제일 잘 압니다. 알고리즘이나 시간을 낭비하게 만드는 광고는 없습니다. 계정 하나로 다른 마스토돈 서버에 있는 누구나 팔로우 하여 그들의 게시물을 시간순으로 받아보고 인터넷의 한 구석을 좀 더 나답게 만들어 보세요.
+      feature_control_title: 내 타임라인에 대해 통제권을 유지하세요
+      feature_creativity: 마스토돈은 오디오, 비디오, 사진, 접근성 설명(alt),  투표, 콘텐츠 주의 (블라인드), 움직이는 아바타, 커스텀 이모티콘, 썸네일 자르기, 그리고 더 많은 것들을 당신이 온라인에서 당신을 더 잘 드러낼 수 있도록 돕기위해 지원합니다. 당신이 그림이나 음악을 올리던, 팟캐스트 같은것을 진행하던 마스토돈이 함께합니다.
+      feature_creativity_title: 독보적인 창의성
+      feature_moderation: 마스토돈은 의사 결정권을 사용자에게 돌려줍니다. 각 서버는 기업 소셜 미디어처럼 하향식이 아닌 로컬에서 시행되는 자체 규칙과 규정을 만들 수 있어 다양한 그룹의 요구에 가장 유연하게 대응할 수 있습니다. 동의하는 규칙이 있는 서버에 가입하거나 직접 서버를 호스팅하세요.
+      feature_moderation_title: 올바른 중재
+      follow_action: 팔로우
+      follow_step: 흥미로운 사람들을 팔로우하는 것이 마스토돈의 전부입니다.
+      follow_title: 내게 맞는 홈 피드 꾸미기
+      follows_subtitle: 잘 알려진 계정들을 팔로우
+      follows_title: 누구를 팔로우 할 지
+      follows_view_more: 팔로우 할 사람들 더 보기
+      hashtags_recent_count:
+        other: 최근 2일동안 %{people} 명
+      hashtags_subtitle: 최근 2일간 무엇이 유행했는지 둘러보기
+      hashtags_title: 유행하는 해시태그
+      hashtags_view_more: 유행하는 해시태그 더 보기
+      post_action: 작성
+      post_step: 글, 사진, 영상, 또는 투표로 세상에 인사해보세요.
+      post_title: 첫번째 게시물 쓰기
+      share_action: 공유
+      share_step: 친구에게 마스토돈에서 나를 찾을 수 있는 방법을 알려주세요.
+      share_title: 마스토돈 프로필을 공유하세요
+      sign_in_action: 로그인
       subject: 마스토돈에 오신 것을 환영합니다
       title: 환영합니다 %{name} 님!
   users:
@@ -1809,6 +1871,7 @@ ko:
     go_to_sso_account_settings: ID 공급자의 계정 설정으로 이동
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
     otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
+    rate_limited: 너무 많은 인증 시도가 있었습니다, 잠시 후에 시도하세요.
     seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
     signed_in_as: '다음과 같이 로그인 중:'
   verification:
@@ -1834,4 +1897,4 @@ ko:
     not_enabled: 아직 WebAuthn을 활성화 하지 않았습니다.
     not_supported: 이 브라우저는 보안 키를 지원하지 않습니다
     otp_required: 보안 키를 사용하기 위해서는 2단계 인증을 먼저 활성화 해 주세요
-    registered_on: "%{date} 에 등록됨"
+    registered_on: "%{date}에 등록됨"
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index b9cc5fe77e..74dcd6f8f3 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1285,7 +1285,6 @@ ku:
   notifications:
     email_events: Bûyer bo agahdariyên e-nameyê
     email_events_hint: 'Bûyera ku tu dixwazî agahdariyan jê wergerî hilbijêre:'
-    other_settings: Sazkariya agahdariyên din
   number:
     human:
       decimal_units:
@@ -1418,7 +1417,6 @@ ku:
     import: Têxistin
     import_and_export: Têxistin û derxistin
     migrate: Barkirina ajimêrê
-    notifications: Agahdarî
     preferences: Hilbijarte
     profile: Profîl
     relationships: Şopandin û şopîner
@@ -1463,8 +1461,6 @@ ku:
         other: "%{count} deng"
       vote: Deng bide
     show_more: Bêtir nîşan bide
-    show_newer: Nûtirîn nîşan bide
-    show_older: Kevntirîn nîşan bide
     show_thread: Mijarê nîşan bide
     title: "%{name}%{quote}"
     visibilities:
@@ -1542,7 +1538,6 @@ ku:
     webauthn: Kilîdên ewlehiyê
   user_mailer:
     appeal_approved:
-      action: Biçe ajimêra xwe
       explanation: Îtîraza binpêkirinê ya li dijî ajimêrê te ya %{strike_date} ku te di %{appeal_date} de şandibû hate pejirandin. Ajimêrê te careke din di rewşek baş de ye.
       subject: Îtîraza te ji %{date} hate pejirandin
       title: Îtîraz hate pejirandin
@@ -1551,7 +1546,6 @@ ku:
       subject: Îtîraza te ji %{date} nehate pejirandin
       title: Îtîraz nehate pejirandin
     backup_ready:
-      explanation: Te yedekîya tijê ya ajimêrê xwe Mastodonê xwest. Niha ji daxistinê re amade ye!
       subject: Arşîva te amede ye bo daxistinê
       title: Pakêtkirina arşîvan
     suspicious_sign_in:
@@ -1593,13 +1587,7 @@ ku:
         silence: Ajimêr sînor kiriye
         suspend: Ajimêr hatiye rawestandin
     welcome:
-      edit_profile_action: Profîlê saz bike
-      edit_profile_step: Tu dikarî bi barkirina wêneyek profîlê, guhertina navê xwe ya xuyangê û bêtir profîla xwe kesane bikî. Berî ku mafê bidî ku te şopînerên nû te bişopînin, tu dikarî binirxînî.
       explanation: Li vir çend serişte hene ku tu dest pê bike
-      final_action: Dest bi weşandinê bike
-      final_step: 'Dest bi weşandinê bike! Bêyî şopîneran jî dibe ku şandiyên te yên gelemperî ji hêla kesên din ve werin dîtin, mînakî li ser demjimêra herêmî û di hashtagan de. Dibe ku tu bixwazî xwe li ser hashtagê #nasname bidî nasandin.'
-      full_handle: Hemî destikê te
-      full_handle_hint: Ji hevalên xwe re, ji bona ji rajekarekê din peyam bişîne an jî ji bona ku te bikaribe bişopîne tişta ku tu bibêjî ev e.
       subject: Tu bi xêr hatî Mastodon
       title: Bi xêr hatî, %{name}!
   users:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 550036b340..e9f18d4bed 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -18,6 +18,9 @@ lad:
     nothing_here: No ay niente aki!
     pin_errors:
       following: Deves estar sigiendo a la persona a la ke keres achetar
+    posts:
+      one: Publikasyon
+      other: Publikasyones
     posts_tab_heading: Publikasyones
   admin:
     account_actions:
@@ -82,7 +85,7 @@ lad:
         title: Lokalizasyon
       login_status: Estado de koneksyon kon kuento
       media_attachments: Aneksos de multimedia
-      memorialize: Konvirtir en memorial
+      memorialize: Konvirte en memorial
       memorialized: Kuento komemorativo
       memorialized_msg: "%{username} se konvirtido kon sukseso en un kuento komemorativo"
       moderation:
@@ -106,14 +109,14 @@ lad:
       previous_strikes_description_html:
         one: Este kuento tiene <strong>un</strong> amonestamiento.
         other: Este kuento tiene <strong>%{count}</strong> amonestamientos.
-      promote: Promosyonar
+      promote: Promosyona
       protocol: Protokol
       public: Publiko
       push_subscription_expires: Ekspirasyon del abonamiento PuSH
-      redownload: Arefreskar profil
+      redownload: Arefreska profil
       redownloaded_msg: Se aktualizo djustamente el profil de %{username} dizde el orijin
       reject: Refuza
-      rejected_msg: La solisitasyon de enrejistrasyon de %{username} a sido refuzada kon sukseso
+      rejected_msg: La solisitasyon de enrejistrasyon de %{username} tyene sido refuzada kon sukseso
       remote_suspension_irreversible: Los datos de este kuento fueron irreversivlemente supremidos.
       remote_suspension_reversible_hint_html: El kuento fue suspendido en este sirvidor i los datos seran totalmente supremidos el %{date}. Asta estonses el sirvidor remoto puede restaurar este kuento sin dingun efekto negativo. Si keres supremir todos los datos del kuento pishin, puedes fazerlo a kontinuasyon.
       remove_avatar: Efasa imaje de profil
@@ -288,7 +291,7 @@ lad:
       empty: No se toparon rejistros.
       filter_by_action: Filtra por aksion
       filter_by_user: Filtra por utilizador
-      title: Log de revizyon
+      title: Defter de revizyon
     announcements:
       destroyed_msg: Pregon supremido kon sukseso!
       edit:
@@ -303,12 +306,12 @@ lad:
       scheduled_for: Programado para %{time}
       scheduled_msg: Pregon programado para su publikasyon!
       title: Pregones
-      unpublish: Retirar publikasyon
+      unpublish: Retira publikasyon
       unpublished_msg: Pregon retirado kon sukseso!
       updated_msg: Pregon aktualizado kon sukseso!
     critical_update_pending: Aktualizasyon kritika esta asperando
     custom_emojis:
-      assign_category: Asinyar kategoria
+      assign_category: Asinya kategoria
       by_domain: Domeno
       copied_msg: Kopia lokala del emoji kriyada kon sukseso
       copy: Kopia
@@ -328,7 +331,7 @@ lad:
       list: Lista
       listed: Listados
       new:
-        title: Adjustar muevo emoji personalizado
+        title: Adjusta muevo emoji personalizado
       no_emoji_selected: No se troko dingun emoji porke no eskojites dinguno
       not_permitted: No tienes permiso para realizar esta aksyon
       overwrite: Sobreskrive
@@ -384,6 +387,7 @@ lad:
         cancel: Anula
         confirm: Suspende
         permanent_action: Si kites la suspensyon no restoraras dingunos datos ni relasyones.
+        preamble_html: Estas a punto de suspender <strong>%{domain}</strong> i sus subdomenos.
         remove_all_data: Esto efasara todo el kontenido, multimedia i datos de profiles de los kuentos en este domeno de tu sirvidor.
         stop_communication: Tu sirvidor deshara de komunikarse kon estos sirvidores.
         title: Konfirma bloko de domeno para %{domain}
@@ -505,8 +509,8 @@ lad:
         all: Todos
         clear: Alimpiar yerros de entrega
         failing: Fayando
-        restart: Reinisyar entrega
-        stop: Detener entrega
+        restart: Reinisya entrega
+        stop: Deten entrega
         unavailable: No desponivle
       delivery_available: Entrega desponivle
       delivery_error_days: Diyas de yerro de entrega
@@ -593,6 +597,9 @@ lad:
       actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria <strong>Spam</strong>.
       actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo <strong>tu</strong> sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
       add_to_report: Adjusta mas al raporto
+      already_suspended_badges:
+        local: Ya suspendido en este sirvidor
+        remote: Ya suspendido en sus sirvidor
       are_you_sure: Estas siguro?
       assign_to_self: Asinyamela a mi
       assigned: Moderador asinyado
@@ -608,6 +615,7 @@ lad:
       created_at: Raportado
       delete_and_resolve: Efasa publikasyones
       forwarded: Reembiado
+      forwarded_replies_explanation: Este raporto vyene de un utilizador remoto i es sovre kontenido remoto. Tiene sido reembiado a ti porke el kontenido raportado esta en una repuesta a uno de tus utilizadores.
       forwarded_to: Reembiado a %{domain}
       mark_as_resolved: Marka komo rezolvido
       mark_as_sensitive: Marka komo sensivle
@@ -630,7 +638,7 @@ lad:
       reported_by: Raportado por
       resolved: Rezolvido
       resolved_msg: Tienes rezolvido la denunsia djustamente!
-      skip_to_actions: Ir direktamente a las aksyones
+      skip_to_actions: Va direktamente a las aksyones
       status: Estado
       statuses: Kontenido raportado
       statuses_description_html: El kontenido ofensivo se sitara en la komunikasyon kon el kuento raportado
@@ -641,12 +649,12 @@ lad:
           silence_html: 'Vas <strong>limitar</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
           suspend_html: 'Vas <strong>suspender</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
         actions:
-          delete_html: Kitar las publikasyones ofensivas
-          mark_as_sensitive_html: Markar los multimedios de la publikasyon komo sensivles
-          silence_html: Severamente limitar la vizivilita de <strong>@%{acct}</strong>, fazendo su profil i kontenido vizivles solo para las personas ke ya lo sigen o manualmente bushkan su profil
-          suspend_html: Suspender <strong>@%{acct}</strong>, faziendo su profil i kontenido inaksesivle i no disponivle para interaksiones
-        close_report: 'Markar raporto #%{id} komo rezolvido'
-        close_reports_html: Markar <strong>todos</strong> los raportos kontra <strong>@%{acct}</strong> komo rezolvidos
+          delete_html: Kita las publikasyones ofensivas
+          mark_as_sensitive_html: Marka los multimedios de la publikasyon komo sensivles
+          silence_html: Severamente limita la vizivilita de <strong>@%{acct}</strong>, fazendo su profil i kontenido vizivles solo para las personas ke ya lo sigen o manualmente bushkan su profil
+          suspend_html: Suspende <strong>@%{acct}</strong>, faziendo su profil i kontenido inaksesivle i no disponivle para interaksiones
+        close_report: 'Marka raporto #%{id} komo rezolvido'
+        close_reports_html: Marka <strong>todos</strong> los raportos kontra <strong>@%{acct}</strong> komo rezolvidos
         delete_data_html: Efasa el profil i kontenido de <strong>@%{acct}</strong> en 30 dias si no sea desuspendido en akel tiempo
         preview_preamble_html: "<strong>@%{acct}</strong> resivira una avertensya komo esta:"
         record_strike_html: Enrejistra un amonestamiento kontra <strong>@%{acct}</strong> para ke te ayude eskalar las violasyones de reglas de este kuento en el avenir
@@ -654,7 +662,7 @@ lad:
         warning_placeholder: Adisionalas, opsionalas razones la aksyon de moderasyon.
       target_origin: Orijin del kuento raportado
       title: Raportos
-      unassign: Dezasinyar
+      unassign: Dezasinya
       unknown_action_msg: 'Aksyon no konesida: %{action}'
       unresolved: No rezolvido
       updated_at: Aktualizado
@@ -712,6 +720,7 @@ lad:
         manage_users: Administra utilizadores
         manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
         manage_webhooks: Administrar webhooks
+        manage_webhooks_description: Permite a los utilizadores konfigurar webhooks para evenimientos administrativos
         view_audit_log: Mostra defter de revisyon
         view_audit_log_description: Permete a los utilizadores ver una estoria de aksyones administrativas en el sirvidor
         view_dashboard: Ve pano
@@ -738,6 +747,9 @@ lad:
       branding:
         preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza.
         title: Marka
+      captcha_enabled:
+        desc_html: Esto se baza en eskriptos eksternos de hCaptcha, ke pueden ser una influensya negra a la sigurita i privasita. Ademas, <strong>esto puede rezultar en un proseso de enrejistrasyon signifikativamente manko aksesivle para algunas personas (espesyalmente diskapasitadas)</strong>. Por estas razones, por favor, konsidera otras alternativas komo rejistrasyon por aprovasyon manuala o kon envitasyon.
+        title: Solisita ke los muevos utilizadores rezolven un CAPTCHA para konfirmar su konto
       content_retention:
         preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
         title: Retensyon de kontenido
@@ -758,6 +770,7 @@ lad:
         disabled: A dinguno
         users: Para los utilizadores lokales ke entrado en su kuento
       registrations:
+        moderation_recommandation: Por favor, asigurate ke tyenes una taifa de moderasyon adekuada i reaktiva antes de avrir los enrejistramyentos a todos!
         preamble: Kontrola ken puede kriyar un kuento en tu sirvidor.
         title: Enrejistramientos
       registrations_mode:
@@ -765,12 +778,19 @@ lad:
           approved: Se rekiere achetasion para enrejistrarse
           none: Permete a los utilizadores trokar la konfigurasyon del sitio
           open: Kualkiera puede enrejistrarse
+        warning_hint: Rekomendamos el uzo de "Se rekiere achetasion para enrejistrarse" a manko ke estes siguro ke tu taifa de moderasyon puede moderar el spam i los enrejistramyentos malisiozos en un tyempo razonavle.
+      security:
+        authorized_fetch: Rekere autentifikasyon de sirvidores federados
+        authorized_fetch_hint: Rekerir autentifikasyon de sirvidores federados permite un forsamyento mas estrikto de los blokos a nivel de utilizador i a nivel de sirvidor. Malgrado esto, el koste de esto es una penalizasyon de efisyensya, reduksyon del alkanse de tus repuestas i puede introduzir problemas de kompatibilita kon algunos sirvisyos federados. Ademas, esto no impidira ke aktores dedikados obtengan tus kuentos publikos i publikasyones publikas.
+        authorized_fetch_overridden_hint: Agora no puedes trokar esta konfigurasyon dkee esta sovreeskrita por una variable de entorno.
+        federation_authentication: Forzamyento de autentifikasyon para la federasyon
       title: Konfigurasyon del sirvidor
     site_uploads:
       delete: Efasa dosya kargada
       destroyed_msg: Dosya supremida kon sukseso!
     software_updates:
       critical_update: Kritiko – por favor aktualiza pishin
+      description: Rekomendamos ke mantengas aktualizada tu enstalasyon de Mastodon para benefisyar de las muevas koreksyones y funksyones. Ademas, a vezes es kritiko aktualizar Mastodon punktualmente para evitar problemas de sigurita. Por estas razones, Mastodon komprova si ay aktualizasyones kada 30 minutos, i te avizara de akodro a tus preferensyas de avizos por posta elektronika.
       documentation_link: Ambezate mas
       release_notes: Notas sovre la versyon
       title: Aktualizasyones desponivles
@@ -820,10 +840,20 @@ lad:
     system_checks:
       database_schema_check:
         message_html: Ay migrasyones asperando de la baza de datos. Por favor, egzekutalas para asigurarte de ke la aplikasyon fonksiona komo deveria
+      elasticsearch_health_red:
+        message_html: El klaster de Elasticsearch no es sano (estado kolorado), funksyones de bushkeda no estan disponivles
+      elasticsearch_health_yellow:
+        message_html: El klaster de Elasticsearch no es sano (estado amariyo), es posivle ke keras investigar la razon
+      elasticsearch_index_mismatch:
+        message_html: Las mapas de indeksos Elasticsearch estan dezaktualizadas. Por favor, uza <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Ve dokumentasyon
+        message_html: Tu klaster de Elasticsearch tiene mas ke un nodo, ama Mastodon no esta konfigurado para uzarlos.
       elasticsearch_preset_single_node:
         action: Ve dokumentasyon
+        message_html: Tu klaster de Elasticsearch solo tyene un nodo, <code>ES_PRESET</code> deve estableserse a <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Tu indekso del sistema Elasticsearch esta dezaktualizado por un trokamyento de konfigurasyon. Por favor uza <code>tootctl search deploy --reset-chewy</code> para aktualizarlo.
       elasticsearch_running_check:
         message_html: No se pudo konektar a Elasticsearch. Por favor, averigua ke esta egzekutandose, o dezaktiva la bushkeda de teksto kompleto
       elasticsearch_version_check:
@@ -941,6 +971,9 @@ lad:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Por la falta de moderadores aktivos, los enrejistramyentos en %{instance} tyenen sido trokados otomatikamente para rekerir revizyon manuala, para ke %{instance} no se utilize potensyalmente komo platforma por malos aktores. Puedes trokarlo de muevo para avrir los enrejistramyentos en kualseker momento.
+      subject: Enrejistramyentos de %{instance} fueron otomatikamente trokados i agora nesesitan aprovasyon
     new_appeal:
       actions:
         delete_statuses: para supremir sus mesajes
@@ -1012,12 +1045,17 @@ lad:
   auth:
     apply_for_account: Solisita un kuento
     captcha_confirmation:
+      help_html: Si tyenes problemas kon rezolver el CAPTCHA, puedes kontaktarnos en %{email} i podremos ayudarte.
+      hint_html: Una koza mas! Tenemos ke konfirmar ke eres umano (para evitar spam!). Rezolve el CAPTCHA abasho i klika "Kontinua".
       title: Kontrolo de sigurita
     confirmations:
+      awaiting_review: Tu adreso de posta tiene sido konfirmado! La taifa de %{domain} esta revizando tu enrejistrasyon. Risiviras un meil si acheten tu kuento!
       awaiting_review_title: Estamos revizando tu enrejistramiento
       clicking_this_link: klikando en este atadijo
       login_link: konektate kon kuento
       proceed_to_login_html: Agora puedes ir a %{login_link}.
+      redirect_to_app_html: Seras readresado a la aplikasyon <strong>%{app_name}</strong>. Si esto no afita, aprova %{clicking_this_link} o regresa manualmente a la aplikasyon.
+      registration_complete: Tu enrejistrasyon en %{domain} ya esta kompletada!
       welcome_title: Bienvenido, %{name}!
       wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
     delete_account: Efasa kuento
@@ -1054,6 +1092,7 @@ lad:
     rules:
       accept: Acheta
       back: Atras
+      invited_by: 'Puedes adjuntarte a %{domain} grasyas a la envitasyon de:'
       preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
       preamble_invited: Antes de kontinuar, por favor reviza las reglas del sirvidor establesidas por los moderatores de %{domain}.
       title: Algunas reglas bazikas.
@@ -1070,6 +1109,7 @@ lad:
       preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
       title: Konektate kon %{domain}
     sign_up:
+      manual_review: Las enrejistrasyones en %{domain} pasan por la revizyon manuala de muestros moderadores. Para ayudarmos a prosesar tu enrejistrasyon, eskrive un poko sovre ti i por ke keres un kuento en %{domain}.
       preamble: Kon un kuento en este sirvidor de Mastodon, podras segir a kualkier otra persona en la red, endependientemente del sirvidor en el ke se tope.
       title: Kriya kuento de Mastodon en %{domain}.
     status:
@@ -1078,12 +1118,13 @@ lad:
       functional: Tu kuento esta kompletamente funksyonal.
       pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
       redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
+      self_destruct: Deke %{domain} va a serrarse, solo tendras akseso limitado a tu kuento.
       view_strikes: Ve amonestamientos pasados kontra tu kuento
     too_fast: Formulario enviado demaziado rapido, aprovalo de muevo.
     use_security_key: Uza la yave de sigurita
   challenge:
     confirm: Kontinua
-    hint_html: "<strong>Tip:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
+    hint_html: "<strong>Konsejo:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
     invalid_password: Kod inkorekto
     prompt: Konfirma kod para segir
   crypto:
@@ -1113,7 +1154,7 @@ lad:
     confirm_password: Eskrive tu kod aktual para demostrar tu identita
     confirm_username: Eskrive tu nombre de utilizador para konfirmar
     proceed: Efasa kuento
-    success_msg: Tu kuento fue efasado kon reusho
+    success_msg: Tu kuento fue efasado kon reushita
     warning:
       before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
       caches: El kontenido ke tiene sido magazinado en kashe por otros sirvidores puede persistir
@@ -1159,6 +1200,7 @@ lad:
     invalid_domain: no es un nombre de domeno valido
   edit_profile:
     basic_information: Enformasyon bazika
+    hint_html: "<strong>Personaliza lo ke la djente ve en tu profil publiko i kon tus publikasyones.</strong> Es mas probavle ke otras personas te sigan i enteraktuen kontigo kuando kompletas tu profil i foto."
     other: Otros
   errors:
     '400': La solisitasyon ke enviates no fue valida o fue malformada.
@@ -1238,11 +1280,18 @@ lad:
       batch:
         remove: Kita del filtro
       index:
+        hint: Este filtro se aplika a la seleksyon de publikasyones individualas independentemente de otros kriteryos. Puedes adjustar mas publikasyones a este filtro dizde la enterfaz de web.
         title: Publikasyones filtradas
   generic:
     all: Todos
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> elemento en esta pajina esta eskojido."
+      other: Todos los <strong>%{count}</strong> elementos en esta pajina estan eskojidos.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> elemento ke koenside con tu bushkeda esta eskojido."
+      other: Todos los <strong>%{count}</strong> elementos ke koensiden con tu bushkeda estan eskojidos.
     cancel: Anula
-    changes_saved_msg: Trokamientos guadrados kon reusho!
+    changes_saved_msg: Trokamientos guadrados kon reushita!
     confirm: Konfirma
     copy: Kopia
     delete: Efasa
@@ -1266,11 +1315,26 @@ lad:
       too_large: Dosya es mas grande
     failures: Yerros
     imported: Importado
+    mismatched_types_warning: Parese ke podrias eskojer el tipo inkorekto para este importo, por favor verifikalo de muevo.
     modes:
       merge: Une
       merge_long: Manten rejistros egzistentes i adjusta muevos
       overwrite: Sobreskrive
       overwrite_long: Mete muevos rejistros en vez de los aktuales
+    overwrite_preambles:
+      blocking_html: Estas a punto de <strong>substituyir tu lista de blokos</strong> por asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Estas a punto de <strong>substituyir tus markadores</strong> por asta <strong>%{total_items} publikasyones</strong> ke vinyeron de <strong>%{filename}</strong>.
+      domain_blocking_html: Estas a punto de <strong>substituyir tu lista de blokos de domeno</strong> por asta <strong>%{total_items} domenos </strong> de <strong>%{filename}</strong>.
+      following_html: Estas a punto de <strong>segir</strong> asta <strong>%{total_items} kuentos</strong> de <strong>%{filename}</strong> i <strong>deshar de segir todos los otros kuentos</strong>.
+      lists_html: Estas a punto de <strong>sustituyir tus listas</strong> con el kontenido de <strong>%{filename}</strong>. Asta <strong>%{total_items} kuentos</strong> seran adjustados a muevas listas.
+      muting_html: Estas a punto de <strong>substituyir tu lista de kuentos silensyados</strong> por asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Estas a punto de <strong>blokar</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Estas a punto de adjustar asta <strong>%{total_items} publikasyones</strong> de <strong>%{filename}</strong> a tus <strong>markadores</strong>.
+      domain_blocking_html: Estas a punto de <strong>blokar</strong> asta <strong>%{total_items} domenos </strong> de <strong>%{filename}</strong>.
+      following_html: Estas a punto de <strong>segir</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      lists_html: Estas a punto de adjustar <strong>%{total_items} kuentos</strong> dizde <strong>%{filename}</strong> a tus <strong>listas</strong>. Se kriyaran muevas listas si no ay listas para adjustarlas.
+      muting_html: Estas a punto de <strong>silensyar</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
     preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
     recent_imports: Importasyones resyentes
     states:
@@ -1341,6 +1405,7 @@ lad:
     unsubscribe:
       action: Si, dezabona
       complete: Dezabonado
+      confirmation_html: Estas siguro de ke ya no keres risivir %{type} de Mastodon en %{domain} a tu posta elektronika %{email}? Syempre podras reabonarte dizde las <a href="%{settings_path}"> opsyones de avizos por posta.</a>.
       emails:
         notification_emails:
           favourite: avizos de favoritos por posta
@@ -1348,6 +1413,8 @@ lad:
           follow_request: avizos de solisitasyones de segimyento por posta
           mention: avizos de enmentaduras por posta
           reblog: avizos de repartajasyones por posta
+      resubscribe_html: Si tyenes deabonado por yerro, puedes reabonar en tus <a href="%{settings_path}">opsyones de avizos por posta elektronika</a>.
+      success_html: Ya no risiviras %{type} de Mastodon en %{domain} a tu posta en %{email}.
       title: Dezabona
   media_attachments:
     validations:
@@ -1431,7 +1498,6 @@ lad:
     administration_emails: Avizos de administrasyon por posta
     email_events: Evenimyentos para avizos por posta
     email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:'
-    other_settings: Otras preferensyas de avizos
   number:
     human:
       decimal_units:
@@ -1473,14 +1539,23 @@ lad:
     posting_defaults: Konfigurasyon predeterminada de publikasyones
     public_timelines: Linyas de tiempo publikas
   privacy:
+    hint_html: "<strong>Personaliza el diskuvrimyento de tu profil y tus publikasyones.</strong> En Mastodon tyenes distinktas funksyones ke te ayudaran a alkansar una audiensya mas ancha si las aktivas. Reviza estas opsyones por un momento para estar siguro ke kaven tus nesesidades."
     privacy: Privasita
+    privacy_hint_html: Kontrola kuanto keres revelar a otros. Las personas diskuvren profiles i aplikasyones interesantes navigando por los suivantes de otras personas i vyendo dizde ke aplikasyones publikan, ama puede ke preferas mantenerlo eskondido.
+    reach: Alkanse
+    reach_hint_html: Kontrola si keres ke te diskuvren i sigen muevas personas. Keres ke tus publikasyones se amostren en la seksyon de Eksplorasyon? Keres que tu kuento este rekomendado a otras personas? Keres achetar otomatikamente a todos los muevos suivantes o tener kontrol sovre kada uno de eyos?
     search: Bushkeda
+    search_hint_html: Kontrola komo keres ke te topen. Keres ke otras personas te topan por lo ke tyenes publikado publikamente? Keres ke las personas de fuera de Mastodon topen tu profil al bushkar en la web? Por favor, akodrate de ke la ekskluzyon totala de todos los bushkadores no puede ser garantizada para enformasyon publika.
+    title: Privasita i alkanse
   privacy_policy:
     title: Politika de privasita
   reactions:
     errors:
       limit_reached: Limito de reaksyones desferentes alkansado
       unrecognized_emoji: no es un emoji konesido
+  redirects:
+    prompt: Si konfiyas en este atadijo, klikalo para kontinuar.
+    title: Estas salyendo de %{instance}.
   relationships:
     activity: Aktivita del kuento
     confirm_follow_selected_followers: Estas siguro ke keres segir a los suivantes eskojidos?
@@ -1517,6 +1592,7 @@ lad:
     over_total_limit: Tienes superado el limito de %{limit} publikasyones programadas
     too_soon: La data programada deve estar en el avenir
   self_destruct:
+    lead_html: Malorozamente, <strong>%{domain}</strong> va serrar permanentemente. Si teniyas un kuento ayi, ya no podras utilizarlo, ama ainda puedes solisitar una kopya de tus datos.
     title: Este sirvidor esta serrando
   sessions:
     activity: Ultima aktivita
@@ -1542,6 +1618,7 @@ lad:
       unknown_browser: Navigador deskonosido
       weibo: Weibo
     current_session: Sesyon aktuala
+    date: Data
     description: "%{browser} en %{platform}"
     explanation: Estos son los navigadores internetikos konektados aktualmente kon tu kuento de Mastodon.
     ip: IP
@@ -1578,7 +1655,7 @@ lad:
     import: Importo
     import_and_export: Importo i eksporto
     migrate: Migrasyon de kuento
-    notifications: Avizos
+    notifications: Avizos por posta elektronika
     preferences: Preferensyas
     profile: Profil publiko
     relationships: Segidos i suivantes
@@ -1586,6 +1663,13 @@ lad:
     strikes: Amonestamientos de moderasyon
     two_factor_authentication: Autentifikasyon en dos pasos
     webauthn_authentication: Yaves de sigurita
+  severed_relationships:
+    download: Abasha (%{count})
+    event_type:
+      user_domain_block: Blokates a %{target_name}
+    lost_followers: Suivantes pedridos
+    lost_follows: Segimyentos pedridos
+    type: Evenimiento
   statuses:
     attached:
       audio:
@@ -1623,8 +1707,6 @@ lad:
         other: "%{count} votos"
       vote: Vota
     show_more: Amostra mas
-    show_newer: Amostra mas muevos
-    show_older: Amostra mas viejos
     show_thread: Amostra diskusyon
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1689,6 +1771,7 @@ lad:
       with_time_zone: "%d de %b del %Y, %H:%M %Z"
   translation:
     errors:
+      quota_exceeded: La kuota de uzo del sirvisyo de traduksyon para todo el sirvidor tiene sido sovrepasada.
       too_many_requests: Ay demaziadas solisitudes de servisyo de traduksyon.
   two_factor_authentication:
     add: Adjusta
@@ -1701,24 +1784,33 @@ lad:
     lost_recovery_codes: Los kodiches de rekuperasyon te permeten obtener akseso a tu kuento si piedres tu telefon. Si tienes pedrido tus kodiches de rekuperasyon, puedes redjenerarlos aki. Tus viejos kodiches de rekuperasyon se aran malatos.
     methods: Metodos de autentifikasyon de dos pasos
     otp: Aplikasyon de autentifikasyon
-    recovery_codes: Fazer kopias de sigurita de tus kodiches de rekuperasyon
+    recovery_codes: Faz kopias de sigurita de tus kodiches de rekuperasyon
     recovery_codes_regenerated: Kodiches de rekupersayon redjenerados kon sukseso
     recovery_instructions_html: Si piedres akseso a tu telefon, puedes uzar uno de los sigientes kodiches de rekuperasyon para obtener akseso a tu kuento. <strong>Mantenlos a salvo</strong>. Por enshemplo, puedes imprimirlos i guadrarlos kon otros dokumentos emportantes.
     webauthn: Yaves de sigurita
   user_mailer:
     appeal_approved:
-      action: Va a tu kuento
+      action: Preferensyas de kuento
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
       subject: Tu apelasyon del %{date} fue achetada
+      subtitle: Tu konto de muevo tiene una reputasyon buena.
       title: Apelasyon achetada
     appeal_rejected:
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
       subject: Tu apelasyon del %{date} fue refuzada
+      subtitle: Tu apelasyon fue refuzada.
       title: Apelasyon refuzada
     backup_ready:
-      explanation: Tienes solisitado una kopia kompleta de tu kuento de Mastodon. Ya esta pronta para abashar!
+      explanation: Tienes solisitado una kopia de sigurita de tu kuento de Mastodon.
+      extra: Agora esta pronto para abashar!
       subject: Tu dosya esta pronta para abashar
       title: Abasha dosya
+    failed_2fa:
+      details: 'Aki estan los peratim de las provas de koneksyon kon tu kuento:'
+      explanation: Algun ha intentado konektarte kon tu cuenta ama prokuro un sigundo paso de autentifikasyon invalido.
+      further_actions_html: Si no fuites tu, rekomendamos %{action} inmediatamente deke puede estar komprometido.
+      subject: Autentikasyon del sigundo paso sin sukseso
+      title: Autentifikasyon del sigundo paso no reushida
     suspicious_sign_in:
       change_password: troka tu kod
       details: 'Aki estan los peratim de la koneksyon kon tu kuento:'
@@ -1758,13 +1850,39 @@ lad:
         silence: Kuento limitado
         suspend: Kuento suspendido
     welcome:
-      edit_profile_action: Konfigurasyon de profil
-      edit_profile_step: Puedes personalizar tu profil kargando una foto de profil, trokando tu nombre de utilizador i muncho mas. Puedes optar por revizar a los muevos suivantes antes de ke puedan segirte.
+      apps_android_action: Abasha en Google Play
+      apps_ios_action: Abasha en App Store
+      apps_step: Abasha muestras aplikasyones ofisyalas.
+      apps_title: Aplikasyones de Mastodon
+      checklist_title: Lista de bienvenida
+      edit_profile_action: Personaliza
+      edit_profile_step: Kompleta tu profil para aumentar tus enteraksyones.
+      edit_profile_title: Personaliza tu profil
       explanation: Aki ay algunos konsejos para ampesar
-      final_action: Ampesa a publikar
-      final_step: 'Ampesa a publikar! Inkluzo sin suivantes, tus publikasyones publikas pueden ser vistas por otros, por enshemplo en la linya de tiempo lokal o en etiketas. Tal vez keras aprezentarte kon la etiketa de #introduksiones.'
-      full_handle: Tu sovrenombre kompleto
-      full_handle_hint: Esto es lo ke le dirias a tus haverim para ke eyos puedan embiarte mesajes o segirte dizde otra instansya.
+      feature_action: Ambezate mas
+      feature_audience_title: Konstruye tu audyensya kon konfyansa
+      feature_control_title: Manten kontrol de tu linya de tyempo
+      feature_creativity_title: Kreativita sin paralelas
+      feature_moderation_title: La moderasyon komo deveria ser
+      follow_action: Sige
+      follow_step: El buto de Mastodon es segir a djente interesante.
+      follow_title: Personaliza tu linya prinsipala
+      follows_subtitle: Sige kuentos konesidos
+      follows_title: A ken segir
+      follows_view_more: Ve mas personas para segir
+      hashtags_recent_count:
+        one: "%{people} persona en los ultimos 2 diyas"
+        other: "%{people} personas en los ultimos 2 diyas"
+      hashtags_subtitle: Eksplora los trendes de los ultimos 2 diyas
+      hashtags_title: Etiketas en trend
+      hashtags_view_more: Ve mas etiketas en trend
+      post_action: Eskrive
+      post_step: Puedes introdusirte al mundo kon teksto, fotos, videos o anketas.
+      post_title: Eskrive tu primera publikasyon
+      share_action: Partaja
+      share_step: Informa a tus amigos komo toparte en Mastodon.
+      share_title: Partaja tu profil de Mastodon
+      sign_in_action: Konektate
       subject: Bienvenido a Mastodon
       title: Bienvenido, %{name}!
   users:
@@ -1772,9 +1890,14 @@ lad:
     go_to_sso_account_settings: Va a la konfigurasyon de kuento de tu prokurador de identita
     invalid_otp_token: Kodiche de dos pasos no valido
     otp_lost_help_html: Si pedriste akseso a los dos, puedes kontaktarte kon %{email}
+    rate_limited: Demaziadas provas de autentifikasyon, aprova de muevo dempues.
+    seamless_external_login: Estas konektado por un servisyo eksterno i estonses la konfigurasyon de kod i konto de posta no estan disponivles.
     signed_in_as: 'Konektado komo:'
   verification:
+    extra_instructions_html: <strong>Konsejo:</strong> El atadijo en tu web puede ser invizivle. La parte importante es <code>rel="me"</code>, ke evita la suplantasyon de identita en sitios kon kontenido jenerado por el utilizador. Puedes inkluzo uzar una etiketa <code>atadijo</code> en la kavesera de la pajina en vez de <code>a</code>, ama el HTML deve ser aksesivle sin exekutar JavaScript.
     here_is_how: Ansina es komo
+    hint_html: "<strong>La verifikasyon de identita en Mastodon es para todos.</strong> Bazado en estandardes abiertos, agora i para syempre. Todo lo ke nesesitas es un sitio web propio ke la gente rekonozka. Kuando adjustas un atadijo a este sitio web dizde tu profil, komprovaremos ke el sitio web se ata a tu profil i lo amostraremos vizualmente."
+    instructions_html: Kopia i apega este kodiche en el HTML de tu sitio web. Estonses, adjusta el adreso de tu sitio web en uno de los kutis adisyonales de tu profil dizde la seksyon "Edita profil" i guadra los trokamyentos.
     verification: Verifikasyon
     verified_links: Tus atadijos verifikados
   webauthn_credentials:
@@ -1784,6 +1907,7 @@ lad:
       success: Tu yave de sigurita fue adjustada kon sukseso.
     delete: Efasa
     delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita?
+    description_html: Si kapasites <strong>autentifikasyon kon yave de sigurita</strong>, nesesitaras uno de tus yaves de sigurita para konektarte kon tu kuento.
     destroy:
       error: Uvo un problem al efasar tu yave de sigurita. Por favor aprova de muevo.
       success: Tu yave de sigurita fue efasada kon sukseso.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b194011a42..552afa8301 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1,7 +1,7 @@
 ---
 lt:
   about:
-    about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija. Turėk savo duomenis su Mastodon!'
+    about_mastodon_html: 'Ateities socialinis tinklas: jokių reklamų, jokių įmonių sekimo, etiškas dizainas ir decentralizacija! Turėk savo duomenis su Mastodon.'
     contact_missing: Nenustatyta
     contact_unavailable: Nėra
     hosted_on: Mastodon talpinamas %{domain}
@@ -15,11 +15,11 @@ lt:
       other: Sekėjų
     following: Seka
     instance_actor_flash: Ši paskyra yra virtualus veikėjas (-a), naudojamas atstovauti pačiam serveriui, o ne atskiram naudotojui. Tai naudojama federacijos tikslais ir neturėtų būti pristabdyta.
-    last_active: paskutinis aktyumas
+    last_active: paskutinį kartą aktyvus
     link_verified_on: Šios nuorodos nuosavybė buvo patikrinta %{date}
-    nothing_here: Nieko čia nėra!
+    nothing_here: Nieko čia nėra.
     pin_errors:
-      following: Privalai sekti asmenį, kurį nori patvirtinti.
+      following: Privalai sekti žmogų, kurį nori patvirtinti.
     posts:
       few: Įrašai
       many: Įrašo
@@ -37,32 +37,43 @@ lt:
     accounts:
       add_email_domain_block: Blokuoti el. pašto domeną
       approve: Patvirtinti
-      approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška
+      approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška.
       are_you_sure: Ar esi įsitikinęs (-usi)?
       avatar: Avataras
       by_domain: Domenas
       change_email:
-        changed_msg: El. paštas sėkmingai pakeistas!
-        current_email: Dabartinis el paštas
-        label: Pakeisti el pašto adresą
-        new_email: Naujas el pašto adresas
-        submit: Pakeisti el pašto adresą
-        title: Pakeisti el pašto adresą vartotojui %{username}
+        changed_msg: El. paštas sėkmingai pakeistas.
+        current_email: Dabartinis el. paštas
+        label: Keisti el. paštą
+        new_email: Naujas el. paštas
+        submit: Keisti el. paštą
+        title: Keisti el. paštą %{username}
+      change_role:
+        changed_msg: Vaidmuo sėkmingai pakeistas.
+        label: Keisti vaidmenį
+        no_role: Jokios vaidmenį
+        title: Keisti vaidmenį %{username}
       confirm: Patvirtinti
       confirmed: Patvirtinta
-      confirming: Tvirtinama
-      deleted: Ištrinti
+      confirming: Patvirtinama
+      custom: Pasirinktinis
+      delete: Ištrinti duomenis
+      deleted: Ištrinta
       demote: Pažeminti
-      disable: Išjungti
-      disable_two_factor_authentication: Išjungti 2 faktorių autentifikaciją
-      disabled: Išjungta
-      display_name: Matomas vardas
+      destroyed_msg: "%{username} duomenys dabar laukia eilėje, kad būtų netrukus ištrinti."
+      disable: Sustabdyti
+      disable_sign_in_token_auth: Išjungti el. pašto prieigos rakto tapatybės nustatymą
+      disable_two_factor_authentication: Išjungti 2FA
+      disabled: Pristabdyta
+      display_name: Rodomas vardas
       domain: Domenas
-      edit: Keisti
-      email: El paštas
-      email_status: El pašto statusas
-      enable: Įjungti
+      edit: Redaguoti
+      email: El. paštas
+      email_status: El. pašto būsena
+      enable: Panaikinti sustabdymą
+      enable_sign_in_token_auth: Įjungti el. pašto prieigos rakto tapatybės nustatymą
       enabled: Įjungta
+      enabled_msg: Sėkmingai panaikintas %{username} paskyros sustabdymas.
       followers: Sekėjai
       follows: Seka
       header: Antraštė
@@ -73,73 +84,264 @@ lt:
       joined: Prisijungė
       location:
         all: Visi
-        local: Lokali
+        local: Vietinis
         remote: Nuotolinis
-        title: Lokacija
-      login_status: Prisijungimo statusas
-      media_attachments: Prisegti medijos failai
-      memorialize: Paversti į memorija
+        title: Vieta
+      login_status: Prisijungimo būsena
+      media_attachments: Medijos priedai
+      memorialize: Paversti į memorialinį
+      memorialized: Memorializuota
+      memorialized_msg: Sėkmingai paversta %{username} į memorialinę paskyrą.
       moderation:
         active: Aktyvus
         all: Visi
+        disabled: Išjungta
+        pending: Laukiama
+        silenced: Ribotas
         suspended: Užrakintas
-        title: Moderacija
-      moderation_notes: Medaracijos žinutės
-      most_recent_activity: Paskutinioji veikla
-      most_recent_ip: Paskutinis IP
-      no_limits_imposed: Be limitu
-      not_subscribed: Ne prenumeruota
-      perform_full_suspension: Užrakinti
+        title: Prižiūrėjimas
+      moderation_notes: Prižiūrėjimo pastabos
+      most_recent_activity: Naujausia veikla
+      most_recent_ip: Naujausias IP
+      no_account_selected: Nebuvo pakeistos jokios paskyros, nes nebuvo pasirinkta nė viena.
+      no_limits_imposed: Nėra nustatytų ribojimų.
+      no_role_assigned: Nėra priskirto vaidmens.
+      not_subscribed: Neužprenumeruota
+      pending: Laukiama peržiūros
+      perform_full_suspension: Pristabdyti
+      previous_strikes: Ankstesni pažeidimai
+      previous_strikes_description_html:
+        few: Šioje paskyroje yra <strong>%{count}</strong> pažeidimai.
+        many: Šioje paskyroje yra <strong>%{count}</strong> pažeidimas.
+        one: Šioje paskyroje yra <strong>vienas</strong> pažeidimas.
+        other: Šioje paskyroje yra <strong>%{count}</strong> pažeidimų.
       promote: Paaukštinti
       protocol: Protokolas
       public: Viešas
-      push_subscription_expires: PuSH prenumeramivas pasibaigė
-      redownload: Perkrauti profilį
-      remove_avatar: Panaikinti profilio nuotrauką
-      remove_header: Panaikinti antraštę
+      push_subscription_expires: PuSH prenumerata baigiasi
+      redownload: Atnaujinti profilį
+      redownloaded_msg: Sėkmingai atnaujintas %{username} profilis iš kilmės šaltinio.
+      reject: Atmesti
+      rejected_msg: Sėkmingai atmesta %{username} registracijos paraiška.
+      remote_suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti.
+      remote_suspension_reversible_hint_html: Paskyra jų serveryje buvo pristabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko nuotolinis serveris gali atkurti šią paskyrą be jokių neigiamų pasekmių. Jei nori iš karto pašalinti visus paskyros duomenis, gali tai padaryti toliau.
+      remove_avatar: Pašalinti avatarą
+      remove_header: Pašalinti antraštę
+      removed_avatar_msg: Sėkmingai pašalintas %{username} avataro vaizdas.
+      removed_header_msg: Sėkmingai pašalintas %{username} antraštės vaizdas.
       resend_confirmation:
-        already_confirmed: Šis vartotojas jau patvirtintas
-      reset: Iš naujo
-      reset_password: Atkurti slaptažodį
-      resubscribe: Per prenumeruoti
+        already_confirmed: Šis naudotojas jau patvirtintas.
+        send: Iš naujo siųsti patvirtinimo nuorodą
+        success: Patvirtinimo nuoroda sėkmingai išsiųsta.
+      reset: Nustatyti iš naujo
+      reset_password: Nustatyti iš naujo slaptažodį
+      resubscribe: Prenumeruoti iš naujo
+      role: Vaidmuo
       search: Ieškoti
-      sensitized: Pažymėti kaip jautrią informaciją
-      shared_inbox_url: Bendroji gautųjų URL
+      search_same_email_domain: Kiti naudotojai su tuo pačiu el. pašto domenu
+      search_same_ip: Kiti naudotojai su tuo pačiu IP
+      security: Saugumas
+      security_measures:
+        only_password: Tik slaptažodis
+        password_and_2fa: Slaptažodis ir 2FA
+      sensitive: Priversti žymėti kaip jautrią
+      sensitized: Pažymėta kaip jautri
+      shared_inbox_url: Bendras gautiejų URL
       show:
-        created_reports: Parašyti raportai
-        targeted_reports: Reportuotas kitų
-      silence: Tyla
-      silenced: Užtildytas
-      statuses: Statusai
+        created_reports: Sukurtos ataskaitos
+        targeted_reports: Pranešė kiti
+      silence: Riboti
+      silenced: Ribotas
+      statuses: Įrašai
+      strikes: Ankstesni pažeidimai
       subscribe: Prenumeruoti
-      suspended: Užrakintas
-      title: Vartotojai
-      unconfirmed_email: Nepatvirtintas el pašto adresas
-      undo_silenced: Atšaukti užtildymą
-      undo_suspension: Atšaukti užrakinimą
-      unsubscribe: Nebeprenumeruoti
-      username: Slapyvardis
+      suspend: Pristabdyti
+      suspended: Pristabdyta
+      suspension_irreversible: Šios paskyros duomenys negrįžtamai ištrinti. Gali atšaukti paskyros pristabdymą, kad ja būtų galima naudotis, bet nebus atkurti jokie anksčiau turėti duomenys.
+      suspension_reversible_hint_html: Paskyra pristabdyta, o duomenys bus visiškai pašalinti %{date}. Iki to laiko paskyrą galima atkurti be jokių neigiamų pasekmių. Jei nori iš karto pašalinti visus paskyros duomenis, gali tai padaryti toliau.
+      title: Naudotojai
+      unblock_email: Atblokuoti el. pašto adresą
+      unblocked_email_msg: Sėkmingai atblokuotas %{username} el. pašto adresas.
+      unconfirmed_email: Nepatvirtintas el. pašto adresas.
+      undo_sensitized: Atšaukti privertimą žymėti kaip jautrią
+      undo_silenced: Atšaukti ribojimą
+      undo_suspension: Atšaukti pristabdymą
+      unsilenced_msg: Sėkmingai atšauktas %{username} paskyros ribojimas.
+      unsubscribe: Atšaukti prenumeratą
+      unsuspended_msg: Sėkmingai panaikintas %{username} paskyros pristabdymas.
+      username: Naudotojo vardas
+      view_domain: Peržiūrėti domeno santrauką
       warn: Įspėti
+      web: Žiniatinklis
+      whitelisted: Leidžiama federacijai
     action_logs:
+      action_types:
+        approve_appeal: Patvirtinti apeliaciją
+        approve_user: Patvirtinti naudotoją
+        assigned_to_self_report: Priskirti ataskaitą
+        change_email_user: Keisti el. paštą naudotojui
+        change_role_user: Keisti naudotojo vaidmenį
+        confirm_user: Patvirtinti naudotoją
+        create_account_warning: Kurti įspėjimą
+        create_announcement: Kurti skelbimą
+        create_canonical_email_block: Kurti el. pašto bloką
+        create_custom_emoji: Kurti pasirinktinį jaustuką
+        create_domain_allow: Kurti domeno leidimą
+        create_domain_block: Kurti domeno bloką
+        create_email_domain_block: Kurti el. pašto domeno bloką
+        create_ip_block: Kurti IP taisyklę
+        create_unavailable_domain: Kurti nepasiekiamą domeną
+        create_user_role: Kurti vaidmenį
+        demote_user: Pažeminti naudotoją
+        destroy_announcement: Ištrinti skelbimą
+        destroy_canonical_email_block: Ištrinti el. pašto bloką
+        destroy_custom_emoji: Ištrinti pasirinktinį jaustuką
+        destroy_domain_allow: Ištrinti domeno leidimą
+        destroy_domain_block: Ištrinti domeno bloką
+        destroy_email_domain_block: Ištrinti el. pašto domeno bloką
+        destroy_instance: Išvalyti domeną
+        destroy_ip_block: Ištrinti IP taisyklę
+        destroy_status: Ištrinti įrašą
+        destroy_unavailable_domain: Ištrinti nepasiekiamą domeną
+        destroy_user_role: Sunaikinti vaidmenį
+        disable_2fa_user: Išjungti 2FA
+        disable_custom_emoji: Išjungti pasirinktinį jaustuką
+        disable_sign_in_token_auth_user: Išjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
+        disable_user: Išjungti naudotoją
+        enable_custom_emoji: Įjungti pasirinktinį jaustuką
+        enable_sign_in_token_auth_user: Įjungti el. pašto prieigos rakto tapatybės nustatymą naudotojui
+        enable_user: Įjungti naudotoją
+        memorialize_account: Memorializuoti paskyrą
+        promote_user: Paaukštinti naudotoją
+        reject_appeal: Atmesti apeliaciją
+        reject_user: Atmesti naudotoją
+        remove_avatar_user: Pašalinti avatarą
+        reopen_report: Iš naujo atidaryti ataskaitą
+        resend_user: Iš naujo siųsti patvirtinimo laišką
+        reset_password_user: Nustatyti iš naujo slaptažodį
+        resolve_report: Išspręsti ataskaitą
+        sensitive_account: Priversti žymėti kaip jautrią paskyrai
+        silence_account: Riboti paskyrą
+        suspend_account: Pristabdyti paskyrą
+        unassigned_report: Panaikinti priskyrimą ataskaitą
+        unblock_email_account: Atblokuoti el. pašto adresą
+        unsensitive_account: Atšaukti privertimą žymėti kaip jautrią paskyrai
+        unsilence_account: Atšaukti riboti paskyrą
+        unsuspend_account: Atšaukti paskyros pristabdymą
+        update_announcement: Atnaujinti skelbimą
+        update_custom_emoji: Atnaujinti pasirinktinį jaustuką
+        update_domain_block: Atnaujinti domeno bloką
+        update_ip_block: Atnaujinti IP taisyklę
+        update_status: Atnaujinti įrašą
+        update_user_role: Atnaujinti vaidmenį
+      actions:
+        approve_appeal_html: "%{name} patvirtino prižiūjimo veiksmo apeliaciją iš %{target}"
+        approve_user_html: "%{name} patvirtino registraciją iš %{target}"
+        assigned_to_self_report_html: "%{name} paskyrė ataskaitą %{target} saviems"
+        change_email_user_html: "%{name} pakeitė el. paštą naudotojui %{target}"
+        change_role_user_html: "%{name} pakeitė vaidmenį %{target}"
+        confirm_user_html: "%{name} patvirtino el. paštą naudotojui %{target}"
+        create_account_warning_html: "%{name} išsiuntė įspėjimą %{target}"
+        create_announcement_html: "%{name} sukūrė naują skelbimą %{target}"
+        create_canonical_email_block_html: "%{name} užblokavo el. paštą su maišu %{target}"
+        create_custom_emoji_html: "%{name} įkėlė naują jaustuką %{target}"
+        create_domain_allow_html: "%{name} leido federaciją su domenu %{target}"
+        create_domain_block_html: "%{name} užblokavo domeną %{target}"
+        create_email_domain_block_html: "%{name} užblokavo el. pašto domeną %{target}"
+        create_ip_block_html: "%{name} sukūrė taisyklę IP %{target}"
+        create_unavailable_domain_html: "%{name} sustabdė tiekimą į domeną %{target}"
+        create_user_role_html: "%{name} sukūrė %{target} vaidmenį"
+        demote_user_html: "%{name} pažemino naudotoją %{target}"
+        destroy_announcement_html: "%{name} ištrynė skelbimą %{target}"
+        destroy_canonical_email_block_html: "%{name} atblokavo el. paštą su maišu %{target}"
+        destroy_custom_emoji_html: "%{name} ištrynė jaustuką %{target}"
+        destroy_domain_allow_html: "%{name} neleido federacijos su domenu %{target}"
+        destroy_domain_block_html: "%{name} atblokavo domeną %{target}"
+        destroy_email_domain_block_html: "%{name} atblokavo el. pašto domeną %{target}"
+        destroy_instance_html: "%{name} išvalė domeną %{target}"
+        destroy_ip_block_html: "%{name} ištrynė taisyklę IP %{target}"
+        destroy_status_html: "%{name} pašalino įrašą %{target}"
+        destroy_unavailable_domain_html: "%{name} pratęsė tiekimą į domeną %{target}"
+        destroy_user_role_html: "%{name} ištrynė %{target} vaidmenį"
+        disable_2fa_user_html: "%{name} išjungė dviejų veiksnių reikalavimą naudotojui %{target}"
+        disable_custom_emoji_html: "%{name} išjungė jaustuką %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} išjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        disable_user_html: "%{name} išjungė prisijungimą naudotojui %{target}"
+        enable_custom_emoji_html: "%{name} įjungė jaustuką %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} įjungė el. pašto prieigos tapatybės nustatymą %{target}"
+        enable_user_html: "%{name} įjungė prisijungimą naudotojui %{target}"
+        memorialize_account_html: "%{name} pavertė %{target} paskyrą į atminimo puslapį"
+        promote_user_html: "%{name} paaukštino naudotoją %{target}"
+        reject_appeal_html: "%{name} atmetė prižiūjimo veiksmo apeliaciją iš %{target}"
+        reject_user_html: "%{name} atmetė registraciją iš %{target}"
+        remove_avatar_user_html: "%{name} pašalino %{target} avatarą"
+        reopen_report_html: "%{name} atidarė ataskaitą %{target}"
+        resend_user_html: "%{name} iš naujo išsiuntė patvirtinimo el. laišką %{target}"
+        reset_password_user_html: "%{name} iš naujo nustatė naudotojo slaptažodį %{target}"
+        resolve_report_html: "%{name} išsprendė ataskaitą %{target}"
+        sensitive_account_html: "%{name} pažymėjo %{target} mediją kaip jautrią"
+        silence_account_html: "%{name} apribojo %{target} paskyrą"
+        suspend_account_html: "%{name} pristabdė %{target} paskyrą"
+        unassigned_report_html: "%{name} panaikino priskyrimą ataskaitui %{target}"
+        unblock_email_account_html: "%{name} atblokavo %{target} el. pašto adresą"
+        unsensitive_account_html: "%{name} panaikino %{target} medijos žymėjimą kaip jautrią"
+        unsilence_account_html: "%{name} panaikino %{target} paskyros ribojimą"
+        unsuspend_account_html: "%{name} atšaukė %{target} paskyros pristabdymą"
+        update_announcement_html: "%{name} atnaujino skelbimą %{target}"
+        update_custom_emoji_html: "%{name} atnaujino jaustuką %{target}"
+        update_domain_block_html: "%{name} atnaujino domeno bloką %{target}"
+        update_ip_block_html: "%{name} pakeitė taisyklę IP %{target}"
+        update_status_html: "%{name} atnaujino įrašą %{target}"
+        update_user_role_html: "%{name} pakeitė %{target} vaidmenį"
+      deleted_account: ištrinta paskyra
+      empty: Žurnalų nerasta.
+      filter_by_action: Filtruoti pagal veiksmą
+      filter_by_user: Filtruoti pagal naudotoją
       title: Audito žurnalas
+    announcements:
+      destroyed_msg: Skelbimas sėkmingai ištrintas.
+      edit:
+        title: Redaguoti skelbimą
+      empty: Skelbimų nerasta.
+      live: Tiesiogiai
+      new:
+        create: Sukurti skelbimą
+        title: Naujas skelbimas
+      publish: Skelbti
+      published_msg: Skelbimas sėkmingai paskelbtas.
+      scheduled_for: Suplanuota %{time}
+      scheduled_msg: Skelbimas suplanuotas paskelbti.
+      title: Skelbimai
+      unpublish: Panaikinti skelbimą
+      unpublished_msg: Skelbimas sėkmingai panaikintas.
+      updated_msg: Skelbimas sėkmingai atnaujintas.
+    critical_update_pending: Laukiama kritinio naujinimo
     custom_emojis:
+      assign_category: Priskirti kategoriją
       by_domain: Domenas
-      copied_msg: Sėkmingai sukurta lokali jaustuko kopija
+      copied_msg: Sėkmingai sukurta vietinė jaustuko kopija.
       copy: Kopijuoti
-      copy_failed_msg: Lokali jaustuko kopija negalėjo būti sukurta
-      created_msg: Jaustukas sukurtas sėkmingai!
+      copy_failed_msg: Nepavyko sukurti vietinės šios jaustuko kopijos.
+      create_new_category: Sukurti naują kategoriją
+      created_msg: Jaustukas sėkmingai sukurtas.
       delete: Ištrinti
       destroyed_msg: Jaustukas sėkmingai sunaikintas!
       disable: Išjungti
-      disabled_msg: Šis jaustukas sėkmingai išjungtas
+      disabled: Išjungta
+      disabled_msg: Sėkmingai išjungtas tas jaustukas.
       emoji: Jaustukas
       enable: Įjungti
-      enabled_msg: Šis jaustukas sėkmingai įjungtas
+      enabled: Įjungta
+      enabled_msg: Sėkmingai įjungtas tas jaustukas.
+      image_hint: PNG arba GIF iki %{size}
+      list: Sąrašas
       listed: Įtrauktas į sąrašą
       new:
-        title: Pridėti naują jaustuką
+        title: Pridėti naują pasirinktinį jaustuką
+      no_emoji_selected: Jaustukos nebuvo pakeistos, nes nebuvo pasirinktos.
+      not_permitted: Tau neleidžiama atlikti šio veiksmo.
       overwrite: Perrašyti
-      shortcode: Trumpas-kodas
+      shortcode: Trumpas kodas
       shortcode_hint: Bent du ženklai, tik raidiniai skaitmeniniai ženklai bei akcentai(_)
       title: Asmeniniai jaustukai
       unlisted: Neįtrauktas į sąrašą
@@ -147,24 +349,72 @@ lt:
       updated_msg: Jaustukas sėkmingai pakeistas!
       upload: Įkelti
     dashboard:
+      active_users: aktyvūs naudotojai
+      interactions: sąveikos
+      media_storage: Medijos saugykla
+      new_users: nauji naudotojai
+      opened_reports: atidaryti ataskaitos
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> laukiantys apeliacijos"
+        many: "<strong>%{count}</strong> laukiama apeliacija"
+        one: "<strong>%{count}</strong> laukiama apeliacija"
+        other: "<strong>%{count}</strong> laukiančių apeliacijų"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> laukiami ataskaitos"
+        many: "<strong>%{count}</strong> laukiama ataskaita"
+        one: "<strong>%{count}</strong> laukiama ataskaita"
+        other: "<strong>%{count}</strong> laukiančių ataskaitų"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> laukiantys saitažodžiai"
+        many: "<strong>%{count}</strong> laukiama saitažodis"
+        one: "<strong>%{count}</strong> laukiama saitažodis"
+        other: "<strong>%{count}</strong> laukiančių saitažodžių"
+      pending_users_html:
+        few: "<strong>%{count}</strong> laukiami naudotojai"
+        many: "<strong>%{count}</strong> laukiama naudotojas"
+        one: "<strong>%{count}</strong> laukiama naudotojas"
+        other: "<strong>%{count}</strong> laukiančių naudotojų"
+      resolved_reports: išspręstos ataskaitos
       software: Programinė įranga
-      space: Naudojama atmintis
-      title: Pagrindinis puslapis
+      sources: Registracijos šaltiniai
+      space: Vietos naudojimas
+      title: Sąvadas
+      top_languages: Populiariausios aktyvios kalbos
+      top_servers: Populiariausi aktyvūs serveriai
+      website: Svetainė
+    disputes:
+      appeals:
+        empty: Apeliacijų nerasta.
+        title: Apeliacijos
+    domain_allows:
+      add_new: Leisti federaciją su domenu
+      created_msg: Domenas buvo sėkmingai leistas federacijai.
+      destroyed_msg: Domenas buvo neleistas federacijai.
+      export: Eksportuoti
     domain_blocks:
       add_new: Pridėti naują domeno bloką
       created_msg: Domeno užblokavimas nagrinėjamas
       destroyed_msg: Domeno blokas pašalintas
       domain: Domenas
+      edit: Redaguoti domeno bloką
+      existing_domain_block: Tu jau nustatei griežtesnius apribojimus %{name}.
+      existing_domain_block_html: Tu jau nustatei griežtesnius apribojimus %{name}, pirmiausia turi <a href="%{unblock_url}">atblokuoti jį</a>.
+      export: Eksportuoti
+      import: Importuoti
       new:
         create: Sukurti bloką
-        hint: Domeno blokavimas nesustabdys vartotojų paskyrų sukūrimo duomenų sistemoje, tačiau automatiškai pritaikys atitinkamus moderavimo metodus šioms paskyroms.
+        hint: Domeno blokas netrukdys kurti paskyrų įrašų duomenų bazėje, bet atgaline data ir automatiškai taikys tam tikrus tų paskyrų prižiūrėjimo būdus.
         severity:
+          desc_html: "<strong>Ribojimas</strong> padarys šio domeno paskyrų įrašus nematomus visiems, kurie jų neseka. <strong>Pristabdymas</strong> iš tavo serverio pašalins visą šio domeno paskyrų turinį, mediją ir profilio duomenis. Naudok <strong>Nieko</strong>, jei nori tik atmesti medijos failus."
           noop: Nieko
-          suspend: Draudimas
+          silence: Riboti
+          suspend: Pristabdyti
         title: Naujos domeno blokas
-      reject_media: Atmesti medijos failai
+      public_comment: Viešas komentaras
+      public_comment_hint: Komentaras apie šį domeno apribojimą plačiajai visuomenei, jei įjungtas domenų apribojimų sąrašo reklamavimas.
+      reject_media: Atmesti medijos failus
       reject_media_hint: Panaikina lokaliai saugomus medijos failus bei atsisako jų parsisiuntimo ateityje. Neliečia užblokavimu
-      reject_reports: Atmesti skundai
+      reject_reports: Atmesti ataskaitas
       reject_reports_hint: Ignoruoti visus skundus, kurie siunčiami iš šio domeno. Neliečia užblokavimu
       undo: Atkurti domeno bloką
     email_domain_blocks:
@@ -178,12 +428,18 @@ lt:
         title: Naujas el pašto juodojo sąrašo įtraukimas
       title: El pašto juodasis sąrašas
     instances:
+      back_to_all: Visi
       by_domain: Domenas
+      content_policies:
+        reason: Viešoji priežastis
+      delivery:
+        all: Visi
       delivery_available: Pristatymas galimas
       moderation:
         all: Visi
         limited: Limituotas
         title: Moderacija
+      public_comment: Viešas komentaras
       title: Federacija
       total_blocked_by_us: Mes užblokavome
       total_followed_by_them: Jų sekami
@@ -201,11 +457,11 @@ lt:
     relays:
       add_new: Pridėti naują pamainą
       delete: Ištrinti
-      description_html: "<strong>Federacijos perjungėjas</strong> tai tarpinis serveris, kuris apsikeičia didelios apimties informacija tarp kitų serverių. <strong> Tai gali padėti mažesniems serveriams atrasti turinį iš fedi-visatos</strong>, kuris kitaip reikalautų vartotojų lokaliai sekti kitus žmones naudojantis kitus tolimus serverius."
+      description_html: "<strong>Federacijos perdavimas</strong> – tai tarpinis serveris, kuris keičiasi dideliais viešų įrašų kiekiais tarp jį prenumeruojančių ir skelbiančių serverių. <strong>Jis gali padėti mažiems ir vidutiniams serveriams atrasti fediverse esantį turinį</strong>, nes priešingu atveju vietiniams naudotojams reikėtų rankiniu būdu sekti kitus žmones iš nutolusių serverių."
       disable: Išjungti
       disabled: Išjungtas
       enable: Įjungti
-      enable_hint: Kai įjungta, Jūsų serveris prenumeruos visas viešas žinutes iš šio tinklo, ir pradės siųsti šio serverio viešas žinutes į tinklą.
+      enable_hint: Kai bus įjungtas, tavo serveris užsiprenumeruos visus šio perdavimo viešus įrašus ir pradės į jį siųsti šio serverio viešus įrašus.
       enabled: Įjungtas
       inbox_url: Perdavimo URL
       pending: Laukiama perdavimo patvirtinimo
@@ -218,11 +474,14 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
+      already_suspended_badges:
+        local: Jau sustabdytas šiame serveryje
+        remote: Jau sustabdytas jų serveryje
       are_you_sure: Ar esi įsitikinęs (-usi)?
       assign_to_self: Paskirti man
       assigned: Paskirtas moderatorius
       comment:
-        none: Nėra
+        none: Nieko
       created_at: Reportuotas
       forwarded_replies_explanation: Šis ataskaita yra iš nuotolinio naudotojo ir susijusi su nuotoliniu turiniu. Jis buvo persiųstas tau, nes turinys, apie kurį pranešta, yra atsakymas vienam iš tavo naudotojų.
       mark_as_resolved: Pažymėti kaip išsprestą
@@ -248,19 +507,29 @@ lt:
     roles:
       everyone: Numatytieji leidimai
       everyone_full_description_html: Tai – <strong>bazinis vaidmuo</strong>, turintis įtakos <strong>visiems naudotojams</strong>, net ir tiems, kurie neturi priskirto vaidmens. Visi kiti vaidmenys iš jo paveldi teises.
+      privileges:
+        manage_taxonomies_description: Leidžia naudotojams peržiūrėti tendencingą turinį ir atnaujinti saitažodžių nustatymus
     settings:
       captcha_enabled:
         desc_html: Tai priklauso nuo hCaptcha išorinių skriptų, kurie gali kelti susirūpinimą dėl saugumo ir privatumo. Be to, <strong>dėl to registracijos procesas kai kuriems žmonėms (ypač neįgaliesiems) gali būti gerokai sunkiau prieinami</strong>. Dėl šių priežasčių apsvarstyk alternatyvias priemones, pavyzdžiui, patvirtinimu arba kvietimu grindžiamą registraciją.
+      content_retention:
+        danger_zone: Pavojinga zona
+      discovery:
+        public_timelines: Viešieji laiko skalės
+        trends: Tendencijos
       domain_blocks:
         all: Visiems
+      registrations:
+        moderation_recommandation: Prieš atidarant registraciją visiems, įsitikink, kad turi tinkamą ir reaguojančią prižiūrėjimo komandą!
     software_updates:
       description: Rekomenduojama nuolat atnaujinti Mastodon diegyklę, kad galėtum naudotis naujausiais pataisymais ir funkcijomis. Be to, kartais labai svarbu laiku naujinti Mastodon, kad būtų išvengta saugumo problemų. Dėl šių priežasčių Mastodon kas 30 minučių tikrina, ar yra atnaujinimų, ir praneša tau apie tai pagal tavo el. pašto pranešimų parinktis.
     statuses:
-      back_to_account: Atgal į paskyros puslapį
+      back_to_account: Grįžti į paskyros puslapį
       media:
         title: Medija
       no_status_selected: Jokie statusai nebuvo pakeisti, nes niekas nepasirinkta
       title: Paskyros statusai
+      trending: Tendencinga
       with_media: Su medija
     system_checks:
       elasticsearch_health_yellow:
@@ -270,23 +539,83 @@ lt:
       elasticsearch_preset_single_node:
         message_html: Tavo Elasticsearch klasteris turi tik vieną mazgą, <code>ES_PRESET</code> turėtų būti nustatyta į <code>single_node_cluster</code>.
     title: Administracija
+    trends:
+      allow: Leisti
+      approved: Patvirtinta
+      disallow: Neleisti
+      links:
+        allow: Leisti nuorodą
+        allow_provider: Leisti leidėją
+        description_html: Tai – nuorodos, kuriomis šiuo metu daug bendrinasi paskyros, iš kurių tavo serveris mato įrašus. Tai gali padėti naudotojams sužinoti, kas vyksta pasaulyje. Jokios nuorodos nerodomos viešai, kol nepatvirtinai leidėjo. Taip pat gali leisti arba atmesti atskiras nuorodas.
+        disallow: Neleisti nuorodą
+        disallow_provider: Neleisti leidėją
+        no_link_selected: Jokios nuorodos nebuvo pakeistos, nes nebuvo pasirinkta nė viena
+        publishers:
+          no_publisher_selected: Jokie leidėjai nebuvo pakeisti, nes nė vienas nebuvo pasirinktas
+        title: Tendencingos nuorodos
+        usage_comparison: Bendrinta %{today} kartų šiandien, palyginti su %{yesterday} vakar
+      not_allowed_to_trend: Neleidžiama tendencinguoti
+      only_allowed: Leidžiama tik
+      pending_review: Laukiama peržiūros
+      preview_card_providers:
+        allowed: Nuorodos iš šio leidėjo gali tendencinguoti
+        description_html: Tai – domenai, iš kurių dažnai bendrinamos nuorodos tavo serveryje. Nuorodos netendencinguos, nebent nuorodos domenas yra patvirtintas. Tavo patvirtinimas (arba atmetimas) apima ir subdomenus.
+        rejected: Nuorodos iš šio leidėjo netendencinguos
+        title: Leidėjai
+      rejected: Atmesta
+      statuses:
+        allow: Leisti įrašą
+        allow_account: Leisti autorių (-ę)
+        description_html: Tai – įrašai, apie kuriuos žino tavo serveris ir kuriais šiuo metu daug bendrinamasi ir kurie yra mėgstami. Tai gali padėti naujiems ir grįžtantiems naudotojams rasti daugiau žmonių, kuriuos galima sekti. Jokie įrašai nerodomi viešai, kol nepatvirtinai autoriaus (-ės), o autorius (-ė) leidžia savo paskyrą siūlyti kitiems. Taip pat gali leisti arba atmesti atskirus įrašus.
+        disallow: Neleisti įrašą
+        disallow_account: Neleisti autorių (-ę)
+        no_status_selected: Jokie tendencingi įrašai nebuvo pakeisti, nes nė vienas iš jų nebuvo pasirinktas
+        not_discoverable: Autorius (-ė) nesutiko, kad būtų galima juos atrasti
+        title: Tendencingi įrašai
+      tags:
+        not_trendable: Nepasirodys tendencijose
+        title: Tendencingos saitažodžiai
+        trendable: Gali pasirodyti tendencijose
+        trending_rank: 'Tendencinga #%{rank}'
+      title: Tendencijos
+      trending: Tendencinga
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
       edit_preset: Keisti įspėjimo nustatymus
       title: Valdyti įspėjimo nustatymus
+    webhooks:
+      description_html: "<strong>Webhook</strong> leidžia Mastodon siųsti <strong>realaus laiko pranešimus</strong> apie pasirinktus įvykius į tavo programą, kad programa galėtų <strong>automatiškai paleisti reakcijas</strong>."
+      events: Įvykiai
   admin_mailer:
+    auto_close_registrations:
+      body: Dėl pastarojo meto peržiūrėtojų aktyvumo trūkumo %{instance} registracija buvo automatiškai pakeista į reikalaujančią rankinės būdo peržiūros, kad %{instance} nebūtų naudojama kaip platforma potencialiems blogiems veikėjams. Bet kuriuo metu gali ją vėl perjungti į atvirą registraciją.
+      subject: "%{instance} registracijos automatiškai pakeistos į reikalaujančias patvirtinimo"
     new_report:
       body: "%{reporter} parašė skundą apie %{target}"
       body_remote: Kažkas iš %{domain} parašė skundą apie %{target}
       subject: Naujas skundas %{instance} (#%{id})
+    new_trends:
+      new_trending_links:
+        title: Tendencingos nuorodos
+      new_trending_statuses:
+        title: Tendencingi įrašai
+      new_trending_tags:
+        title: Tendencingos saitažodžiai
+      subject: Naujos tendencijos peržiūrimos %{instance}
   appearance:
+    advanced_web_interface: Išplėstinė žiniatinklio sąsaja
+    advanced_web_interface_hint: 'Jei nori išnaudoti visą ekrano plotį, išplėstinė žiniatinklio sąsaja leidžia sukonfigūruoti daug skirtingų stulpelių, kad vienu metu matytum tiek informacijos, kiek tik nori: Pagrindinis, pranešimai, federacinė laiko skalė, bet kokie sąrašai ir saitažodžiai.'
+    animations_and_accessibility: Animacijos ir pritaikymas neįgaliesiems
+    confirmation_dialogs: Patvirtinimo dialogai
+    discovery: Atradimas
     localization:
       body: Mastodon verčia savanoriai.
       guide_link_text: Visi gali prisidėti.
+    sensitive_content: Jautrus turinys
   application_mailer:
-    notification_preferences: Keisti el pašto parinktis
-    settings: 'Keisti el pašto parinktis: %{link}'
+    notification_preferences: Keisti el. pašto nuostatas
+    settings: 'Keisti el. pašto nuostatas: %{link}'
     view: 'Peržiūra:'
     view_profile: Peržiurėti profilį
     view_status: Peržiūrėti statusą
@@ -316,6 +645,7 @@ lt:
     security: Apsauga
     set_new_password: Nustatyti naują slaptažodį
     status:
+      account_status: Paskyros būsena
       redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
       self_destruct: Kadangi %{domain} uždaromas, turėsi tik ribotą prieigą prie savo paskyros.
       view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
@@ -346,13 +676,15 @@ lt:
       your_appeal_approved: Tavo apeliacija buvo patvirtinta
       your_appeal_pending: Pateikei apeliaciją
       your_appeal_rejected: Tavo apeliacija buvo atmesta
+  edit_profile:
+    hint_html: "<strong>Tinkink tai, ką žmonės mato tavo viešame profilyje ir šalia įrašų.</strong> Kiti žmonės labiau linkę sekti atgal ir bendrauti su tavimi, jei tavo profilis yra užpildytas ir turi profilio nuotrauką."
   errors:
     '403': Jūs neturie prieigos matyti šiam puslapiui.
     '404': Puslapis nerastas.
     '410': Puslapis neegzistuoja.
     '422':
-      content: Apsaugos patvirtinmas klaidingas. Ar jūs blokuojate sausainius?
-      title: Apsaugos patvirtinimas nepavyko
+      content: Nepavyko saugumo patvirtinimas. Ar blokuoji slapukus?
+      title: Nepavyko saugumo patvirtinimas
     '429': Stabdomas
     '500':
       content: Atsiprašome, tačiau mūsų pusėje įvyko klaida.
@@ -373,11 +705,12 @@ lt:
     storage: Medijos sandėlis
   featured_tags:
     add_new: Pridėti naują
+    hint_html: "<strong>Savo profilyje parodyk svarbiausius saitažodžius.</strong> Tai puikus įrankis kūrybiniams darbams ir ilgalaikiams projektams sekti, todėl svarbiausios saitažodžiai rodomi matomoje vietoje profilyje ir leidžia greitai pasiekti tavo paties įrašus."
   filters:
     contexts:
       home: Namų laiko juosta
       notifications: Priminimai
-      public: Viešos laiko juostos
+      public: Viešieji laiko skalės
       thread: Pokalbiai
     edit:
       title: Keisti filtrą
@@ -385,12 +718,15 @@ lt:
       invalid_context: Jokio arba netinkamas pateiktas kontekstas
     index:
       delete: Ištrinti
+      empty: Neturi jokių filtrų.
       title: Filtrai
     new:
       title: Pridėti naują filtrą
   generic:
+    all: Visi
     changes_saved_msg: Pakeitimai sėkmingai išsaugoti!
     copy: Kopijuoti
+    order_by: Tvarkyti pagal
     save_changes: Išsaugoti pakeitimus
   imports:
     modes:
@@ -421,10 +757,10 @@ lt:
     invalid: Šis kvietimas negalioja.
     invited_by: 'Jus pakvietė:'
     max_uses:
-      few: "%{count} panaudojimai"
-      many: "%{count} panaudojimo"
-      one: 1 panaudojimas
-      other: "%{count} panaudojimų"
+      few: "%{count} naudojimai"
+      many: "%{count} naudojimo"
+      one: 1 naudojimas
+      other: "%{count} naudojimų"
     max_uses_prompt: Nėra limito
     prompt: Generuok ir bendrink nuorodas su kitais, kad suteiktum prieigą prie šio serverio
     table:
@@ -462,6 +798,9 @@ lt:
       body: 'Tavo įrašą pakėlė %{name}:'
       subject: "%{name} pakėlė tavo įrašą"
       title: Naujas pakėlimas
+  notifications:
+    email_events: Įvykiai, skirti el. laiško pranešimams
+    email_events_hint: 'Pasirink įvykius, apie kuriuos nori gauti pranešimus:'
   pagination:
     newer: Naujesnis
     next: Kitas
@@ -469,8 +808,34 @@ lt:
     prev: Ankstesnis
   preferences:
     other: Kita
+    posting_defaults: Skelbimo numatytosios nuostatos
+    public_timelines: Viešieji laiko skalės
   privacy:
     hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
+    privacy: Privatumas
+    privacy_hint_html: Valdyk, kiek informacijos norėtum atskleisti kitų labui. Žmonės atranda įdomių profilių ir šaunių programėlių, naršydami kitų žmonių sekamus profilius ir žiūrėdami, iš kokių programėlių jie skelbia įrašus, bet tu galbūt norėsi tai slėpti.
+    reach: Pasiekiamumas
+    reach_hint_html: Valdyk, ar norėtum, kad tave atrastų ir sektų nauji žmonės. Ar nori, kad įrašai būtų rodomi Naršyti ekrane? Ar nori, kad kiti žmonės tave matytų savo sekimo rekomendacijose? Ar nori automatiškai priimti visus naujus sekėjus, ar detaliai valdyti kiekvieną iš jų?
+    search: Paieška
+    search_hint_html: Valdyk, kaip norėtum būti surastas. Ar nori, kad žmonės tave rastų pagal tai, apie ką viešai paskelbi? Ar nori, kad ne Mastodon žmonės, ieškantys profilio internete, rastų tavo profilį? Atmink, kad visiško pašalinimo iš visų paieškos variklių viešai skelbiamai informacijai užtikrinti negalima.
+    title: Privatumas ir pasiekiamumas
+  privacy_policy:
+    title: Privatumo politika
+  redirects:
+    prompt: Jei pasitiki šia nuoroda, spustelėk ją, kad tęstum.
+    title: Palieki %{instance}
+  relationships:
+    activity: Paskyros aktyvumas
+    dormant: Neaktyvus
+    followers: Sekėjai
+    following: Sekama
+    last_active: Paskutinį kartą aktyvus
+    most_recent: Naujausias
+    moved: Perkelta
+    mutual: Bendri
+    primary: Pirminis
+    relationship: Sąryšis
+    status: Paskyros būsena
   remote_follow:
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
   scheduled_statuses:
@@ -482,25 +847,39 @@ lt:
     browser: Naršyklė
     browsers:
       generic: Nežinoma naršyklė
-    current_session: Dabartinė sesija
+    current_session: Dabartinis seansas
+    date: Data
     description: "%{browser} ant %{platform}"
     explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
+    platforms:
+      android: Android
+      ios: iOS
+      kai_os: KaiOS
+      mac: macOS
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Atšaukti
-    revoke_success: Sesija sėkmingai atšaukta
-    title: Sesijos
+    revoke_success: Seansas sėkmingai panaikintas.
+    title: Seansai
   settings:
     authorized_apps: Autorizuotos aplikacijos
-    back: Atgal į Mastodon
+    back: Grįžti į Mastodon
     delete: Paskyros trynimas
     development: Plėtojimas
     edit_profile: Keisti profilį
     export: Informacijos eksportas
-    featured_tags: Rodomi saitažodžiai(#)
+    featured_tags: Rodomi saitažodžiai
     import: Importuoti
     migrate: Paskyros migracija
-    notifications: Pranešimai
-    preferences: Preferencijos
+    notifications: El. laiško pranešimai
+    preferences: Nuostatos
+    profile: Viešas profilis
+    relationships: Sekimai ir sekėjai
+    severed_relationships: Nutrūkę sąryšiai
     two_factor_authentication: Dviejų veiksnių autentikacija
+  severed_relationships:
+    preamble: Užblokavus domeną arba prižiūrėtojams nusprendus pristabdyti nuotolinio serverio veiklą, gali prarasti sekimus ir sekėjus. Kai taip atsitiks, galėsi atsisiųsti nutrauktų sąryšių sąrašus, kad juos patikrinti ir galbūt importuoti į kitą serverį.
   statuses:
     attached:
       description: 'Pridėta: %{attached}'
@@ -515,11 +894,11 @@ lt:
     show_more: Daugiau
     visibilities:
       private: Tik sekėjams
-      private_long: Rodyti tik sekėjams
+      private_long: rodyti tik sekėjams
       public: Viešas
-      public_long: Visi gali matyti
+      public_long: visi gali matyti
       unlisted: Neįtrauktas į sąrašus
-      unlisted_long: Matyti gali visi, tačiau nėra įtraukti į viešąsias laiko skales
+      unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
     keep_polls_hint: Neištrina jokių tavo apklausų
@@ -528,9 +907,10 @@ lt:
   stream_entries:
     sensitive_content: Jautrus turinys
   themes:
-    contrast: Mastodon (Didelio Kontrasto)
-    default: Mastodon (Tamsus)
-    mastodon-light: Mastodon (Šviesus)
+    contrast: Mastodon (didelis kontrastas)
+    default: Mastodon (tamsi)
+    mastodon-light: Mastodon (šviesi)
+    system: Automatinis (naudoti sistemos temą)
   two_factor_authentication:
     disable: Išjungti
     enabled: Dviejų veiksnių autentikacija įjungta
@@ -541,10 +921,22 @@ lt:
     recovery_codes_regenerated: Atkūrimo kodai sėkmingai sugeneruoti
     recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jūs galite naudoti atkūrimo kodus esančius žemiau, kad atgautumėte priega prie savo paskyros.<strong>Laikykite atkūrimo kodus saugiai</strong> Pavyzdžiui, galite norėti juos išspausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
   user_mailer:
+    appeal_approved:
+      action: Paskyros nustatymai
+      subtitle: Tavo paskyros būklė vėl yra gera.
+    appeal_rejected:
+      subtitle: Tavo apeliacija buvo atmesta.
     backup_ready:
-      explanation: Jūs prašėte pilnos Mastodon paskyros atsarginės kopijos. Ji paruošta parsisiuntimui!
+      explanation: Prašai sukurti pilną Mastodon paskyros atsarginę kopiją.
+      extra: Jį jau galima atsisiųsti!
       subject: Jūsų archyvas paruoštas parsisiuntimui
       title: Archyvas išimtas
+    failed_2fa:
+      details: 'Štai išsami informacija apie bandymą prisijungti:'
+      explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą antrąjį tapatybės nustatymo veiksnį.
+      further_actions_html: Jei tai buvo ne tu, rekomenduojame nedelsiant imtis %{action}, nes jis gali būti pažeistas.
+      subject: Antrojo veiksnio tapatybės nustatymas nesėkmingai
+      title: Nepavyko atlikti antrojo veiksnio tapatybės nustatymo
     warning:
       subject:
         disable: Jūsų paskyra %{acct} buvo užšaldyta
@@ -557,12 +949,41 @@ lt:
         silence: Paskyra limituota
         suspend: Paskyra užrakinta
     welcome:
-      edit_profile_action: Nustatyti profilį
+      apps_android_action: Gauti per Google Play
+      apps_ios_action: Atsisiųsti per App Store
+      apps_step: Atsisiųsk oficialias programėles.
+      apps_title: Mastodon programėlės
+      checklist_subtitle: 'Pradėkime pažintį su šia nauja socialine sritimi:'
+      checklist_title: Pasveikinimo sąrašas
+      edit_profile_action: Suasmeninti
+      edit_profile_step: Padidink savo sąveiką turint išsamų profilį.
+      edit_profile_title: Suasmenink savo profilį
       explanation: Štai keletas patarimų, kaip pradėti
-      final_action: Pradėti kelti įrašus
-      final_step: 'Pradėk skelbti! Net jei ir neturi sekėjų, tavo viešus įrašus gali matyti kiti, pavyzdžiui, vietinėje laiko skalėje arba saitažodžiuose. Galbūt norėsi prisistatyti saitažodyje #introductions.'
-      full_handle: Tavo pilnas slapyvardis
-      full_handle_hint: Štai ką pasakytum savo draugams, kad jie galėtų parašyti arba sekti tave iš kito serverio.
+      feature_action: Sužinoti daugiau
+      feature_audience: Mastodon suteikia unikalią galimybę valdyti savo auditoriją be tarpininkų. Tavo infrastruktūroje įdiegtas Mastodon leidžia sekti ir būti sekamam iš bet kurio kito Mastodon serverio internete ir yra kontroliuojamas tik tavęs.
+      feature_audience_title: Užtikrintai kurk savo auditoriją
+      feature_control: Tu geriausiai žinai, ką nori matyti savo pagrindiniame sraute. Jokių algoritmų ar reklamų, kurios gaištų tavo laiką. Iš vienos paskyros sek bet kurį asmenį bet kuriame Mastodon serveryje, gauk jo įrašus chronologine tvarka ir padaryk savo interneto kampelį šiek tiek panašesnį į save.
+      feature_control_title: Kontroliuok savo laiko skalę
+      feature_creativity: Mastodon palaiko garso, vaizdo įrašus ir paveikslėlių įrašus, prieinamumus aprašymus, apklausas, turinio įspėjimus, animuotus avatarus, pasirinktinius jaustukus, miniatiūrų apkarpymo valdymą ir dar daugiau, kad galėtum išreikšti save internete. Nesvarbu, ar publikuoji savo kūrybą, muziką, ar tinklalaidę, Mastodon tau padės.
+      feature_creativity_title: Neprilygstamas kūrybiškumas
+      feature_moderation: Mastodon grąžina sprendimų priėmimą į tavo rankas. Kiekvienas serveris kuria savo taisykles ir nuostatus, kurie yra įgyvendinami vietoje, o ne iš viršaus į apačią, kaip įmonių socialinėje medijoje, todėl ši sistema lanksčiausiai reaguoja į skirtingų žmonių grupių poreikius. Prisijunk prie serverio su taisyklėmis, su kuriomis sutinki, arba talpink savo serverį.
+      feature_moderation_title: Prižiūrėjimas taip, kaip turėtų būti
+      follow_action: Sekti
+      follow_step: Sekti įdomius žmones – tai, kas yra Mastodon.
+      follow_title: Suasmenink savo pagrindinį srautą
+      follows_subtitle: Sek gerai žinomas paskyras.
+      follows_title: Ką sekti
+      follows_view_more: Peržiūrėti daugiau sekamų žmonių
+      hashtags_subtitle: Naršyk, kas tendencinga per pastarąsias 2 dienas
+      hashtags_title: Tendencingos saitažodžiai
+      hashtags_view_more: Peržiūrėti daugiau tendencingų saitažodžių
+      post_action: Sukurti
+      post_step: Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis.
+      post_title: Sukūrk savo pirmąjį įrašą
+      share_action: Bendrinti
+      share_step: Leisk draugams sužinoti, kaip tave rasti Mastodon.
+      share_title: Bendrink savo Mastodon profilį
+      sign_in_action: Prisijungti
       subject: Sveiki atvykę į Mastodon
       title: Sveiki atvykę, %{name}!
   users:
@@ -570,12 +991,14 @@ lt:
     go_to_sso_account_settings: Eik į savo tapatybės teikėjo paskyros nustatymus
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
     otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
+    rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
     seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
-    extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kas <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
+    extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kad <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
+    here_is_how: Štai kaip
     hint_html: "<strong>Savo tapatybės patvirtinimas Mastodon skirtas visiems.</strong> Remiantis atviraisiais žiniatinklio standartais, dabar ir visam laikui nemokamas. Viskas, ko tau reikia, yra asmeninė svetainė, pagal kurią žmonės tave atpažįsta. Kai iš savo profilio pateiksi nuorodą į šią svetainę, patikrinsime, ar svetainėje yra nuoroda į tavo profilį, ir parodysime vizualinį indikatorių."
-    instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke „Redaguoti profilį“ įrašyk savo svetainės adresą ir išsaugok pakeitimus.
+    instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke Redaguoti profilį įrašyk savo svetainės adresą ir išsaugok pakeitimus.
     verification: Patvirtinimas
     verified_links: Tavo patikrintos nuorodos
   webauthn_credentials:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c532b84e27..f4f0aa9db2 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -16,9 +16,9 @@ lv:
     instance_actor_flash: Šis konts ir virtuāls aktieris, ko izmanto, lai pārstāvētu pašu serveri, nevis atsevišķu lietotāju. To izmanto federācijas nolūkos, un to nevajadzētu apturēt.
     last_active: pēdējā aktivitāte
     link_verified_on: Šīs saites piederība tika pārbaudīta %{date}
-    nothing_here: Te nekā nav!
+    nothing_here: Šeit nekā nav.
     pin_errors:
-      following: Tev jau ir jāseko personai, kuru vēlies apstiprināt
+      following: Tev ir jāseko personai, kuru vēlies atbalstīt
     posts:
       one: Ziņa
       other: Ziņas
@@ -37,7 +37,7 @@ lv:
       approve: Apstiprināt
       approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
       are_you_sure: Vai esi pārliecināts?
-      avatar: Avatars
+      avatar: Profila attēls
       by_domain: Domēns
       change_email:
         changed_msg: E-pasts veiksmīgi nomainīts!
@@ -65,7 +65,7 @@ lv:
       disabled: Iesaldēts
       display_name: Parādāmais vārds
       domain: Domēns
-      edit: Rediģēt
+      edit: Labot
       email: E-pasts
       email_status: E-pasta statuss
       enable: Atsaldēt
@@ -122,9 +122,9 @@ lv:
       rejected_msg: Veiksmīgi noraidīts %{username} reģistrēšanās pieteikums
       remote_suspension_irreversible: Šī konta dati ir neatgriezeniski dzēsti.
       remote_suspension_reversible_hint_html: Konts ir apturēts viņu serverī, un dati tiks pilnībā noņemti %{date}. Līdz tam attālais serveris var atjaunot šo kontu bez jebkādām negatīvām sekām. Ja vēlaties nekavējoties noņemt visus konta datus, varat to izdarīt tālāk.
-      remove_avatar: Noņemt avatāru
+      remove_avatar: Noņemt profila attēlu
       remove_header: Noņemt galveni
-      removed_avatar_msg: Veiksmīgi noņemts %{username} avatāra attēls
+      removed_avatar_msg: Veiksmīgi noņemts %{username} profila attēls
       removed_header_msg: Veiksmīgi noņemts %{username} galvenes attēls
       resend_confirmation:
         already_confirmed: Šis lietotājs jau ir apstiprināts
@@ -212,7 +212,7 @@ lv:
         promote_user: Izceltt Lietotāju
         reject_appeal: Noraidīt Apelāciju
         reject_user: Noraidīt lietotāju
-        remove_avatar_user: Noņemt Avatāru
+        remove_avatar_user: Noņemt profila attēlu
         reopen_report: Atkārtoti Atvērt Ziņojumu
         resend_user: Atkārtoti nosūtīt Apstiprinājuma Pastu
         reset_password_user: Atiestatīt Paroli
@@ -260,7 +260,7 @@ lv:
         destroy_status_html: "%{name} noņēma ziņu %{target}"
         destroy_unavailable_domain_html: "%{name} atjaunoja piegādi uz domēnu %{target}"
         destroy_user_role_html: "%{name} izdzēsa %{target} lomu"
-        disable_2fa_user_html: "%{name} atspējoja divfaktoru prasības lietotājam %{target}"
+        disable_2fa_user_html: "%{name} atspējoja divpakāpju prasības lietotājam %{target}"
         disable_custom_emoji_html: "%{name} atspējoja emocijzīmi %{target}"
         disable_sign_in_token_auth_user_html: "%{name} atspējoja e-pasta marķiera autentifikāciju %{target}"
         disable_user_html: "%{name} atspējoja pieteikšanos lietotājam %{target}"
@@ -271,7 +271,7 @@ lv:
         promote_user_html: "%{name} paaugstināja lietotāju %{target}"
         reject_appeal_html: "%{name} noraidīja moderācijas lēmuma apelāciju no %{target}"
         reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
-        remove_avatar_user_html: "%{name} noņēma %{target} avatāru"
+        remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
         reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
         resend_user_html: "%{name} atkārtoti nosūtīja apstiprinājuma e-pastu %{target}"
         reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
@@ -298,7 +298,7 @@ lv:
     announcements:
       destroyed_msg: Paziņojums ir veiksmīgi izdzēsts!
       edit:
-        title: Rediģēt paziņojumu
+        title: Labot paziņojumu
       empty: Neviens paziņojums netika atrasts.
       live: Dzīvajā
       new:
@@ -402,7 +402,7 @@ lv:
       created_msg: Domēna bloķēšana tagad tiek apstrādāta
       destroyed_msg: Domēna bloķēšana ir atsaukta
       domain: Domēns
-      edit: Rediģēt domēna bloķēšanu
+      edit: Labot domēna aizturēšanu
       existing_domain_block: Tu jau esi noteicis stingrākus ierobežojumus %{name}.
       existing_domain_block_html: Tu jau esi noteicis stingrākus ierobežojumus %{name}, vispirms tev <a href="%{unblock_url}">jāatbloķē</a>.
       export: Eksportēt
@@ -432,6 +432,7 @@ lv:
       view: Skatīt domēna bloķēšanu
     email_domain_blocks:
       add_new: Pievienot jaunu
+      allow_registrations_with_approval: Atļaut reģistrāciju ar apstiprināšanu
       attempts_over_week:
         one: "%{count} mēģinājums pagājušajā nedēļā"
         other: "%{count} reģistrēšanās mēģinājumi pagājušajā nedēļā"
@@ -467,12 +468,12 @@ lv:
         title: Importēt bloķētos domēnus
       no_file: Nav atlasīts neviens fails
     follow_recommendations:
-      description_html: "<strong>Sekošana rekomendācijām palīdz jaunajiem lietotājiem ātri atrast interesantu saturu</strong>. Ja lietotājs nav pietiekami mijiedarbojies ar citiem, lai izveidotu personalizētus ieteikumus, ieteicams izmantot šos kontus. Tie tiek pārrēķināti katru dienu, izmantojot vairākus kontus ar visaugstākajām pēdējā laika saistībām un vislielāko vietējo sekotāju skaitu noteiktā valodā."
+      description_html: "<strong>Sekošanas ieteikumi palīdz jauniem lietotājiem ātri arast saistošu saturu</strong>. Kad lietotājs nav pietiekami mijiedarbojies ar citiem, lai veidotos pielāgoti sekošanas iteikumi, tiek ieteikti šie konti. Tie tiek pārskaitļoti ik dienas, izmantojot kontu, kuriem ir augstākās nesenās iesaistīšanās un lielākais vietējo sekotāju skaits norādītajā valodā."
       language: Valodai
       status: Statuss
       suppress: Apspiest sekošanas rekomendāciju
       suppressed: Apspiestie
-      title: Sekošanas rekomendācijas
+      title: Sekošanas ieteikumi
       unsuppress: Atjaunot sekošanas rekomendāciju
     instances:
       availability:
@@ -574,7 +575,7 @@ lv:
     relays:
       add_new: Pievienot jaunu releju
       delete: Dzēst
-      description_html: "<strong>Federācijas relejs</strong> ir starpniekserveris, kas apmainās ar lielu publisko ziņu apjomu starp serveriem, kas to abonē un publicē. <strong>Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu no federācijas</strong>, pretējā gadījumā vietējiem lietotājiem manuāli jāseko citām personām attālos serveros."
+      description_html: "<strong>Federācijas pārraidītājs</strong> ir starpniekserveris, kas apmainās ar lielu publisko ierakstu apjomu starp serveriem, kas to abonē un publicē tajā. <strong>Tas var palīdzēt maziem un vidējiem serveriem atklāt saturu fediversā</strong>, pretējā gadījumā vietējiem lietotājiem būtu pasrocīgi jāseko citiem cilvēkiem attālos serveros."
       disable: Atspējot
       disabled: Atspējots
       enable: Iespējot
@@ -658,7 +659,7 @@ lv:
         actions:
           delete_html: Noņemt aizskarošās ziņas
           mark_as_sensitive_html: Atzīmēt aizskarošo ziņu multivides saturu kā sensitīvu
-          silence_html: Ievērojami ierobežojiet <strong>@%{acct}</strong> sasniedzamību, padarot viņa profilu un saturu redzamu tikai personām, kas jau seko viņiem vai manuāli meklē profilu
+          silence_html: Ievērojami ierobežo <strong>@%{acct}</strong> sasniedzamību, padarot viņa profilu un saturu redzamu tikai cilvēkiem, kas jau seko tam vai pašrocīgi uzmeklē profilu
           suspend_html: Apturēt <strong>@%{acct}</strong>, padarot viņu profilu un saturu nepieejamu un neiespējamu mijiedarbību ar
         close_report: 'Atzīmēt ziņojumu #%{id} kā atrisinātu'
         close_reports_html: Atzīmējiet <strong>visus</strong> pārskatus par <strong>@%{acct}</strong> kā atrisinātus
@@ -688,7 +689,7 @@ lv:
         special: Īpašās
       delete: Dzēst
       description_html: Izmantojot <strong>lietotāju lomas</strong>, vari pielāgot, kurām Mastodon funkcijām un apgabaliem var piekļūt tavi lietotāji.
-      edit: Rediģēt lomu '%{name}'
+      edit: Labot lomu '%{name}'
       everyone: Noklusētās atļaujas
       everyone_full_description_html: Šī ir <strong>pamata loma</strong>, kas ietekmē <strong>visus lietotājus</strong>, pat tos, kuriem nav piešķirta loma. Visas pārējās lomas manto atļaujas no šīs.
       permissions_count:
@@ -741,7 +742,7 @@ lv:
       add_new: Pievienot noteikumu
       delete: Dzēst
       description_html: Lai gan lielākā daļa apgalvo, ka ir izlasījuši pakalpojumu sniegšanas noteikumus un piekrīt tiem, parasti cilvēki to izlasa tikai pēc problēmas rašanās. <strong>Padariet vienkāršāku sava servera noteikumu uztveršanu, veidojot tos vienkāršā sarakstā pa punktiem.</strong> Centieties, lai atsevišķi noteikumi būtu īsi un vienkārši, taču arī nesadaliet tos daudzos atsevišķos vienumos.
-      edit: Rediģēt noteikumu
+      edit: Labot nosacījumu
       empty: Servera noteikumi vēl nav definēti.
       title: Servera noteikumi
     settings:
@@ -760,6 +761,7 @@ lv:
         desc_html: Tas balstās uz ārējiem skriptiem no hCaptcha, kas var radīt bažas par drošību un privātumu. Turklāt <strong>tas var padarīt reģistrācijas procesu ievērojami mazāk pieejamu dažiem cilvēkiem (īpaši invalīdiem)</strong>. Šo iemeslu dēļ, lūdzu, apsver alternatīvus pasākumus, piemēram, reģistrāciju, kas balstīta uz apstiprinājumu vai uzaicinājumu.
         title: Pieprasīt jaunajiem lietotājiem atrisināt CAPTCHA, lai apstiprinātu savu kontu
       content_retention:
+        danger_zone: Bīstama sadaļa
         preamble: Kontrolē, kā Mastodon tiek glabāts lietotāju ģenerēts saturs.
         title: Satura saglabāšana
       default_noindex:
@@ -829,7 +831,7 @@ lv:
       reblogs: Reblogi
       status_changed: Ziņa mainīta
       title: Konta ziņas
-      trending: Populārākie
+      trending: Aktuāli
       visibility: Redzamība
       with_media: Ar multividi
     strikes:
@@ -884,7 +886,7 @@ lv:
         action: Pārbaudi šeit, lai iegūtu plašāku informāciju
         message_html: "<strong>Tava objektu krātuve ir nepareizi konfigurēta. Tavu lietotāju privātums ir apdraudēts.</strong>"
     tags:
-      review: Pārskatīt statusu
+      review: Pārskatīt stāvokli
       updated_msg: Tēmtura iestatījumi ir veiksmīgi atjaunināti
     title: Administrēšana
     trends:
@@ -894,16 +896,16 @@ lv:
       links:
         allow: Atļaut saiti
         allow_provider: Atļaut publicētāju
-        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem tavs serveris redz ziņas. Tas var palīdzēt taviem lietotājiem uzzināt, kas notiek pasaulē. Kamēr tu neapstiprini izdevēju, neviena saite netiek rādīta publiski. Vari arī atļaut vai noraidīt atsevišķas saites.
+        description_html: Šīs ir saites, kuras pašlaik bieži koplieto konti, no kuriem Tavs serveris redz ziņas. Tas var palīdzēt Taviem lietotājiem uzzināt, kas notiek pasaulē. Neviena saite netiek publiski rādīta, līdz tu apstiprini izdevēju. Tu vari arī atļaut vai noraidīt atsevišķas saites.
         disallow: Neatļaut saiti
         disallow_provider: Neatļaut publicētāju
         no_link_selected: Neviena saite netika mainīta, jo neviena netika atlasīta
         publishers:
           no_publisher_selected: Neviens publicētājs netika mainīts, jo neviens netika atlasīts
         shared_by_over_week:
-          one: Pēdējās nedēļas laikā kopīgoja viena persona
-          other: Pēdējās nedēļas laikā kopīgoja %{count} personas
-          zero: Pēdējās nedēļas laikā kopīgoja %{count} personas
+          one: Pēdējās nedēļas laikā kopīgoja viens cilvēks
+          other: Pēdējās nedēļas laikā kopīgoja %{count} cilvēki
+          zero: Pēdējās nedēļas laikā kopīgoja %{count} cilvēku
         title: Populārākās saites
         usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar
       not_allowed_to_trend: Popularizešana nav atļauta
@@ -916,10 +918,10 @@ lv:
         title: Publicētāji
       rejected: Noraidīts
       statuses:
-        allow: Atļaut publicēt
+        allow: Ļaut veikt ierakstus
         allow_account: Atļaut autoru
-        description_html: Šīs ir ziņas, par kurām tavs serveris zina un kuras pašlaik tiek koplietotas un pašlaik ir daudz izlasē. Tas var palīdzēt taviem jaunajiem un atkārtotiem lietotājiem atrast vairāk cilvēku, kam sekot. Neviena ziņa netiek publiski rādīta, kamēr neesi apstiprinājis autoru un autors atļauj savu kontu ieteikt citiem. Vari arī atļaut vai noraidīt atsevišķas ziņas.
-        disallow: Neatļaut publicēt
+        description_html: Šie ir ieraksti, par kuriem zina Tavs serveris un kuri pašlaik tiek daudz kopīgoti un pievienoti izlasēm. Tas var palīdzēt jaunajiem lietotājiem un tiem, kuri atgriežas, atrast vairāk cilvēku, kam sekot. Neviens ieraksts netiek publiski rādīts, līdz apstiprināsi autoru un ja autors ļauj savu kontu ieteikt citiem. Tu vari arī atļaut vai noraidīt atsevišķus ierakstus.
+        disallow: Neļaut veikt ierakstus
         disallow_account: Neatļaut autoru
         no_status_selected: Neviena populāra ziņa netika mainīta, jo neviena netika atlasīta
         not_discoverable: Autors nav izvēlējies būt atklājams
@@ -936,22 +938,22 @@ lv:
           tag_servers_dimension: Populārākie serveri
           tag_servers_measure: dažādi serveri
           tag_uses_measure: lietojumi pavisam
-        description_html: Šīs ir atsauces, kas pašlaik tiek rādītas daudzās ziņās, kuras redz tavs serveris. Tas var palīdzēt taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviena atsauce netiek rādīta publiski, kamēr tu neesi tās apstiprinājis.
+        description_html: Šie ir tēmturi, kas pašlaik parādās daudzos ierakstos, kurus redz Tavs serveris. Tas var palīdzēt Taviem lietotājiem uzzināt, par ko cilvēki šobrīd runā visvairāk. Neviens tēmturis netiek publiski parādīts, līdz apstiprināsi tos.
         listable: Var tikt ieteikts
         no_tag_selected: Neviena atzīme netika mainīta, jo neviena netika atlasīta
         not_listable: Nevar tikt ieteikts
         not_trendable: Neparādīsies pie tendencēm
         not_usable: Nevar tikt lietots
         peaked_on_and_decaying: Sasniedza maksimumu %{date}, tagad samazinās
-        title: Populārākie tēmturi
+        title: Izplatīti tēmturi
         trendable: Var parādīsies pie tendencēm
         trending_rank: 'Populārākie #%{rank}'
         usable: Var tikt lietots
-        usage_comparison: Šodien lietots %{today} reizes, salīdzinot ar %{yesterday} vakar
+        usage_comparison: Šodien izmantots %{today} reizes, salīdzinot ar %{yesterday} vakar
         used_by_over_week:
           one: Pēdējās nedēļas laikā izmantoja viens cilvēks
-          other: Pēdējās nedēļas laikā izmantoja %{count} personas
-          zero: Pēdējās nedēļas laikā izmantoja %{count} personas
+          other: Pēdējās nedēļas laikā izmantoja %{count} cilvēki
+          zero: Pēdējās nedēļas laikā izmantoja %{count} cilvēku
       title: Tendences
       trending: Populārākie
     warning_presets:
@@ -966,7 +968,7 @@ lv:
       description_html: Izmantojot <strong>tīmekļa aizķeri</strong>, Mastodon var nosūtīt jūsu lietojumprogrammai <strong>reāllaika paziņojumus</strong> par izvēlētajiem notikumiem, lai tava lietojumprogramma varētu <strong>automātiski izraisīt reakcijas</strong>.
       disable: Atspējot
       disabled: Atspējots
-      edit: Rediģēt galapunktu
+      edit: Labot galapunktu
       empty: Tev vēl nav konfigurēts neviens tīmekļa aizķeres galapunkts.
       enable: Iespējot
       enabled: Aktīvie
@@ -1014,7 +1016,7 @@ lv:
       new_trending_statuses:
         title: Populārākās ziņas
       new_trending_tags:
-        title: Populārākie tēmturi
+        title: Izplatīti tēmturi
       subject: Tiek pārskatītas jaunas tendences %{instance}
   aliases:
     add_new: Izveidot aizstājvārdu
@@ -1039,7 +1041,7 @@ lv:
     salutation: "%{name},"
     settings: 'Mainīt e-pasta uztādījumus: %{link}'
     unsubscribe: Atcelt abonēšanu
-    view: 'Skatījums:'
+    view: 'Skatīt:'
     view_profile: Skatīt profilu
     view_status: Skatīt ziņu
   applications:
@@ -1053,7 +1055,7 @@ lv:
   auth:
     apply_for_account: Pieprasīt kontu
     captcha_confirmation:
-      help_html: Ja tev ir problēmas ar CAPTCHA risināšanu, vari sazināties ar mums, izmantojot %{email}, un mēs varam tev palīdzēt.
+      help_html: Ja Tev ir sarežģījumi ar CAPTCHA risināšanu, Tu vari sazināties ar mums e-pasta adresē %{email}, un mēs varēsim Tev palīdzēt.
       hint_html: Vēl tikai viena lieta! Mums ir jāapstiprina, ka tu esi cilvēks (tas ir tāpēc, lai mēs varētu nepieļaut surogātpasta izsūtīšanu!). Atrisini tālāk norādīto CAPTCHA un noklikšķini uz "Turpināt".
       title: Drošības pārbaude
     confirmations:
@@ -1065,7 +1067,7 @@ lv:
       redirect_to_app_html: Tev vajadzētu būt novirzītam uz lietotni <strong>%{app_name}</strong>. Ja tas nenotika, mēģini %{clicking_this_link} vai manuāli atgriezieties lietotnē.
       registration_complete: Tava reģistrācija domēnā %{domain} tagad ir pabeigta!
       welcome_title: Laipni lūdzam, %{name}!
-      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, varat to mainīt konta iestatījumos.
+      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, to var mainīt konta iestatījumos.
     delete_account: Dzēst kontu
     delete_account_html: Ja vēlies dzēst savu kontu, tu vari <a href="%{path}">turpināt šeit</a>. Tev tiks lūgts apstiprinājums.
     description:
@@ -1076,7 +1078,7 @@ lv:
     dont_have_your_security_key: Vai tev nav drošības atslēgas?
     forgot_password: Aizmirsi paroli?
     invalid_reset_password_token: Paroles atiestatīšanas pilnvara nav derīga, vai tai ir beidzies derīgums. Lūdzu, pieprasi jaunu.
-    link_to_otp: Ievadi divfaktoru kodu no tālruņa vai atkopšanas kodu
+    link_to_otp: Jāievada divpakāpju kods no tālruņa vai atkopšanas kods
     link_to_webauth: Lieto savu drošības atslēgas iekārtu
     log_in_with: Pieslēgties ar
     login: Pieteikties
@@ -1108,22 +1110,22 @@ lv:
     security: Drošība
     set_new_password: Iestatīt jaunu paroli
     setup:
-      email_below_hint_html: Pārbaudi savu surogātpasta mapi vai pieprasiet citu. Tu vari labot savu e-pasta adresi, ja tā ir nepareiza.
+      email_below_hint_html: Pārbaudi savu surogātpasta mapi vai pieprasi vēl vienu! Tu vari labot savu e-pasta adresi, ja tā ir nepareiza.
       email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
       link_not_received: Vai nesaņēmi sati?
       new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pastu ar apstiprinājuma saiti!
       title: Pārbaudi savu iesūtni
     sign_in:
-      preamble_html: Piesakies ar saviem <strong>%{domain}</strong> akreditācijas datiem. Ja tavs konts ir mitināts citā serverī, tu nevarēsi pieteikties šeit.
+      preamble_html: Jāpiesakās ar saviem <strong>%{domain}</strong> piekļuves datiem. Ja Tavs konts tiek mitināts citā serverī, Tu nevarēsi šeit pieteikties.
       title: Pierakstīties %{domain}
     sign_up:
       manual_review: Reģistrācijas domēnā %{domain} manuāli pārbauda mūsu moderatori. Lai palīdzētu mums apstrādāt tavu reģistrāciju, uzraksti mazliet par sevi un to, kāpēc vēlies kontu %{domain}.
-      preamble: Izmantojot kontu šajā Mastodon serverī, tu varēsi sekot jebkurai citai personai tīklā neatkarīgi no tā, kur tiek mitināts viņas konts.
+      preamble: Ar kontu šajā Mastodon serverī varēsi sekot jebkuram citam tīklā esošam cilvēkam neatkarīgi no tā, kur tiek mitināts viņa konts.
       title: Atļauj tevi iestatīt %{domain}.
     status:
       account_status: Konta statuss
       confirming: Gaida e-pasta apstiprinājuma pabeigšanu.
-      functional: Tavs konts ir pilnībā darboties spējīgs.
+      functional: Tavs konts ir pilnā darba kārtībā.
       pending: Tavu pieteikumu gaida mūsu darbinieku izskatīšana. Tas var aizņemt kādu laiku. Ja tavs pieteikums tiks apstiprināts, tu saņemsi e-pastu.
       redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
       self_destruct: Tā kā %{domain} tiek slēgts, tu iegūsi tikai ierobežotu piekļuvi savam kontam.
@@ -1164,7 +1166,7 @@ lv:
     proceed: Dzēst kontu
     success_msg: Tavs konts tika veiksmīgi dzēsts
     warning:
-      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
       caches: Citu serveru kešatmiņā saglabātais saturs var saglabāties
       data_removal: Tavas ziņas un citi dati tiks neatgriezeniski noņemti
       email_change_html: Tu vari <a href="%{path}">mainīt savu e-pasta adresi</a>, neizdzēšot savu kontu
@@ -1187,7 +1189,7 @@ lv:
       approve_appeal: Apstiprināt apelāciju
       associated_report: Saistītais ziņojums
       created_at: Datēts
-      description_html: Šīs ir darbības, kas veiktas pret tavu kontu, un brīdinājumi, ko tev ir nosūtījuši %{instance} darbinieki.
+      description_html: Šīs ir darbības, kas veiktas pret Tavu kontu, un brīdinājumi, kurus Tev ir nosūtījuši %{instance} darbinieki.
       recipient: Adresēts
       reject_appeal: Noraidīt apelāciju
       status: 'Publikācija #%{id}'
@@ -1208,7 +1210,7 @@ lv:
     invalid_domain: nav derīgs domēna nosaukums
   edit_profile:
     basic_information: Pamata informācija
-    hint_html: "<strong>Pielāgo to, ko cilvēki redz tavā publiskajā profilā un blakus tavām ziņām.</strong> Citas personas, visticamāk, sekos tev un sazināsies ar tevi, ja tev būs aizpildīts profils un profila attēls."
+    hint_html: "<strong>Pielāgo, ko cilvēki redz Tavā publiskajā profilā un blakus Taviem ierakstiem.</strong> Ir lielāka iespējamība, ka citi clivēki sekos Tev un mijiedarbosies ar Tevi, ja Tev ir aizpildīts profils un profila attēls."
     other: Cits
   errors:
     '400': Tevis iesniegtais pieprasījums bija nederīgs vai nepareizi izveidots.
@@ -1221,7 +1223,7 @@ lv:
       title: Drošības pārbaude neizdevās
     '429': Pārāk daudz pieprasījumu
     '500':
-      content: Atvaino, bet kaut kas mūsu pusē nogāja greizi.
+      content: Atvainojamies, bet mūsu pusē kaut kas nogāja greizi.
       title: Šī lapa nav pareiza
     '503': Lapu nevarēja apkalpot īslaicīgas servera kļūmes dēļ.
     noscript_html: Lai izmantotu Mastodon web lietojumu, lūdzu, iespējo JavaScript. Vai arī izmēģini kādu no <a href="%{apps_path}">vietējām lietotnēm</a> Mastodon savai platformai.
@@ -1247,7 +1249,7 @@ lv:
     add_new: Pievienot jaunu
     errors:
       limit: Tu jau esi piedāvājis maksimālo tēmturu skaitu
-    hint_html: "<strong>Kas ir piedāvātie tēmturi?</strong> Tie ir redzami tavā publiskajā profilā un ļauj cilvēkiem pārlūkot tavas publiskās ziņas tieši zem šiem tēmturiem. Tie ir lielisks līdzeklis radošu darbu vai ilgtermiņa projektu izsekošanai."
+    hint_html: "<strong>Izcel savus vissvarīgākos tēmturus savā profilā!</strong> Lielisks rīks, lai izsekotu saviem radošajiem darbiem un ilgtermiņa projektiem, izceltie tēmturi tiek attēloti pamanāmi attēloti Tavā profilā un ļauj ātru piekļuvi saviem ierakstiem."
   filters:
     contexts:
       account: Profili
@@ -1260,7 +1262,7 @@ lv:
       keywords: Atslēgvārdi
       statuses: Individuālās ziņas
       statuses_hint_html: Šis filtrs attiecas uz atsevišķām ziņām neatkarīgi no tā, vai tās atbilst tālāk norādītajiem atslēgvārdiem. <a href="%{path}">Pārskatīt vai noņemt ziņas no filtra</a>.
-      title: Rediģēt filtru
+      title: Labot atlasi
     errors:
       deprecated_api_multiple_keywords: Šos parametrus šajā lietojumprogrammā nevar mainīt, jo tie attiecas uz vairāk nekā vienu filtra atslēgvārdu. Izmanto jaunāku lietojumprogrammu vai tīmekļa saskarni.
       invalid_context: Nav, vai piegādāts nederīgs konteksts
@@ -1330,7 +1332,7 @@ lv:
       too_large: Fails ir pārāk liels
     failures: Kļūmes
     imported: Importēti
-    mismatched_types_warning: Šķiet, ka šim importam esi izvēlējies nepareizu veidu. Lūdzu, pārbaudi vēlreiz.
+    mismatched_types_warning: Izskatās, ka varētu būt atlasīts nepareizs veids šai ievietošanai. Lūgums pārbaudīt vēlreiz.
     modes:
       merge: Apvienot
       merge_long: Saglabāt esošos ierakstus un pievienot jaunus
@@ -1350,7 +1352,7 @@ lv:
       following_html: Tu gatavojies <strong>sekot</strong> līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong>.
       lists_html: Tu gatavojies pievienot līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong> saviem <strong>sarakstiem</strong>. Jauni saraksti tiks izveidoti, ja nav saraksta, ko pievienot.
       muting_html: Tu gatavojies <strong>noklusināt</strong> līdz pat <strong>%{total_items} kontiem</strong> no <strong>%{filename}</strong>.
-    preface: Tu vari importēt datus, kurus esi eksportējis no cita servera, piemēram, to personu sarakstu, kurām tu seko vai kuras bloķē.
+    preface: Tu vari ievietot datus, kurus esi izguvis no cita servera, kā, piemēram, cilvēku sarakstu, kuriem Tu seko vai kurus bloķē.
     recent_imports: Nesen importēts
     states:
       finished: Pabeigts
@@ -1407,11 +1409,11 @@ lv:
       limit: Jūs esat sasniedzis maksimālo sarakstu skaitu
   login_activities:
     authentication_methods:
-      otp: divfaktoru autentifikācijas lietotne
+      otp: divpakāpju autentifikācijas lietotne
       password: parole
       sign_in_token: e-pasta drošības kods
       webauthn: drošības atslēgas
-    description_html: Ja pamani darbības, kuras tu neatpazīsti, apsver iespēju nomainīt savu paroli un iespējot divfaktoru autentifikāciju.
+    description_html: Ja pamani darbības, kuras neatpazīsti, jāapsver iespēja nomainīt savu paroli un iespējot divpakāpju autentifikāciju.
     empty: Nav pieejama autentifikācijas vēsture
     failed_sign_in_html: Neizdevies pierakstīšanās mēģinājums ar %{method} no %{ip} (%{browser})
     successful_sign_in_html: Veiksmīga pierakstīšanās ar %{method} no %{ip} (%{browser})
@@ -1460,7 +1462,7 @@ lv:
     set_redirect: Iestatīt novirzīšanu
     warning:
       backreference_required: Jaunais konts vispirms ir jākonfigurē, lai tas atsauktos uz šo kontu
-      before: 'Pirms turpināt, lūdzu, uzmanīgi izlasi šīs piezīmes:'
+      before: 'Pirms turpināšanas lūgums uzmanīgi izlasīt šīs piezīmes:'
       cooldown: Pēc pārcelšanās ir gaidīšanas periods, kura laikā tu vairs nevarēsi pārvietoties
       disabled_account: Tavs pašreizējais konts pēc tam nebūs pilnībā lietojams. Tomēr tev būs piekļuve datu eksportēšanai, kā arī atkārtotai aktivizēšanai.
       followers: Veicot šo darbību, visi sekotāji tiks pārvietoti no pašreizējā konta uz jauno kontu
@@ -1480,7 +1482,7 @@ lv:
       report:
         subject: "%{name} iesniedza ziņojumu"
       sign_up:
-        subject: "%{name} ir pierakstījies"
+        subject: "%{name} pierakstījās"
     favourite:
       body: 'Tavu ziņu izlasei pievienoja %{name}:'
       subject: "%{name} pievienoja tavu ziņu izlasei"
@@ -1508,12 +1510,11 @@ lv:
     status:
       subject: "%{name} tikko publicēja"
     update:
-      subject: "%{name} rediģējis rakstu"
+      subject: "%{name} laboja ierakstu"
   notifications:
     administration_emails: Administrators e-pasta paziņojumi
     email_events: E-pasta paziņojumu notikumi
     email_events_hint: 'Atlasi notikumus, par kuriem vēlies saņemt paziņojumus:'
-    other_settings: Citu paziņojumu iestatījumi
   number:
     human:
       decimal_units:
@@ -1526,12 +1527,12 @@ lv:
           trillion: T
   otp_authentication:
     code_hint: Lai apstiprinātu, ievadi autentifikācijas lietotnes ģenerēto kodu
-    description_html: Ja iespējosi <strong>divfaktoru autentifikāciju</strong>, izmantojot autentifikatora lietotni, lai pieteiktos, tev būs nepieciešams tālrunis, kas ģenerēs ievadāmos marķierus.
+    description_html: Jā iespējo <strong>divpakāpju autentifikāciju</strong> ar autentificēšanas lietotni, pieteikšanās laikā būs nepieciešams tālrunis, kurā tiks izveidoti ievadāmie kodi.
     enable: Iespējot
     instructions_html: "<strong>Skenē šo QR kodu Google Authenticator vai līdzīgā TOTP lietotnē savā tālrunī</strong>. No šī brīža šī lietotne ģenerēs marķierus, kas tev būs jāievada, piesakoties."
     manual_instructions: 'Ja nevari noskenēt QR kodu un tas ir jāievada manuāli, šeit ir noslēpums vienkāršā tekstā:'
     setup: Iestatīt
-    wrong_code: Ievadītais kods nebija derīgs! Vai servera laiks un ierīces laiks ir pareizs?
+    wrong_code: Ievadītais kods bija nederīgs. Vai servera un ierīces laiks ir pareizs?
   pagination:
     newer: Jaunāks
     next: Nākamais
@@ -1631,8 +1632,9 @@ lv:
       unknown_browser: Nezināms Pārlūks
       weibo: Weibo
     current_session: Pašreizējā sesija
+    date: Datums
     description: "%{browser} uz %{platform}"
-    explanation: Šīs ir tīmekļa pārlūkprogrammas, kurās pašlaik esi pieteicies savā Mastodon kontā.
+    explanation: Šie ir tīmekļa pārlūki, kuros šobrīd esi pieteicies savā Mastodon kontā.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1661,20 +1663,23 @@ lv:
     back: Atgriezties Mastodon
     delete: Konta dzēšana
     development: Izstrāde
-    edit_profile: Rediģēt profilu
+    edit_profile: Labot profilu
     export: Datu eksports
     featured_tags: Piedāvātie tēmturi
     import: Imports
     import_and_export: Imports un eksports
     migrate: Konta migrācija
-    notifications: Paziņojumi
+    notifications: E-pasta paziņojumi
     preferences: Iestatījumi
     profile: Profils
     relationships: Sekojamie un sekotāji
     statuses_cleanup: Automātiska ziņu dzēšana
     strikes: Moderācijas aizrādījumi
-    two_factor_authentication: Divfaktoru Aut
+    two_factor_authentication: Divpakāpju autentifikācija
     webauthn_authentication: Drošības atslēgas
+  severed_relationships:
+    download: Lejupielādēt (%{count})
+    type: Notikums
   statuses:
     attached:
       audio:
@@ -1697,7 +1702,7 @@ lv:
       one: 'saturēja neatļautu tēmturi: %{tags}'
       other: 'saturēja neatļautus tēmturus: %{tags}'
       zero: 'neatļauti tēmturi: %{tags}'
-    edited_at_html: Rediģēts %{date}
+    edited_at_html: Labots %{date}
     errors:
       in_reply_not_found: Šķiet, ka ziņa, uz kuru tu mēģini atbildēt, nepastāv.
     open_in_web: Atvērt webā
@@ -1705,21 +1710,19 @@ lv:
     pin_errors:
       direct: Ziņojumus, kas ir redzami tikai minētajiem lietotājiem, nevar piespraust
       limit: Tu jau esi piespraudis maksimālo ziņu skaitu
-      ownership: Citas personas ziņu nevar piespraust
+      ownership: Kāda cita ierakstu nevar piespraust
       reblog: Izceltu ierakstu nevar piespraust
     poll:
       total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-        zero: "%{count} personu"
+        one: "%{count} cilvēks"
+        other: "%{count} cilvēki"
+        zero: "%{count} cilvēku"
       total_votes:
         one: "%{count} balss"
         other: "%{count} balsis"
         zero: "%{count} balsu"
       vote: Balsu skaits
     show_more: Rādīt vairāk
-    show_newer: Nekad nerādīt
-    show_older: Rādīt senākus
     show_thread: Rādīt tematu
     title: "%{name}: “%{quote}”"
     visibilities:
@@ -1789,13 +1792,13 @@ lv:
   two_factor_authentication:
     add: Pievienot
     disable: Atspējot 2FA
-    disabled_success: Divfaktoru autentifikācija veiksmīgi atspējota
-    edit: Rediģēt
-    enabled: Divfaktoru autentifikācija ir iespējota
-    enabled_success: Divfaktoru autentifikācija veiksmīgi iespējota
+    disabled_success: Divpakāpju autentifikācija veiksmīgi atspējota
+    edit: Labot
+    enabled: Divpakāpju autentifikācija ir iespējota
+    enabled_success: Divpakāpju autentifikācija veiksmīgi iespējota
     generate_recovery_codes: Ģenerēt atkopšanas kodus
     lost_recovery_codes: Atkopšanas kodi ļauj atgūt piekļuvi tavam kontam, ja pazaudē tālruni. Ja esi pazaudējis atkopšanas kodus, tu vari tos ģenerēt šeit. Tavi vecie atkopšanas kodi tiks anulēti.
-    methods: Divfaktoru metodes
+    methods: Divpakāpju veidi
     otp: Autentifikātora lietotne
     recovery_codes: Veidot atkopšanas kodu rezerves kopijas
     recovery_codes_regenerated: Atkopšanas kodi veiksmīgi atjaunoti
@@ -1803,7 +1806,7 @@ lv:
     webauthn: Drošības atslēgas
   user_mailer:
     appeal_approved:
-      action: Dodies uz savu kontu
+      action: Konta iestatījumi
       explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir apstiprināta. Jūsu konts atkal ir labā stāvoklī.
       subject: Jūsu %{date} apelācija ir apstiprināta
       title: Apelācija apstiprināta
@@ -1812,7 +1815,6 @@ lv:
       subject: Jūsu %{date} apelācija ir noraidīta
       title: Apelācija noraidīta
     backup_ready:
-      explanation: Tu pieprasīji pilnu sava Mastodon konta dublējumu. Tagad tas ir gatavs lejupielādei!
       subject: Tavs arhīvs ir gatavs lejupielādei
       title: Arhīva līdzņemšana
     suspicious_sign_in:
@@ -1831,7 +1833,7 @@ lv:
       explanation:
         delete_statuses: Tika konstatēts, ka dažas no tavām ziņām pārkāpj vienu vai vairākas kopienas vadlīnijas, un rezultātā %{instance} moderatori tās noņēma.
         disable: Tu vairs nevari izmantot savu kontu, taču tavs profils un citi dati paliek neskarti. Tu vari pieprasīt savu datu dublējumu, mainīt konta iestatījumus vai dzēst kontu.
-        mark_statuses_as_sensitive: "%{instance} moderatori dažas no tavām ziņām ir atzīmējušas kā sensitīvas. Tas nozīmē, ka cilvēkiem būs jāpieskaras ziņās esošajai multividei, pirms tiek parādīts priekšskatījums. Tu arī pats vari atzīmēt mediju kā sensitīvu, kad tādu publicēsi turpmāk."
+        mark_statuses_as_sensitive: "%{instance} moderatori dažus no Taviem ierakstiem ir atzīmējuši kā jutīgus. Tas nozīmē, ka cilvēkiem būs jāpiesit ierakstos esošajiem informāijas nesējiem, pirms tiek attēlots priekšskatījums. Tu arī pats vari atzīmēt informācijas nesēju kā jutīgu, kad nākotnē tādu ievietosi."
         sensitive: No šī brīža visi augšupielādētie multivides faili tiks atzīmēti kā sensitīvi un paslēpti aiz klikšķa brīdinājuma.
         silence: Tu joprojām vari izmantot savu kontu, taču tikai tie cilvēki, kuri jau tev seko, redzēs tavas ziņas šajā serverī, un tev var tikt liegtas dažādas atklāšanas funkcijas. Tomēr citi joprojām var tev manuāli sekot.
         suspend: Tu vairs nevari izmantot savu kontu, un tavs profils un citi dati vairs nav pieejami. Tu joprojām vari pieteikties, lai pieprasītu savu datu dublēšanu, līdz dati tiks pilnībā noņemti aptuveni 30 dienu laikā, taču mēs saglabāsim dažus pamata datus, lai neļautu tev izvairīties no apturēšanas.
@@ -1854,13 +1856,28 @@ lv:
         silence: Konts ierobežots
         suspend: Konts apturēts
     welcome:
-      edit_profile_action: Iestatīt profilu
-      edit_profile_step: Tu vari pielāgot savu profilu, augšupielādējot profila attēlu, mainot parādāmo vārdu un citas lietas. Vari izvēlēties pārskatīt jaunus sekotājus, pirms atļauj viņiem tev sekot.
+      apps_android_action: Iegūt to Google Play
+      apps_title: Mastodon lietotnes
+      edit_profile_action: Pielāgot
+      edit_profile_title: Pielāgo savu profilu
       explanation: Šeit ir daži padomi, kā sākt darbu
-      final_action: Sāc publicēt
-      final_step: 'Sāc publicēt! Pat bez sekotājiem tavas publiskās ziņas var redzēt citi, piemēram, vietējā ziņu lentā vai atsaucēs. Iespējams, tu vēlēsies iepazīstināt ar sevi, izmantojot tēmturi #introductions.'
-      full_handle: Tavs pilnais lietotājvārds
-      full_handle_hint: Šis ir tas, ko tu pasaki saviem draugiem, lai viņi varētu tev ziņot vai sekot tev no cita servera.
+      feature_action: Uzzināt vairāk
+      feature_creativity: Mastodon nodrošina skaņas, video un attēlu ierakstus, pieejamības aprakstus, aptaujas, satura brīdinājumus, animētus profila attēlus, pielāgotas emocijzīmes, sīktēlu apgriešanas vadīklas un vēl, lai palīdzētu Tev sevi izpaust tiešsaistē. Vai Tu izplati savu mākslu, mūziku vai aplādes, Mastodon ir šeit ar Tevi.
+      follow_action: Sekot
+      follow_title: Pielāgo savu mājas barotni
+      follows_title: Kam sekot
+      follows_view_more: Rādīt vairāk cilvēku, kuriem sekot
+      hashtags_recent_count:
+        one: "%{people} cilvēks pēdējās 2 dienās"
+        other: "%{people} cilvēki pēdējās 2 dienās"
+        zero: "%{people} cilvēku pēdējās divās dienās"
+      post_action: Rakstīt
+      post_step: Pasveicini pasauli ar tekstu, fotoattēliem, video vai aptaujām!
+      post_title: Izveido savu pirmo ierakstu
+      share_action: Kopīgot
+      share_step: Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!
+      share_title: Kopīgo savu Mastodon profilu
+      sign_in_action: Pieteikties
       subject: Laipni lūgts Mastodon
       title: Laipni lūgts uz borta, %{name}!
   users:
@@ -1868,13 +1885,14 @@ lv:
     go_to_sso_account_settings: Dodies uz sava identitātes nodrošinātāja konta iestatījumiem
     invalid_otp_token: Nederīgs divfaktora kods
     otp_lost_help_html: Ja esi zaudējis piekļuvi abiem, tu vari sazināties ar %{email}
+    rate_limited: Pārāk daudz autentifikācijas mēģinājumu, vēlāk jāmēģina vēlreiz.
     seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
-    signed_in_as: 'Pierakstījies kā:'
+    signed_in_as: 'Pieteicies kā:'
   verification:
-    extra_instructions_html: <strong>Padoms.</strong> saite tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju ģenerētu saturu. Tu vari pat lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam, neizpildot JavaScript.
+    extra_instructions_html: <strong>Padoms:</strong> saite Tavā vietnē var būt neredzama. Svarīga daļa ir <code>rel="me"</code>, kas novērš uzdošanos vietnēs ar lietotāju izveidotu saturu. Tu pat vari lapas galvenē izmantot tagu <code>link</code>, nevis <code>a</code>, taču HTML ir jābūt pieejamam bez JavaScript izpildīšanas.
     here_is_how: Lūk, kā
-    hint_html: "<strong>Ikviens var apliecināt savu identitāti Mastodon.</strong> Pamatojoties uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas tev nepieciešams, ir personīga vietne, pēc kuras cilvēki tevi atpazīst. Kad no sava profila izveidosi saiti uz šo vietni, mēs pārbaudīsim, vai vietne novirza atpakaļ uz tavu profilu, un tajā tiks parādīts vizuāls indikators."
-    instructions_html: Nokopē un ielīmē tālāk norādīto kodu savas vietnes HTML. Pēc tam pievieno savas vietnes adresi vienā no papildu laukiem savā profilā no cilnes "Rediģēt profilu" un saglabā izmaiņas.
+    hint_html: "<strong>Ikviens var apliecināt savu identitāti Mastodon.</strong> Balstīts uz atvērtiem tīmekļa standartiem, tagad un uz visiem laikiem bez maksas. Viss, kas Tev nepieciešams, ir personīga vietne, pēc kuras cilvēki Tevi atpazīst. Kad savā profilu sasaistīsi ar šo tīmekļvietni, mēs pārbaudīsim, vai tīmekļvietnei ir saite uz Tavu profilu, un tajā tiks parādīts redzama norāde."
+    instructions_html: Ievieto starpliktuvē un ielīmē tālāk norādīto kodu savas tīmekļvietnes HTML! Tad pievieno savas tīmekļvietnes adresi vienā no papildu laukiem savā profila cilnē "Labot profilu" un saglabā izmaiņas!
     verification: Pārbaude
     verified_links: Tavas verifikācijas saites
   webauthn_credentials:
@@ -1892,5 +1910,5 @@ lv:
     nickname_hint: Ievadi savas jaunās drošības atslēgas segvārdu
     not_enabled: Tu vel neesi iespējojis WebAuthn
     not_supported: Šī pārlūkprogramma neatbalsta drošības atslēgas
-    otp_required: Lai izmantotu drošības atslēgas, lūdzu, vispirms iespējo divfaktoru autentifikāciju.
+    otp_required: Lai izmantotu drošības atslēgas, lūgums vispirms iespējot divpakāpju autentifikāciju.
     registered_on: Reģistrēts %{date}
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 5f8de52987..883a400318 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -87,5 +87,3 @@ ml:
       subject: "%{name} ഇപ്പോൾ നിങ്ങളെ പിന്തുടരുന്നു"
   relationships:
     following: പിന്തുടരുന്നു
-  settings:
-    notifications: അറിയിപ്പുകൾ
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 74acf87552..f39c26a5c1 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1442,7 +1442,6 @@ ms:
     administration_emails: Notifikasi e-mel pentadbir
     email_events: Acara untuk pemberitahuan e-mel
     email_events_hint: 'Pilih acara yang ingin anda terima pemberitahuan:'
-    other_settings: Tetapan notifikasi lain
   number:
     human:
       decimal_units:
@@ -1596,7 +1595,6 @@ ms:
     import: Import
     import_and_export: Import dan eksport
     migrate: Penghijrahan akaun
-    notifications: Pemberitahuan
     preferences: Keutamaan
     profile: Profil
     relationships: Ikutan dan pengikut
@@ -1635,8 +1633,6 @@ ms:
         other: "%{count} undi"
       vote: Undi
     show_more: Tunjuk lebih banyak
-    show_newer: Tunjuk lebih baharu
-    show_older: Tunjuk lebih tua
     show_thread: Tunjuk bebenang
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1720,7 +1716,6 @@ ms:
     webauthn: Kunci keselamatan
   user_mailer:
     appeal_approved:
-      action: Pergi ke akaun anda
       explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah diluluskan. Akaun anda kini dalam kedudukan yang baik.
       subject: Rayuan anda dari %{date} telah diluluskan
       title: Rayuan diluluskan
@@ -1729,7 +1724,6 @@ ms:
       subject: Rayuan anda dari %{date} telah ditolak
       title: Rayuan ditolak
     backup_ready:
-      explanation: Anda meminta sandaran penuh akaun Mastodon anda. Ia kini sedia untuk dimuat turun!
       subject: Arkib anda sedia untuk dimuat turun
       title: Arkibkan bawa pulang
     suspicious_sign_in:
@@ -1771,13 +1765,7 @@ ms:
         silence: Akaun terhad
         suspend: Akaun digantung
     welcome:
-      edit_profile_action: Sediakan profil
-      edit_profile_step: Anda boleh menyesuaikan profil anda dengan memuat naik gambar profil, menukar nama paparan anda dan banyak lagi. Anda boleh ikut serta untuk menyemak pengikut baharu sebelum mereka dibenarkan mengikuti anda.
       explanation: Berikut ialah beberapa petua untuk anda bermula
-      final_action: Mula menyiarkan
-      final_step: 'Mula menyiarkan! Walaupun tanpa pengikut, pos awam anda mungkin dilihat oleh orang lain, contohnya pada garis masa tempatan atau dalam hashtag. Anda mungkin ingin memperkenalkan diri anda pada hashtag #introductions.'
-      full_handle: Pemegang penuh anda
-      full_handle_hint: Inilah yang anda akan beritahu rakan anda supaya mereka boleh menghantar mesej atau mengikuti anda dari server lain.
       subject: Selamat datang kepada Mastodon
       title: Selamat datang, %{name}!
   users:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4ba4fcfad3..4ac9ecdd45 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1445,7 +1445,6 @@ my:
     administration_emails: စီမံခန့်ခွဲသူ အီးမေးလ် အသိပေးချက်များ
     email_events: အီးမေးလ်သတိပေးချက်များအတွက်အကြောင်းအရာများ
     email_events_hint: အသိပေးချက်များရယူမည့် အစီအစဉ်များကို ရွေးပါ -
-    other_settings: အခြားအသိပေးချက်များ၏ သတ်မှတ်ချက်များ
   number:
     human:
       decimal_units:
@@ -1595,7 +1594,6 @@ my:
     import: ထည့်သွင်းခြင်း
     import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း
     migrate: အကောင့်ပြောင်းရွှေ့ခြင်း
-    notifications: အသိပေးချက်များ
     preferences: သတ်မှတ်ချက်များ
     profile: ပရိုဖိုင်
     relationships: စောင့်ကြည့်သူများနှင့် စောင့်ကြည့်စာရင်း
@@ -1634,8 +1632,6 @@ my:
         other: မဲအရေအတွက် %{count} မဲ
       vote: မဲပေးမည်
     show_more: ပိုမိုပြရန်
-    show_newer: ပို့စ်အသစ်များပြရန်
-    show_older: ပို့စ်အဟောင်းများပြရန်
     show_thread: Thread ကို ပြပါ
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1719,7 +1715,6 @@ my:
     webauthn: လုံခြုံရေးကီးများ
   user_mailer:
     appeal_approved:
-      action: သင့်အကောင့်သို့ သွားပါ
       explanation: "%{appeal_date} တွင် သင်တင်သွင်းခဲ့သည့် %{strike_date} တွင် သင့်အကောင့်ကို ဆန့်ကျင်သည့် တိုင်ချက်၏ အယူခံဝင်မှုကို အတည်ပြုပြီးဖြစ်သည်။ သင့်အကောင့်သည် ကောင်းမွန်သောအနေအထားတွင် ရှိနေပြန်သည်။"
       subject: "%{date} တွင် သင့်အယူခံဝင်ချက်ကို အတည်ပြုပြီးပါပြီ"
       title: အယူခံဝင်သည်
@@ -1728,7 +1723,6 @@ my:
       subject: "%{date} တွင် သင့်တင်ပြချက်ကို ပယ်ချခဲ့သည်"
       title: အယူခံကို ပယ်ချခဲ့သည်
     backup_ready:
-      explanation: သင့် Mastodon အကောင့် အရန်ကူးယူရန် တောင်းဆိုပြီးဖြစ်သည်။ ယခု ဒေါင်းလုဒ်လုပ်နိုင်ပါပြီ။
       subject: သင့်မှတ်တမ်း ဒေါင်းလုဒ်ဆွဲရန် အသင့်ဖြစ်ပါပြီ
       title: မှတ်တမ်းသိမ်းရန်
     suspicious_sign_in:
@@ -1770,13 +1764,7 @@ my:
         silence: အကောင့်ကန့်သတ်ထားသည်
         suspend: အကောင့်ရပ်ဆိုင်းထားသည်
     welcome:
-      edit_profile_action: ပရိုဖိုင်ထည့်သွင်းရန်
-      edit_profile_step: ပရိုဖိုင်ဓာတ်ပုံတစ်ပုံ တင်ခြင်း၊ ဖော်ပြမည့်အမည် ပြောင်းလဲခြင်းနှင့် အခြားအရာများပြုလုပ်ခြင်းတို့ဖြင့် သင့်ပရိုဖိုင်ကို စိတ်ကြိုက်ပြင်ဆင်နိုင်ပါသည်။ စောင့်ကြည့်သူအသစ်များ သင့်ကိုစောင့်ကြည့်ခွင့်မပြုမီ ပြန်လည်သုံးသပ်ရန်အတွက် ဆုံးဖြတ်နိုင်ပါသည်။
       explanation: ဤသည်မှာ သင် စတင်အသုံးပြုနိုင်ရန်အတွက် အကြံပြုချက်အချို့ဖြစ်ပါသည်
-      final_action: ပို့စ် တင်ရန်
-      final_step: 'ပို့စ်စပြီး တင်နိုင်ပါပြီ။ စောင့်ကြည့်သူများမရှိသေးသော်လည်း သင့်အများမြင်ပို့စ်များကို ဒေသတွင်းစာမျက်နှာ သို့မဟုတ် ဟက်ရှ်တက်စာမျက်နှာတို့တွင် အခြားသူများက မြင်နိုင်ပါသည်။ #introductions ဟက်ရှ်တက်ဖြင့် သင့်ကိုယ်သင် မိတ်ဆက်နိုင်ပါသည်။'
-      full_handle: ကိုယ်တိုင်ထိန်းချုပ်နိုင်သည်
-      full_handle_hint: ဤသည်မှာ သင့်သူငယ်ချင်းများကို အခြားဆာဗာတစ်ခုမှ မက်ဆေ့ချ်ပို့နိုင်ကြောင်း သို့မဟုတ် စောင့်ကြည့်နိုင်ကြောင်း အသိပေးပါမည်။
       subject: Mastodon မှ လှိုက်လှဲစွာကြိုဆိုပါသည်။
       title: "%{name} က ကြိုဆိုပါတယ်။"
   users:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 34769e08ec..74dea29b0e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -386,12 +386,12 @@ nl:
       confirm_suspension:
         cancel: Annuleren
         confirm: Opschorten
-        permanent_action: De schorsing ongedaan maken zal geen gegevens of volgrelaties herstellen.
+        permanent_action: Het ongedaan maken van de schorsing herstelt geen gegevens of volgrelaties.
         preamble_html: Je staat op het punt om <strong>%{domain}</strong> en subdomeinen op te schorten.
         remove_all_data: Dit verwijdert alle inhoud, media en profielgegevens van de accounts van dit domein van jouw server.
-        stop_communication: Jouw server zal niet langer met deze servers communiceren.
+        stop_communication: Jouw server communiceert niet langer meer met deze servers.
         title: Domeinblokkade voor %{domain} bevestigen
-        undo_relationships: Dit zal elke volgrelatie tussen de accounts van deze servers en die van jou ongedaan maken.
+        undo_relationships: Dit maakt elke volgrelatie tussen de accounts van deze servers en die van jou ongedaan.
       created_msg: Domeinblokkade wordt nu verwerkt
       destroyed_msg: Domeinblokkade is ongedaan gemaakt
       domain: Domein
@@ -425,7 +425,7 @@ nl:
       view: Domeinblokkade bekijken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
-      allow_registrations_with_approval: Inschrijvingen met goedkeuring toestaan
+      allow_registrations_with_approval: Registraties met goedkeuring toestaan
       attempts_over_week:
         one: "%{count} registratiepoging tijdens de afgelopen week"
         other: "%{count} registratiepogingen tijdens de afgelopen week"
@@ -470,8 +470,8 @@ nl:
     instances:
       availability:
         description_html:
-          one: Als de bezorging aan het domein gedurende <strong>%{count} dag</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
-          other: Als de bezorging aan het domein gedurende <strong>%{count} verschillende dagen</strong> blijft mislukken, dan zullen er geen verdere pogingen tot bezorging worden gedaan tot een bezorging <em>van</em> het domein is ontvangen.
+          one: Wanneer de bezorging aan het domein gedurende <strong>%{count} dag</strong> blijft mislukken dan worden er geen bezorgpogingen meer gedaan, totdat een bezorging <em>van</em> het domein wordt ontvangen.
+          other: Als de bezorging aan het domein gedurende <strong>%{count} verschillende dagen</strong> blijft mislukken dan worden er geen bezorgpogingen meer gedaan, totdat een bezorging <em>van</em> het domein wordt ontvangen.
         failure_threshold_reached: Foutieve drempelwaarde bereikt op %{date}.
         failures_recorded:
           one: Mislukte poging op %{count} dag.
@@ -560,7 +560,7 @@ nl:
       no_ip_block_selected: Er zijn geen IP-regels veranderd, omdat er geen een was geselecteerd
       title: IP-regels
     relationships:
-      title: Relaties van %{acct}
+      title: Volgrelaties van %{acct}
     relays:
       add_new: Nieuwe relayserver toevoegen
       delete: Verwijderen
@@ -571,7 +571,7 @@ nl:
       enable_hint: Eenmaal ingeschakeld gaat jouw server zich op alle openbare berichten van deze relayserver abonneren en stuurt het de openbare berichten van jouw server naar de relayserver.
       enabled: Ingeschakeld
       inbox_url: Relay-URL
-      pending: Aan het wachten op toestemming van de relayserver
+      pending: Aan het wachten op goedkeuring van de relayserver
       save_and_enable: Opslaan en inschakelen
       setup: Een verbinding met een relayserver maken
       signatures_not_enabled: Federatierelays werken mogelijk niet goed wanneer de veilige modus of de beperkte federatiemodus is ingeschakeld
@@ -593,10 +593,13 @@ nl:
         other_description_html: Bekijk meer opties voor het controleren van het gedrag van en de communicatie met het gerapporteerde account.
         resolve_description_html: Er wordt tegen het gerapporteerde account geen maatregel genomen, geen overtreding geregistreerd en de rapportage wordt gemarkeerd als opgelost.
         silence_description_html: Het account is alleen zichtbaar voor degenen die het al volgen of handmatig opzoeken, waardoor het bereik ernstig wordt beperkt. Dit kan altijd ongedaan worden gemaakt. Dit sluit alle rapporten tegen dit account af.
-        suspend_description_html: Het account en al zijn inhoud zullen niet toegankelijk zijn en uiteindelijk verwijderd worden en er zal geen interactie met het account mogelijk zijn. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
+        suspend_description_html: Het account en de inhoud hiervan is niet meer toegankelijk, en het is ook niet meer mogelijk om ermee interactie te hebben. Uiteindelijk wordt het account volledig verwijderd. Dit is omkeerbaar binnen 30 dagen. Dit sluit alle rapporten tegen dit account af.
       actions_description_html: Beslis welke maatregel moet worden genomen om deze rapportage op te lossen. Wanneer je een (straf)maatregel tegen het gerapporteerde account neemt, krijgt het account een e-mailmelding, behalve wanneer de <strong>spam</strong>-categorie is gekozen.
       actions_description_remote_html: Beslis welke actie moet worden ondernomen om deze rapportage op te lossen. Dit is alleen van invloed op hoe <strong>jouw</strong> server met dit externe account communiceert en de inhoud ervan beheert.
       add_to_report: Meer aan de rapportage toevoegen
+      already_suspended_badges:
+        local: Al geschorst op deze server
+        remote: Al geschorst op hun server
       are_you_sure: Weet je het zeker?
       assign_to_self: Aan mij toewijzen
       assigned: Toegewezen moderator
@@ -653,7 +656,7 @@ nl:
         close_report: 'Rapportage #%{id} als opgelost markeren'
         close_reports_html: "<strong>Alle</strong> rapportages tegen <strong>@%{acct}</strong> als opgelost markeren"
         delete_data_html: Het account en inhoud van <strong>@%{acct}</strong> over 30 dagen verwijderen, tenzij die in de tussentijd wordt gedeblokkeerd
-        preview_preamble_html: "<strong>@%{acct}</strong> zal een waarschuwing ontvangen met de volgende inhoud:"
+        preview_preamble_html: "<strong>@%{acct}</strong> ontvangt een waarschuwing met de volgende inhoud:"
         record_strike_html: Registreer een overtreding van <strong>@%{acct}</strong> om je te helpen met het sneller afhandelen van toekomstige overtredingen van dit account
         send_email_html: Een waarschuwingsmail naar <strong>@%{acct}</strong> sturen
         warning_placeholder: Optionele aanvullende redenen voor de moderatie-actie.
@@ -742,12 +745,13 @@ nl:
         preamble: Mastodons webomgeving aanpassen.
         title: Weergave
       branding:
-        preamble: De branding van jouw server laat zien hoe het met andere servers in het netwerk verschilt. Deze informatie wordt op verschillende plekken getoond, zoals in de webomgeving van Mastodon, in mobiele apps, in voorvertoningen op andere websites en berichten-apps, enz. Daarom is het belangrijk om de informatie helder, kort en beknopt te houden.
+        preamble: De branding van jouw server laat zien hoe het met andere servers in het netwerk verschilt. Deze informatie wordt op verschillende plekken getoond, zoals in de webomgeving van Mastodon, in mobiele apps, in linkvoorbeelden op andere websites en berichten-apps, enz. Daarom is het belangrijk om de informatie helder, kort en beknopt te houden.
         title: Branding
       captcha_enabled:
         desc_html: Dit is afhankelijk van externe scripts van hCaptcha, wat veiligheids- en privacyrisico's met zich mee kan brengen. Bovendien kan <strong>dit het registratieproces aanzienlijk minder toegankelijk maken voor sommige (vooral gehandicapte) mensen</strong>. Om deze redenen kun je het beste alternatieve maatregelen overwegen, zoals registratie op basis van goedkeuring of op uitnodiging.
         title: Nieuwe gebruikers dienen een CAPTCHA op te lossen om hun account te bevestigen
       content_retention:
+        danger_zone: Gevarenzone
         preamble: Toezicht houden op hoe berichten en media van gebruikers op Mastodon worden bewaard.
         title: Bewaartermijn berichten
       default_noindex:
@@ -767,6 +771,7 @@ nl:
         disabled: Aan niemand
         users: Aan ingelogde lokale gebruikers
       registrations:
+        moderation_recommandation: Zorg ervoor dat je een adequaat en responsief moderatieteam hebt voordat je registraties voor iedereen openstelt!
         preamble: Toezicht houden op wie een account op deze server kan registreren.
         title: Registraties
       registrations_mode:
@@ -774,9 +779,10 @@ nl:
           approved: Goedkeuring vereist om te kunnen registreren
           none: Niemand kan zich registreren
           open: Iedereen kan zich registreren
+        warning_hint: We raden je aan om “Goedkeuring vereist om te kunnen registreren” te gebruiken, tenzij je er zeker van bent dat jouw moderatieteam spam en kwaadwillende registraties tijdig kan afhandelen.
       security:
         authorized_fetch: Verificatie van gefedeerde servers vereisen
-        authorized_fetch_hint: Verificatie vereisen van gefedereerde servers maakt een striktere handhaving van blokkades op gebruikersniveau en serverniveau mogelijk. Dit gaat echter ten koste van de prestaties, vermindert het bereik van je reacties en kan compatibiliteitsproblemen met sommige gefedereerde services opleveren. Bovendien zal dit niet voorkomen dat personen met slechte bedoelingen je openbare berichten en accounts kunnen ophalen.
+        authorized_fetch_hint: Verificatie vereisen van gefedereerde servers maakt een striktere handhaving van blokkades op gebruikersniveau en serverniveau mogelijk. Dit gaat echter ten koste van de prestaties, vermindert het bereik van je reacties en kan compatibiliteitsproblemen met sommige gefedereerde services opleveren. Bovendien voorkomt dit niet dat personen met slechte bedoelingen je openbare berichten en accounts kunnen ophalen.
         authorized_fetch_overridden_hint: Je kunt momenteel deze instelling niet wijzigen, omdat deze is overschreven door een omgevingsvariabele.
         federation_authentication: Afgedwongen federatie-verificatie
       title: Serverinstellingen
@@ -898,7 +904,7 @@ nl:
       pending_review: In afwachting van beoordeling
       preview_card_providers:
         allowed: Links van deze website kunnen trending worden
-        description_html: Dit zijn domeinen waarvan er links vaak op jouw server worden gedeeld. Links zullen niet in het openbaar trending worden, voordat het domein van de link wordt goedgekeurd. Jouw goedkeuring (of afwijzing) geldt ook voor subdomeinen.
+        description_html: Dit zijn domeinen waarvan er vaak links op jouw server worden gedeeld. Links worden niet in het openbaar trending, voordat het domein van de link wordt goedgekeurd. Jouw goedkeuring (of afwijzing) geldt ook voor subdomeinen.
         rejected: Links naar deze nieuwssite kunnen niet trending worden
         title: Websites
       rejected: Afgekeurd
@@ -926,7 +932,7 @@ nl:
         listable: Kan worden aanbevolen
         no_tag_selected: Er werden geen hashtags gewijzigd, omdat er geen enkele werd geselecteerd
         not_listable: Wordt niet aanbevolen
-        not_trendable: Zal niet onder trends verschijnen
+        not_trendable: Verschijnt niet onder trends
         not_usable: Kan niet worden gebruikt
         peaked_on_and_decaying: Piekte op %{date} en is nu weer op diens retour
         title: Trending hashtags
@@ -966,6 +972,9 @@ nl:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: In verband met een gebrek aan recentelijke moderator-activiteit, is de registratie-modus op %{instance} automatisch veranderd naar handmatige beoordeling door moderatoren. Dit om te voorkomen dat %{instance} als platform voor eventueel misbruik kan worden gebruikt. Je kunt op elk gewenst moment veel terugschakelen naar open registraties.
+      subject: De registratie-modus op %{instance} is automatisch veranderd naar handmatige beoordeling door moderatoren
     new_appeal:
       actions:
         delete_statuses: het verwijderen van diens berichten
@@ -1154,10 +1163,10 @@ nl:
       email_change_html: Je kunt <a href="%{path}">je e-mailadres wijzigen</a> zonder dat je jouw account hoeft te verwijderen
       email_contact_html: Wanneer het nog steeds niet aankomt, kun je voor hulp e-mailen naar <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Wanneer je de bevestigingsmail niet hebt ontvangen, kun je deze <a href="%{path}">opnieuw aanvragen</a>
-      irreversible: Je zult niet in staat zijn om jouw account te herstellen of te deactiveren
+      irreversible: Je bent niet meer in staat om jouw account te herstellen of te deactiveren
       more_details_html: Zie het <a href="%{terms_path}">privacybeleid</a> voor meer informatie.
-      username_available: Jouw gebruikersnaam zal weer beschikbaar komen
-      username_unavailable: Jouw gebruikersnaam zal onbeschikbaar blijven
+      username_available: Jouw gebruikersnaam komt weer beschikbaar
+      username_unavailable: Jouw gebruikersnaam blijft onbeschikbaar
   disputes:
     strikes:
       action_taken: Genomen maatregel
@@ -1192,7 +1201,7 @@ nl:
     invalid_domain: is een ongeldige domeinnaam
   edit_profile:
     basic_information: Algemene informatie
-    hint_html: "<strong>Pas aan wat mensen op jouw openbare profiel en naast je berichten zien.</strong> Andere mensen zullen je eerder volgen en met je communiceren wanneer je profiel is ingevuld en je een profielfoto hebt."
+    hint_html: "<strong>Wat mensen op jouw openbare profiel en naast je berichten zien aanpassen.</strong> Andere mensen gaan je waarschijnlijk eerder volgen en hebben vaker interactie met je, wanneer je profiel is ingevuld en je een profielfoto hebt."
     other: Overige
   errors:
     '400': De aanvraag die je hebt ingediend was ongeldig of foutief.
@@ -1318,7 +1327,7 @@ nl:
       bookmarks_html: Je staat op het punt <strong>jouw bladwijzers</strong> te vervangen door <strong>%{total_items} berichten</strong> vanuit <strong>%{filename}</strong>.
       domain_blocking_html: Je staat op het punt <strong>jouw lijst met geblokkeerde domeinen</strong> te vervangen door <strong>%{total_items} domeinen</strong> vanuit <strong>%{filename}</strong>.
       following_html: Je staat op het punt om <strong>%{total_items} accounts</strong> <strong>te volgen</strong> vanuit <strong>%{filename}</strong> en <strong>te stoppen met het volgen van alle andere accounts</strong>.
-      lists_html: Je staat op het punt <strong>je lijsten</strong> te vervangen door inhoud van <strong>%{filename}</strong>. Tot <strong>%{total_items} accounts</strong> zullen aan nieuwe lijsten worden toegevoegd.
+      lists_html: Je staat op het punt <strong>je lijsten</strong> te vervangen door inhoud van <strong>%{filename}</strong>. Er worden totaal <strong>%{total_items} accounts</strong> aan nieuwe lijsten toegevoegd.
       muting_html: Je staat op het punt <strong>jouw lijst met genegeerde accounts</strong> te vervangen door <strong>%{total_items} accounts</strong> vanuit <strong>%{filename}</strong>.
     preambles:
       blocking_html: Je staat op het punt om <strong>%{total_items} accounts</strong> te <strong>blokkeren</strong> vanuit <strong>%{filename}</strong>.
@@ -1416,7 +1425,7 @@ nl:
   migrations:
     acct: Verhuisd naar
     cancel: Doorverwijzing annuleren
-    cancel_explanation: Het annuleren van de doorverwijzing zal jouw huidige account opnieuw activeren, maar brengt geen volgers terug die naar het andere account zijn verhuisd.
+    cancel_explanation: Het annuleren van de doorverwijzing activeert opnieuw jouw huidige account, maar brengt geen volgers terug die naar het andere account zijn verhuisd.
     cancelled_msg: De doorverwijzing is succesvol geannuleerd.
     errors:
       already_moved: is hetzelfde account waarnaar je al naar toe bent verhuisd
@@ -1490,7 +1499,6 @@ nl:
     administration_emails: E-mailmeldingen beheerder
     email_events: E-mailmeldingen voor gebeurtenissen
     email_events_hint: 'Selecteer gebeurtenissen waarvoor je meldingen wilt ontvangen:'
-    other_settings: Andere meldingsinstellingen
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ nl:
     errors:
       limit_reached: Limiet van verschillende emoji-reacties bereikt
       unrecognized_emoji: is geen bestaande emoji-reactie
+  redirects:
+    prompt: Als je deze link vertrouwt, klik er dan op om door te gaan.
+    title: Je verlaat %{instance}.
   relationships:
     activity: Accountactiviteit
     confirm_follow_selected_followers: Weet je zeker dat je de geselecteerde volgers wilt volgen?
@@ -1562,7 +1573,7 @@ nl:
     moved: Verhuisd
     mutual: Wederzijds
     primary: Primair
-    relationship: Relatie
+    relationship: Volgrelatie
     remove_selected_domains: Alle volgers van de geselecteerde domeinen verwijderen
     remove_selected_followers: Geselecteerde volgers verwijderen
     remove_selected_follows: Geselecteerde gebruikers ontvolgen
@@ -1608,6 +1619,7 @@ nl:
       unknown_browser: Onbekende browser
       weibo: Weibo
     current_session: Huidige sessie
+    date: Datum
     description: "%{browser} op %{platform}"
     explanation: Dit zijn de webbrowsers die momenteel met jouw Mastodonaccount zijn ingelogd.
     ip: IP
@@ -1644,14 +1656,26 @@ nl:
     import: Importeren
     import_and_export: Importeren en exporteren
     migrate: Accountmigratie
-    notifications: Meldingen
+    notifications: E-mailmeldingen
     preferences: Voorkeuren
     profile: Openbaar profiel
     relationships: Volgers en gevolgde accounts
+    severed_relationships: Verbroken volgrelaties
     statuses_cleanup: Automatisch berichten verwijderen
     strikes: Vastgestelde overtredingen
     two_factor_authentication: Tweestapsverificatie
     webauthn_authentication: Beveiligingssleutels
+  severed_relationships:
+    download: Downloaden (%{count})
+    event_type:
+      account_suspension: Accountschorsing (%{target_name})
+      domain_block: Serverschorsing (%{target_name})
+      user_domain_block: Je hebt %{target_name} geblokkeerd
+    lost_followers: Verloren volgers
+    lost_follows: Verloren gevolgde accounts
+    preamble: Je kan gevolgde accounts en volgers verliezen wanneer je een domein blokkeert of wanneer de moderators van jouw server beslissen om een externe server op te schorten. Wanneer dat gebeurt, kun je lijsten van verbroken volgrelaties downloaden, deze inspecteren en mogelijk importeren op een andere server.
+    purged: Informatie over deze server is verwijderd door de beheerders van jouw server.
+    type: Gebeurtenis
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ nl:
         other: "%{count} stemmen"
       vote: Stemmen
     show_more: Meer tonen
-    show_newer: Nieuwere tonen
-    show_older: Oudere tonen
     show_thread: Gesprek tonen
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,6 +1769,7 @@ nl:
     contrast: Mastodon (hoog contrast)
     default: Mastodon (donker)
     mastodon-light: Mastodon (licht)
+    system: Automatisch (systeemthema gebruiken)
   time:
     formats:
       default: "%d %B %Y om %H:%M"
@@ -1774,18 +1797,27 @@ nl:
     webauthn: Beveiligingssleutels
   user_mailer:
     appeal_approved:
-      action: Ga naar je account
+      action: Accountinstellingen
       explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is goedgekeurd. De eerder vastgestelde overtreding is hierbij niet langer geldig.
       subject: Jouw bezwaar van %{date} is goedgekeurd
+      subtitle: Jouw account heeft weer een goede reputatie.
       title: Bezwaar goedgekeurd
     appeal_rejected:
       explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is afgewezen. De vastgestelde overtreding blijft daarom ongewijzigd.
       subject: Jouw bezwaar van %{date} is afgewezen
+      subtitle: Jouw bezwaar is afgewezen.
       title: Bezwaar afgewezen
     backup_ready:
-      explanation: Je hebt een volledige back-up van jouw Mastodon-account opgevraagd. Het staat nu klaar om te worden gedownload!
+      explanation: Je hebt een volledige back-up van je Mastodon-account aangevraagd.
+      extra: Het staat nu klaar om te worden gedownload!
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
+    failed_2fa:
+      details: 'Hier zijn details van de inlogpoging:'
+      explanation: Iemand heeft geprobeerd om in te loggen op jouw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
+      further_actions_html: Als jij dit niet was, raden we je aan om onmiddellijk %{action} aangezien het in gevaar kan zijn.
+      subject: Tweestapsverificatiefout
+      title: Tweestapsverificatie mislukt
     suspicious_sign_in:
       change_password: je wachtwoord te wijzigen
       details: 'Hier zijn de details van inlogpoging:'
@@ -1805,7 +1837,7 @@ nl:
         mark_statuses_as_sensitive: Sommige van jouw berichten zijn als gevoelig gemarkeerd door de moderatoren van %{instance}. Dit betekent dat mensen op de media in de berichten moeten klikken/tikken om deze weer te geven. Je kunt media in de toekomst ook zelf als gevoelig markeren.
         sensitive: Vanaf nu worden al jouw geüploade media als gevoelig gemarkeerd en verborgen achter een waarschuwing.
         silence: Je kunt nog steeds jouw account gebruiken, maar alleen mensen die jou al volgen kunnen jouw berichten zien, en je kunt minder goed worden gevonden. Andere kunnen je echter nog wel steeds handmatig volgen.
-        suspend: Je kunt niet langer jouw account gebruiken, en jouw profiel en andere gegevens zijn niet langer toegankelijk. Je kunt nog steeds inloggen om een backup van jouw gegevens op te vragen, totdat deze na 30 dagen volledig worden verwijderd. We zullen wel enkele basisgegevens behouden om te voorkomen dat je onder je schorsing uit probeert te komen.
+        suspend: Je kunt niet langer jouw account gebruiken, en jouw profiel en andere gegevens zijn niet langer toegankelijk. Je kunt nog steeds inloggen om een backup van jouw gegevens op te vragen, totdat deze na 30 dagen volledig worden verwijderd. We behouden wel enkele basisgegevens, om te voorkomen dat je onder je schorsing uit probeert te komen.
       reason: 'Reden:'
       statuses: 'Gerapporteerde berichten:'
       subject:
@@ -1813,7 +1845,7 @@ nl:
         disable: Jouw account %{acct} is bevroren
         mark_statuses_as_sensitive: Deze berichten van %{acct} zijn als gevoelig gemarkeerd
         none: Waarschuwing voor %{acct}
-        sensitive: Berichten van %{acct} zullen vanaf nu altijd als gevoelig worden gemarkeerd
+        sensitive: Berichten van %{acct} worden vanaf nu altijd als gevoelig gemarkeerd
         silence: Jouw account %{acct} is nu beperkt
         suspend: Jouw account %{acct} is opgeschort
       title:
@@ -1825,13 +1857,44 @@ nl:
         silence: Account beperkt
         suspend: Account opgeschort
     welcome:
-      edit_profile_action: Profiel instellen
-      edit_profile_step: Je kunt jouw profiel aanpassen door een profielfoto te uploaden, jouw weergavenaam aan te passen en meer. Je kunt het handmatig goedkeuren van volgers instellen.
+      apps_android_action: Via Google Play downloaden
+      apps_ios_action: Via de App Store downloaden
+      apps_step: Onze officiële apps downloaden.
+      apps_title: Mastodon-apps
+      checklist_subtitle: 'Laten we aan dit nieuwe sociale avontuur beginnen:'
+      checklist_title: Welkomstchecklist
+      edit_profile_action: Personaliseren
+      edit_profile_step: Wanneer je meer over jezelf vertelt, krijg je meer interactie met andere mensen.
+      edit_profile_title: Je profiel aanpassen
       explanation: Hier zijn enkele tips om je op weg te helpen
-      final_action: Begin berichten te plaatsen
-      final_step: 'Begin berichten te plaatsen! Zelfs zonder volgers kunnen jouw openbare berichten door anderen bekeken worden, bijvoorbeeld op de lokale tijdlijn en onder hashtags. Je kunt jezelf voorstellen met het gebruik van de hashtag #introductions.'
-      full_handle: Jouw volledige Mastodonadres
-      full_handle_hint: Dit geef je aan jouw vrienden, zodat ze jou berichten kunnen sturen of (vanaf een andere Mastodonserver) kunnen volgen.
+      feature_action: Meer informatie
+      feature_audience: Mastodon biedt je een unieke mogelijkheid om je publiek te beheren zonder tussenpersonen. Mastodon, geïmplementeerd in jouw eigen infrastructuur, stelt je in staat om elke andere Mastodon-server online te volgen en door hen gevolgd te worden, en staat onder controle van niemand, behalve die van jou.
+      feature_audience_title: Bouw jouw publiek in vertrouwen op
+      feature_control: Je weet zelf het beste wat je op jouw tijdlijn wilt zien. Geen algoritmen of advertenties om je tijd te verspillen. Volg iedereen op elke Mastodon-server vanaf één account en ontvang hun berichten in chronologische volgorde, en maak jouw hoekje op het internet een beetje meer zoals jezelf.
+      feature_control_title: Houd controle over je eigen tijdlijn
+      feature_creativity: Mastodon ondersteunt audio-, video- en fotoberichten, toegankelijkheidsbeschrijvingen, peilingen, inhoudswaarschuwingen, geanimeerde profielfoto's, aangepaste lokale emoji's, controle over het bijwerken van thumbnails en meer, om je te helpen jezelf online uit te drukken. Of je nu jouw kunst, jouw muziek of jouw podcast publiceert, Mastodon staat voor je klaar.
+      feature_creativity_title: Ongeëvenaarde creativiteit
+      feature_moderation: Mastodon legt de besluitvorming weer in jouw handen. Elke server creëert diens eigen regels en voorschriften, die lokaal worden gehandhaafd en niet van bovenaf zoals sociale media van bedrijven, waardoor het het meest flexibel is in het reageren op de behoeften van verschillende groepen mensen. Word lid van een server met de regels waarmee je akkoord gaat, of host jouw eigen.
+      feature_moderation_title: Moderatie zoals het hoort
+      follow_action: Volgen
+      follow_step: Op Mastodon draait het helemaal om het volgen van interessante mensen.
+      follow_title: Personaliseer je starttijdlijn
+      follows_subtitle: Volg bekende accounts
+      follows_title: Wie te volgen
+      follows_view_more: Meer mensen om te volgen bekijken
+      hashtags_recent_count:
+        one: "%{people} persoon in de afgelopen 2 dagen"
+        other: "%{people} mensen in de afgelopen 2 dagen"
+      hashtags_subtitle: Wat er in de afgelopen 2 dagen is gebeurd verkennen
+      hashtags_title: Populaire hashtags
+      hashtags_view_more: Meer populaire hashtags bekijken
+      post_action: Opstellen
+      post_step: Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen.
+      post_title: Je eerste bericht schrijven
+      share_action: Delen
+      share_step: Laat je vrienden weten waar je op Mastodon bent te vinden.
+      share_title: Je Mastodonprofiel delen
+      sign_in_action: Inloggen
       subject: Welkom op Mastodon
       title: Welkom aan boord %{name}!
   users:
@@ -1839,12 +1902,13 @@ nl:
     go_to_sso_account_settings: Ga naar de accountinstellingen van je identiteitsprovider
     invalid_otp_token: Ongeldige tweestaps-toegangscode
     otp_lost_help_html: Als je toegang tot beiden kwijt bent geraakt, neem dan contact op via %{email}
+    rate_limited: Te veel authenticatiepogingen, probeer het later opnieuw.
     seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
     signed_in_as: 'Ingelogd als:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> De link op je website kan onzichtbaar zijn. Het belangrijke onderdeel is <code>rel="me"</code> dat impersonatie op websites met user-generated content voorkomt. Je kunt zelfs een <code>link</code>-tag gebruiken in de header van de pagina in plaats van <code>a</code>, maar de HTML moet ook zonder JavaScript toegankelijk zijn.
     here_is_how: Zo werkt het
-    hint_html: "<strong>Verificatie van je identiteit op Mastodon is voor iedereen.</strong> Het is gebaseerd op open webstandaarden, en is en blijft altijd gratis. Alles wat nodig is is een persoonlijke website waar mensen je aan kunnen herkennen. Wanneer je vanuit jouw profiel naar deze website linkt, zullen wij controleren of de website naar jouw profiel teruglinkt en daar een visuele indicator van tonen."
+    hint_html: "<strong>Verificatie van je identiteit op Mastodon is voor iedereen.</strong> Het is gebaseerd op open webstandaarden, en is en blijft altijd gratis. Alles wat nodig is is een persoonlijke website waar mensen je aan kunnen herkennen. Wanneer je vanuit jouw profiel naar deze website linkt, controleren wij of de website naar jouw profiel teruglinkt en geven wij dit duidelijk hierop aan."
     instructions_html: Kopieer en plak de onderstaande code in de HTML van je website. Voeg vervolgens het adres van je website toe aan een van de extra velden op je profiel op het tabblad "Profiel bewerken" en sla de wijzigingen op.
     verification: Verificatie
     verified_links: Jouw geverifieerde links
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index de23096ed1..013674ca51 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -31,7 +31,7 @@ nn:
       created_msg: Moderatormerknad er laga!
       destroyed_msg: Moderatormerknad er utsletta!
     accounts:
-      add_email_domain_block: Gøym e-postdomene
+      add_email_domain_block: Blokker e-postdomene
       approve: Godtak
       approved_msg: Godkjende %{username} sin registreringssøknad
       are_you_sure: Er du sikker?
@@ -58,7 +58,7 @@ nn:
       demote: Degrader
       destroyed_msg: "%{username} sine data er no i slettekøa"
       disable: Slå av
-      disable_sign_in_token_auth: Slå av e-post token autentisering
+      disable_sign_in_token_auth: Slå av innlogging med epost-nykel
       disable_two_factor_authentication: Slå av 2FA
       disabled: Slege av
       display_name: Synleg namn
@@ -67,7 +67,7 @@ nn:
       email: E-post
       email_status: E-poststatus
       enable: Slå på
-      enable_sign_in_token_auth: Slå på e-post token autentisering
+      enable_sign_in_token_auth: Slå på innlogging med epost-nykel
       enabled: Aktivert
       enabled_msg: Gjenaktiverte %{username} sin konto
       followers: Fylgjarar
@@ -152,15 +152,15 @@ nn:
       suspend: Utvis og slett kontodata for godt
       suspended: Utvist
       suspension_irreversible: Data frå denne kontoen har blitt ikkje-reverserbart sletta. Du kan oppheve suspenderinga av kontoen for å bruke den, men det vil ikkje gjenopprette alle data den tidligare har hatt.
-      suspension_reversible_hint_html: Kontoen har blitt suspendert, og data vil bli fullstendig fjerna den %{date}. Fram til då kan kontoen gjenopprettes uten negative effekter. Om du ynskjer å fjerne kontodata no, kan du gjere det nedanfor.
+      suspension_reversible_hint_html: Kontoen har vorte stengd, og data vil bli fullstendig fjerna den %{date}. Fram til då kandu gjenoppretta kontoen utan negative konsekvensar. Om du ynskjer å fjerna kontodata no, kan du gjera det nedanfor.
       title: Kontoar
       unblock_email: Avblokker e-postadresse
       unblocked_email_msg: Avblokkerte %{username} si e-postadresse
       unconfirmed_email: E-post utan stadfesting
       undo_sensitized: Angr tving ømtolig
-      undo_silenced: Angr målbinding
+      undo_silenced: Angre avgrensinga
       undo_suspension: Angr utvising
-      unsilenced_msg: Opphevde vellykket begrensningen av %{username} sin konto
+      unsilenced_msg: Oppheva avgrensinga av %{username} sin konto
       unsubscribe: Avmeld
       unsuspended_msg: Oppheving av utvisinga av %{username} sin konto var vellykka
       username: Brukarnamn
@@ -200,10 +200,10 @@ nn:
         destroy_user_role: Øydelegg rolle
         disable_2fa_user: Skruv av 2FA
         disable_custom_emoji: Skruv av tilpassa emoji
-        disable_sign_in_token_auth_user: Slå av e-post tokenautentisering for brukar
+        disable_sign_in_token_auth_user: Slå av innlogging med epost-nykel for brukaren
         disable_user: Skruv av brukar
         enable_custom_emoji: Skruv på tilpassa emoji
-        enable_sign_in_token_auth_user: Slå på e-post tokenautentisering for brukar
+        enable_sign_in_token_auth_user: Slå på innlogging med epost-nykel for brukaren
         enable_user: Skruv på brukar
         memorialize_account: Opprett minnekonto
         promote_user: Forfrem brukar
@@ -221,7 +221,7 @@ nn:
         unblock_email_account: Avblokker e-postadresse
         unsensitive_account: Angr tving ømtolig konto
         unsilence_account: Angre avgrensing av konto
-        unsuspend_account: Opphev suspensjonen av kontoen
+        unsuspend_account: Opphev utestenginga av kontoen
         update_announcement: Oppdater kunngjøringen
         update_custom_emoji: Oppdater tilpassa emoji
         update_domain_block: Oppdater domene-sperring
@@ -259,10 +259,10 @@ nn:
         destroy_user_role_html: "%{name} sletta rolla %{target}"
         disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
         disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} deaktivert e-post token for godkjenning for %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} skrudde av innlogging med epost-nykel for %{target}"
         disable_user_html: "%{name} slo av innlogging for brukaren %{target}"
         enable_custom_emoji_html: "%{name} aktiverte emojien %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} aktiverte e-post token autentisering for %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} skrudde på innlogging med epost-nykel for %{target}"
         enable_user_html: "%{name} aktiverte innlogging for brukaren %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} fremja brukaren %{target}"
@@ -274,7 +274,7 @@ nn:
         reset_password_user_html: "%{name} tilbakestilte passordet for brukaren %{target}"
         resolve_report_html: "%{name} løyste ein rapport %{target}"
         sensitive_account_html: "%{name} markerte %{target} sitt media som ømtolig"
-        silence_account_html: "%{name} begrensa %{target} sin konto"
+        silence_account_html: "%{name} avgrensa %{target} sin konto"
         suspend_account_html: "%{name} utviste %{target} sin konto"
         unassigned_report_html: "%{name} løyste ein rapport %{target}"
         unblock_email_account_html: "%{name} avblokkerte %{target} si e-postadresse"
@@ -385,38 +385,38 @@ nn:
       add_new: Lag ny
       confirm_suspension:
         cancel: Avbryt
-        confirm: Suspender
+        confirm: Utvis
         permanent_action: Å oppheve suspensjonen vil ikkje gjenopprette data eller koplingar.
-        preamble_html: Du er i ferd med å suspendera <strong>%{domain}</strong> inkludert underdomener.
+        preamble_html: Du er i ferd med å utestenga <strong>%{domain}</strong> inkludert underdomene.
         remove_all_data: Dette vil fjerna alt innhald, media og profildata for kontoar som tilhøyrer dette domenet frå din tenar.
         stop_communication: Tenaren din vil slutta å kommunisera med desse tenarane.
         title: Stadfest domeneblokkering for %{domain}
-        undo_relationships: Dette vil oppheve alle følgar-relasjonar mellom kontoane dine og kontoar på desse tenerane.
+        undo_relationships: Dette vil oppheve alle fylgjar-relasjonar mellom kontoane dine og kontoar på desse tenerane.
       created_msg: Domeneblokkering blir nå behandlet
       destroyed_msg: Domeneblokkering har nå blitt angret
       domain: Domene
       edit: Rediger domeneblokkering
-      existing_domain_block: Du har allerede pålagt strengere begrensninger på %{name}.
-      existing_domain_block_html: Du har allerede pålagt strengere begrensninger på %{name}, du kan være nødt til <a href="%{unblock_url}">oppheve blokkeringen av den</a> først.
+      existing_domain_block: Du har allereie gjort strengare avgrensingar av %{name}.
+      existing_domain_block_html: Du har allereie avgrensa kontoen til %{name} kraftig, det kan henda du må <a href="%{unblock_url}">oppheva blokkeringa</a> fyrst.
       export: Eksporter
       import: Importer
       new:
         create: Lag blokkering
         hint: Domeneblokkeringen vil ikke hindre opprettelse av kontooppføringer i databasen, men vil retroaktivt og automatisk benytte spesifikke moderasjonsmetoder på de kontoene.
         severity:
-          desc_html: "<strong>Målbind</strong> gjer kontoen sine postear usynlege for alle som ikkje følger den. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoen. Bruk <strong>Ingen</strong> viss du berre vil fjerne mediafiler."
+          desc_html: "<strong>Avgrens</strong> gjer innlegg frå kontoar på dette domenet usynlege for alle som ikkje fylgjer dei. <strong>Utvis</strong> fjernar alt innhald, media og profildata frå kontoar på dette domenet frå tenaren din. Bruk <strong>Ingen</strong> viss du berre vil avvisa mediafiler."
           noop: Ingen
-          silence: Målbind
+          silence: Avgrens
           suspend: Utvis
         title: Ny domeneblokkering
       no_domain_block_selected: Ingen domeneblokkeringar vart endra sidan ingen var valde
       not_permitted: Du har ikkje løyve til å utføra denne handlinga
       obfuscate: Obfuskere domenenavn
-      obfuscate_hint: Skjul deler av domenenavnet i listen hvis annonsering av listen over domenebegrensninger er slått på
+      obfuscate_hint: Gøym delar av domenenamnet i lista viss kunngjering av lista over domeneavgrensingar er påskrudd
       private_comment: Privat kommentar
-      private_comment_hint: Kommenter angående denne domenebegrensningen for internt bruk av moderatorene.
+      private_comment_hint: Kommentar om denne domeneavgrensinga til intern bruk for administratorane.
       public_comment: Offentleg kommentar
-      public_comment_hint: Kommenter angående denne domenebegrensningen for offentligheten, hvis publisering av domenebegrensningslisten er slått på.
+      public_comment_hint: Kommentar om denne domeneavgrensinga for publikum, viss kunngjering av lista over avgrensa domene er påskrudd.
       reject_media: Avvis mediefiler
       reject_media_hint: Fjernar mediefiler som er lagra lokalt og nektar å lasta ned andre i framtida. Har ikkje noko å seia for utvisingar
       reject_reports: Avvis rapportar
@@ -480,7 +480,7 @@ nn:
         title: Tilgjenge
         warning: Det siste forsøket på å koble til denne serveren lyktes ikke
       back_to_all: Alle
-      back_to_limited: Begrenset
+      back_to_limited: Avgrensa
       back_to_warning: Advarsel
       by_domain: Domene
       confirm_purge: Er du sikker på at du vil slette data permanent fra dette domenet?
@@ -491,16 +491,16 @@ nn:
         policies:
           reject_media: Avvis media
           reject_reports: Avvis rapporter
-          silence: Begrens
-          suspend: Suspender
+          silence: Avgrens
+          suspend: Utvis
         policy: Vilkår
         reason: Offentlig årsak
         title: Retningslinjer for innhold
       dashboard:
         instance_accounts_dimension: Mest fylgde kontoar
         instance_accounts_measure: lagrede kontoer
-        instance_followers_measure: våre følgere der
-        instance_follows_measure: deres følgere her
+        instance_followers_measure: fylgjarane våre der
+        instance_follows_measure: fylgjarane deira her
         instance_languages_dimension: Mest brukte språk
         instance_media_attachments_measure: lagrede mediavedlegg
         instance_reports_measure: rapporter om dem
@@ -597,6 +597,9 @@ nn:
       actions_description_html: Avgjer kva som skal gjerast med denne rapporteringa. Dersom du utfører straffetiltak mot den rapporterte kontoen, vil dei motta ein e-post – så sant du ikkje har valt kategorien <strong>Spam</strong>.
       actions_description_remote_html: Avgjer kva du vil gjera for å løysa denne rapporten. Dette påverkar berre korleis tenaren <strong>din</strong> kommuniserer med kontoen på ein annan tenar, og korleis tenaren din handterer innhald derifrå.
       add_to_report: Legg til i rapporten
+      already_suspended_badges:
+        local: Allereie utestengd på denne tenaren
+        remote: Allereie utestengd på tenaren deira
       are_you_sure: Er du sikker?
       assign_to_self: Tilegn til meg
       assigned: Tilsett moderator
@@ -648,7 +651,7 @@ nn:
         actions:
           delete_html: Fjerna dei påtala innlegga
           mark_as_sensitive_html: Markera dei påtala mediefilene som sensitive
-          silence_html: Sterkt avgrensa korleis <strong>@%{acct}</strong> kan samhandla ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer han opp manuelt
+          silence_html: Avgrens kraftig korleis <strong>@%{acct}</strong> kan samhandla med andre ved å gjera brukarprofilen og innhaldet synleg berre for folk som allereie fylgjer brukarkontoen eller søkjer opp profilen manuelt
           suspend_html: Stengja brukarkontoen til <strong>@%{acct}</strong>, slik at brukarprofilen og innhaldet blir utilgjengeleg og umogleg å samhandla med
         close_report: Marker rapport nr. %{id} som løyst
         close_reports_html: Marker <strong>alle</strong> rapportane om <strong>@%{acct}</strong> som løyste
@@ -748,6 +751,7 @@ nn:
         desc_html: Dette baserer seg på eksterne skript frå hCaptcha, noko som kan vera eit tryggleiks- og personvernsproblem. <strong>I tillegg kan dette gjera registreringsprosessen monaleg mindre tilgjengeleg (særleg for folk med nedsett funksjonsevne)</strong>. Dette gjer at du bør du vurdera alternative tiltak, som til dømes godkjennings- eller invitasjonsbasert registrering.
         title: Krev at nye brukarar løyser ein CAPTCHA for å bekrefte kontoen sin
       content_retention:
+        danger_zone: Faresone
         preamble: Styr korleis brukargenerert innhald blir lagra i Mastodon.
         title: Bevaring av innhald
       default_noindex:
@@ -767,13 +771,15 @@ nn:
         disabled: Til ingen
         users: Til lokale brukarar som er logga inn
       registrations:
+        moderation_recommandation: Pass på at du har mange og kjappe redaktørar og moderatorar på laget ditt før du opnar for allmenn registrering!
         preamble: Kontroller kven som kan oppretta konto på tenaren din.
         title: Registreringar
       registrations_mode:
         modes:
-          approved: Godkjenning kreves for påmelding
+          approved: Godkjenning krevst for å registrera seg
           none: Ingen kan melda seg inn
           open: Kven som helst kan melda seg inn
+        warning_hint: Me rår til at du bruker "Godkjenning krevst for å registrera seg" viss du ikkje er sikker på at moderatorane kan handtera søppel og illmeinte registreringar kvikt.
       security:
         authorized_fetch: Krev autentisering frå fødererte tenarar
         authorized_fetch_hint: Krav om autentisering frå fødererte tenarar gjer det mogleg med strengare handheving av blokkering, både på brukar- og tenar-nivå. Likevel, dette har ein kostnad når det gjeld yting, reduserer rekkevidda til svara dine og kan medføra kompabilitetsproblem med enkelte fødererte tenester. Dette vil heller ikkje hindra dei som verkeleg vil i å henta dei offentlege innlegga eller kontoane dine.
@@ -827,9 +833,9 @@ nn:
         mark_statuses_as_sensitive: "%{name} markerte %{target} sine innlegg som ømtålige"
         none: "%{name} sendte en advarsel til %{target}"
         sensitive: "%{name} markerte %{target} sin konto som ømtolig"
-        silence: "%{name} begrenset %{target}s konto"
+        silence: "%{name} avgrensa kontoen til %{target}"
         suspend: "%{name} utviste %{target} sin konto"
-      appeal_approved: Klage tatt til følge
+      appeal_approved: Anka
       appeal_pending: Klage behandles
       appeal_rejected: Anken er avvist
     system_checks:
@@ -966,6 +972,9 @@ nn:
       title: Webhooker
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: På grunn av mangel på nyleg moderatoraktivitet, er registreringar på %{instance} automatisk bytt til å krevje manuell gjennomgang, for å hindre at %{instance} vert brukt som ein plattform for potensielle dårlege aktørar. Du kan byte tilbake for å opne registreringar når som helst.
+      subject: Registreringar for %{instance} er automatisk bytt til å krevje godkjenning
     new_appeal:
       actions:
         delete_statuses: å slette sine innlegg
@@ -973,8 +982,8 @@ nn:
         mark_statuses_as_sensitive: å merke innleggene sine som følsomme
         none: en advarsel
         sensitive: å merke kontoen sin som følsom
-        silence: for å begrense deres konto
-        suspend: for å suspendere kontoen deres
+        silence: for å avgrensa kontoen deira
+        suspend: for å stenga kontoen deira
       body: "%{target} ankar på ei modereringsavgjerd av %{action_taken_by} den %{date}, som var %{type}. Dei skreiv:"
       next_steps: Du kan godkjenna anken for å endra modereringsavgjerda, eller du kan oversjå anken.
       subject: "%{username} ankar ei modereringsavgjer på %{instance}"
@@ -1005,7 +1014,7 @@ nn:
     created_msg: Laga eit nytt kallenamn. No kan du setja i gang med flyttinga frå den gamle kontoen.
     deleted_msg: Fjerna kallenamnet. No vert det ikkje lenger mogeleg å flytta frå den andre kontoen til denne.
     empty: Du har inkje alias.
-    hint_html: Dersom du vil flytte fra en annen konto til den, kan du lage et alias her, som er påkrevd før du kan gå videre med å flytte følgere fra den gamle kontoen til den nye. Handlingen i seg selv er <strong>harmløs og reversibel</strong>. <strong>Kontoflyttingen har blitt satt i gang fra den gamle kontoen</strong>.
+    hint_html: Viss du vil flytta frå ein annan konto til denne, kan du laga eit alias her. Det treng du før du kan halda fram med å flytta fylgjarar frå den gamle kontoen til dnene. Denne handlinga er i seg sjølv <strong>harmlaus og kan angrast</strong>. <strong>Du har starta overføringa frå den gamle kontoen</strong>.
     remove: Fjern aliaslenking
   appearance:
     advanced_web_interface: Avansert nettgrensesnitt
@@ -1059,7 +1068,7 @@ nn:
     didnt_get_confirmation: Fekk du ikkje stadfestingslenka?
     dont_have_your_security_key: Har du ikke sikkerhetsnøkkelen din?
     forgot_password: Har du gløymt passordet ditt?
-    invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å beda om ein ny ein.
+    invalid_reset_password_token: Tilgangsnykelen er ugyldig eller utgått. Ver venleg å be om ein ny ein.
     link_to_otp: Skriv inn en 2-trinnskode fra din 2-trinnspåloggingsenhet eller en gjenopprettingskode
     link_to_webauth: Bruk sikkerhetsnøkkel-enheten din
     log_in_with: Logg inn med
@@ -1102,7 +1111,7 @@ nn:
       title: Logg inn på %{domain}
     sign_up:
       manual_review: Når du lagar ein konto på %{domain}, vil moderatorane våre gå gjennom påmeldinga di manuelt. For å hjelpa oss med påmeldinga di, er det fint om du skriv litt om deg sjølv og kvifor du vil ha ein konto på %{domain}.
-      preamble: Med en konto på denne Mastodon-tjeneren vil du kunne følge andre personer på nettverket, uansett hvor kontoen deres holder til.
+      preamble: Med ein konto på denne Mastodon-tenaren kan du fylgja andre folk på nettverket, uansett kvar dei har brukarkontoen sin.
       title: La oss få deg satt i gang på %{domain}.
     status:
       account_status: Kontostatus
@@ -1162,7 +1171,7 @@ nn:
     strikes:
       action_taken: Handling utført
       appeal: Klage
-      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
+      appeal_approved: Denne handlinga er anka og er ikkje lenger gyldig
       appeal_rejected: Klagen ble avvist
       appeal_submitted_at: Klage levert
       appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
@@ -1183,8 +1192,8 @@ nn:
         mark_statuses_as_sensitive: Markering av innlegg som ømtolige
         none: Advarsel
         sensitive: Markering av konto som ømtolig
-        silence: Begrensning av konto
-        suspend: Suspensjon av konto
+        silence: Avgrensing av konto
+        suspend: Utestenging av konto
       your_appeal_approved: Din klage har blitt godkjent
       your_appeal_pending: Du har levert en klage
       your_appeal_rejected: Din klage har blitt avvist
@@ -1416,7 +1425,7 @@ nn:
   migrations:
     acct: Flytta til
     cancel: Avbryt omdirigeringen
-    cancel_explanation: Å avbryte omdirigeringen vil reaktivere din nåværende konto, men vil ikke bringe tilbake følgere som har blitt flyttet til den kontoen.
+    cancel_explanation: Viss du avbryt omdirigeringa, vil det ta i bruk at den noverande kontoen din, men det vil ikkje få tilbake fylgjarar som er flytte til den andre kontoen.
     cancelled_msg: Avbrøt omdirigeringen med suksess.
     errors:
       already_moved: er den same kontoen som du allereie har flytta til
@@ -1427,7 +1436,7 @@ nn:
     followers_count: Fylgjarar då kontoen vart flytta
     incoming_migrations: Flyttar frå ein annan konto
     incoming_migrations_html: For å flytta frå ein annnan konto til denne må du fyrst <a href="%{path}">laga eit kallenamn til kontoen</a>.
-    moved_msg: Kontoen din omdirigeres nå til %{acct}, og følgerne dine blir flyttet over.
+    moved_msg: Kontoen din vidaresender no til %{acct}, og fylgjarane dine blir flytte over dit.
     not_redirecting: Kontoen din omdirigeres ikke til noen andre kontoer for øyeblikket.
     on_cooldown: Du har nylig overført kontoen din. Denne funksjonen blir tilgjengelig igjen om %{count} dager.
     past_migrations: Tidlegare vandringar
@@ -1440,14 +1449,14 @@ nn:
       before: 'Før du fortsetter, vennligst les disse notisene nøye:'
       cooldown: Etter flytting er det en nedkjølingsperiode der du ikke vil kunne flytte igjen
       disabled_account: Din nåværende konto vil ikke være fullt brukbar etterpå. Men du vil ha tilgang til dataeksportering såvel som reaktivering.
-      followers: Denne handlingen vil flytte alle følgere fra den nåværende kontoen til den nye kontoen
+      followers: Denne handlinga flyttar alle fylgjarar frå denne kontoen til den nye
       only_redirect_html: Alternativt kan du velge å <a href="%{path}">bare legge ut en omdirigering på profilen din</a>.
       other_data: Inkje anna data flyttast av seg sjølve
       redirect: Profilen til din nåværende konto vil bli oppdatert med en omdirigeringsnotis og bli fjernet fra søk
   moderation:
     title: Moderasjon
   move_handler:
-    carry_blocks_over_text: Denne brukaren flytta frå %{acct}, som du gøymde.
+    carry_blocks_over_text: Denne brukaren flytta frå %{acct}, som du hadde blokkert.
     carry_mutes_over_text: Denne brukeren flyttet fra %{acct}, som du hadde dempet.
     copy_account_note_text: 'Denne brukeren flyttet fra %{acct}, her var dine tidligere notater om dem:'
   navigation:
@@ -1490,7 +1499,6 @@ nn:
     administration_emails: Administrator sine epost-varsler
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
-    other_settings: Andre varslingsinnstillinger
   number:
     human:
       decimal_units:
@@ -1503,9 +1511,9 @@ nn:
           trillion: Bil
   otp_authentication:
     code_hint: Skriv inn koden generert av autentiseringsappen din for å bekrefte
-    description_html: Hvis du skrur på <strong>2-trinnsautentisering</strong> ved hjelp av en autentiseringsapp, vil pålogging kreve at du er i besittelse av autentiseringsenheten din, som genererer sjetonger som du skal skrive inn.
+    description_html: Viss du skrur på <strong>tofaktorinnlogging</strong> med ein innloggingsapp, må du ha telefonen din klar når du loggar inn. Telefonen lagar innloggingsnyklar du må skriva inn.
     enable: Aktiver
-    instructions_html: "<strong>Skann denne QR-koden i Authy, Google Autentisering, eller en lignende TOTP-app på en av dine enheter</strong>. Fra nå av, vil den appen generere sjetonger som du vil måtte skrive inn når du logger på."
+    instructions_html: "<strong>Skann denne QR-koden i Google authenticator eller annan tofaktor-app på telefonen din</strong>. Frå no vil den appen laga tilgangsnyklar som du skriv inn når du vil logga inn."
     manual_instructions: 'Hvis du ikke kan skanne QR-koden og må skrive den inn manuelt, her er tekstkoden i ren tekst:'
     setup: Sett opp
     wrong_code: Den innskrevne koden var ugyldig! Er tjenertiden og enhetstiden riktige?
@@ -1534,7 +1542,7 @@ nn:
   privacy:
     hint_html: "<strong>Tilpass korleis du vil at andre skal finna profilen og innlegga dine.</strong> Mastodon har fleire funksjonar du kan ta i bruk for å få kontakt med eit større publikum. Sjå gjerne gjennom innstillingane slik at du er sikker på at dei passar til deg og din bruk."
     privacy: Personvern
-    privacy_hint_html: Ha kontroll over kor mykje du vil dela. Folk finn interessante profilar og fine appar ved å sjå gjennom kva andre fylgjer og kva appar dei legg ut innlegg med, men det kan henda du vil gøyma desse opplysingane.
+    privacy_hint_html: Kontroller kor mykje du vil dela. Folk finn interessante profilar og fine appar ved å sjå gjennom kva andre fylgjer og kva appar dei legg ut innlegg med, men det kan henda du vil gøyma desse opplysingane.
     reach: Nå andre
     reach_hint_html: Hald styring med om du vil at andre skal kunna oppdaga og fylgja deg. Vil du at innlegga dine skal stå på Utforsk-sida? Vil du at andre skal sjå deg i tilrådingane for kven dei skal fylgja? Vil du ta imot nye fylgjarar automatisk, eller vil du kontrollera kvar einskild fylgjar?
     search: Søk
@@ -1546,6 +1554,9 @@ nn:
     errors:
       limit_reached: Grensen for forskjellige reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
+  redirects:
+    prompt: Viss du stolar på denne lenka, klikkar du på ho for å halda fram.
+    title: No forlèt du %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du ynskjer å fylgja dei valde fylgjarane?
@@ -1554,7 +1565,7 @@ nn:
     dormant: I dvale
     follow_failure: Greidde ikkje fylgja alle kontoane du valde.
     follow_selected_followers: Følg valgte tilhengere
-    followers: Følgere
+    followers: Fylgjarar
     following: Følginger
     invited: Innboden
     last_active: Sist aktiv
@@ -1608,6 +1619,7 @@ nn:
       unknown_browser: Ukjend nettlesar
       weibo: Weibo
     current_session: Noverande økt
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Desse nettlesarane er logga inn på Mastodon-kontoen din.
     ip: IP-adresse
@@ -1644,14 +1656,26 @@ nn:
     import: Hent inn
     import_and_export: Importer og eksporter
     migrate: Kontoflytting
-    notifications: Varsel
+    notifications: E-postvarslingar
     preferences: Innstillingar
     profile: Profil
     relationships: Fylgjar og fylgjarar
+    severed_relationships: Brotne forhold
     statuses_cleanup: Automatisert sletting av innlegg
     strikes: Modereringsadvarsler
     two_factor_authentication: Tostegsautorisering
     webauthn_authentication: Sikkerhetsnøkler
+  severed_relationships:
+    download: Last ned (%{count})
+    event_type:
+      account_suspension: Utestenging av konto (%{target_name})
+      domain_block: Tenarutestenging (%{target_name})
+      user_domain_block: Du blokkerte %{target_name}
+    lost_followers: Mista fylgjarar
+    lost_follows: Mista fylgjer
+    preamble: Du kan mista fylgjarar og folk du fylgjer når du blokkerer eit domene eller når moderatorar avgjer å utestenga ein annan tenar. Når det skjer, vil du kunne lasta ned ei liste over brotne forhold, slik at du kan sjå gjennom ho og kanskje importera ho på ein annan tenar.
+    purged: Informasjonen om denne tenaren er sletta av administratorane på tenaren din.
+    type: Hending
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ nn:
         other: "%{count} røyster"
       vote: Røyst
     show_more: Vis meir
-    show_newer: Vis nyere
-    show_older: Vis eldre
     show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1747,6 +1769,7 @@ nn:
     contrast: Mastodon (Høg kontrast)
     default: Mastodon (Mørkt)
     mastodon-light: Mastodon (Lyst)
+    system: Automatisk (bruk systemdrakta)
   time:
     formats:
       default: "%d.%b %Y, %H:%M"
@@ -1774,18 +1797,27 @@ nn:
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      action: Gå til din konto
+      action: Kontoinnstillingar
       explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
       subject: Din klage fra %{date} er godkjent
+      subtitle: Kontoen din er tilbake i god stand.
       title: Anke godkjend
     appeal_rejected:
       explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
       subject: Din klage fra %{date} er avvist
+      subtitle: Klaga di vart avvist.
       title: Anke avvist
     backup_ready:
-      explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
+      explanation: Du ba om ein fullstendig tryggingskopi av Mastodon-kontoen din.
+      extra: No kan du lasta han ned!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
+    failed_2fa:
+      details: 'Her er detaljane om innloggingsforsøket:'
+      explanation: Nokon har prøvd å logge inn på kontoen din, men brukte ein ugyldig andre-autentiseringsfaktor.
+      further_actions_html: Om dette ikkje var deg, rår me deg til å %{action} med éin gong, då det kan vere kompomittert.
+      subject: To-faktor-autentiseringsfeil
+      title: Mislukka to-faktor-autentisering
     suspicious_sign_in:
       change_password: endre passord
       details: 'Her er påloggingsdetaljane:'
@@ -1805,7 +1837,7 @@ nn:
         mark_statuses_as_sensitive: Nokre av innlegga dine har vorte markerte som ømtolige av moderatorane ved %{instance}. Dette tyder at folk må trykkje på mediane i innlegga for å førehandsvise dei. Du kan markera media som ømtolig sjølv når du legg ut nye innlegg.
         sensitive: Frå no av vil alle dine opplasta mediefiler bli markert som ømtolig og skjult bak ei klikk-åtvaring.
         silence: Medan kontoen din er avgrensa, vil berre folk som allereie fylgjer deg sjå dine tutar på denne tenaren, og du kan bli ekskludert fra diverse offentlige oppføringer. Andre kan framleis fylgje deg manuelt.
-        suspend: Du kan ikkje lenger bruke kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logge inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men vi beheld nokre grunnleggjande data for å forhindre deg å omgå suspenderinga.
+        suspend: Du kan ikkje lenger bruka kontoen din, og profilen og andre data er ikkje lenger tilgjengelege. Du kan framleis logga inn for å be om ein sikkerheitskopi av data før dei blir fullstendig sletta om omtrent 30 dagar, men me vil lagra nokre grunnleggjande data for å syta for at du ikkje omgår utestenginga.
       reason: 'Årsak:'
       statuses: 'Innlegg sitert:'
       subject:
@@ -1825,13 +1857,44 @@ nn:
         silence: Konto avgrensa
         suspend: Konto utvist
     welcome:
-      edit_profile_action: Lag til profil
-      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
+      apps_android_action: Få det på Google Play
+      apps_ios_action: Last ned på App Store
+      apps_step: Last ned dei offisielle appane våre.
+      apps_title: Mastodon-appar
+      checklist_subtitle: 'La oss hjelpa deg i gang på denne nye sosiale reisa:'
+      checklist_title: Kom i gang
+      edit_profile_action: Tilpass til deg
+      edit_profile_step: Få fleire samhandlingar ved å fylla ut profilen din.
+      edit_profile_title: Tilpass profilen din
       explanation: Her er nokre tips for å koma i gang
-      final_action: Kom i gang med å leggja ut
-      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
-      full_handle: Det fulle brukarnamnet ditt
-      full_handle_hint: Dette er det du fortel venene dine for at dei skal kunna senda deg meldingar eller fylgja deg frå ein annan tenar.
+      feature_action: Lær meir
+      feature_audience: Mastodon gjev deg eit unikt høve til å styra kven som ser innhaldet ditt, utan mellommenn. Viss du installerer Mastodon på din eigen tenar, kan du fylgja og bli fylgt frå alle andre Mastodon-tenarar på nett, og det er ingen andre enn du som har kontrollen.
+      feature_audience_title: Få tilhengjarar på ein trygg måte
+      feature_control: Du veit best kva du vil ha på tidslina di. Her er ingen algoritmar eller reklame som kastar bort tida. Du kan fylgja folk på ein kvar Mastodon-tenar frå brukarkontoen din, få innlegga deira i kronologisk rekkjefylgje, og gjera ditt eige hjørne av internett litt meir ditt.
+      feature_control_title: Hald kontroll over tidslina di
+      feature_creativity: På Mastodon kan du laga innlegg med lyd, film og bilete, du kan skildra media for betre tilgjenge, du kan laga avrøystingar, innhaldsåtvaringar og eigne smilefjes, du kan klyppa til småbilete og endå meir for å uttrykkja deg på nettet. Mastodon passar for deg, anten du vil skriva eller leggja ut kunst, musikk eller podkastar.
+      feature_creativity_title: Ustoppeleg kreativt
+      feature_moderation: Med Mastodon bestemmer du sjølv. Kvar tenar har sine eigne reglar og retningsliner som blir laga lokalt og ikkje sentralt i eit stort firma, slik det er med andre sosiale nettverk. Det gjer at alle slags grupper kan få ein Mastodon-tenar som passar til dei. Du kan bli med på ein tenar som har reglar du er samd med, eller du kan laga din eigen tenar.
+      feature_moderation_title: Moderering slik det bør vera
+      follow_action: Fylg
+      follow_step: Å fylgja interessante folk er det det handlar om på Mastodon.
+      follow_title: Tilpass tidslina di
+      follows_subtitle: Fylg kjende folk
+      follows_title: Kven du kan fylgja
+      follows_view_more: Sjå fleire du kan fylgja
+      hashtags_recent_count:
+        one: "%{people} person dei siste to dagane"
+        other: "%{people} personar dei siste to dagane"
+      hashtags_subtitle: Sjå kva som har vore populært dei siste to dagane
+      hashtags_title: Populære emneknaggar
+      hashtags_view_more: Sjå fleire populære emneknaggar
+      post_action: Skriv
+      post_step: Sei hei til verda med tekst, bilete, filmar eller meiningsmålingar.
+      post_title: Skriv ditt fyrste innlegg
+      share_action: Del
+      share_step: Fortel venene dine korleis dei finn deg på Mastodon.
+      share_title: Del Mastodon-profilen din
+      sign_in_action: Logg inn
       subject: Velkomen til Mastodon
       title: Velkomen om bord, %{name}!
   users:
@@ -1839,6 +1902,7 @@ nn:
     go_to_sso_account_settings: Gå til kontoinnstillingane hjå identitetsleverandøren din
     invalid_otp_token: Ugyldig tostegskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+    rate_limited: For mange autentiseringsforsøk, prøv igjen seinare.
     seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
   verification:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 54f82550b7..c71dffc636 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -229,7 +229,7 @@
         update_status: Oppdater statusen
         update_user_role: Oppdater rolle
       actions:
-        approve_appeal_html: "%{name} godkjente klagen på modereringa fra %{target}"
+        approve_appeal_html: "%{name} godkjente anken på moderering fra %{target}"
         approve_user_html: "%{name} godkjente registrering fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg selv"
         change_email_user_html: "%{name} endret e-postadressen til brukeren %{target}"
@@ -266,7 +266,7 @@
         enable_user_html: "%{name} aktiverte innlogging for bruker %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} forfremmet bruker %{target}"
-        reject_appeal_html: "%{name} avviste moderasjonsavgjørelsesklagen fra %{target}"
+        reject_appeal_html: "%{name} avviste anken på moderering fra %{target}"
         reject_user_html: "%{name} avslo registrering fra %{target}"
         remove_avatar_user_html: "%{name} fjernet %{target} sitt profilbilde"
         reopen_report_html: "%{name} gjenåpnet rapporten %{target}"
@@ -372,8 +372,8 @@
       website: Nettside
     disputes:
       appeals:
-        empty: Ingen klager funnet.
-        title: Klager
+        empty: Ingen anker funnet.
+        title: Anker
     domain_allows:
       add_new: Hvitelist domene
       created_msg: Domenet har blitt hvitelistet
@@ -692,8 +692,8 @@
         invite_users_description: Lar brukere invitere nye personer til serveren
         manage_announcements: Behandle Kunngjøringer
         manage_announcements_description: Lar brukere endre kunngjøringer på serveren
-        manage_appeals: Behandle klager
-        manage_appeals_description: Lar brukere gjennomgå klager mot modereringsaktiviteter
+        manage_appeals: Behandle anker
+        manage_appeals_description: Lar brukere gjennomgå anker mot modereringsaktiviteter
         manage_blocks: Behandle Blokker
         manage_blocks_description: Lar brukere blokkere e-postleverandører og IP-adresser
         manage_custom_emojis: Administrer egendefinerte Emojier
@@ -829,8 +829,8 @@
         sensitive: "%{name} merket %{target}s konto som følsom"
         silence: "%{name} begrenset %{target}s konto"
         suspend: "%{name} suspenderte %{target}s konto"
-      appeal_approved: Klage tatt til følge
-      appeal_pending: Klage behandles
+      appeal_approved: Anket
+      appeal_pending: Anke behandles
       appeal_rejected: Anke avvist
     system_checks:
       database_schema_check:
@@ -966,6 +966,8 @@
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      subject: Registreringer for %{instance} har blitt automatisk byttet til å kreve godkjenning
     new_appeal:
       actions:
         delete_statuses: å slette sine innlegg
@@ -975,9 +977,9 @@
         sensitive: å merke kontoen sin som følsom
         silence: for å begrense deres konto
         suspend: for å avslutte kontoen
-      body: "%{target} klager på en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
-      next_steps: Du kan godkjenne klagen for å angre på moderasjonsvedtaket eller ignorere det.
-      subject: "%{username} klager på en moderasjonsbeslutning for %{instance}"
+      body: "%{target} anker en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
+      next_steps: Du kan godkjenne anken for å angre på moderasjonsvedtaket eller ignorere det.
+      subject: "%{username} anker en moderasjonsbeslutning for %{instance}"
     new_critical_software_updates:
       body: Nye kritiske versjoner av Mastodon har blitt utgitt, det kan være fordelaktig å oppdatere så snart som mulig!
       subject: Kritiske Mastodon-oppdateringer er tilgjengelige for %{instance}!
@@ -1161,19 +1163,19 @@
   disputes:
     strikes:
       action_taken: Handling utført
-      appeal: Klage
-      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
-      appeal_rejected: Klagen ble avvist
-      appeal_submitted_at: Klage levert
-      appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
+      appeal: Anke
+      appeal_approved: Denne advarselens anke ble tatt til følge og er ikke lenger gyldig
+      appeal_rejected: Anken ble avvist
+      appeal_submitted_at: Anke levert
+      appealed_msg: Anken din har blitt levert. Du får beskjed om den blir godkjent.
       appeals:
-        submit: Lever klage
-      approve_appeal: Godkjenn klage
+        submit: Lever anke
+      approve_appeal: Godkjenn anke
       associated_report: Tilhørende rapport
       created_at: Datert
       description_html: Dette er tiltakene mot din konto og advarsler som har blitt sent til deg av %{instance}-personalet.
       recipient: Adressert til
-      reject_appeal: Avvis klage
+      reject_appeal: Avvis anke
       status: 'Innlegg #%{id}'
       status_removed: Innlegg allerede fjernet fra systemet
       title: "%{action} fra %{date}"
@@ -1185,9 +1187,9 @@
         sensitive: Merking av konto som sensitiv
         silence: Begrensning av konto
         suspend: Suspensjon av konto
-      your_appeal_approved: Din klage har blitt godkjent
-      your_appeal_pending: Du har levert en klage
-      your_appeal_rejected: Din klage har blitt avvist
+      your_appeal_approved: Anken din har blitt godkjent
+      your_appeal_pending: Du har levert en anke
+      your_appeal_rejected: Anken din har blitt avvist
   domain_validator:
     invalid_domain: er ikke et gyldig domenenavn
   edit_profile:
@@ -1490,7 +1492,6 @@
     administration_emails: Administrators e-postvarslinger
     email_events: E-postvarslinger for hendelser
     email_events_hint: 'Velg hendelser som du vil motta varslinger for:'
-    other_settings: Andre varslingsinnstillinger
   number:
     human:
       decimal_units:
@@ -1546,6 +1547,9 @@
     errors:
       limit_reached: Grensen for ulike reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
+  redirects:
+    prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
+    title: Du forlater %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du vil følge valgte følgere?
@@ -1608,6 +1612,7 @@
       unknown_browser: Ukjent Nettleser
       weibo: Weibo
     current_session: Nåværende økt
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Dette er nettlesere som er pålogget på din Mastodon-konto akkurat nå.
     ip: IP-adresse
@@ -1644,7 +1649,6 @@
     import: Importér
     import_and_export: Importer og eksporter
     migrate: Kontomigrering
-    notifications: Varslinger
     preferences: Innstillinger
     profile: Profil
     relationships: Følginger og følgere
@@ -1689,8 +1693,6 @@
         other: "%{count} stemmer"
       vote: Stem
     show_more: Vis mer
-    show_newer: Vis nyere
-    show_older: Vis eldre
     show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1740,7 +1742,7 @@
     sensitive_content: Følsomt innhold
   strikes:
     errors:
-      too_late: Det er for sent å klage på denne advarselen
+      too_late: Det er for sent å anke denne advarselen
   tags:
     does_not_match_previous_name: samsvarer ikke med det forrige navnet
   themes:
@@ -1774,18 +1776,27 @@
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      action: Gå til kontoen din
-      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
-      subject: Din klage fra %{date} er godkjent
-      title: Klage godkjent
+      action: Kontoinnstillinger
+      explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
+      subject: Anken din fra %{date} er godkjent
+      subtitle: Kontoen din er tilbake i god stand.
+      title: Anke godkjent
     appeal_rejected:
-      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
-      subject: Din klage fra %{date} er avvist
-      title: Klage avvist
+      explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
+      subject: Anken din fra %{date} er avvist
+      subtitle: Anken din har blitt avvist.
+      title: Anke avvist
     backup_ready:
-      explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
+      explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
+      extra: Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
+    failed_2fa:
+      details: 'Her er detaljer om påloggingsforsøket:'
+      explanation: Noen har prøvd å logge på kontoen din, men ga en ugyldig andre-autentiseringsfaktor.
+      further_actions_html: Hvis dette ikke var deg, anbefaler vi at du %{action} umiddelbart fordi det kan ha blitt kompromittert.
+      subject: Andre-autentiseringsfaktorfeil
+      title: Mislykket andre-autentiseringsfaktor
     suspicious_sign_in:
       change_password: endre passord
       details: 'Her er detaljer om påloggingen:'
@@ -1794,8 +1805,8 @@
       subject: Din konto ble tatt i bruk fra en ny IP-adresse
       title: En ny pålogging
     warning:
-      appeal: Lever en klage
-      appeal_description: Hvis du mener dette er feil, kan du sende inn en klage til personalet i %{instance}.
+      appeal: Lever en anke
+      appeal_description: Hvis du mener dette er feil, kan du sende inn en anke til personalet i %{instance}.
       categories:
         spam: Søppelpost
         violation: Innholdet bryter følgende retningslinjer for fellesskapet
@@ -1825,13 +1836,29 @@
         silence: Kontoen er begrenset
         suspend: Kontoen er suspendert
     welcome:
-      edit_profile_action: Sett opp profil
-      edit_profile_step: Du kan tilpasse profilen din ved å laste opp et profilbilde, endre visningsnavnet ditt og mer. Du kan velge at nye følgere må godkjennes av deg før de får lov til å følge deg.
+      apps_android_action: Få den på Google Play
+      apps_ios_action: Last ned på App Store
+      apps_step: Last ned våre offisielle apper.
+      apps_title: Mastodon-apper
+      checklist_title: Velkomst-sjekkliste
+      edit_profile_action: Tilpass
+      edit_profile_title: Tilpass profilen din
       explanation: Her er noen tips for å komme i gang
-      final_action: Start postingen
-      final_step: 'Skriv innlegg! Selv uten følgere kan dine offentlige innlegg bli sett av andre, for eksempel på den lokale tidslinjen og i emneknagger. Du kan introdusere deg selv ved å bruke emneknaggen #introduksjon.'
-      full_handle: Ditt fullstendige brukernavn
-      full_handle_hint: Dette er hva du forteller venner slik at de kan sende melding eller følge deg fra en annen instanse.
+      feature_action: Lær mer
+      feature_moderation_title: Moderering slik det burde være
+      follow_action: Følg
+      follow_title: Tilpass tidslinjen din
+      follows_subtitle: Følg godt kjente kontoer
+      follows_title: Hvem å følge
+      follows_view_more: Vis flere personer å følge
+      hashtags_title: Populære emneknagger
+      hashtags_view_more: Vis flere populære emneknagger
+      post_step: Si hallo til verdenen med tekst, bilder, videoer, eller meningsmålinger.
+      post_title: Lag ditt første innlegg
+      share_action: Del
+      share_step: La vennene dine vite hvordan finne deg på Mastodon.
+      share_title: Del Mastadon-profilen din
+      sign_in_action: Logg inn
       subject: Velkommen til Mastodon
       title: Velkommen ombord, %{name}!
   users:
@@ -1839,6 +1866,7 @@
     go_to_sso_account_settings: Gå til din identitetsleverandørs kontoinnstillinger
     invalid_otp_token: Ugyldig to-faktorkode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+    rate_limited: For mange autentiseringsforsøk, prøv igjen senere.
     seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
     signed_in_as: 'Innlogget som:'
   verification:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 83c2638b51..0a653ea46c 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -724,7 +724,6 @@ oc:
   notifications:
     email_events: Eveniments per las notificacions per corrièl
     email_events_hint: 'Seleccionatz los eveniments que volètz recebre :'
-    other_settings: Autres paramètres de notificacion
   number:
     human:
       decimal_units:
@@ -833,7 +832,6 @@ oc:
     import: Importar de donadas
     import_and_export: Import e export
     migrate: Migracion de compte
-    notifications: Notificacions
     preferences: Preferéncias
     profile: Perfil
     relationships: Abonaments e seguidors
@@ -876,8 +874,6 @@ oc:
         other: "%{count} vòtes"
       vote: Votar
     show_more: Ne veire mai
-    show_newer: Veire mai recents
-    show_older: Veire mai ancians
     show_thread: Mostrar lo fil
     title: '%{name} : "%{quote}"'
     visibilities:
@@ -948,10 +944,7 @@ oc:
     recovery_instructions_html: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. <strong>Gardatz los còdis en seguretat</strong>, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
     webauthn: Claus de seguretat
   user_mailer:
-    appeal_approved:
-      action: Anatz al vòstre compte
     backup_ready:
-      explanation: Avètz demandat una salvagarda complèta de vòstre compte Mastodon. Es prèsta per telecargament !
       subject: Vòstre archiu es prèst per telecargament
       title: Archiu per emportar
     warning:
@@ -969,11 +962,7 @@ oc:
         silence: Compte limitat
         suspend: Compte suspendut
     welcome:
-      edit_profile_action: Configuracion del perfil
       explanation: Vaquí qualques astúcias per vos preparar
-      final_action: Començar de publicar
-      full_handle: Vòstre escais-nom complèt
-      full_handle_hint: Es aquò que vos cal donar a vòstres amics per que pòscan vos escriure o sègre a partir d’un autre servidor.
       subject: Benvengut a Mastodon
       title: Vos desirem la benvenguda a bòrd %{name} !
   users:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 15aefe5f74..7c037d7d00 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -621,6 +621,9 @@ pl:
       actions_description_html: Zdecyduj, jakie działania należy podjąć, aby rozstrzygnąć niniejsze zgłoszenie. Jeśli podejmiesz działania karne przeciwko zgłoszonemu kontowi, zostanie do nich wysłane powiadomienie e-mail, chyba że wybrano kategorię <strong>Spam</strong>.
       actions_description_remote_html: Zdecyduj, jakie działanie należy podjąć, aby rozwiązać to zgłoszenie. Będzie to miało wpływ jedynie na sposób, w jaki <strong>Twój</strong> serwer komunikuje się z tym kontem zdalnym i obsługuje jego zawartość.
       add_to_report: Dodaj więcej do zgłoszenia
+      already_suspended_badges:
+        local: Już zawieszono na tym serwerze
+        remote: Już zawieszono na ich serwerze
       are_you_sure: Czy na pewno?
       assign_to_self: Przypisz do siebie
       assigned: Przypisany moderator
@@ -776,6 +779,7 @@ pl:
         desc_html: Wymaga użycia zewnętrznych skryptów hCaptcha, co może negatywnie wpływać na bezpieczeństwo i prywatność. <strong>Może również przyczynić się do znaczącego utrudnienia procesu rejestracji niektórym, np. niepełnosprawnym, osobom.</strong> Dlatego sugeruje się używanie zaproszeń bądź ręcznie potwierdzanie kont.
         title: W celu potwierdzenia ich kont wymagaj rozwiązania zadania CAPTCHA przez nowych użytkowników
       content_retention:
+        danger_zone: Strefa niebezpieczeństwa
         preamble: Kontroluj, jak treści generowane przez użytkownika są przechowywane w Mastodon.
         title: Retencja treści
       default_noindex:
@@ -795,6 +799,7 @@ pl:
         disabled: Nikomu
         users: Zalogowanym lokalnym użytkownikom
       registrations:
+        moderation_recommandation: Upewnij się, że masz adekwatny i szybko reagujący zespół moderacyjny przed otwarciem rejestracji!
         preamble: Kontroluj, kto może utworzyć konto na Twoim serwerze.
         title: Rejestracje
       registrations_mode:
@@ -802,6 +807,7 @@ pl:
           approved: Przyjęcie jest wymagane do rejestracji
           none: Nikt nie może się zarejestrować
           open: Każdy może się zarejestrować
+        warning_hint: Polecamy "Przyjęcie jest wymagane do rejestracji" chyba że masz pewność, że twój zespół moderacyjny może szybko obsłużyć spam i złośliwe rejestracje.
       security:
         authorized_fetch: Wymagaj uwierzytelnienia od sfederowanych serwerów
         authorized_fetch_hint: Wymaganie uwierzytelnienia ze sfederowanych serwerów pozwala na ściślejsze wymuszanie bloków z poziomu użytkowników i serwera, ale jest wolniejsze, redukuje zasięg odpowiedzi, i może być niekompatybilne z niektórymi sfederowanymi usługami. Nie chroni również publicznych kont i wpisów przed oddanymi użytkownikami.
@@ -1002,6 +1008,9 @@ pl:
       title: Webhooki
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Z powodu braku niedawnych działań moderacyjnych, rejestracje na %{instance} wymagają ręcznej weryfikacji (by uniknąć dystrybucji spamu itp.). W dowolnym momencie możesz przywrócić politykę otwartej rejestracji.
+      subject: "%{instance} zostało automatycznie przełączone na zatwierdzanie rejestracji"
     new_appeal:
       actions:
         delete_statuses: aby usunąć ich wpisy
@@ -1542,7 +1551,6 @@ pl:
     administration_emails: Administracyjne powiadomienia e-mail
     email_events: 'Powiadamiaj e-mailem o:'
     email_events_hint: 'Wybierz wydarzenia, o których chcesz otrzymywać powiadomienia:'
-    other_settings: Inne ustawienia powiadomień
   number:
     human:
       decimal_units:
@@ -1598,6 +1606,9 @@ pl:
     errors:
       limit_reached: Przekroczono limit różnych reakcji
       unrecognized_emoji: nie jest znanym emoji
+  redirects:
+    prompt: Kliknij ten link jeżeli mu ufasz.
+    title: Opuszczasz %{instance}.
   relationships:
     activity: Aktywność konta
     confirm_follow_selected_followers: Czy na pewno chcesz obserwować wybranych obserwujących?
@@ -1660,6 +1671,7 @@ pl:
       unknown_browser: Nieznana Przeglądarka
       weibo: Weibo
     current_session: Obecna sesja
+    date: Data
     description: "%{browser} na %{platform}"
     explanation: Przeglądarki z aktywną sesją Twojego konta.
     ip: Adres IP
@@ -1696,14 +1708,26 @@ pl:
     import: Importowanie danych
     import_and_export: Import i eksport
     migrate: Migracja konta
-    notifications: Powiadomienia
+    notifications: Powiadomienia e-mail
     preferences: Preferencje
     profile: Profil
     relationships: Obserwowani i obserwujący
+    severed_relationships: Zerwane związki
     statuses_cleanup: Automatyczne usuwanie wpisów
     strikes: Ostrzeżenia moderacyjne
     two_factor_authentication: Uwierzytelnianie dwuetapowe
     webauthn_authentication: Klucze bezpieczeństwa
+  severed_relationships:
+    download: Pobierz (%{count})
+    event_type:
+      account_suspension: Zawieszenie konta (%{target_name})
+      domain_block: Zawieszenie serwera (%{target_name})
+      user_domain_block: Zablokowano %{target_name}
+    lost_followers: Utraceni obserwujący
+    lost_follows: Utracone obserwowania
+    preamble: Możesz stracić obserwowania i obserwujących kiedy zablokujesz domenę albo kiedy twoi moderatorzy postanowią zawiesić obcy serwer. W tym wypadku będziesz móc pobrać listę zerwanych związków do przejrzenia i potencjalnego importu na innym serwerze.
+    purged: Informacje o tym serwerze zostały wyczyszczone przez administratora twojego serwera.
+    type: Zdarzenie
   statuses:
     attached:
       audio:
@@ -1753,8 +1777,6 @@ pl:
         other: "%{count} głosy"
       vote: Głosuj
     show_more: Pokaż więcej
-    show_newer: Pokaż nowsze
-    show_older: Pokaż starsze
     show_thread: Pokaż wątek
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1811,6 +1833,7 @@ pl:
     contrast: Mastodon (Wysoki kontrast)
     default: Mastodon (Ciemny)
     mastodon-light: Mastodon (Jasny)
+    system: Automatyczny (odpowiadający motywowi systemu)
   time:
     formats:
       default: "%d. %b %Y, %H:%M"
@@ -1838,18 +1861,27 @@ pl:
     webauthn: Klucze bezpieczeństwa
   user_mailer:
     appeal_approved:
-      action: Przejdź do swojego konta
+      action: Ustawienia Konta
       explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało zatwierdzone. Twoje konto jest ponownie w dobrej kondycji.
       subject: Twoje odwołanie z dnia %{date} zostało zatwierdzone
+      subtitle: Reputacja twojego konta została przywrócona.
       title: Odwołanie zatwierdzone
     appeal_rejected:
       explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało odrzucone.
       subject: Twoje odwołanie z dnia %{date} zostało odrzucone
+      subtitle: Twoje odwołanie zostało odrzucone.
       title: Odwołanie odrzucone
     backup_ready:
-      explanation: Zażądałeś pełnej kopii zapasowej konta na Mastodonie. Jest ona dostępna do pobrania!
+      explanation: Zamówiono pełną kopię zapasową twojego konta Mastodon.
+      extra: Gotowe do pobrania!
       subject: Twoje archiwum jest gotowe do pobrania
       title: Odbiór archiwum
+    failed_2fa:
+      details: 'Oto szczegóły próby logowania:'
+      explanation: Ktoś próbował zalogować się na twoje konto, ale nie przeszedł drugiego etapu autoryzacji.
+      further_actions_html: Jeśli to nie ty, polecamy natychmiastowo %{action}, bo może ono być narażone.
+      subject: Błąd drugiego etapu uwierzytelniania
+      title: Nieudane uwierzytelnienie w drugim etapie
     suspicious_sign_in:
       change_password: zmień hasło
       details: 'Oto szczegóły logowania:'
@@ -1889,13 +1921,46 @@ pl:
         silence: Konto ograniczone
         suspend: Konto zawieszone
     welcome:
-      edit_profile_action: Skonfiguruj profil
-      edit_profile_step: Możesz dostosować profil wysyłając awatar, zmieniając wyświetlaną nazwę i o wiele więcej. Jeżeli chcesz, możesz również włączyć przeglądanie i ręczne akceptowanie nowych próśb o możliwość obserwacji Twojego profilu.
+      apps_android_action: Pobierz z Google Play
+      apps_ios_action: Pobierz z App Store
+      apps_step: Pobierz oficjalne aplikacje.
+      apps_title: Aplikacje Mastodon
+      checklist_subtitle: 'Aby porządnie rozpocząć użytkowanie Mastodona:'
+      checklist_title: Powitalna lista kontrolna
+      edit_profile_action: Personalizuj
+      edit_profile_step: Inni użytkownicy są bardziej skłonni do interakcji z Tobą jeśli posiadasz wypełniony profil.
+      edit_profile_title: Spersonalizuj swój profil
       explanation: Kilka wskazówek, które pomogą Ci rozpocząć
-      final_action: Zacznij pisać
-      final_step: 'Zacznij tworzyć! Nawet jeżeli nikt Cię nie obserwuje, Twoje publiczne wiadomości będą widziane przez innych, na przykład na lokalnej osi czasu i w hashtagach. Możesz też utworzyć wpis wprowadzający używając hashtagu #introductions.'
-      full_handle: Twój pełny adres
-      full_handle_hint: Ten adres możesz podać znajomym, aby mogli skontaktować się z Tobą lub zacząć obserwować z innego serwera.
+      feature_action: Dowiedz się więcej
+      feature_audience: Mastodon zapewnia ci unikalne możliwości docierania do twojego grona odbiorców bez żadnych pośredników. Postawiony na własnej infrastrukturze, Mastodon pozwala ci obserwować i być obserwowanym z dowolnego innego serwera Mastodona. Nikt, poza tobą samym(-ą), nie ma nad tym kontroli.
+      feature_audience_title: Buduj swoją publiczność z pewnością
+      feature_control: Sam(a) wiesz najlepiej, co chcesz widzieć na swojej osi czasu. Brak algorytmów i reklam, które marnują twój cenny czas. Obserwuj dowolne osoby z dowolnego serwera Mastodona przy pomocy jednego konta i otrzymuj ich wpisy w kolejności chronologicznej. Każdy zasługuje na własny kąt w internecie.
+      feature_control_title: Miej kontrolę nad swoją osią czasu
+      feature_creativity: Mastodon obsługuje wpisy audio, wideo oraz zdjęcia, jak również opisy zdjęć na potrzeby dostępności, ankiety, ostrzeżenia dotyczące treści, animowane awatary, niestandardowe emoji, kontrolę miniatur zdjęć i więcej, aby pomóc Ci wyrażać siebie. Bez względu na to, czy dzielisz się swoją sztuką, muzyką czy podcastem, Mastodon jest dla ciebie.
+      feature_creativity_title: Niezrównana kreatywność
+      feature_moderation: Mastodon oddaje w twoje ręce prawo podejmowania decyzji. Każdy serwer tworzy własne zasady i regulacje, które są egzekwowane lokalnie a nie odgórnie jak w przypadku korporacyjnych mediów społecznościowych. Czyni to Mastodona najbardziej elastyczną platformą dla różnych grup ludzi z różnymi potrzebami. Dołącz do serwera, z którego zasadami zgadzasz się najbardziej, lub stwórz swój własny.
+      feature_moderation_title: Moderacja we właściwy sposób
+      follow_action: Obserwuj
+      follow_step: Zarządzasz swoim własnym kanałem. Wypełnij go interesującymi ludźmi.
+      follow_title: Spersonalizuj swoją stronę główną
+      follows_subtitle: Obserwuj dobrze znane konta
+      follows_title: Kogo obserwować
+      follows_view_more: Zobacz więcej osób do obserwowania
+      hashtags_recent_count:
+        few: "%{people} osoby w ostatnie 2 dni"
+        many: "%{people} osób w ostatnie 2 dni"
+        one: "%{people} osoba w ostatnie 2 dni"
+        other: "%{people} osób w ostatnie 2 dni"
+      hashtags_subtitle: Zobacz, co było popularne przez ostatnie 2 dni
+      hashtags_title: Popularne hashtagi
+      hashtags_view_more: Zobacz więcej popularnych hashtagów
+      post_action: Utwórz wpis
+      post_step: Przywitaj się ze światem.
+      post_title: Utwórz swój pierwszy post
+      share_action: Udostępnij
+      share_step: Poinformuj swoich przyjaciół jak znaleźć cię na Mastodonie.
+      share_title: Udostępnij swój profil
+      sign_in_action: Zaloguj się
       subject: Witaj w Mastodonie
       title: Witaj na pokładzie, %{name}!
   users:
@@ -1903,6 +1968,7 @@ pl:
     go_to_sso_account_settings: Przejdź do ustawień konta dostawcy tożsamości
     invalid_otp_token: Kod uwierzytelniający jest niepoprawny
     otp_lost_help_html: Jeżeli utracisz dostęp do obu, możesz skontaktować się z %{email}
+    rate_limited: Zbyt wiele prób uwierzytelnienia. Spróbuj ponownie później.
     seamless_external_login: Zalogowano z użyciem zewnętrznej usługi, więc ustawienia hasła i adresu e-mail nie są dostępne.
     signed_in_as: 'Zalogowano jako:'
   verification:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2c485283b1..60730d53e9 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -597,6 +597,9 @@ pt-BR:
       actions_description_html: Decida que medidas tomar para resolver esta denúncia. Se você decidir punir a conta denunciada, ela receberá uma notificação por e-mail, exceto quando for selecionada a categoria <strong>spam</strong> for selecionada.
       actions_description_remote_html: Decida quais medidas tomará para resolver esta denúncia. Isso só afetará como <strong>seu servidor</strong> se comunica com esta conta remota e manipula seu conteúdo.
       add_to_report: Adicionar mais à denúncia
+      already_suspended_badges:
+        local: Já suspenso neste servidor
+        remote: Já suspenso em seu servidor
       are_you_sure: Você tem certeza?
       assign_to_self: Atribuir para si
       assigned: Moderador responsável
@@ -748,6 +751,7 @@ pt-BR:
         desc_html: Isso é baseado em scripts externos de hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, <strong>isso pode tornar o processo de registro significativamente menos acessível para algumas pessoas (especialmente deficientes)</strong>. Por estas razões, favor considerar medidas alternativas como o registro baseado em aprovação ou em convite.
         title: Exigir que novos usuários resolvam um CAPTCHA para confirmar sua conta
       content_retention:
+        danger_zone: Zona de perigo
         preamble: Controlar como o conteúdo gerado pelo usuário é armazenado no Mastodon.
         title: Retenção de conteúdo
       default_noindex:
@@ -767,6 +771,7 @@ pt-BR:
         disabled: Para ninguém
         users: Para usuários locais logados
       registrations:
+        moderation_recommandation: Por favor, certifique-se de ter uma equipe de moderação adequada e reativa antes de abrir as inscrições para todos!
         preamble: Controle quem pode criar uma conta no seu servidor.
         title: Inscrições
       registrations_mode:
@@ -774,6 +779,7 @@ pt-BR:
           approved: Aprovação necessária para criar conta
           none: Ninguém pode criar conta
           open: Qualquer um pode criar conta
+        warning_hint: Recomendamos o uso de "Aprovação necessária para se cadastrar", a menos que você esteja confiante de que sua equipe de moderação pode lidar com spam e registros maliciosos em tempo hábil.
       security:
         authorized_fetch: Exigir autenticação por parte de servidores federados
         authorized_fetch_hint: Exigir autenticação de servidores federados permite uma aplicação mais rigorosa de bloqueios tanto de nível de usuário como de servidor. No entanto, isso traz como custo uma penalidade no desempenho, reduz o alcance das suas respostas e pode introduzir problemas de compatibilidade com alguns serviços federados. Além disso, não impedirá atores dedicados de consultar suas publicações e contas públicas.
@@ -966,6 +972,9 @@ pt-BR:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para exigir revisão manual, para evitar que %{instance} seja usada como uma plataforma para potenciais atores mal-intencionados. Você pode alterá-la de volta para inscrições abertas a qualquer momento.
+      subject: As inscrições para %{instance} foram automaticamente alteradas para requerer aprovação
     new_appeal:
       actions:
         delete_statuses: para excluir suas publicações
@@ -1490,7 +1499,6 @@ pt-BR:
     administration_emails: Notificações por e-mail sobre administração
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
-    other_settings: Outras opções para notificações
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ pt-BR:
     errors:
       limit_reached: Limite de reações diferentes atingido
       unrecognized_emoji: não é um emoji reconhecido
+  redirects:
+    prompt: Se você confia neste link, clique nele para continuar.
+    title: Você está saindo de %{instance}.
   relationships:
     activity: Atividade da conta
     confirm_follow_selected_followers: Tem certeza que deseja seguir os seguidores selecionados?
@@ -1608,6 +1619,7 @@ pt-BR:
       unknown_browser: Navegador desconhecido
       weibo: Weibo
     current_session: Sessão atual
+    date: Data
     description: "%{browser} em %{platform}"
     explanation: Estes são os navegadores que estão conectados com a sua conta Mastodon.
     ip: IP
@@ -1644,14 +1656,26 @@ pt-BR:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
+    severed_relationships: Relacionamentos rompidos
     statuses_cleanup: Exclusão automatizada de publicações
     strikes: Avisos de moderação
     two_factor_authentication: Autenticação de dois fatores
     webauthn_authentication: Chaves de segurança
+  severed_relationships:
+    download: Download  %{count}
+    event_type:
+      account_suspension: Suspensão da conta (%{target_name})
+      domain_block: Suspensão do servidor (%{target_name})
+      user_domain_block: Você bloqueou %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Seguidores perdidos
+    preamble: Você poderá perder seguidores e seguidores quando bloquear um domínio ou quando os seus moderadores decidirem suspender um servidor remoto. Quando isso acontecer, você poderá baixar listas de relações desfeitas, a serem inspecionadas e possivelmente importadas para outro servidor.
+    purged: As informações sobre este servidor foram eliminadas pelos administradores do seu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ pt-BR:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
-    show_newer: Mostrar mais recentes
-    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,6 +1769,7 @@ pt-BR:
     contrast: Mastodon  (Alto contraste)
     default: Mastodon (Noturno)
     mastodon-light: Mastodon (Diurno)
+    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
@@ -1774,18 +1797,27 @@ pt-BR:
     webauthn: Chaves de segurança
   user_mailer:
     appeal_approved:
-      action: Acessar perfil
+      action: Configurações da conta
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi aprovada. Sua conta está novamente em situação regular.
       subject: Sua revisão de %{date} foi aprovada
+      subtitle: Sua conta está novamente em boa situação.
       title: Revisão aprovada
     appeal_rejected:
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi rejeitada.
       subject: Sua revisão de %{date} foi rejeitada
+      subtitle: Sua revisão foi rejeitada.
       title: Revisão rejeitada
     backup_ready:
-      explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
+      explanation: Você solicitou um ‘backup’ completo da sua conta Mastodon.
+      extra: Agora está pronto para baixar!
       subject: Seu arquivo está pronto para ser baixado
       title: Baixar arquivo
+    failed_2fa:
+      details: 'Aqui estão os detalhes da tentativa de acesso:'
+      explanation: Alguém tentou entrar em sua conta, mas forneceu um segundo fator de autenticação inválido.
+      further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois ela pode ser comprometida.
+      subject: Falha na autenticação do segundo fator
+      title: Falha na autenticação do segundo fator
     suspicious_sign_in:
       change_password: Altere sua senha
       details: 'Aqui estão os detalhes do acesso:'
@@ -1825,13 +1857,44 @@ pt-BR:
         silence: Conta silenciada
         suspend: Conta banida
     welcome:
-      edit_profile_action: Configurar perfil
-      edit_profile_step: Você pode personalizar seu perfil enviando uma foto de perfil, mudando seu nome de exibição e mais. Você pode optar por revisar novos seguidores antes que eles possam te seguir.
+      apps_android_action: Disponível no Google Play
+      apps_ios_action: Disponível na App Store
+      apps_step: Baixe nossos aplicativos oficiais.
+      apps_title: Apps Mastodon
+      checklist_subtitle: 'Vamos começar nesta nova fronteira social:'
+      checklist_title: Lista de verificação de boas-vindas
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumente suas interações tendo um perfil completo.
+      edit_profile_title: Customize seu perfil
       explanation: Aqui estão algumas dicas para você começar
-      final_action: Comece a publicar
-      final_step: 'Comece a postar! Mesmo sem seguidores, suas postagens públicas podem ser vistas pelos outros, por exemplo, na linha do tempo local ou nas hashtags. Você pode querer fazer uma introdução usando a hashtag #introduções.'
-      full_handle: Seu nome de usuário completo
-      full_handle_hint: Isso é o que você compartilha com seus amigos para que eles possam te mandar mensagens ou te seguir a partir de outro servidor.
+      feature_action: Saiba mais
+      feature_audience: O Mastodon oferece a você uma oportunidade única de gerenciar seu público sem intermediários. O Mastodon implantado em sua própria infraestrutura permite que você siga e seja seguido por qualquer outro servidor Mastodon online e está única e exclusivamente sob o seu controle.
+      feature_audience_title: Construa confiança com seu público
+      feature_control: Você sabe o que deseja ver na sua página inicial. Sem algoritmos ou anúncios para desperdiçar seu tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba suas postagens em ordem cronológica, e faça o seu cantinho na internet um pouco mais a sua cara.
+      feature_control_title: Fique no controle da sua própria linha do tempo
+      feature_creativity: Mastodon oferece suporte a postagens de áudio, vídeo e imagem, descrições de acessibilidade, enquetes, avisos de conteúdo, avatares animados, emojis personalizados, recorte de miniaturas e muito mais, para ajudá-lo a se expressar online. Seja você publicando sua arte, sua música ou seu podcast, o Mastodon está lá para você.
+      feature_creativity_title: Criatividade inigualável
+      feature_moderation: Mastodon devolve a tomada de decisão para suas mãos. Cada servidor cria suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como nas redes sociais corporativas, tornando-o o mais flexível em responder às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda, ou hospede o seu próprio.
+      feature_moderation_title: Moderando como deve ser
+      follow_action: Seguir
+      follow_step: Seguir pessoas interessantes é do que trata Mastodon.
+      follow_title: Personalize sua página inicial
+      follows_subtitle: Siga contas conhecidas
+      follows_title: Quem seguir
+      follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count:
+        one: "%{people} Pessoas nos últimos 2 dias"
+        other: "%{people} pessoas nos últimos 2 dias"
+      hashtags_subtitle: Explorar o que está em alta nos últimos 2 dias
+      hashtags_title: Hashtags em alta
+      hashtags_view_more: Ver mais hashtags em alta
+      post_action: Escrever
+      post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
+      post_title: Crie sua primeira publicação
+      share_action: Compartilhar
+      share_step: Deixe seus amigos saberem como te encontrar no Mastodon.
+      share_title: Compartilhe seu perfil do Mastodon
+      sign_in_action: Entrar
       subject: Boas-vindas ao Mastodon
       title: Boas vindas, %{name}!
   users:
@@ -1839,6 +1902,7 @@ pt-BR:
     go_to_sso_account_settings: Vá para as configurações de conta do seu provedor de identidade
     invalid_otp_token: Código de dois fatores inválido
     otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
+    rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
     seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
     signed_in_as: 'Entrou como:'
   verification:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 111f0fa8ee..0c2e6cfd6d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -597,6 +597,9 @@ pt-PT:
       actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
       actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como <strong>o seu</strong> servido comunica com esta conta remota e gere o seu conteúdo.
       add_to_report: Adicionar mais à denúncia
+      already_suspended_badges:
+        local: Já suspenso neste servidor
+        remote: Já suspenso no servidor deles
       are_you_sure: Tem a certeza?
       assign_to_self: Atribuída a mim
       assigned: Atribuída ao moderador
@@ -748,6 +751,7 @@ pt-PT:
         desc_html: Isto depende de scripts externos da hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, <strong>isto pode tornar o processo de registo menos acessível para algumas pessoas (especialmente as com limitações físicas)</strong>. Por isso, considere medidas alternativas tais como registo mediante aprovação ou sob convite.
         title: Requerer que novos utilizadores resolvam um CAPTCHA para confirmar a sua conta
       content_retention:
+        danger_zone: Zona de perigo
         preamble: Controle como o conteúdo gerado pelos utilizadores é armazenado no Mastodon.
         title: Retenção de conteúdo
       default_noindex:
@@ -767,6 +771,7 @@ pt-PT:
         disabled: Para ninguém
         users: Para utilizadores locais que se encontrem autenticados
       registrations:
+        moderation_recommandation: Por favor, certifique-se de que você tem uma equipe de moderação adequada e reativa antes de abrir os registros para todos!
         preamble: Controle quem pode criar uma conta no seu servidor.
         title: Inscrições
       registrations_mode:
@@ -774,6 +779,7 @@ pt-PT:
           approved: Registo sujeito a aprovação
           none: Ninguém se pode registar
           open: Qualquer pessoa se pode registar
+        warning_hint: Recomendamos o uso de "Aprovação necessária para se cadastrar", a menos que você esteja confiante de que sua equipe de moderação pode lidar com spam e registros maliciosos em tempo hábil.
       security:
         authorized_fetch: Exigir autenticação de servidores federados
         authorized_fetch_hint: Exigir autenticação de servidores federados permite uma aplicação mais rigorosa de bloqueios tanto ao nível do utilizador como do servidor. No entanto, isso é feito à custa de uma diminuição de desempenho, reduz o alcance das suas respostas e pode introduzir problemas de compatibilidade com alguns serviços federados. Além disso, isso não impede os atores mais empenhados de aceder às suas publicações e contas públicas.
@@ -966,6 +972,9 @@ pt-PT:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Devido à falta de atividade recente dos moderadores, as inscrições em %{instance} foram automaticamente alteradas para requererem revisão manual, para evitar que %{instance} seja utilizada como plataforma para potenciais maus atores. Pode voltar a alterar para inscrições abertas em qualquer altura.
+      subject: As incrições em %{instance} foram automaticamente alteradas para requererem aprovação
     new_appeal:
       actions:
         delete_statuses: para eliminar as suas publicações
@@ -1490,7 +1499,6 @@ pt-PT:
     administration_emails: Notificções administrativas por e-mail
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os casos para os quais deseja receber notificações:'
-    other_settings: Outras opções de notificações
   number:
     human:
       decimal_units:
@@ -1546,6 +1554,9 @@ pt-PT:
     errors:
       limit_reached: Alcançado limite de reações diferentes
       unrecognized_emoji: não é um emoji reconhecido
+  redirects:
+    prompt: Se confia nesta hiperligação, clique nela para continuar.
+    title: Está a deixar %{instance}.
   relationships:
     activity: Atividade da conta
     confirm_follow_selected_followers: Tem a certeza que deseja seguir os seguidores selecionados?
@@ -1608,6 +1619,7 @@ pt-PT:
       unknown_browser: Navegador Desconhecido
       weibo: Weibo
     current_session: Sessão atual
+    date: Data
     description: "%{browser} em %{platform}"
     explanation: Estes são os navegadores que estão conectados com a tua conta do Mastodon.
     ip: IP
@@ -1644,14 +1656,26 @@ pt-PT:
     import: Importar
     import_and_export: Importar e exportar
     migrate: Migração de conta
-    notifications: Notificações
+    notifications: Notificações por e-mail
     preferences: Preferências
     profile: Perfil
     relationships: Seguindo e seguidores
+    severed_relationships: Relações cessadas
     statuses_cleanup: Remoção automática da publicação
     strikes: Punições de moderação
     two_factor_authentication: Autenticação em duas etapas
     webauthn_authentication: Chaves de segurança
+  severed_relationships:
+    download: Transferir (%{count})
+    event_type:
+      account_suspension: Suspensão de conta (%{target_name})
+      domain_block: Suspensão de servidor (%{target_name})
+      user_domain_block: Bloqueou %{target_name}
+    lost_followers: Seguidores perdidos
+    lost_follows: Pessoas que segue perdidas
+    preamble: Pode perder seguidores e pessoas que segue quando bloqueia um domínio ou quando os seus moderadores decidem suspender um servidor remoto. Quando isso acontecer, poderá descarregar listas de relações cessadas, para serem inspeccionadas e possivelmente importadas para outro servidor.
+    purged: Informações sobre este servidor foram purgadas pelos administradores do seu servidor.
+    type: Evento
   statuses:
     attached:
       audio:
@@ -1689,8 +1713,6 @@ pt-PT:
         other: "%{count} votos"
       vote: Votar
     show_more: Mostrar mais
-    show_newer: Mostrar mais recentes
-    show_older: Mostrar mais antigos
     show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,6 +1769,7 @@ pt-PT:
     contrast: Mastodon (Elevado contraste)
     default: Mastodon (Escuro)
     mastodon-light: Mastodon (Claro)
+    system: Automático (usar tema do sistema)
   time:
     formats:
       default: "%H:%M em %d de %b de %Y"
@@ -1774,18 +1797,27 @@ pt-PT:
     webauthn: Chaves de segurança
   user_mailer:
     appeal_approved:
-      action: Ir para a sua conta
+      action: Configurações de Conta
       explanation: O recurso à reprimenda contra a sua conta de %{strike_date}, enviado a %{appeal_date}, foi deferido. A sua conta encontra-se novamente em situação regular.
       subject: O seu recurso de %{date} foi deferido
+      subtitle: A sua conta está em situação regular novamente.
       title: Recurso deferido
     appeal_rejected:
       explanation: O recurso à punição contra a sua conta de %{strike_date}, submetido em %{appeal_date}, foi indeferido.
       subject: O seu recurso de %{date} foi indeferido
+      subtitle: O seu recurso foi rejeitado.
       title: Recurso indeferido
     backup_ready:
-      explanation: Pediu uma cópia integral de salvaguarda da sua conta Mastodon. Já está pronta para descarregar!
+      explanation: Pediu uma cópia completa da sua conta Mastodon.
+      extra: Está pronta para transferir!
       subject: O seu arquivo está pronto para descarregar
       title: Arquivo de ficheiros
+    failed_2fa:
+      details: 'Aqui estão os detalhes da tentativa de entrada:'
+      explanation: Alguém tentou entrar em sua conta mas forneceu um segundo fator de autenticação inválido.
+      further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois pode ter sido comprometido.
+      subject: Falha na autenticação do segundo fator
+      title: Falha na autenticação do segundo fator
     suspicious_sign_in:
       change_password: alterar a sua palavra-passe
       details: 'Eis os pormenores do início de sessão:'
@@ -1825,13 +1857,44 @@ pt-PT:
         silence: Conta limitada
         suspend: Conta suspensa
     welcome:
-      edit_profile_action: Configurar o perfil
-      edit_profile_step: Pode personalizar o seu perfil carregando uma imagem de perfil, alterando o nome a exibir, entre outras opções. Pode optar por rever os novos seguidores antes de estes o poderem seguir.
+      apps_android_action: Baixe no Google Play
+      apps_ios_action: Baixar na App Store
+      apps_step: Baixe nossos aplicativos oficiais.
+      apps_title: Apps Mastodon
+      checklist_subtitle: 'Vamos começar nesta nova fronteira social:'
+      checklist_title: Checklist de Boas-vindas
+      edit_profile_action: Personalizar
+      edit_profile_step: Aumente suas interações tendo um perfil completo.
+      edit_profile_title: Personalize seu perfil
       explanation: Aqui estão algumas dicas para começar
-      final_action: Começar a publicar
-      final_step: 'Comece a publicar! Mesmo sem seguidores, as suas mensagens públicas podem ser vistas por outros, como por exemplo na cronologia local e em etiquetas. Pense em apresentar-se usando a etiqueta #apresentações.'
-      full_handle: O seu nome completo
-      full_handle_hint: Isto é o que tem de facultar aos seus amigos para que eles lhe possam enviar mensagens ou segui-lo a partir de outra instância.
+      feature_action: Mais informações
+      feature_audience: Mastodon oferece uma possibilidade única de gerenciar seu público sem intermediários. O Mastodon implantado em sua própria infraestrutura permite que você siga e seja seguido de qualquer outro servidor Mastodon online e não esteja sob o controle de ninguém além do seu.
+      feature_audience_title: Construa seu público em confiança
+      feature_control: Você sabe melhor o que deseja ver no feed da sua casa. Sem algoritmos ou anúncios para desperdiçar seu tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba suas postagens em ordem cronológica, deixando seu canto da internet um pouco mais parecido com você.
+      feature_control_title: Fique no controle da sua própria linha do tempo
+      feature_creativity: Mastodon suporta postagens de áudio, vídeo e imagens, descrições de acessibilidade, enquetes, avisos de conteúdo, avatares animados, emojis personalizados, controle de corte de miniaturas e muito mais, para ajudá-lo a se expressar online. Esteja você publicando sua arte, sua música ou seu podcast, o Mastodon está lá para você.
+      feature_creativity_title: Criatividade inigualável
+      feature_moderation: Mastodon coloca a tomada de decisões de volta em suas mãos. Cada servidor cria as suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como as redes sociais corporativas, tornando-o mais flexível na resposta às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda ou hospede as suas próprias.
+      feature_moderation_title: Moderando como deve ser
+      follow_action: Seguir
+      follow_step: Seguir pessoas interessantes é do que trata Mastodon.
+      follow_title: Personalize seu feed residencial
+      follows_subtitle: Siga contas bem conhecidas
+      follows_title: Quem seguir
+      follows_view_more: Veja mais pessoas para seguir
+      hashtags_recent_count:
+        one: "%{people} pessoa nos últimos 2 dias"
+        other: "%{people} pessoas nos últimos 2 dias"
+      hashtags_subtitle: Explore o que está em tendência desde os últimos 2 dias
+      hashtags_title: Trending hashtags
+      hashtags_view_more: Ver mais hashtags em alta
+      post_action: Compor
+      post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
+      post_title: Faça a sua primeira publicação
+      share_action: Compartilhar
+      share_step: Diga aos seus amigos como te encontrar no Mastodon.
+      share_title: Compartilhe seu perfil de Mastodon
+      sign_in_action: Iniciar sessão
       subject: Bem-vindo ao Mastodon
       title: Bem-vindo a bordo, %{name}!
   users:
@@ -1839,6 +1902,7 @@ pt-PT:
     go_to_sso_account_settings: Ir para as definições de conta do seu fornecedor de identidade
     invalid_otp_token: Código de autenticação inválido
     otp_lost_help_html: Se perdeu o acesso a ambos, pode entrar em contacto com %{email}
+    rate_limited: Demasiadas tentativas de autenticação, tente novamente mais tarde.
     seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
     signed_in_as: 'Registado como:'
   verification:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 12c06505b8..cd54d51051 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -122,6 +122,8 @@ ro:
       removed_header_msg: S-a îndepărtat cu succes coperta utilizatorului %{username}
       resend_confirmation:
         already_confirmed: Acest utilizator este deja confirmat
+        send: Retrimite link-ul de confirmare
+        success: Link-ul de confirmare a fost trimis cu succes!
       reset: Resetează
       reset_password: Resetează parola
       resubscribe: Resubscrie-te
@@ -129,6 +131,7 @@ ro:
       search: Caută
       search_same_email_domain: Alţi utilizatori cu acelaşi domeniu de e-mail
       search_same_ip: Alţi utilizatori cu acelaşi IP
+      security: Securitate
       security_measures:
         only_password: Doar parola
         password_and_2fa: Parolă și Conectarea în 2 pași
@@ -189,6 +192,7 @@ ro:
         destroy_ip_block: Șterge regula IP
         destroy_status: Șterge starea
         destroy_unavailable_domain: Șterge Domeniul Indisponibil
+        destroy_user_role: Distruge Rolul
         disable_2fa_user: Dezactivează 2FA
         disable_custom_emoji: Dezactivează Emoji-urile Personalizate
         disable_sign_in_token_auth_user: Dezactivează Autentificarea prin Token E-mail pentru Utilizator
@@ -202,6 +206,7 @@ ro:
         reject_user: Respinge Utilizatorul
         remove_avatar_user: Elimină avatar
         reopen_report: Redeschide Raport
+        resend_user: Retrimite E-Mail-ul de Confirmare
         reset_password_user: Resetează Parola
         resolve_report: Rezolvă Raport
         sensitive_account: Cont Sensibil
@@ -213,7 +218,9 @@ ro:
         unsuspend_account: Anulează Suspendarea Contului
         update_announcement: Actualizare Anunț
         update_custom_emoji: Actualizare Emoji Personalizat
+        update_ip_block: Actualizați regula IP
         update_status: Actualizează Starea
+        update_user_role: Actualizare Rol
       actions:
         create_custom_emoji_html: "%{name} a încărcat noi emoji %{target}"
       deleted_account: cont șters
@@ -238,6 +245,7 @@ ro:
       unpublish: Revocă publicarea
       unpublished_msg: Publicarea anunțului a fost revocată cu succes!
       updated_msg: Anunț actualizat cu succes!
+    critical_update_pending: Actualizare critică în așteptare
     custom_emojis:
       assign_category: Atribuie o categorie
       by_domain: Domeniu
@@ -272,6 +280,37 @@ ro:
       update_failed_msg: Nu s-a putut actualiza emoticonul respectiv
       updated_msg: Emoticon actualizat cu succes!
       upload: Încarcă
+    dashboard:
+      active_users: utilizatori activi
+      interactions: interacțiuni
+      media_storage: Stocare media
+      new_users: utilizatori noi
+      opened_reports: rapoarte deschise
+      resolved_reports: rapoarte rezolvate
+      software: Software
+      sources: Surse de înscriere
+      space: Utilizare spațiu
+      title: Tablou de bord
+      top_languages: Limbi active de top
+      top_servers: Top servere active
+      website: Site web
+    disputes:
+      appeals:
+        empty: Niciun recurs găsit.
+        title: Recursuri
+    domain_allows:
+      export: Exportare
+      import: Importare
+    domain_blocks:
+      confirm_suspension:
+        cancel: Anulare
+        confirm: Suspendă
+        permanent_action: Anularea suspendării nu va restabili nicio dată sau relație.
+        preamble_html: Sunteți pe cale să suspendați <strong>%{domain}</strong> și subdomeniile sale.
+        remove_all_data: Acest lucru va elimina tot conținutul, media și datele profilului contului acestui domeniu de pe server.
+        stop_communication: Serverul tău nu va mai comunica cu aceste servere.
+        title: Confirmați blocarea domeniului pentru %{domain}
+        undo_relationships: Această acțiune va anula orice relație de urmărire între conturile acestor servere și ale tale.
     email_domain_blocks:
       delete: Șterge
       dns:
@@ -527,6 +566,7 @@ ro:
       blocking: Lista de blocare
       domain_blocking: Listă de blocare domenii
       following: Lista de urmărire
+      lists: Liste
       muting: Lista de ignorare
     upload: Încarcă
   invites:
@@ -583,6 +623,14 @@ ro:
       body: 'Postarea ta a fost impulsionată de %{name}:'
       subject: "%{name} ți-a impulsionat postarea"
       title: Impuls nou
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
   polls:
     errors:
       expired: Sondajul s-a încheiat deja
@@ -693,7 +741,6 @@ ro:
     recovery_instructions_html: Dacă îți pierzi vreodată accesul la telefon, poți folosi unul dintre codurile de recuperare de mai jos pentru a recâștiga accesul la contul tău. <strong>Păstrați codurile de recuperare în condiții de siguranță</strong>. De exemplu, le puteți tipări și stoca cu alte documente importante.
   user_mailer:
     backup_ready:
-      explanation: Ai solicitat o copie de rezervă completă a contului tău. Acum este gata pentru descărcare!
       subject: Arhiva ta este gata pentru descărcare
       title: Preluare arhivă
     warning:
@@ -708,11 +755,7 @@ ro:
         silence: Cont limitat
         suspend: Cont suspendat
     welcome:
-      edit_profile_action: Configurare profil
       explanation: Iată câteva sfaturi pentru a începe
-      final_action: Începe să postezi
-      full_handle: Numele tău complet
-      full_handle_hint: Asta este ceea ce vei putea spune prietenilor pentru a te putea contacta sau pentru a te urmării de pe un alt server.
       subject: Bine ai venit
       title: Bine ai venit la bord, %{name}!
   users:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b1c86494c7..85d8a7a540 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -439,6 +439,7 @@ ru:
       view: Посмотреть доменные блокировки
     email_domain_blocks:
       add_new: Добавить новую
+      allow_registrations_with_approval: Разрешить регистрацию с одобрением
       attempts_over_week:
         few: "%{count} попытки за последнюю неделю"
         many: "%{count} попыток за последнюю неделю"
@@ -1541,7 +1542,6 @@ ru:
     administration_emails: Уведомления администратора по электронной почте
     email_events: События для e-mail уведомлений
     email_events_hint: 'Выберите события, для которых вы хотели бы получать уведомления:'
-    other_settings: Остальные настройки уведомлений
   number:
     human:
       decimal_units:
@@ -1597,6 +1597,9 @@ ru:
     errors:
       limit_reached: Достигнут лимит разных реакций
       unrecognized_emoji: не является распознанным эмодзи
+  redirects:
+    prompt: Если вы доверяете этой ссылке, нажмите на нее, чтобы продолжить.
+    title: Вы покидаете %{instance}.
   relationships:
     activity: Активность учётной записи
     confirm_follow_selected_followers: Вы уверены, что хотите подписаться на выбранных подписчиков?
@@ -1659,6 +1662,7 @@ ru:
       unknown_browser: Неизвестный браузер
       weibo: Weibo
     current_session: Текущая сессия
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Здесь отображаются все браузеры, с которых выполнен вход в вашу учётную запись. Авторизованные приложения находятся в секции «Приложения».
     ip: IP
@@ -1695,7 +1699,6 @@ ru:
     import: Импорт
     import_and_export: Импорт и экспорт
     migrate: Миграция учётной записи
-    notifications: Уведомления
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики
@@ -1752,8 +1755,6 @@ ru:
         other: "%{count} голосов"
       vote: Голосовать
     show_more: Развернуть
-    show_newer: Показать более новое
-    show_older: Показать старые
     show_thread: Открыть обсуждение
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1837,18 +1838,27 @@ ru:
     webauthn: Ключи безопасности
   user_mailer:
     appeal_approved:
-      action: Перейти к своему профилю
+      action: Настройки аккаунта
       explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
       subject: Ваше обжалование от %{date} была одобрено
+      subtitle: Ваш аккаунт снова с хорошей репутацией.
       title: Обжалование одобрено
     appeal_rejected:
       explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись восстановлена.
       subject: Ваше обжалование от %{date} отклонено
+      subtitle: Ваша апелляция отклонена.
       title: Обжалование отклонено
     backup_ready:
-      explanation: Вы запросили архив всех данных вашей учётной записи Mastodon. Что ж, он готов к скачиванию.
+      explanation: Вы запросили полное резервное копирование вашей учетной записи Mastodon.
+      extra: Теперь он готов к загрузке!
       subject: Ваш архив готов к загрузке
       title: Архив ваших данных готов
+    failed_2fa:
+      details: 'Вот подробности попытки регистрации:'
+      explanation: Кто-то пытался войти в вашу учетную запись, но указал неверный второй фактор аутентификации.
+      further_actions_html: Если это не вы, мы рекомендуем %{action} немедленно принять меры, так как он может быть скомпрометирован.
+      subject: Сбой двухфакторной аутентификации
+      title: Сбой двухфакторной аутентификации
     suspicious_sign_in:
       change_password: сменить пароль
       details: 'Подробности о новом входе:'
@@ -1888,13 +1898,8 @@ ru:
         silence: На учётную запись наложены ограничения
         suspend: Учётная запись заблокирована
     welcome:
-      edit_profile_action: Настроить профиль
-      edit_profile_step: Вы можете настроить свой профиль добавляя аватарку, изменяя отображаемое имя и так далее. Вы можете вручную подтверждать подписчиков, перед тем как им будет разрешено подписаться на вас.
       explanation: Вот несколько советов для новичков
-      final_action: Начать постить
-      final_step: 'Начинайте постить! Даже без подписчиков, ваши публичные посты могут быть увиденными другими, например в локальной ленте или в хештегах. Вы можете представиться с хэштегом #introductions.'
-      full_handle: Ваше обращение
-      full_handle_hint: То, что Вы хотите сообщить своим друзьям, чтобы они могли написать Вам или подписаться с другого узла.
+      feature_action: Подробнее
       subject: Добро пожаловать в Mastodon
       title: Добро пожаловать на борт, %{name}!
   users:
@@ -1902,6 +1907,7 @@ ru:
     go_to_sso_account_settings: Перейти к настройкам сторонних аккаунтов учетной записи
     invalid_otp_token: Введен неверный код двухфакторной аутентификации
     otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
+    rate_limited: Слишком много попыток аутентификации, повторите попытку позже.
     seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
     signed_in_as: 'Выполнен вход под именем:'
   verification:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index d92b64783a..01c355794d 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -865,7 +865,6 @@ sc:
   notifications:
     email_events: Eventos pro notìficas cun posta eletrònica
     email_events_hint: 'Seletziona eventos pro is chi boles retzire notìficas:'
-    other_settings: Àteras configuratziones de notìficas
   number:
     human:
       decimal_units:
@@ -986,7 +985,6 @@ sc:
     import: Importatzione
     import_and_export: Importatzione e esportatzione
     migrate: Tràmuda de contu
-    notifications: Notìficas
     preferences: Preferèntzias
     profile: Profilu
     relationships: Gente chi sighis e sighiduras
@@ -1026,8 +1024,6 @@ sc:
         other: "%{count} votos"
       vote: Vota
     show_more: Ammustra·nde prus
-    show_newer: Ammustra is prus noos
-    show_older: Ammustra is prus betzos
     show_thread: Ammustra su tema
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1077,7 +1073,6 @@ sc:
     webauthn: Craes de seguresa
   user_mailer:
     backup_ready:
-      explanation: As pedidu una còpia de seguresa totale de su contu de Mastodon tuo. Immoe est pronta pro s'iscarrigamentu!
       subject: S'archìviu tuo est prontu pro èssere iscarrigadu
       title: Collida dae s'archìviu
     warning:
@@ -1093,11 +1088,7 @@ sc:
         silence: Contu limitadu
         suspend: Contu suspèndidu
     welcome:
-      edit_profile_action: Cunfigura su profilu
       explanation: Inoghe ddoe at una paja de impòsitos pro cumintzare
-      final_action: Cumintza a publicare
-      full_handle: Su nòmine utente intreu tuo
-      full_handle_hint: Custu est su chi dias nàrrere a is amistades tuas pro chi ti potzant imbiare messàgios o sighire dae un'àteru serbidore.
       subject: Ti donamus su benebènnidu a Mastodon
       title: Ti donamus su benebènnidu, %{name}!
   users:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index f77c4c7978..2a7b1e3e70 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1275,7 +1275,6 @@ sco:
   notifications:
     email_events: Events fir email notes
     email_events_hint: 'Pick events thit ye''r wantin tae get notes fir:'
-    other_settings: Ither notes settins
   number:
     human:
       decimal_units:
@@ -1408,7 +1407,6 @@ sco:
     import: Import
     import_and_export: Import an export
     migrate: Accoont flittin
-    notifications: Notes
     preferences: Preferences
     profile: Profile
     relationships: Follaes and follaers
@@ -1453,8 +1451,6 @@ sco:
         other: "%{count} votes"
       vote: Vote
     show_more: Shaw mair
-    show_newer: Shaw newer
-    show_older: Shaw aulder
     show_thread: Shaw threid
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1532,7 +1528,6 @@ sco:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Gang tae yer accoont
       explanation: The appeal o the strike agin yer accoont on %{strike_date} thit ye submittit on %{appeal_date} haes been approved. Yer accoont is ance again in guid staunnin.
       subject: Yer appeal fae %{date} haes been approved
       title: Appeal approved
@@ -1541,7 +1536,6 @@ sco:
       subject: Yer appeal fae %{date} haes been rejectit
       title: Appeal rejectit
     backup_ready:
-      explanation: Ye wantit a ful backup o yer Mastodon accoont. It's riddy fir tae doonload noo!
       subject: Yer archive is riddy fir doonload
       title: Archive takoot
     suspicious_sign_in:
@@ -1583,13 +1577,7 @@ sco:
         silence: Accoont limitit
         suspend: Accoont suspendit
     welcome:
-      edit_profile_action: Setup profile
-      edit_profile_step: Ye kin customize yer profile bi uploadin a profile picture, chyngin yer display nemm an mair. Ye kin opt-in fir tae luik ower new follaers afore they’re allooed tae follae ye.
       explanation: Here some tips fir tae get ye stertit
-      final_action: Stert postin
-      final_step: 'Stert postin! Even athout follaers, yer public posts kin stull be seen bi ithers, fir example on the local timeline or in hashtags. Ye mibbie want tae introduce yersel on the #introductions hashtag.'
-      full_handle: Yer ful haunnle
-      full_handle_hint: This is whit ye wad tell yer pals sae thit they kin message or follae ye fae anither server.
       subject: Welcome tae Mastodon, 'mon in
       title: Welcome aboord, %{name}!
   users:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 70aefafc11..f5e65fda8d 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1144,7 +1144,6 @@ si:
   notifications:
     email_events: ඊමේල් දැනුම්දීම් සඳහා සිදුවීම්
     email_events_hint: 'ඔබට දැනුම්දීම් ලැබීමට අවශ්‍ය සිදුවීම් තෝරන්න:'
-    other_settings: වෙනත් දැනුම්දීම් සැකසුම්
   number:
     human:
       decimal_units:
@@ -1275,7 +1274,6 @@ si:
     import: ආයාතය
     import_and_export: ආයාත හා නිර්යාත
     migrate: ගිණුම් සංක්‍රමණය
-    notifications: දැනුම්දීම්
     preferences: අභිප්‍රේත
     profile: ප්‍රසිද්ධ පැතිකඩ
     relationships: අනුගමන හා අනුගාමික
@@ -1317,8 +1315,6 @@ si:
         other: ඡන්ද %{count} යි
       vote: ඡන්දය
     show_more: තව පෙන්වන්න
-    show_newer: අලුත්ම පෙන්වන්න
-    show_older: පැරණි පෙන්වන්න
     show_thread: නූල් පෙන්වන්න
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1389,7 +1385,6 @@ si:
     webauthn: ආරක්‍ෂණ යතුරු
   user_mailer:
     appeal_approved:
-      action: ඔබගේ ගිණුමට යන්න
       explanation: ඔබ %{appeal_date} දින ඉදිරිපත් කළ %{strike_date} හි ඔබේ ගිණුමට එරෙහි වර්ජනයේ අභියාචනය අනුමත කර ඇත. ඔබගේ ගිණුම නැවත වරක් හොඳ තත්වයක පවතී.
       subject: "%{date} සිට ඔබගේ අභියාචනය අනුමත කර ඇත"
       title: අභියාචනය අනුමත කර ඇත
@@ -1398,7 +1393,6 @@ si:
       subject: "%{date} සිට ඔබගේ අභියාචනය ප්‍රතික්ෂේප කර ඇත"
       title: අභියාචනය ප්‍රතික්ෂේප විය
     backup_ready:
-      explanation: ඔබගේ මාස්ටඩන් ගිණුමේ පූර්ණ උපස්ථයක් ඉල්ලා ඇත. එය දැන් බාගැනීමට හැකිය!
       subject: ඔබගේ සංරක්ෂිතය බාගැනීමට සූදානම්ය
       title: සංරක්ෂිත රැගෙන යාම
     suspicious_sign_in:
@@ -1436,11 +1430,7 @@ si:
         silence: ගිණුම සීමා කර ඇත
         suspend: ගිණුම අත්හිටුවා ඇත
     welcome:
-      edit_profile_action: පැතිකඩ පිහිටුවන්න
       explanation: ඔබ ආරම්භ කිරීමට උපදෙස් කිහිපයක් මෙන්න
-      final_action: ලිපි පළ කරන්න
-      full_handle: ඔබේ සම්පූර්ණ හසුරුව
-      full_handle_hint: මෙය ඔබ ඔබේ මිතුරන්ට පවසනු ඇත, එවිට ඔවුන්ට වෙනත් සේවාදායකයකින් ඔබට පණිවිඩ යැවීමට හෝ අනුගමනය කිරීමට හැකිය.
       subject: මාස්ටඩන් වෙත පිළිගනිමු
       title: නැවට සාදරයෙන් පිළිගනිමු, %{name}!
   users:
diff --git a/config/locales/simple_form.af.yml b/config/locales/simple_form.af.yml
index 6c87a7a636..a7c449f86d 100644
--- a/config/locales/simple_form.af.yml
+++ b/config/locales/simple_form.af.yml
@@ -14,6 +14,8 @@ af:
     labels:
       defaults:
         locale: Koppelvlaktaal
+        new_password: Newe wagwoord
+        password: Wagwoord
       featured_tag:
         name: Hutsetiket
       form_admin_settings:
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index f354e5ba82..e409c39ae1 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -31,14 +31,12 @@ an:
         text: Nomás puetz apelar una amonestación una vegada
       defaults:
         autofollow: Los usuarios que se rechistren per medio d'a invitación te seguirán automaticament
-        avatar: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
         bot: Esta cuenta executa prencipalment accions automatizadas y podría no estar monitorizada
         context: Un u multiples contextos en os quals ha d'aplicar-se lo filtro
         current_password: Per razons de seguranza per favor ingrese la clau d'a cuenta actual
         current_username: Pa confirmar, per favor ingrese lo nombre d'usuario d'a cuenta actual
         digest: Solo ninviau dimpués d'un largo periodo d'inactividat y nomás si has recibiu mensaches personals entre la tuya ausencia
         email: Se le ninviará un correu de confirmación
-        header: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
         inbox_url: Copia la URL d'a pachina prencipal d'o relés que quiers utilizar
         irreversible: Las publicacions filtradas desapareixerán irreversiblement, mesmo si este filtro ye eliminau mas abance
         locale: L'idioma d'a interficie d'usuario, correus y notificacions push
@@ -68,13 +66,10 @@ an:
           warn: Amagar lo conteniu filtrau dezaga d'una alvertencia mencionando lo titol d'o filtro
       form_admin_settings:
         activity_api_enabled: Conteyo de publicacions locals, usuarios activos y nuevos rechistros en periodos semanals
-        backups_retention_period: Mantener los fichers d'usuario cheneraus entre lo numero de días especificau.
         bootstrap_timeline_accounts: Estas cuentas amaneixerán en a parte superior d'as recomendacions d'os nuevos usuarios.
         closed_registrations_message: Amostrau quan los rechistros son zarraus
-        content_cache_retention_period: Las publicacions d'atros servidors s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva. Esto puede estar irreversible.
         custom_css: Puetz aplicar estilos personalizaus a la versión web de Mastodon.
         mascot: Reemplaza la ilustración en a interficie web abanzada.
-        media_cache_retention_period: Los fichers multimedia descargaus s'eliminarán dimpués d'o numero especificau de días quan s'estableixca una valor positiva, y se redescargarán baixo demanda.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha trobau en o Fediverso. Aquí no s'incluye garra dato sobre si federas con un servidor determinau, nomás que lo tuyo servidor lo conoixe. Esto ye emplegau per los servicios que replegan estatisticas sobre la federación en un sentiu cheneral.
         profile_directory: Lo directorio de perfils lista a totz los usuarios que han optado per que la suya cuenta pueda estar descubierta.
         require_invite_text: Quan los rechistros requieren aprebación manual, fa obligatoria la dentrada de texto "Per qué quiers unir-te?" en cuenta d'opcional
@@ -223,7 +218,6 @@ an:
         backups_retention_period: Periodo de retención d'o fichero d'usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensache personalizau quan los rechistros no son disponibles
-        content_cache_retention_period: Periodo de retención de caché de conteniu
         custom_css: CSS personalizau
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Periodo de retención de caché multimedia
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 92e181a8ed..370667d48e 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -39,14 +39,14 @@ ar:
         text: يمكنك الطعن في عقوبة مرة واحدة فقط
       defaults:
         autofollow: سوف يتابعك تلقائيًا الأشخاص الذين يقومون بالتسجيل من خلال الدعوة
-        avatar: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
+        avatar: ملف WEBP أو PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تقليصه إلى %{dimensions} بيكسل
         bot: يقوم هذا الحساب أساسا بإجراءات آلية وقد لا يتم مراقبته
         context: واحد أو أكثر من السياقات التي يجب أن ينطبق عليها عامل التصفية
         current_password: لأسباب أمنية ، يرجى إدخال الكلمة السرية الخاصة بالحساب الحالي
         current_username: يرجى إدخال اسم المستخدم الخاص بالحساب الحالي قصد التأكيد
         digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
         email: سوف تتلقى رسالة إلكترونية للتأكيد
-        header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
+        header: ملف WEBP أو PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تقليصه إلى %{dimensions} بيكسل
         inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
         irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
         locale: لغة واجهة المستخدم و الرسائل الإلكترونية و الإشعارات
@@ -77,13 +77,15 @@ ar:
           warn: إخفاء المحتوى الذي تم تصفيته خلف تحذير يذكر عنوان الفلتر
       form_admin_settings:
         activity_api_enabled: عدد المنشورات المحلية و المستخدمين الناشطين و التسجيلات الأسبوعية الجديدة
-        backups_retention_period: الاحتفاظ بأرشيف المستخدم الذي تم إنشاؤه لعدد محدد من الأيام.
+        app_icon: WEBP أو PNG أو GIF أو JPG. يتجاوز أيقونة التطبيق الافتراضية على الجوالات مع أيقونة مخصصة.
+        backups_retention_period: للمستخدمين القدرة على إنشاء أرشيفات لمنشوراتهم لتحميلها في وقت لاحق. عند التعيين إلى قيمة موجبة، سيتم حذف هذه الأرشيف تلقائياً من وحدة تخزينك بعد عدد الأيام المحدد.
         bootstrap_timeline_accounts: سيتم تثبيت هذه الحسابات على قمة التوصيات للمستخدمين الجدد.
         closed_registrations_message: ما سيعرض عند إغلاق التسجيلات
-        content_cache_retention_period: سيتم حذف كافة المنشورات والمعاد نشرها من الخوادم الأخرى بعد عدد الأيام المحدد. قد لا تكون بعض المنشورات قابلة للاسترداد. كافة الفواصل المرجعية والمفضلات والمعاد نشرها ذات الصلة سوف تضيع ويستحيل التراجع عن هذا الإجراء.
+        content_cache_retention_period: سيتم حذف جميع المنشورات من الخوادم الأخرى (بما في ذلك التعزيزات والردود) بعد عدد الأيام المحدد، دون أي تفاعل محلي للمستخدم مع هذه المنشورات. وهذا يشمل المنشورات التي قام المستخدم المحلي بوضع علامة عليها كإشارات مرجعية أو المفضلة. وسوف تختفي أيضا الإشارات الخاصة بين المستخدمين من المثيلات المختلفة ويستحيل استعادتها. والغرض من استخدام هذا الإعداد هو مثيلات الغرض الخاص ويفسد الكثير من توقعات المستخدمين عند تنفيذها للاستخدام لأغراض عامة.
         custom_css: يمكنك تطبيق أساليب مخصصة على نسخة الويب من ماستدون.
+        favicon: WEBP أو PNG أو GIF أو JPG. يتجاوز أيقونة التطبيق المفضلة الافتراضية مع أيقونة مخصصة.
         mascot: تجاوز الرسوم التوضيحية في واجهة الويب المتقدمة.
-        media_cache_retention_period: سيتم حذف ملفات الوسائط التي تم تنزيلها بعد عدد الأيام المحدد عند تعيينها إلى قيمة موجبة، وإعادة تنزيلها عند الطلب.
+        media_cache_retention_period: ملفات الوسائط من المنشورات التي يقوم بها المستخدمون البعيدون يتم تخزينها في خادمك. عند التعيين إلى قيمة موجبة، سيتم حذف الوسائط بعد عدد الأيام المحدد. إذا كانت بيانات الوسائط مطلوبة بعد حذفها، فسيتم إعادة تحميلها إذا كان محتوى المصدر لا يزال متاحًا. بسبب القيود المفروضة على عدد المرات التي يتم فيها ربط بطاقات المعاينة لمواقع الطرف الثالث، يوصى بتعيين هذه القيمة إلى 14 يوماً على الأقل، أو لن يتم تحديث بطاقات معاينة الرابط عند الطلب قبل ذلك الوقت.
         peers_api_enabled: قائمة بأسماء النطاقات التي صادفها هذا الخادم في الفدرالية. لا توجد بيانات هنا حول ما إذا كنت تتحد مع خادم معين، فقط أن خادمك يعرف عنها. ويستخدم هذا الخدمات التي تجمع الإحصاءات المتعلقة بالاتحاد بشكل عام.
         profile_directory: دليل الملف الشخصي يسرد جميع المستخدمين الذين اختاروا الدخول ليكونوا قابلين للاكتشاف.
         require_invite_text: عندما تتطلب التسجيلات الموافقة اليدوية، اجعل إدخال النص "لماذا تريد الانضمام ؟" إلزاميا بدلا من اختياري
@@ -116,6 +118,7 @@ ar:
           sign_up_requires_approval: التسجيلات الجديدة سوف تتطلب موافقتك
         severity: اختر ما سيحدث مع الطلبات من هذا الـIP
       rule:
+        hint: اختياري. قدم المزيد من التفاصيل حول القاعدة
         text: صِف قانون أو شرط للمستخدمين على هذا الخادم. حاول أن تُبقيه قصير وبسيط
       sessions:
         otp: 'قم بإدخال رمز المصادقة بخطوتين الذي قام بتوليده تطبيق جهازك أو استخدم أحد رموز النفاذ الاحتياطية:'
@@ -242,7 +245,7 @@ ar:
         backups_retention_period: فترة الاحتفاظ بأرشيف المستخدم
         bootstrap_timeline_accounts: أوصي دائما بهذه الحسابات للمستخدمين الجدد
         closed_registrations_message: رسالة مخصصة عندما يكون التسجيل غير متاح
-        content_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
+        content_cache_retention_period: مدة الاحتفاظ بالمحتوى البعيد
         custom_css: سي أس أس CSS مخصص
         mascot: جالب حظ مخصص (قديم)
         media_cache_retention_period: مدة الاحتفاظ بالتخزين المؤقت للوسائط
@@ -299,6 +302,7 @@ ar:
           patch: إشعاري عند توفّر تحديثات التصحيح
         trending_tag: المتداولة الجديدة تتطلّب مراجعة
       rule:
+        hint: معلومات إضافية
         text: قانون
       settings:
         indexable: السماح لمحركات البحث بفهرسة صفحتك التعريفية
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 4ffc4bd166..d1950ab15f 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -2,6 +2,9 @@
 ast:
   simple_form:
     hints:
+      account:
+        note: 'Pues @mentar a otros perfiles o poner #etiquetes.'
+        unlocked: Los perfiles van ser a siguite ensin solicitar la to aprobación. Desmarca esta opción si quies revisar les solicitúes de siguimientu y escoyer si aceptales o refugales.
       admin_account_action:
         text_html: Opcional. Pues usar la sintaxis de los artículos ya amestar <a href="%{path}">alvertencies preconfiguraes</a> p'aforrar tiempu
         type_html: Escueyi qué facer con <strong>%{acct}</strong>
@@ -15,10 +18,8 @@ ast:
         text: Pues usar la sintaxis de los artículos. Ten en cuenta l'espaciu que l'anunciu va ocupar na pantalla del usuariu/a
       defaults:
         autofollow: Les persones que se rexistren pente la invitación van siguite automáticamente
-        avatar: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
         digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
-        header: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
         irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
         locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
         password: Usa polo menos 8 caráuteres
@@ -32,11 +33,9 @@ ast:
       featured_tag:
         name: 'Equí tán dalgunes de les etiquetes qu''usesti apocayá:'
       form_admin_settings:
-        backups_retention_period: Caltién los archivos xeneraos polos perfiles demientres el númberu de díes especificáu.
         closed_registrations_message: Apaez cuando'l rexistru ta desactiváu
         custom_css: Pues aplicar estilos personalizaos a la versión web de Mastodon.
         mascot: Anula la ilustración na interfaz web avanzada.
-        media_cache_retention_period: Los ficheros multimedia baxaos desaníciense dempués del númberu de díes especificáu al configurar un valor positivu, ya vuelven baxase baxo demanda.
         require_invite_text: Cuando los rexistros riquen una aprobación manual, el campu «¿Por qué quies xunite?» vuélvese obligatoriu
         site_extended_description: Cualesquier tipu d'información adicional que pueda ser útil pa visitantes ya pa perfiles rexistraos. El testu pue estructurase cola sintaxis de Mastodon.
         site_short_description: Un descripción curtia qu'ayuda a identificar de forma única al sirvidor. ¿Quién lu lleva?, ¿pa quién ye?
@@ -59,9 +58,11 @@ ast:
         chosen_languages: Namás los artículos de les llingües que marques son los que van apaecer nes llinies de tiempu públiques
     labels:
       account:
+        discoverable: Destacar el perfil ya los artículos nos algoritmos de descubrimientu
         fields:
           name: Etiqueta
           value: Conteníu
+        indexable: Incluyir los artículos públicos nos resultaos de busca
       account_warning_preset:
         title: Títulu
       admin_account_action:
@@ -131,7 +132,6 @@ ast:
       form_admin_settings:
         backups_retention_period: Periodu de retención de los archivos de los perfiles
         closed_registrations_message: Mensaxe personalizáu cuando'l rexistru nun ta disponible
-        content_cache_retention_period: Periodu de retención de la caché de conteníu
         media_cache_retention_period: Periodu de retención de la caché multimedia
         registrations_mode: Quién pue rexistrase
         require_invite_text: Riquir un motivu pa rexistrase
@@ -166,9 +166,13 @@ ast:
         pending_account: Una cuenta nueva precisa una revisión
         reblog: Daquién compartió'l to artículu
         report: Unvióse un informe nuevu
+        software_updates:
+          label: Hai disponible un anovamientu de Mastodon
         trending_tag: Una tendencia rique una revisión
       rule:
         text: Norma
+      settings:
+        indexable: Incluyir la páxina del perfil nos motores de busca
       tag:
         listable: Permitir qu'esta etiqueta apaeza nes busques ya nes suxerencies
         name: Etiqueta
@@ -176,6 +180,7 @@ ast:
         usable: Permitir que los artículos usen esta etiqueta
       user:
         role: Rol
+        time_zone: Fusu horariu
       user_role:
         name: Nome
         permissions_as_keys: Permisos
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index 7ad87cdd9f..f8000a1c81 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -39,14 +39,14 @@ be:
         text: Вы можаце абскардзіць рашэнне толькі адзін раз
       defaults:
         autofollow: Людзі, якія зарэгістраваліся праз запрашэнне, аўтаматычна падпішуцца на вас
-        avatar: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        avatar: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         bot: Паведаміць іншым, што гэты ўліковы запіс у асноўным выконвае аўтаматычныя дзеянні і можа не кантралявацца
         context: Адзін ці некалькі кантэкстаў, да якіх трэба прымяніць фільтр
         current_password: У мэтах бяспекі, калі ласка, увядзіце пароль бягучага ўліковага запісу
         current_username: Каб пацвердзіць, увядзіце, калі ласка імя карыстальніка бягучага ўліковага запісу
         digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
         email: Пацвярджэнне будзе выслана па электроннай пошце
-        header: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
+        header: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
         irreversible: Адфільтраваныя пасты прападуць незваротна, нават калі фільтр потым будзе выдалены
         locale: Мова карыстальніцкага інтэрфейсу, электронных паведамленняў і апавяшчэнняў
@@ -77,13 +77,10 @@ be:
           warn: Схаваць адфільтраваны кантэнт за папярэджаннем з назвай фільтру
       form_admin_settings:
         activity_api_enabled: Падлік лакальна апублікаваных пастоў, актыўных карыстальнікаў і новых рэгістрацый у тыдзень
-        backups_retention_period: Захоўваць створаныя архівы карыстальніка адзначаную колькасць дзён.
         bootstrap_timeline_accounts: Гэтыя ўліковыя запісы будуць замацаваны ў топе рэкамендацый для новых карыстальнікаў.
         closed_registrations_message: Паказваецца, калі рэгістрацыя закрытая
-        content_cache_retention_period: Допісы з іншых сервераў будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік. Гэта можа быць незваротным.
         custom_css: Вы можаце прымяняць карыстальніцкія стылі ў вэб-версіі Mastodon.
         mascot: Замяняе ілюстрацыю ў пашыраным вэб-інтэрфейсе.
-        media_cache_retention_period: Спампаваныя медыя будуць выдаляцца пасля выстаўленай колькасці дзён, калі выстаўлены станоўчы лік, і спампоўвацца нанова па запыце.
         peers_api_enabled: Спіс даменных імён, з якімі сутыкнуўся гэты сервер у федэсвеце. Дадзеныя аб тым, ці знаходзіцеся вы з пэўным серверам у федэрацыі, не ўключаныя, ёсць толькі тое, што ваш сервер ведае пра гэта. Гэта выкарыстоўваецца сэрвісамі, якія збіраюць статыстыку па федэрацыі ў агульным сэнсе.
         profile_directory: Дырэкторыя профіляў змяшчае спіс усіх карыстальнікаў, якія вырашылі быць бачнымі.
         require_invite_text: Калі рэгістрацыя патрабуе ручнога пацвержання, зрабіце поле "Чаму вы хочаце далучыцца?" абавязковым
@@ -116,6 +113,7 @@ be:
           sign_up_requires_approval: Новыя рэгістрацыі запатрабуюць вашага ўзгаднення
         severity: Абярыце, што будзе адбывацца з запытамі з гэтага IP
       rule:
+        hint: Неабавязкова. Пазначце дадатковыя звесткі аб правіле
         text: Апішыце правіла ці патрабаванне для карыстальнікаў на гэтым серверы. Імкніцеся зрабіць яго простым ды кароткім
       sessions:
         otp: 'Увядзіце код двухфактарнай аўтэнтыфікацыі з вашага тэлефона або адзін з кодаў аднаўлення:'
@@ -242,7 +240,6 @@ be:
         backups_retention_period: Працягласць захавання архіву карыстальніка
         bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
         closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
-        content_cache_retention_period: Працягласць захавання кэшу для змесціва
         custom_css: CSS карыстальніка
         mascot: Уласны маскот(спадчына)
         media_cache_retention_period: Працягласць захавання кэшу для медыя
@@ -299,6 +296,7 @@ be:
           patch: Апавяшчаць аб абнаўленнях з выпраўленнем памылак
         trending_tag: Новы трэнд патрабуе разгляду
       rule:
+        hint: Дадатковая інфармацыя
         text: Правіла
       settings:
         indexable: Індэксаваць профіль у пошукавых сістэмах
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 68e45ef47b..f14a21b0c7 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -9,7 +9,7 @@ bg:
         indexable: Вашите обществени публикации може да се появят в резултатите от търсене в Mastodon. Взаимодействалите с публикациите ви може да ги търсят независимо.
         note: 'Може да @споменавате други хора или #хаштагове.'
         show_collections: Хората ще може да разглеждат през вашите последвания и последователи. Хората, които сте следвали, ще видят, че ги следвате независимо от това.
-        unlocked: Хората ще може да ви следват без да се изисква одобрение. Размаркирайте, ако искате да преглеждате заявките за последване и изберете дали да приемете или отхвърлите новите последователи.
+        unlocked: Хората ще могат да ви последват без изискване на одобрение. Размаркирайте, ако искате да преглеждате заявките за последване и изберете дали да приемете или отхвърлите новите последователи.
       account_alias:
         acct: Посочете потребителско_име@домейн на акаунта си, от който искате да се преместите
       account_migration:
@@ -39,14 +39,14 @@ bg:
         text: Може да възразите срещу провинение само веднъж
       defaults:
         autofollow: Хората, които се регистрират чрез поканата, автоматично ще ви последват
-        avatar: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
+        avatar: WEBP, PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
         bot: Сигнализиране до другите, че акаунтът изпълнява предимно автоматизирани деяния и може да не се наблюдава
         context: Един или повече контексти, към които да се приложи филтърът
         current_password: От съображения за сигурност, въведете паролата на текущия акаунт
         current_username: Въведете потребителското име на текущия профил, за да потвърдите
         digest: Изпраща се само след дълъг период на бездействие и само ако сте получили лични съобщения във ваше отсъствие
         email: Ще ви се изпрати имейл за потвърждение
-        header: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
+        header: WEBP, PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
         inbox_url: Копирайте URL адреса от заглавната страница на предаващия сървър, който искате да използвате
         irreversible: Филтрираните публикации ще изчезнат безвъзвратно, дори филтърът да бъде премахнат по-късно
         locale: Езикът на потребителския интерфейс, известиятата по имейл и насочените известия
@@ -77,13 +77,15 @@ bg:
           warn: Скриване на филтрираното съдържание зад предупреждение, споменавайки заглавието на филтъра
       form_admin_settings:
         activity_api_enabled: Броят на местните публикувани публикации, дейни потребители и нови регистрации в седмични кофи
-        backups_retention_period: Задържане на породените потребителски архиви за определения брой дни.
+        app_icon: WEBP, PNG, GIF или JPG. Заменя подразбиращата се икона на приложението в мобилни устройства с произволна икона.
+        backups_retention_period: Потребителите имат способността да пораждат архиви от публикациите си за по-късно изтегляне. Задавайки положителна стойност, тези архиви самодейно ще се изтрият от хранилището ви след определения брой дни.
         bootstrap_timeline_accounts: Тези акаунти ще се закачат в горния край на препоръките за следване на нови потребители.
         closed_registrations_message: Показва се, когато е затворено за регистрации
-        content_cache_retention_period: Всички публикации и подсилвания от други сървъри ще се изтрият след определен брой дни. Някои публикации може да не се възстановят. Всички сродни отметки, любими и подсилвания също ще се загубят и невъзможно да се отмени.
+        content_cache_retention_period: Всички публикации от други сървъри, включително подсилвания и отговори, ще се изтрият след посочения брой дни, без да се взема предвид каквото и да е взаимодействие на местния потребител с тези публикации. Това включва публикации, които местния потребител е означил като отметки или любими. Личните споменавания между потребители от различни инстанции също ще се загубят и невъзможно да се възстановят. Употребата на тази настройка е предназначена за случаи със специално предназначение и разбива очакванията на много потребители, когато се изпълнява за употреба с общо предназначение.
         custom_css: Може да прилагате собствени стилове в уебверсията на Mastodon.
+        favicon: WEBP, PNG, GIF или JPG. Заменя стандартната сайтоикона на Mastodon с произволна икона.
         mascot: Замества илюстрацията в разширения уеб интерфейс.
-        media_cache_retention_period: Изтеглените мултимедийни файлове ще се изтрият след посочения брой дни, задавайки положително число, и ще се изтеглят пак при поискване.
+        media_cache_retention_period: Мултимедийни файлове от публикации, направени от отдалечени потребители, се сринаха в сървъра ви. Задавайки положителна стойност, мултимедията ще се изтрие след посочения брой дни. Ако се искат мултимедийни данни след изтриването, то ще се изтегли пак, ако още е наличен източникът на съдържание. Поради ограниченията за това колко често картите за предварващ преглед на връзките анкетират сайтове на трети страни, се препоръчва да зададете тази стойност на поне 14 дни или картите за предварващ преглед на връзките няма да се обновяват при поискване преди този момент.
         peers_api_enabled: Списък от имена на домейни, с които сървърът се е свързал във федивселената. Тук не се включват данни за това дали федерирате с даден сървър, а само за това дали сървърът ви знае за него. Това се ползва от услуги, събиращи статистика за федерацията в общия смисъл.
         profile_directory: Указателят на профили вписва всички потребители, избрали да бъдат откриваеми.
         require_invite_text: Когато регистрацията изисква ръчно одобрение, то направете текстовото поле за това "Защо желаете да се присъедините?" по-скоро задължително, отколкото по желание
@@ -116,6 +118,7 @@ bg:
           sign_up_requires_approval: Новите регистрации ще изискват одобрението ви
         severity: Изберете какво да се случва със заявките от този IP
       rule:
+        hint: По избор. Дайте по-подробно за правилото
         text: Опишете правило или изискване за потребителите на този сървър. Опитайте се да го направите кратко и просто
       sessions:
         otp: 'Въведете двуфакторния код, породен от приложението на телефона си или използвайте един от кодовете си за възстановяване:'
@@ -242,7 +245,7 @@ bg:
         backups_retention_period: Период за съхранение на потребителския архив
         bootstrap_timeline_accounts: Винаги да се препоръчват следните акаунти на нови потребители
         closed_registrations_message: Съобщение при неналична регистрация
-        content_cache_retention_period: Период на съхранение на кеша за съдържание
+        content_cache_retention_period: Период на запазване на отдалечено съдържание
         custom_css: Персонализиран CSS
         mascot: Плашило талисман по избор (остаряло)
         media_cache_retention_period: Период на запазване на мултимедийния кеш
@@ -261,7 +264,7 @@ bg:
         status_page_url: URL адрес на страница със състоянието
         theme: Стандартна тема
         thumbnail: Образче на сървъра
-        timeline_preview: Позволяване на неупълномощен достъп до публични часови оси
+        timeline_preview: Позволяване на неудостоверен достъп до публични инфопотоци
         trendable_by_default: Без преглед на налагащото се
         trends: Включване на налагащи се
         trends_as_landing_page: Употреба на налагащото се като целева страница
@@ -299,6 +302,7 @@ bg:
           patch: Известие за обновявания на оправени грешки
         trending_tag: Изискване на преглед за новонашумели
       rule:
+        hint: Допълнителни сведения
         text: Правило
       settings:
         indexable: Включване на страницата на профила в търсачките
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 9e8aefad49..196711aee9 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -3,8 +3,8 @@ br:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF pe JPG. Brasoc'h eget %{size}. A vo izelaet betek %{dimensions}px
-        header: PNG, GIF pe JPG. Brasoc'h eget %{size}. A vo izelaet betek %{dimensions}px
+        avatar: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
+        header: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
         password: Implijit 8 lizherennoù d'an neubeutañ
         setting_default_sensitive: Ar mediaoù kizidik a zo kuzhet dre ziouer ha gallout a reont bezañ diguzhet dre ur c'hlik
         setting_display_media_default: Kuzhat mediaoù aroueziet evel kizidik
@@ -41,7 +41,7 @@ br:
         email: Chomlec'h postel
         expires_in: Mont war e dermen goude
         header: Talbenn
-        locale: Yezh ar c'hetal
+        locale: Yezh an etrefas
         new_password: Ger-tremen nevez
         note: Kinnig
         password: Ger-tremen
@@ -49,6 +49,7 @@ br:
         setting_display_media_default: Dre ziouer
         setting_display_media_hide_all: Kuzhat pep tra
         setting_display_media_show_all: Diskouez pep tra
+        setting_theme: Neuz al lec'hienn
         setting_use_pending_items: Mod gorrek
         title: Titl
         username: Anv
@@ -66,6 +67,7 @@ br:
       notification_emails:
         follow: Heuliañ a ra {name} ac'hanoc'h
       rule:
+        hint: Titouroù ouzhpenn
         text: Reolenn
       tag:
         name: Hashtag
@@ -73,6 +75,7 @@ br:
         usable: Aotren an embannadurioù da implijout an hashtag-mañ
       user:
         role: Roll
+        time_zone: Gwerzhid eur
       user_role:
         name: Anv
     'no': Ket
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 12a6ac1fe8..d3dc4b13f1 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -39,14 +39,14 @@ ca:
         text: Només pots emetre una apel·lació per cada acció
       defaults:
         autofollow: Qui es registri a través de la invitació et seguirà automàticament
-        avatar: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. De com a màxim %{size}. S'escalarà a %{dimensions} px
         bot: Notifica que aquest compte realitza principalment accions automatitzades i que pot estar no monitorat
         context: Un o diversos contextos en què s'ha d'aplicar el filtre
         current_password: Per motius de seguretat, introduïu la contrasenya del compte actual
         current_username: Per a confirmar, entreu el nom d'usuari del compte actual
         digest: Només s'envia després d'un llarg període d'inactivitat i només si has rebut algun missatge personal durant la teva absència
         email: Se t'enviarà un correu electrònic de confirmació
-        header: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. De com a màxim %{size}. S'escalarà a %{dimensions} px
         inbox_url: Copia l'enllaç de la pàgina principal del relay que vols usar
         irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
         locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
@@ -77,13 +77,15 @@ ca:
           warn: Oculta el contingut filtrat darrere d'un avís mencionant el títol del filtre
       form_admin_settings:
         activity_api_enabled: Contador de tuts publicats localment, usuaris actius i registres nous en períodes setmanals
-        backups_retention_period: Manté els arxius d'usuari generats durant el nombre de dies especificats.
+        app_icon: WEBP, PNG, GIF o JPG. Canvia la icona per defecte de l'app en dispositius mòbils per una de personalitzada.
+        backups_retention_period: Els usuaris poden generar arxius de les seves publicacions per a baixar-los més endavant. Quan tingui un valor positiu, els arxius s'esborraran del vostre emmagatzematge després del nombre donat de dies.
         bootstrap_timeline_accounts: Aquests comptes es fixaran en la part superior de les recomanacions de seguiment dels nous usuaris.
         closed_registrations_message: Es mostra quan el registres estan tancats
-        content_cache_retention_period: Els tuts d'altres servidors se suprimiran després del nombre de dies especificat quan s'estableix un valor positiu. Això pot ser irreversible.
+        content_cache_retention_period: S'esborraran totes les publicacions d'altres servidors (impulsos i respostes inclosos) passats els dies indicats, sense tenir en consideració les interaccions d'usuaris locals amb aquestes publicacions. Això inclou les publicacions que un usuari local hagi marcat com a favorites. També es perdran, i no es podran recuperar, les mencions privades entre usuaris d'instàncies diferents. Aquest paràmetre està pensat per a instàncies amb un propòsit especial i trencarà les expectatives dels usuaris si s'utilitza en una instància convencional.
         custom_css: Pots aplicar estils personalitzats en la versió web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Canvia la icona per defecte de Mastodon a la pestanya del navegador per una de personalitzada.
         mascot: Anul·la la il·lustració en la interfície web avançada.
-        media_cache_retention_period: Els fitxers multimèdia descarregats s'esborraran després del nombre de dies especificat quan el valor configurat és positiu, i tornats a descarregats sota demanda.
+        media_cache_retention_period: El vostre servidor conserva una còpia dels fitxers multimèdia de les publicacions dels usuaris remots. Si s'indica un valor positiu, s'esborraran passats els dies indicats. Si el fitxer es torna a demanar un cop esborrat, es tornarà a baixar si el contingut origen segueix disponible. Per causa de les restriccions en la freqüència amb què es poden demanar les targetes de previsualització d'altres servidors, es recomana definir aquest valor com a mínim a 14 dies, o les targetes de previsualització no s'actualizaran a demanda abans d'aquest termini.
         peers_api_enabled: Una llista de noms de domini que aquest servidor ha trobat al fedivers. No inclou cap dada sobre si estàs federat amb un servidor determinat, només si el teu en sap res. La fan servir, en un sentit general, serveis que recol·lecten estadístiques sobre la federació.
         profile_directory: El directori de perfils llista tots els usuaris que tenen activat ser descoberts.
         require_invite_text: Quan el registre requereixi aprovació manual, fes que sigui obligatori en lloc d'opcional d'escriure el text de la sol·licitud d'invitació "Per què vols unir-te?"
@@ -116,6 +118,7 @@ ca:
           sign_up_requires_approval: Els nous registres requeriran la teva aprovació
         severity: Tria què passarà amb les sol·licituds des d’aquesta IP
       rule:
+        hint: Opcional. Proporcioneu més detalls de la regla
         text: Descriu una norma o requeriment pels usuaris d'aquest servidor. Intenta fer-la curta i senzilla
       sessions:
         otp: 'Introdueix el codi de dos factors generat per el teu telèfon o utilitza un dels teus codis de recuperació:'
@@ -242,7 +245,7 @@ ca:
         backups_retention_period: Període de retenció del arxiu d'usuari
         bootstrap_timeline_accounts: Recomana sempre aquests comptes als nous usuaris
         closed_registrations_message: Missatge personalitzat quan el registre no és accessible
-        content_cache_retention_period: Període de retenció de la memòria cau de contingut
+        content_cache_retention_period: Període de retenció del contingut remot
         custom_css: CSS personalitzat
         mascot: Mascota personalitzada (llegat)
         media_cache_retention_period: Període de retenció del cau multimèdia
@@ -299,6 +302,7 @@ ca:
           patch: Notificar sobre les actualitzacions de correcció d'errors
         trending_tag: Nova tendència requereix revisió
       rule:
+        hint: Informació addicional
         text: Norma
       settings:
         indexable: Inclou la pàgina del perfil en els motors de cerca
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index a6110e2034..3c1d8315e3 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -25,14 +25,12 @@ ckb:
         text: دەتوانیت ڕستەسازی توت بەکار بێنیت. تکایە بیر لەو بۆشاییە بکەوە کە بانگەوازەکە لەسەر شاشەی بەکارهێنەرەکە دەست نیشان دەکات
       defaults:
         autofollow: ئەو کەسانەی کە لە ڕێگەی بانگهێشتکردنەوە تۆمار دەکرێن بە خۆکارانە شوێنت دەکەون
-        avatar: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}px
         bot: ئەم هەژمارە بەشێوەیەکی سەرەکی کردارە خۆکارانە ئەنجام دەدات و لەوانەیە چاودێری نەکرێت
         context: یەک یان چەند دەقێک کە پالافتنەکە جێبەجێ بکات
         current_password: بۆ مەبەستی پاراستن تکایە تێپەروشەی هەژمارەی ئێستاکەت بنووسە
         current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
         digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
         email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
-        header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
         inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
         irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
         locale: زمانی ڕووکاری بەکارهێنەر، ئیمەیلەکان و ئاگانامەکان
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index fd6f595e91..dfec033469 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -23,14 +23,12 @@ co:
         text: Pudete utilizà a sintassa di i statuti. Pensate à a piazza chì l'annunziu hà da piglià nant'à u screnu di l'utilizatore
       defaults:
         autofollow: Quelli·e chì s'arregistranu cù l'invitazione saranu autumaticamente abbunati·e à voi
-        avatar: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
         bot: Stu contu hè autumatizatu è ùn hè forse micca survegliatu
         context: Cuntestu·i induve u filtru deve esse applicatu
         current_password: Per ragione di sicurità, entrate a chjave d'accessu di stu contu
         current_username: Per cunfirmà, entrate u cugnome di questu contu
         digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti
         email: Avete da riceve un'e-mail di cunfirmazione
-        header: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
         inbox_url: Cupiate l'URL di a pagina d'accolta di u ripetitore chì vulete utilizà
         irreversible: I statuti filtrati saranu sguassati di manera irreversibile, ancu s'ellu hè toltu u filtru
         locale: A lingua di l'interfaccia utilizatore, di l'e-mail è di e nutificazione push
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index dff9378098..0b1a34e1b9 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -3,9 +3,13 @@ cs:
   simple_form:
     hints:
       account:
+        discoverable: Vaše veřejné příspěvky a profil mohou být zobrazeny nebo doporučeny v různých oblastech Mastodonu a váš profil může být navrhován ostatním uživatelům.
         display_name: Vaše celé jméno nebo přezdívka.
         fields: Vaše domovská stránka, zájmena, věk, cokoliv chcete.
+        indexable: Vaše veřejné příspěvky se mohou objevit ve výsledcích vyhledávání na Mastodonu. Lidé, kteří s vašimi příspěvky interagovaly, je mohou stále vyhledávat.
         note: 'Můžete @zmínit jiné osoby nebo #hashtagy.'
+        show_collections: Lidé budou moci procházet skrz sledující. Lidé, které sledujete, uvidí, že je sledujete bezohledně.
+        unlocked: Lidé vás budou moci sledovat, aniž by vás žádali o schválení. Zrušte zaškrtnutí, pokud chcete zkontrolovat požadavky a zvolte, zda přijmete nebo odmítněte nové následovníky.
       account_alias:
         acct: Zadejte svůj účet, ze kterého se chcete přesunout jinam, ve formátu přezdívka@doména
       account_migration:
@@ -34,15 +38,15 @@ cs:
       appeal:
         text: Proti prohřešku se můžete odvolat jen jednou
       defaults:
-        autofollow: Lidé, kteří se zaregistrují na základě pozvánky, vás budou automaticky sledovat
-        avatar: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
+        autofollow: Lidé, kteří se zaregistrují skrz pozvánky, vás budou automaticky sledovat
+        avatar: WEBP, PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         bot: Signalizovat ostatním, že účet převážně vykonává automatizované akce a nemusí být monitorován
         context: Jeden či více kontextů, ve kterých má být filtr uplatněn
         current_password: Z bezpečnostních důvodů prosím zadejte heslo současného účtu
         current_username: Potvrďte prosím tuto akci zadáním uživatelského jména aktuálního účtu
         digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste během své nepřítomnosti obdrželi osobní zprávy
         email: Bude vám poslán potvrzovací e-mail
-        header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
+        header: WEBP, PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
         inbox_url: Zkopírujte URL z hlavní stránky mostu, který chcete použít
         irreversible: Filtrované příspěvky nenávratně zmizí, i pokud bude filtr později odstraněn
         locale: Jazyk uživatelského rozhraní, e-mailů a push notifikací
@@ -72,14 +76,16 @@ cs:
           hide: Úplně schovat filtrovaný obsah tak, jako by neexistoval
           warn: Schovat filtrovaný obsah za varováním zmiňujicím název filtru
       form_admin_settings:
-        activity_api_enabled: Počty lokálně publikovaných příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
-        backups_retention_period: Zachovat generované uživatelské archivy pro zadaný počet dní.
+        activity_api_enabled: Počty lokálně zveřejnělých příspěvků, aktivních uživatelů a nových registrací v týdenních intervalech
+        app_icon: WEBP, PNG, GIF nebo JPG. Nahradí výchozí ikonu aplikace v mobilních zařízeních vlastní ikonou.
+        backups_retention_period: Uživatelé mají možnost vytvářet archivy svých příspěvků, které si mohou stáhnout později. Pokud je nastaveno na kladnou hodnotu, budou tyto archivy po zadaném počtu dní automaticky odstraněny z úložiště.
         bootstrap_timeline_accounts: Tyto účty budou připnuty na vrchol nových uživatelů podle doporučení.
         closed_registrations_message: Zobrazeno při zavření registrace
-        content_cache_retention_period: Příspěvky z jiných serverů budou odstraněny po zadaném počtu dní, pokud je nastavena kladná hodnota. To může být nevratné.
+        content_cache_retention_period: Všechny příspěvky z jiných serverů (včetně boostů a odpovědí) budou po uplynutí stanoveného počtu dní smazány bez ohledu na interakci místního uživatele s těmito příspěvky. To se týká i příspěvků, které místní uživatel přidal do záložek nebo oblíbených. Soukromé zmínky mezi uživateli z různých instancí budou rovněž ztraceny a nebude možné je obnovit. Použití tohoto nastavení je určeno pro instance pro speciální účely a při implementaci pro obecné použití porušuje mnohá očekávání uživatelů.
         custom_css: Můžete použít vlastní styly ve verzi Mastodonu.
+        favicon: WEBP, PNG, GIF nebo JPG. Nahradí výchozí favicon Mastodonu vlastní ikonou.
         mascot: Přepíše ilustraci v pokročilém webovém rozhraní.
-        media_cache_retention_period: Stažené mediální soubory budou po zadaném počtu dní odstraněny, pokud je nastavena kladná hodnota, a na požádání znovu staženy.
+        media_cache_retention_period: Mediální soubory z příspěvků vzdálených uživatelů se ukládají do mezipaměti na vašem serveru. Pokud je nastaveno na kladnou hodnotu, budou média po zadaném počtu dní odstraněna. Pokud jsou mediální data vyžádána po jejich odstranění, budou znovu stažena, pokud je zdrojový obsah stále k dispozici. Vzhledem k omezením týkajícím se četnosti dotazů karet náhledů odkazů na weby třetích stran se doporučuje nastavit tuto hodnotu alespoň na 14 dní, jinak nebudou karty náhledů odkazů na vyžádání aktualizovány dříve.
         peers_api_enabled: Seznam názvů domén se kterými se tento server setkal ve fediversu. Neobsahuje žádná data o tom, zda jste federovali s daným serverem, pouze že o něm váš server ví. Toto je využíváno službami, které sbírají o federování statistiku v obecném smyslu.
         profile_directory: Adresář profilu obsahuje seznam všech uživatelů, kteří se přihlásili, aby mohli být nalezeni.
         require_invite_text: Pokud přihlášení vyžaduje ruční schválení, měl by být textový vstup „Proč se chcete připojit?“ povinný spíše než volitelný
@@ -112,10 +118,14 @@ cs:
           sign_up_requires_approval: Nové registrace budou vyžadovat schválení
         severity: Zvolte, jak naložit s požadavky z dané IP
       rule:
+        hint: Nepovinné. Uveďte další podrobnosti o pravidle
         text: Popište pravidlo nebo požadavek uživatelům tohoto serveru. Snažte se ho držet krátký a jednoduchý
       sessions:
         otp: 'Zadejte kód pro dvoufázové ověření vygenerovaný vaší mobilní aplikací, nebo použijte jeden z vašich záložních kódů:'
         webauthn: Pokud jde o USB klíč, vložte jej a případně se dotkněte jeho tlačítka.
+      settings:
+        indexable: Vaše profilová stránka se může objevit ve výsledcích vyhledávání na Google, Bingu a ostatních vyhledávačích.
+        show_application: I tak budete vždy moci vidět, která aplikace zveřejnila váš příspěvek.
       tag:
         name: Můžete měnit pouze velikost písmen, například kvůli lepší čitelnosti
       user:
@@ -133,9 +143,13 @@ cs:
         url: Kam budou události odesílány
     labels:
       account:
+        discoverable: Zobrazovat profil a příspěvky ve vyhledávacích algoritmech
         fields:
           name: Označení
           value: Obsah
+        indexable: Zahrnout veřejné příspěvky do výsledků hledání
+        show_collections: Zobrazit koho sledujete a kdo vás sleduje v profilu
+        unlocked: Automaticky přijímat nové sledující
       account_alias:
         acct: Adresa starého účtu
       account_migration:
@@ -231,7 +245,7 @@ cs:
         backups_retention_period: Doba uchovávání archivu uživatelů
         bootstrap_timeline_accounts: Vždy doporučovat tyto účty novým uživatelům
         closed_registrations_message: Vlastní zpráva, když přihlášení není k dispozici
-        content_cache_retention_period: Doba uchování mezipaměti obsahu
+        content_cache_retention_period: Doba uchovávání vzdáleného obsahu
         custom_css: Vlastní CSS
         mascot: Vlastní maskot (zastaralé)
         media_cache_retention_period: Doba uchovávání mezipaměti médií
@@ -280,9 +294,19 @@ cs:
         pending_account: Je třeba posoudit nový účet
         reblog: Někdo boostnul váš příspěvek
         report: Je odesláno nové hlášení
+        software_updates:
+          all: Upozornit na všechny aktualizace
+          critical: Upozornit pouze na kritické aktualizace
+          label: Nová verze Mastodonu k dispozici
+          none: Nikdy neoznamovat aktualizace (nedoporučeno)
+          patch: Upozornit na aktualizace chyb
         trending_tag: Nový trend vyžaduje posouzení
       rule:
+        hint: Další informace
         text: Pravidlo
+      settings:
+        indexable: Zahrnout stránku profilu do vyhledávačů
+        show_application: Zobrazit aplikaci, ze které jste odeslali příspěvek
       tag:
         listable: Povolit zobrazení tohoto hashtagu ve vyhledávání a návrzích
         name: Hashtag
@@ -303,6 +327,7 @@ cs:
         url: URL koncového bodu
     'no': Ne
     not_recommended: Nedoporučuje se
+    overridden: Přepsáno
     recommended: Doporučeno
     required:
       mark: "*"
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index ddc1b1b935..5e8fd85293 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -39,14 +39,14 @@ cy:
         text: Dim ond unwaith y gallwch apelio yn erbyn rhybudd
       defaults:
         autofollow: Bydd pobl sy'n cofrestru drwy'r gwahoddiad yn eich dilyn yn awtomatig
-        avatar: PNG, GIF neu JPG. %{size} yn uchafswm. Bydd yn cael ei israddio i %{dimensions}px
+        avatar: WEBP, PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei leihau i %{dimensions}px
         bot: Mae'r cyfrif hwn yn perfformio gweithredoedd awtomatig yn bennaf ac mae'n bosib nad yw'n cael ei fonitro
         context: Un neu fwy cyd-destun lle dylai'r hidlydd weithio
         current_password: At ddibenion diogelwch, nodwch gyfrinair y cyfrif cyfredol
         current_username: I gadarnhau, nodwch enw defnyddiwr y cyfrif cyfredol
         digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
         email: Byddwch yn derbyn e-bost cadarnhau
-        header: PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei israddio i %{dimensions}px
+        header: WEBP, PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei leihau i %{dimensions}px
         inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
         irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
         locale: Iaith y rhyngwyneb, e-byst a hysbysiadau gwthiadwy
@@ -77,13 +77,15 @@ cy:
           warn: Cuddiwch y cynnwys wedi'i hidlo y tu ôl i rybudd sy'n sôn am deitl yr hidlydd
       form_admin_settings:
         activity_api_enabled: Cyfrif o bostiadau a gyhoeddir yn lleol, defnyddwyr gweithredol, a chofrestriadau newydd mewn bwcedi wythnosol
-        backups_retention_period: Cadw archifau defnyddwyr a gynhyrchwyd am y nifer penodedig o ddyddiau.
+        app_icon: WEBP, PNG, GIF neu JPG. Yn diystyru'r eicon ap rhagosodedig ar ddyfeisiau symudol gydag eicon cyfaddas.
+        backups_retention_period: Mae gan ddefnyddwyr y gallu i gynhyrchu archifau o'u postiadau i'w llwytho i lawr yn ddiweddarach. Pan gânt eu gosod i werth positif, bydd yr archifau hyn yn cael eu dileu'n awtomatig o'ch storfa ar ôl y nifer penodedig o ddyddiau.
         bootstrap_timeline_accounts: Bydd y cyfrifon hyn yn cael eu pinio i frig argymhellion dilynol defnyddwyr newydd.
         closed_registrations_message: Yn cael eu dangos pan fydd cofrestriadau wedi cau
-        content_cache_retention_period: Bydd postiadau o weinyddion eraill yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan fyddan nhw wedi'u gosod i werth positif. Gall nad oes modd dadwneud hyn.
+        content_cache_retention_period: Bydd yr holl bostiadau gan weinyddion eraill (gan gynnwys hwb ac atebion) yn cael eu dileu ar ôl y nifer penodedig o ddyddiau, heb ystyried unrhyw ryngweithio defnyddiwr lleol â'r postiadau hynny. Mae hyn yn cynnwys postiadau lle mae defnyddiwr lleol wedi ei farcio fel nodau tudalen neu ffefrynnau. Bydd cyfeiriadau preifat rhwng defnyddwyr o wahanol achosion hefyd yn cael eu colli ac yn amhosibl eu hadfer. Mae'r defnydd o'r gosodiad hwn wedi'i fwriadu ar gyfer achosion pwrpas arbennig ac mae'n torri llawer o ddisgwyliadau defnyddwyr pan gaiff ei weithredu at ddibenion cyffredinol.
         custom_css: Gallwch gymhwyso arddulliau cyfaddas ar fersiwn gwe Mastodon.
+        favicon: WEBP, PNG, GIF neu JPG. Yn diystyru'r favicon Mastodon rhagosodedig gydag eicon cyfaddas.
         mascot: Yn diystyru'r darlun yn y rhyngwyneb gwe uwch.
-        media_cache_retention_period: Bydd ffeiliau cyfryngau wedi'u llwytho i lawr yn cael eu dileu ar ôl y nifer penodedig o ddyddiau pan gânt eu gosod i werth cadarnhaol, a'u hail-lwytho i lawr ar alw.
+        media_cache_retention_period: Mae ffeiliau cyfryngau o bostiadau a wneir gan ddefnyddwyr o bell yn cael eu storio ar eich gweinydd. Pan gaiff ei osod i werth positif, bydd y cyfryngau yn cael eu dileu ar ôl y nifer penodedig o ddyddiau. Os gofynnir am y data cyfryngau ar ôl iddo gael ei ddileu, caiff ei ail-lwytho i lawr, os yw'r cynnwys ffynhonnell yn dal i fod ar gael. Oherwydd cyfyngiadau ar ba mor aml y mae cardiau rhagolwg cyswllt yn pleidleisio i wefannau trydydd parti, argymhellir gosod y gwerth hwn i o leiaf 14 diwrnod, neu ni fydd cardiau rhagolwg cyswllt yn cael eu diweddaru ar alw cyn yr amser hwnnw.
         peers_api_enabled: Rhestr o enwau parth y mae'r gweinydd hwn wedi dod ar eu traws yn y ffediws. Nid oes unrhyw ddata wedi'i gynnwys yma ynghylch a ydych chi'n ffedereiddio â gweinydd penodol, dim ond bod eich gweinydd yn gwybod amdano. Defnyddir hwn gan wasanaethau sy'n casglu ystadegau ar ffedereiddio mewn ystyr cyffredinol.
         profile_directory: Mae'r cyfeiriadur proffil yn rhestru'r holl ddefnyddwyr sydd wedi dewis i fod yn ddarganfyddiadwy.
         require_invite_text: Pan fydd angen cymeradwyaeth â llaw ar gyfer cofrestriadau, gwnewch y “Pam ydych chi am ymuno?” mewnbwn testun yn orfodol yn hytrach na dewisol
@@ -116,6 +118,7 @@ cy:
           sign_up_requires_approval: Bydd angen eich cymeradwyaeth ar gyfer cofrestriadau newydd
         severity: Dewiswch beth fydd yn digwydd gyda cheisiadau o'r IP hwn
       rule:
+        hint: Dewisol. Darparwch ragor o fanylion am y rheol
         text: Disgrifiwch reol neu ofyniad ar gyfer defnyddwyr ar y gweinydd hwn. Ceisiwch ei gadw'n fyr ac yn syml
       sessions:
         otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffôn neu defnyddiwch un o''ch codau adfer:'
@@ -242,7 +245,7 @@ cy:
         backups_retention_period: Cyfnod cadw archif defnyddwyr
         bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
         closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
-        content_cache_retention_period: Cyfnod cadw storfa cynnwys
+        content_cache_retention_period: Cyfnod cadw cynnwys o bell
         custom_css: CSS cyfaddas
         mascot: Mascot cyfaddas (hen)
         media_cache_retention_period: Cyfnod cadw storfa cyfryngau
@@ -299,6 +302,7 @@ cy:
           patch: Rhoi gwybod am ddiweddariadau trwsio byg
         trending_tag: Mae pwnc llosg newydd angen adolygiad
       rule:
+        hint: Gwybodaeth ychwanegol
         text: Rheol
       settings:
         indexable: Cynnwys tudalen proffil mewn peiriannau chwilio
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 0d86b2bc8d..0719e26430 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -39,14 +39,14 @@ da:
         text: En advarsel kan kun appelleres én gang
       defaults:
         autofollow: Personer tilmeldt via invitationen vil automatisk blive følgere
-        avatar: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
+        avatar: WEBP, PNG, GIF eller JPG. Maks. %{size}. Nedskaleres til %{dimensions}px
         bot: Signalér til andre, at denne konto primært udfører automatiserede handlinger og muligvis ikke monitoreres
         context: En eller flere kontekster, hvor filteret skal anvendes
         current_password: Angiv af sikkerhedsårsager adgangskoden til den aktuelle konto
         current_username: For at bekræfte, angiv brugernavnet for den aktuelle konto
         digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder under fraværet
         email: En bekræftelses-e-mail fremsendes
-        header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
+        header: WEBP, PNG, GIF eller JPG. Maks. %{size}. Nedskaleres til %{dimensions}px
         inbox_url: Kopiér URL'en fra forsiden af den videreformidler, der skal anvendes
         irreversible: Filtrerede indlæg forsvinder permanent, selv hvis filteret senere fjernes
         locale: Sprog til brug for brugerflade, e-mails og push-notifikationer
@@ -77,13 +77,15 @@ da:
           warn: Skjul filtreret indhold bag en advarsel, der nævner filterets titel
       form_admin_settings:
         activity_api_enabled: Antal lokalt opslåede indlæg, aktive brugere samt nye tilmeldinger i ugentlige opdelinger
-        backups_retention_period: Behold genererede brugerarkiver i det angivne antal dage.
+        app_icon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard app-ikonet på mobilenheder med et tilpasset ikon.
+        backups_retention_period: Brugere har mulighed for at generere arkiver af deres indlæg til senere downloade. Når sat til positiv værdi, vil disse arkiver automatisk blive slettet fra lagerpladsen efter det angivne antal dage.
         bootstrap_timeline_accounts: Disse konti fastgøres øverst på nye brugeres følg-anbefalinger.
         closed_registrations_message: Vises, når tilmeldinger er lukket
-        content_cache_retention_period: Indlæg fra andre servere slettes efter det angivne antal dage, når sat til en positiv værdi. Dette kan være irreversibelt.
+        content_cache_retention_period: Alle indlæg fra andre servere (herunder boosts og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug.
         custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen.
+        favicon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard Mastodon favikonet på mobilenheder med et tilpasset ikon.
         mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade.
-        media_cache_retention_period: Downloadede mediefiler slettes efter det angivne antal dage, når sat til en positiv værdi, og gendownloades på forlangende.
+        media_cache_retention_period: Mediefiler fra indlæg oprettet af eksterne brugere er cachet på din server. Når sat til positiv værdi, slettes medier efter det angivne antal dage. Anmodes om mediedata efter de er slettet, gendownloades de, hvis kildeindholdet stadig er tilgængeligt. Grundet begrænsninger på, hvor ofte linkforhåndsvisningskort forespørger tredjeparts websteder, anbefales det at sætte denne værdi til mindst 14 dage, ellers opdateres linkforhåndsvisningskort ikke efter behov før det tidspunkt.
         peers_api_enabled: En liste med domænenavne, som denne server har stødt på i fediverset. Ingen data inkluderes her om, hvorvidt der fødereres med en given server, blot at din server kender til det. Dette bruges af tjenester, som indsamler generelle føderationsstatistikker.
         profile_directory: Profilmappen oplister alle brugere, som har valgt at kunne opdages.
         require_invite_text: Når tilmelding kræver manuel godkendelse, så gør “Hvorfor ønsker du at deltage?” tekstinput obligatorisk i stedet for valgfrit
@@ -116,6 +118,7 @@ da:
           sign_up_requires_approval: Nye tilmeldinger kræver din godkendelse
         severity: Afgør, hvordan forespørgsler fra denne IP behandles
       rule:
+        hint: Valgfrit. Oplys yderligere detaljer om reglen
         text: Beskriv på en kort og enkel form en regel/krav for brugere på denne server
       sessions:
         otp: 'Angiv tofaktorkoden generet af din mobil-app eller brug en af genoprettelseskoderne:'
@@ -242,7 +245,7 @@ da:
         backups_retention_period: Brugerarkivs opbevaringsperiode
         bootstrap_timeline_accounts: Anbefal altid disse konti til nye brugere
         closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig
-        content_cache_retention_period: Indholds-cache opbevaringsperiode
+        content_cache_retention_period: Opbevaringsperiode for eksternt indhold
         custom_css: Tilpasset CSS
         mascot: Tilpasset maskot (ældre funktion)
         media_cache_retention_period: Media-cache opbevaringsperiode
@@ -299,6 +302,7 @@ da:
           patch: Notificér om fejlrettelsesopdateringer
         trending_tag: Ny tendens kræver revidering
       rule:
+        hint: Yderligere oplysninger
         text: Regel
       settings:
         indexable: Inkludér profilside i søgemaskiner
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index fcf92e29f4..7d39786697 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -39,14 +39,14 @@ de:
         text: Du kannst nur einmal Einspruch gegen eine Maßnahme einlegen
       defaults:
         autofollow: Personen, die sich über deine Einladung registrieren, folgen automatisch deinem Profil
-        avatar: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
+        avatar: WEBP, PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         bot: Signalisiert, dass dieses Konto hauptsächlich automatisierte Aktionen durchführt und möglicherweise nicht persönlich betreut wird
         context: Orte, an denen der Filter aktiv sein soll
         current_password: Gib aus Sicherheitsgründen bitte das Passwort des aktuellen Kontos ein
         current_username: Um das zu bestätigen, gib den Profilnamen des aktuellen Kontos ein
         digest: Wenn du eine längere Zeit inaktiv bist oder du während deiner Abwesenheit in einer privaten Nachricht erwähnt worden bist
         email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
-        header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
+        header: WEBP, PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
         inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
         irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
         locale: Die Sprache der Bedienoberfläche, E-Mails und Push-Benachrichtigungen
@@ -77,13 +77,15 @@ de:
           warn: Den gefilterten Beitrag hinter einer Warnung, die den Filtertitel beinhaltet, ausblenden
       form_admin_settings:
         activity_api_enabled: Anzahl der wöchentlichen Beiträge, aktiven Profile und Registrierungen auf diesem Server
-        backups_retention_period: Behalte die Archive, die von den Benutzer*innen erstellt worden sind, für die angegebene Anzahl an Tagen.
+        app_icon: WEBP, PNG, GIF oder JPG. Überschreibt das Standard-App-Symbol auf mobilen Geräten mit einem eigenen Symbol.
+        backups_retention_period: Nutzer*innen haben die Möglichkeit, Archive ihrer Beiträge zu erstellen, die sie später herunterladen können. Wenn ein positiver Wert gesetzt ist, werden diese Archive nach der festgelegten Anzahl von Tagen automatisch aus deinem Speicher gelöscht.
         bootstrap_timeline_accounts: Diese Konten werden bei den Follower-Empfehlungen für neu registrierte Nutzer*innen oben angeheftet.
         closed_registrations_message: Wird angezeigt, wenn Registrierungen deaktiviert sind
-        content_cache_retention_period: Sowohl alle Beiträge als auch geteilte Beiträge von anderen Servern werden nach der angegebenen Anzahl von Tagen gelöscht. Alle zugehörigen Lesezeichen, Favoriten und geteilte Beiträge werden ebenfalls verloren gehen. Dies kann nicht mehr rückgängig gemacht werden.
+        content_cache_retention_period: Sämtliche Beiträge von anderen Servern (einschließlich geteilte Beiträge und Antworten) werden, unabhängig von der Interaktion der lokalen Nutzer*innen mit diesen Beiträgen, nach der festgelegten Anzahl von Tagen gelöscht. Das betrifft auch Beiträge, die von lokalen Nutzer*innen favorisiert oder als Lesezeichen gespeichert wurden. Private Erwähnungen zwischen Nutzer*innen von verschiedenen Servern werden ebenfalls verloren gehen und können nicht wiederhergestellt werden. Das Verwenden dieser Option richtet sich ausschließlich an Server für spezielle Zwecke und wird die allgemeine Nutzungserfahrung beeinträchtigen, wenn sie für den allgemeinen Gebrauch aktiviert ist.
         custom_css: Du kannst benutzerdefinierte Stile auf die Web-Version von Mastodon anwenden.
+        favicon: WEBP, PNG, GIF oder JPG. Überschreibt das Standard-Mastodon-Favicon mit einem eigenen Symbol.
         mascot: Überschreibt die Abbildung in der erweiterten Weboberfläche.
-        media_cache_retention_period: Von anderen Servern übertragene Mediendateien werden nach der angegebenen Anzahl an Tagen – sofern das Feld eine positive Zahl enthält – aus dem Cache gelöscht und bei Bedarf erneut heruntergeladen.
+        media_cache_retention_period: Mediendateien aus Beiträgen von externen Nutzer*innen werden auf deinem Server zwischengespeichert. Wenn ein positiver Wert gesetzt ist, werden die Medien nach der festgelegten Anzahl von Tagen gelöscht. Sollten die Medien nach dem Löschvorgang wieder angefragt werden, werden sie erneut heruntergeladen, sofern der ursprüngliche Inhalt noch vorhanden ist. Es wird empfohlen, diesen Wert auf mindestens 14 Tage festzulegen, da die Häufigkeit der Abfrage von Linkvorschaukarten für Websites von Dritten begrenzt ist und die Linkvorschaukarten sonst nicht vor Ablauf dieser Zeit aktualisiert werden.
         peers_api_enabled: Eine Liste von Domains, die diesem Server im Fediverse begegnet sind. Hierbei werden keine Angaben darüber gemacht, ob du mit einem bestimmten Server föderierst, sondern nur, dass dein Server davon weiß. Dies wird von Diensten verwendet, die allgemein Statistiken übers Ferdiverse sammeln.
         profile_directory: Dieses Verzeichnis zeigt alle Profile an, die sich dafür entschieden haben, entdeckt zu werden.
         require_invite_text: Wenn Registrierungen eine manuelle Genehmigung erfordern, dann werden Nutzer einen Grund für ihre Registrierung angeben müssen
@@ -116,6 +118,7 @@ de:
           sign_up_requires_approval: Neue Registrierungen müssen genehmigt werden
         severity: Wähle aus, was mit Anfragen von dieser IP-Adresse geschehen soll
       rule:
+        hint: "(Optional) Gib weitere Details zu dieser Regel an"
         text: Führe eine Regel oder Auflage für Profile auf diesem Server ein. Bleib dabei kurz und knapp
       sessions:
         otp: 'Gib den Zwei-Faktor-Code von deinem Smartphone ein oder verwende einen deiner Wiederherstellungscodes:'
@@ -148,7 +151,7 @@ de:
         show_collections: Follower und „Folge ich“ im Profil anzeigen
         unlocked: Neue Follower automatisch akzeptieren
       account_alias:
-        acct: Profilname des alten Kontos
+        acct: Adresse des alten Kontos
       account_migration:
         acct: Adresse des neuen Kontos
       account_warning_preset:
@@ -242,7 +245,7 @@ de:
         backups_retention_period: Aufbewahrungsfrist für Archive
         bootstrap_timeline_accounts: Neuen Nutzern immer diese Konten empfehlen
         closed_registrations_message: Nachricht, falls Registrierungen deaktiviert sind
-        content_cache_retention_period: Aufbewahrungsfrist für Inhalte im Cache
+        content_cache_retention_period: Aufbewahrungsfrist für externe Inhalte
         custom_css: Eigenes CSS
         mascot: Benutzerdefiniertes Maskottchen (Legacy)
         media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache
@@ -299,6 +302,7 @@ de:
           patch: Über Fehlerbehebungen informieren
         trending_tag: Neuer Trend erfordert eine Überprüfung
       rule:
+        hint: Zusätzliche Informationen
         text: Regel
       settings:
         indexable: Profilseite in Suchmaschinen einbeziehen
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index dc140a199f..29b9f59e14 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -31,14 +31,12 @@ el:
         text: Μπορείς να κάνετε έφεση σε ένα παράπτωμα μόνο μία φορά
       defaults:
         autofollow: Όσοι εγγραφούν μέσω της πρόσκλησης θα σε ακολουθούν αυτόματα
-        avatar: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
         bot: Ο λογαριασμός αυτός εκτελεί κυρίως αυτοματοποιημένες ενέργειες και ίσως να μην παρακολουθείται
         context: Ένα ή περισσότερα πλαίσια στα οποία μπορεί να εφαρμόζεται αυτό το φίλτρο
         current_password: Για λόγους ασφαλείας παρακαλώ γράψε τον κωδικό του τρέχοντος λογαριασμού
         current_username: Για επιβεβαίωση, παρακαλώ γράψε το όνομα χρήστη του τρέχοντος λογαριασμού
         digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
         email: Θα σου σταλεί email επιβεβαίωσης
-        header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
         inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή που θέλεις να χρησιμοποιήσεις
         irreversible: Οι φιλτραρισμένες αναρτήσεις θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί
         locale: Η γλώσσα χρήσης, των email και των ειδοποιήσεων push
@@ -69,13 +67,10 @@ el:
           warn: Απόκρυψη φιλτραρισμένου περιεχομένου πίσω από μια προειδοποίηση που αναφέρει τον τίτλο του φίλτρου
       form_admin_settings:
         activity_api_enabled: Καταμέτρηση τοπικά δημοσιευμένων δημοσιεύσεων, ενεργών χρηστών και νέων εγγραφών σε εβδομαδιαία πακέτα
-        backups_retention_period: Διατήρηση αρχείων χρηστών που δημιουργήθηκαν για τον καθορισμένο αριθμό ημερών.
         bootstrap_timeline_accounts: Αυτοί οι λογαριασμοί θα καρφιτσωθούν στην κορυφή των νέων χρηστών που ακολουθούν τις συστάσεις.
         closed_registrations_message: Εμφανίζεται όταν κλείνουν οι εγγραφές
-        content_cache_retention_period: Αναρτήσεις από άλλους διακομιστές θα διαγραφούν μετά τον καθορισμένο αριθμό ημερών όταν οριστεί μια θετική τιμή. Αυτό μπορεί να είναι μη αναστρέψιμο.
         custom_css: Μπορείς να εφαρμόσεις προσαρμοσμένα στυλ στην έκδοση ιστοσελίδας του Mastodon.
         mascot: Παρακάμπτει την εικονογραφία στην προηγμένη διεπαφή ιστού.
-        media_cache_retention_period: Τα ληφθέντα αρχεία πολυμέσων θα διαγραφούν μετά τον καθορισμένο αριθμό ημερών, όταν οριστεί σε θετική τιμή, και να γίνει εκ νέου λήψη κατά απαίτηση.
         peers_api_enabled: Μια λίστα με ονόματα τομέα που συνάντησε αυτός ο διακομιστής στο fediverse. Δεν περιλαμβάνονται δεδομένα εδώ για το αν συναλλάσσετε με ένα συγκεκριμένο διακομιστή, μόνο ότι ο διακομιστής σας το ξέρει. Χρησιμοποιείται από υπηρεσίες που συλλέγουν στατιστικά στοιχεία για την συναλλαγή με γενική έννοια.
         profile_directory: Ο κατάλογος προφίλ παραθέτει όλους τους χρήστες που έχουν επιλέξει να είναι ανακαλύψιμοι.
         require_invite_text: 'Όταν η εγγραφή απαιτεί χειροκίνητη έγκριση, κάνε το πεδίο κειμένου: «Γιατί θέλετε να συμμετάσχετε;» υποχρεωτικό αντί για προαιρετικό'
@@ -226,7 +221,6 @@ el:
         backups_retention_period: Περίοδος αρχειοθέτησης του χρήστη
         bootstrap_timeline_accounts: Πρότεινε πάντα αυτούς τους λογαριασμούς σε νέους χρήστες
         closed_registrations_message: Προσαρμοσμένο μήνυμα όταν οι εγγραφές δεν είναι διαθέσιμες
-        content_cache_retention_period: Περίοδος διατήρησης προσωρινής μνήμης περιεχομένου
         custom_css: Προσαρμοσμένο CSS
         mascot: Προσαρμοσμένη μασκότ (απαρχαιωμένο)
         media_cache_retention_period: Περίοδος διατήρησης προσωρινής μνήμης πολυμέσων
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index f0c18d1128..eaf0501a27 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -39,14 +39,14 @@ en-GB:
         text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
-        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        avatar: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: Signal to others that the account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
         email: You will be sent a confirmation e-mail
-        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        header: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
@@ -77,13 +77,15 @@ en-GB:
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
-        backups_retention_period: Keep generated user archives for the specified number of days.
+        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
+        backups_retention_period: Users have the ability to generate archives of their posts to download later. When set to a positive value, these archives will be automatically deleted from your storage after the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
-        content_cache_retention_period: Posts from other servers will be deleted after the specified number of days when set to a positive value. This may be irreversible.
+        content_cache_retention_period: All posts from other servers (including boosts and replies) will be deleted after the specified number of days, without regard to any local user interaction with those posts. This includes posts where a local user has marked it as bookmarks or favorites. Private mentions between users from different instances will also be lost and impossible to restore. Use of this setting is intended for special purpose instances and breaks many user expectations when implemented for general purpose use.
         custom_css: You can apply custom styles on the web version of Mastodon.
+        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
-        media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
+        media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
@@ -116,6 +118,7 @@ en-GB:
           sign_up_requires_approval: New sign-ups will require your approval
         severity: Choose what will happen with requests from this IP
       rule:
+        hint: Optional. Provide more details about the rule
         text: Describe a rule or requirement for users on this server. Try to keep it short and simple
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
@@ -242,7 +245,7 @@ en-GB:
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
         closed_registrations_message: Custom message when sign-ups are not available
-        content_cache_retention_period: Content cache retention period
+        content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
@@ -299,6 +302,7 @@ en-GB:
           patch: Notify on bugfix updates
         trending_tag: New trend requires review
       rule:
+        hint: Additional information
         text: Rule
       settings:
         indexable: Include profile page in search engines
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 0b718c5b65..2d9f412f15 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -6,7 +6,9 @@ en:
         discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
         display_name: Your full name or your fun name.
         fields: Your homepage, pronouns, age, anything you want.
+        hide_collections: People will not be able to browse through your follows and followers. People that you follow will see that you follow them regardless.
         indexable: Your public posts may appear in search results on Mastodon. People who have interacted with your posts may be able to search them regardless.
+        locked: People will request to follow you and you will be able to either accept or reject new followers.
         note: 'You can @mention other people or #hashtags.'
         show_collections: People will be able to browse through your follows and followers. People that you follow will see that you follow them regardless.
         unlocked: People will be able to follow you without requesting approval. Uncheck if you want to review follow requests and chose whether to accept or reject new followers.
@@ -39,28 +41,51 @@ en:
         text: You can only appeal a strike once
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
-        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        avatar: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: Signal to others that the account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         current_password: For security purposes please enter the password of the current account
         current_username: To confirm, please enter the username of the current account
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
+        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
+        discoverable_local: Disable the setting on federated servers. The setting is available this server only for avoiding full-text search on other servers
         email: You will be sent a confirmation e-mail
-        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        header: WEBP, PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
         password: Use at least 8 characters
+        person: This is normal account
         phrase: Will be matched regardless of casing in text or content warning of a post
         scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
         setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts)
+        setting_allow_quote: Subdued quotes are allowed regardless of this setting; you can quote freely from any source except kmyblue!
         setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon
+        setting_bookmark_category_needed: When removing from all category, unbookmarked automatically
+        setting_default_searchability: On kmyblue and Fedibird, the search is based on the search permission setting; on Misskey, all public, local public, and non-public posts are searched regardless of this setting; on Mastodon and Firefish, instead of search permission, the "Make public posts freely searchable on other servers" setting in the profile settings is applied. In Mastodon and Firefish, the "Make public posts freely searchable on other servers" setting in the profile settings is applied instead of the search permission.
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
+        setting_disallow_unlisted_public_searchability: この設定を有効にすると、非収載投稿と検索範囲「誰でも」は両立できず不特定多数からの検索が不可になります。Fedibirdと同じ挙動になります
         setting_display_media_default: Hide media marked as sensitive
+        setting_display_media_expand: Misskey and others can submit more than 4. The additions will be displayed up to 16. kmyblue will not allow uploading from kmyblue.
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
+        setting_dtl_force_searchability: 'With using #%{tag} tag, your post settings will be changed forcibly'
+        setting_dtl_force_subscribable: Your post can be detected local user's antenna to subscribe deep timeline
+        setting_dtl_force_visibility: 'With using #%{tag} tag, your post settings will be changed forcibly'
+        setting_emoji_reaction_policy: Even with this setting, users on other servers are free to put their emoji reaction on the post and share it within the same server. If you simply want to remove the emoji reaction from your own screen, you can disable it from the appearance settings
+        setting_emoji_reaction_streaming_notify_impl2: 当該サーバーの独自機能に対応したアプリを利用時に、絵文字リアクション機能を利用できます。動作確認していないため（そもそもそのようなアプリ自体を確認できていないため）正しく動かない場合があります
+        setting_enable_emoji_reaction: If turn off, other users still can react your posts
+        setting_enabled_visibilities: If turn off, you cannot select and post the privacy.
+        setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
+        setting_public_post_to_unlisted: 未対応のサードパーティアプリからもローカル公開で投稿できますが、公開投稿はWeb以外できなくなります
+        setting_reject_send_limited_to_suspects: This applies to "Mutual Only" posts. Circle posts will be delivered without exception. Some Misskey servers have independently supported limited posting, but this is a setting for those who are concerned about it, as mutual-only posting exposes some of the users you are mutual with to Misskey users!
+        setting_reject_unlisted_subscription: Misskey and its forks can **subscribe and search** for "non-following" posts from accounts they do not follow. This differs from kmyblue's behavior. It delivers posts in the specified public range to such servers as "followers only". Please understand, however, that due to its structure, it is difficult to handle perfectly and will occasionally be delivered as non-subscribed.
+        setting_reverse_search_quote: Double-quotes will result in a search with a wider range of notation, which is the opposite of Mastodon's default behavior.
+        setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
+        setting_stop_emoji_reaction_streaming: Helps to save communication capacity.
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
+        subscription_policy: Your post is not picked by antenna
         username: You can use letters, numbers, and underscores
         whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       domain_allow:
@@ -73,19 +98,31 @@ en:
       filters:
         action: Chose which action to perform when a post matches the filter
         actions:
+          half_warn: Hide the filtered content (exclude account info) behind a warning mentioning the filter's title
           hide: Completely hide the filtered content, behaving as if it did not exist
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
         activity_api_enabled: Counts of locally published posts, active users, and new registrations in weekly buckets
-        backups_retention_period: Keep generated user archives for the specified number of days.
+        app_icon: WEBP, PNG, GIF or JPG. Overrides the default app icon on mobile devices with a custom icon.
+        backups_retention_period: Users have the ability to generate archives of their posts to download later. When set to a positive value, these archives will be automatically deleted from your storage after the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
-        content_cache_retention_period: All posts and boosts from other servers will be deleted after the specified number of days. Some posts may not be recoverable. All related bookmarks, favourites and boosts will also be lost and impossible to undo.
+        content_cache_retention_period: All posts from other servers (including boosts and replies) will be deleted after the specified number of days, without regard to any local user interaction with those posts. This includes posts where a local user has marked it as bookmarks or favorites. Private mentions between users from different instances will also be lost and impossible to restore. Use of this setting is intended for special purpose instances and breaks many user expectations when implemented for general purpose use.
         custom_css: You can apply custom styles on the web version of Mastodon.
+        delete_content_cache_without_reaction: This feature currently raises concerns about load. We anticipate the emergence of user bots that bookmark all posts. Please consider this carefully, especially on large servers.
+        enable_local_timeline: While enabling this feature will allow for interaction between like-minded users, it may also strengthen the internal atmosphere; since Mastodon is supposed to have a local timeline, we recommend annotating it in the server introduction if it is to be disabled.
+        enable_public_unlisted_visibility: If true, your community maybe closed-minded. If turn it false, strongly recommend that you disclose that you have disabled this setting!
+        enable_public_visibility: If disabled, public posts will be forcibly replaced with "Local public" or "Unlisted" posts.
+        favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
-        media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
+        media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
+        receive_other_servers_emoji_reaction: It can cause load. It is recommended to enable it only when there are few people.
+        registrations_end_hour: 新規登録が承認なしで可能な時間帯の開始時間を指定します。これより前の時間に登録することはできません。終了時間より後にすることはできません。この時間帯から外れた新規登録には、別途承認が必要となります。
+        registrations_limit: 現在のユーザー数がこれを超過すると、管理者がこの数値を増やさない限り新規登録できません。0を指定すると、この制限を無効化します。
+        registrations_limit_per_day: 本日登録されたユーザー数がこれを超過すると、UTC時刻で翌日0時にならない限り新規登録できません。0を指定すると、この制限を無効化します。
+        registrations_start_hour: 新規登録が承認なしで可能な時間帯の終了時間を指定します。これより後の時間に登録することはできません。開始時間より前にすることはできません。この時間帯から外れた新規登録には、別途承認が必要となります。
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
         site_contact_email: How people can reach you for legal or support inquiries.
         site_contact_username: How people can reach you on Mastodon.
@@ -94,6 +131,7 @@ en:
         site_terms: Use your own privacy policy or leave blank to use the default. Can be structured with Markdown syntax.
         site_title: How people may refer to your server besides its domain name.
         status_page_url: URL of a page where people can see the status of this server during an outage
+        streaming_other_servers_emoji_reaction: Check network lines and server load as large amounts of data are delivered. If the server load is high, try unchecking the box temporarily.
         theme: Theme that logged out visitors and new users see.
         thumbnail: A roughly 2:1 image displayed alongside your server information.
         timeline_preview: Logged out visitors will be able to browse the most recent public posts available on the server.
@@ -116,6 +154,7 @@ en:
           sign_up_requires_approval: New sign-ups will require your approval
         severity: Choose what will happen with requests from this IP
       rule:
+        hint: Optional. Provide more details about the rule
         text: Describe a rule or requirement for users on this server. Try to keep it short and simple
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
@@ -123,6 +162,10 @@ en:
       settings:
         indexable: Your profile page may appear in search results on Google, Bing, and others.
         show_application: You will always be able to see which app published your post regardless.
+      subscription_policy:
+        allow: Allow
+        block: Block
+        followers_only: Followers only
       tag:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
@@ -142,9 +185,14 @@ en:
       account:
         discoverable: Feature profile and posts in discovery algorithms
         fields:
+          examples:
+            name_1: 例) GitHub
+            value_1: 例) https://github.com/xxxxxx
           name: Label
           value: Content
         indexable: Include public posts in search results
+        indexable_kmyblue: Enable indexable
+        searchability_kmyblue: Default searchability
         show_collections: Show follows and followers on profile
         unlocked: Automatically accept new followers
       account_alias:
@@ -184,71 +232,162 @@ en:
         context: Filter contexts
         current_password: Current password
         data: Data
+        discoverable: Suggest account to others
+        discoverable_local: Disallow suggesting account on other servers
         display_name: Display name
+        domain: Domain
         email: E-mail address
         expires_in: Expire after
         fields: Extra fields
+        group: This is a group account
         header: Header picture
         honeypot: "%{label} (do not fill in)"
         inbox_url: URL of the relay inbox
         irreversible: Drop instead of hide
         locale: Interface language
         max_uses: Max number of uses
+        my_actor_type: Account type
         new_password: New password
         note: Bio
         otp_attempt: Two-factor code
         password: Password
+        person: This is a normal account
         phrase: Keyword or phrase
         setting_advanced_layout: Enable advanced web interface
         setting_aggregate_reblogs: Group boosts in timelines
+        setting_allow_quote: Allow quote your posts
         setting_always_send_emails: Always send e-mail notifications
         setting_auto_play_gif: Auto-play animated GIFs
+        setting_bio_markdown: Enable profile markdown
+        setting_bookmark_category_needed: Category selection needed when registering bookmark on web
+        setting_boost_menu: Show popup when click boost button
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_language: Posting language
         setting_default_privacy: Posting privacy
+        setting_default_reblog_privacy: Reblogging privacy
+        setting_default_searchability: Searchability of your own post
+        setting_default_searchability_of_search: Your search setting
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
         setting_disable_swiping: Disable swiping motions
+        setting_disallow_unlisted_public_searchability: Disallow everyone or local searchability when unlisted visibility
         setting_display_media: Media display
         setting_display_media_default: Default
+        setting_display_media_expand: Show more medias
         setting_display_media_hide_all: Hide all
         setting_display_media_show_all: Show all
+        setting_dtl_force_searchability: Post searchability
+        setting_dtl_force_subscribable: Ignore your subscribability setting when using the DTL tag
+        setting_dtl_force_visibility: Post visibility
+        setting_dtl_menu: Show DTL menu on web
+        setting_emoji_reaction_policy: Emoji reaction receive/display policy
+        setting_emoji_reaction_policy_items:
+          allow: Allow all
+          block: Block
+          followers_only: Followers only
+          following_only: Followings only
+          mutuals_only: Mutuals only
+          outside_only: Followings or followers only
+        setting_emoji_reaction_streaming_notify_impl2: Enable emoji reaction notification compat with Nyastodon, Catstodon, glitch-soc
+        setting_enable_emoji_reaction: Use emoji reaction function
+        setting_enabled_visibilities: Enabled visibilities
         setting_expand_spoilers: Always expand posts marked with content warnings
+        setting_hide_emoji_reaction_unavailable_server: Hide emoji reaction button from unavailable server
         setting_hide_network: Hide your social graph
+        setting_hide_quote_unavailable_server: Hide quote menu from unavailable server
+        setting_hide_status_reference_unavailable_server: Hide quiet quote (reference named by Fedibird) menu from unavailable server
+        setting_lock_follow_from_bot: Request approval about bot follow
+        setting_public_post_to_unlisted: Convert public post to public unlisted if not using Web app
         setting_reduce_motion: Reduce motion in animations
+        setting_reject_public_unlisted_subscription: Reject sending public unlisted visibility/non-public searchability posts to Misskey, Calckey
+        setting_reject_send_limited_to_suspects: Reject sending mutual posts to Misskey
+        setting_reject_unlisted_subscription: Reject sending unlisted visibility/non-public searchability posts to Misskey, Calckey
+        setting_reverse_search_quote: Perform word-by-word search when search keywords are not enclosed in double quotes
+        setting_show_application: Disclose application used to send posts
+        setting_show_blocking_quote: Show posts which have a quote written by the user you are blocking
+        setting_show_emoji_reaction_count: Show emoji reaction number
+        setting_show_emoji_reaction_on_timeline: Show all emoji reactions on timeline
+        setting_show_favourite_menu: Show favourite menu
+        setting_show_followers_count: Show followers count
+        setting_show_following_count: Show following count
+        setting_show_quote_in_home: Show quotes in home, list or antenna timelines
+        setting_show_quote_in_public: Show quotes in public timelines
+        setting_show_recent_emojis: Show recent emojis
+        setting_show_relationships: Show relationships on account page
+        setting_show_statuses_count: Show statuses count
+        setting_simple_timeline_menu: Reduce post menu on timeline
+        setting_slip_local_emoji_reaction: Allow bypassing emoji reaction from local users
+        setting_stay_privacy: Keep visibility after post
+        setting_stop_emoji_reaction_streaming: Disable emoji reaction streamings
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
+        setting_translatable_private: Allow other users translation of your private posts
         setting_trends: Show today's trends
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         setting_use_blurhash: Show colorful gradients for hidden media
         setting_use_pending_items: Slow mode
+        setting_use_public_index: Include permitted accounts post to results of search
         severity: Severity
         sign_in_token_attempt: Security code
+        subscription_policy: Subscribability
         title: Title
         type: Import type
         username: Username
         username_or_email: Username or Email
         whole_word: Whole word
+      dtl_force_searchability:
+        public: Everyone
+        public_unlisted: Local and followers
+        unchange: Unchange
+      dtl_force_visibility:
+        public: Public
+        public_unlisted: Local public
+        unchange: Unchange
+        unlisted: Unlisted
       email_domain_block:
         with_dns_records: Include MX records and IPs of the domain
+      emoji_reactions:
+        deny_from_all: Block all emoji reactions
+        must_be_follower: Block emoji reactions from non-followers
+        must_be_following: Block emoji reactions from people you don't follow
       featured_tag:
         name: Hashtag
       filters:
         actions:
+          half_warn: Half hide with a warning
           hide: Hide completely
           warn: Hide with a warning
+        options:
+          exclude_follows: Exclude following users
+          exclude_localusers: Exclude local users
+          exclude_quote: Exclude quote or references
       form_admin_settings:
         activity_api_enabled: Publish aggregate statistics about user activity in the API
         backups_retention_period: User archive retention period
         bootstrap_timeline_accounts: Always recommend these accounts to new users
+        check_lts_version_only: Check kmyblue LTS version only when update check
         closed_registrations_message: Custom message when sign-ups are not available
-        content_cache_retention_period: Content cache retention period
+        content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
+        delete_content_cache_without_reaction: Exclude favorite/bookmarked posts from deletion
+        enable_emoji_reaction: Enable emoji reaction function
+        enable_local_timeline: Enable local timeline
+        enable_public_unlisted_visibility: Enable public-unlisted visibility / public-unlisted searchability
+        enable_public_visibility: Enable public visibility
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
         peers_api_enabled: Publish list of discovered servers in the API
         profile_directory: Enable profile directory
+        receive_other_servers_emoji_reaction: Receive emoji reaction between other server users
+        registration_button_message: Register button message
+        registrations_end_hour: Registration-without-approval end hour (UTC 0-24)
+        registrations_limit: User registration limit (Current %{count})
+        registrations_limit_per_day: User registration limit per day (Current %{count})
         registrations_mode: Who can sign-up
+        registrations_secondary_end_hour: Secondary registration end hour (UTC 0-24)
+        registrations_secondary_end_hour_hint: If input 0, secondary hour is disabled.
+        registrations_secondary_start_hour: Secondary registration start hour (UTC 0-24)
+        registrations_start_hour: Registration-without-approval start hour (UTC 0-24)
         require_invite_text: Require a reason to join
         show_domain_blocks: Show domain blocks
         show_domain_blocks_rationale: Show why domains were blocked
@@ -259,12 +398,15 @@ en:
         site_terms: Privacy Policy
         site_title: Server name
         status_page_url: Status page URL
+        streaming_local_emoji_reaction: Streaming emoji reactions related to local users
+        streaming_other_servers_emoji_reaction: Streaming emoji reactions between other server users
         theme: Default theme
         thumbnail: Server thumbnail
         timeline_preview: Allow unauthenticated access to public timelines
         trendable_by_default: Allow trends without prior review
         trends: Enable trends
         trends_as_landing_page: Use trends as the landing page
+        unlocked_friend: Accept all friend server follows automatically
       interactions:
         must_be_follower: Block notifications from non-followers
         must_be_following: Block notifications from people you don't follow
@@ -289,6 +431,7 @@ en:
         follow_request: Someone requested to follow you
         mention: Someone mentioned you
         pending_account: New account needs review
+        pending_friend_server: New friend server requires review
         reblog: Someone boosted your post
         report: New report is submitted
         software_updates:
@@ -299,10 +442,15 @@ en:
           patch: Notify on bugfix updates
         trending_tag: New trend requires review
       rule:
+        hint: Additional information
         text: Rule
       settings:
         indexable: Include profile page in search engines
         show_application: Display from which app you sent a post
+      subscription_policy:
+        allow: 全員に許可
+        block: 全員拒否
+        followers_only: フォロワーにのみ許可
       tag:
         listable: Allow this hashtag to appear in searches and suggestions
         name: Hashtag
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index d25412561b..e83f71a2cb 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -39,14 +39,12 @@ eo:
         text: Oni povas apelaci strikin nur unufoje
       defaults:
         autofollow: Homoj, kiuj registriĝos per la invito aŭtomate sekvos vin
-        avatar: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         bot: Tiu konto ĉefe faras aŭtomatajn agojn, kaj povas esti ne kontrolata
         context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi
         current_password: Pro sekuraj kialoj, bonvolu enigi la pasvorton de la nuna konto
         current_username: Por konfirmi, bonvolu enigi la uzantnomon de la nuna konto
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
         email: Vi ricevos konfirman retpoŝton
-        header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
         inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
         irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
         locale: La lingvo de la fasado, retpoŝtaĵoj, kaj sciigoj
@@ -77,13 +75,10 @@ eo:
           warn: Kaŝi la enhavon filtritan malantaŭ averto mencianta la nomon de la filtro
       form_admin_settings:
         activity_api_enabled: Nombroj de loke publikigitaj afiŝoj, aktivaj uzantoj kaj novaj registradoj en semajnaj siteloj
-        backups_retention_period: Konservi generitajn uzantoarkivojn por la kvanto de tagoj.
         bootstrap_timeline_accounts: Ĉi tiuj kontoj pinglitas al la supro de sekvorekomendoj de novaj uzantoj.
         closed_registrations_message: Montrita kiam registroj fermitas
-        content_cache_retention_period: Mesaĝoj de aliaj serviloj forigitas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
         custom_css: Vi povas meti propajn stilojn en la retversio de Mastodon.
         mascot: Anstatauigi la ilustraĵon en la altnivela retinterfaco.
-        media_cache_retention_period: Elŝutitaj audovidaĵojn forigotas post la kvanto de tagoj kiam fiksitas al pozitiva nombro.
         peers_api_enabled: Listo de domajnaj nomoj kiujn ĉi tiu servilo renkontis en la fediverso. Neniuj datumoj estas inkluditaj ĉi tie pri ĉu vi federacias kun donita servilo, nur ke via servilo scias pri ĝi. Ĉi tio estas uzata de servoj kiuj kolektas statistikojn pri federacio en ĝenerala signifo.
         profile_directory: La profilujo listigas ĉiujn uzantojn kiu volonte malkovrebli.
         require_invite_text: Kiam registroj bezonas permanan aprobon, igi la "Kial vi volas aliĝi?" tekstoenigon deviga anstau nedeviga
@@ -242,7 +237,6 @@ eo:
         backups_retention_period: Uzantoarkivretendauro
         bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
         closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
-        content_cache_retention_period: Enhavkaŝaĵretendauro
         custom_css: Propa CSS
         mascot: Propa maskoto
         media_cache_retention_period: Audovidaĵkaŝaĵretendauro
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 9b52ece34e..e346a23a02 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -39,14 +39,14 @@ es-AR:
         text: Sólo podés apelar un incumplimiento una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
         current_username: Para confirmar, por favor, ingresá el nombre de usuario de la cuenta actual
         digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
         email: Se te enviará un correo electrónico de confirmación
-        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
         irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
         locale: El idioma de la interface de usuario, correos electrónicos y notificaciones push
@@ -77,13 +77,15 @@ es-AR:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteos de mensajes publicados localmente, cuentas activas y nuevos registros en tandas semanales
-        backups_retention_period: Conservar los archivos historiales generados por el usuario durante el número de días especificado.
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el ícono de aplicación predeterminado en dispositivos móviles con uno personalizado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos historiales de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente de su almacenamiento después del número especificado de días.
         bootstrap_timeline_accounts: Estas cuentas serán fijadas a la parte superior de las recomendaciones de cuentas a seguir para nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Todos los mensajes y adhesiones de otros servidores se eliminarán después del número especificado de días. Es posible que algunos mensajes no sean recuperables. Todos los marcadores relacionados, mensajes marcados como favoritos y adhesiones también se perderán y será imposible de deshacer.
+        content_cache_retention_period: Todos los mensajes de otros servidores (incluyendo adhesiones y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes que un usuario local haya agregado a marcadores o los haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes servidores también se perderán y también serán imposibles de restaurar. El uso de esta configuración está destinado a servidores de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general.
         custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicón predeterminado de Mastodon con uno personalizado.
         mascot: Reemplaza la ilustración en la interface web avanzada.
-        media_cache_retention_period: Los archivos de medios descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se volverán a descargar a pedido.
+        media_cache_retention_period: Los archivos de medios de mensajes publicados por usuarios remotos se almacenan en la memoria caché en tu servidor. Cuando se establece un valor positivo, los medios se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si es que el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlace consultan a sitios web de terceros, se recomienda establecer este valor a, al menos, 14 días, o las tarjetas de previsualización de enlaces no se actualizarán a pedido antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Acá no se incluye ningún dato sobre si federás con un servidor determinado, sólo que tu servidor lo conoce. Esto es usado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado a que su cuenta pueda ser descubierta.
         require_invite_text: Cuando registros aprobación manual, hacé que la solicitud de invitación "¿Por qué querés unirte?" sea obligatoria, en vez de opcional
@@ -116,6 +118,7 @@ es-AR:
           sign_up_requires_approval: Los nuevos registros requerirán tu aprobación
         severity: Elegí lo que pasará con las solicitudes desde esta dirección IP
       rule:
+        hint: Opcional. Ofrecé más detalles sobre la regla
         text: Describí una regla o requisito para los usuarios de este servidor. Intentá hacerla corta y sencilla
       sessions:
         otp: 'Ingresá el código de autenticación de dos factores generado por la aplicación en tu dispositivo, o usá uno de tus códigos de recuperación:'
@@ -242,7 +245,7 @@ es-AR:
         backups_retention_period: Período de retención del archivo historial del usuario
         bootstrap_timeline_accounts: Siempre recomendar estas cuentas a usuarios nuevos
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de la caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de la caché de medios
@@ -299,6 +302,7 @@ es-AR:
           patch: Notificar sobre actualizaciones de corrección de errores
         trending_tag: Una nueva tendencia requiere revisión
       rule:
+        hint: Información adicional
         text: Regla
       settings:
         indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 932ed6c59a..b3c8a857e8 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -39,14 +39,14 @@ es-MX:
         text: Sólo puede apelar una amonestación a la vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
         email: Se le enviará un correo de confirmación
-        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
@@ -77,13 +77,15 @@ es-MX:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos, y nuevos registros en periodos semanales
-        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el icono de aplicación predeterminado en dispositivos móviles con un icono personalizado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicon predeterminado de Mastodon con un icono personalizado.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
-        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el fediverso. Aquí no se incluye ningún dato sobre si usted federa con un servidor determinado, sólo que su servidor lo sabe. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
         require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
@@ -116,6 +118,7 @@ es-MX:
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
+        hint: Opcional. Proporciona más detalles sobre la regla
         text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
       sessions:
         otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -242,7 +245,7 @@ es-MX:
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
@@ -299,6 +302,7 @@ es-MX:
           patch: Notificar en actualizaciones de errores
         trending_tag: La nueva tendencia requiere de revisión
       rule:
+        hint: Información adicional
         text: Norma
       settings:
         indexable: Incluir la página de perfil en los motores de búsqueda
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 997f09bf08..2fb5cab987 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -11,9 +11,9 @@ es:
         show_collections: Las personas podrán navegar a través de tus seguidos y seguidores. Esto no impide que las personas que sigues sepan que las estás siguiendo.
         unlocked: Las personas podrán seguirte sin pedir aprobación. Desmarca si deseas revisar las solicitudes de seguimiento y aceptar o rechazar nuevos seguidores.
       account_alias:
-        acct: Especifique su nombre de usuario@dominio de la cuenta de donde se desea migrar
+        acct: Especifica el nombre_de_usuario@dominio de la cuenta desde donde deseas migrar
       account_migration:
-        acct: Especifique el nombre de usuario@dominio de la cuenta de la cual se desea migrar
+        acct: Especifica el nombre_de_usuario@dominio de la cuenta hacia la que quieres migrar
       account_warning_preset:
         text: Puede usar sintaxis de publicaciones, como URLs, hashtags y menciones
         title: Opcional. No es visible para el destinatario
@@ -21,14 +21,14 @@ es:
         include_statuses: El usuario verá qué publicaciones han causado la acción de moderación o advertencia
         send_email_notification: El usuario recibirá una explicación de lo que ha sucedido con su cuenta
         text_html: Opcional. Puede usar sintaxis de publicaciones. Puede añadir <a href="%{path}">configuraciones predefinidas de advertencia</a> para ahorrar tiempo
-        type_html: Elige lo qué vas a hacer con <strong>%{acct}</strong>
+        type_html: Elige lo que vas a hacer con <strong>%{acct}</strong>
         types:
           disable: Evita que el usuario utilice su cuenta, pero no elimina ni oculta sus contenidos.
-          none: Utilizar esto para enviar una advertencia al usuario, sin poner en marcha ninguna otra acción.
+          none: Utiliza esto para enviar una advertencia al usuario, sin ejecutar ninguna otra acción.
           sensitive: Forzar que todos los archivos multimedia de este usuario sean marcados como sensibles.
           silence: Evita que el usuario pueda publicar con visibilidad pública, y oculta sus mensajes y notificaciones a personas que no lo siguen. Cierra todos los informes contra esta cuenta.
           suspend: Evita cualquier interacción desde o hacia esta cuenta y elimina su contenido. Reversible en 30 días. Cierra todos los informes contra esta cuenta.
-        warning_preset_id: Opcional. Aún puede añadir texto personalizado al final de la configuración predefinida
+        warning_preset_id: Opcional. Aún puedes añadir texto personalizado al final de la configuración predefinida
       announcement:
         all_day: Cuando está seleccionado solo se mostrarán las fechas del rango de tiempo
         ends_at: Opcional. El anuncio desaparecerá automáticamente en este momento
@@ -36,17 +36,17 @@ es:
         starts_at: Opcional. En caso de que su anuncio esté vinculado a un intervalo de tiempo específico
         text: Puedes usar la sintaxis de publicaciones. Por favor ten en cuenta el espacio que ocupará el anuncio en la pantalla del usuario
       appeal:
-        text: Sólo puedes apelar una amonestación una vez
+        text: Solo puedes apelar la amonestación una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual
         current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
         email: Se le enviará un correo de confirmación
-        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
         inbox_url: Copia la URL de la página principal del relés que quieres utilizar
         irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
         locale: El idioma de la interfaz de usuario, correos y notificaciones push
@@ -77,13 +77,15 @@ es:
           warn: Ocultar el contenido filtrado detrás de una advertencia mencionando el título del filtro
       form_admin_settings:
         activity_api_enabled: Conteo de publicaciones publicadas localmente, usuarios activos y registros nuevos cada semana
-        backups_retention_period: Mantener los archivos de usuario generados durante el número de días especificado.
+        app_icon: WEBP, PNG, GIF o JPG. Reemplaza el icono de aplicación predeterminado en dispositivos móviles con un icono personalizado.
+        backups_retention_period: Los usuarios tienen la capacidad de generar archivos de sus mensajes para descargar más adelante. Cuando se establece un valor positivo, estos archivos se eliminarán automáticamente del almacenamiento después del número de días especificado.
         bootstrap_timeline_accounts: Estas cuentas aparecerán en la parte superior de las recomendaciones de los nuevos usuarios.
         closed_registrations_message: Mostrado cuando los registros están cerrados
-        content_cache_retention_period: Las publicaciones de otros servidores se eliminarán después del número especificado de días cuando se establezca un valor positivo. Esto puede ser irreversible.
+        content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general.
         custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicon predeterminado de Mastodon con un icono personalizado.
         mascot: Reemplaza la ilustración en la interfaz web avanzada.
-        media_cache_retention_period: Los archivos multimedia descargados se eliminarán después del número especificado de días cuando se establezca un valor positivo, y se redescargarán bajo demanda.
+        media_cache_retention_period: Los archivos multimedia de las publicaciones creadas por usuarios remotos se almacenan en caché en tu servidor. Cuando se establece un valor positivo, estos archivos se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlaces realizan peticiones a sitios de terceros, se recomienda establecer este valor a al menos 14 días, o las tarjetas de previsualización de enlaces no se actualizarán bajo demanda antes de ese momento.
         peers_api_enabled: Una lista de nombres de dominio que este servidor ha encontrado en el Fediverso. Aquí no se incluye ningún dato sobre si federas con un servidor determinado, solo que tu servidor lo conoce. Esto es utilizado por los servicios que recopilan estadísticas sobre la federación en un sentido general.
         profile_directory: El directorio de perfiles lista a todos los usuarios que han optado por que su cuenta pueda ser descubierta.
         require_invite_text: Cuando los registros requieren aprobación manual, hace obligatoria la entrada de texto "¿Por qué quieres unirte?" en lugar de opcional
@@ -116,6 +118,7 @@ es:
           sign_up_requires_approval: Nuevos registros requerirán su aprobación
         severity: Elegir lo que pasará con las peticiones desde esta IP
       rule:
+        hint: Opcional. Proporciona más detalles sobre la regla
         text: Describe una norma o requisito para los usuarios de este servidor. Intenta hacerla corta y sencilla
       sessions:
         otp: 'Introduce el código de autenticación de dos factores generado por tu aplicación de teléfono o usa uno de tus códigos de recuperación:'
@@ -242,7 +245,7 @@ es:
         backups_retention_period: Período de retención del archivo de usuario
         bootstrap_timeline_accounts: Recomendar siempre estas cuentas a nuevos usuarios
         closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles
-        content_cache_retention_period: Período de retención de caché de contenido
+        content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
@@ -299,6 +302,7 @@ es:
           patch: Notificar de actualizaciones de errores
         trending_tag: Una nueva tendencia requiere revisión
       rule:
+        hint: Información adicional
         text: Norma
       settings:
         indexable: Incluye la página de perfil en los buscadores
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 501e1f333e..b2ad4c51cf 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -39,14 +39,14 @@ et:
         text: Otsust on võimalik vaidlustada vaid 1 kord
       defaults:
         autofollow: Inimesed, kes loovad konto selle kutse läbi, automaatselt jälgivad sind
-        avatar: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
+        avatar: WEBP, PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         bot: Teavita teisi, et see konto teeb enamjaolt automatiseeritud tegevusi ja ei pruugi olla järelvalve all
         context: Üks või mitu konteksti, mille vastu see filter peaks rakenduma
         current_password: Sisesta turvalisuse huvides oma siinse konto salasõna
         current_username: Kinnitamiseks palun sisesta oma konto kasutajanimi
         digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
         email: Sulle saadetakse e-posti teel kinnituskiri
-        header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
+        header: WEBP, PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
         inbox_url: Kopeeri soovitud vahendaja avalehe URL
         irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja tõuketeadete keel
@@ -77,13 +77,10 @@ et:
           warn: Varja filtreeritud sisu hoiatusega, nimetades filtri pealkirja
       form_admin_settings:
         activity_api_enabled: Kohalike postituste, aktiivsete kasutajate ja uute registreerumistr arv nädala kaupa grupeeritult
-        backups_retention_period: Talleta genereeritud kasutajaarhiivid määratud arv päevi.
         bootstrap_timeline_accounts: Need kasutajad kinnitatakse uute kasutajate jälgimissoovituste esiritta.
         closed_registrations_message: Kuvatakse, kui liitumised pole võimalikud
-        content_cache_retention_period: Teiste serverite postitused kustutatakse pärast määratud päevade arvu, kui see on seatud positiivsele väärtusele. See võib olla pöördumatu.
         custom_css: Kohandatud stiile on võimalik kasutada Mastodoni veebiliideses.
         mascot: Asendab kohandatud veebiliidese illustratsiooni.
-        media_cache_retention_period: Positiivse väärtuse korral kustutatakse allalaetud meediafailid määratud päevade möödudes. Vajadusel laaditakse need uuesti alla.
         peers_api_enabled: Domeeninimede loetelu, mida see server on Fediversumis kohanud. Mitte mingeid andmeid selle serveri födereerumise kohta antud serverite pole, vaid üksnes info, et sellest serverist ollakse teadlik. Seda kasutavad teenused, mis koguvad üldist födereerumise statistikat.
         profile_directory: Kasutajate kataloog kuvab nimekirja kasutajatest, kes on seda lubanud.
         require_invite_text: Kui liitumisi on tarvis kinnitada, oleks "Miks soovid liituda?" vastus vajalik
@@ -116,6 +113,7 @@ et:
           sign_up_requires_approval: Uued liitumised vajavad kinnitamist
         severity: Valik, mis juhtub päringutega sellelt IP-aadressilt
       rule:
+        hint: Valikuline. Anna reegli kohta rohkem üksikasju
         text: Reegli või nõude kirjeldus selle serveri kasutajatele. Võimalikult lühidalt ja lihtsalt
       sessions:
         otp: 'Kaheastmelise autentimise kood telefonirakendusest või mõni taastekood:'
@@ -242,7 +240,6 @@ et:
         backups_retention_period: Kasutajate arhiivi talletusperiood
         bootstrap_timeline_accounts: Alati soovita neid kontosid uutele kasutajatele
         closed_registrations_message: Kohandatud teade, kui liitumine pole võimalik
-        content_cache_retention_period: Meediapuhvri talletusperiood
         custom_css: Kohandatud CSS
         mascot: Kohandatud maskott (kunagine)
         media_cache_retention_period: Meediapuhvri talletusperiood
@@ -299,6 +296,7 @@ et:
           patch: Teata veaparandusuuendustest
         trending_tag: Uus trend vajab ülevaatust
       rule:
+        hint: Lisainfo
         text: Reegel
       settings:
         indexable: Kaasa profiilileht otsimootoritesse
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 6f2bbfd969..8c467bc9bf 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -3,7 +3,7 @@ eu:
   simple_form:
     hints:
       account:
-        discoverable: Zure bidalketa publikoak eta profila nabarmendu edo gomendatu egin daitezke Mastodoneko hainbat eremutan eta zure profila beste erabiltzaile batzuei iradoki dakieke.
+        discoverable: Zure bidalketa publikoak eta profila nabarmendu edo gomendatu egin daitezke Mastodon-go hainbat eremutan eta zure profila beste erabiltzaile batzuei iradoki dakieke.
         display_name: Zure izena edo ezizena.
         fields: Zure webgunea, izenordainak, adina, nahi duzun guztia.
         indexable: Zure argitalpen publikoak bilaketa-emaitzetan ager daitezke Mastodonen. Zure argitalpenekin elkarregin duten jendeak ikusi ahal izango dituzte, hala ere.
@@ -39,14 +39,14 @@ eu:
         text: Neurri bati apelazioa behin bakarrik jarri diezaiokezu
       defaults:
         autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
-        avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
+        avatar: WEBP, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
         bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen
         context: Iragazkia aplikatzeko testuinguru bat edo batzuk
         current_password: Segurtasunagatik sartu uneko kontuaren pasahitza
         current_username: Berresteko sartu uneko kontuaren erabiltzaile-izena
-        digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
+        digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu soilik
         email: Baieztapen e-mail bat bidaliko zaizu
-        header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
+        header: WEBP, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
         inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
         irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
@@ -77,13 +77,15 @@ eu:
           warn: Ezkutatu iragazitako edukia iragazkiaren izenburua duen abisu batekin
       form_admin_settings:
         activity_api_enabled: Lokalki argitaratutako bidalketak, erabiltzaile aktiboak, eta izen-emateen kopuruak astero zenbatzen ditu
-        backups_retention_period: Mantendu sortutako erabiltzailearen artxiboa zehazturiko egun kopuruan.
+        app_icon: WEBP, PNG, GIF edo JPG. Aplikazioaren ikono lehenetsia gainidazten du ikono pertsonalizatu batekin gailu mugikorretan.
+        backups_retention_period: Erabiltzaileek geroago deskarga dezaketen beren argitalpenen artxiboak sor ditzakete. Balio positibo bat ezartzean, artxibo hauek biltegiratzetik automatikoki ezabatuko dira zehazturiko egunen buruan.
         bootstrap_timeline_accounts: Kontu hauek erabiltzaile berrien jarraitzeko gomendioen goiko aldean ainguratuko dira.
         closed_registrations_message: Izen-ematea itxia dagoenean bistaratua
-        content_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietako bidalketak ezabatuko dira. Hau ezin da desegin.
+        content_cache_retention_period: Beste zerbitzarietako argitalpen guztiak (bultzadak eta erantzunak barne) ezabatuko dira zehazturiko egunen buruan, argitalpen horiek izan ditzaketen erabiltzaile lokalaren interakzioa kontuan izanik gabe. Instantzia desberdinetako erabiltzaileen arteko aipamen pribatuak ere galdu egingo dira eta ezin izango dira berreskuratu. Ezarpen honen erabilera xede berezia duten instantziei zuzendua dago eta erabiltzaileen itxaropena hausten da orotariko erabilerarako inplementatzean.
         custom_css: Estilo pertsonalizatuak aplikatu ditzakezu Mastodonen web bertsioan.
+        favicon: WEBP, PNG, GIF or JPG. Mastodon-en favicon-a gainidazten du ikono pertsonalizatu batekin.
         mascot: Web interfaze aurreratuko ilustrazioa gainidazten du.
-        media_cache_retention_period: Balio positibo bat ezarriz gero, egun kopuru horretara iristean beste zerbitzarietatik deskargatutako multimedia fitxategiak ezabatuko dira. Ondoren, eskatu ahala deskargatuko dira berriz.
+        media_cache_retention_period: Multimedia-fitxategiak dituzten urruneko erabiltzaileen argitalpenak zure zerbitzarian gordetzen dira cachean. Balio positiboa ezartzean, multimedia zehazturiko egunen buruan ezabatuko da. Multimedia-datuak eskatzen badira ezabatu ostean, berriro deskargatuko dira, iturburuko edukia oraindik erabilgarri badago. Estekaren aurrebistako txartelek hirugarrenen guneei zenbatetan dei diezaieketen mugatzen dieten murrizketak direla eta, balio honi, gutxienez, 14 egunen balioa ezartzea gomendatzen da, bestela, esteken aurrebistako txartelak ez dira eguneratuko eskatu ahala denbora horren aurretik.
         peers_api_enabled: Zerbitzari honek fedibertsoan ikusi dituen zerbitzarien domeinu-izenen zerrenda. Ez da daturik ematen zerbitzari jakin batekin federatzearen ala ez federatzearen inguruan, zerbitzariak haien berri duela soilik. Federazioari buruzko estatistika orokorrak biltzen dituzten zerbitzuek erabiltzen dute hau.
         profile_directory: Profilen direktorioan ikusgai egotea aukeratu duten erabiltzaile guztiak zerrendatzen dira.
         require_invite_text: Izen emateak eskuz onartu behar direnean, "Zergatik elkartu nahi duzu?" testu sarrera derrigorrezko bezala ezarri, ez hautazko
@@ -116,6 +118,7 @@ eu:
           sign_up_requires_approval: Izen emate berriek zure onarpena beharko dute
         severity: Aukeratu zer gertatuko den IP honetatik datozen eskaerekin
       rule:
+        hint: Aukerakoa. Eman arauari buruzko xehetasun gehiago.
         text: Deskribatu zerbitzari honetako erabiltzaileentzako arau edo betekizun bat. Saiatu labur eta sinple idazten
       sessions:
         otp: 'Sartu zure telefonoko aplikazioak sortutako bi faktoreetako kodea, edo erabili zure berreskuratze kodeetako bat:'
@@ -126,7 +129,7 @@ eu:
       tag:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       user:
-        chosen_languages: Ezer markatzekotan, hautatutako hizkuntzetan dauden tootak besterik ez dira erakutsiko
+        chosen_languages: Markatzean, hautatutako hizkuntzetan dauden tutak besterik ez dira erakutsiko.
         role: Rolak erabiltzaileak dituen baimenak kontrolatzen ditu
       user_role:
         color: Rolarentzat erabiltzaile interfazean erabiliko den kolorea, formatu hamaseitarreko RGB bezala
@@ -242,7 +245,7 @@ eu:
         backups_retention_period: Erabiltzailearen artxiboa gordetzeko epea
         bootstrap_timeline_accounts: Gomendatu beti kontu hauek erabiltzaile berriei
         closed_registrations_message: Izen-emateak itxita daudenerako mezu pertsonalizatua
-        content_cache_retention_period: Edukiaren cache-a atxikitzeko epea
+        content_cache_retention_period: Urruneko edukiaren atxikipen-aldia
         custom_css: CSS pertsonalizatua
         mascot: Maskota pertsonalizatua (zaharkitua)
         media_cache_retention_period: Multimediaren cachea atxikitzeko epea
@@ -299,6 +302,7 @@ eu:
           patch: Jakinarazi akats zuzenketa eguneraketa guztiak
         trending_tag: Joera berriak berrikuspena behar du
       rule:
+        hint: Informazio gehigarria
         text: Araua
       settings:
         indexable: Gehitu profila bilaketa-motorretan
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 23fbc43b07..dd1c56e3bd 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -39,14 +39,12 @@ fa:
         text: فقط یک بار می‌توانید برای اخطار درخواست تجدیدنظر کنید
       defaults:
         autofollow: کسانی که از راه دعوت‌نامه عضو می‌شوند به طور خودکار پیگیر شما خواهند شد
-        avatar: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         bot: این حساب بیشتر به طور خودکار فعالیت می‌کند و نظارت پیوسته‌ای روی آن وجود ندارد
         context: یک یا چند زمینه که پالایه باید در آن‌ها اعمال شود
         current_password: به دلایل امنیتی لطفاً گذرواژه این حساب را وارد کنید
         current_username: برای تأیید، لطفاً نام کاربری حساب فعلی را وارد کنید
         digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
         email: به شما ایمیل تأییدی فرستاده خواهد شد
-        header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
         inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
         irreversible: فرسته‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
         locale: زبان واسط کاربری، رایانامه‌ها و آگاهی‌های ارسالی
@@ -64,7 +62,7 @@ fa:
         username: تنها می‌توانید از حروف، اعداد، و زیرخط استفاده کنید
         whole_word: اگر کلیدواژه فقط دارای حروف و اعداد باشد، تنها وقتی پیدا می‌شود که با کل یک واژه در متن منطبق باشد، نه با بخشی از یک واژه
       domain_allow:
-        domain: این دامین خواهد توانست داده‌ها از این سرور را دریافت کند و داده‌های از این دامین در این‌جا پردازش و ذخیره خواهند شد
+        domain: این دامنه خواهد توانست داده‌ها را از این کارساز واکشی کرده و داده‌های ورودی از آن پردازش و ذخیره خواهند شد
       email_domain_block:
         domain: این می‌تواند نام دامنه‌ای باشد که در نشانی رایانامه یا رکورد MX استفاده می‌شود. پس از ثبت نام بررسی خواهند شد.
         with_dns_records: تلاشی برای resolve کردن رکوردهای ساناد دامنهٔ داده‌شده انجام شده و نتیجه نیز مسدود خواهد شد
@@ -77,13 +75,10 @@ fa:
           warn: نهفتن محتوای پالوده پشت هشداری که به عنوان پالایه اشاره می‌کند
       form_admin_settings:
         activity_api_enabled: تعداد بوق‌های منتشرهٔ محلی، کاربران فعال، و کاربران تازه در هر هفته
-        backups_retention_period: نگه داشتن بایگانی‌های کاربری برای روزهای مشخّص شده.
         bootstrap_timeline_accounts: سنجاق کردنThese accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: نمایش داده هنگام بسته بودن ثبت‌نام‌ها
-        content_cache_retention_period: همهٔ فرسته‌ها و تقویت‌ها از دیگر کارسازها پس از روزهای نشخّص حذف خواهند شد. ممکن است برخی فرسته‌ها قابل بازیابی نباشند. همهٔ نشانک‌ها، پسندها و تقویت‌ها نیز از دست خواهند رفت و قابل بازگشت نخواهند بود.
         custom_css: می‌توانیدروی نگارش وب ماستودون سبک‌های سفارشی اعمال کنید.
         mascot: نقش میانای وب پیش‌رفته را پایمال می‌کند.
-        media_cache_retention_period: اگر به مقدار مثبتی تنظیم شود، پرونده‌های رسانهٔ بارگرفته پس از روزهای مشخّص شده حذف خواهند شد و هنگام درخواست دوباره بارگرفته می‌شوند.
         peers_api_enabled: فهرستی از نام‌های دامنه‌ای که این کارساز در فدیورس با آن مواجه شده است. هیچ اطلاعاتی در مورد اینکه آیا شما با یک کارساز داده شده متعهد هستید، در اینجا گنجانده نشده است، فقط کارساز شما در مورد آن می‌داند. این توسط خدماتی استفاده می‌شود که آمار مربوط به فدراسیون را به معنای کلی جمع‌آوری می‌کنند.
         profile_directory: شاخهٔ نمایه، همهٔ کاربرانی که کشف‌پذیری را برگزیده‌اند سیاهه می‌کند.
         require_invite_text: زمانی که نام‌نویسی ها نیازمند تایید دستی است، متن «چرا می‌خواهید بپیوندید؟» بخش درخواست دعوت را به جای اختیاری، اجباری کنید
@@ -227,7 +222,6 @@ fa:
         backups_retention_period: دورهٔ نگه‌داری بایگانی کاربری
         bootstrap_timeline_accounts: پیشنهاد همیشگی این حساب‌ها به کاربران جدید
         closed_registrations_message: پیام سفارشی هنگام در دسترس نبودن ثبت‌نام‌ها
-        content_cache_retention_period: دورهٔ نگه‌داری انبارهٔ محتوا
         custom_css: سبک CSS سفارشی
         mascot: نشان سفارشی (قدیمی)
         media_cache_retention_period: دورهٔ نگه‌داری انبارهٔ رسانه
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 29f2398a90..4971e25022 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -5,7 +5,7 @@ fi:
       account:
         discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
         display_name: Koko nimesi tai lempinimesi.
-        fields: Kotisivusi, pronominit, ikä, mitä ikinä haluat.
+        fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
         indexable: Julkiset julkaisusi voivat näkyä hakutuloksissa Mastodonissa. Ihmiset, jotka ovat olleet vuorovaikutuksessa julkaisujesi kanssa, voivat etsiä niitä asetuksesta riippumatta.
         note: 'Voit @mainita muita käyttäjiä tai #aihetunnisteita.'
         show_collections: Käyttäjät voivat selata seurattujasi ja seuraajiasi. Käyttäjät, joita seuraat, näkevät joka tapauksessa, että seuraat heitä.
@@ -39,14 +39,14 @@ fi:
         text: Voit valittaa varoituksesta vain kerran
       defaults:
         autofollow: Henkilöt, jotka rekisteröityvät kutsun kautta, seuraavat sinua automaattisesti
-        avatar: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
+        avatar: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         bot: Tämä tili suorittaa enimmäkseen automaattisia toimintoja eikä sitä ehkä valvota
         context: Ainakin yksi konteksti, jossa suodattimen pitäisi olla voimassa
         current_password: Turvallisuussyistä kirjoita nykyisen tilin salasana
         current_username: Vahvista kirjoittamalla nykyisen tilin käyttäjänimi
         digest: Lähetetään vain pitkän poissaolon jälkeen ja vain, jos olet saanut suoria viestejä poissaolosi aikana
         email: Sinulle lähetetään vahvistussähköposti
-        header: PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
+        header: WEBP, PNG, GIF tai JPG. Enintään %{size}. Skaalataan kokoon %{dimensions} px
         inbox_url: Kopioi URL-osoite haluamasi välittäjän etusivulta
         irreversible: Suodatetut julkaisut katoavat lopullisesti, vaikka suodatin poistettaisiin myöhemmin
         locale: Käyttöliittymän, sähköpostien ja puskuilmoitusten kieli
@@ -55,14 +55,14 @@ fi:
         scopes: Mihin sovellusliittymiin sovellus pääsee käsiksi. Jos valitset ylätason laajuuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
-        setting_default_sensitive: Arkaluonteinen media on oletuksena piilotettu, ja se voidaan näyttää yhdellä napsautuksella
+        setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
         setting_display_media_default: Piilota arkaluonteiseksi merkitty media
-        setting_display_media_hide_all: Piilota media aina
-        setting_display_media_show_all: Näytä media aina
+        setting_display_media_hide_all: Piilota mediasisältö aina
+        setting_display_media_show_all: Näytä mediasisältö aina
         setting_use_blurhash: Liukuvärit perustuvat piilotettujen kuvien väreihin mutta sumentavat yksityiskohdat
         setting_use_pending_items: Piilota aikajanan päivitykset napsautuksen taakse syötteen automaattisen vierityksen sijaan
         username: Voit käyttää kirjaimia, numeroita ja alaviivoja
-        whole_word: Kun avainsana tai -fraasi on kokonaan aakkosnumeerinen, se on voimassa vain, jos se vastaa koko sanaa
+        whole_word: Kun avainsana tai -fraasi on täysin aakkosnumeerinen, suodatin aktivoituu vain sen täysvastineille
       domain_allow:
         domain: Tämä verkkotunnus voi noutaa tietoja tältä palvelimelta ja sieltä saapuvat tiedot käsitellään ja tallennetaan
       email_domain_block:
@@ -77,13 +77,13 @@ fi:
           warn: Piilota suodatettu sisältö varoituksen taakse, jossa mainitaan suodattimen nimi
       form_admin_settings:
         activity_api_enabled: Paikallisesti julkaistujen julkaisujen, aktiivisten käyttäjien ja rekisteröitymisten viikoittainen määrä
-        backups_retention_period: Säilytä luodut arkistot määritetyn määrän päiviä.
-        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuositusten yläpuolelle.
+        app_icon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen mobiililaitteiden sovelluskuvakkeen omalla kuvakkeella.
+        backups_retention_period: Käyttäjillä on mahdollisuus arkistoida julkaisujaan myöhemmin ladattaviksi. Kun tämä on asetettu positiiviseksi arvoksi, nämä arkistot poistetaan automaattisesti asetetun päivien määrän jälkeen.
+        bootstrap_timeline_accounts: Nämä tilit kiinnitetään uusien käyttäjien seuraamissuosituslistojen alkuun.
         closed_registrations_message: Näkyy, kun rekisteröityminen on suljettu
-        content_cache_retention_period: Kaikki julkaisut ja tehostukset muilta palvelimilta poistetaan, kun määritelty määrä päiviä on kulunut. Osaa julkaisuista voi olla mahdoton palauttaa. Kaikki julkaisuihin liittyvät kirjanmerkit, suosikit ja tehostukset menetetään, eikä niitä voi palauttaa.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin verkkoversiossa.
+        favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin suosikkikuvakkeen omalla kuvakkeella.
         mascot: Ohittaa kuvituksen edistyneessä selainkäyttöliittymässä.
-        media_cache_retention_period: Ladatut mediatiedostot poistetaan määritetyn määrän päiviä jälkeen, kun arvo on positiivinen ja ladataan uudelleen pyynnöstä.
         peers_api_enabled: Luettelo verkkotunnuksista, jotka tämä palvelin on kohdannut fediversumissa. Se ei kerro, oletko liitossa tietyn palvelimen kanssa, vaan että palvelimesi on ylipäätään tietoinen siitä. Tätä tietoa käytetään palveluissa, jotka keräävät tilastoja federoinnista yleisellä tasolla.
         profile_directory: Profiilihakemisto lueteloi kaikki käyttäjät, jotka ovat ilmoittaneet olevansa löydettävissä.
         require_invite_text: Kun rekisteröityminen vaatii manuaalisen hyväksynnän, tee ”Miksi haluat liittyä?” -tekstikentästä pakollinen vapaaehtoisen sijaan
@@ -108,26 +108,27 @@ fi:
         text: Tämä auttaa meitä arvioimaan hakemustasi
       ip_block:
         comment: Valinnainen. Muista miksi lisäsit tämän säännön.
-        expires_in: IP-osoitteet ovat rajallinen resurssi, joskus niitä jaetaan ja vaihtavat usein omistajaa. Tästä syystä epämääräisiä IP-lohkoja ei suositella.
-        ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia alueita käyttämällä CIDR-syntaksia. Varo, että et lukitse itseäsi ulos!
+        expires_in: IP-osoitteet ovat rajallinen resurssi – joskus niitä jaetaan, ja ne vaihtavat usein omistajaa. Niinpä epämääräisiä IP-lohkoja ei suositella.
+        ip: Kirjoita IPv4- tai IPv6-osoite. Voit estää kokonaisia IP-osoitealueita CIDR-syntaksin avulla. Varo lukitsemasta itseäsi ulos!
         severities:
           no_access: Estä pääsy kaikkiin resursseihin
           sign_up_block: Uudet rekisteröitymiset eivät ole mahdollisia
           sign_up_requires_approval: Uudet rekisteröitymiset edellyttävät hyväksyntääsi
         severity: Valitse, mitä tapahtuu tämän IP-osoitteen pyynnöille
       rule:
-        text: Kuvaile sääntöä tai vaatimusta tämän palvelimen käyttäjille. Yritä pitää se lyhyenä ja yksinkertaisena
+        hint: Vapaaehtoinen. Anna yksityiskohtaisempia tietoja säännöstä
+        text: Kuvaile sääntöä tai edellytystä palvelimesi käyttäjille. Suosi tiivistä, yksinkertaista ilmaisua
       sessions:
-        otp: Syötä puhelimeen saamasi kaksivaiheisen tunnistautumisen koodi tai käytä palautuskoodia.
+        otp: 'Näppäile mobiilisovelluksessa näkyvä kaksivaiheisen todennuksen tunnusluku, tai käytä tarvittaessa palautuskoodia:'
         webauthn: Jos kyseessä on USB-avain, muista laittaa se paikalleen ja tarvittaessa napauttaa sitä.
       settings:
         indexable: Profiilisi voi näkyä Googlen, Bingin ja muiden hakukoneiden hakutuloksissa.
         show_application: Voit silti aina nähdä, mistä sovelluksesta julkaisusi lähetettiin.
       tag:
-        name: Voit muuttaa esimerkiksi kirjaimia paremmin luettavaksi
+        name: Voit esimerkiksi vaihtaa suur- ja pienaakkosten kesken helppolukuistaaksesi tekstiäsi
       user:
-        chosen_languages: Kun valittu, vain valituilla kielillä kirjoitetut julkaisut näkyvät julkisilla aikajanoilla
-        role: Rooli määrää, mitkä käyttöoikeudet käyttäjällä on
+        chosen_languages: Jos valitset kieliä oheisesta listauksesta, vain niidenkieliset julkaisut näkyvät julkisilla aikajanoilla sinulle
+        role: Rooli vaikuttaa käyttäjän käyttöoikeuksiin
       user_role:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
         highlighted: Tämä tekee roolista julkisesti näkyvän
@@ -152,22 +153,22 @@ fi:
       account_migration:
         acct: Uuden tilin käyttäjänimi
       account_warning_preset:
-        text: Esiasetettu teksti
+        text: Esimääritetty teksti
         title: Nimi
       admin_account_action:
-        include_statuses: Sisällytä raportoidut viestit sähköpostiin
+        include_statuses: Sisällytä raportoidut viestit sähköposti-ilmoitukseen
         send_email_notification: Ilmoita käyttäjälle sähköpostitse
         text: Mukautettu varoitus
         type: Toimi
         types:
-          disable: Poista kirjautuminen käytöstä
-          none: Älä tee mitään
+          disable: Jäädytä
+          none: Lähetä varoitus
           sensitive: Arkaluonteinen
           silence: Rajoita
           suspend: Jäädytä
-        warning_preset_id: Käytä varoitusmallia
+        warning_preset_id: Käytä varoituspohjaa
       announcement:
-        all_day: Koko päivän kestävä tapahtuma
+        all_day: Koko päivän tapahtuma
         ends_at: Tapahtuman loppu
         scheduled_at: Ajoita julkaisu
         starts_at: Tapahtuman alku
@@ -192,11 +193,11 @@ fi:
         honeypot: "%{label} (älä täytä)"
         inbox_url: Välittäjän postilaatikon URL-osoite
         irreversible: Pudota piilottamisen sijaan
-        locale: Kieli
+        locale: Käyttöliittymän kieli
         max_uses: Käyttökertoja enintään
         new_password: Uusi salasana
         note: Elämäkerta
-        otp_attempt: Kaksivaiheisen tunnistuksen koodi
+        otp_attempt: Kaksivaiheisen todennuksen tunnusluku
         password: Salasana
         phrase: Avainsana tai -fraasi
         setting_advanced_layout: Ota edistynyt selainkäyttöliittymä käyttöön
@@ -208,19 +209,19 @@ fi:
         setting_default_privacy: Julkaisun näkyvyys
         setting_default_sensitive: Merkitse media aina arkaluonteiseksi
         setting_delete_modal: Kysy vahvistusta ennen julkaisun poistamista
-        setting_disable_swiping: Poista pyyhkäisyt käytöstä
+        setting_disable_swiping: Poista pyyhkäisyeleet käytöstä
         setting_display_media: Median näyttäminen
         setting_display_media_default: Oletus
         setting_display_media_hide_all: Piilota kaikki
         setting_display_media_show_all: Näytä kaikki
         setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt julkaisut
-        setting_hide_network: Piilota verkkosi
+        setting_hide_network: Piilota verkostotietosi
         setting_reduce_motion: Vähennä animaatioiden liikettä
         setting_system_font_ui: Käytä järjestelmän oletusfonttia
         setting_theme: Sivuston teema
         setting_trends: Näytä päivän trendit
         setting_unfollow_modal: Kysy vahvistusta ennen seuraamisen lopettamista
-        setting_use_blurhash: Näytä värikkäät liukuvärit piilotetulle medialle
+        setting_use_blurhash: Käytä värikästä liukusävytystä piilotetulle medialle
         setting_use_pending_items: Hidas tila
         severity: Vakavuus
         sign_in_token_attempt: Turvakoodi
@@ -230,23 +231,23 @@ fi:
         username_or_email: Käyttäjänimi tai sähköpostiosoite
         whole_word: Koko sana
       email_domain_block:
-        with_dns_records: Sisällytä toimialueen MX tietueet ja IP-osoite
+        with_dns_records: Sisällytä toimialueen MX-tietueet ja IP-osoitteet
       featured_tag:
         name: Aihetunniste
       filters:
         actions:
           hide: Piilota kokonaan
-          warn: Piilota ja näytä varoitus
+          warn: Piilota varoittaen
       form_admin_settings:
         activity_api_enabled: Julkaise yhteenlasketut tilastot käyttäjätoiminnasta ohjelmointirajapinnassa
         backups_retention_period: Käyttäjän arkiston säilytysaika
         bootstrap_timeline_accounts: Suosittele aina näitä tilejä uusille käyttäjille
         closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla
-        content_cache_retention_period: Sisällön välimuistin säilytysaika
+        content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
-        mascot: Mukautettu maskotti (legacy)
-        media_cache_retention_period: Median välimuistin säilytysaika
-        peers_api_enabled: Julkaise löydettyjen instanssien luettelo ohjelmointirajapinnassa
+        mascot: Mukautettu maskotti (vanhentunut ominaisuus)
+        media_cache_retention_period: Mediasisältövälimuistin säilytysaika
+        peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
         profile_directory: Ota profiilihakemisto käyttöön
         registrations_mode: Kuka voi rekisteröityä
         require_invite_text: Vaadi syy liittyä
@@ -260,11 +261,11 @@ fi:
         site_title: Palvelimen nimi
         status_page_url: Tilasivun URL-osoite
         theme: Oletusteema
-        thumbnail: Palvelimen pikkukuva
+        thumbnail: Palvelimen pienoiskuva
         timeline_preview: Salli todentamaton pääsy julkisille aikajanoille
-        trendable_by_default: Salli trendit ilman ennakkotarkastusta
+        trendable_by_default: Salli suositun sisällön koonti ilman ennakkotarkastusta
         trends: Ota trendit käyttöön
-        trends_as_landing_page: Käytä trendejä aloitussivuna
+        trends_as_landing_page: Käytä suosittua sisältöä aloitussivuna
       interactions:
         must_be_follower: Estä ilmoitukset käyttäjiltä, jotka eivät seuraa sinua
         must_be_following: Estä ilmoitukset käyttäjiltä, joita et seuraa
@@ -299,6 +300,7 @@ fi:
           patch: Ilmoita virhekorjauspäivityksistä
         trending_tag: Uusi trendi vaatii tarkistusta
       rule:
+        hint: Lisätietoja
         text: Sääntö
       settings:
         indexable: Sisällytä profiilisivu hakukoneisiin
@@ -318,7 +320,7 @@ fi:
         permissions_as_keys: Oikeudet
         position: Prioriteetti
       webhook:
-        events: Tapahtumat käytössä
+        events: Käytössä olevat tapahtumat
         template: Hyötykuormapohja
         url: Päätepisteen URL
     'no': Ei
@@ -327,8 +329,8 @@ fi:
     recommended: Suositeltu
     required:
       mark: "*"
-      text: pakollinen tieto
+      text: vaadittu tieto
     title:
       sessions:
-        webauthn: Käytä jotakin suojausavainta kirjautuaksesi sisään
+        webauthn: Käytä yhtä turva-avaimistasi kirjautuaksesi sisään
     'yes': Kyllä
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index e4d87e1786..7d4da2b51e 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -39,14 +39,14 @@ fo:
         text: Tú kanst bara kæra eina atsókn eina ferð
       defaults:
         autofollow: Fólk, sum tilmelda seg gjøgnum innbjóðingina, fylgja tær sjálvvirkandi
-        avatar: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        avatar: WEBP, PNG, GIF ella JPG. Í mesta lagi %{size}. Verður minkað til %{dimensions}px
         bot: Tekin til onnur, at kontan í høvuðsheitum ger sjálvvirkandi atgerðir og møguliga ikki verður yvirvakað
         context: Ein ella fleiri kontekstir, har sum filtrið skal brúkast
         current_password: Av trygdarávum vinarliga les inn loyniorðið hjá verandi kontu
         current_username: Fyri at vátta, vinarliga les inn brúkaranavnið á verandi kontu
         digest: Einans sent eftir eitt langt tíðarskeið við óvirkni og einans um tú hevur móttikið persónlig boð meðan tú var burtur
         email: Tú fær sendandi ein váttanarteldupost
-        header: PNG, GIF ella JPG. Ikki størri enn %{size}. Verður minkað til %{dimensions}px
+        header: WEBP, PNG, GIF ella JPG. Í mesta lagi %{size}. Verður minkað til %{dimensions}px
         inbox_url: Avrita URL'in frá forsíðuni hjá reiðlagnum, sum tú vilt brúka
         irreversible: Filtreraðir postar blíva burtur med alla, eisini sjálvt um filtrið seinni verður strikað
         locale: Málið, sum verður brúkt í brúkaramarkamótinum, teldupostum og skumpiboðum
@@ -77,13 +77,15 @@ fo:
           warn: Fjal filtreraða innihaldið aftan fyri eina ávaring, sum nevnir heitið á filtrinum
       form_admin_settings:
         activity_api_enabled: Tal av lokalt útgivnum postum, virknum brúkarum og nýggjum skrásetingum býtt vikuliga
-        backups_retention_period: Varðveit gjørd brúkarasøvn í ásetta talið av døgum.
+        app_icon: WEBP, PNG, GIF ella JPG. Býtir vanligu ikonina á fartelefoneindum um við eina ser-ikon.
+        backups_retention_period: Brúkarar hava møguleika at gera trygdaravrit av teirra postum, sum tey kunnu taka niður seinni. Tá hetta er sett til eitt virði størri enn 0, so verða hesi trygdaravrit strikaði av sær sjálvum frá tínar goymslu eftir ásetta talið av døgum.
         bootstrap_timeline_accounts: Hesar kontur verða festar ovast á listanum yvir brúkarar, sum tey nýggju verða mælt til at fylgja.
         closed_registrations_message: Víst tá stongt er fyri tilmeldingum
-        content_cache_retention_period: Postar frá øðrum ambætarum verða strikaðir eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði. Hetta kann møguliga ikki broytast.
+        content_cache_retention_period: Allir postar frá øðrum ambætarum (íroknað stimbranir og svar) verða strikaði eftir ásetta talið av døgum, óansæð hvussu lokalir brúkarar hava samvirkað við hesar postar. Hetta fevnir eisini um postar, sum lokalir brúkarar hava bókamerkt ella yndismerkt. Privatar umrøður millum brúkarar frá ymiskum ambætarum verða eisini burturmistar og ómøguligar at endurskapa. Brúk av hesi stillingini er einans hugsað til serligar støður og oyðileggur nógv, sum brúkarar vænta av einum vanligum ambætara.
         custom_css: Tú kanst seta títt egna snið upp í net-útgávuni av Mastodon.
+        favicon: WEBP, PNG, GIF ella JPG. Býtir vanligu Mastodon fav-ikonina um við eina ser-ikon.
         mascot: Skúgvar til viks myndprýðingina í framkomna vev-markamótinum.
-        media_cache_retention_period: Miðlafílur, sum eru tiknar niður, verða strikaðar eftir ásetta talið av døgum, tá hetta er sett til eitt positivt virði, og takast niður umaftur eftir ynski.
+        media_cache_retention_period: Miðlafílur frá postum, sum fjarbrúkarar hava gjørt, verða goymdir á tínum ambætara. Tá hetta er sett til eitt virði størri enn 0, so verða miðlafílurnar strikaðar eftir ásetta talið av døgum. Um miðladátur verða umbidnar eftir at tær eru strikaðar, verða tær tiknar innaftur á ambætaran, um keldutilfarið enn er tøkt. Vegna avmarkingar á hvussu ofta undanvísingarkort til leinki spyrja triðjapartsstøð, so verður mælt til at seta hetta virðið til í minsta lagi 14 dagar. Annars verða umbønir um dagføringar av undanvísingarkortum til leinki ikki gjørdar áðrenn hetta.
         peers_api_enabled: Ein listi við navnaøkjum, sum hesin ambætarin er komin framat í fediversinum. Ongar dátur eru tiknar við her um tú er sameind/ur við ein givnan ambætara, einans at tín ambætari veit um hann. Hetta verður brúkt av tænastum, sum gera hagtøl um sameining yvirhøvur.
         profile_directory: Vangaskráin listar allar brúkarar, sum hava valt at kunna uppdagast.
         require_invite_text: Tá tilmeldingar krevja serskilda góðkenning, set so "Hví vil tú vera við?" tekstateigin til at vera kravdan heldur enn valfrían
@@ -116,6 +118,7 @@ fo:
           sign_up_requires_approval: Nýggjar tilmeldingar fara at krevja tína góðkenning
         severity: Vel, hvat skal henda við umbønum frá hesari IP adressuni
       rule:
+        hint: Valfrítt. Gev fleiri smálutir um regluna
         text: Lýs eina reglu ella eitt krav fyri brúkarar á hesum ambætaranum. Ger tað stutt og einfalt
       sessions:
         otp: 'Skriva tvey-faktor koduna frá telefon-appini ella brúka eina av tínum endurgerðskodum:'
@@ -242,7 +245,7 @@ fo:
         backups_retention_period: Hvussu leingi verða brúkarasøvn goymd
         bootstrap_timeline_accounts: Mæl altíð nýggjum brúkarum at fylgja hesar kontur
         closed_registrations_message: Serskild boð, tá tað ikki er møguligt at tilmelda seg
-        content_cache_retention_period: Tíðarskeið, har innihaldgoymslan verður varðveitt
+        content_cache_retention_period: Tíðarskeið fyri varðveiðslu av fjartilfari
         custom_css: Serskilt CSS
         mascot: Serskildur maskottur (arvur)
         media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
@@ -299,6 +302,7 @@ fo:
           patch: Gev fráboðan um feilrættingardagføringar
         trending_tag: Broytt rák skal kannast
       rule:
+        hint: Fleiri upplýsingar
         text: Regla
       settings:
         indexable: Lat vangasíðu vera tøka í leitimaskinum
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index f5a2a428e9..4b3f53e222 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -39,14 +39,14 @@ fr-CA:
         text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
       defaults:
         autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
-        avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         context: Un ou plusieurs contextes où le filtre devrait s’appliquer
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir le nom d'utilisateur de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
         email: Vous recevrez un courriel de confirmation
-        header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relai que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
@@ -77,13 +77,10 @@ fr-CA:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
-        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
-        content_cache_retention_period: Les publications depuis d'autres serveurs seront supprimées après un nombre de jours spécifiés lorsque défini sur une valeur positive. Cela peut être irréversible.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
-        media_cache_retention_period: Les fichiers multimédias téléchargés seront supprimés après le nombre de jours spécifiés lorsque la valeur est positive, et seront téléchargés à nouveau sur demande.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les utilisateurs qui ont opté pour être découverts.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
@@ -116,6 +113,7 @@ fr-CA:
           sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
         severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
       rule:
+        hint: Optionnel. Fournissez plus de détails sur la règle
         text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple
       sessions:
         otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
@@ -242,7 +240,6 @@ fr-CA:
         backups_retention_period: Période d'archivage utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
-        content_cache_retention_period: Durée de rétention du contenu dans le cache
         custom_css: CSS personnalisé
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
@@ -299,6 +296,7 @@ fr-CA:
           patch: Notifier pour des mises à jour de corrections de bug
         trending_tag: Nouvelle tendance nécessitant supervision
       rule:
+        hint: Information supplémentaire
         text: Règle
       settings:
         indexable: Inclure la page de profil dans les moteurs de recherches
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 5a74facb7a..476f197f41 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -39,14 +39,14 @@ fr:
         text: Vous ne pouvez faire appel d'une sanction qu'une seule fois
       defaults:
         autofollow: Les personnes qui s’inscrivent grâce à l’invitation vous suivront automatiquement
-        avatar: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         bot: Signale aux autres que ce compte exécute principalement des actions automatisées et pourrait ne pas être surveillé
         context: Un ou plusieurs contextes où le filtre devrait s’appliquer
         current_password: Par mesure de sécurité, veuillez saisir le mot de passe de ce compte
         current_username: Pour confirmer, veuillez saisir l’identifiant de ce compte
         digest: Uniquement envoyé après une longue période d’inactivité en cas de messages personnels reçus pendant votre absence
         email: Vous recevrez un courriel de confirmation
-        header: Au format PNG, GIF ou JPG. %{size} maximum. Sera réduit à %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Au plus %{size}. Sera réduit à %{dimensions}px
         inbox_url: Copiez l’URL depuis la page d’accueil du relais que vous souhaitez utiliser
         irreversible: Les messages filtrés disparaîtront irrévocablement, même si le filtre est supprimé plus tard
         locale: La langue de l’interface, des courriels et des notifications
@@ -77,13 +77,10 @@ fr:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
-        backups_retention_period: Conserve les archives générées par l'utilisateur selon le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
-        content_cache_retention_period: Lorsque la valeur est positive, les messages publiés depuis d'autres serveurs seront supprimés après le nombre de jours défini. Cela peut être irréversible.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         mascot: Remplace l'illustration dans l'interface Web avancée.
-        media_cache_retention_period: Lorsque la valeur est positive, les fichiers multimédias téléchargés seront supprimés après le nombre de jours défini et pourront être à nouveau téléchargés sur demande.
         peers_api_enabled: Une liste de noms de domaine que ce serveur a rencontrés dans le fédiverse. Aucune donnée indiquant si vous vous fédérez ou non avec un serveur particulier n'est incluse ici, seulement l'information que votre serveur connaît un autre serveur. Cette option est utilisée par les services qui collectent des statistiques sur la fédération en général.
         profile_directory: L'annuaire des profils répertorie tous les comptes qui choisi d'être découvrables.
         require_invite_text: Lorsque les inscriptions nécessitent une approbation manuelle, rendre le texte de l’invitation "Pourquoi voulez-vous vous inscrire ?" obligatoire plutôt que facultatif
@@ -116,6 +113,7 @@ fr:
           sign_up_requires_approval: Les nouvelles inscriptions nécessiteront votre approbation
         severity: Choisir ce qui se passera avec les requêtes de cette adresse IP
       rule:
+        hint: Optionnel. Fournissez plus de détails sur la règle
         text: Décrivez une règle ou une exigence pour les utilisateurs sur ce serveur. Essayez de la garder courte et simple
       sessions:
         otp: 'Entrez le code d’authentification à deux facteurs généré par l’application de votre téléphone ou utilisez un de vos codes de récupération :'
@@ -242,7 +240,6 @@ fr:
         backups_retention_period: Durée de rétention des archives utilisateur
         bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux⋅elles utilisateur⋅rice⋅s
         closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
-        content_cache_retention_period: Durée de rétention du contenu dans le cache
         custom_css: CSS personnalisé
         mascot: Mascotte personnalisée (héritée)
         media_cache_retention_period: Durée de rétention des médias dans le cache
@@ -299,6 +296,7 @@ fr:
           patch: Notifier pour des mises à jour de corrections de bug
         trending_tag: Nouvelle tendance nécessitant supervision
       rule:
+        hint: Information supplémentaire
         text: Règle
       settings:
         indexable: Inclure la page de profil dans les moteurs de recherches
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index f506b79252..8d599324b3 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -39,14 +39,14 @@ fy:
         text: Jo kinne mar ien kear beswier yntsjinje tsjin in fêststelde oertrêding
       defaults:
         autofollow: Minsken dy’t harren fia de útnûging registrearre hawwe, folgje jo automatysk
-        avatar: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
+        avatar: WEBP, PNG, GIF of JPG. Maksimaal %{size}. Wurdt ferlytse nei %{dimensions}px
         bot: Sinjaal nei oare brûkers ta dat dizze account yn haadsaak automatisearre berjochten stjoert en mooglik net kontrolearre wurdt
         context: Ien of meardere lokaasjes wêr’t it filter aktyf wêze moat
         current_password: Fier foar feilichheidsredenen it wachtwurd fan jo aktuele account yn
         current_username: Fier ta befêstiging de brûkersnamme fan jo aktuele account yn
         digest: Wurdt allinnich nei in lange perioade fan ynaktiviteit ferstjoerd en allinnich wannear’t jo wylst jo ôfwêzigens persoanlike berjochten ûntfongen hawwe
         email: Jo krije in befêstigings-e-mailberjocht
-        header: PNG, GIF of JPG. Maksimaal %{size}. Wurdt weromskeald nei %{dimensions}px
+        header: WEBP, PNG, GIF of JPG. Maksimaal %{size}. Wurdt ferlytse nei %{dimensions}px
         inbox_url: Kopiearje de URL fan de foarside fan de relayserver dy’t jo brûke wolle
         irreversible: Filtere berjochten ferdwine definityf, sels as it filter letter fuortsmiten wurdt
         locale: De taal fan de brûkersomjouwing, e-mailberjochten en pushmeldingen
@@ -77,13 +77,13 @@ fy:
           warn: Ferstopje de filtere ynhâld efter in warskôging, mei de titel fan it filter as warskôgingstekst
       form_admin_settings:
         activity_api_enabled: Tal lokaal publisearre artikelen, aktive brûkers en nije registraasjes yn wyklikse werjefte
-        backups_retention_period: De oanmakke brûkersargiven foar it opjûne oantal dagen behâlde.
+        backups_retention_period: Brûkers hawwe de mooglikheid om argiven fan harren berjochten te generearjen om letter te downloaden. Wannear ynsteld op in positive wearde, wurde dizze argiven automatysk fuortsmiten út jo ûnthâld nei it opjûne oantal dagen.
         bootstrap_timeline_accounts: Dizze accounts wurde boppe oan de oanrekommandaasjes oan nije brûkers toand. Meardere brûkersnammen troch komma’s skiede.
         closed_registrations_message: Werjûn wannear’t registraasje fan nije accounts útskeakele is
-        content_cache_retention_period: 'Berjochten fan oare servers wurde nei it opjûne oantal dagen fuortsmiten. Let op: Dit is definityf.'
+        content_cache_retention_period: Alle berjochten fan oare servers (ynklusyf boosts en reaksjes) wurde fuortsmiten nei it opjûne oantal dagen, nettsjinsteande iennige lokale brûkersynteraksje mei dy berjochten. Dit oanbelanget ek berjochten dy’t in lokale brûker oan harren blêdwizers tafoege hat of as favoryt markearre hat. Priveeberjochten tusken brûkers fan ferskate servers gean ek ferlern en binne ûnmooglik te werstellen. It gebrûk fan dizze ynstelling is bedoeld foar servers dy’t in spesjaal doel tsjinje en oertrêdet in protte brûkersferwachtingen wannear’t dizze foar algemien gebrûk ymplemintearre wurdt.
         custom_css: Jo kinne oanpaste CSS tapasse op de webferzje fan dizze Mastodon-server.
         mascot: Oerskriuwt de yllustraasje yn de avansearre webomjouwing.
-        media_cache_retention_period: Mediabestannen dy’t fan oare servers download binne wurde nei it opjûne oantal dagen fuortsmiten en wurde op fersyk opnij download.
+        media_cache_retention_period: Mediabestannen fan berjochten fan eksterne brûkers wurde op jo server yn de buffer bewarre. Wannear ynsteld op in positive wearde, wurde media fuortsmiten nei it opjûne oantal dagen. As de mediagegevens opfrege wurde neidat se fuortsmiten binne, wurde se opnij download wannear de orizjinele ynhâld noch hieltyd beskikber is. Fanwegen beheiningen op hoe faak keppelingsfoarbylden websites fan tredden rieplachtsje, wurdt oanrekommandearre om dizze wearde yn te stellen op op syn minste 14 dagen. Oars wurde keppelingsfoarbylden net op oanfraach bywurke.
         peers_api_enabled: In list mei domeinnammen, dêr’t dizze server yn fediverse kontakt hân mei hat. Hjir wurdt gjin data dield, oft jo mei in bepaalde server federearrest, mar alinnich, dat jo server dat wit. Dit wurdt foar tsjinsten brûkt, dy’t statistiken oer federaasje yn algemiene sin sammelet.
         profile_directory: De brûkersgids befettet in list fan alle brûkers dy¥t derfoar keazen hawwe om ûntdekt wurde te kinnen.
         require_invite_text: Meitsje it ynfoljen fan ‘Wêrom wolle jo jo hjir registrearje?’ ferplicht yn stee fan opsjoneel, wannear’t registraasjes hânmjittich goedkard wurde moatte
@@ -116,6 +116,7 @@ fy:
           sign_up_requires_approval: Nije registraasjes fereaskje jo goedkarring
         severity: Kies wat der barre moat mei oanfragen fan dit IP-adres
       rule:
+        hint: Opsjoneel. Jou mear details oer de rigel
         text: Omskriuw in rigel of eask foar brûkers op dizze server. Probearje it koart en simpel te hâlden
       sessions:
         otp: 'Fier de twa-stapstagongskoade fan jo mobile telefoan ôf yn of brûk ien fan jo werstelkoaden:'
@@ -242,7 +243,7 @@ fy:
         backups_retention_period: Bewartermyn brûkersargyf
         bootstrap_timeline_accounts: Accounts dy’t altyd oan nije brûkers oanrekommandearre wurde
         closed_registrations_message: Oanpast berjocht wannear registraasje útskeakele is
-        content_cache_retention_period: Bewartermyn berjochtebuffer
+        content_cache_retention_period: Bewartermyn foar eksterne ynhâld
         custom_css: Oanpaste CSS
         mascot: Oanpaste maskotte (legacy)
         media_cache_retention_period: Bewartermyn mediabuffer
@@ -299,6 +300,7 @@ fy:
           patch: Meldingen by bugfix-fernijingen
         trending_tag: Nije trend beoardieling fereasket
       rule:
+        hint: Oanfoljende ynformaasje
         text: Regel
       settings:
         indexable: Sykmasinen jo profylside fine litte
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index f567866c3e..8a36f73dc1 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -39,14 +39,14 @@ gd:
         text: Chan urrainn dhut ath-thagradh a dhèanamh air rabhadh ach aon turas
       defaults:
         autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh thu gu fèin-obrachail
-        avatar: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
+        avatar: WEBP, PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         bot: Comharraich do chàch gu bheil an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir
         context: Na co-theacsaichean air am bi a’ chriathrag an sàs
         current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich
         current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich
         digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh
         email: Thèid post-d dearbhaidh a chur thugad
-        header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
+        header: WEBP, PNG, GIF no JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px
         inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh
         irreversible: Thèid postaichean criathraichte à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh às dèidh làimhe
         locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh
@@ -77,13 +77,10 @@ gd:
           warn: Falaich an t-susbaint chriathraichte air cùlaibh rabhaidh a dh’innseas tiotal na criathraige
       form_admin_settings:
         activity_api_enabled: Cunntasan nam postaichean a chaidh fhoillseachadh gu h-ionadail, nan cleachdaichean gnìomhach ’s nan clàraidhean ùra an am bucaidean seachdaineil
-        backups_retention_period: Cùm na tasg-lannan a chaidh a ghintinn dhan luchd-cleachdaidh rè an àireamh de làithean a shònraich thu.
         bootstrap_timeline_accounts: Thèid na cunntasan seo a phrìneachadh air bàrr nam molaidhean leantainn dhan luchd-cleachdaidh ùr.
         closed_registrations_message: Thèid seo a shealltainn nuair a bhios an clàradh dùinte
-        content_cache_retention_period: Thèid gach post is brosnachadh o fhrithealaichean eile a sguabadh às às dèidh an àireamh de làithean a shònraicheas tu. Dh’fhaoidte nach gabh a h-uile post aiseag. Thèid gach comharran-lìn, annsachd is brosnachadh co-cheangailte riutha air chall cuideachd agus cha ghabh sin a neo-dhèanamh.
         custom_css: "’S urrainn dhut stoidhlean gnàthaichte a chur an sàs air an tionndadh-lìn de Mhastodon."
         mascot: Tar-àithnidh seo an sgead-dhealbh san eadar-aghaidh-lìn adhartach.
-        media_cache_retention_period: Thèid na faidhlichean meadhain air an luchdadh a-nuas a sguabadh às às dèidh an àireamh de làithean a shònraich thu nuair a bhios luach dearbh air agus an ath-luachdadh nuair a thèid an iarraidh an uairsin.
         peers_api_enabled: Seo liosta de dh’ainmean àrainne ris an do thachair am frithealaiche seo sa cho-shaoghal. Chan eil dàta sam bith ’ga ghabhail a-staigh an-seo mu a bheil thu co-naisgte ri frithealaiche sònraichte gus nach eil ach dìreach gu bheil am frithealaiche agad eòlach air. Thèid seo a chleachdadh le seirbheisean a chruinnicheas stadastaireachd air a’ cho-nasgadh san fharsaingeachd.
         profile_directory: Seallaidh eòlaire nam pròifil liosta dhen luchd-cleachdaidh a dh’aontaich gun gabh an rùrachadh.
         require_invite_text: Nuair a bhios aontachadh a làimh riatanach dhan chlàradh, dèan an raon teacsa “Carson a bu mhiann leat ballrachd fhaighinn?” riatanach seach roghainneil
@@ -116,6 +113,7 @@ gd:
           sign_up_requires_approval: Bidh cleachdaichean air an ùr-chlàradh feumach air d’ aonta
         severity: Tagh na thachras le iarrtasan on IP seo
       rule:
+        hint: Roghainneil. Thoir seachad barrachd fiosrachaidh mun riaghailt
         text: Mìnich riaghailt no riatanas do chleachdaichean an fhrithealaiche seo. Feuch an cùm thu sìmplidh goirid e
       sessions:
         otp: 'Cuir a-steach an còd dà-cheumnach a ghin aplacaid an fhòn agad no cleachd fear dhe na còdan aisig agad:'
@@ -140,7 +138,7 @@ gd:
         url: Far an dèid na tachartasan a chur
     labels:
       account:
-        discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean luirg
+        discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean rùrachaidh
         fields:
           name: Leubail
           value: Susbaint
@@ -242,7 +240,6 @@ gd:
         backups_retention_period: Ùine glèidhidh aig tasg-lannan an luchd-cleachdaidh
         bootstrap_timeline_accounts: Mol na cunntasan seo do chleachdaichean ùra an-còmhnaidh
         closed_registrations_message: Teachdaireachd ghnàthaichte nuair nach eil clàradh ri fhaighinn
-        content_cache_retention_period: Ùine glèidhidh aig tasgadan na susbainte
         custom_css: CSS gnàthaichte
         mascot: Suaichnean gnàthaichte (dìleabach)
         media_cache_retention_period: Ùine glèidhidh aig tasgadan nam meadhanan
@@ -299,15 +296,16 @@ gd:
           patch: Thoir brathan dhomh do dh’ùrachaidhean càraidh
         trending_tag: Tha treand ùr ri lèirmheasadh
       rule:
+        hint: Barrachd fiosrachaidh
         text: Riaghailt
       settings:
         indexable: Gabh a-staigh duilleag na pròifil sna h-einnseanan-luirg
         show_application: Seall dè an aplacaid a chuir thu post leatha
       tag:
-        listable: Leig leis an taga hais seo gun nochd e ann an toraidhean luirg ’s am measg nam molaidhean
+        listable: Faodaidh an taga hais seo nochdadh ann an toraidhean luirg ’s am measg nam molaidhean
         name: Taga hais
-        trendable: Leig leis an taga hais seo gun nochd e am measg nan treandaichean
-        usable: Leig le postaichean an taga hais seo a chleachdadh
+        trendable: Faodaidh an taga hais seo nochdadh am measg nan treandaichean
+        usable: Faodaidh postaichean an taga hais seo a chleachdadh
       user:
         role: Dreuchd
         time_zone: Roinn-tìde
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 7bafca6b71..0411c45bc1 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -39,14 +39,14 @@ gl:
         text: Só podes apelar a decisión unha vez
       defaults:
         autofollow: As persoas que se conectaron a través dun convite seguirante automáticamente
-        avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
         bot: Advirte ás usuarias de que esta conta realiza principalmente accións automatizadas e podería non estar monitorizada
         context: Un ou varios contextos onde se debería aplicar o filtro
         current_password: Por razóns de seguridade, introduce o contrasinal da conta actual
         current_username: Para confirmar, introduce o nome de usuaria da conta actual
         digest: Enviar só tras un longo período de inactividade e só se recibiches algunha mensaxe directa na tua ausencia
         email: Ímosche enviar un correo de confirmación
-        header: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px
         inbox_url: Copiar o URL desde a páxina de inicio do repetidor que queres utilizar
         irreversible: As publicacións filtradas desaparecerán de xeito irreversible, incluso se despois se elimina o filtro
         locale: O idioma da interface de usuaria, correos e notificacións
@@ -77,13 +77,15 @@ gl:
           warn: Agochar o contido filtrado tras un aviso que conteña o nome do filtro
       form_admin_settings:
         activity_api_enabled: Conta do número de publicacións locais, usuarias activas, e novos rexistros en acumulados semanais
-        backups_retention_period: Gardar os arquivos xerados pola usuaria durante o número de días indicado.
+        app_icon: WEBP, PNG, GIF ou JPG. Sobrescribe a icona por defecto da aplicación nos dispositivos móbiles cunha icona personalizada.
+        backups_retention_period: As usuarias poden crear arquivos das súas publicacións para descargalos. Cando se establece un valor positivo, estes arquivos serán borrados automáticamente da túa almacenaxe despois do número de días establecido.
         bootstrap_timeline_accounts: Estas contas aparecerán fixas na parte superior das recomendacións para as usuarias.
         closed_registrations_message: Móstrase cando non se admiten novas usuarias
-        content_cache_retention_period: As publicacións desde outros servidores serán eliminadas despois do número de días indicados ao poñer un valor positivo. É unha acción irreversible.
+        content_cache_retention_period: Todas as publicacións procedentes de outros servidores (incluído promocións e respostas) van ser eliminadas despois do número de días indicado, sen importar as interaccións das usuarias locais con esas publicacións. Esto inclúe publicacións que a usuaria local marcou como favoritas ou incluíu nos marcadores. As mencións privadas entre usuarias de diferentes instancias tamén se eliminarán e non se poderán restablecer. O uso desta ferramenta esta orientado a situacións especiais e estraga moitas das expectativas das usuarias ao implementala cun propósito de uso xeral.
         custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Sobrescribe a icona de favoritos de Mastodon por defecto cunha icona personalizada.
         mascot: Sobrescribe a ilustración na interface web avanzada.
-        media_cache_retention_period: Os ficheiros multimedia descargados serán eliminados despois do número de días indicado ao establecer un valor positivo, e voltos a descargar baixo petición.
+        media_cache_retention_period: Os ficheiros multimedia de publicacións de usuarias remotas están almacenados no teu servidor. Ao establecer un valor positivo, o multimedia vaise eliminar despois do número de días establecido. Se o multimedia fose requerido após ser eliminado entón descargaríase outra vez, se aínda está dispoñible na orixe. Debido a restricións sobre a frecuencia en que o servizo de vista previa trae recursos de terceiras partes, é recomendable establecer este valor polo menos en 14 días, ou as tarxetas de vista previa non se actualizarán baixo demanda para casos anteriores a ese prazo.
         peers_api_enabled: Unha lista dos nomes de dominio que este servidor atopou no fediverso. Non se inclúen aquí datos acerca de se estás a federar con eles ou non, só que o teu servidor os recoñeceu. Ten utilidade para servizos que recollen estatísticas acerca da federación nun amplo senso.
         profile_directory: O directorio de perfís inclúe a tódalas usuarias que optaron por ser descubribles.
         require_invite_text: Cando os rexistros requiren aprobación manual, facer que o texto "Por que te queres rexistrar?" do convite sexa obrigatorio en lugar de optativo
@@ -116,6 +118,7 @@ gl:
           sign_up_requires_approval: Os novos rexistros requerirán a túa aprobación
         severity: Escolle que acontecerá coas peticións desde este IP
       rule:
+        hint: Optativo. Proporciona máis detalles acerca da regra
         text: Describe unha regra ou requerimento para as usuarias deste servidor. Intenta que sexa curta e simple
       sessions:
         otp: 'Escribe o código do segundo factor creado pola aplicación do teu móbil ou usa un dos códigos de recuperación:'
@@ -242,7 +245,7 @@ gl:
         backups_retention_period: Período de retención do arquivo da usuaria
         bootstrap_timeline_accounts: Recomendar sempre estas contas ás novas usuarias
         closed_registrations_message: Mensaxe personalizada para cando o rexistro está pechado
-        content_cache_retention_period: Período de retención da caché do contido
+        content_cache_retention_period: Período de retención de contido remoto
         custom_css: CSS personalizado
         mascot: Mascota propia (herdado)
         media_cache_retention_period: Período de retención da caché multimedia
@@ -299,6 +302,7 @@ gl:
           patch: Notificar as actualizacións de arranxos
         trending_tag: Hai que revisar unha nova tendencia
       rule:
+        hint: Información adicional
         text: Regra
       settings:
         indexable: Incluír páxina de perfil nos motores de busca
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 0a8a57c347..65c6f6110f 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -39,14 +39,14 @@ he:
         text: ניתן לערער על עברה רק פעם אחת
       defaults:
         autofollow: אנשים שיצטרפו בעזרת ההזמנה יעקבו אחריך באופן אוטומטי
-        avatar: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן ל-%{dimensions}px
+        avatar: WEBP, PNG, GIF או JPG. גודל מירבי %{size}. גודל התמונה יוקטן ל־%{dimensions} פיקסלים
         bot: איתות לאחרים שהחשבון מבצע בעיקר פעולות אוטומטיות ועשוי לא להיות מנוטר
         context: הקשר אחד או יותר בהם יופעל המסנן
         current_password: מסיבות אבטחה נא להזין את הסיסמא של החשבון הנוכחי
         current_username: על מנת לאשר, נא להכניס את שם המשתמש של החשבון הנוכחי
         digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך
         email: דוא"ל אישור יישלח אליך
-        header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
+        header: WEBP, PNG, GIF או JPG. גודל מירבי %{size}. גודל התמונה יוקטן ל־%{dimensions} פיקסלים
         inbox_url: נא להעתיק את הקישורית מדף הבית של הממסר בו תרצה/י להשתמש
         irreversible: הודעות מסוננות יעלמו באופן בלתי הפיך, אפילו אם מאוחר יותר יוסר המסנן
         locale: שפת ממשק המשתמש, הדוא"ל וההתראות בדחיפה
@@ -77,13 +77,15 @@ he:
           warn: הסתר את התוכן המסונן מאחורי אזהרה עם כותרת המסנן
       form_admin_settings:
         activity_api_enabled: מספר ההודעות שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
-        backups_retention_period: לשמור ארכיון משתמש שנוצר למשך מספר הימים המצוין.
+        app_icon: WEBP, PNG, GIF או JPG. גובר על אייקון ברירת המחדל ביישומון על מכשירים ניידים ומחליף אותו באייקון נבחר.
+        backups_retention_period: למשתמשים יש יכולת לבקש ארכיון של הודעותיהם להורדה מאוחר יותר. כאשר נבחר ערך חיובי, הארכיונים הללו ימחקו מאחסון לאחר מספר הימים שצוינו.
         bootstrap_timeline_accounts: חשבונות אלו יוצמדו לראש רשימת המלצות המעקב של משתמשים חדשים.
         closed_registrations_message: להציג כאשר הרשמות חדשות אינן מאופשרות
-        content_cache_retention_period: הודעות משרתים אחרים ימחקו אחרי מספר הימים המצוין כאשר מצוין מספר חיובי. פעולה זו אינה הפיכה.
+        content_cache_retention_period: כל ההודעות משרתים אחרים (לרבות הדהודים ותגובות) ימחקו אחרי מספר ימים, ללא קשר לאינטראקציה של משתמשים מקומיים איתם. בכלל זה הודעות שהמתשתמשים המקומיים סימנו בסימניה או חיבוב. איזכורים פרטיים ("דיאם") בין משתמשים בין שרתים שונים יאבדו גם הם ולא תהיה אפשרות לשחזרם. השימוש באפשרות הזו מיועד לשרתים עם ייעוד מיוחד ושובר את ציפיותיהם של רב המשתמשים כאשר האפשרות מופעלת בשרת לשימוש כללי.
         custom_css: ניתן לבחור ערכות סגנון אישיות בגרסת הדפדפן של מסטודון.
+        favicon: WEBP, PNG, GIF או JPG. גובר על "פאבאייקון" ברירת המחדל ומחליף אותו באייקון נבחר בדפדפן.
         mascot: בחירת ציור למנשק הווב המתקדם.
-        media_cache_retention_period: קבצי מדיה שהורדו ימחקו אחרי מספר הימים שיצוינו אם נבחר מספר חיובי, או-אז יורדו שוב מחדש בהתאם לצורך.
+        media_cache_retention_period: קבצי מדיה מהודעות שהגיעו משרתים רחוקים נשמרות על השרת שלך. כאשר יבחר פה מספר חיובי, המדיה תמחק לאחר מספר ימים כמצוין. אם המידע יבוקש שוב לאחר שנמחק, הוא יורד מחדש, אם המידע עדיין זמין בצד הרחוק. עקב מגבלות על תכיפות שליפת כרטיסי קדימון מאתרים מרוחקים, מומלץ לכוון את הערך ל־14 יום לפחות, או שכרטיסי קדימונים לא יעודכנו לפי דרישה לפני חלוף חלון הזמן הזה.
         peers_api_enabled: רשימת השרתים ששרת זה פגש בפדיוורס. לא כולל מידע לגבי קשר ישיר עם שרת נתון, אלא רק שידוע לשרת זה על קיומו. מידע זה משמש שירותים האוספים סטטיסטיקות כלליות על הפדרציה.
         profile_directory: ספריית הפרופילים מציגה ברשימה את כל המשתמשים שביקשו להיות ניתנים לגילוי.
         require_invite_text: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
@@ -116,6 +118,7 @@ he:
           sign_up_requires_approval: הרשמות חדשות ידרשו את אישורך
         severity: נא לבחור מה יקרה לבקשות מכתובת IP זו
       rule:
+        hint: לא חובה. פירוט נוסף לגבי הכלל
         text: נא לתאר את הכלל או הדרישה למשתמשים משרת זה. על התיאור להיות קצר ובהיר
       sessions:
         otp: 'נא להקליד קוד אימות דו-שלבי ממכשירך או להשתמש באחד מקודי אחזור הגישה שלך:'
@@ -242,7 +245,7 @@ he:
         backups_retention_period: תקופת השמירה של ארכיון המשתמש
         bootstrap_timeline_accounts: המלצה על חשבונות אלה למשתמשים חדשים
         closed_registrations_message: הודעה מיוחדת כשההרשמה לא מאופשרת
-        content_cache_retention_period: תקופת שמירת מטמון תוכן
+        content_cache_retention_period: תקופת השמירה על תוכן חיצוני
         custom_css: CSS בהתאמה אישית
         mascot: סמל השרת (ישן)
         media_cache_retention_period: תקופת שמירת מטמון מדיה
@@ -299,6 +302,7 @@ he:
           patch: קבלת הודעה על עדכוני תיקון שקצים
         trending_tag: נושאים חמים חדשים דורשים סקירה
       rule:
+        hint: מידע נוסף
         text: כלל
       settings:
         indexable: חשיפת דף המשתמש במנועי החיפוש
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 3db4fd3b4a..ea40543c51 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -8,8 +8,6 @@ hr:
         title: Proizvoljno. Nije vidljivo primatelju
       defaults:
         autofollow: Ljudi koji se registriraju kroz pozivnicu će te automatski slijediti
-        avatar: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
-        header: PNG, GIF ili JPG. Najviše %{size}. Bit će smanjeno na %{dimensions}px
         password: Mora biti najmanje 8 znakova
         setting_display_media_default: Sakrij medijski sadržaj označen kao osjetljiv
         setting_display_media_hide_all: Uvijek sakrij medijski sadržaj
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 6e11f7fb93..6ccca2bc84 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -39,14 +39,14 @@ hu:
         text: Egy vétséget csak egyszer fellebbezhetsz meg
       defaults:
         autofollow: Akik meghívón keresztül regisztrálnak, automatikusan követni fognak téged
-        avatar: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+        avatar: WEBP, PNG, GIF vagy JPG. Legfeljebb %{size}. Át lesz méretezve %{dimensions} képpontosra.
         bot: Ez a fiók automatikus műveleteket végez és valószínűleg nem figyeljük
         context: Kontextusok, ahol a szűrőnek működnie kell
         current_password: Biztonsági okok miatt kérlek, írd be a jelenlegi fiók jelszavát
         current_username: A jóváhagyáshoz írd be a jelenlegi fiók felhasználói nevét
         digest: Csak hosszú távollét esetén küldődik és csak ha személyes üzenetet kaptál távollétedben
         email: Kapsz egy megerősítő e-mailt
-        header: PNG, GIF vagy JPG. Maximum %{size}. Átméretezzük %{dimensions} pixelre
+        header: WEBP, PNG, GIF vagy JPG. Legfeljebb %{size}. Át lesz méretezve %{dimensions} képpontosra.
         inbox_url: Másold ki a használandó relé szerver kezdőoldalának URL-jét
         irreversible: A kiszűrt bejegyzések visszafordíthatatlanul eltűnnek, a szűrő későbbi törlése esetén is
         locale: A felhasználói felület, e-mailek, push üzenetek nyelve
@@ -54,11 +54,11 @@ hu:
         phrase: Illeszkedni fog kis/nagybetű függetlenül, és tartalmi figyelmeztetések mögött is
         scopes: Mely API-kat érheti el az alkalmazás. Ha felső szintű hatáskört választasz, nem kell egyesével kiválasztanod az alatta lévőeket.
         setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan bejegyzésekhez, melyeket nemrég toltak meg (csak új megtolásokra lép életbe)
-        setting_always_send_emails: Alapesetben nem küldünk e-mail értesítéseket, ha aktívan használod a Mastodont
+        setting_always_send_emails: Alapesetben nem küldünk e-mail-értesítéseket, ha aktívan használod a Mastodont
         setting_default_sensitive: A kényes médiatartalmat alapesetben elrejtjük, de egyetlen kattintással előhozható
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
-        setting_display_media_hide_all: Mindig minden média elrejtése
-        setting_display_media_show_all: Mindig mutasd a szenzitív tartalomként jelölt médiát
+        setting_display_media_hide_all: Média elrejtése mindig
+        setting_display_media_show_all: Média megjelenítése mindig
         setting_use_blurhash: A kihomályosítás az eredeti képből történik, de minden részletet elrejt
         setting_use_pending_items: Idővonal frissítése csak kattintásra automatikus görgetés helyett
         username: Betűk, számok és alávonások használhatók
@@ -77,13 +77,15 @@ hu:
           warn: A szűrt tartalom a szűrő címét említő figyelmeztetés mögé rejtése
       form_admin_settings:
         activity_api_enabled: Helyi bejegyzések, aktív felhasználók és új regisztrációk száma heti bontásban
-        backups_retention_period: Az előállított felhasználói archívumok megtartása a megadott napokig.
+        app_icon: WEBP, PNG, GIF vagy JPG. Mobileszközökön az alkalmazás alapértelmezett ikonját felülírja egy egyéni ikonnal.
+        backups_retention_period: A felhasználók archívumokat állíthatnak elő a bejegyzéseikből, hogy később letöltsék azokat. Ha pozitív értékre van állítva, akkor a megadott számú nap után automatikusan törölve lesznek a tárhelyedről.
         bootstrap_timeline_accounts: Ezek a fiókok ki lesznek tűzve az új felhasználók követési javaslatainak élére.
         closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
-        content_cache_retention_period: A más kiszolgálókról származó bejegyzések megadott számú nap után törölve lesznek, ha pozitív értékre van állítva. Ez lehet, hogy nem fordítható vissza.
+        content_cache_retention_period: Minden más kiszolgálóról származó bejegyzés (megtolásokkal és válaszokkal együtt) törölve lesz a megadott számú nap elteltével, függetlenül a helyi felhasználók ezekkel a bejegyzésekkel történő interakcióitól. Ebben azok a bejegyzések is benne vannak, melyeket a helyi felhasználó könyvjelzőzött vagy kedvencnek jelölt. A különböző kiszolgálók felhasználói közötti privát üzenetek is el fognak veszni visszaállíthatatlanul. Ennek a beállításnak a használata különleges felhasználási esetekre javasolt, mert számos felhasználói elvárás fog eltörni, ha általános céllal használják.
         custom_css: A Mastodon webes verziójában használhatsz egyéni stílusokat.
+        favicon: WEBP, PNG, GIF vagy JPG. Az alapértelmezett Mastodon favicont felülírja egy egyéni ikonnal.
         mascot: Felülbírálja a speciális webes felületen található illusztrációt.
-        media_cache_retention_period: A letöltött médiafájlok megadott számú nap után törölve lesznek, ha pozitív értékre van állítva, és igény szerint újból le lesznek töltve.
+        media_cache_retention_period: A távoli felhasználók bejegyzéseinek médiatartalmait a kiszolgálód gyorsítótárazza. Ha pozitív értékre állítják, ezek a médiatartalmak a megadott számú nap után törölve lesznek. Ha a médiát újra lekérik, miután törlődött, újra le fogjuk tölteni, ha az eredeti még elérhető. A hivatkozások előnézeti kártyáinak harmadik fél weboldalai felé történő hivatkozásaira alkalmazott megkötései miatt javasolt, hogy ezt az értéket legalább 14 napra állítsuk, ellenkező esetben a hivatkozások előnézeti kártyái szükség esetén nem fognak tudni frissülni ezen idő előtt.
         peers_api_enabled: Azon domainek listája, melyekkel ez a kiszolgáló találkozott a fediverzumban. Nem csatolunk adatot arról, hogy föderált kapcsolatban vagy-e az adott kiszolgálóval, csak arról, hogy a kiszolgálód tud a másikról. Ezt olyan szolgáltatások használják, melyek általában a föderációról készítenek statisztikákat.
         profile_directory: A profilok jegyzéke minden olyan felhasználót felsorol, akik engedélyezték a felfedezhetőségüket.
         require_invite_text: Ha a regisztrációhoz manuális jóváhagyásra van szükség, akkor a „Miért akarsz csatlakozni?” válasz kitöltése legyen kötelező, és ne opcionális
@@ -116,6 +118,7 @@ hu:
           sign_up_requires_approval: Új regisztrációk csak a jóváhagyásoddal történhetnek majd meg
         severity: Válaszd ki, mi történjen a kérésekkel erről az IP-ről
       rule:
+        hint: Nem kötelező. Adj meg további részleteket a szabályról.
         text: Írd le, mi a szabály vagy elvárás ezen a kiszolgálón a felhasználók felé. Próbálj röviden, egyszerűen fogalmazni.
       sessions:
         otp: 'Add meg a telefonodon generált kétlépcsős azonosító kódodat vagy használd az egyik tartalék bejelentkező kódot:'
@@ -145,12 +148,12 @@ hu:
           name: Címke
           value: Tartalom
         indexable: Nyilvános bejegyzések szerepeltetése a keresési eredményekben
-        show_collections: Követők és követettek megjelnítése a profilban
+        show_collections: Követők és követettek megjelenítése a profilban
         unlocked: Új követők automatikus elfogadása
       account_alias:
-        acct: Régi fiók kezelése
+        acct: A régi fiók fiókneve
       account_migration:
-        acct: Új fiók kezelése
+        acct: Az új fiók fiókneve
       account_warning_preset:
         text: Figyelmeztető szöveg
         title: Cím
@@ -186,7 +189,7 @@ hu:
         data: Adatok
         display_name: Megjelenített név
         email: E-mail cím
-        expires_in: Elévül
+        expires_in: Elévülés dátuma
         fields: Profil metaadatai
         header: Fejléc
         honeypot: "%{label} (ne töltsd ki)"
@@ -201,7 +204,7 @@ hu:
         phrase: Kulcsszó vagy kifejezés
         setting_advanced_layout: Speciális webes felület engedélyezése
         setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon
-        setting_always_send_emails: E-mail értesítések küldése mindig
+        setting_always_send_emails: E-mail-értesítések küldése mindig
         setting_auto_play_gif: GIF-ek automatikus lejátszása
         setting_boost_modal: Megerősítés kérése megtolás előtt
         setting_default_language: Bejegyzések nyelve
@@ -242,7 +245,7 @@ hu:
         backups_retention_period: Felhasználói archívum megtartási időszaka
         bootstrap_timeline_accounts: Mindig javasoljuk ezeket a fiókokat az új felhasználók számára
         closed_registrations_message: A feliratkozáskor megjelenő egyéni üzenet nem érhető el
-        content_cache_retention_period: Tartalom-gyorsítótár megtartási időszaka
+        content_cache_retention_period: Távoli tartalmak megtartási időszaka
         custom_css: Egyéni CSS
         mascot: Egyéni kabala (örökölt)
         media_cache_retention_period: Média-gyorsítótár megtartási időszaka
@@ -251,7 +254,7 @@ hu:
         registrations_mode: Ki regisztrálhat
         require_invite_text: Indok megkövetelése a csatlakozáshoz
         show_domain_blocks: Domain tiltások megjelenitése
-        show_domain_blocks_rationale: A domainok blokkolásának okának megjelenítése
+        show_domain_blocks_rationale: A domainek letiltási okainak megjelenítése
         site_contact_email: Kapcsolattartó e-mail
         site_contact_username: Kapcsolattartó felhasználóneve
         site_extended_description: Bővített leírás
@@ -299,6 +302,7 @@ hu:
           patch: Értesítés hibajavítási frissítésekről
         trending_tag: Új trend felülvizsgálatra vár
       rule:
+        hint: További információk
         text: Szabály
       settings:
         indexable: A profiloldal szerepeltetése a keresőmotorokban
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 9dbcd1301e..0525f2d6fc 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -23,14 +23,12 @@ hy:
         text: Կարող ես օգտագործել գրառման առանձնայատկութիւնը։ Խնդրում ենք, լինել խելամիտ յայտարարութեան տարածքն օգտագործելիս, այն յայտնուելու է օգտատիրոջ էկրանին
       defaults:
         autofollow: Հրաւէրի միջոցով գրանցուող մարդիկ կը հետեւեն քեզ
-        avatar: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
         bot: Այս հաշիւը հիմնականում կատարում է աւտօմատացուած գործողութւնները եւ գուցէ չի վերայսկուում
         context: Մէկ կամ մի քանի կոնտեքստներ, որտեղ պէտք է կիրառուի զտիչ
         current_password: Անվտանգութեան նկատառումներից ելնելով, խնդրում ենք մուտքագրել տուել հաշուի ծածկագիրը
         current_username: Հաստատելու համար խնդրում ենք մուտքագրել տուել հաշուի օգտանունը
         digest: Ուղարկուում է պասիւութեան երկար շրջանից յետոյ եւ միայն այն դէպքում, երբ բացակայութեանդ ժամանակ որեւէ անձնական հաղորդագրութիւն ես ստացել
         email: Քեզ ուղարկուել է հաստատման իմակ
-        header: PNG, GIF կամ JPG։ Առաւելագոյնը՝ %{size}։ Կը փոքրացուի մինչեւ %{dimensions}
         inbox_url: Պատճէնիր URL այն շերտի դիմերեսից, որը ցանկանում ես օգտագործել
         irreversible: Զտուած գրառումները կորչելու են անդառնալիօրէն, նոյնիսկ եթէ զտիչը յետոյ հեռացնես
         locale: Ինտերֆեյսի լեզուն, էլ. նամակները եւ push ծանուցումները
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 552abb2550..51329edd88 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -1,46 +1,338 @@
 ---
 ia:
   simple_form:
+    hints:
+      account:
+        discoverable: Tu messages public e tu profilo pote esser consiliate o recommendate in varie areas de Mastodon e tu profilo pote esser suggerite a altere usatores.
+        display_name: Tu prenomine e nomine de familia o tu pseudonymo.
+        fields: Tu pagina principal, pronomines, etate, toto lo que tu vole.
+        indexable: Tu messages public pote apparer in resultatos del recerca sur Mastodon. Illes qui ha interagite con tu messages totevia pote cercar les.
+        note: 'Tu pote @mentionar altere personas o #hashtags.'
+        show_collections: Le personas potera navigar per tu sequites e sequaces. Le personas potera navigar per tu sequites e sequaces.
+        unlocked: Le personas potera sequer te sin requestar approbation. Dismarca si tu desira revider le requestas de sequer e selige si acceptar o rejectar nove sequaces.
+      account_alias:
+        acct: Specifica le nomine_de_usator@dominio del conto ab que tu vole mover
+      account_migration:
+        acct: Specifica le nomine_de_usator@dominio del conto a que tu vole mover
+      account_warning_preset:
+        text: Tu pote usar le syntaxe de message, tal como URLs, hashtags e mentiones
+        title: Optional. Non visibile al destinatario
+      admin_account_action:
+        include_statuses: Le usator videra que messages ha causate le action o aviso de moderation
+        send_email_notification: Le usator recipera un explication de cosa eveniva con lor conto
+        text_html: Optional. Tu pote usar le syntaxe de message. Tu pote <a href="%{path}">adder avisos preconfigurate</a> pro sparniar tempore
+        type_html: Selige lo que tu vole facer con <strong>%{acct}</strong>
+        types:
+          disable: Impedir al usator de usar lor conto, sin deler o celar lor contentos.
+          none: Usar lo pro inviar un aviso al usator, sin discatenar ulle altere action.
+          sensitive: Fortiar tote le annexos multimedial de iste usator a esser signalate como sensibile.
+          silence: Impedir al usator de poter publicar messages con public visibilitate, celar lor messages e notificationes ab gente non sequente illes. Clauder tote le reportos contra iste conto.
+          suspend: Impedir ulle interaction de o a iste conto e deler su contentos. Reversibile intra 30 dies. Clauder tote le reportos contra iste conto.
+        warning_preset_id: Optional. Tu pote ancora adder personal texto a fin del preconfigurate
+      announcement:
+        all_day: Si marcate, solo le datas del campo tempore sera monstrate
+        ends_at: Le annuncio sera automaticamente obscurate a iste tempore
+        scheduled_at: Lassar blanc pro publicar le annuncio immediatemente
+        starts_at: Optional. In caso tu annuncio es ligate con un specific campo tempore
+        text: Tu pote usar le syntaxe de message. Presta attention al spatio que le annuncio occupara sur le schermo de usator
+      appeal:
+        text: Tu pote solo appellar te un vice
+      defaults:
+        autofollow: Illes qui se inscribe per le invitation automaticamente devenira tu sequaces
+        avatar: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+        bot: Signala a alteres que le conto principalmente exeque actiones automatisate e poterea non esser surveliate
+        context: Un o plure contextos ubi le filtro deberea applicar se
+        current_password: Pro propositos de securitate insere le contrasigno del conto actual
+        current_username: Pro confirmar, insere le nomine de usator del conto actual
+        digest: Solo inviate post un longe periodo de inactivitate e solo si tu ha recipite alcun messages personal in tu absentia
+        email: Te sera inviate un email de confirmation
+        header: WEBP, PNG, GIF or JPG. Al maximo %{size}. Sera diminuite a %{dimensions}px
+        inbox_url: Copia le URL ab le pagina principal del repetitor que tu vole usar
+        irreversible: Le messages filtrate disparera irreversibilemente, mesmo si le filtro es plus tarde removite
+        locale: Le lingua del interfacie de usator, del emails e del notificationes pulsate
+        password: Usa al minus 8 characteres
+        phrase: Sera concordate ignorante majuscule/minuscule in le texto o avisos de contento de un message
+        scopes: A que APIs sera permittite acceder al application. Si tu selige un ambito de maxime nivello, tu non besonia de seliger los singulemente.
+        setting_aggregate_reblogs: Non monstra nove stimulos pro messages que ha essite recentemente stimulate (stimulos solo affice los novemente recipite)
+        setting_always_send_emails: Normalmente le avisos de email non sera inviate quando tu activemente usa Mastodon
+        setting_default_sensitive: Le medios sensibile es celate de ordinario e pote esser revelate con un clic
+        setting_display_media_default: Celar le medios marcate como sensibile
+        setting_display_media_hide_all: Sempre celar le medios
+        setting_display_media_show_all: Sempre monstrar le medios
+        setting_use_blurhash: Le imagines degradate es basate sur le colores del medios visual celate, ma illos offusca qualcunque detalios
+        setting_use_pending_items: Celar le classification temporal detra un clic in vice que automaticamente rolante le fluxo
+        username: Tu pote usar litteras, numeros e tractos de sublineamento
+        whole_word: Quando le parola o expression clave es solo alphanumeric, illo sera solo applicate si illo concorda con tote le parola
+      domain_allow:
+        domain: Iste dominio potera reportar datos ab iste servitor e le datos in ingresso ab illo sera processate e immagazinate
+      email_domain_block:
+        domain: Isto pote esser le nomine de dominio que apparera in le adresse email o le registration MX que illo usa. Illos sera verificate durante le inscription.
+        with_dns_records: Un tentativa sera facite pro resolver le registrationes de DNS del dominio date e le resultatos sera alsi blocate
+      featured_tag:
+        name: 'Ecce alcun del hashtags que tu usava le plus recentemente:'
+      filters:
+        action: Selige que action exequer quando un message concorda con le filtro
+        actions:
+          hide: Completemente celar le contento filtrate, comportar se como si illo non existerea
+          warn: Celar le contento filtrate detra un aviso citante le titulo del filtro
+      form_admin_settings:
+        activity_api_enabled: Numeros de messages localmente publicate, usatores active, e nove registrationes in gruppos septimanal
+        app_icon: WEBP, PNG, GIF o JPG. Supplanta le icone predefinite sur apparatos mobile con un icone personalisate.
+        backups_retention_period: Le usatores pote generar archivos de lor messages pro discargar los plus tarde. Quando predefinite a un valor positive, iste archivos sera automaticamente delite de tu immagazinage post le specificate numero de dies.
+        bootstrap_timeline_accounts: Iste contos sera appunctate al summitate del recommendationes a sequer del nove usatores.
+        closed_registrations_message: Monstrate quando le inscriptiones es claudite
+        content_cache_retention_period: Tote messages de altere servitores (includite stimulos e responsas) sera delite post le specificate numero de dies, sin considerar alcun interaction de usator local con ille messages. Isto include messages ubi un usator local los ha marcate como marcapaginas o favoritos. Mentiones private inter usatores de differente instantias sera alsi perdite e impossibile a restaurar. Le uso de iste parametros es intendite pro specific instantias e infringe multe expectationes de usator quando implementate pro uso general.
+        custom_css: Tu pote applicar stilos personalisate sur le version de web de Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Supplanta le favicone predefinite de Mastodon con un icone personalisate.
+        mascot: Illo substitue le illustration in le interfacie web avantiate.
+        media_cache_retention_period: Le files multimedial de messages producite per usatores remote es in cache sur tu servitor. Quando predefinite a un valor positive, le medios sera delite post le numero de dies specificate. Le datos multimedial requirite post que illo es delite, sera re-discargate, si le contento original sera ancora disponibile. Per limitationes sur le frequentia con que le schedas de pre-visualisation de ligamine scruta le sitos de tertie partes, il es recommendate de predefinir iste valor a al minus 14 dies, o le schedas de pre-visualisation de ligamine non sera actualisate sur demanda ante ille tempore.
+        peers_api_enabled: Un lista de nomines de dominio que iste servitor ha incontrate in le fediverso. Nulle datos es includite ci re tu federation con un date servitor, justo que tu servitor lo cognosce. Isto es usate per servicios que collige statistica re le federation in senso general.
+        profile_directory: Le directorio de profilo lista tote le usatores qui ha optate pro esser detectabile.
+        require_invite_text: Quando le inscriptiones require approbation manual, rende obligatori, plus tosto que optional, le entrata de texto “Perque vole tu junger te?”
+        site_contact_email: Como pote contactar te le personas pro questiones legal o de supporto.
+        site_contact_username: Como pote contactar te le personas re Mastodon.
+        site_extended_description: Qualcunque information additional que pote esser utile al visitatores e a tu usatores. Pote esser structurate con syntaxe de markdown.
+        site_short_description: Un breve description pro adjutar a univocamente identificar tu servitor. Qui ha exequite illo, proque es illo?
+        site_terms: Usa tu proprie politica de confidentialitate o lassa blanc pro usar le predefinite. Pote esser structurate con syntaxe de markdown.
+        site_title: Como le personas pote referer se a tu servitor in addition su nomine de dominio.
+        status_page_url: URL de un pagina ubi le personas pote vider le stato de iste servitor durante un interruption
+        theme: Thema que le visitatores disconnexe e le nove usatores vide.
+        thumbnail: Un imagine approximativemente 2:1 monstrate al latere del informationes de tu servitor.
+        timeline_preview: Le visitatores disconnexe potera navigar per le plus recente messages public disponibile sur le servitor.
+        trendable_by_default: Saltar le revision manual del contento de tendentia. Elementos singule pote ancora esser removite de tendentias post le facto.
+        trends: Tendentias monstra que messages, hashtags e novas gania traction sur tu servitor.
+        trends_as_landing_page: Monstrar contento de tendentia a usatores disconnexe e visitatores in vice que un description de iste servitor. Require tendentias esser activate.
+      form_challenge:
+        current_password: Tu entra in un area secur
+      imports:
+        data: File CSV exportate ab un altere servitor de Mastodon
+      invite_request:
+        text: Isto nos adjutara a revider tu application
+      ip_block:
+        comment: Optional. Memorar perque tu ha addite iste regula.
+        expires_in: Le adresses IP es un ressource finite, illos es aliquando compartite e sovente cambia manos. Pro iste ration, blocadas de IP indefinite non es recommendate.
+        ip: Inserer un adresse IPv4 o IPv6. Tu pote blocar campos integre per le syntaxe CIDR. Sia attente pro non disconnecter te!
+        severities:
+          no_access: Blocar accesso a tote le ressources
+          sign_up_block: Nove inscriptiones non sera possibile
+          sign_up_requires_approval: Nove inscriptiones requirera tu approbation
+        severity: Seliger que evenira con requestas ab iste IP
+      rule:
+        hint: Optional. Forni altere detalios re le regula
+        text: Describe un regula o requisito pro usatores sur iste servitor. Tenta de mantener lo breve e simple
+      sessions:
+        otp: 'Insere le codice a duo factores generate per le app de tu telephono o usa un de tu codices de recuperation:'
+        webauthn: Si illo es un clave USB cura de inserer lo e, si necessari, tocca lo.
+      settings:
+        indexable: Tu pagina del profilo pote apparer in resultatos del recerca sur Google, Bing, e alteros.
+        show_application: Tu sempre sera capace totevia de vider que app publicava tu message.
+      tag:
+        name: Tu pote solo cambiar le inveloppe del litteras, per exemplo, pro render lo plus legibile
+      user:
+        chosen_languages: Si marcate, solo le messages in le linguas seligite sera monstrate in chronologias public
+        role: Le rolo controla que permissos ha le usator
+      user_role:
+        color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
+        highlighted: Iste rende le rolo publicamente visibile
+        name: Nomine public del rolo, si rolo es definite a esser monstrate como insignia
+        permissions_as_keys: Usatores con iste rolo habera accesso a...
+        position: Rolo superior decide resolution de conflicto in certe situationes. Certe actiones pote solo esser exequite sur rolos con un prioritate inferior
+      webhook:
+        events: Selige le eventos a inviar
+        template: Compone tu proprie carga utile JSON per interpolation de variabile. Lassar blanc pro JSON predefinite.
+        url: Ubi le eventos essera inviate
     labels:
       account:
+        discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
         fields:
           name: Etiquetta
           value: Contento
+        indexable: Includer messages public in le resultatos de recerca
+        show_collections: Monstrar sequites e sequitores in le profilo
+        unlocked: Acceptar automaticamente nove sequitores
+      account_alias:
+        acct: Pseudonymo del vetere conto
+      account_migration:
+        acct: Pseudonymo del nove conto
+      account_warning_preset:
+        text: Texto predefinite
+        title: Titulo
       admin_account_action:
+        include_statuses: Includer messages reportate in le email
+        send_email_notification: Notificar le usator per e-mail
+        text: Advertimento personalisate
         type: Action
+        types:
+          disable: Gelar
+          none: Inviar un advertimento
+          sensitive: Sensibile
+          silence: Limitar
+          suspend: Suspender
+        warning_preset_id: Usar un aviso predefinite
+      announcement:
+        all_day: Evento quotidian
+        ends_at: Fin del evento
+        scheduled_at: Planificar publication
+        starts_at: Initio del evento
+        text: Annuncio
+      appeal:
+        text: Explicar perque iste decision deberea esser revertite
       defaults:
+        autofollow: Invitar a sequer tu conto
         avatar: Pictura de profilo
+        bot: Isto es un conto automatisate
+        chosen_languages: Filtrar linguas
         confirm_new_password: Confirmar nove contrasigno
         confirm_password: Confirmar contrasigno
+        context: Contextos del filtro
         current_password: Contrasigno actual
+        data: Datos
+        display_name: Nomine a monstrar
+        email: Adresse de e-mail
+        expires_in: Expira post
+        fields: Campos extra
+        header: Imagine titulo
+        honeypot: "%{label} (non compilar)"
+        inbox_url: URL del cassa de ingresso de repetitor
+        irreversible: Declinar in vice que celar
+        locale: Lingua de interfacie
+        max_uses: Numero max de usos
         new_password: Nove contrasigno
+        note: Bio
+        otp_attempt: Codice a duo factores
         password: Contrasigno
+        phrase: Parola o phrase clave
+        setting_advanced_layout: Activar le interfacie web avantiate
+        setting_aggregate_reblogs: Gruppa promotiones in classificationes temporal
+        setting_always_send_emails: Sempre inviar notificationes per e-mail
+        setting_auto_play_gif: Auto-reproduce GIFs animate
+        setting_boost_modal: Monstrar dialogo de confirmation ante promover
+        setting_default_language: Lingua de publication
+        setting_default_privacy: Confidentialitate del messages
+        setting_default_sensitive: Sempre marcar le medios cmo sensbile
+        setting_delete_modal: Monstrar le dialogo de confirmation ante deler un message
+        setting_disable_swiping: Disactivar le movimentos per glissamento
+        setting_display_media: Visualisation de medios
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
         setting_display_media_show_all: Monstrar toto
+        setting_expand_spoilers: Sempre expander messages marcate con avisos de contento
+        setting_hide_network: Cela tu rete social
+        setting_reduce_motion: Reducer movimento in animationes
         setting_system_font_ui: Usar typo de litteras predefinite del systema
         setting_theme: Thema de sito
         setting_trends: Monstrar le tendentias de hodie
+        setting_unfollow_modal: Monstrar dialogo de confirmation ante cessar de sequer alcuno
+        setting_use_blurhash: Monstrar imagines degradate multicolor pro medios celate
+        setting_use_pending_items: Modo lente
+        severity: Severitate
         sign_in_token_attempt: Codice de securitate
         title: Titulo
+        type: Importar le typo
         username: Nomine de usator
         username_or_email: Nomine de usator o e-mail
+        whole_word: Parola integre
+      email_domain_block:
+        with_dns_records: Includer registrationes MX e IPs del dominio
+      featured_tag:
+        name: Hashtag
+      filters:
+        actions:
+          hide: Celar completemente
+          warn: Celar con un advertimento
       form_admin_settings:
+        activity_api_enabled: Publicar statisticas aggregate re le activitate de usator in le API
+        backups_retention_period: Periodo de retention del archivo de usator
+        bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
+        closed_registrations_message: Message personalisate quando le inscriptiones non es disponibile
+        content_cache_retention_period: Periodo de retention del contento remote
         custom_css: CSS personalisate
+        mascot: Personalisar le mascotte (hereditage)
+        media_cache_retention_period: Periodo de retention del cache multimedial
+        peers_api_enabled: Publicar le lista de servitores discoperite in le API
         profile_directory: Activar directorio de profilos
+        registrations_mode: Qui pote inscriber se
+        require_invite_text: Requirer un ration pro junger se
+        show_domain_blocks: Monstrar le blocadas de dominio
+        show_domain_blocks_rationale: Monstrar perque le dominios era blocate
         site_contact_email: Adresse de e-mail de contacto
         site_contact_username: Nomine de usator de contacto
+        site_extended_description: Description extense
+        site_short_description: Description de servitor
         site_terms: Politica de confidentialitate
         site_title: Nomine de servitor
+        status_page_url: URL del pagina de stato
         theme: Thema predefinite
+        thumbnail: Miniatura de servitor
+        timeline_preview: Permitter accesso non authenticate a chronologias public
+        trendable_by_default: Permitter tendentias sin revision previe
         trends: Activar tendentias
+        trends_as_landing_page: Usar tendentias como pagina de destination
+      interactions:
+        must_be_follower: Blocar notificationes de non-sequaces
+        must_be_following: Blocar notificationes de gente que tu non sequer
+        must_be_following_dm: Blocar messages directe de gente que tu non seque
+      invite:
+        comment: Commento
+      invite_request:
+        text: Perque vole tu junger te?
+      ip_block:
+        comment: Commento
+        ip: IP
+        severities:
+          no_access: Blocar le accesso
+          sign_up_block: Blocar inscriptiones
+          sign_up_requires_approval: Limitar inscriptiones
+        severity: Regula
       notification_emails:
+        appeal: Alcuno appella un decision de moderator
+        digest: Inviar emails compendio
+        favourite: Alcuno appreciava tu message
+        follow: Alcuno te sequeva
+        follow_request: Alcuno requireva de sequer te
+        mention: Alcuno te mentionava
+        pending_account: Nove conto besonia de revision
+        reblog: Alcuno promoveva tu message
+        report: Un nove reporto es inviate
         software_updates:
+          all: Notificar sur tote le actualisationes
+          critical: Notificar solmente sur actualisationes critic
           label: Un nove version de Mastodon es disponibile
+          none: Nunquam notificar sur actualisationes (non recommendate)
+          patch: Notificar re actualisationes de correction de bug
+        trending_tag: Un nove tendentia require revision
+      rule:
+        hint: Information additional
+        text: Regula
+      settings:
+        indexable: Includer pagina de profilo in le motores de recerca
+        show_application: Monstrar ab que app tu ha inviate un message
+      tag:
+        listable: Permitter a iste hashtag apparer in le recercas e suggestiones
+        name: Hashtag
+        trendable: Permitter a iste hashtag de sub tendentias
+        usable: Permitter al messages usar iste hashtag
       user:
+        role: Rolo
         time_zone: Fuso horari
       user_role:
+        color: Color de insignia
+        highlighted: Monstrar le rolo como insignia sur le profilos de usator
         name: Nomine
         permissions_as_keys: Permissiones
         position: Prioritate
+      webhook:
+        events: Eventos activate
+        template: Modello de carga utile
+        url: URL de extremo
+    'no': 'No'
+    not_recommended: Non recommendate
+    overridden: Supplantate
+    recommended: Recommendate
+    required:
+      mark: "*"
+      text: requirite
+    title:
+      sessions:
+        webauthn: Usa un de tu claves de securitate pro acceder
     'yes': Si
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 51046ce9d4..856f312eda 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -29,14 +29,12 @@ id:
         text: Anda hanya dapat mengajukan banding peringatan sekali
       defaults:
         autofollow: Orang yang ingin mendaftar lewat undangan, otomatis mengikuti Anda
-        avatar: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         bot: Akun ini melakukan aksi otomatis dan mungkin tak termonitor
         context: Satu atau lebih konteks tempat saringan perlu diterapkan
         current_password: Untuk tujuan keamanan mohon masukkan kata sandi akun ini
         current_username: Untuk konfirmasi, mohon masukkan nama pengguna akun ini
         digest: Hanya kirim setelah lama tidak aktif dan hanya jika Anda menerima pesan personal atas absensi Anda
         email: Anda akan dikirimi email konfirmasi
-        header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         inbox_url: Salin URL dari halaman depan relai yang ingin Anda pakai
         irreversible: Toot tersaring akan hilang permanen bahkan jika saringan dihapus kemudian
         locale: Bahasa antar muka pengguna, email, dan notifikasi dorong
@@ -65,13 +63,10 @@ id:
           hide: Sembunyikan konten yang disaring, seperti itu tidak ada
           warn: Sembunyikan konten yang disaring di belakang sebuah peringatan menyebutkan judul saringan
       form_admin_settings:
-        backups_retention_period: Simpan arsip pengguna yang dibuat untuk jumlah hari yang ditetapkan.
         bootstrap_timeline_accounts: Akun ini akan disematkan di atas rekomendasi ikut pengguna baru.
         closed_registrations_message: Ditampilkan ketika pendaftaran ditutup
-        content_cache_retention_period: Kiriman dari server lain akan dihapus setelah jumlah hari yang ditentukan jika nilai positif ditetapkan. Ini mungkin tidak dapat diurungkan.
         custom_css: Anda dapat menerapkan gaya kustom di versi web Mastodon.
         mascot: Menimpa ilustrasi di antarmuka web tingkat lanjut.
-        media_cache_retention_period: File media yang diunduh akan dihapus setelah beberapa hari yang ditentukan ketika ditetapkan ke nilai yang positif, dan diunduh ulang pada permintaan.
         profile_directory: Direktori profil mendaftarka semua pengguna yang ingin untuk dapat ditemukan.
         require_invite_text: Ketika pendaftaran membutuhkan persetujuan manual, buat masukan teks "Mengapa Anda ingin bergabung?" dibutuhkan daripada opsional
         site_contact_email: Bagaimana orang dapat menghubungi Anda untuk kebutuhan hukum atau dukungan.
@@ -218,7 +213,6 @@ id:
         backups_retention_period: Rentang retensi arsip pengguna
         bootstrap_timeline_accounts: Selalu rekomendasikan akun ini ke pengguna baru
         closed_registrations_message: Pesan kustom ketika pendaftaran tidak tersedia
-        content_cache_retention_period: Rentang retensi tembolok konten
         custom_css: CSS kustom
         mascot: Maskot kustom (lawas)
         media_cache_retention_period: Rentang retensi tembolok media
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index dfd0836412..2b995e7efa 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -39,14 +39,14 @@ ie:
         text: Tu posse apellar un admoniment solmen un vez
       defaults:
         autofollow: Persones qui adherer per li invitation va sequer te automaticmen
-        avatar: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG, con un maximum de %{size}. Va esser diminuet a %{dimensions}px
         bot: Dir a altres que li conto primarimen far automatic actiones e que fórsan null homan vigila it
         context: Un o multiplic contextus u li filtre deve aplicar
         current_password: Por securital rasones, ples introducter li passa-parol del actual conto
         current_username: Por confirmar, ples inmetter li usator-nómine del actual conto
         digest: Misset solmen pos un long periode de ínactivitá e solmen si tu ha recivet quelcunc missages personal in tui inbuxe
         email: On va misser te un email de confirmation
-        header: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG, con un maximum de %{size}. Va esser diminuet a %{dimensions}px
         inbox_url: Copiar li URL del initial págine del relé quel tu vole usar
         irreversible: Filtrat postas va desaparir ínreversibilmen, mem si li filtre es removet plu tard
         locale: Li lingue del usator-interfacie, emails e notificationes push
@@ -77,13 +77,15 @@ ie:
           warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
         activity_api_enabled: Númeres de postas publicat localmen, activ usatores, e nov adhesiones in periodes semanal
-        backups_retention_period: Mantener usator-generat archives por li specificat quantitá de dies.
+        app_icon: WEBP, PNG, GIF o JPG. Remplazza li predenifit favicon Mastodon sur mobiles con un icon customisat.
+        backups_retention_period: Usatores posse generar archives de lor postas por adcargar plu tard. Si on specifica un valore positiv, li archives va esser automaticmen deletet de tui magazinage pos li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
         closed_registrations_message: Monstrat quande adhesiones es cludet
-        content_cache_retention_period: Omni postas e boosts de altri servitores va esser deletet pos li specificat quantitá de dies. Quelc postas fórsan va esser ínrestaurabil. Omni pertinent marcatores, favorites e boosts anc va esser perdit e ínpossibil a restaurar.
+        content_cache_retention_period: Omni postas de altri servitores (includente boosts e responses) va esser deletet pos li specificat quantitá de dies, sin egard a local usator-interactiones con les. To vale anc por postas queles un local usator ha marcat o favoritat it. Anc privat mentiones ínter usatores de diferent instanties va esser perdit e ínrestorabil. Talmen, ti-ci parametre es intentet por scopes special pro que it posse ruptes li expectationes de usatores.
         custom_css: On posse aplicar customisat stiles al web-version de Mastodon.
+        favicon: WEBP, PNG, GIF oo JPG. Remplazza li predenifit favicon Mastodon con in icon customisat.
         mascot: Substitue li ilustration in li avansat interfacie web.
-        media_cache_retention_period: Descargat files de media va esser deletet pos li specificat quantitá de dies quande li valore es positiv, e re-descargat sur demanda.
+        media_cache_retention_period: Files de medie de postas creat de lontan usatores es cachat sur tui servitor. Si on specifica un valore positiv, ili va esser automaticmen deletet pos li specificat quantitá de dies. Si on peti li data del medie pos deletion, it va esser re-descargat si li original fonte es disponibil. Restrictiones pri li frequentie de ligament-previsiones posse exister sur altri situs, e pro to it es recomandat que on usa un valore de adminim 14 dies; altrimen, li ligament-previsiones ne va esser actualisat secun demande ante ti témpor.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
         require_invite_text: Quande registrationes besona manual aprobation, fa que li textu "Pro quo tu vole registrar te?" es obligatori vice facultativ
@@ -116,6 +118,7 @@ ie:
           sign_up_requires_approval: Nov registrationes va besonar tui aprobation
         severity: Selecter quo va evenir con demandes ex ti-ci IP
       rule:
+        hint: Optional. Ples provider plu detallies pri li regul
         text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
       sessions:
         otp: 'Intrar li 2-factor code generat del app sur tui portabile o usar un de tui codes de recuperation:'
@@ -242,7 +245,7 @@ ie:
         backups_retention_period: Periode de retener archives de usator
         bootstrap_timeline_accounts: Sempre recomandar ti-ci contos a nov usatores
         closed_registrations_message: Customisat missage quande registration ne disponibil
-        content_cache_retention_period: Periode de retention por cachat contenete
+        content_cache_retention_period: Periode de retention por contenete lontan
         custom_css: Custom CSS
         mascot: Customisat mascot (hereditat)
         media_cache_retention_period: Periode de retention por cachat medie
@@ -299,6 +302,7 @@ ie:
           patch: Notificar pri problema-fixant actualisationes
         trending_tag: Nov tendentie besonant inspection
       rule:
+        hint: Information in plu
         text: Regul
       settings:
         indexable: Includer profil-pagine in serchatores
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index eef2014d19..81f298249e 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -39,14 +39,12 @@ io:
         text: Vu povas nur apelar striko unafoye
       defaults:
         autofollow: Personi quo registresesas tra invito automatika sequos vu
-        avatar: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         bot: Signalez a altra personi ke la konto precipue havas automatikigita agi e forsan ne surveyesas
         context: Situeso kande filtrilo debas aplikesar
         current_password: Por sekuresorezoni, pozez pasvorto di ca konto
         current_username: Por konfirmar, pozez uzantonomo di ca konto
         digest: Nur sendesas pos longa neaktiveso e nur se vu ganis irga mesaji dum ke vu esas neprezenta
         email: Vu sendesos konfirmretposto
-        header: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         inbox_url: Kopiez URL de frontpagino de relayo quon vu volas uzar
         irreversible: Filtrita posti neinversigeble desaparos, mem se filtro efacesas pose
         locale: Linguo di uzantointervizajo, retposti e pulsavizi
@@ -77,13 +75,10 @@ io:
           warn: Celez filtrita kontenajo dop avert quo montras titulo di filtrilo
       form_admin_settings:
         activity_api_enabled: Quanto de lokale publikigita posti, aktiva uzanti e nova registri, donita semanope
-        backups_retention_period: Retenez igita uzantoarkivi por la diiquanto.
         bootstrap_timeline_accounts: Ca konti pinglagesos a super sequorekomendi di nova uzanti.
         closed_registrations_message: Montresas kande registradi klozesas
-        content_cache_retention_period: Omna posti e repeti de altra servili efacesos pos la specigita nombro de dii. Kelka posti forsan ne esos restaurebla. Omna relata libromarki, favoriziti e repeti anke esos perdita e neposible restaurota.
         custom_css: Vu povas pozar kustumizita staili en retverso di Mastodon.
         mascot: Remplas montreso en avanca retintervizajo.
-        media_cache_retention_period: Deschargita mediifaili efacesos pos la diiquanto kande fixesas a positiva nombro, e rideschargesas irgatempe.
         peers_api_enabled: Listo di domeni quin ca servilo trovis en la fediverso. Nula informo inkluzesas hike pri ka vu federas kun partikulara servilo, nur ke vua servilo savas pri lo. Co es uzata da enti qui kolektas statistiki pri federeso generale.
         profile_directory: La profilcheflisto montras omna uzanti quo voluntale volas esar deskovrebla.
         require_invite_text: Kande registradi bezonas manuala aprobo, ol kauzigas "Por quo vu volas juntas?" textoenpozo esar obliganta
@@ -241,7 +236,6 @@ io:
         backups_retention_period: Uzantoarkivretendurtempo
         bootstrap_timeline_accounts: Sempre rekomendez ca konti a nova uzanti
         closed_registrations_message: Kustumizita mesajo kande registradi ne esas disponebla
-        content_cache_retention_period: Kontenajmemorajretendurtempo
         custom_css: Kustumizita CSS
         mascot: Kustumizita reprezentimajo (oldo)
         media_cache_retention_period: Mediimemorajretendurtempo
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 87190693f6..044e24deb0 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -39,14 +39,14 @@ is:
         text: Þú getur aðeins áfrýjað refsingu einu sinni
       defaults:
         autofollow: Fólk sem skráir sig í gegnum boðið mun sjálfkrafa fylgjast með þér
-        avatar: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
+        avatar: WEBP, PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         bot: Þessi aðgangur er aðallega til að framkvæma sjálfvirkar aðgerðir og gæti verið án þess að hann sé vaktaður reglulega
         context: Eitt eða fleiri samhengi þar sem sían ætti að gilda
         current_password: Í öryggisskyni skaltu setja inn lykilorðið fyrir þennan notandaaðgang
         current_username: Til að staðfesta skaltu setja inn notandanafnið fyrir þennan notandaaðgang
         digest: Er aðeins sent eftir lengri tímabil án virkni og þá aðeins ef þú hefur fengið persónuleg skilaboð á meðan þú hefur ekki verið á línunni
         email: Þú munt fá sendan staðfestingarpóst
-        header: PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
+        header: WEBP, PNG, GIF eða JPG. Mest %{size}. Verður smækkað í %{dimensions}px
         inbox_url: Afritaðu slóðina af forsíðu endurvarpans sem þú vilt nota
         irreversible: Síaðar færslur munu hverfa óendurkræft, jafnvel þó sían sé seinna fjarlægð
         locale: Tungumál notandaviðmótsins, tölvupósts og ýti-tilkynninga
@@ -77,13 +77,15 @@ is:
           warn: Fela síað efni á bakvið aðvörun sem tekur fram titil síunnar
       form_admin_settings:
         activity_api_enabled: Fjöldi staðværra stöðufærslna, virkra notenda og nýskráninga í vikulegum skömmtum
-        backups_retention_period: Halda safni notandans í tiltekinn fjölda daga.
+        app_icon: WEBP, PNG, GIF eða JPG. Tekur yfir sjálfgefna táknmynd forrits á snjalltækjum með sérsniðinni táknmynd.
+        backups_retention_period: Notendur hafa kost á að útbúa safnskrár með færslunum sínum til að sækja svo síðar. Þegar þetta er stillt á jákvætt gildi, verður þessum safnskrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga.
         bootstrap_timeline_accounts: Þessir notendaaðgangar verða festir efst í meðmælum til nýrra notenda um að fylgjast með þeim.
         closed_registrations_message: Birtist þegar lokað er á nýskráningar
-        content_cache_retention_period: Færslum af öðrum netþjónum verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi. Þetta gæti verið óafturkallanleg aðgerð.
+        content_cache_retention_period: Öllum færslum af öðrum netþjónum (þar með taldar endurbirtingar og svör) verður eytt eftir uppgefinn fjölda daga, án tillits til gagnvirkni staðværra notenda við þessar færslur. Þetta á einnig við um færslur sem notandinn hefur merkt sem bókamerki eða eftirlæti. Beinar tilvísanir (einkaspjall) milli notenda af mismunandi netþjónum munu einnig tapast og er engin leið til að endurheimta þær. Notkun á þessari stillingu er einungis ætluð sérstilltum netþjónum og mun skemma fyrir notendum ef þetta er sett upp fyrir almenna notkun.
         custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
+        favicon: WEBP, PNG, GIF eða JPG. Tekur yfir sjálfgefna Mastodon favicon-táknmynd með sérsniðinni táknmynd.
         mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
-        media_cache_retention_period: Sóttu myndefni verður eytt eftir tiltekinn fjölda daga þegar þetta er jákvætt gildi og síðan sótt aftur eftir þörfum.
+        media_cache_retention_period: Myndefnisskrár úr færslum sem gerðar eru af fjartengdum notendum eru geymdar á netþjóninum þínum. Þegar þetta er stillt á jákvætt gildi, verður þessum skrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga. Ef beðið er um myndefnið eftir að því er eytt, mun það verða sótt aftur ef frumgögnin eru ennþá aðgengileg. Vegna takmarkana á hversu oft forskoðunarspjöld tengla eru sótt á utanaðkomandi netþjóna, þá er mælt með því að setja þetta gildi á að minnsta kosti 14 daga, annars gæti mistekist að uppfæra forskoðunarspjöld tengla eftir þörfum fyrir þann tíma.
         peers_api_enabled: Listi yfir þau lénaheiti sem þessi netþjónn hefur rekist á í skýjasambandinu. Engin gögn eru hér sem gefa til kynna hvort þú sért í sambandi við tiltekinn netþjón, bara að netþjónninn þinn viti um hann. Þetta er notað af þjónustum sem safna tölfræði um skýjasambönd á almennan hátt.
         profile_directory: Notendamappan telur upp alla þá notendur sem hafa valið að vera uppgötvanlegir.
         require_invite_text: Þegar nýskráningar krefjast handvirks samþykkis, þá skal gera textann í “Hvers vegna viltu taka þátt?” að kröfu en ekki valkvæðan
@@ -116,6 +118,7 @@ is:
           sign_up_requires_approval: Nýskráningar munu þurfa samþykki þitt
         severity: Veldu hvað munir gerast við beiðnir frá þessu IP-vistfangi
       rule:
+        hint: Valkvætt. Gefðu nánari upplýsingar um regluna
         text: Lýstu reglum eða kröfum sem gerðar eru til notenda á þessum netþjóni. Reyndu að hafa þetta skýrt og skorinort
       sessions:
         otp: 'Settu inn tveggja-þátta kóðann sem farsímaforritið útbjó eða notaðu einn af endurheimtukóðunum þínum:'
@@ -242,7 +245,7 @@ is:
         backups_retention_period: Tímalengd sem safni notandans er haldið eftir
         bootstrap_timeline_accounts: Alltaf mæla með þessum notendaaðgöngum fyrir nýja notendur
         closed_registrations_message: Sérsniðin skilaboð þegar ekki er hægt að nýskrá
-        content_cache_retention_period: Tímalengd sem haldið er í biðminni
+        content_cache_retention_period: Tímabil sem á að geyma fjartengt efni
         custom_css: Sérsniðið CSS
         mascot: Sérsniðið gæludýr (eldra)
         media_cache_retention_period: Tímalengd sem myndefni haldið
@@ -299,6 +302,7 @@ is:
           patch: Láta vita við uppfærslur með lagfæringum
         trending_tag: Nýtt vinsælt efni krefst yfirferðar
       rule:
+        hint: Viðbótarupplýsingar
         text: Regla
       settings:
         indexable: Hafa notandasnið með í leitarvélum
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 731379835a..f5624344b9 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -39,14 +39,14 @@ it:
         text: Puoi appellarti solo una volta
       defaults:
         autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente
-        avatar: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona
         context: Uno o più contesti nei quali il filtro dovrebbe essere applicato
         current_password: Per motivi di sicurezza inserisci la password dell'account attuale
         current_username: Per confermare, inserisci il nome utente dell'account attuale
         digest: Inviata solo dopo un lungo periodo di inattività e solo se hai ricevuto qualche messaggio personale in tua assenza
         email: Ti manderemo una email di conferma
-        header: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         inbox_url: Copia la URL dalla pagina iniziale del ripetitore che vuoi usare
         irreversible: I post filtrati scompariranno in modo irreversibile, anche se il filtro viene eliminato
         locale: La lingua dell'interfaccia utente, di email e notifiche push
@@ -77,13 +77,15 @@ it:
           warn: Nascondi il contenuto filtrato e mostra invece un avviso, citando il titolo del filtro
       form_admin_settings:
         activity_api_enabled: Conteggi di post pubblicati localmente, utenti attivi e nuove registrazioni in gruppi settimanali
-        backups_retention_period: Conserva gli archivi utente generati per il numero di giorni specificato.
+        app_icon: WEBP, PNG, GIF o JPG. Sostituisce l'icona dell'app predefinita sui dispositivi mobili con un'icona personalizzata.
+        backups_retention_period: Gli utenti hanno la possibilità di generare archivi dei propri post da scaricare successivamente. Se impostati su un valore positivo, questi archivi verranno automaticamente eliminati dallo spazio di archiviazione dopo il numero di giorni specificato.
         bootstrap_timeline_accounts: Questi account verranno aggiunti in cima ai consigli da seguire dei nuovi utenti.
         closed_registrations_message: Visualizzato alla chiusura delle iscrizioni
-        content_cache_retention_period: I post da altri server verranno eliminati dopo il numero di giorni specificato se impostato su un valore positivo. Questo potrebbe essere irreversibile.
+        content_cache_retention_period: Tutti i post da altri server (inclusi booster e risposte) verranno eliminati dopo il numero specificato di giorni, senza tener conto di eventuali interazioni con gli utenti locali con tali post. Questo include i post in cui un utente locale ha contrassegnato come segnalibri o preferiti. Anche le menzioni private tra utenti di diverse istanze andranno perse e impossibile da ripristinare. L'uso di questa impostazione è inteso per casi di scopo speciale e rompe molte aspettative dell'utente quando implementato per uso generale.
         custom_css: È possibile applicare stili personalizzati sulla versione web di Mastodon.
+        favicon: WEBP, PNG, GIF o JPG. Sostituisce la favicon predefinita di Mastodon con un'icona personalizzata.
         mascot: Sostituisce l'illustrazione nell'interfaccia web avanzata.
-        media_cache_retention_period: I file multimediali scaricati verranno eliminati dopo il numero di giorni specificato se impostati su un valore positivo e scaricati nuovamente su richiesta.
+        media_cache_retention_period: I file multimediali da post fatti da utenti remoti sono memorizzati nella cache sul tuo server. Quando impostato a un valore positivo, i media verranno eliminati dopo il numero specificato di giorni. Se i dati multimediali sono richiesti dopo che sono stati eliminati, saranno nuovamente scaricati, se il contenuto sorgente è ancora disponibile. A causa di restrizioni su quanto spesso link anteprima carte sondaggio siti di terze parti, si consiglia di impostare questo valore ad almeno 14 giorni, o le schede di anteprima link non saranno aggiornate su richiesta prima di quel tempo.
         peers_api_enabled: Un elenco di nomi di dominio che questo server ha incontrato nel fediverse. Qui non sono inclusi dati sul fatto se si federano con un dato server, solo che il server ne è a conoscenza. Questo viene utilizzato dai servizi che raccolgono statistiche sulla federazione in senso generale.
         profile_directory: La directory del profilo elenca tutti gli utenti che hanno acconsentito ad essere individuabili.
         require_invite_text: 'Quando le iscrizioni richiedono l''approvazione manuale, rendi la domanda: "Perché vuoi unirti?" obbligatoria anziché facoltativa'
@@ -116,6 +118,7 @@ it:
           sign_up_requires_approval: Le nuove iscrizioni richiederanno la tua approvazione
         severity: Scegli cosa accadrà con le richieste da questo IP
       rule:
+        hint: Opzionale. Fornisce maggiori dettagli sulla regola
         text: Descrivi una regola o un requisito per gli utenti su questo server. Prova a mantenerla breve e semplice
       sessions:
         otp: 'Inserisci il codice a due fattori generato dall''app del tuo telefono o usa uno dei codici di recupero:'
@@ -242,7 +245,7 @@ it:
         backups_retention_period: Periodo di conservazione dell'archivio utente
         bootstrap_timeline_accounts: Consiglia sempre questi account ai nuovi utenti
         closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili
-        content_cache_retention_period: Periodo di conservazione della cache dei contenuti
+        content_cache_retention_period: Periodo di ritenzione del contenuto remoto
         custom_css: Personalizza CSS
         mascot: Personalizza mascotte (legacy)
         media_cache_retention_period: Periodo di conservazione della cache multimediale
@@ -299,6 +302,7 @@ it:
           patch: Notifica sulle correzioni di bug
         trending_tag: La nuova tendenza richiede un controllo
       rule:
+        hint: Informazioni aggiuntive
         text: Regola
       settings:
         indexable: Includi la pagina del profilo nei motori di ricerca
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 08e866b55e..ec9e691bb3 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -6,7 +6,9 @@ ja:
         discoverable: プロフィールと公開投稿をMastodonのおすすめやハイライトとしてほかのユーザーに表示することを許可します。
         display_name: フルネーム、ハンドルネームなど
         fields: ホームページ、代名詞、年齢など何でも構いません。
+        hide_collections: People will not be able to browse through your follows and followers. People that you follow will see that you follow them regardless.
         indexable: "「公開」で送信された投稿がMastodonの検索結果にヒットするようになります。ここのチェック状態にかかわらず、ほかのユーザーにブーストやお気に入り登録された投稿はそのユーザーから検索されることがあります。"
+        locked: People will request to follow you and you will be able to either accept or reject new followers.
         note: '自己紹介には #ハッシュタグ や、ほかのアカウントのユーザー名 (@user) を使用できます'
         show_collections: チェックを入れるとフォローとフォロワーの一覧を誰でも見られるようにします。チェックをはずすとこれらの情報を非公開にできますが、あなたがフォローしているユーザーからは、あなたがフォロワーになっていることがわかります。
         unlocked: 新しいフォロワーを自動的に承認します。チェックをはずすとフォローリクエストとその承認が必要になり、新しいフォロワーを受け入れるか拒否するかを自分で選べるようになります。
@@ -39,28 +41,51 @@ ja:
         text: 一度だけ異議を申し立てることができます
       defaults:
         autofollow: 招待から登録した人が自動的にあなたをフォローするようになります
-        avatar: "%{size}までのPNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
+        avatar: "%{size}までのWEBP、PNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
         bot: このアカウントは主に自動で動作し、人が見ていない可能性があります
         context: フィルターを適用する対象 (複数選択可)
         current_password: 現在のアカウントのパスワードを入力してください
         current_username: 確認のため、現在のアカウントのユーザー名を入力してください
         digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
+        discoverable: レコメンド、トレンド、その他の機能により、あなたのアカウントを他の人から見つけられるようにします。なおkmyblueのローカルユーザーはこの設定をオンにしても全文検索結果には掲載されません。全文検索結果への掲載には、投稿の検索許可設定を変更する必要があります
+        discoverable_local: 上記設定を当サーバー内でのみ適用するようにします。他のサーバーの全文検索結果への掲載を回避できますが、レコメンド、トレンドなどその他の機能への掲載も回避されます
         email: 確認のメールが送信されます
-        header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
+        header: "%{size}までのWEBP、PNG、GIF、JPGが利用可能です。%{dimensions}pxまで縮小されます"
         inbox_url: 使用したいリレーサーバーのトップページからURLをコピーします
         irreversible: フィルターが後で削除されても、除外された投稿は元に戻せなくなります
         locale: ユーザーインターフェース、メールやプッシュ通知の言語
         password: 少なくとも8文字は入力してください
+        person: これは人が使用している通常のアカウントです
         phrase: 投稿内容の大文字小文字や閲覧注意に関係なく一致
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
         setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響)
+        setting_allow_quote: ひかえめな引用はこの設定に関わらず可能です。kmyblue以外からは自由に引用できます
         setting_always_send_emails: 通常、Mastodon からメール通知は行われません。
+        setting_bookmark_category_needed: すべてのカテゴリから削除したとき、ブックマークが自動で外れるようになります
+        setting_default_searchability: kmyblue・Fedibirdでは検索許可設定に基づき検索されます。Misskeyでは当設定に関係なく、全ての公開・ローカル公開・非収載投稿が検索されます。Mastodon・Firefishでは検索許可の代わりにプロフィール設定の「公開投稿を他のサーバーで自由に検索できるようにする」設定が適用されます
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
+        setting_disallow_unlisted_public_searchability: この設定を有効にすると、非収載投稿と検索範囲「誰でも」は両立できず不特定多数からの検索が不可になります。Fedibirdと同じ挙動になります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
+        setting_display_media_expand: Misskeyなどは4個を超えて投稿可能です。その追加分を最大16個まで表示します。kmyblueからアップロードはできません
         setting_display_media_hide_all: メディアを常に隠す
         setting_display_media_show_all: メディアを常に表示する
+        setting_dtl_force_searchability: 'ハッシュタグ #%{tag} をつけて投稿するとき、検索許可を強制的に置き換えるかを設定します'
+        setting_dtl_force_subscribable: 購読拒否設定に関係なく、ディープタイムラインに向けた投稿はアンテナに掲載されます。ディープタイムラインをアンテナ経由で閲覧している人にあなたの発言が届きます
+        setting_dtl_force_visibility: 'ハッシュタグ #%{tag} をつけて投稿するとき、公開範囲を強制的に置き換えるかを設定します'
+        setting_emoji_reaction_policy: この設定をしても他のサーバーのユーザーはその投稿に自由に絵文字をつけ、同じサーバーの中で共有できます。単にあなた自身の画面から絵文字リアクションを除去したいだけなら、外観設定から絵文字リアクションを無効にすることができます
+        setting_emoji_reaction_streaming_notify_impl2: 当該サーバーの独自機能に対応したアプリを利用時に、絵文字リアクション機能を利用できます。動作確認していないため（そもそもそのようなアプリ自体を確認できていないため）正しく動かない場合があります
+        setting_enable_emoji_reaction: この機能を無効にしても、他の人はあなたの投稿に絵文字をつけられます
+        setting_enabled_visibilities: チェックを外した公開範囲は投稿することができなくなります。投稿しようとするとエラーが出ます
+        setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
+        setting_public_post_to_unlisted: 未対応のサードパーティアプリからもローカル公開で投稿できますが、公開投稿はWeb以外できなくなります
+        setting_reject_send_limited_to_suspects: これは「相互のみ」投稿に適用されます。サークル投稿は例外なく配送されます。一部のMisskeyサーバーが独自に限定投稿へ対応しましたが、相互のみ投稿を行うとあなたと相互になっているユーザーの一部がMisskeyのユーザーに公開されるため、気になる人向けの設定です
+        setting_reject_unlisted_subscription: Misskeyやそのフォークは、フォローしていないアカウントの「非収載」投稿を **購読・検索** することができます。これはkmyblueの挙動と異なります。そのようなサーバーに、指定した公開範囲の投稿を「フォロワーのみ」として配送します。ただし構造上、完璧な対応は困難でたまに非収載として配信されること、ご理解ください
+        setting_reverse_search_quote: 検索ワードをダブルクオートで囲って検索した場合、表記ゆれ多めの検索結果になります。Mastodon標準とは逆の挙動となります。
+        setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
+        setting_stop_emoji_reaction_streaming: 通信容量の節約に役立ちます
         setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています
         setting_use_pending_items: 新着があってもタイムラインを自動的にスクロールしないようにします
+        subscription_policy: あなたの投稿はこの設定の範囲外にあるアカウントのアンテナに掲載されなくなります。Misskeyのアンテナを拒否することはできません。Mastodonの一部のサーバーもこの設定に対応しますが、挙動が一部kmyblueと異なる場合があります
         username: アルファベット大文字と小文字、数字、アンダーバー「_」が使えます
         whole_word: キーワードまたはフレーズが英数字のみの場合、単語全体と一致する場合のみ適用されるようになります
       domain_allow:
@@ -73,19 +98,31 @@ ja:
       filters:
         action: 投稿がフィルタに一致したときに実行するアクションを選択
         actions:
+          half_warn: フィルターに一致した投稿の本文のみを非表示にし、フィルターのタイトルを含む警告を表示します
           hide: フィルタに一致した投稿を完全に非表示にします
           warn: フィルタに一致した投稿を非表示にし、フィルタのタイトルを含む警告を表示します
       form_admin_settings:
         activity_api_enabled: 週単位でローカルで公開された投稿数、アクティブユーザー数、新規登録者数を表示します
-        backups_retention_period: 生成されたユーザーのアーカイブを指定した日数の間保持します。
+        app_icon: モバイル端末で表示されるデフォルトのアプリアイコンを独自のアイコンで上書きします。WEBP、PNG、GIF、JPGが利用可能です。
+        backups_retention_period: ユーザーには、後でダウンロードするために投稿のアーカイブを生成する機能があります。正の値に設定すると、これらのアーカイブは指定された日数後に自動的にストレージから削除されます。
         bootstrap_timeline_accounts: これらのアカウントは、新しいユーザー向けのおすすめユーザーの一番上にピン留めされます。
         closed_registrations_message: アカウント作成を停止している時に表示されます
-        content_cache_retention_period: 指定した日数が経過した他のサーバーの投稿とブーストを削除します。削除された投稿は再取得できない場合があります。削除された投稿についたブックマークやお気に入り、ブーストも失われ、元に戻せません。
+        content_cache_retention_period: 他のサーバーからのすべての投稿（ブーストや返信を含む）は、指定された日数が経過すると、ローカルユーザーとのやりとりに関係なく削除されます。これには、ローカルユーザーがブックマークやお気に入りとして登録した投稿も含まれます。異なるサーバーのユーザー間の非公開な変身も失われ、復元することは不可能です。この設定の使用は特別な目的のインスタンスのためのものであり、一般的な目的のサーバーで使用するした場合、多くのユーザーの期待を裏切ることになります。
         custom_css: ウェブ版のMastodonでカスタムスタイルを適用できます。
+        delete_content_cache_without_reaction: この機能は現在、負荷に関する懸念があります。すべての投稿をブックマークするユーザーbotの出現も想定されます。特に大規模サーバーでは慎重に検討してください。
+        enable_local_timeline: 有効にすると気の合ったユーザー同士の交流が捗る反面、内輪の雰囲気が強くなるかもしれません。Mastodonはローカルタイムラインがあるものだと思われているので、無効にする場合はサーバー紹介での注記をおすすめします。
+        enable_public_unlisted_visibility: 有効にするとあなたのコミュニティは閉鎖的になるかもしれません。この設定はkmyblueの主要機能の1つであり、無効にする場合は概要などに記載することを強くおすすめします。
+        enable_public_visibility: 無効にすると公開投稿は強制的に「ローカル公開」または「非収載」に置き換えられます。
+        favicon: デフォルトのMastodonのブックマークアイコンを独自のアイコンで上書きします。WEBP、PNG、GIF、JPGが利用可能です。
         mascot: 上級者向けWebインターフェースのイラストを上書きします。
-        media_cache_retention_period: 正の値に設定されている場合、ダウンロードされたメディアファイルは指定された日数の後に削除され、リクエストに応じて再ダウンロードされます。
+        media_cache_retention_period: リモートユーザーが投稿したメディアファイルは、あなたのサーバーにキャッシュされます。正の値を設定すると、メディアは指定した日数後に削除されます。削除後にメディアデータが要求された場合、ソースコンテンツがまだ利用可能であれば、再ダウンロードされます。リンクプレビューカードがサードパーティのサイトを更新する頻度に制限があるため、この値を少なくとも14日に設定することをお勧めします。
         peers_api_enabled: このサーバーが Fediverse で遭遇したドメイン名のリストです。このサーバーが知っているだけで、特定のサーバーと連合しているかのデータは含まれません。これは一般的に Fediverse に関する統計情報を収集するサービスによって使用されます。
         profile_directory: ディレクトリには、掲載する設定をしたすべてのユーザーが一覧表示されます。
+        receive_other_servers_emoji_reaction: 負荷の原因になります。人が少ない場合にのみ有効にすることをおすすめします。
+        registrations_end_hour: 新規登録が承認なしで可能な時間帯の開始時間を指定します。これより前の時間に登録することはできません。終了時間より後にすることはできません。この時間帯から外れた新規登録には、別途承認が必要となります。
+        registrations_limit: 現在のユーザー数がこれを超過すると、管理者がこの数値を増やさない限り新規登録できません。0を指定すると、この制限を無効化します。
+        registrations_limit_per_day: 本日登録されたユーザー数がこれを超過すると、UTC時刻で翌日0時にならない限り新規登録できません。0を指定すると、この制限を無効化します。
+        registrations_start_hour: 新規登録が承認なしで可能な時間帯の終了時間を指定します。これより後の時間に登録することはできません。開始時間より前にすることはできません。この時間帯から外れた新規登録には、別途承認が必要となります。
         require_invite_text: アカウント登録が承認制の場合、登録の際の申請事由の入力を必須にします
         site_contact_email: 法律またはサポートに関する問い合わせ先
         site_contact_username: マストドンでの連絡方法
@@ -94,6 +131,7 @@ ja:
         site_terms: 独自のプライバシーポリシーを使用するか空白にしてデフォルトのプライバシーポリシーを使用します。Markdownが使えます。
         site_title: ドメイン名以外でサーバーを参照する方法
         status_page_url: 障害発生時などにユーザーがサーバーの状態を確認できるページのURL
+        streaming_other_servers_emoji_reaction: 大量のデータが配信されるため、ネットワークの回線やサーバーの負荷をチェックしてください。サーバーの負荷が高い場合は一時的にチェックを外してみてください。
         theme: ログインしていない人と新規ユーザーに表示されるテーマ。
         thumbnail: サーバー情報と共に表示される、アスペクト比が約 2:1 の画像。
         timeline_preview: ログインしていないユーザーがサーバー上の最新の公開投稿を閲覧できるようにします。
@@ -116,6 +154,7 @@ ja:
           sign_up_requires_approval: 承認するまで新規登録が完了しなくなります
         severity: このIPに対する措置を選択してください
       rule:
+        hint: ルールについての具体的な説明を追加できます (任意)
         text: ユーザーのためのルールや要件を記述してください。短くシンプルにしてください。
       sessions:
         otp: '携帯電話のアプリで生成された二要素認証コードを入力するか、リカバリーコードを使用してください:'
@@ -142,9 +181,14 @@ ja:
       account:
         discoverable: アカウントを見つけやすくする
         fields:
+          examples:
+            name_1: 例) GitHub
+            value_1: 例) https://github.com/xxxxxx
           name: ラベル
           value: 内容
         indexable: 公開投稿を検索できるようにする
+        indexable_kmyblue: Indexableを有効にする
+        searchability_kmyblue: デフォルトの検索許可
         show_collections: フォローとフォロワーの一覧を開示する
         unlocked: フォローリクエストを不要にする
       account_alias:
@@ -184,71 +228,162 @@ ja:
         context: 除外対象
         current_password: 現在のパスワード
         data: データ
+        discoverable: ディレクトリに掲載する
+        discoverable_local: 他サーバーのディレクトリに掲載しない
         display_name: 表示名
+        domain: ドメイン
         email: メールアドレス
         expires_in: 有効期限
         fields: プロフィール補足情報
+        group: これはグループアカウントです
         header: ヘッダー
         honeypot: "%{label} (入力しない)"
         inbox_url: リレーサーバーの inbox URL
         irreversible: 隠すのではなく除外する
         locale: 言語
         max_uses: 使用できる回数
+        my_actor_type: アカウントの種類
         new_password: 新しいパスワード
         note: プロフィール
         otp_attempt: 二要素認証コード
         password: パスワード
+        person: これは通常のアカウントです
         phrase: キーワードまたはフレーズ
         setting_advanced_layout: 上級者向けUIを有効にする
         setting_aggregate_reblogs: ブーストをまとめる
+        setting_allow_quote: 引用を許可する
         setting_always_send_emails: 常にメール通知を送信する
         setting_auto_play_gif: アニメーションGIFを自動再生する
+        setting_bio_markdown: プロフィールのMarkdownを有効にする
+        setting_bookmark_category_needed: Webでブックマーク時にカテゴリの選択を必須にする
+        setting_boost_menu: ブーストボタンを押したときにポップアップメニューを表示する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
         setting_default_language: 投稿する言語
         setting_default_privacy: 投稿の公開範囲
+        setting_default_reblog_privacy: BTの公開範囲
+        setting_default_searchability: 自分の投稿の検索を許可する範囲
+        setting_default_searchability_of_search: 自分が検索するときの検索許可設定
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: 投稿を削除する前に確認ダイアログを表示する
         setting_disable_swiping: スワイプでの切り替えを無効にする
+        setting_disallow_unlisted_public_searchability: 非収載投稿の検索許可が「誰でも」「ローカルとフォロワー」だった場合、「フォロワーのみ」に変更する
         setting_display_media: メディアの表示
         setting_display_media_default: 標準
+        setting_display_media_expand: 5個目以降のメディアも表示する (最大16)
         setting_display_media_hide_all: 非表示
         setting_display_media_show_all: 表示
+        setting_dtl_force_searchability: DTL投稿の検索許可
+        setting_dtl_force_subscribable: ディープタイムライン用のハッシュタグを購読するアンテナに限り、購読拒否設定を無視する
+        setting_dtl_force_visibility: DTL投稿の公開範囲
+        setting_dtl_menu: Webクライアントのメニューにディープタイムラインを追加する
+        setting_emoji_reaction_policy: 絵文字リアクション受け入れと表示設定
+        setting_emoji_reaction_policy_items:
+          allow: 全員に許可
+          block: 全員禁止
+          followers_only: フォロワーのみ許可
+          following_only: フォロー中の相手のみ許可
+          mutuals_only: 相互のみ許可
+          outside_only: フォロー中、またはフォロワーのみに許可
+        setting_emoji_reaction_streaming_notify_impl2: Nyastodon, Catstodon, glitch-soc互換の絵文字リアクション機能を有効にする
+        setting_enable_emoji_reaction: 絵文字リアクション機能を使用する
+        setting_enabled_visibilities: 投稿を有効にする公開範囲
         setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
+        setting_hide_emoji_reaction_unavailable_server: 絵文字リアクションに対応していないと思われるサーバーの投稿から絵文字リアクション機能を隠す
         setting_hide_network: 繋がりを隠す
+        setting_hide_quote_unavailable_server: 引用に対応していないと思われるサーバーの投稿からメニューを隠す
+        setting_hide_status_reference_unavailable_server: ひかえめな引用（Fedibirdの参照）に対応していないと思われるサーバーの投稿からメニューを隠す
+        setting_lock_follow_from_bot: botからのフォローを承認制にする
+        setting_public_post_to_unlisted: サードパーティから公開範囲「公開」で投稿した場合、「ローカル公開」に変更する
         setting_reduce_motion: アニメーションの動きを減らす
+        setting_reject_public_unlisted_subscription: Misskey系サーバーに「ローカル公開」かつ検索許可「誰でも以外」の投稿を「フォロワーのみ」に変換して配送する
+        setting_reject_send_limited_to_suspects: Misskey系サーバーに「相互のみ」投稿を配送しない
+        setting_reject_unlisted_subscription: Misskey系サーバーに「非収載」かつ検索許可「誰でも以外」の投稿を「フォロワーのみ」に変換して配送する
+        setting_reverse_search_quote: ダブルクオートで囲まず検索した時、単語単位で検索する
+        setting_show_application: 送信したアプリを開示する
+        setting_show_blocking_quote: ブロックしたユーザーの投稿を引用した投稿を表示する
+        setting_show_emoji_reaction_count: 投稿につけられた各絵文字の数を表示する
+        setting_show_emoji_reaction_on_timeline: タイムライン上の投稿に他の人のつけた絵文字を表示する
+        setting_show_favourite_menu: 右サイドメニューに「お気に入り」を表示する
+        setting_show_followers_count: フォロワー数を公開する
+        setting_show_following_count: フォロー数を公開する
+        setting_show_quote_in_home: ホーム・リスト・アンテナなどで引用された投稿を表示する
+        setting_show_quote_in_public: 公開タイムライン（ローカル・連合）で引用された投稿を表示する
+        setting_show_recent_emojis: 絵文字ピッカーで絵文字デッキと一緒に、絵文字の使用履歴も表示する
+        setting_show_relationships: アカウント詳細ベージで、相手からのフォロー状況を表示する
+        setting_show_statuses_count: 投稿数を公開する
+        setting_simple_timeline_menu: タイムライン上でメニューの項目を減らす
+        setting_slip_local_emoji_reaction: ローカルユーザーに限って上記設定を無視して絵文字リアクションを許可する
+        setting_stay_privacy: 投稿時に公開範囲を保存する
+        setting_stop_emoji_reaction_streaming: 絵文字リアクションのストリーミングを停止する
         setting_system_font_ui: システムのデフォルトフォントを使う
         setting_theme: サイトテーマ
+        setting_translatable_private: 非公開投稿の翻訳を許可する
         setting_trends: 本日のトレンドタグを表示する
         setting_unfollow_modal: フォローを解除する前に確認ダイアログを表示する
         setting_use_blurhash: 非表示のメディアを色付きのぼかしで表示する
         setting_use_pending_items: 手動更新モード
+        setting_use_public_index: Mastodonの標準設定によって検索が許可されたアカウントの公開投稿を検索結果に含める
         severity: 重大性
         sign_in_token_attempt: セキュリティコード
+        subscription_policy: 購読許可
         title: タイトル
         type: インポートする項目
         username: ユーザー名
         username_or_email: ユーザー名またはメールアドレス
         whole_word: 単語全体にマッチ
+      dtl_force_searchability:
+        public: 誰でも
+        public_unlisted: ローカルとフォロワー
+        unchange: 変更しない
+      dtl_force_visibility:
+        public: 公開
+        public_unlisted: ローカル公開
+        unchange: 変更しない
+        unlisted: 非収載
       email_domain_block:
         with_dns_records: ドメインのMXレコードとIPアドレスを含む
+      emoji_reactions:
+        deny_from_all: 自分以外すべての絵文字リアクションをブロック
+        must_be_follower: フォロワー以外からの絵文字リアクションをブロック
+        must_be_following: フォローしていないユーザーからの絵文字リアクションをブロック
       featured_tag:
         name: ハッシュタグ
       filters:
         actions:
+          half_warn: アカウント名だけを出し、本文は警告で隠す
           hide: 完全に隠す
           warn: 警告付きで隠す
+        options:
+          exclude_follows: フォロー中のユーザーをフィルターの対象にしない
+          exclude_localusers: ローカルユーザーをフィルターの対象にしない
+          exclude_quote: 引用の内容をフィルターの対象にしない
       form_admin_settings:
         activity_api_enabled: APIでユーザーアクティビティに関する集計統計を公開する
         backups_retention_period: ユーザーアーカイブの保持期間
         bootstrap_timeline_accounts: おすすめユーザーに常に表示するアカウント
+        check_lts_version_only: 更新チェックの時、LTSバージョンのみ確認する
         closed_registrations_message: アカウント作成を停止している時のカスタムメッセージ
-        content_cache_retention_period: コンテンツキャッシュの保持期間
+        content_cache_retention_period: リモートコンテンツの保存期間
         custom_css: カスタムCSS
+        delete_content_cache_without_reaction: お気に入り・ブックマークされた投稿を削除対象から除外する
+        enable_emoji_reaction: 絵文字リアクション機能を有効にする
+        enable_local_timeline: ローカルタイムラインを有効にする
+        enable_public_unlisted_visibility: 公開範囲「ローカル公開」と検索許可「ローカルとフォロワー」を有効にする
+        enable_public_visibility: 公開範囲「公開」を有効にする
         mascot: カスタムマスコット（レガシー）
         media_cache_retention_period: メディアキャッシュの保持期間
         peers_api_enabled: 発見したサーバーのリストをAPIで公開する
         profile_directory: プロフィール一覧を有効にする
+        receive_other_servers_emoji_reaction: 他のサーバーのユーザーが他のサーバーの投稿につけた絵文字リアクションを受け入れる
+        registration_button_message: 新規登録ボタンの直上に表示するメッセージ
+        registrations_end_hour: 登録に承認を必要としない時間帯の終了時刻 A (UTC 0〜24)
+        registrations_limit: 登録ユーザー数上限 (現在 %{count} 名)
+        registrations_limit_per_day: 1日あたり登録ユーザー数上限 (現在 %{count} 名)
         registrations_mode: 新規登録が可能な人
+        registrations_secondary_end_hour: 登録に承認を必要としない時間帯の終了時刻 B (UTC 0〜24)
+        registrations_secondary_end_hour_hint: ここで0を指定した場合、時間Bの設定は無効化されます
+        registrations_secondary_start_hour: 登録に承認を必要としない時間帯の開始時刻 B (UTC 0〜24)
+        registrations_start_hour: 登録に承認を必要としない時間帯の開始時刻 A (UTC 0〜24)
         require_invite_text: 申請事由の入力を必須にする
         show_domain_blocks: ドメインブロックを表示
         show_domain_blocks_rationale: ドメインがブロックされた理由を表示
@@ -259,12 +394,15 @@ ja:
         site_terms: プライバシーポリシー
         site_title: サーバーの名前
         status_page_url: サーバーの状態ページのURL
+        streaming_local_emoji_reaction: ローカルユーザーがつけた、またはローカル投稿についた絵文字リアクションをストリーミングする
+        streaming_other_servers_emoji_reaction: 他のサーバーのユーザーが他のサーバーの投稿につけた絵文字リアクションをストリーミングする
         theme: デフォルトテーマ
         thumbnail: サーバーのサムネイル
         timeline_preview: 公開タイムラインへの未認証のアクセスを許可する
         trendable_by_default: 審査前のトレンドの掲載を許可する
         trends: トレンドを有効にする
         trends_as_landing_page: 新規登録画面にトレンドを表示する
+        unlocked_friend: 全てのフレンドサーバー申請を自動承認する
       interactions:
         must_be_follower: フォロワー以外からの通知をブロック
         must_be_following: フォローしていないユーザーからの通知をブロック
@@ -289,20 +427,26 @@ ja:
         follow_request: フォローリクエストを受けた時
         mention: 返信が来た時
         pending_account: 新しいアカウントの承認が必要な時
+        pending_friend_server: 新しいフレンドサーバーの承認が必要な時
         reblog: 投稿がブーストされた時
         report: 新しい通報が送信された時
         software_updates:
           all: すべてのアップデートを通知する
           critical: 緊急のアップデートのみ通知する
-          label: 新しいMastodonバージョンが利用可能です
+          label: 新しいMastodonバージョンが利用可能になった時
           none: 通知しない (非推奨)
           patch: 緊急のアップデートとバグ修正アップデートを通知する
         trending_tag: 新しいトレンドのレビューをする必要がある時
       rule:
+        hint: ルールの補足説明
         text: ルール
       settings:
         indexable: 検索エンジンからアクセスできるようにする
         show_application: 投稿に使ったアプリを開示する
+      subscription_policy:
+        allow: 全員に許可
+        block: 全員拒否
+        followers_only: フォロワーにのみ許可
       tag:
         listable: 検索とディレクトリへの使用を許可する
         name: ハッシュタグ
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index e5d874c5a5..48f028c575 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -4,11 +4,9 @@ ka:
     hints:
       defaults:
         autofollow: ადამიანები რომლებიც დარეგისტრირდებიან მოწვევით, ავტომატურად გამოგყვებიან
-        avatar: პნგ, გიფ ან ჯპგ. მაქს. %{size}. ზომა დაპატარავდება %{dimensions}პიქს.-ზე
         bot: ეს ანგარიში უმთავრესად ასრულებს ავტომატურ მოქმედებებს და შესაძლოა არ იყოს მონიტორინგის ქვეშ
         context: ერთ ან მრავალი კონტექსტი სადაც ფილტრი უნდა შესრულდეს
         digest: იგზავნება მხოლოდ ხანგრძლივი უაქტივობის პერიოდის შემდეგ და არყოფნისას თუ მიიღეთ ერთი წერილი მაინც
-        header: პნგ, გიფ ან ჯპგ. მაქს. %{size}. ზომა დაპატარავდება %{dimensions}პიქს.-ზე
         inbox_url: ურლ დააკოირეთ გამოყენებისთვის სასურველი რილეის წინა გვერდიდან
         irreversible: გაფილტრული ტუტები გაუქმდება აღუდგენლად, იმ შემთხვევაშიც კი თუ ფილტრი სამომავლოდ გაუქმდება
         locale: მომხმარებლის ინტერფეისის, ელ-ფოსტის წერილების და ფუშ შეტყობინებების ენა
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 1e1c52da24..9461f16cd5 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -2,6 +2,9 @@
 kab:
   simple_form:
     hints:
+      account:
+        display_name: Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer.
+        fields: Asebter-ik·im agejdan, imqimen, leεmer, ayen tebɣiḍ.
       account_alias:
         acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
       account_migration:
@@ -11,13 +14,17 @@ kab:
         type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong>
       defaults:
         autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman
+        bot: Smekti-d wiyaḍ dakken amiḍan-a ixeddem s wudem amezwer tigawin tiwurmanin yernu ur yezmir ara ad yettwaɛass
         email: Ad n-teṭṭfeḍ imayl i usentem
-        irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
+        irreversible: Tisuffaɣ i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat
         locale: Tutlayt n ugrudem, imaylen d tilγa
         password: Seqdec ma drus 8 n yisekkilen
         setting_display_media_default: Ffer teywalt yettwacreḍ d tanafrit
         setting_display_media_hide_all: Ffer yal tikkelt akk taywalt
         setting_display_media_show_all: Ffer yal tikkelt teywalt yettwacreḍ d tanafrit
+        username: Tzemreḍ ad tesqedceḍ isekkilen, uṭṭunen akked yijerriden n wadda
+      featured_tag:
+        name: 'Ha-t-an kra seg ihacṭagen i tesseqdaceḍ ussan-a ineggura maḍi :'
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       ip_block:
@@ -46,6 +53,7 @@ kab:
         ends_at: Tagara n tedyant
         text: Alɣu
       defaults:
+        autofollow: Ɛreḍ-it-id ad yeḍfer amiḍan-ik·im
         avatar: Avaṭar
         bot: Wagi d amiḍan aṛubut
         chosen_languages: Sizdeg tutlayin
@@ -55,6 +63,7 @@ kab:
         data: Isefka
         display_name: Isem ara d-yettwaskanen
         email: Tansa imayl
+        expires_in: Ad yemmet
         header: Ixef
         locale: Tutlayt n wegrudem
         max_uses: Amḍan afellay n iseqdacen
@@ -65,26 +74,30 @@ kab:
         setting_default_language: Tutlayt n tira
         setting_default_privacy: Tabaḍnit n tira
         setting_display_media_default: Akk-a kan
-        setting_display_media_hide_all: Ffer kullec
-        setting_display_media_show_all: Ssken kullec
+        setting_display_media_hide_all: Ffer-iten akk
+        setting_display_media_show_all: Sken-iten-id akk
         setting_hide_network: Ffer azetta-k·m
         setting_theme: Asental n wesmel
-        setting_use_pending_items: Askar aleγwayan
+        setting_use_pending_items: Askar aleɣwayan
         sign_in_token_attempt: Tangalt n tɣellist
         title: Azwel
         type: Anaw n uktar
         username: Isem n useqdac
-        username_or_email: Isem n useqdac neγ imal
+        username_or_email: Isem n useqdac neɣ imal
         whole_word: Awal akk
       featured_tag:
         name: Ahacṭag
       form_admin_settings:
         site_terms: Tasertit tabaḍnit
         site_title: Isem n uqeddac
+      interactions:
+        must_be_follower: Ssewḥel ilɣa sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
+        must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
+        must_be_following_dm: Sewḥel iznan usriden sɣur wid akked tid ur tettḍafareḍ ara
       invite:
         comment: Awennit
       invite_request:
-        text: Acimi tebγiḍ ad ternuḍ iman-ik?
+        text: Acimi tebɣiḍ ad ternuḍ iman-ik?
       ip_block:
         comment: Awennit
         ip: IP
@@ -92,13 +105,18 @@ kab:
           no_access: Sewḥel anekcum
         severity: Alugen
       notification_emails:
+        favourite: Ma yella walbɛaḍ i iḥemmlen tasuffeɣt-ik·im
         follow: Yeḍfer-ik·im-id walbɛaḍ
+        follow_request: Ma yella win i d-yessutren ad k·em-yeḍfer
         mention: Yuder-ik·em-id walbɛaḍ
         reblog: Yella win yesselhan adda-dik·im
       rule:
+        hint: Isallen-nniḍen
         text: Alugen
       tag:
         name: Ahacṭag
+      user:
+        time_zone: Tamnaḍt tasragant
       user_role:
         name: Isem
         permissions_as_keys: Tisirag
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 4da58e6c64..54d36eafe0 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -39,14 +39,14 @@ ko:
         text: 처벌에 대해 단 한 번만 이의제기를 할 수 있습니다
       defaults:
         autofollow: 이 초대로 가입한 사람은 나를 팔로우하게 됩니다.
-        avatar: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
+        avatar: WEBP, PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소됨
         bot: 이 계정이 대부분 자동으로 작업을 수행하고 잘 확인하지 않는다는 것을 알립니다.
         context: 필터를 적용 할 한 개 이상의 컨텍스트
         current_password: 보안을 위해 현재 계정의 암호를 입력해주세요
         current_username: 확인을 위해, 현재 계정의 사용자명을 입력해주세요
         digest: 오랫동안 활동하지 않았을 때 받은 멘션들에 대한 요약 받기
         email: 확인용 이메일을 보냈습니다.
-        header: PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소 됨
+        header: WEBP, PNG, GIF 혹은 JPG. 최대 %{size}. %{dimensions}px로 축소됨
         inbox_url: 사용 할 릴레이 서버의 프론트페이지에서 URL을 복사합니다
         irreversible: 필터링 된 게시물은 나중에 필터가 사라지더라도 돌아오지 않게 됩니다
         locale: 사용자 인터페이스, 이메일, 푸시 알림 언어
@@ -77,13 +77,15 @@ ko:
           warn: 필터 제목을 언급하는 경고 뒤에 걸러진 내용을 숨기기
       form_admin_settings:
         activity_api_enabled: 주별 로컬에 게시된 글, 활성 사용자 및 새로운 가입자 수
-        backups_retention_period: 생성된 사용자 아카이브를 며칠동안 저장할 지.
+        app_icon: WEBP, PNG, GIF 또는 JPG. 모바일 기기에 쓰이는 기본 아이콘을 대체합니다.
+        backups_retention_period: 사용자들은 나중에 다운로드하기 위해 게시물 아카이브를 생성할 수 있습니다. 양수로 설정된 경우 이 아카이브들은 지정된 일수가 지난 후에 저장소에서 자동으로 삭제될 것입니다.
         bootstrap_timeline_accounts: 이 계정들은 팔로우 추천 목록 상단에 고정됩니다.
         closed_registrations_message: 새 가입을 차단했을 때 표시됩니다
-        content_cache_retention_period: 다른 서버의 게시물과 부스트들은 지정한 일수가 지나면 삭제될 것입니다. 몇몇 게시물들은 복구가 불가능할 것입니다. 관련된 북마크, 좋아요, 부스트 또한 잃어버릴 것이며 취소도 할 수 없습니다.
+        content_cache_retention_period: 다른 서버의 모든 게시물(부스트 및 답글 포함)은 해당 게시물에 대한 로컬 사용자의 상호 작용과 관계없이 지정된 일수가 지나면 삭제됩니다. 여기에는 로컬 사용자가 북마크 또는 즐겨찾기로 표시한 게시물도 포함됩니다. 다른 인스턴스 사용자와 주고 받은 비공개 멘션도 손실되며 복원할 수 없습니다. 이 설정은 특수 목적의 인스턴스를 위한 것이며 일반적인 용도의 많은 사용자의 예상이 빗나가게 됩니다.
         custom_css: 사용자 지정 스타일을 웹 버전의 마스토돈에 지정할 수 있습니다.
+        favicon: WEBP, PNG, GIF 또는 JPG. 기본 파비콘을 대체합니다.
         mascot: 고급 웹 인터페이스의 그림을 대체합니다.
-        media_cache_retention_period: 양수로 설정된 경우 다운로드된 미디어 파일들은 지정된 일수가 지나면 삭제될 것이고 필요할 때 다시 다운로드 될 것입니다.
+        media_cache_retention_period: 원격 사용자가 작성한 글의 미디어 파일은 이 서버에 캐시됩니다. 양수로 설정하면 지정된 일수 후에 미디어가 삭제됩니다. 삭제된 후에 미디어 데이터를 요청하면 원본 콘텐츠를 사용할 수 있는 경우 다시 다운로드됩니다. 링크 미리 보기 카드가 타사 사이트를 폴링하는 빈도에 제한이 있으므로 이 값을 최소 14일로 설정하는 것이 좋으며, 그렇지 않으면 그 이전에는 링크 미리 보기 카드가 제때 업데이트되지 않을 것입니다.
         peers_api_enabled: 이 서버가 연합우주에서 만났던 서버들에 대한 도메인 네임의 목록입니다. 해당 서버와 어떤 연합을 했는지에 대한 정보는 전혀 포함되지 않고, 단순히 그 서버를 알고 있는지에 대한 것입니다. 이것은 일반적으로 연합에 대한 통계를 수집할 때 사용됩니다.
         profile_directory: 프로필 책자는 발견되기를 희망하는 모든 사람들의 목록을 나열합니다.
         require_invite_text: 가입이 수동 승인을 필요로 할 때, "왜 가입하려고 하나요?" 항목을 선택사항으로 두는 것보다는 필수로 두는 것이 낫습니다
@@ -116,6 +118,7 @@ ko:
           sign_up_requires_approval: 새 가입이 승인을 필요로 하도록 합니다
         severity: 해당 IP로부터의 요청에 대해 무엇이 일어나게 할 지 고르세요
       rule:
+        hint: 옵션사항. 규칙에 대한 더 상세한 정보를 제공하세요
         text: 이 서버 사용자들이 지켜야 할 규칙과 요구사항을 설명해주세요. 짧고 간단하게 작성해주세요
       sessions:
         otp: '휴대전화에서 생성된 이중 인증 코드를 입력하거나, 복구 코드 중 하나를 사용하세요:'
@@ -242,7 +245,7 @@ ko:
         backups_retention_period: 사용자 아카이브 유지 기한
         bootstrap_timeline_accounts: 새로운 사용자들에게 추천할 계정들
         closed_registrations_message: 가입이 불가능 할 때의 사용자 지정 메시지
-        content_cache_retention_period: 콘텐츠 캐시 유지 기한
+        content_cache_retention_period: 리모트 콘텐츠 보유 기간
         custom_css: 사용자 정의 CSS
         mascot: 사용자 정의 마스코트 (legacy)
         media_cache_retention_period: 미디어 캐시 유지 기한
@@ -294,14 +297,15 @@ ko:
         software_updates:
           all: 모든 업데이트에 대해 알림
           critical: 긴급 업데이트에 대해서만 알림
-          label: 새 마스토돈 버전이 사용 가능합니다
+          label: 새 마스토돈 버전이 있을 때
           none: 업데이트에 대해 알리지 않기 (비추천)
           patch: 버그픽스 업데이트에 대해 알림
         trending_tag: 검토해야 할 새 유행
       rule:
+        hint: 추가 정보
         text: 규칙
       settings:
-        indexable: 검색 엔진에 프로필 페이지 기재하기
+        indexable: 검색엔진에 프로필 페이지 포함하기
         show_application: 어떤 앱으로 게시물을 보냈는지 표시
       tag:
         listable: 이 해시태그가 검색과 추천에 보여지도록 허용
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index fb7a45c34b..0c4f872131 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -29,14 +29,12 @@ ku:
         text: Tu dikarî tenê carekê îtîraza binpêkirinê bikî
       defaults:
         autofollow: Mirovên ku bi riya vexwendinê xwe tomar kirine ew ên bi xweberî te bişopînin
-        avatar: PNG, GIF an jî JPG. Herî zêde %{size} dê ber bi %{dimensions}px ve were kêmkirin
         bot: Ji yên din re nîşan bike ku ajimêr bi piranî kiryarên xweberî dike û dibe ku neyê çavdêrî kirin
         context: Yek an jî zêdetir girêdan divê parzûn were sepandin
         current_password: Ji bo ewlehiyê ji kerema xwe borînpeyva ajimêrê xwe têxe
         current_username: Ji bo piştrastkirinê, ji kerema xwe navê bikarhêner ya ajimêrê niha binvîse
         digest: Tenê piştî demek dirêj neçalakiyê de û tenê di nebûna te da peyamên teybetî standî be tê şandin
         email: Ji te re e-name ya pejirandinê were
-        header: PNG, GIF an jî JPG. Herî zêde %{size} ber bi %{dimensions}px ve were kêmkirin
         inbox_url: Girêdanê ji rûpela pêşîn a guhêrkera ku tu dixwazî bi kar bînî jê bigire
         irreversible: Şandiyên parzûnkirî êdî bê veger wenda bibe, heger parzûn paşê were rakirin jî nabe
         locale: Zimanê navrûyê bikarhêner, agahdarîyên e-name û pêl kirin
@@ -67,13 +65,10 @@ ku:
           hide: Naveroka parzûnkirî bi tevahî veşêre, mîna ku ew tune be tevbigere
           warn: Naveroka parzûnkirî li pişt hişyariyek ku sernavê parzûnê qal dike veşêre
       form_admin_settings:
-        backups_retention_period: Arşîvên bikarhênerên çêkirî ji bo rojên diyarkirî tomar bike.
         bootstrap_timeline_accounts: Ev ajimêr wê di pêşnîyarên şopandina bikarhênerên nû de werin derzîkirin.
         closed_registrations_message: Dema ku tomarkirin girtî bin têne xuyakirin
-        content_cache_retention_period: Şandiyên ji rajekarên din wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin. Dibe ku ev bê veger be.
         custom_css: Tu dikarî awayên kesane li ser guhertoya malperê ya Mastodon bicîh bikî.
         mascot: Îlustrasyona navrûyê webê yê pêşketî bêbandor dike.
-        media_cache_retention_period: Pelên medyayê yên daxistî wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin, û li gorî daxwazê ​​ji nû ve werin daxistin.
         profile_directory: Pelrêça profîlê hemû bikarhênerên keşfbûnê hilbijartine lîste dike.
         require_invite_text: Gava ku tomarkirin pêdiviya pejirandina destan dike, Têketina nivîsê "Tu çima dixwazî beşdar bibî?" Bike sereke ji devla vebijêrkî
         site_contact_email: Mirov dikarin ji bo pirsên qanûnî yan jî yên piştgiriyê çawa xwe digihînin te.
@@ -220,7 +215,6 @@ ku:
         backups_retention_period: Serdema tomarkirina arşîva bikarhêner
         bootstrap_timeline_accounts: Van ajimêran ji bikarhênerên nû re pêşniyar bike
         closed_registrations_message: Peyama kesane dema ku tomarkirin peyda nebin
-        content_cache_retention_period: Serdema tomarkirina bîrdanka naverokê
         custom_css: CSS a kesanekirî
         mascot: Mascot a kesanekirî (legacy)
         media_cache_retention_period: Serdema tomarkirina bîrdanka medyayê
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index c23960e07d..cef58e4601 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -32,21 +32,21 @@ lad:
       announcement:
         all_day: Kuando esta eskojido solo se amostraran las datas del rango de tiempo
         ends_at: Opsyonal. El pregon dezaparesera otomatikamente en este momento
-        scheduled_at: Deshar en blanko para publikar el pregon pishin
+        scheduled_at: Desha en blanko para publikar el pregon pishin
         starts_at: Opsyonal. En caso de ke tu pregon este atado a un intervalo de tiempo espesifiko
         text: Puedes kulanear la sintaksa de publikasyones. Por favor nota el espasyo ke okupara el pregon en el ekran del utilizador
       appeal:
         text: Solo puedes apelar un amonestamiento una vez
       defaults:
         autofollow: Los utilizadores ke se enrejistren por la envitasyon te segiran otomatikamente
-        avatar: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        avatar: WEBP, PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
         bot: Indika ke este kuento egzekuta prinsipalmente aksyones otomatizadas i podria no ser monitorizada
         context: Uno o multiples kontekstos en los ke deve aplikarse el filtro
         current_password: Por razones de sigurita por favor ingresa el kod del kuento aktual
         current_username: Para konfirmar, por favor ingresa el nombre de utilizador del kuento aktual
         digest: Solo embiado dempues de un eluengo periodo de inaktivita i solo si tienes recibido mesajes personales durante tu ausensya
         email: Se te embiara konfirmasyon por posta elektronika
-        header: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        header: WEBP, PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
         inbox_url: Kopia el URL de la pajina prinsipala del relevo ke keres utilizar
         irreversible: Las publikasyones filtradas dezapareseran irreversivlemente, inkluzo si este filtro es supremido mas adelante
         locale: La lingua de la enterfaz de utilizador, posta i avizos arrepushados
@@ -77,13 +77,10 @@ lad:
           warn: Eskonde el kontenido filtrado detras de una avertensya enmentando el titolo del filtro
       form_admin_settings:
         activity_api_enabled: Numero de publikasyones publikadas lokalmente, utilizadores activos i enrejistrasyones muevas kada semana
-        backups_retention_period: Manten las dosyas de utilizador djeneradas durante el numero de diyas espesifikado.
         bootstrap_timeline_accounts: Estos kuentos apareseran en la parte superior de las rekomendasiones de los muevos utilizadores.
         closed_registrations_message: Amostrado kuando las enrejistrasyones estan serrados
-        content_cache_retention_period: Las publikasyones de otros sirvidores se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva. Esto puede ser irreversivle.
         custom_css: Puedes aplikar estilos personalizados a la version web de Mastodon.
         mascot: Reemplaza la ilustrasyon en la enterfaz web avanzada.
-        media_cache_retention_period: Las dosyas de multimedia abashadas se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva, i se reabasharan basho demanda.
         peers_api_enabled: Una lista de nombres de domeno ke este sirvidor tiene topado en el Fediverso. Aki no se inkluye dingun dato sovre si federas kon un sirvidor determinado, solo ke tu sirvidor lo konese. Esto es utilizado por los servisyos ke rekopilan estatistikas sovre la federasyon en un senso djeneral.
         profile_directory: El katalogo de profiles lista a todos los utilizadores ke tienen optado por ke sus kuento pueda ser deskuvierto.
         require_invite_text: Kuando las enrejistrasyones rekieren achetasyon manuala, faze obligatoria la entrada de teksto "Por ke keres unirte?" en lugar de ser opsyonal
@@ -116,6 +113,7 @@ lad:
           sign_up_requires_approval: Muevas enrejistrasyones rekeriran tu achetasyon
         severity: Eskoje lo ke pasara kon las petisyones dizde este IP
       rule:
+        hint: Opsyonal. Adjusta mas detalyos sovre la regla
         text: Deskrive una norma o rekerensya para los utilizadores de este sirvidor. Aprova fazerla kurta i kolay
       sessions:
         otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:'
@@ -242,7 +240,6 @@ lad:
         backups_retention_period: Periodo de retensyon de la dosya de utilizador
         bootstrap_timeline_accounts: Rekomenda siempre estos kuentos a muevos utilizadores
         closed_registrations_message: Mesaj personalizado kuando las enrejistrasyones no estan desponivles
-        content_cache_retention_period: Periodo de retensyon de kashe de kontenido
         custom_css: CSS personalizado
         mascot: Maskota personalizada (legado)
         media_cache_retention_period: Periodo de retensyon de kashe multimedia
@@ -299,6 +296,7 @@ lad:
           patch: Avizame de aktualizasyones de yerros
         trending_tag: Un muevo trend nesesita revizyon
       rule:
+        hint: Enformasyon adisyonala
         text: Regla
       settings:
         indexable: Inkluye la pajina de profil en los bushkadores
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 6eb90340dc..1c73ce0a84 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -39,28 +39,28 @@ lt:
         text: Gali pateikti apeliaciją dėl streiko tik vieną kartą
       defaults:
         autofollow: Žmonės, kurie užsiregistruos per kvietimą, automatiškai seks tave
-        avatar: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
-        bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima
+        avatar: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
+        bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima.
         context: Vienas arba keli kontekstai, kuriems turėtų būti taikomas filtras
         current_password: Saugumo sumetimais įvesk dabartinės paskyros slaptažodį
         current_username: Kad patvirtintum, įvesk dabartinės paskyros naudotojo vardą
         digest: Siunčiama tik po ilgo neaktyvumo laikotarpio ir tik tuo atveju, jei negavai jokių asmeninių žinučių
         email: Tau bus išsiųstas patvirtinimo el. laiškas
-        header: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
+        header: WEBP, PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         inbox_url: Nukopijuok URL adresą iš pradinio puslapio perdavėjo, kurį nori naudoti
         irreversible: Filtruoti įrašai išnyks negrįžtamai, net jei vėliau filtras bus pašalintas
-        locale: Naudotojo sąsajos kalba, el. laiškai ir stumiamieji pranešimai
+        locale: Naudotojo sąsajos kalba, el. laiškai ir tiesioginiai pranešimai
         password: Naudok bent 8 simbolius
         phrase: Bus suderinta, neatsižvelgiant į teksto lygį arba įrašo turinio įspėjimą
         scopes: Prie kurių API programai bus leidžiama pasiekti. Pasirinkus aukščiausio lygio sritį, atskirų sričių pasirinkti nereikia.
-        setting_aggregate_reblogs: Nerodyti naujų pakėlimų įrašams, kurie neseniai buvo pakelti (taikoma tik naujai gautiems pakėlimams)
-        setting_always_send_emails: Paprastai pranešimai el. paštu nebus siunčiami, kai aktyviai naudoji Mastodon
-        setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista paspaudus
+        setting_aggregate_reblogs: Nerodyti naujų pakėlimų įrašams, kurie neseniai buvo pakelti (taikoma tik naujai gautiems pakėlimams).
+        setting_always_send_emails: Paprastai el. laiško pranešimai nebus siunčiami, kai aktyviai naudoji Mastodon.
+        setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista spustelėjus.
         setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
         setting_display_media_hide_all: Visada slėpti mediją
         setting_display_media_show_all: Visada rodyti mediją
-        setting_use_blurhash: Gradientai pagrįsti paslėptų vaizdų spalvomis, tačiau užgožia bet kokias detales
-        setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio kanalo slinkimo
+        setting_use_blurhash: Gradientai pagrįsti paslėptų vizualizacijų spalvomis, bet užgožia bet kokias detales.
+        setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio srauto slinkimo.
         username: Gali naudoti raides, skaičius ir pabraukimus
         whole_word: Kai raktažodis ar frazė yra tik raidinis ir skaitmeninis, jis bus taikomas tik tada, jei atitiks visą žodį
       email_domain_block:
@@ -74,7 +74,10 @@ lt:
           warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
       form_admin_settings:
         activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
-        backups_retention_period: Laikyti sukurtus naudotojų archyvus nurodytą dienų skaičių.
+        backups_retention_period: Naudotojai gali generuoti savo įrašų archyvus, kuriuos vėliau galės atsisiųsti. Nustačius teigiamą reikšmę, šie archyvai po nurodyto dienų skaičiaus bus automatiškai ištrinti iš saugyklos.
+        content_cache_retention_period: Visi įrašai iš kitų serverių (įskaitant pakėlimus ir atsakymus) bus ištrinti po nurodyto dienų skaičiaus, neatsižvelgiant į bet kokią vietinio naudotojo sąveiką su tais įrašais. Tai taikoma ir tiems įrašams, kuriuos vietinis naudotojas yra pažymėjęs kaip žymes ar mėgstamus. Privačios paminėjimai tarp naudotojų iš skirtingų instancijų taip pat bus prarastos ir jų bus neįmanoma atkurti. Šis nustatymas skirtas naudoti ypatingos paskirties instancijose, o įgyvendinus jį bendram naudojimui, pažeidžiami daugelio naudotojų lūkesčiai.
+        mascot: Pakeičia išplėstinės žiniatinklio sąsajos iliustraciją.
+        media_cache_retention_period: Nuotolinių naudotojų įrašytų įrašų medijos failai talpinami tavo serveryje. Nustačius teigiamą reikšmę, medijos bus ištrinamos po nurodyto dienų skaičiaus. Jei medijos duomenų bus paprašyta po to, kai jie bus ištrinti, jie bus atsiųsti iš naujo, jei šaltinio turinys vis dar prieinamas. Dėl apribojimų, susijusių su nuorodų peržiūros kortelių apklausos dažnumu trečiųjų šalių svetainėse, rekomenduojama nustatyti šią reikšmę ne trumpesnę kaip 14 dienų, kitaip nuorodų peržiūros kortelės nebus atnaujinamos pagal pareikalavimą iki to laiko.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
@@ -82,16 +85,21 @@ lt:
         thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
         timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
+        trends_as_landing_page: Rodyti tendencingą turinį atsijungusiems naudotojams ir lankytojams vietoj šio serverio aprašymo. Reikia, kad tendencijos būtų įjungtos.
+      rule:
+        hint: Pasirinktinai. Pateik daugiau informacijos apie taisyklę.
       sessions:
         otp: 'Įvesk telefono programėlėje sugeneruotą dviejų tapatybės kodą arba naudok vieną iš atkūrimo kodų:'
         webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
       settings:
         indexable: Tavo profilio puslapis gali būti rodomas paieškos rezultatuose Google, Bing ir kituose.
+        show_application: Neatsižvelgiant į tai, visada galėsi matyti, kuri programėlė paskelbė tavo įrašą.
       user:
-        chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis
+        chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis.
         role: Vaidmuo valdo, kokius leidimus naudotojas (-a) turi
     labels:
       account:
+        discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
         indexable: Įtraukti viešus įrašus į paieškos rezultatus
         show_collections: Rodyti sekimus ir sekėjus profilyje
         unlocked: Automatiškai priimti naujus sekėjus
@@ -114,19 +122,26 @@ lt:
         note: Biografija
         password: Slaptažodis
         phrase: Raktažodis arba frazė
+        setting_advanced_layout: Įjungti išplėstinę žiniatinklio sąsają
+        setting_aggregate_reblogs: Grupuoti pakėlimus laiko skalėse
+        setting_always_send_emails: Visada siųsti el. laiško pranešimus
         setting_auto_play_gif: Automatiškai leisti animuotų GIF
         setting_boost_modal: Rodyti patvirtinimo dialogą prieš pakėliant įrašą
         setting_default_language: Skelbimo kalba
         setting_default_privacy: Skelbimo privatumas
         setting_default_sensitive: Visada žymėti mediją kaip jautrią
         setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
+        setting_disable_swiping: Išjungti perbraukimo judėjimus
         setting_display_media: Medijos rodymas
         setting_display_media_hide_all: Slėpti viską
         setting_display_media_show_all: Rodyti viską
         setting_expand_spoilers: Visada išplėsti įrašus, pažymėtus turinio įspėjimais
         setting_hide_network: Slėpti savo socialinę diagramą
+        setting_reduce_motion: Sumažinti judėjimą animacijose
         setting_system_font_ui: Naudoti numatytąjį sistemos šriftą
         setting_theme: Svetainės tema
+        setting_trends: Rodyti šiandienos trendus
+        setting_use_blurhash: Rodyti spalvingus paslėptos medijos gradientus
         setting_use_pending_items: Lėtas režimas
         title: Pavadinimas
         type: Importo tipas
@@ -144,7 +159,7 @@ lt:
       form_admin_settings:
         activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
         bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
-        content_cache_retention_period: Turinio talpyklos išlaikymo laikotarpis
+        content_cache_retention_period: Nuotolinio turinio saugojimo laikotarpis
         custom_css: Pasirinktinis CSS
         mascot: Pasirinktinis talismanas (pasenęs)
         registrations_mode: Kas gali užsiregistruoti
@@ -155,6 +170,9 @@ lt:
         site_title: Serverio pavadinimas
         theme: Numatytoji tema
         thumbnail: Serverio miniatūra
+        trendable_by_default: Leisti tendencijas be išankstinės peržiūros
+        trends: Įjungti tendencijas
+        trends_as_landing_page: Naudoti tendencijas kaip nukreipimo puslapį
       invite_request:
         text: Kodėl nori prisijungti?
       notification_emails:
@@ -167,9 +185,12 @@ lt:
         software_updates:
           label: Yra nauja Mastodon versija
           patch: Pranešti apie klaidų ištaisymo atnaujinimus
+        trending_tag: Reikia peržiūros naujam tendencijai
       rule:
+        hint: Papildoma informacija
         text: Taisyklė
       settings:
+        indexable: Įtraukti profilio puslapį į paieškos variklius
         show_application: Rodyti, iš kurios programėles išsiuntei įrašą
       tag:
         listable: Leisti šį saitažodį rodyti paieškose ir pasiūlymuose
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index bf831c946f..711484b642 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -6,9 +6,9 @@ lv:
         discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem.
         display_name: Tavs pilnais vārds vai tavs joku vārds.
         fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies.
-        indexable: Tavas publiskās ziņas var tikt parādītas Mastodon meklēšanas rezultātos. Personas, kuras ir mijiedarbojušās ar tavām ziņām, var tās meklēt neatkarīgi no tā.
+        indexable: Tavi publiskie ieraksti var tikt parādīti Mastodon meklēšanas iznākumā. Cilvēki, kuri ir mijiedarbojušies ar Taviem ierakstiem, var tos meklēt neatkarīgi no tā.
         note: 'Tu vari @minēt citus cilvēkus vai #mirkļbirkas.'
-        show_collections: Cilvēki varēs pārlūkot tavus sekotājus un kam tu seko. Cilvēki, kuriem seko, redzēs, ka tu seko viņiem neatkarīgi no tā.
+        show_collections: Cilvēki varēs pārlūkot Tavus sekotājus un sekojamos. Cilvēki, kuriem Tu seko, redzēs, ka Tu seko viņiem neatkarīgi no tā.
         unlocked: Cilvēki varēs tev sekot, neprasot apstiprinājumu. Noņem atzīmi, ja vēlies pārskatīt sekošanas pieprasījumus un izvēlēties, pieņemt vai noraidīt jaunus sekotājus.
       account_alias:
         acct: Norādi konta lietotājvārdu@domēnu, no kura vēlies pārvākties
@@ -26,7 +26,7 @@ lv:
           disable: Neļauj lietotājam izmantot savu kontu, bet neizdzēs vai neslēp tā saturu.
           none: Izmanto šo, lai nosūtītu lietotājam brīdinājumu, neradot nekādas citas darbības.
           sensitive: Piespiest visus šī lietotāja multivides pielikumus atzīmēt kā sensitīvus.
-          silence: Neļauj lietotājam publicēt ziņas ar publisku redzamību, paslēp viņa ziņas un paziņojumus no personām, kas viņiem neseko. Tiek aizvērti visi šī konta pārskati.
+          silence: Neļaut lietotājam veikt ierakstus ar publisku redzamību, paslēpt viņa ierakstus un paziņojumus no cilvēkiem, kas tam neseko. Tiek aizvērti visi ziņojumi par šo kontu.
           suspend: Novērs jebkādu mijiedarbību no šī konta vai uz to un dzēs tā saturu. Atgriežams 30 dienu laikā. Tiek aizvērti visi šī konta pārskati.
         warning_preset_id: Neobligāts. Tu joprojām vari pievienot pielāgotu tekstu sākotnējās iestatīšanas beigās
       announcement:
@@ -39,14 +39,14 @@ lv:
         text: Brīdinājumu var pārsūdzēt tikai vienu reizi
       defaults:
         autofollow: Cilvēki, kuri reģistrējas, izmantojot uzaicinājumu, automātiski sekos tev
-        avatar: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions} px
+        avatar: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         bot: Paziņo citiem, ka kontā galvenokārt tiek veiktas automatizētas darbības un tas var netikt uzraudzīts
         context: Viens vai vairāki konteksti, kur jāpiemēro filtrs
         current_password: Drošības nolūkos, lūdzu, ievadi pašreizējā konta paroli
         current_username: Lai apstiprinātu, lūdzu, ievadi pašreizējā konta paroli
-        digest: Sūta tikai pēc ilgstošas neaktivitātes un tikai tad, ja savas prombūtnes laikā neesi saņēmis personiskas ziņas
+        digest: Tiek nosūtīts tikai pēc ilgstošas bezdarbības un tikai tad, ja savas prombūtnes laikā esi saņēmis jebkādas personīgas ziņas
         email: Tev tiks nosūtīts apstiprinājuma e-pasts
-        header: PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
+        header: WEBP, PNG, GIF vai JPG. Ne vairāk kā %{size}. Tiks samazināts līdz %{dimensions}px
         inbox_url: Nokopē URL no tā releja sākumlapas, kuru vēlies izmantot
         irreversible: Filtrētās ziņas neatgriezeniski pazudīs, pat ja filtrs vēlāk tiks noņemts
         locale: Lietotāja saskarnes, e-pasta ziņojumu un push paziņojumu valoda
@@ -59,7 +59,7 @@ lv:
         setting_display_media_default: Paslēpt multividi, kas atzīmēta kā sensitīva
         setting_display_media_hide_all: Vienmēr slēpt multividi
         setting_display_media_show_all: Vienmēr rādīt multividi
-        setting_use_blurhash: Gradientu pamatā ir paslēpto vizuālo attēlu krāsas, bet neskaidras visas detaļas
+        setting_use_blurhash: Pāreju pamatā ir paslēpto uzskatāmo līdzekļu krāsas, bet saturs tiek padarīts neskaidrs
         setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis automātiski ritini plūsmu
         username: Tu vari lietot burtus, ciparus un zemsvītras
         whole_word: Ja atslēgvārds vai frāze ir tikai burtciparu, tas tiks lietots tikai tad, ja tas atbilst visam vārdam
@@ -77,13 +77,10 @@ lv:
           warn: Paslēp filtrēto saturu aiz brīdinājuma, kurā minēts filtra nosaukums
       form_admin_settings:
         activity_api_enabled: Vietēji publicēto ziņu, aktīvo lietotāju un jauno reģistrāciju skaits nedēļas kopās
-        backups_retention_period: Saglabā ģenerētos lietotāju arhīvus norādīto dienu skaitā.
         bootstrap_timeline_accounts: Šie konti tiks piesprausti jauno lietotāju ieteikumu augšdaļā.
         closed_registrations_message: Tiek rādīts, kad reģistrēšanās ir slēgta
-        content_cache_retention_period: Ziņas no citiem serveriem tiks dzēstas pēc norādītā dienu skaita, ja ir iestatīta pozitīva vērtība. Tas var būt neatgriezeniski.
         custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
         mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
-        media_cache_retention_period: Lejupielādētie multivides faili tiks dzēsti pēc norādītā dienu skaita, kad tie būs iestatīti uz pozitīvu vērtību, un pēc pieprasījuma tiks lejupielādēti atkārtoti.
         peers_api_enabled: Domēna vārdu saraksts, ar kuriem šis serveris ir saskāries fediversā. Šeit nav iekļauti dati par to, vai tu veic federāciju ar noteiktu serveri, tikai tavs serveris par to zina. To izmanto dienesti, kas apkopo statistiku par federāciju vispārīgā nozīmē.
         profile_directory: Profilu direktorijā ir uzskaitīti visi lietotāji, kuri ir izvēlējušies būt atklājami.
         require_invite_text: 'Ja pierakstīšanai nepieciešama manuāla apstiprināšana, izdari tā, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis opcionāla'
@@ -96,7 +93,7 @@ lv:
         status_page_url: Tās lapas URL, kurā lietotāji var redzēt šī servera statusu pārtraukuma laikā
         theme: Tēma, kuru redz apmeklētāji, kuri ir atteikušies, un jaunie lietotāji.
         thumbnail: Aptuveni 2:1 attēls, kas tiek parādīts kopā ar tava servera informāciju.
-        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākās serverī pieejamās publiskās ziņas.
+        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākos serverī pieejamos publiskos ierakstus.
         trendable_by_default: Izlaist aktuālā satura manuālu pārskatīšanu. Atsevišķas preces joprojām var noņemt no tendencēm pēc fakta.
         trends: Tendences parāda, kuras ziņas, atsauces un ziņu stāsti gūst panākumus tavā serverī.
         trends_as_landing_page: Šī servera apraksta vietā rādīt aktuālo saturu lietotājiem un apmeklētājiem, kuri ir atteikušies. Nepieciešams iespējot tendences.
@@ -176,8 +173,8 @@ lv:
         text: Paskaidrojiet, kāpēc šis lēmums ir jāatceļ
       defaults:
         autofollow: Uzaicini sekot tavam kontam
-        avatar: Avatars
-        bot: Šis ir bot konts
+        avatar: Profila attēls
+        bot: Šis ir automatizēts konts
         chosen_languages: Filtrēt valodas
         confirm_new_password: Apstiprināt jauno paroli
         confirm_password: Apstiprināt paroli
@@ -220,7 +217,7 @@ lv:
         setting_theme: Vietnes motīvs
         setting_trends: Parādīt šodienas tendences
         setting_unfollow_modal: Parādīt apstiprinājuma dialogu pirms pārtraukt kādam sekot
-        setting_use_blurhash: Rādīt krāsainus gradientus slēptajiem multivides materiāliem
+        setting_use_blurhash: Rādīt krāsainas pārejas paslēptajiem informācijas nesējiem
         setting_use_pending_items: Lēnais režīms
         severity: Smagums
         sign_in_token_attempt: Drošības kods
@@ -242,7 +239,6 @@ lv:
         backups_retention_period: Lietotāja arhīva glabāšanas periods
         bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem
         closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama
-        content_cache_retention_period: Satura arhīva glabāšanas periods
         custom_css: Pielāgots CSS
         mascot: Pielāgots talismans (mantots)
         media_cache_retention_period: Multivides kešatmiņas saglabāšanas periods
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index 79929cec5d..ae375149eb 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -39,14 +39,12 @@ ms:
         text: Anda boleh membuat rayuan terhadap pelanggaran sekali sahaja
       defaults:
         autofollow: Orang yang mendaftar melalui undangan akan mengikuti anda secara automatik
-        avatar: PNG, GIF atau JPG. Kebanyakannya %{size}. Saiz akan dikecilkan kepada %{dimensions}px
         bot: Memberi isyarat kepada orang lain bahawa akaun itu kebanyakannya melakukan tindakan automatik dan mungkin tidak dipantau
         context: Satu atau berbilang konteks di mana penapis harus digunakan
         current_password: Untuk tujuan keselamatan sila masukkan kata laluan akaun semasa
         current_username: Untuk mengesahkan, sila masukkan nama pengguna akaun semasa
         digest: Hanya dihantar selepas tempoh yang lama tidak aktif dan hanya jika anda telah menerima sebarang mesej peribadi semasa ketiadaan anda
         email: Anda akan dihantar e-mel pengesahan
-        header: PNG, GIF atau JPG. Paling banyak %{size}. Akan diturunkan skala kepada %{dimensions}px
         inbox_url: Salin URL dari muka depan geganti yang anda mahu gunakan
         irreversible: Siaran yang ditapis akan hilang secara tidak dapat dipulihkan, walaupun penapis dialih keluar kemudian
         locale: Bahasa untuk antara muka pengguna, e-mel dan pemberitahuan segera
@@ -77,13 +75,10 @@ ms:
           warn: Sembunyikan kandungan yang ditapis di sebalik amaran yang menyebut tajuk penapis
       form_admin_settings:
         activity_api_enabled: Kiraan siaran tempatan yang diterbitkan, pengguna aktif dan pendaftaran baharu dalam baldi mingguan
-        backups_retention_period: Simpan arkib pengguna yang dijana untuk bilangan hari yang ditentukan.
         bootstrap_timeline_accounts: Akaun ini akan disematkan pada bahagian atas cadangan ikutan pengguna baharu.
         closed_registrations_message: Dipaparkan semasa pendaftaran ditutup
-        content_cache_retention_period: Semua pos dan rangsangan daripada server lain akan dipadamkan selepas bilangan hari yang ditentukan. Sesetengah siaran mungkin tidak boleh dipulihkan. Semua penanda halaman, kegemaran dan rangsangan yang berkaitan juga akan hilang dan mustahil untuk dibuat asal.
         custom_css: Anda boleh menggunakan gaya tersuai pada versi web Mastodon.
         mascot: Mengatasi ilustrasi dalam antara muka web lanjutan.
-        media_cache_retention_period: Fail media yang dimuat turun akan dipadamkan selepas bilangan hari yang ditetapkan apabila ditetapkan kepada nilai positif dan dimuat turun semula atas permintaan.
         peers_api_enabled: Senarai nama domain yang pernah ditemui oleh server ini dalam fediverse. Tiada data disertakan di sini tentang sama ada anda bersekutu dengan server tertentu, cuma server anda mengetahuinya. Ini digunakan oleh perkhidmatan yang mengumpul statistik mengenai persekutuan dalam pengertian umum.
         profile_directory: Direktori profil menyenaraikan semua pengguna yang telah mengikut serta untuk ditemui.
         require_invite_text: Apabila pendaftaran memerlukan kelulusan manual, buat "Mengapa anda mahu menyertai?" input teks wajib dan bukannya pilihan
@@ -242,7 +237,6 @@ ms:
         backups_retention_period: Tempoh pengekalan arkib pengguna
         bootstrap_timeline_accounts: Sentiasa mengesyorkan akaun ini kepada pengguna baharu
         closed_registrations_message: Mesej tersuai apabila pendaftaran tidak tersedia
-        content_cache_retention_period: Tempoh pengekalan cache kandungan
         custom_css: CSS tersuai
         mascot: Maskot tersuai (warisan)
         media_cache_retention_period: Tempoh pengekalan cache media
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 80b234c17c..20c862ab27 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -39,14 +39,12 @@ my:
         text: လုပ်ဆောင်ချက်တစ်ကြိမ်သာ အသုံးပြုနိုင်သည်
       defaults:
         autofollow: ဖိတ်ကြားချက်မှတစ်ဆင့် အကောင့်ဖွင့်သူများမှာ သင့်ကို အလိုအလျောက်စောင့်ကြည့်မည်ဖြစ်ပါသည်
-        avatar: PNG၊ GIF သို့မဟုတ် JPG။ အများဆုံး %{size}။ %{dimensions}px သို့ လျှော့ချပါမည်။
         bot: အကောင့်သည် အဓိကအားဖြင့် အလိုအလျောက် လုပ်ဆောင်ချက်များ ဆောင်ရွက်နိုင်ပြီး စောင့်ကြည့်ခြင်းမပြုနိုင်ကြောင်း အခြားသူများအား အသိပေးပါ
         context: စစ်ထုတ်သင့်သည့် အကြောင်းအရာ တစ်ခု သို့မဟုတ် များစွာ
         current_password: လုံခြုံရေးအတွက် ကျေးဇူးပြုပြီး လက်ရှိအကောင့်၏ စကားဝှက်ကို ထည့်ပါ
         current_username: အတည်ပြုရန်အတွက် လက်ရှိအကောင့်၏ အသုံးပြုသူအမည်ကို ရိုက်ထည့်ပါ
         digest: အချိန်အတော်ကြာ အသုံးမပြုသည့်သည့်နောက်တွင်သာ ပေးပို့ပြီး အသုံးမပြုသည့်ကာလအတွင်း ကိုယ်ရေးကိုယ်တာစာများသာ လက်ခံရန်
         email: သင့်ထံ အတည်ပြုချက်အီးမေးလ်တစ်စောင် ပေးပို့ပါမည်
-        header: PNG၊ GIF သို့မဟုတ် JPG။ အများဆုံး %{size}။ %{dimensions}px သို့ လျှော့ချပါမည်
         inbox_url: သင်အသုံးပြုလိုသော relay ၏ ရှေ့စာမျက်နှာမှ URL ကို ကူးယူပါ
         irreversible: စစ်ထုတ်ခြင်းကိုဖယ်ရှားလိုက်ပါက စစ်ထုတ်ထားသော ပို့စ်များမှာ ပျောက်ကွယ်သွားပါမည်
         locale: အသုံးပြုသူမှ လက်ရှိသုံးနေသည့်ဘာသာစကား၊ အီးမေးလ်များနှင့် ရရှိစေရန်ပေးပို့သည့် အသိပေးချက်များ
@@ -77,13 +75,10 @@ my:
           warn: စစ်ထုတ်မှုခေါင်းစဉ်ကိုဖော်ပြသည့်သတိပေးချက်နောက်တွင် စစ်ထုတ်ထားသောအကြောင်းအရာကို ဖျောက်ထားပါ
       form_admin_settings:
         activity_api_enabled: အပတ်စဉ် စာရင်းများတွင် ဒေသတွင်းတင်ထားသောပို့စ်များ၊ လက်ရှိအသုံးပြုသူများနှင့် စာရင်းသွင်းမှုအသစ်များ
-        backups_retention_period: သတ်မှတ်ထားသော ရက်အရေအတွက်အလိုက် အသုံးပြုသူမှတ်တမ်းများကို သိမ်းဆည်းပါ။
         bootstrap_timeline_accounts: ဤအကောင့်များကို အသုံးပြုသူအသစ်များ၏ စောင့်ကြည့်မှု အကြံပြုချက်များ၏ထိပ်ဆုံးတွင် ပင်ချိတ်ထားပါမည်။
         closed_registrations_message: အကောင့်ဖွင့်ခြင်းများကို ပိတ်ထားသည့်အခါတွင် ပြသထားသည်
-        content_cache_retention_period: သတ်မှတ်ထားသောရက်များပြီးနောက် အခြားဆာဗာများမှ ပို့စ်များကို ဖျက်လိုက်ပါမည်။ ပြန်လည်ပြင်ဆင်၍မရပါ။
         custom_css: Mastodon ဝဘ်ဗားရှင်းတွင် စိတ်ကြိုက်စတိုင်များကို အသုံးပြုနိုင်ပါသည်။
         mascot: အဆင့်မြင့် ဝဘ်ပုံစံတွင်တွင် ရုပ်ပုံဖြင့်ဖော်ပြထားသည်။
-        media_cache_retention_period: သတ်မှတ်ထားသောရက်များပြီးနောက် ဒေါင်းလုဒ်လုပ်ထားသော မီဒီယာဖိုင်များကို ဖျက်လိုက်ပါမည်။ တောင်းဆိုပါက ပြန်လည်ဒေါင်းလုဒ် လုပ်ခွင့်ရှိသည်။
         peers_api_enabled: ဤဆာဗာမှတွေ့ရသော ဖက်ဒီနယ်ပယ်ပေါင်းစုံရှိ ဒိုမိန်းအမည်များစာရင်း။ ဖက်ဒီနယ်ပယ်များမှာ သင်အသုံးပြုနေသည့်ဆာဗာနှင့် ပေါင်းစပ်ခြင်းရှိသည်ဖြစ်စေ၊ မရှိသည်ဖြစ်စေ ဤနေရာတွင် အချက်အလက်များကို မပြသထားပါ။ ယေဘုယျအားဖြင့် ဖက်ဒရယ်ဆိုင်ရာ စာရင်းအင်းများစုဆောင်းသည့် ဝန်ဆောင်မှုကိုသာ အသုံးပြုထားသည်။
         profile_directory: ပရိုဖိုင်လမ်းညွှန်တွင် ရှာဖွေ‌နိုင်သည့်အသုံးပြုသူအားလုံးကို စာရင်းပြုစုထားသည်။
         require_invite_text: အကောင့်ဖွင့်ရာတွင် လူကိုယ်တိုင်ခွင့်ပြုချက်လိုအပ်သောအခါ “ဘာကြောင့်ပါဝင်ချင်သလဲ” ဟုလုပ်ပါ။ စိတ်ကြိုက်ရွေးချယ်မည့်အစား စာသားထည့်သွင်းရန်မဖြစ်မနေထည့်သွင်းပါ။
@@ -242,7 +237,6 @@ my:
         backups_retention_period: အသုံးပြုသူ၏ မှတ်တမ်းကာလ
         bootstrap_timeline_accounts: ဤအကောင့်များကို အသုံးပြုသူအသစ်များအတွက် အကြံပြုပေးပါ
         closed_registrations_message: အကောင့်ဖွင့်ခြင်းများ မရတော့သောအခါ စိတ်ကြိုက်မက်ဆေ့ချ်ပို့ခြင်း
-        content_cache_retention_period: အကြောင်းအရာ ကက်ရှ်ထိန်းသိမ်းသည့်ကာလ
         custom_css: စိတ်ကြိုက်ပြုလုပ်ထားသော CSS
         mascot: စိတ်ကြိုက်ပြုလုပ်ထားသော mascot (legacy)
         media_cache_retention_period: မီဒီယာကက်ရှ် ထိန်းသိမ်းသည့်ကာလ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index b0b695745b..8bc717fe1f 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -39,14 +39,14 @@ nl:
         text: Je kunt maar eenmalig bezwaar indienen tegen een vastgestelde overtreding
       defaults:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
-        avatar: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
+        avatar: WEBP, PNG, GIF of JPG. Maximaal %{size}. Wordt verkleind naar %{dimensions}px
         bot: Signaal aan anderen dat het account voornamelijk geautomatiseerde acties uitvoert en mogelijk niet wordt gecontroleerd
         context: Een of meerdere locaties waar de filter actief moet zijn
         current_password: Voer voor veiligheidsredenen het wachtwoord van je huidige account in
         current_username: Voer ter bevestiging de gebruikersnaam van je huidige account in
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
         email: Je krijgt een bevestigingsmail
-        header: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
+        header: WEBP, PNG, GIF of JPG. Maximaal %{size}. Wordt verkleind naar %{dimensions}px
         inbox_url: Kopieer de URL van de voorpagina van de relayserver die je wil gebruiken
         irreversible: Gefilterde berichten verdwijnen onomkeerbaar, zelfs als de filter later wordt verwijderd
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
@@ -77,13 +77,15 @@ nl:
           warn: Verberg de gefilterde inhoud achter een waarschuwing, met de titel van het filter als waarschuwingstekst
       form_admin_settings:
         activity_api_enabled: Aantallen lokaal gepubliceerde berichten, actieve gebruikers en nieuwe registraties per week
-        backups_retention_period: De aangemaakte gebruikersarchieven voor het opgegeven aantal dagen behouden.
+        app_icon: WEBP, PNG, GIF of JPG. Vervangt op mobiele apparaten het standaard app-pictogram met een aangepast pictogram.
+        backups_retention_period: Gebruikers hebben de mogelijkheid om archieven van hun berichten te genereren om later te downloaden. Indien ingesteld op een positieve waarde, worden deze archieven automatisch verwijderd uit jouw opslag na het opgegeven aantal dagen.
         bootstrap_timeline_accounts: Deze accounts worden bovenaan de aanbevelingen aan nieuwe gebruikers getoond. Meerdere gebruikersnamen met komma's scheiden.
         closed_registrations_message: Weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld
-        content_cache_retention_period: Alle berichten van andere servers worden na het opgegeven aantal dagen verwijderd. Deze berichten kunnen daarna hoogstwaarschijnlijk niet meer worden hersteld. Alle gerelateerde bladwijzers, favorieten en boosts worden eveneens onomkeerbaar verwijderd.
+        content_cache_retention_period: Alle berichten van andere servers (inclusief boosts en reacties) worden verwijderd na het opgegeven aantal dagen, ongeacht enige lokale gebruikersinteractie met die berichten. Dit betreft ook berichten die een lokale gebruiker aan diens bladwijzers heeft toegevoegd of als favoriet heeft gemarkeerd. Privéberichten tussen gebruikers van verschillende servers gaan ook verloren en zijn onmogelijk te herstellen. Het gebruik van deze instelling is bedoeld voor servers die een speciaal doel dienen en overtreedt veel gebruikersverwachtingen wanneer deze voor algemeen gebruik wordt geïmplementeerd.
         custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server.
+        favicon: WEBP, PNG, GIF of JPG. Vervangt de standaard Mastodon favicon met een aangepast pictogram.
         mascot: Overschrijft de illustratie in de geavanceerde webomgeving.
-        media_cache_retention_period: Mediabestanden die van andere servers zijn gedownload worden na het opgegeven aantal dagen verwijderd en worden op verzoek opnieuw gedownload.
+        media_cache_retention_period: Mediabestanden van berichten van externe gebruikers worden op jouw server in de cache opgeslagen. Indien ingesteld op een positieve waarde, worden media verwijderd na het opgegeven aantal dagen. Als de mediagegevens worden opgevraagd nadat ze zijn verwijderd, worden ze opnieuw gedownload wanneer de originele inhoud nog steeds beschikbaar is. Vanwege beperkingen op hoe vaak linkvoorbeelden sites van derden raadplegen, wordt aanbevolen om deze waarde in te stellen op ten minste 14 dagen. Anders worden linkvoorbeelden niet op aanvraag bijgewerkt.
         peers_api_enabled: Een lijst met domeinnamen die deze server heeft aangetroffen in de fediverse. Er zijn hier geen gegevens inbegrepen over de vraag of je verbonden bent met een bepaalde server, alleen dat je server er van weet. Dit wordt gebruikt door diensten die statistieken over de federatie in algemene zin verzamelen.
         profile_directory: De gebruikersgids bevat een lijst van alle gebruikers die ervoor gekozen hebben om ontdekt te kunnen worden.
         require_invite_text: Maak het invullen van "Waarom wil je je hier registreren?" verplicht in plaats van optioneel, wanneer registraties handmatig moeten worden goedgekeurd
@@ -116,6 +118,7 @@ nl:
           sign_up_requires_approval: Nieuwe registraties vereisen jouw goedkeuring
         severity: Kies wat er moet gebeuren met aanvragen van dit IP-adres
       rule:
+        hint: Optioneel. Verstrek meer details over de regel
         text: Omschrijf een regel of vereiste voor gebruikers op deze server. Probeer het kort en simpel te houden
       sessions:
         otp: 'Voer de tweestaps-toegangscode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
@@ -148,9 +151,9 @@ nl:
         show_collections: Accounts die jij volgt en die jou volgen op je profiel tonen
         unlocked: Automatisch nieuwe volgers accepteren
       account_alias:
-        acct: Mastodonadres van het oude account
+        acct: Fediverse-adres van het oude account
       account_migration:
-        acct: Mastodonadres van het nieuwe account
+        acct: Fediverse-adres van het nieuwe account
       account_warning_preset:
         text: Tekst van preset
         title: Titel
@@ -242,7 +245,7 @@ nl:
         backups_retention_period: Bewaartermijn gebruikersarchief
         bootstrap_timeline_accounts: Accounts die altijd aan nieuwe gebruikers worden aanbevolen
         closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld
-        content_cache_retention_period: Bewaartermijn berichtencache
+        content_cache_retention_period: Bewaartermijn voor externe inhoud
         custom_css: Aangepaste CSS
         mascot: Aangepaste mascotte (legacy)
         media_cache_retention_period: Bewaartermijn mediacache
@@ -299,6 +302,7 @@ nl:
           patch: Meldingen bij bugfix-updates
         trending_tag: Nieuwe trend vereist beoordeling
       rule:
+        hint: Aanvullende informatie
         text: Regel
       settings:
         indexable: Zoekmachines jouw profielpagina laten vinden
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 266ef1fcce..a93a803221 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -39,14 +39,14 @@ nn:
         text: Ei åtvaring kan kun ankast ein gong
       defaults:
         autofollow: Folk som lagar ein konto gjennom innbydinga fylgjer deg automatisk
-        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
+        avatar: WEBP, PNG, GIF eller JPG. Maks %{size}. Blir forminska til %{dimensions}pkt
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: Skriv inn brukarnamnet til den noverande kontoen for å stadfesta
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du får snart ein stadfestings-e-post
-        header: PNG, GIF eller JPG. Maksimalt %{size}. Minkast til %{dimensions}px
+        header: WEBP, PNG, GIF eller JPG. Maks %{size}. Blir forminska til %{dimensions}pkt
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte tut vil verta borte for evig, sjølv om filteret vert fjerna seinare
         locale: Språket til brukargrensesnittet, e-postar og push-varsel
@@ -55,8 +55,8 @@ nn:
         scopes: API-ane som programmet vil få tilgjenge til. Ettersom du vel eit toppnivåomfang tarv du ikkje velja einskilde API-ar.
         setting_aggregate_reblogs: Ikkje vis nye framhevingar for tut som nyleg har vorte heva fram (Påverkar berre nylege framhevingar)
         setting_always_send_emails: Vanlegvis vil ikkje e-postvarsel bli sendt når du brukar Mastodon aktivt
-        setting_default_sensitive: Nærtakande media vert gøymd som standard og kan synast med eit klikk
-        setting_display_media_default: Gøym media som er merka som nærtakande
+        setting_default_sensitive: Sensitive media vert gøymde som standard, og du syner dei ved å klikka på dei
+        setting_display_media_default: Gøym media som er merka som sensitive
         setting_display_media_hide_all: Alltid skjul alt media
         setting_display_media_show_all: Vis alltid media
         setting_use_blurhash: Overgangar er basert på fargane til skjulte grafikkelement, men gjer detaljar utydelege
@@ -77,13 +77,15 @@ nn:
           warn: Skjul det filtrerte innhaldet bak ei åtvaring som nemner tittelen på filteret
       form_admin_settings:
         activity_api_enabled: Tal på lokale innlegg, aktive brukarar og nyregistreringar kvar veke
-        backups_retention_period: Ta vare på genererte brukararkiv i angitt antal dagar.
+        app_icon: WEBP, PNG, GIF eller JPG. Overstyrer standard-app-ikonet på mobile einingar med eit eigendefinert ikon.
+        backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
-        content_cache_retention_period: Innlegg frå andre tenarar vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi. Dette kan vera irreversibelt.
+        content_cache_retention_period: Alle innlegg frå andre serverar (inkludert boostar og svar) vil bli sletta etter dei gitte antal dagar, uten hensyn til lokale brukarinteraksjonar med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerker eller som favorittar. Òg private nemningar mellom brukarar frå ulike førekomstar vil gå tapt og vere umogleg å gjenskape. Bruk av denne innstillinga er rekna på spesielle førekomstar og bryt mange brukarforventingar når dette blir tatt i generell bruk.
         custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
+        favicon: WEBP, PNG, GIF eller JPG. Overstyrer det standarde Mastodon-favikonet med eit eigendefinert ikon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
-        media_cache_retention_period: Mediafiler som har blitt lasta ned vil bli sletta etter det angitte talet på dagar når det er sett til ein positiv verdi, og lasta ned på nytt ved etterspørsel.
+        media_cache_retention_period: Mediafiler frå innlegg laga av eksterne brukarar blir bufra på serveren din. Når sett til ein positiv verdi, slettast media etter eit gitt antal dagar. Viss mediedata blir førespurt etter det er sletta, vil dei bli lasta ned på nytt viss kjelda sitt innhald framleis er tilgjengeleg. På grunn av restriksjonar på kor ofte lenkeførehandsvisningskort lastar tredjepart-nettstadar, rådast det til å setje denne verdien til minst 14 dagar, eller at førehandsvisningskort ikkje blir oppdatert på førespurnad før det tidspunktet.
         peers_api_enabled: Ei liste over domenenamn denne tenaren har møtt på i allheimen. Det står ingenting om tenaren din samhandlar med ein annan tenar, berre om tenaren din veit om den andre. Dette blir brukt av tenester som samlar statistikk om føderering i det heile.
         profile_directory: Profilkatalogen viser alle brukarar som har valt å kunne bli oppdaga.
         require_invite_text: Når registrering krev manuell godkjenning, lyt du gjera tekstfeltet "Kvifor vil du bli med?" obligatorisk i staden for valfritt
@@ -116,6 +118,7 @@ nn:
           sign_up_requires_approval: Du må godkjenna nye registreringar
         severity: Vel kva som skal skje ved førespurnader frå denne IP
       rule:
+        hint: Valfritt. Gje meir informasjon om regelen
         text: Forklar ein regel eller eit krav for brukarar på denne tenaren. Prøv å skriva kort og lettfattleg
       sessions:
         otp: Angi tofaktorkoden fra din telefon eller bruk en av dine gjenopprettingskoder.
@@ -164,7 +167,7 @@ nn:
           none: Gjer inkje
           sensitive: Ømtolig
           silence: Togn
-          suspend: Utvis og slett kontodata for godt
+          suspend: Utvis
         warning_preset_id: Bruk åtvaringsoppsett
       announcement:
         all_day: Heildagshending
@@ -220,10 +223,10 @@ nn:
         setting_theme: Sidetema
         setting_trends: Vis kva som er populært i dag
         setting_unfollow_modal: Vis stadfesting før du sluttar å fylgja nokon
-        setting_use_blurhash: Vis fargerike overgangar for gøymt media
+        setting_use_blurhash: Vis fargerike overgangar for gøymde medium
         setting_use_pending_items: Saktemodus
         severity: Alvorsgrad
-        sign_in_token_attempt: Trygdenykel
+        sign_in_token_attempt: Innloggingsnykel
         title: Tittel
         type: Importtype
         username: Brukarnamn
@@ -235,14 +238,14 @@ nn:
         name: Emneknagg
       filters:
         actions:
-          hide: Gøym totalt
-          warn: Gøym med ei advarsel
+          hide: Gøym heilt
+          warn: Gøym med ei åtvaring
       form_admin_settings:
         activity_api_enabled: Legg ut samla statistikk om brukaraktiviteten i APIet
         backups_retention_period: Arkiveringsperiode for brukararkiv
         bootstrap_timeline_accounts: Tilrå alltid desse kontoane for nye brukarar
         closed_registrations_message: Eigendefinert melding når registrering ikkje er mogleg
-        content_cache_retention_period: Oppbevaringsperiode for innhaldsbuffer
+        content_cache_retention_period: Oppbevaringstid for eksternt innhald
         custom_css: Egendefinert CSS
         mascot: Eigendefinert maskot (eldre funksjon)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
@@ -266,9 +269,9 @@ nn:
         trends: Aktiver trendar
         trends_as_landing_page: Bruk trendar som startside
       interactions:
-        must_be_follower: Gøym varslingar frå folk som ikkje fylgjer deg
-        must_be_following: Gøym varslingar frå folk du ikkje fylgjer
-        must_be_following_dm: Gøym direktemeldinger frå folk du ikkje fylgjer
+        must_be_follower: Blokker varsel frå folk som ikkje fylgjer deg
+        must_be_following: Blokker varsel frå folk du ikkje fylgjer
+        must_be_following_dm: Blokker direktemeldinger frå folk du ikkje fylgjer
       invite:
         comment: Kommentar
       invite_request:
@@ -279,7 +282,7 @@ nn:
         severities:
           no_access: Blokker tilgang
           sign_up_block: Blokker registrering
-          sign_up_requires_approval: Begrens påmeldinger
+          sign_up_requires_approval: Avgrens påmeldingar
         severity: Oppføring
       notification_emails:
         appeal: Nokon klagar på ei moderatoravgjerd
@@ -299,6 +302,7 @@ nn:
           patch: Varsle om feilrettingsoppdateringar
         trending_tag: Ny trend krev gjennomgang
       rule:
+        hint: Meir informasjon
         text: Regler
       settings:
         indexable: Ta med profilsida i søkjemotorar
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index ca2020e21e..de3788aa42 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -36,17 +36,17 @@
         starts_at: Valgfritt. I tilfellet din kunngjøring er bundet til en spesifikk tidsramme
         text: Du kan bruke innlegg-syntaks. Vennligst vær oppmerksom på plassen som kunngjøringen vil ta opp på brukeren sin skjerm
       appeal:
-        text: Du kan kun klage på en advarsel en gang
+        text: Du kan kun anke en advarsel en gang
       defaults:
         autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
-        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
+        avatar: WEBP, PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         bot: Denne kontoen utfører i hovedsak automatiserte handlinger og blir kanskje ikke holdt øye med
         context: En eller flere sammenhenger der filteret skal gjelde
         current_password: For sikkerhetsgrunner, vennligst oppgi passordet til den nåværende bruker
         current_username: For å bekrefte, vennligst skriv inn brukernavnet til den nåværende kontoen
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
         email: Du vil bli tilsendt en bekreftelses-E-post
-        header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
+        header: WEBP, PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         inbox_url: Kopier URLen fra forsiden til overgangen du vil bruke
         irreversible: Filtrerte innlegg vil ugjenkallelig forsvinne, selv om filteret senere blir fjernet
         locale: Språket til brukergrensesnittet, e-mailer og push-varsler
@@ -77,13 +77,10 @@
           warn: Skjul det filtrerte innholdet bak et varsel som omtaler filterets tittel
       form_admin_settings:
         activity_api_enabled: Teller med lokale publiserte innlegg, aktive brukere og nye registreringer i ukentlige bøtter
-        backups_retention_period: Behold genererte brukerarkiv i det angitte antall dager.
         bootstrap_timeline_accounts: Disse kontoene vil bli festet til toppen av nye brukeres følge-anbefalinger.
         closed_registrations_message: Vises når det er stengt for registrering
-        content_cache_retention_period: Innlegg fra andre tjenere vil slettes etter det angitte antall dager når det er satt til en positiv verdi. Dette kan være irreversibelt.
         custom_css: Du kan bruke egendefinerte stiler på nettversjonen av Mastodon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
-        media_cache_retention_period: Mediafiler som lastes ned vil bli slettet etter det angitte antall dager når det settes til en positiv verdi, og blir lastet ned på nytt ved behov.
         peers_api_enabled: En liste over domenenavn denne serveren har oppstått i fødiverset. Det finnes ikke data om du føderer med en gitt server, for akkurat det serveren din vet om. Dette brukes av tjenester som i all hovedsak innhenter føderasjonsstatistikk.
         profile_directory: Profilkatalogen viser alle brukere som har valgt å kunne bli oppdaget.
         require_invite_text: Når registreringer krever manuell godkjenning, må du gjøre «Hvorfor vil du bli med?»-tekstinput obligatorisk i stedet for valgfritt
@@ -242,7 +239,6 @@
         backups_retention_period: Brukers oppbevaringsperiode for arkiv
         bootstrap_timeline_accounts: Anbefaler alltid disse kontoene til nye brukere
         closed_registrations_message: Egendefinert melding når registrering ikke er tilgjengelig
-        content_cache_retention_period: Oppbevaringsperiode for innholdsbuffer
         custom_css: Egendefinert CSS
         mascot: Egendefinert maskot (legacy)
         media_cache_retention_period: Oppbevaringsperiode for mediebuffer
@@ -282,7 +278,7 @@
           sign_up_requires_approval: Begrens påmeldinger
         severity: Oppføring
       notification_emails:
-        appeal: Noen klager på en moderator sin avgjørelse
+        appeal: Noen anker en moderator sin avgjørelse
         digest: Send sammendrag på e-post
         favourite: Send e-post når noen setter din status som favoritt
         follow: Send e-post når noen følger deg
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 7159eed322..ba9c260e47 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -25,14 +25,12 @@ oc:
         text: Podètz utilizar la sintaxi dels tuts. Gardatz al cap qu’aquesta anóncia ocuparà la fenèstra de l’utilizaire
       defaults:
         autofollow: Lo mond que se marcan gràcia a l’invitacion vos segràn automaticament
-        avatar: PNG, GIF o JPG. Maximum %{size}. Serà retalhat en %{dimensions}px
         bot: Avisar lo mond qu’aqueste compte es pas d’una persona
         context: Un o mai de contèxtes ont lo filtre deuriá s’aplicar
         current_password: Per de rasons de seguretat volgatz picar lo senhal del compte actual
         current_username: Per confirmar, volgatz picar lo nom d’utilizaire del compte actual
         digest: Solament enviat aprèp un long moment d’inactivitat e solament s’avètz recebut de messatges personals pendent vòstra abséncia
         email: Vos mandarem un corrièl de confirmacion
-        header: PNG, GIF o JPG. Maximum %{size}. Serà retalhada en %{dimensions}px
         inbox_url: Copiatz l’URL de la pagina màger del relai que volètz utilizar
         irreversible: Los tuts filtrats desapareisseràn irreversiblament, encara que lo filtre siá suprimit mai tard
         locale: La lenga de l’interfàcia d’utilizacion, los messatges e las notificacions
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index a55a93556f..9d82384af9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -39,14 +39,14 @@ pl:
         text: Możesz wysłać odwołanie do ostrzeżenia tylko raz
       defaults:
         autofollow: Osoby, które zarejestrują się z Twojego zaproszenia automatycznie zaczną Cię obserwować
-        avatar: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
+        avatar: WEBP, PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         bot: To konto wykonuje głównie zautomatyzowane działania i może nie być monitorowane
         context: Jedno lub wiele miejsc, w których filtr zostanie zastosowany
         current_password: Ze względów bezpieczeństwa wprowadź hasło obecnego konta
         current_username: Aby potwierdzić, wprowadź nazwę użytkownika obecnego konta
         digest: Wysyłane tylko po długiej nieaktywności, jeżeli w tym czasie otrzymaleś jakąś wiadomość bezpośrednią
         email: Otrzymasz e-mail potwierdzający
-        header: PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
+        header: WEBP, PNG, GIF lub JPG. Maksymalnie %{size}. Zostanie zmniejszony do %{dimensions}px
         inbox_url: Skopiuj adres ze strony głównej przekaźnika, którego chcesz użyć
         irreversible: Filtrowane wpisy znikną bezpowrotnie, nawet gdy filtr zostanie usunięty
         locale: Język interfejsu, wiadomości e-mail i powiadomieniach push
@@ -77,13 +77,15 @@ pl:
           warn: Ukryj filtrowaną zawartość za ostrzeżeniem wskazującym tytuł filtra
       form_admin_settings:
         activity_api_enabled: Liczby opublikowanych lokalnych postów, aktywnych użytkowników i nowych rejestracji w tygodniowych przedziałach
-        backups_retention_period: Zachowaj wygenerowane archiwa użytkownika przez określoną liczbę dni.
+        app_icon: WEBP, PNG, GIF, albo JPEG. Nadpisuje domyślną ikonę aplikacji na urządzeniach mobilnych.
+        backups_retention_period: Użytkownicy mogą generować archiwa wpisów do późniejszego pobrania. Jeżeli ta wartość jest dodatnia, te archiwa zostaną automatycznie usunięte z twojego serwera po danej liczbie dni.
         bootstrap_timeline_accounts: Te konta zostaną przypięte na górze rekomendacji obserwacji nowych użytkowników.
         closed_registrations_message: Wyświetlane po zamknięciu rejestracji
-        content_cache_retention_period: Posty z innych serwerów zostaną usunięte po określonej liczbie dni, kiedy liczba jest ustawiona na wartość dodatnią. Może to być nieodwracalne.
+        content_cache_retention_period: Wszystkie wpisy z innych serwerów (w tym podbicia i odpowiedzi) zostaną usunięte po danej liczbie dni, bez względu na interakcje z nimi twoich użytkowników. Zawierają się w tym wpisy, które twoi użytkownicy dodali do zakładek lub ulubionych. Prywatne wzmianki od innych instancji zostaną utracone i będą nieprzywracalne. To ustawienie jest przeznaczone dla instancji zastosowania specjalnego i jest niezgodne z wieloma oczekiwaniami użytkowników.
         custom_css: Możesz zastosować niestandardowe style w internetowej wersji Mastodon.
+        favicon: WEBP, PNG, GIF, albo JPEG. Nadpisuje domyślną faviconę Mastodona.
         mascot: Nadpisuje ilustrację w zaawansowanym interfejsie internetowym.
-        media_cache_retention_period: Pobrane pliki multimedialne zostaną usunięte po określonej liczbie dni po ustawieniu na wartość dodatnią i ponownie pobrane na żądanie.
+        media_cache_retention_period: Media z wpisów od obcych użytkowników są cache'owane na twoim serwerze. Kiedy dana wartość jest dodatnia, media te będą usunięte po tylu dniach. Jeżeli usunięte media zostaną potem zażądane, oryginał zostanie ponownie pobrany (o ile jest dalej dostępny). Z powodu ograniczeń dot. częstotliwości z jaką karty podglądu linków dopytują się o dane od stron trzecich, zalecana wartość to min. 14 dni, bo karty podglądu linków nie będą wcześniej odświeżane na żądane.
         peers_api_enabled: Lista nazw domen, z którymi ten serwer spotkał się w fediverse. Nie są tu zawarte żadne dane o tym, czy użytkownik dokonuje federacji z danym serwerem, a jedynie, że jego serwer o tym wie. Jest to wykorzystywane przez serwisy, które zbierają statystyki dotyczące federacji w ogólnym sensie.
         profile_directory: Katalog profili zawiera listę wszystkich użytkowników, którzy zgodzili się na bycie znalezionymi.
         require_invite_text: Kiedy rejestracje wymagają ręcznego zatwierdzenia, ustaw pole "Dlaczego chcesz dołączyć?" jako obowiązkowe, a nie opcjonalne
@@ -116,6 +118,7 @@ pl:
           sign_up_requires_approval: Nowe rejestracje będą wymagać twojej zgody
         severity: Wybierz co ma się stać z żadaniami z tego adresu IP
       rule:
+        hint: Opcjonalne. Dodaj więcej szczegółów dot. tej zasady
         text: Opisz wymóg lub regułę dla użytkowników na tym serwerze. Postaraj się, aby była krótka i prosta
       sessions:
         otp: 'Wprowadź kod weryfikacji dwuetapowej z telefonu lub wykorzystaj jeden z kodów zapasowych:'
@@ -242,7 +245,7 @@ pl:
         backups_retention_period: Okres przechowywania archiwum użytkownika
         bootstrap_timeline_accounts: Zawsze rekomenduj te konta nowym użytkownikom
         closed_registrations_message: Niestandardowa wiadomość, gdy rejestracje nie są dostępne
-        content_cache_retention_period: Okres przechowywania pamięci podręcznej
+        content_cache_retention_period: Okres zachowywania zdalnych treści
         custom_css: Niestandardowy CSS
         mascot: Własna ikona
         media_cache_retention_period: Okres przechowywania pamięci podręcznej
@@ -299,6 +302,7 @@ pl:
           patch: Powiadamiaj o aktualizacjach naprawiających błędy
         trending_tag: Nowe popularne wymagają przeglądu
       rule:
+        hint: Informacje dodatkowe
         text: Zasada
       settings:
         indexable: Udostępniaj profil wyszukiwarkom
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 1c303c0dae..77a0d8cd6f 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -39,14 +39,14 @@ pt-BR:
         text: Você só pode solicitar uma revisão uma vez
       defaults:
         autofollow: Pessoas que criarem conta através de seu convite te seguirão automaticamente
-        avatar: PNG, GIF or JPG. Arquivos de até %{size}. Serão redimensionados para %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         bot: Essa conta executa principalmente ações automatizadas e pode não ser monitorada
         context: Um ou mais contextos onde o filtro deve atuar
         current_password: Para fins de segurança, digite a senha da conta atual
         current_username: Para confirmar, digite o nome de usuário da conta atual
         digest: Enviado apenas após um longo período de inatividade com um resumo das menções recebidas durante ausência
         email: Você receberá um e-mail de confirmação
-        header: PNG, GIF ou JPG de até %{size}. Serão redimensionados para %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         inbox_url: Copie o link da página inicial do repetidor que você deseja usar
         irreversible: As publicações filtradas desaparecerão irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma da interface do usuário, e-mails e notificações
@@ -77,13 +77,15 @@ pt-BR:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem de publicações locais, usuários ativos e novos usuários semanais
-        backups_retention_period: Manter os arquivos de usuário gerados pelo número de dias especificados.
+        app_icon: WEBP, PNG, GIF ou JPG. Sobrescrever o ícone padrão do aplicativo em dispositivos móveis com um ícone personalizado.
+        backups_retention_period: Os usuários têm a capacidade de gerar arquivos de suas postagens para baixar mais tarde. Quando definido como um valor positivo, esses arquivos serão automaticamente excluídos do seu armazenamento após o número especificado de dias.
         bootstrap_timeline_accounts: Estas contas serão fixadas no topo das recomendações de novos usuários para seguir.
         closed_registrations_message: Exibido quando as inscrições estiverem fechadas
-        content_cache_retention_period: Postagens de outros servidores serão excluídas após o número de dias especificados, quando definido com um valor positivo. Isso pode ser irreversível.
+        content_cache_retention_period: Todas as postagens de outros servidores (incluindo boosts e respostas) serão excluídas após o número especificado de dias, sem levar a qualquer interação do usuário local com esses posts. Isto inclui postagens onde um usuário local o marcou como favorito ou favoritos. Menções privadas entre usuários de diferentes instâncias também serão perdidas e impossíveis de restaurar. O uso desta configuração destina-se a instâncias especiais de propósitos e quebra muitas expectativas dos usuários quando implementadas para uso de propósito geral.
         custom_css: Você pode aplicar estilos personalizados na versão da web do Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Sobrescreve o favicon padrão do Mastodon com um ícone personalizado.
         mascot: Substitui a ilustração na interface web avançada.
-        media_cache_retention_period: Os arquivos de mídia baixados serão excluídos após o número especificado de dias, quando definido para um valor positivo, e baixados novamente na demanda.
+        media_cache_retention_period: Arquivos de mídia de mensagens de usuários remotos são armazenados em cache no seu servidor. Quando definido como valor positivo, a mídia será excluída após o número especificado de dias. Se os dados da mídia forem solicitados depois de excluídos, eles serão baixados novamente, se o conteúdo fonte ainda estiver disponível. Devido a restrições de quantas vezes os cartões de visualização de links sondam sites de terceiros, é recomendado definir este valor em pelo menos 14 dias, ou pré-visualização de links não serão atualizados a pedido antes desse tempo.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no "fediverse". Nenhum dado é incluído aqui sobre se você concorda com os padroes operacionais de um determinado servidor, apenas que o seu servidor sabe disso. Esta ferramenta é utilizado por serviços que recolhem estatísticas sob as normas da federação (grupo de empresas que concordam sob paramentros operacionais específicos), em termos gerais.
         profile_directory: O diretório de perfis lista todos os usuários que optaram por permitir que suas contas sejam descobertas.
         require_invite_text: 'Quando o cadastro de novas contas exigir aprovação manual, tornar obrigatório, ao invés de opcional, o texto de solicitação de convite: "Por que você deseja ingressar nessa comunidade?"'
@@ -116,6 +118,7 @@ pt-BR:
           sign_up_requires_approval: Novas inscrições exigirão sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
+        hint: Opcional. Forneça mais detalhes sobre a regra
         text: Descreva uma regra ou requisito para os usuários neste servidor. Tente mantê-la curta e simples.
       sessions:
         otp: 'Digite o código de dois fatores gerado pelo aplicativo no seu celular ou use um dos códigos de recuperação:'
@@ -242,7 +245,7 @@ pt-BR:
         backups_retention_period: Período de retenção do arquivo de usuário
         bootstrap_timeline_accounts: Sempre recomendar essas contas para novos usuários
         closed_registrations_message: Mensagem personalizada quando inscrições não estão disponíveis
-        content_cache_retention_period: Período de retenção do cachê de conteúdo
+        content_cache_retention_period: Período de retenção de conteúdo remoto
         custom_css: CSS personalizável
         mascot: Mascote personalizado (legado)
         media_cache_retention_period: Período de retenção do cachê de mídia
@@ -299,6 +302,7 @@ pt-BR:
           patch: Notificar sobre atualizações de correções
         trending_tag: Uma nova tendência requer revisão
       rule:
+        hint: Informações adicionais
         text: Regra
       settings:
         indexable: Incluir página de perfil nos motores de busca
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 691ecec3a0..7fcbb210c5 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -39,14 +39,14 @@ pt-PT:
         text: Só pode recorrer uma única vez de uma reprimenda
       defaults:
         autofollow: As pessoas que aderirem através do convite segui-lo-ão automaticamente
-        avatar: PNG, GIF ou JPG. Ficheiros no máximo de %{size}. Serão reduzidos para %{dimensions}px
+        avatar: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         bot: Esta conta executa essencialmente ações automatizadas e pode não ser monitorizada
         context: Um ou diversos contextos nos quais o filtro deve ser aplicado
         current_password: Para fins de segurança, queira inserir a palavra-passe da conta atual
         current_username: Para confirmar, queira inserir o nome de utilizador da conta atual
         digest: Enviado após um longo período de inatividade e apenas se foste mencionado na tua ausência
         email: Será enviado um e-mail de confirmação
-        header: PNG, GIF ou JPG. Ficheiros no máximo de %{size}. Serão reduzidos para %{dimensions}px
+        header: WEBP, PNG, GIF ou JPG. No máximo %{size}. Será reduzido para %{dimensions}px
         inbox_url: Copie o URL da página inicial do repetidor que quer usar
         irreversible: Publicações filtradas irão desaparecer irremediavelmente, mesmo que o filtro seja removido posteriormente
         locale: O idioma da interface de utilizador, e-mails e notificações push
@@ -77,13 +77,15 @@ pt-PT:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
-        backups_retention_period: Manter os ficheiros gerados pelos utilizadores durante um número concreto de dias.
+        app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão do aplicativo em dispositivos móveis por um ícone personalizado.
+        backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
-        content_cache_retention_period: Publicações de outros servidores serão apagadas decorrido o número de dias especificado, se estiver definido um valor positivo. Isso pode ser irreversível.
+        content_cache_retention_period: Todas as publicações de outros servidores (incluindo boosts e respostas) serão eliminadas após o número de dias especificado, independentemente de qualquer interação do utilizador local com essas publicações. Isto inclui publicações em que um utilizador local as tenha marcado como favoritas ou adicionado aos items salvos. As menções privadas entre utilizadores de instâncias diferentes também se perderão e serão impossíveis de restaurar. A utilização desta definição destina-se a instâncias para fins especiais e quebra muitas expectativas dos utilizadores quando implementada para utilização geral.
         custom_css: Pode aplicar estilos personalizados na versão web do Mastodon.
+        favicon: WEBP, PNG, GIF ou JPG. Substitui o ícone de favorito padrão do Mastodon por um ícone personalizado.
         mascot: Sobrepõe-se à ilustração na interface web avançada.
-        media_cache_retention_period: Os ficheiros de media descarregados serão apagados decorrido o número de dias especificado, quando definido com um valor positivo, e descarregados novamente quando solicitados.
+        media_cache_retention_period: Os ficheiros multimédia de publicações feitas por utilizadores remotos são armazenados em cache no seu servidor. Quando definido para um valor positivo, os ficheiros multimédia serão eliminados após o número de dias especificado. Se os ficheiros multimédia forem solicitados depois de terem sido eliminados, serão transferidos novamente, se o conteúdo de origem ainda estiver disponível. Devido a restrições sobre a frequência com que os cartões de pré-visualização de links pesquisam sites de terceiros, recomenda-se que este valor seja definido para, pelo menos, 14 dias, ou os cartões de pré-visualização de links não serão atualizados a pedido antes desse período.
         peers_api_enabled: Uma lista de nomes de domínio que este servidor encontrou no fediverso. Nenhum dado é incluído aqui sobre se você federa com um determinado servidor, apenas que o seu servidor o conhece. Este serviço é utilizado por serviços que recolhem estatísticas na federação, em termos gerais.
         profile_directory: O diretório de perfis lista todos os utilizadores que optaram por ter a sua conta a ser sugerida a outros.
         require_invite_text: Quando as incrições exigirem aprovação manual, faça o texto "Por que se quer juntar a nós?" da solicitação de convite ser obrigatório, em vez de opcional
@@ -116,6 +118,7 @@ pt-PT:
           sign_up_requires_approval: Novas inscrições requererão a sua aprovação
         severity: Escolha o que acontecerá com as solicitações deste IP
       rule:
+        hint: Opcional. Forneça mais detalhes sobre a regra
         text: Descreva uma regra ou requisito para os utilizadores nesta instância. Tente mantê-la curta e simples
       sessions:
         otp: 'Insira o código de autenticação em duas etapas gerado pelo seu telemóvel ou use um dos seus códigos de recuperação:'
@@ -242,7 +245,7 @@ pt-PT:
         backups_retention_period: Período de retenção de arquivos de utilizador
         bootstrap_timeline_accounts: Recomendar sempre estas contas para novos utilizadores
         closed_registrations_message: Mensagem personalizada quando as inscrições não estiverem disponíveis
-        content_cache_retention_period: Período de retenção de conteúdo em cache
+        content_cache_retention_period: Período de retenção de conteúdos remotos
         custom_css: CSS personalizado
         mascot: Mascote personalizada (legado)
         media_cache_retention_period: Período de retenção de ficheiros de media em cache
@@ -299,6 +302,7 @@ pt-PT:
           patch: Notificar sobre atualizações de correções de problemas
         trending_tag: Uma nova publicação em alta requer avaliação
       rule:
+        hint: Informação Adicional
         text: Regra
       settings:
         indexable: Incluir página de perfil nos motores de busca
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index cade572f38..dfb44c7745 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -23,14 +23,12 @@ ro:
         text: Poți folosi sintaxa de postare. Te rugăm să fii atent la spațiul pe care anunțul îl va ocupa pe ecranul utilizatorului
       defaults:
         autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat
-        avatar: PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
         bot: Acest cont performează în cea mai mare parte acțiuni automate și nu poate fi monitorizat
         context: Contextele în care filtrul trebuie aplicat
         current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
         current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
         digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
         email: Vei primi un e-mail de confirmare
-        header: PNG, GIF sau JPG. Cel mult %{size}. Vor fi redimensionate la %{dimensions}px
         inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi
         irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters
         locale: Limba interfaței de utilizator, e-mailurile si notificările push
@@ -165,5 +163,6 @@ ro:
     'no': Nu
     recommended: Recomandat
     required:
+      mark: "*"
       text: obligatoriu
     'yes': Da
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 2d82a66358..a050b5a529 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -39,14 +39,12 @@ ru:
         text: Вы можете обжаловать замечание только один раз
       defaults:
         autofollow: Люди, пришедшие по этому приглашению, автоматически будут подписаны на вас.
-        avatar: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшен до %{dimensions}px.
         bot: Отметьте, если с этой учётной записи выполняются автоматизированные действия и она может не просматриваться владельцем.
         context: Один или несколько контекстов, к которым должны быть применены фильтры
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
         digest: Если вы долго не заглядывали, отправим вам дайджест событий, которые происходили в период вашего отсутствия.
         email: Вам будет отправлено электронное письмо с подтверждением.
-        header: Поддерживается PNG, GIF и JPG. Максимальный размер — %{size}. Будет уменьшена до %{dimensions}px.
         inbox_url: Копировать URL с главной страницы ретранслятора, который вы хотите использовать
         irreversible: Отфильтрованные посты будут утеряны навсегда, даже если в будущем фильтр будет убран
         locale: Язык интерфейса, e-mail писем и push-уведомлений
@@ -77,13 +75,10 @@ ru:
           warn: Скрыть отфильтрованный контент за предупреждением с указанием названия фильтра
       form_admin_settings:
         activity_api_enabled: Подсчёт количества локальных постов, активных пользователей и новых регистраций на еженедельной основе
-        backups_retention_period: Сохранять сгенерированные пользовательские архивы для указанного количества дней.
         bootstrap_timeline_accounts: Эти аккаунты будут рекомендованы для подписки новым пользователям.
         closed_registrations_message: Отображается, когда регистрация закрыта
-        content_cache_retention_period: Записи с других серверов будут удалены после указанного количества дней, когда установлено положительное значение. Это может быть необратимо.
         custom_css: Вы можете применять пользовательские стили в веб-версии Mastodon.
         mascot: Заменяет иллюстрацию в расширенном веб-интерфейсе.
-        media_cache_retention_period: Скачанные медиа-файлы будут удалены после указанного количества дней, когда установлено положительное значение и повторно загружены по требованию.
         peers_api_enabled: Список доменных имен, с которыми сервер столкнулся в fediverse. Здесь нет данных о том, федерировались ли вы с данным сервером, только что ваш сервер знает об этом. Это используется службами, которые собирают статистику по федерации в общем смысле.
         profile_directory: В каталоге профилей перечислены все пользователи, которые согласились быть доступными для обнаружения.
         require_invite_text: Когда регистрация требует ручного одобрения, сделайте текстовый ввод "Почему вы хотите присоединиться?" обязательным, а не опциональным
@@ -242,7 +237,6 @@ ru:
         backups_retention_period: Период хранения архива пользователя
         bootstrap_timeline_accounts: Всегда рекомендовать эти учетные записи новым пользователям
         closed_registrations_message: Сообщение, когда регистрация недоступна
-        content_cache_retention_period: Период хранения кэша содержимого
         custom_css: Пользовательский CSS
         mascot: Пользовательский маскот (устаревшее)
         media_cache_retention_period: Период хранения кэша медиафайлов
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 5f5d633079..792619e6c7 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -27,14 +27,12 @@ sc:
         text: Podes impreare sintassi in is tuts. Dae cara a su tretu chi s'annùntziu at a pigare in s'ischermu de s'utente
       defaults:
         autofollow: Is persones chi s'ant a registrare pro mèdiu de s'invitu t'ant a sighire in manera automàtica
-        avatar: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
         bot: Sinnala a àtere chi custu contu faghet pro su prus atziones automatizadas e diat pòdere no èssere monitoradu
         context: Unu o prus cuntestos in ue su filtru si diat dèpere aplicare
         current_password: Pro chistiones de seguresa inserta sa crae de intrada de su contu atuale
         current_username: Pro cunfirmare inserta su nòmine utente de su contu atuale
         digest: Imbiadu isceti a pustis de unu perìodu longu de inatividade, e isceti si as retzidu calicunu messàgiu personale cando non bi fias
         email: As a retzire unu messàgiu eletrònicu de cunfirma
-        header: PNG, GIF o JPG. Màssimu %{size}. Ant a èssere iscaladas a %{dimensions}px
         inbox_url: Còpia s'URL dae sa pàgina printzipale de su ripetidore chi boles impreare
         irreversible: Is tuts filtrados ant a isparèssere in manera irreversìbile, fintzas si prus a tardu s'at a bogare su filtru
         locale: S'idioma de s'interfache de s'utente, de is messàgios de posta eletrònica e de is notìficas push
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 85fa66ddc9..f9dc4ba291 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -29,14 +29,12 @@ sco:
         text: Ye kin ainly appeal a strike the wance
       defaults:
         autofollow: Fowk thit signs up throu the invite wull follae ye automatic
-        avatar: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         bot: Signal tae ithers thit the accoont maistly performs automatit actions an mibbie wullnae be monitort
         context: Ae or mair contexts whaur the filter shuid apply
         current_password: Fir security purposes please pit in the passwird o the current accoont
         current_username: Fir tae confirm, please pit in the uisernemm o the current accoont
         digest: Ainly sent efter a lang whilie o inactivity an ainly if ye'v gotten onie personal messages whilst ye wis awa
         email: Ye'll be sent a confirmation email
-        header: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         inbox_url: Copy the URL fae the frontpage o the relay thit ye'r wantin tae uise
         irreversible: Filtert posts wull dizappear irreversibly, even if filter is taen aff efter
         locale: The leid o the uiser interface, emails an push notes
@@ -65,13 +63,10 @@ sco:
           hide: Totally plank the filtert content, ackin as if it didnae exist
           warn: Plank the filtert content ahin a warnin menshiein the filter's title
       form_admin_settings:
-        backups_retention_period: Haud generatit uiser archives fir the specified nummer o days.
         bootstrap_timeline_accounts: Thir accoonts wull get preenit tae the tap o new uisers' follae recommendations.
         closed_registrations_message: Displayit whan sign-ups is shut
-        content_cache_retention_period: Posts fae ither servers wull get deletit efter the specified nummer o days whan set tae a positive value. This wull mibbie be irreversible.
         custom_css: Ye kin pit custom styles on tae the web version o Mastodon.
         mascot: Owerrides the illustration in the advanced web interface.
-        media_cache_retention_period: Doonloadit media files wull be deletit efter the specified nummer o days whan set tae a positive value, an re-doonloadit on demand.
         profile_directory: The profile directory lists aw uisers thit hae opted-in fir tae be discoverable.
         require_invite_text: Whan sign-ups require approval bi haun, mak the “Hou dae ye want tae jyne?” text input mandatory raither nor optional
         site_contact_email: Hou fowk kin reach ye fir legal or support inquiries.
@@ -218,7 +213,6 @@ sco:
         backups_retention_period: Uiser archive retention period
         bootstrap_timeline_accounts: Aye recommend thir accoonts tae new uisers
         closed_registrations_message: Custom message whan sign-ups urnae available
-        content_cache_retention_period: Content cache retention period
         custom_css: Custom CSS
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index ededa85bcc..eb41d263bc 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -27,14 +27,12 @@ si:
         text: ඔබට වර්ජනයකට අභියාචනා කළ හැක්කේ එක් වරක් පමණි
       defaults:
         autofollow: ආරාධනාව හරහා ලියාපදිංචි වන පුද්ගලයින් ස්වයංක්‍රීයව ඔබව අනුගමනය කරනු ඇත
-        avatar: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
         bot: ගිණුම ප්‍රධාන වශයෙන් ස්වයංක්‍රීය ක්‍රියා සිදු කරන බවත් නිරීක්ෂණය නොකළ හැකි බවත් අන් අයට සංඥා කරන්න
         context: පෙරහන යෙදිය යුතු සන්දර්භ එකක් හෝ කිහිපයක්
         current_password: ආරක්ෂක අරමුණු සඳහා කරුණාකර ජංගම ගිණුමේ මුරපදය ඇතුළත් කරන්න
         current_username: තහවුරු කිරීමට, කරුණාකර වත්මන් ගිණුමේ පරිශීලක නාමය ඇතුළත් කරන්න
         digest: දිගු කාලයක් අක්‍රියව සිටීමෙන් පසුව පමණක් යවන ලද අතර ඔබ නොමැති විට ඔබට කිසියම් පුද්ගලික පණිවිඩයක් ලැබී ඇත්නම් පමණි
         email: ඔබට තහවුරු කිරීමේ විද්‍යුත් තැපෑලක් එවනු ලැබේ
-        header: PNG, GIF හෝ JPG. වැඩිම %{size}. %{dimensions}px දක්වා අඩු කරනු ඇත
         inbox_url: ඔබට භාවිතා කිරීමට අවශ්‍ය රිලේ හි මුල් පිටුවෙන් URL එක පිටපත් කරන්න
         irreversible: පෙරහන පසුව ඉවත් කළ ද, පෙරූ ලිපි අප්‍රතිවර්ත්‍යව අතුරුදහන් වනු ඇත
         locale: වි-තැපැල්, තල්ලු දැනුම්දීම් සහ පරිශ්‍රීලක අතුරුමුහුණතේ භාෂාව
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index e13a05835f..71bd25d6df 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -16,14 +16,14 @@ sk:
         warning_preset_id: Voliteľné. Stále môžeš vložiť vlastný text na samý koniec predlohy
       defaults:
         autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď následovať
-        avatar: PNG, GIF alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
+        avatar: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný
         context: Jedno, alebo viac kritérií, v ktorých má byť filtrovanie uplatnené
         current_password: Z bezpečtnostných dôvodov prosím zadaj heslo súčasného účtu
         current_username: Pre potvrdenie prosím zadaj prezývku súčasného účtu
         digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdržal/a nejaké osobné správy kým si bol/a preč
         email: Bude ti odoslaný potvrdzujúci email
-        header: PNG, GIF, alebo JPG. Maximálne %{size}. Bude zmenšený na %{dimensions}px
+        header: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         inbox_url: Skopíruj adresu z hlavnej stránky mostíka, ktorý chceš používať
         irreversible: Vytriedené príspevky zmiznú nenávratne, aj keď triedenie neskôr zrušíš
         locale: Jazyk užívateľského rozhrania, emailových, a nástenkových oboznámení
@@ -60,6 +60,7 @@ sk:
         fields:
           name: Označenie
           value: Obsah
+        unlocked: Automaticky prijímaj nových nasledovateľov
       account_alias:
         acct: Adresa starého účtu
       account_migration:
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index ef345f78c3..a4abb737c0 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -39,14 +39,14 @@ sl:
         text: Na ukrep se lahko pritožite le enkrat
       defaults:
         autofollow: Osebe, ki se prijavijo prek povabila, vas bodo samodejno sledile
-        avatar: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
+        avatar: WEBP, PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions} sl. točk
         bot: Ta račun v glavnem opravlja samodejna dejanja in morda ni pod nadzorom
         context: En ali več kontekstov, kjer naj se uporabi filter
         current_password: Iz varnostnih razlogov vnesite geslo trenutnega računa
         current_username: Za potrditev vnesite uporabniško ime trenutnega računa
         digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti
         email: Poslali vam bomo potrditveno e-pošto
-        header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
+        header: WEBP, PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions} sl. točk
         inbox_url: Kopirajte URL naslov s prve strani releja, ki ga želite uporabiti
         irreversible: Filtrirane objave bodo nepovratno izginile, tudi če je filter kasneje odstranjen
         locale: Jezik uporabniškega vmesnika, e-poštnih sporočil in potisnih obvestil
@@ -77,13 +77,10 @@ sl:
           warn: Skrij filtrirano vsebino za opozorilom, ki pomenja naslov filtra
       form_admin_settings:
         activity_api_enabled: Številke krajevno objavljenih objav, dejavnih uporabnikov in novih registracij na tedenskih seznamih
-        backups_retention_period: Hani tvorjene arhive uporabnikov navedeno število dni.
         bootstrap_timeline_accounts: Ti računi bodo pripeti na vrh priporočenih sledenj za nove uporabnike.
         closed_registrations_message: Prikazano, ko so registracije zaprte
-        content_cache_retention_period: Objave z drugih strežnikov bodo izbrisane po navedenem številu dni, če je vrednost pozitivna. Ta dejanja lahko nepovratna.
         custom_css: Spletni različici Mastodona lahko uveljavite sloge po meri.
         mascot: Preglasi ilustracijo v naprednem spletnem vmesniku.
-        media_cache_retention_period: Prenesene predstavnostne datoteke bodo izbrisane po navedenem številu dni, če je vrednost pozitivna, in ponovno prenesene na zahtevo.
         peers_api_enabled: Seznam imen domen, na katere je ta strežnik naletel v fediverzumu. Sem niso vključeni podatki o tem, ali ste v federaciji z danim strežnikom, zgolj to, ali vaš strežnik ve zanj. To uporabljajo storitve, ki zbirajo statistične podatke o federaciji v splošnem smislu.
         profile_directory: Imenik profilov izpiše vse uporabnike, ki so dovolili, da so v njem navedeni.
         require_invite_text: Če registracije zahtevajo ročno potrditev, nastavite vnos besedila pod »Zakaj se želite pridružiti?« za obveznega.
@@ -116,6 +113,7 @@ sl:
           sign_up_requires_approval: Za nove registracije bo potrebna vaša odobritev
         severity: Izberite, kaj se bo zgodilo z zahtevami iz tega IP-naslova
       rule:
+        hint: Neobvezno. Vnesite dodatne podrobnosti o pravilu
         text: Opišite pravilo ali zahtevo za uporabnike na tem strežniku. Poskusite biti kratki in jasni
       sessions:
         otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaših obnovitvenih kod:'
@@ -242,7 +240,6 @@ sl:
         backups_retention_period: Obdobje hrambe arhivov uporabnikov
         bootstrap_timeline_accounts: Vedno priporočaj te račune novim uporabnikom
         closed_registrations_message: Sporočilo po meri, ko registracije niso na voljo
-        content_cache_retention_period: Obdobje hrambe predpomnilnika vsebine
         custom_css: CSS po meri
         mascot: Maskota po meri (opuščeno)
         media_cache_retention_period: Obdobje hrambe predpomnilnika predstavnosti
@@ -299,6 +296,7 @@ sl:
           patch: Obveščaj o posodobitvah z odpravljenimi hrošči
         trending_tag: Nov trend zahteva pregled
       rule:
+        hint: Dodatne informacije
         text: Pravilo
       settings:
         indexable: V iskalnike vključi stran profila
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index dc07478070..c3c3920962 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -39,14 +39,14 @@ sq:
         text: Një paralajmërim mund ta apeloni vetëm një herë
       defaults:
         autofollow: Personat që regjistrohen përmes ftesës do t’ju ndjekin vetvetiu
-        avatar: PNG, GIF ose JPG. Maksimumi %{size}. Do të zvogëlohen në %{dimensions}px
+        avatar: WEBP, PNG, GIF ose JPG. E shumta %{size}. Do të zvogëlohet në %{dimensions}px
         bot: Kjo llogari kryesisht bën veprime të automatizuara dhe mund të mos mbikëqyret dot
         context: Një ose disa kontekste kur duhet të zbatohet filtri
         current_password: Për qëllime sigurie, ju lutemi, jepni fjalëkalimin e llogarisë së tanishme
         current_username: Që ta ripohoni, ju lutemi, jepni emrin e përdoruesit të llogarisë së tanishme
         digest: I dërguar vetëm pas një periudhe të gjatë pasiviteti dhe vetëm nëse keni marrë ndonjë mesazh personal gjatë mungesës tuaj
         email: Do t’ju dërgohet një email ripohimi
-        header: PNG, GIF ose JPG. E shumta %{size}. Do të ripërmasohet në %{dimensions}px
+        header: WEBP, PNG, GIF ose JPG. E shumta %{size}. Do të zvogëlohet në %{dimensions}px
         inbox_url: Kopjoni URL-në prej faqes ballore të relesë që doni të përdorni
         irreversible: Mesazhet e filtruar do të zhduken në mënyrë të pakthyeshme, edhe nëse filtri hiqet më vonë
         locale: Gjuha e ndërfaqes së përdoruesit, email-eve dhe njoftimeve <em>push</em>
@@ -77,13 +77,15 @@ sq:
           warn: Fshihe lëndën e filtruar pas një sinjalizimi që përmend titullin e filtrit
       form_admin_settings:
         activity_api_enabled: Numër postimesh të botuar lokalisht, përdoruesish aktiv dhe regjistrimesh të reja sipas matjesh javore
-        backups_retention_period: Mbaji arkivat e prodhuara të përdoruesve për aq ditë sa numri i dhënë.
+        app_icon: WEBP, PNG, GIF, ose JPG. Anashkalon ikonë parazgjedhje aplikacioni në pajisje celulare me një ikonë vetjake.
+        backups_retention_period: Përdorues kanë aftësinë të prodhojnë arkiva të postimeve të tyre për t’i shkarkuar më vonë. Kur i jepet një vlerë pozitive, këto arkiva do të fshihen automatikisht prej depozitës tuaj pas numrit të dhënë të ditëve.
         bootstrap_timeline_accounts: Këto llogari do të fiksohen në krye të rekomandimeve për ndjekje nga përdorues të rinj.
         closed_registrations_message: Shfaqur kur mbyllen dritare regjistrimesh
-        content_cache_retention_period: Postimet prej shërbyesve të tjerë do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive. Kjo mund të jetë e pakthyeshme.
+        content_cache_retention_period: Krejt postimet prej shërbyesve të tjerë (përfshi përforcime dhe përgjigje) do të fshihen pas numrit të caktuar të ditëve, pa marrë parasysh çfarëdo ndërveprimi përdoruesi me këto postime. Kjo përfshin postime kur një përdorues vendor u ka vënë shenjë si faqerojtës, ose të parapëlqyer. Do të humbin gjithashtu dhe përmendje private mes përdoruesish nga instanca të ndryshme dhe s’do të jetë e mundshme të rikthehen. Përdorimi i këtij rregullimi është menduar për instanca me qëllim të caktuar dhe ndërhyn në çka presin mjaft përdorues, kur sendërtohet për përdorim të përgjithshëm.
         custom_css: Stile vetjakë mund të aplikoni në versionin web të Mastodon-it.
+        favicon: WEBP, PNG, GIF, ose JPG. Anashkalon favikonën parazgjedhje Mastodon me një ikonë vetjake.
         mascot: Anashkalon ilustrimin te ndërfaqja web e thelluar.
-        media_cache_retention_period: Kartelat media të shkarkuara do të fshihen pas numrit të dhënë të ditëve, kur këtij i jepet një vlerë pozitive dhe rishkarkohen po u kërkua.
+        media_cache_retention_period: Kartela media nga postime të bëra nga përdorues të largët ruhen në një fshehtinë në shërbyesin tuaj. Kur i jepet një vlerë pozitive, media do të fshihet pas numrit të dhënë të ditëve. Nëse të dhënat e medias duhen pas fshirjes, do të rishkarkohen, nëse lënda burim mund të kihet ende. Për shkak kufizimesh mbi sa shpesh skeda paraparjesh lidhjesh ndërveprojnë me sajte palësh të treta, rekomandohet të vihet kjo vlerë të paktën 14 ditë, ose skedat e paraparjes së lidhje s’do të përditësohen duke e kërkuar para asaj kohe.
         peers_api_enabled: Një listë emrash përkatësish që ky shërbyes ka hasur në fedivers. Këtu s’jepen të dhëna nëse jeni i federuar me shërbyesin e dhënë, thjesht tregohet se shërbyesi juaj e njeh. Kjo përdoret nga shërbime që mbledhin statistika mbi federimin në kuptimin e përgjithshëm.
         profile_directory: Drejtoria e profileve paraqet krejt përdoruesit që kanë zgjedhur të jenë të zbulueshëm.
         require_invite_text: Kur regjistrimet lypin miratim dorazi, bëje tekstin “Përse doni të bëheni pjesë?” të detyrueshëm, në vend se opsional
@@ -116,6 +118,7 @@ sq:
           sign_up_requires_approval: Regjistrime të reja do të duan miratimin tuaj
         severity: Zgjidhni ç’do të ndodhë me kërkesa nga kjo IP
       rule:
+        hint: Opsionale. Jepni më tepër hollësi rreth këtij rregulli
         text: Përshkruani një rregull ose një domosdoshmëri për përdoruesit në këtë shërbyes. Përpiquni të jetë i shkurtër dhe i thjeshtë
       sessions:
         otp: 'Jepni kodin dyfaktorësh të prodhuar nga aplikacioni i telefonit tuaj ose përdorni një nga kodet tuaj të rikthimeve:'
@@ -242,7 +245,7 @@ sq:
         backups_retention_period: Periudhë mbajtjeje arkivash përdoruesish
         bootstrap_timeline_accounts: Rekomandoju përherë këto llogari përdoruesve të rinj
         closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja
-        content_cache_retention_period: Periudhë mbajtjeje lënde fshehtine
+        content_cache_retention_period: Periudhë mbajtjeje lënde të largët
         custom_css: CSS Vetjake
         mascot: Simbol vetjak (e dikurshme)
         media_cache_retention_period: Periudhë mbajtjeje lënde media
@@ -299,6 +302,7 @@ sq:
           patch: Njofto për ndreqje të metash
         trending_tag: Për gjëra të reja në modë lypset shqyrtim
       rule:
+        hint: Informacion shtesë
         text: Rregull
       settings:
         indexable: Përfshi faqe profili në motorë kërkimesh
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 6405ee338a..8dd1986563 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -39,14 +39,14 @@ sr-Latn:
         text: Možete podneti samo jednu žalbu na upisan prestup
       defaults:
         autofollow: Osobe koje se prijave kroz pozivnice će vas automatski zapratiti
-        avatar: PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
+        avatar: WEBP, PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         bot: Daje drugima do znanja da ovaj nalog uglavnom vrši automatizovane radnje i možda se ne nadgleda
         context: Jedan ili više konteksta u kojima treba da se primeni filter
         current_password: Iz bezbednosnih razloga molimo Vas unesite lozinku trenutnog naloga
         current_username: Da biste potvrdili, Molimo Vas unesite korisničko ime trenutno aktivnog naloga
         digest: Šalje se samo posle dužeg perioda neaktivnosti i samo u slučaju da ste primili jednu ili više ličnih poruka tokom Vašeg odsustva
         email: Biće Vam poslat mejl sa potvrdom
-        header: PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
+        header: WEBP, PNG, GIF ili JPG. Najviše %{size}. Biće smanjeno na %{dimensions}px
         inbox_url: Kopirajte URL sa naslovne strane releja koji želite koristiti
         irreversible: Filtrirane obajve će nestati nepovratno, čak i ako je filter kasnije uklonjen
         locale: Jezik korisničkog okruženja, e-pošte i mobilnih obaveštenja
@@ -77,13 +77,15 @@ sr-Latn:
           warn: Sakrij filtrirani sadržaj iza upozorenja u kome se navodi naziv filtera
       form_admin_settings:
         activity_api_enabled: Brojevi lokalno postavljenih objava, aktivnih korisnika i novih registracija na nedeljnoj bazi
-        backups_retention_period: Čuvaj generisane korisničke arhive navedeni broj dana.
+        app_icon: WEBP, PNG, GIF ili JPG. Zamenjuje podrazumevanu ikonicu aplikacije na mobilnim uređajima prilagođenom ikonicom.
+        backups_retention_period: Korisnici imaju mogućnost da generišu arhive svojih objava za kasnije preuzimanje. Kada se podese na pozitivnu vrednost, ove arhive će se automatski izbrisati iz vašeg skladišta nakon navedenog broja dana.
         bootstrap_timeline_accounts: Ovi nalozi će biti zakačeni na vrh preporuka za praćenje novih korisnika.
         closed_registrations_message: Prikazuje se kada su registracije zatvorene
-        content_cache_retention_period: Sve objave i podržavanja sa drugih servera će biti izbrisani nakon navedenog broja dana. Neke objave se možda neće moći oporaviti. Svi povezani obeleživači, omiljeni i podržavanja će takođe biti izgubljeni i nemoguće je opozvati radnju.
+        content_cache_retention_period: Sve objave sa drugih servera (uključujući podržavanja i odgovore) će biti izbrisane nakon navedenog broja dana, bez obzira na bilo kakvu interakciju lokalnog korisnika sa tim objavama. Ovo uključuje objave u kojima ih je lokalni korisnik označio kao obeleživače ili omiljene. Privatna pominjanja između korisnika sa različitih instanci će takođe biti izgubljena i nemoguće ih je vratiti. Korišćenje ove postavke je namenjeno za slučajeve posebne namene i krši mnoga očekivanja korisnika kada se primeni za upotrebu opšte namene.
         custom_css: Možete da primenite prilagođene stilove na veb verziji Mastodon-a.
+        favicon: WEBP, PNG, GIF ili JPG. Zamenjuje podrazumevani Mastodon favikon prilagođenom ikonicom.
         mascot: Zamenjuje ilustraciju u naprednom veb okruženju.
-        media_cache_retention_period: Kada se postavi na pozitivnu vrednost, preuzete medijske datoteke će biti izbrisane nakon navedenog broja dana, i ponovo preuzete na zahtev.
+        media_cache_retention_period: Medijske datoteke iz objava udaljenih korisnika se keširaju na vašem serveru. Kada se podesi na pozitivnu vrednost, mediji će biti izbrisani nakon navedenog broja dana. Ako se medijski podaci zahtevaju nakon brisanja, biće ponovo preuzeti, ako je izvorni sadržaj i dalje dostupan. Zbog ograničenja koliko često kartice za pregled veza anketiraju sajtove trećih strana, preporučuje se da ovu vrednost postavite na najmanje 14 dana, inače kartice za pregled veza neće biti ažurirane na zahtev pre tog vremena.
         peers_api_enabled: Lista domena sa kojima se ovaj server susreo u fediverzumu. Ovde nisu sadržani podaci o tome da li se Vaš server federiše sa drugim serverima, već samo da Vaš server zna za njih. Ove informacije koriste servisi koji prikupljaju podatke i vode statistiku o federaciji u širem smislu.
         profile_directory: Direktorijum profila navodi sve korisnike koji su se opredelili da budu vidljivi.
         require_invite_text: Kada registracije zahtevaju ručno odobrenje, postavite da odgovor na „Zašto želite da se pridružite?“ bude obavezan, a ne opcionalan
@@ -116,6 +118,7 @@ sr-Latn:
           sign_up_requires_approval: Nove registracije će zahtevati Vaše odobrenje
         severity: Izaberite šta će se desiti sa zahtevima sa ove IP adrese
       rule:
+        hint: Opcionalno. Pružite više detalja o pravilu
         text: Opišite pravilo ili uslov za korisnike na ovom serveru. Potrudite se da opis bude kratak i jednostavan
       sessions:
         otp: 'Unesite dvofaktorski kod sa Vašeg telefona ili koristite jedan od kodova za oporavak:'
@@ -192,7 +195,7 @@ sr-Latn:
         honeypot: "%{label} (ne popunjavaj)"
         inbox_url: URL od relejnog prijemnog sandučeta
         irreversible: Ispustiti umesto sakriti
-        locale: Jezik
+        locale: Jezik okruženja
         max_uses: Maksimalni broj korišćenja
         new_password: Nova lozinka
         note: Biografija
@@ -242,7 +245,7 @@ sr-Latn:
         backups_retention_period: Period čuvanja korisničke arhive
         bootstrap_timeline_accounts: Uvek preporuči ove naloge novim korisnicima
         closed_registrations_message: Prilagođena poruka kada prijave nisu moguće
-        content_cache_retention_period: Period čuvanja keša sadržaja
+        content_cache_retention_period: Period zadržavanja udaljenog sadržaja
         custom_css: Prilagođeni CSS
         mascot: Prilagođena maskota (nasleđe)
         media_cache_retention_period: Period čuvanja keša medija
@@ -299,6 +302,7 @@ sr-Latn:
           patch: Obavesti o ispravkama grešaka
         trending_tag: Novi trend treba pregledati
       rule:
+        hint: Dodatne informacije
         text: Pravilo
       settings:
         indexable: Uključi stranicu profila u pretraživače
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index da1ac81233..e88a99df13 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -39,14 +39,14 @@ sr:
         text: Можете поднети само једну жалбу на уписан преступ
       defaults:
         autofollow: Особе које се пријаве кроз позивнице ће вас аутоматски запратити
-        avatar: PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
+        avatar: WEBP, PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         bot: Даје другима до знања да овај налог углавном врши аутоматизоване радње и можда се не надгледа
         context: Један или више контекста у којима треба да се примени филтер
         current_password: Из безбедносних разлога молимо Вас унесите лозинку тренутног налога
         current_username: Да бисте потврдили, Молимо Вас унесите корисничко име тренутно активног налога
         digest: Шаље се само после дужег периода неактивности и само у случају да сте примили једну или више личних порука током Вашег одсуства
         email: Биће Вам послат мејл са потврдом
-        header: PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
+        header: WEBP, PNG, GIF или JPG. Највише %{size}. Биће смањено на %{dimensions}px
         inbox_url: Копирајте URL са насловне стране релеја који желите користити
         irreversible: Филтриранe обајве ће нестати неповратно, чак и ако је филтер касније уклоњен
         locale: Језик корисничког окружења, е-поште и мобилних обавештења
@@ -77,13 +77,15 @@ sr:
           warn: Сакриј филтрирани садржај иза упозорења у коме се наводи назив филтера
       form_admin_settings:
         activity_api_enabled: Бројеви локално постављених објава, активних корисника и нових регистрација на недељној бази
-        backups_retention_period: Чувај генерисане корисничке архиве наведени број дана.
+        app_icon: WEBP, PNG, GIF или JPG. Замењује подразумевану иконицу апликације на мобилним уређајима прилагођеном иконицом.
+        backups_retention_period: Корисници имају могућност да генеришу архиве својих објава за касније преузимање. Када се подесе на позитивну вредност, ове архиве ће се аутоматски избрисати из вашег складишта након наведеног броја дана.
         bootstrap_timeline_accounts: Ови налози ће бити закачени на врх препорука за праћење нових корисника.
         closed_registrations_message: Приказује се када су регистрације затворене
-        content_cache_retention_period: Све објаве и подржавања са других сервера ће бити избрисани након наведеног броја дана. Неке објаве се можда неће моћи опоравити. Сви повезани обележивачи, омиљени и подржавања ће такође бити изгубљени и немогуће је опозвати радњу.
+        content_cache_retention_period: Све објаве са других сервера (укључујући подржавања и одговоре) ће бити избрисане након наведеног броја дана, без обзира на било какву интеракцију локалног корисника са тим објавама. Ово укључује објаве у којима их је локални корисник означио као обележиваче или омиљене. Приватна помињања између корисника са различитих инстанци ће такође бити изгубљена и немогуће их је вратити. Коришћење ове поставке је намењено за случајеве посебне намене и крши многа очекивања корисника када се примени за употребу опште намене.
         custom_css: Можете да примените прилагођене стилове на веб верзији Mastodon-а.
+        favicon: WEBP, PNG, GIF или JPG. Замењује подразумевани Mastodon фавикон прилагођеном иконицом.
         mascot: Замењује илустрацију у напредном веб окружењу.
-        media_cache_retention_period: Када се постави на позитивну вредност, преузете медијске датотеке ће бити избрисане након наведеног броја дана, и поново преузете на захтев.
+        media_cache_retention_period: Медијске датотеке из објава удаљених корисника се кеширају на вашем серверу. Када се подеси на позитивну вредност, медији ће бити избрисани након наведеног броја дана. Ако се медијски подаци захтевају након брисања, биће поново преузети, ако је изворни садржај и даље доступан. Због ограничења колико често картице за преглед веза анкетирају сајтове трећих страна, препоручује се да ову вредност поставите на најмање 14 дана, иначе картице за преглед веза неће бити ажуриране на захтев пре тог времена.
         peers_api_enabled: Листа домена са којима се овај сервер сусрео у федиверзуму. Овде нису садржани подаци о томе да ли се Ваш сервер федерише са другим серверима, већ само да Ваш сервер зна за њих. Ове информације користе сервиси који прикупљају податке и воде статистику о федерацији у ширем смислу.
         profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
         require_invite_text: Када регистрације захтевају ручно одобрење, поставите да одговор на „Зашто желите да се придружите?“ буде обавезан, а не опционалан
@@ -116,6 +118,7 @@ sr:
           sign_up_requires_approval: Нове регистрације ће захтевати Ваше одобрење
         severity: Изаберите шта ће се десити са захтевима са ове IP адресе
       rule:
+        hint: Опционално. Пружите више детаља о правилу
         text: Опишите правило или услов за кориснике на овом серверу. Потрудите се да опис буде кратак и једноставан
       sessions:
         otp: 'Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак:'
@@ -192,7 +195,7 @@ sr:
         honeypot: "%{label} (не попуњавај)"
         inbox_url: URL од релејног пријемног сандучета
         irreversible: Испустити уместо сакрити
-        locale: Језик
+        locale: Језик окружења
         max_uses: Максимални број коришћења
         new_password: Нова лозинка
         note: Биографија
@@ -242,7 +245,7 @@ sr:
         backups_retention_period: Период чувања корисничке архиве
         bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
         closed_registrations_message: Прилагођена порука када пријаве нису могуће
-        content_cache_retention_period: Период чувања кеша садржаја
+        content_cache_retention_period: Период задржавања удаљеног садржаја
         custom_css: Прилагођени CSS
         mascot: Прилагођена маскота (наслеђе)
         media_cache_retention_period: Период чувања кеша медија
@@ -299,6 +302,7 @@ sr:
           patch: Обавести о исправкама грешака
         trending_tag: Нови тренд треба прегледати
       rule:
+        hint: Додатне информације
         text: Правило
       settings:
         indexable: Укључи страницу профила у претраживаче
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index b01436b415..5e5c6f9549 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -39,14 +39,14 @@ sv:
         text: Du kan endast överklaga en varning en gång
       defaults:
         autofollow: Användarkonton som skapas genom din inbjudan kommer automatiskt följa dig
-        avatar: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
+        avatar: WEBP, PNG, GIF eller JPG. Högst %{size}. Kommer nedskalas till %{dimensions} pixlar
         bot: Detta konto utför huvudsakligen automatiserade åtgärder och kanske inte övervakas
         context: Ett eller fler sammanhang där filtret ska tillämpas
         current_password: Av säkerhetsskäl krävs lösenordet till det nuvarande kontot
         current_username: Ange det nuvarande kontots användarnamn för att bekräfta
         digest: Skickas endast efter en lång period av inaktivitet och endast om du har fått några personliga meddelanden i din frånvaro
         email: Du kommer att få ett bekräftelsemeddelande via e-post
-        header: PNG, GIF eller JPG. Högst %{size}. Kommer att skalas ner till %{dimensions}px
+        header: WEBP, PNG, GIF eller JPG. Högst %{size}. Kommer nedskalas till %{dimensions} pixlar
         inbox_url: Kopiera webbadressen från hemsidan av det ombud du vill använda
         irreversible: Filtrerade inlägg kommer att försvinna oåterkalleligt, även om filter tas bort senare
         locale: Språket för användargränssnittet, e-postmeddelanden och push-aviseringar
@@ -77,13 +77,13 @@ sv:
           warn: Dölj det filtrerade innehållet bakom en varning som visar filtrets rubrik
       form_admin_settings:
         activity_api_enabled: Antalet lokalt publicerade inlägg, aktiva användare och nya registrerade konton per vecka
-        backups_retention_period: Behåll genererade användararkiv i det angivna antalet dagar.
+        backups_retention_period: Användare har möjlighet att generera arkiv av sina inlägg för att ladda ned senare. När det sätts till ett positivt värde raderas dessa arkiv automatiskt från din lagring efter det angivna antalet dagar.
         bootstrap_timeline_accounts: Dessa konton kommer fästas högst upp i nya användares följrekommendationer.
         closed_registrations_message: Visas när nyregistreringar är avstängda
-        content_cache_retention_period: Inlägg från andra servrar kommer att raderas efter det angivna antalet dagar när detta är inställt på ett positivt värde. Åtgärden kan vara oåterkallelig.
+        content_cache_retention_period: Alla inlägg från andra servrar (inklusive booster och svar) kommer att raderas efter det angivna antalet dagar, utan hänsyn till någon lokal användarinteraktion med dessa inlägg. Detta inkluderar inlägg där en lokal användare har markerat det som bokmärke eller favoriter. Privata omnämnanden mellan användare från olika instanser kommer också att gå förlorade och blir omöjliga att återställa. Användningen av denna inställning är avsedd för specialfall och bryter många användarförväntningar när de implementeras för allmänt bruk.
         custom_css: Du kan använda anpassade stilar på webbversionen av Mastodon.
         mascot: Åsidosätter illustrationen i det avancerade webbgränssnittet.
-        media_cache_retention_period: Nedladdade mediefiler kommer raderas efter det angivna antalet dagar, om inställt till ett positivt värde, och laddas ned på nytt vid behov.
+        media_cache_retention_period: Mediafiler från inlägg som gjorts av fjärranvändare cachas på din server. När inställd på ett positivt värde kommer media att raderas efter det angivna antalet dagar. Om mediadatat begärs efter att det har raderats, kommer det att laddas ned igen om källinnehållet fortfarande är tillgängligt. På grund av begränsningar för hur ofta förhandsgranskningskort för länkar hämtas från tredjepartswebbplatser, rekommenderas det att ange detta värde till minst 14 dagar, annars kommer förhandsgranskningskorten inte att uppdateras på begäran före den tiden.
         peers_api_enabled: En lista över domänen den här servern har stött på i fediversum. Ingen data inkluderas om du har federerat med servern, bara att din server känner till den. Detta används av tjänster som samlar statistik om federering i allmänhet.
         profile_directory: Profilkatalogen visar alla användare som har samtyckt till att bli upptäckbara.
         require_invite_text: Gör fältet "Varför vill du gå med?" obligatoriskt när nyregistreringar kräver manuellt godkännande
@@ -116,6 +116,7 @@ sv:
           sign_up_requires_approval: Nya registreringar kräver ditt godkännande
         severity: Välj vad som ska hända med förfrågningar från denna IP
       rule:
+        hint: Valfritt. Ange mer information om regeln
         text: Beskriv en regel eller ett krav för användare av denna server. Försök hålla det kort och koncist
       sessions:
         otp: 'Ange tvåfaktorskoden som genererades av din telefonapp, eller använd någon av dina återställningskoder:'
@@ -242,7 +243,7 @@ sv:
         backups_retention_period: Lagringsperiod för användararkivet
         bootstrap_timeline_accounts: Rekommendera alltid dessa konton till nya användare
         closed_registrations_message: Anpassat meddelande när nyregistreringar inte är tillgängliga
-        content_cache_retention_period: Tid för bibehållande av innehållscache
+        content_cache_retention_period: Förvaringsperiod för fjärrinnehåll
         custom_css: Anpassad CSS
         mascot: Anpassad maskot (tekniskt arv)
         media_cache_retention_period: Tid för bibehållande av mediecache
@@ -299,6 +300,7 @@ sv:
           patch: Meddela vid buggfix-uppdateringar
         trending_tag: En ny trend kräver granskning
       rule:
+        hint: Ytterligare information
         text: Regel
       settings:
         indexable: Inkludera profilsidan i sökmotorer
diff --git a/config/locales/simple_form.ta.yml b/config/locales/simple_form.ta.yml
index a3819e5eb5..fcf031f90e 100644
--- a/config/locales/simple_form.ta.yml
+++ b/config/locales/simple_form.ta.yml
@@ -17,7 +17,6 @@ ta:
         starts_at: கட்டாயமில்லை. உங்கள் அறிவிப்பு ஒரு குறிப்பிட்ட நேரத்தில் வெளியாக வேண்டுமெனில் மட்டும்
       defaults:
         autofollow: அழைப்பின் வாயிலாக புதிய கணக்கை துவங்குவோர் தாமாகவே உங்களை பின்தொடர்வர்
-        avatar: PNG, GIF or JPG. அதிகபட்சம் %{size}, %{dimensions}px க்கு குறைக்கப்படும்
         bot: இந்த கணக்கு முக்கியமாக தானியங்கு செயல்களைச் செய்கிறது மற்றும் கண்காணிக்கப்படாமல் போகலாம்
         current_password: பாதுகாப்பு காரணங்களுக்காக, தங்களின் தற்போதைய கணக்கின் கடவுச்சொல்லை உள்ளீடு செய்க
         current_username: உறுதிசெய்ய, தற்போதைய கணக்கின் பயனர் பெயரை உள்ளிடுக
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index c388001888..0816efcc5f 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -18,7 +18,7 @@ th:
         text: คุณสามารถใช้ไวยากรณ์โพสต์ เช่น URL, แฮชแท็ก และการกล่าวถึง
         title: ไม่จำเป็น ไม่ปรากฏแก่ผู้รับ
       admin_account_action:
-        include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการควบคุมหรือคำเตือน
+        include_statuses: ผู้ใช้จะเห็นว่าโพสต์ใดก่อให้เกิดการกระทำการกลั่นกรองหรือคำเตือน
         send_email_notification: ผู้ใช้จะได้รับคำอธิบายว่าเกิดอะไรขึ้นกับบัญชีของเขา
         text_html: ไม่จำเป็น คุณสามารถใช้ไวยากรณ์โพสต์ คุณสามารถ <a href="%{path}">เพิ่มคำเตือนที่ตั้งไว้ล่วงหน้า</a> เพื่อประหยัดเวลา
         type_html: เลือกสิ่งที่จะทำกับ <strong>%{acct}</strong>
@@ -39,14 +39,14 @@ th:
         text: คุณสามารถอุทธรณ์การดำเนินการได้เพียงครั้งเดียวเท่านั้น
       defaults:
         autofollow: ผู้คนที่ลงทะเบียนผ่านคำเชิญจะติดตามคุณโดยอัตโนมัติ
-        avatar: PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
+        avatar: WEBP, PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
         bot: ส่งสัญญาณให้ผู้อื่นว่าบัญชีทำการกระทำแบบอัตโนมัติเป็นหลักและอาจไม่ได้รับการสังเกตการณ์
         context: หนึ่งหรือหลายบริบทที่ตัวกรองควรนำไปใช้
         current_password: เพื่อวัตถุประสงค์ด้านความปลอดภัย โปรดป้อนรหัสผ่านของบัญชีปัจจุบัน
         current_username: เพื่อยืนยัน โปรดป้อนชื่อผู้ใช้ของบัญชีปัจจุบัน
         digest: ส่งเฉพาะหลังจากไม่มีการใช้งานเป็นเวลานานและในกรณีที่คุณได้รับข้อความส่วนบุคคลใด ๆ เมื่อคุณไม่อยู่เท่านั้น
         email: คุณจะได้รับอีเมลการยืนยัน
-        header: PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
+        header: WEBP, PNG, GIF หรือ JPG สูงสุด %{size} จะได้รับการย่อขนาดเป็น %{dimensions}px
         inbox_url: คัดลอก URL จากหน้าแรกของรีเลย์ที่คุณต้องการใช้
         irreversible: โพสต์ที่กรองอยู่จะหายไปอย่างถาวร แม้ว่าจะเอาตัวกรองออกในภายหลังก็ตาม
         locale: ภาษาของส่วนติดต่อผู้ใช้, อีเมล และการแจ้งเตือนแบบผลัก
@@ -77,16 +77,18 @@ th:
           warn: ซ่อนเนื้อหาที่กรองอยู่หลังคำเตือนที่กล่าวถึงชื่อเรื่องของตัวกรอง
       form_admin_settings:
         activity_api_enabled: จำนวนโพสต์ที่เผยแพร่ในเซิร์ฟเวอร์, ผู้ใช้ที่ใช้งานอยู่ และการลงทะเบียนใหม่ในบักเก็ตรายสัปดาห์
-        backups_retention_period: เก็บการเก็บถาวรผู้ใช้ที่สร้างขึ้นตามจำนวนวันที่ระบุ
+        app_icon: WEBP, PNG, GIF หรือ JPG เขียนทับไอคอนแอปเริ่มต้นในอุปกรณ์มือถือด้วยไอคอนที่กำหนดเอง
+        backups_retention_period: ผู้ใช้มีความสามารถในการสร้างการเก็บถาวรของโพสต์ของเขาเพื่อดาวน์โหลดในภายหลัง เมื่อตั้งเป็นค่าบวก จะลบการเก็บถาวรเหล่านี้ออกจากที่เก็บข้อมูลของคุณโดยอัตโนมัติหลังจากจำนวนวันที่ระบุ
         bootstrap_timeline_accounts: จะปักหมุดบัญชีเหล่านี้ไว้ด้านบนสุดของคำแนะนำการติดตามของผู้ใช้ใหม่
         closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
-        content_cache_retention_period: จะลบโพสต์และการดันทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ หลังจากจำนวนวันที่ระบุ โพสต์บางส่วนอาจไม่สามารถกู้คืนได้ ที่คั่นหน้า, รายการโปรด และการดันที่เกี่ยวข้องทั้งหมดจะสูญหายและไม่สามารถเลิกทำได้เช่นกัน
+        content_cache_retention_period: จะลบโพสต์ทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ (รวมถึงการดันและการตอบกลับ) หลังจากจำนวนวันที่ระบุ โดยไม่คำนึงถึงการโต้ตอบใด ๆ ของผู้ใช้ในเซิร์ฟเวอร์กับโพสต์เหล่านั้น สิ่งนี้รวมถึงโพสต์ที่ผู้ใช้ในเซิร์ฟเวอร์ได้ทำเครื่องหมายโพสต์ว่าเป็นที่คั่นหน้าหรือรายการโปรด การกล่าวถึงแบบส่วนตัวระหว่างผู้ใช้จากอินสแตนซ์ที่แตกต่างกันจะหายไปและไม่สามารถคืนค่าได้เช่นกัน การใช้การตั้งค่านี้มีไว้สำหรับอินสแตนซ์ที่มีวัตถุประสงค์พิเศษและทำลายความคาดหวังของผู้ใช้จำนวนมากเมื่อนำไปใช้สำหรับการใช้งานที่มีวัตถุประสงค์ทั่วไป
         custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
+        favicon: WEBP, PNG, GIF หรือ JPG เขียนทับ Favicon ของ Mastodon เริ่มต้นด้วยไอคอนที่กำหนดเอง
         mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
-        media_cache_retention_period: จะลบไฟล์สื่อที่ดาวน์โหลดหลังจากจำนวนวันที่ระบุเมื่อตั้งเป็นค่าบวก และดาวน์โหลดใหม่ตามความต้องการ
+        media_cache_retention_period: จะแคชไฟล์สื่อจากโพสต์ที่สร้างโดยผู้ใช้ระยะไกลในเซิร์ฟเวอร์ของคุณ เมื่อตั้งเป็นค่าบวก จะลบสื่อหลังจากจำนวนวันที่ระบุ หากมีการขอข้อมูลสื่อหลังจากมีการลบสื่อ จะดาวน์โหลดสื่อใหม่ หากเนื้อหาต้นฉบับยังคงใช้งานได้ เนื่องจากข้อจำกัดเกี่ยวกับความถี่ที่บัตรตัวอย่างลิงก์สำรวจไซต์จากบุคคลที่สาม ขอแนะนำให้ตั้งค่านี้เป็นอย่างน้อย 14 วัน มิฉะนั้นจะไม่อัปเดตบัตรตัวอย่างลิงก์ตามความต้องการก่อนเวลานั้น
         peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
         profile_directory: ไดเรกทอรีโปรไฟล์แสดงรายการผู้ใช้ทั้งหมดที่ได้เลือกรับให้สามารถค้นพบได้
-        require_invite_text: เมื่อการลงทะเบียนต้องมีการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
+        require_invite_text: เมื่อการลงทะเบียนต้องการการอนุมัติด้วยตนเอง ทำให้การป้อนข้อความ “ทำไมคุณจึงต้องการเข้าร่วม?” บังคับแทนที่จะไม่จำเป็น
         site_contact_email: วิธีที่ผู้คนสามารถเข้าถึงคุณสำหรับการสอบถามด้านกฎหมายหรือการสนับสนุน
         site_contact_username: วิธีที่ผู้คนสามารถเข้าถึงคุณใน Mastodon
         site_extended_description: ข้อมูลเพิ่มเติมใด ๆ ที่อาจเป็นประโยชน์กับผู้เยี่ยมชมและผู้ใช้ของคุณ สามารถจัดโครงสร้างด้วยไวยากรณ์ Markdown
@@ -113,9 +115,10 @@ th:
         severities:
           no_access: ปิดกั้นการเข้าถึงทรัพยากรทั้งหมด
           sign_up_block: จะไม่สามารถทำการลงทะเบียนใหม่
-          sign_up_requires_approval: การลงทะเบียนใหม่จะต้องมีการอนุมัติของคุณ
+          sign_up_requires_approval: การลงทะเบียนใหม่จะต้องการการอนุมัติของคุณ
         severity: เลือกสิ่งที่จะเกิดขึ้นกับคำขอจาก IP นี้
       rule:
+        hint: ไม่จำเป็น ให้รายละเอียดเพิ่มเติมเกี่ยวกับกฎ
         text: อธิบายกฎหรือข้อกำหนดสำหรับผู้ใช้ในเซิร์ฟเวอร์นี้ พยายามทำให้กฎหรือข้อกำหนดสั้นและเรียบง่าย
       sessions:
         otp: 'ป้อนรหัสสองปัจจัยที่สร้างโดยแอปในโทรศัพท์ของคุณหรือใช้หนึ่งในรหัสกู้คืนของคุณ:'
@@ -242,7 +245,7 @@ th:
         backups_retention_period: ระยะเวลาการเก็บรักษาการเก็บถาวรผู้ใช้
         bootstrap_timeline_accounts: แนะนำบัญชีเหล่านี้ให้กับผู้ใช้ใหม่เสมอ
         closed_registrations_message: ข้อความที่กำหนดเองเมื่อการลงทะเบียนไม่พร้อมใช้งาน
-        content_cache_retention_period: ระยะเวลาการเก็บรักษาแคชเนื้อหา
+        content_cache_retention_period: ระยะเวลาการเก็บรักษาเนื้อหาระยะไกล
         custom_css: CSS ที่กำหนดเอง
         mascot: มาสคอตที่กำหนดเอง (ดั้งเดิม)
         media_cache_retention_period: ระยะเวลาการเก็บรักษาแคชสื่อ
@@ -282,7 +285,7 @@ th:
           sign_up_requires_approval: จำกัดการลงทะเบียน
         severity: กฎ
       notification_emails:
-        appeal: ใครสักคนอุทธรณ์การตัดสินใจของผู้ควบคุม
+        appeal: ใครสักคนอุทธรณ์การตัดสินใจของผู้กลั่นกรอง
         digest: ส่งอีเมลสรุป
         favourite: ใครสักคนได้ชื่นชอบโพสต์ของคุณ
         follow: ใครสักคนได้ติดตามคุณ
@@ -299,6 +302,7 @@ th:
           patch: แจ้งเตือนการอัปเดตการแก้ไขข้อบกพร่อง
         trending_tag: แนวโน้มใหม่ต้องการการตรวจทาน
       rule:
+        hint: ข้อมูลเพิ่มเติม
         text: กฎ
       settings:
         indexable: รวมหน้าโปรไฟล์ในเครื่องมือค้นหา
diff --git a/config/locales/simple_form.tok.yml b/config/locales/simple_form.tok.yml
new file mode 100644
index 0000000000..37b0ee765a
--- /dev/null
+++ b/config/locales/simple_form.tok.yml
@@ -0,0 +1,17 @@
+---
+tok:
+  simple_form:
+    hints:
+      account:
+        display_name: nimi sina ale anu nimi sina musi.
+      defaults:
+        setting_display_media_hide_all: sitelen ale li len
+        setting_display_media_show_all: sitelen ale li len ala
+    labels:
+      defaults:
+        expires_in: ona o moli lon
+        setting_theme: kule lipu
+      user_role:
+        name: nimi
+    required:
+      text: ni li ken ala lon ala
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 7d16531eae..697417a541 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -39,16 +39,16 @@ tr:
         text: Bir eyleme yalnızca bir kere itiraz edebilirsiniz
       defaults:
         autofollow: Davetiyeyle kaydolan kişiler sizi otomatik olarak takip eder
-        avatar: En fazla %{size} olacak şekilde PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px büyüklüğüne indirgenecektir
+        avatar: En fazla %{size} olacak şekilde WEBP, PNG, GIF veya JPG formatında yükleyiniz. %{dimensions}px boyutuna küçültülecektir
         bot: Bu hesap temelde otomatik eylemler gerçekleştirir ve izlenmeyebilir
         context: Filtrenin geçerli olması gereken bir veya daha fazla içerik
         current_password: Güvenlik nedeniyle lütfen şu anki hesabın parolasını girin
         current_username: Onaylamak için lütfen şu anki hesabın kullanıcı adını girin
         digest: Sadece uzun bir süre hareketsiz kaldıktan sonra ve yalnızca yokluğunuzda herhangi bir kişisel mesaj aldıysanız gönderilir
         email: Onay e-postası gönderilir
-        header: PNG, GIF ya da JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecek
+        header: WEBP, PNG, GIF veya JPG. En fazla %{size}. %{dimensions}px boyutuna küçültülecektir
         inbox_url: Kullanmak istediğiniz aktarıcının ön sayfasından URL'yi kopyalayın
-        irreversible: Filtrelenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
+        irreversible: Süzgeçlenmiş gönderiler, filtre daha sonra kaldırılsa bile, geri dönüşümsüz biçimde kaybolur
         locale: Kullanıcı arayüzünün dili, e-postalar ve push bildirimleri
         password: En az 8 karakter kullanın
         phrase: Metnin büyük/küçük harf durumundan veya gönderinin içerik uyarısından bağımsız olarak eşleştirilecek
@@ -74,16 +74,18 @@ tr:
         action: Bir gönderi filtreyle eşleştiğinde hangi eylemin yapılacağını seçin
         actions:
           hide: Filtrelenmiş içeriği tamamen gizle, sanki varolmamış gibi
-          warn: Filtrelenmiş içeriği, filtrenin başlığından söz eden bir uyarının arkasında gizle
+          warn: Süzgeçlenmiş içeriği, süzgecinin başlığından söz eden bir uyarının arkasında gizle
       form_admin_settings:
         activity_api_enabled: Yerel olarak yayınlanan gönderi, etkin kullanıcı ve yeni kayıtların haftalık sayıları
-        backups_retention_period: Üretilen kullanıcı arşivlerini belirli gün sayısı kadar sakla.
+        app_icon: WEBP, PNG, GIF veya JPG. Mobil aygıtlarda varsayılan uygulama simgesini isteğe bağlı bir simgeyle değiştirir.
+        backups_retention_period: Kullanıcılar, gönderilerinin arşivlerini daha sonra indirmek üzere oluşturabilirler. Pozitif bir değer verdilğinde bu arşivler verilmiş olan gün sonunda deponuzdan otomatik olarak silinecektir.
         bootstrap_timeline_accounts: Bu hesaplar, yeni kullanıcıların takip önerilerinin tepesinde sabitlenecektir.
         closed_registrations_message: Kayıt olma kapalıyken görüntülenir
-        content_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan gelen gönderiler belirli bir gün sonra silinecektir. Silme geri alınamayabilir.
+        content_cache_retention_period: Diğer sunuculardaki (öne çıkarma ve yanıtlar da dahil olmak üzere) tüm gönderiler belirlenen gün sonunda, yerel bir kullanıcının etkileşimine bakılmadan, silinecektir. Yerel bir kullanıcının yerimlerine veya favorilerine eklediği gönderiler de dahildir. Farklı sunuculardaki kullanıcılar arasındaki özel bahsetmeler de kaybolacak ve geri getirilmeleri mümkün olmayacaktır. Bu ayarın kullanımı özel amaçlı sunucular içindir ve genel amaçlı kullanımda etkinleştirildiğinde kullanıcı beklentilerini karşılamayabilir.
         custom_css: Mastodon'un web sürümüne özel biçimler uygulayabilirsiniz.
+        favicon: WEBP, PNG, GIF veya JPG. Varsayılan Mastodon simgesini isteğe bağlı bir simgeyle değiştirir.
         mascot: Gelişmiş web arayüzündeki illüstrasyonu geçersiz kılar.
-        media_cache_retention_period: Pozitif bir sayı girildiğinde, diğer sunuculardan indirilen medya dosyaları belirli bir gün sonra silinecektir, isteğe bağlı olarak tekrar indirilebilir.
+        media_cache_retention_period: Uzak kullanıcıların gönderilerindeki ortam dosyaları sunucunuzda önbelleklenir. Pozitif bir değer verildiğinde, ortam dosyaları belirlenen gün sonunda silinecektir. Eğer ortam dosyaları silindikten sonra istenirse, kaynak içerik hala mevcutsa, tekrar indirilecektir. Bağlantı önizleme kartlarının üçüncü parti siteleri yoklamasına ilişkin kısıtlamalar nedeniyle, bu değeri en azından 14 gün olarak ayarlamanız önerilir, yoksa bağlantı önizleme kartları bu süreden önce isteğe bağlı olarak güncellenmeyecektir.
         peers_api_enabled: Bu sunucunun fediverse'te karşılaştığı alan adlarının bir listesi. İlgili sunucuyla birleştirme mi yapıyorsunuz yoksa sunucunuz sadece onu biliyor mu hakkında bir bilgi burada yok. Bu blgi genel olarak federasyın hakkında istatistik toplamak isteyen hizmetler tarafından kullanılıyor.
         profile_directory: Profil dizini keşfedilebilir olmayı kabul eden tüm kullanıcıları listeler.
         require_invite_text: Kayıt olmak elle doğrulama gerektiriyorsa, "Neden katılmak istiyorsunuz?" metin girdisini isteğe bağlı yerine zorunlu yapın
@@ -116,9 +118,10 @@ tr:
           sign_up_requires_approval: Yeni kayıt onayınızı gerektirir
         severity: Bu IP'den gelen isteklere ne olacağını seçin
       rule:
+        hint: İsteğe bağlı. Kural hakkında daha fazla ayrıntı verin
         text: Bu sunucu üzerindeki kullanıcılar için bir kural veya gereksinimi tanımlayın. Kuralı kısa ve yalın tutmaya çalışın
       sessions:
-        otp: Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz.
+        otp: 'Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarınızdan birini giriniz:'
         webauthn: Bir USB anahtarıysa, taktığınızdan ve gerekirse üzerine tıkladığınızdan emin olun.
       settings:
         indexable: Profil sayfanız Google, Bing ve diğerlerindeki arama sonuçlarında görüntülenebilir.
@@ -178,10 +181,10 @@ tr:
         autofollow: Hesabınızı takip etmeye davet edin
         avatar: Profil resmi
         bot: Bu bir bot hesabı
-        chosen_languages: Dilleri filtrele
+        chosen_languages: Dilleri süzgeçle
         confirm_new_password: Yeni parolayı onayla
         confirm_password: Parolayı doğrula
-        context: İçeriği filtrele
+        context: İçeriği süzgeçle
         current_password: Güncel parola
         data: Veri
         display_name: Görünen isim
@@ -203,7 +206,7 @@ tr:
         setting_aggregate_reblogs: Zaman çizelgesindeki boostları grupla
         setting_always_send_emails: Her zaman e-posta bildirimleri gönder
         setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
-        setting_boost_modal: Boostlamadan önce onay iletişim kutusu göster
+        setting_boost_modal: Paylaşmadan önce onay iletişim kutusu göster
         setting_default_language: Gönderi dili
         setting_default_privacy: Gönderi gizliliği
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
@@ -227,7 +230,7 @@ tr:
         title: Başlık
         type: İçeri aktarma türü
         username: Kullanıcı adı
-        username_or_email: Kullanıcı adı ya da e-posta
+        username_or_email: Kullanıcı adı veya e-posta
         whole_word: Tam sözcük
       email_domain_block:
         with_dns_records: Alan adının MX kayıtlarını ve IP'lerini ekleyin
@@ -242,7 +245,7 @@ tr:
         backups_retention_period: Kullanıcı arşivi saklama süresi
         bootstrap_timeline_accounts: Bu hesapları yeni kullanıcılara her zaman öner
         closed_registrations_message: Kayıt olma mevcut değilken gösterilen özel ileti
-        content_cache_retention_period: İçerik önbelleği saklama süresi
+        content_cache_retention_period: Uzak içerik saklama süresi
         custom_css: Özel CSS
         mascot: Özel maskot (eski)
         media_cache_retention_period: Medya önbelleği saklama süresi
@@ -268,7 +271,7 @@ tr:
       interactions:
         must_be_follower: Takipçim olmayan kişilerden gelen bildirimleri engelle
         must_be_following: Takip etmediğim kişilerden gelen bildirimleri engelle
-        must_be_following_dm: Takip etmediğiniz kişilerden gelen direkt mesajları engelle
+        must_be_following_dm: Takip etmediğiniz kişilerden gelen doğrudan iletileri engelle
       invite:
         comment: Yorum
       invite_request:
@@ -299,6 +302,7 @@ tr:
           patch: Yama güncellemelerini bildir
         trending_tag: Yeni eğilimin gözden geçmesi gerekiyor
       rule:
+        hint: Ek bilgi
         text: Kural
       settings:
         indexable: Arama motorları profil sayfasını içersin
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index aa64ecfdb7..1d69f5c579 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -39,14 +39,14 @@ uk:
         text: Ви можете оскаржити рішення лише один раз
       defaults:
         autofollow: Люди, що зареєструвалися за вашим запрошенням, автоматично підпишуться на вас
-        avatar: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
+        avatar: WEBP, PNG, GIF, або JPG. Максимальний розмір - %{size}. Буде зменшено до %{dimensions}px
         bot: Цей обліковий запис виконує переважно автоматичні дії та може не відстежуватися
         context: Один або кілька контекстів, до яких повинні бути застосовані фільтри
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
         email: Вам надійде електронний лист з підтвердженням
-        header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
+        header: WEBP, PNG, GIF, або JPG. Максимальний розмір - %{size}. Буде зменшено до %{dimensions}px
         inbox_url: Скопіюйте інтернет-адресу з титульної сторінки ретранслятора
         irreversible: Відфільтровані дописи зникнуть назавжди, навіть якщо фільтр потім буде вилучено
         locale: Мова інтерфейсу, електронних листів та push-сповіщень
@@ -77,16 +77,10 @@ uk:
           warn: Сховати відфільтрований вміст за попередженням, у якому вказано заголовок фільтра
       form_admin_settings:
         activity_api_enabled: Кількість локальних опублікованих дописів, активних і нових користувачів у тижневих розрізах
-        backups_retention_period: Зберігати створені архіви користувача вказану кількість днів.
         bootstrap_timeline_accounts: Ці облікові записи будуть закріплені в топі пропозицій для нових користувачів.
         closed_registrations_message: Показується, коли реєстрація закрита
-        content_cache_retention_period: |-
-          Матеріали з інших серверів будуть видалені після вказаної кількості днів, коли встановлено позитивне значення. Ця дія може бути незворотна.
-
-          Матеріали з інших серверів будуть видалені після вказаної кількості днів. Ця дія може бути незворотна. Усі пов'язані з ними закладки та поширення також будуть втрачені.
         custom_css: Ви можете застосувати користувацькі стилі у вебверсії Mastodon.
         mascot: Змінює ілюстрацію в розширеному вебінтерфейсі.
-        media_cache_retention_period: Завантажені медіафайли будуть видалені після вказаної кількості днів після встановлення додатного значення та повторного завантаження за запитом.
         peers_api_enabled: Список доменів імен цього сервера з'явився у федівсесвіті. Сюди не входять дані чи ви пов'язані федерацією з цим сервером, а лише відомості, що вашому серверу відомо про нього. Його використовують служби, які збирають загальну статистику про федерації.
         profile_directory: У каталозі профілів перераховані всі користувачі, які погодились бути видимими.
         require_invite_text: Якщо реєстрація вимагає власноручного затвердження, зробіть текстове поле «Чому ви хочете приєднатися?» обов'язковим, а не додатковим
@@ -119,6 +113,7 @@ uk:
           sign_up_requires_approval: Нові реєстрації потребуватимуть затвердження вами
         severity: Виберіть, що буде відбуватися з запитами з цієї IP
       rule:
+        hint: Необов'язково. Докладніше про правило
         text: Опис правила або вимоги для користувачів на цьому сервері. Спробуйте зробити його коротким і простим
       sessions:
         otp: 'Введіть код двофакторної автентифікації, згенерований вашим мобільним застосунком, або скористайтеся одним з ваших кодів відновлення:'
@@ -245,7 +240,7 @@ uk:
         backups_retention_period: Період утримання архіву користувача
         bootstrap_timeline_accounts: Завжди рекомендувати новим користувачам ці облікові записи
         closed_registrations_message: Показуване повідомлення, якщо реєстрація недоступна
-        content_cache_retention_period: Час зберігання кешу контенту
+        content_cache_retention_period: Період збереження віддаленого вмісту
         custom_css: Користувацький CSS
         mascot: Користувацький символ (застарілий)
         media_cache_retention_period: Період збереження кешу медіа
@@ -302,6 +297,7 @@ uk:
           patch: Сповіщати про оновлення з виправленнями
         trending_tag: Нове популярне вимагає розгляду
       rule:
+        hint: Додаткова інформація
         text: Правило
       settings:
         indexable: Включити сторінку профілю в пошукові системи
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 8943527b16..e5063e6112 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -39,14 +39,14 @@ vi:
         text: Bạn chỉ có thể khiếu nại mỗi lần một cảnh cáo
       defaults:
         autofollow: Những người đăng ký sẽ tự động theo dõi bạn
-        avatar: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
+        avatar: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
         context: Chọn một hoặc nhiều nơi mà bộ lọc sẽ áp dụng
         current_password: Vì mục đích bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
         current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
         digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
         email: Bạn sẽ được gửi một email xác minh
-        header: PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
+        header: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
         inbox_url: Sao chép URL của máy chủ mà bạn muốn dùng
         irreversible: Các tút đã lọc sẽ không thể phục hồi, kể cả sau khi xóa bộ lọc
         locale: Ngôn ngữ của giao diện, email và thông báo đẩy
@@ -77,13 +77,15 @@ vi:
           warn: Ẩn nội dung đã lọc đằng sau một cảnh báo đề cập đến tiêu đề của bộ lọc
       form_admin_settings:
         activity_api_enabled: Số lượng tút được đăng trong máy chủ, người dùng đang hoạt động và đăng ký mới hàng tuần
-        backups_retention_period: Lưu trữ dữ liệu người dùng đã tạo trong số ngày được chỉ định.
+        app_icon: WEBP, PNG, GIF hoặc JPG. Dùng biểu tượng tùy chỉnh trên thiết bị di động.
+        backups_retention_period: Người dùng có khả năng tạo bản sao lưu các tút của họ để tải xuống sau. Các bản sao lưu này sẽ tự động bị xóa khỏi bộ nhớ của bạn sau số ngày được chỉ định.
         bootstrap_timeline_accounts: Những người này sẽ được ghim vào đầu các gợi ý theo dõi của người mới.
         closed_registrations_message: Được hiển thị khi đóng đăng ký
-        content_cache_retention_period: Tút từ các máy chủ khác sẽ bị xóa sau số ngày được chỉ định. Sau đó có thể không thể phục hồi được.
+        content_cache_retention_period: Tất cả tút từ các máy chủ khác (bao gồm cả đăng lại và trả lời) sẽ bị xóa sau số ngày được chỉ định mà không tính đến bất kỳ tương tác nào của người dùng cục bộ với các tút đó. Điều này bao gồm các tút mà người dùng cục bộ đã đánh dấu nó là dấu trang hoặc mục yêu thích. Những lượt nhắc riêng tư giữa những người dùng từ các máy chủ khác nhau cũng sẽ bị mất và không thể khôi phục. Việc sử dụng cài đặt này dành cho các trường hợp có mục đích đặc biệt và phá vỡ nhiều kỳ vọng của người dùng khi được triển khai cho mục đích sử dụng chung.
         custom_css: Bạn có thể tùy chỉnh phong cách trên bản web của Mastodon.
+        favicon: WEBP, PNG, GIF hoặc JPG. Dùng favicon Maston tùy chỉnh.
         mascot: Ghi đè hình minh họa trong giao diện web nâng cao.
-        media_cache_retention_period: Media đã tải xuống sẽ bị xóa sau số ngày được chỉ định và sẽ tải xuống lại theo yêu cầu.
+        media_cache_retention_period: Các tệp phương tiện từ các tút do người dùng máy chủ khác thực hiện sẽ được lưu vào bộ đệm trên máy chủ của bạn. Khi được đặt thành giá trị dương, phương tiện sẽ bị xóa sau số ngày được chỉ định. Nếu dữ liệu phương tiện được yêu cầu sau khi bị xóa, dữ liệu đó sẽ được tải xuống lại nếu nội dung nguồn vẫn còn. Do những hạn chế về tần suất thẻ xem trước liên kết thăm dò ý kiến ​​các trang web của bên thứ ba, bạn nên đặt giá trị này thành ít nhất 14 ngày, nếu không thẻ xem trước liên kết sẽ không được cập nhật theo yêu cầu trước thời gian đó.
         peers_api_enabled: Danh sách các máy chủ khác mà máy chủ này đã liên hợp. Không có dữ liệu nào được đưa vào đây về việc bạn có liên kết với một máy chủ nhất định hay không, chỉ là máy chủ của bạn biết về nó. Điều này được sử dụng bởi các dịch vụ thu thập số liệu thống kê về liên kết theo nghĩa chung.
         profile_directory: Liệt kê tất cả người đã chọn tham gia để có thể khám phá.
         require_invite_text: Khi đăng ký yêu cầu phê duyệt thủ công, hãy đặt câu hỏi "Tại sao bạn muốn tham gia?" nhập văn bản bắt buộc thay vì tùy chọn
@@ -116,6 +118,7 @@ vi:
           sign_up_requires_approval: Bạn sẽ phê duyệt những đăng ký mới từ IP này
         severity: Chọn hành động nếu nhận được yêu cầu từ IP này
       rule:
+        hint: Tùy chọn. Cung cấp chi tiết hơn về nội quy
         text: Mô tả một nội quy bắt buộc trên máy chủ này. Nên để ngắn và đơn giản
       sessions:
         otp: 'Nhập mã xác minh 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
@@ -242,7 +245,7 @@ vi:
         backups_retention_period: Thời hạn lưu trữ nội dung người dùng sao lưu
         bootstrap_timeline_accounts: Luôn đề xuất những người này đến người mới
         closed_registrations_message: Thông báo tùy chỉnh khi tắt đăng ký
-        content_cache_retention_period: Thời hạn lưu trữ cache nội dung
+        content_cache_retention_period: Khoảng thời gian lưu giữ nội dung máy chủ khác
         custom_css: Tùy chỉnh CSS
         mascot: Tùy chỉnh linh vật (kế thừa)
         media_cache_retention_period: Thời hạn lưu trữ cache media
@@ -299,6 +302,7 @@ vi:
           patch: Thông báo bản cập sửa lỗi
         trending_tag: Phê duyệt nội dung nổi bật mới
       rule:
+        hint: Thông tin thêm
         text: Nội quy
       settings:
         indexable: Cho phép hiện hồ sơ trong công cụ tìm kiếm
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 7a56fa2559..6058cc00cf 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -39,14 +39,14 @@ zh-CN:
         text: 你仅能对单次处罚提交一次申诉
       defaults:
         autofollow: 通过邀请链接注册的用户将会自动关注你
-        avatar: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
+        avatar: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
         bot: 来自这个账户的绝大多数操作都是自动进行的，并且可能无人监控
         context: 过滤器的应用环境
         current_password: 为了安全起见，请输入当前账号的密码
         current_username: 请输入当前账号的用户名以确认
         digest: 仅在你长时间未登录，且收到了私信时发送
         email: 我们会向你发送一封确认邮件
-        header: 文件大小限制 %{size}，只支持 PNG、GIF 或 JPG 格式。图片分辨率将会压缩至 %{dimensions}px
+        header: 支持WEBP、PNG、GIF 或 JPG。最大 %{size}。将缩小到 %{dimensions}px
         inbox_url: 从你想要使用的中继站的主页上复制 URL
         irreversible: 已过滤的嘟文会不可逆转地消失，即便移除过滤器之后也一样
         locale: 用户界面、电子邮件和推送通知中使用的语言
@@ -77,13 +77,15 @@ zh-CN:
           warn: 在警告中提及过滤器标题后，隐藏过滤内容
       form_admin_settings:
         activity_api_enabled: 本站每周的嘟文数、活跃用户数和新注册用户数
-        backups_retention_period: 将在指定天数内保留生成的用户存档。
+        app_icon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖移动设备上的默认应用图标。
+        backups_retention_period: 用户可以生成其嘟文存档以供之后下载。当该值被设为正值时，这些存档将在指定的天数后自动从您的存储中删除。
         bootstrap_timeline_accounts: 这些账号将在新用户关注推荐中置顶。
         closed_registrations_message: 在关闭注册时显示
-        content_cache_retention_period: 设为正数值时，来自其他服务器的嘟文将在指定天数后被删除。删除有可能会是不可逆的。
+        content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。
         custom_css: 你可以为网页版 Mastodon 应用自定义样式。
+        favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。
         mascot: 覆盖高级网页界面中的绘图形象。
-        media_cache_retention_period: 设为正数值时，来自其他服务器的媒体文件将在指定天数后被删除，并在需要时再次下载。
+        media_cache_retention_period: 来自外站用户嘟文的媒体文件将被缓存到你的实例上。当该值被设为正值时，缓存的媒体文件将在指定天数后被清除。如果媒体文件在被清除后重新被请求，且源站内容仍然可用，它将被重新下载。由于链接预览卡拉取第三方站点的频率受到限制，建议将此值设置为至少 14 天，如果小于该值，链接预览卡将不会按需更新。
         peers_api_enabled: 此服务器在联邦宇宙中遇到的域名列表。 这里不包含关于您是否与给定服务器联合的数据，只是您的服务器知道它。 这由收集一般意义上的联邦统计信息的服务使用。
         profile_directory: 个人资料目录会列出所有选择可被发现的用户。
         require_invite_text: 当注册需要手动批准时，将“你为什么想要加入？”设为必填项
@@ -116,6 +118,7 @@ zh-CN:
           sign_up_requires_approval: 新注册需要你的批准
         severity: 选择如何处理来自此 IP 的请求。
       rule:
+        hint: 选填。提供关于这条规则的更多详情
         text: 描述这个服务器上的用户规则或要求。尽量确保简洁、清晰易懂
       sessions:
         otp: 输入你手机应用上生成的双因素认证代码，或者任意一个恢复代码：
@@ -242,7 +245,7 @@ zh-CN:
         backups_retention_period: 用户存档保留期
         bootstrap_timeline_accounts: 推荐新用户关注以下账号
         closed_registrations_message: 在关闭注册时显示的自定义消息
-        content_cache_retention_period: 内容缓存保留期
+        content_cache_retention_period: 外站内容保留期
         custom_css: 自定义 CSS
         mascot: 自定义吉祥物（旧）
         media_cache_retention_period: 媒体缓存保留期
@@ -299,6 +302,7 @@ zh-CN:
           patch: 通知错误修复更新
         trending_tag: 新热门待审核
       rule:
+        hint: 补充信息
         text: 规则
       settings:
         indexable: 允许搜索引擎索引个人资料页面
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index ad963b32b6..0e2ee81db7 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -39,14 +39,14 @@ zh-HK:
         text: 你每次只能提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的用戶將會自動關注你
-        avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
+        avatar: WEBP、PNG、GIF 或 JPG 格式圖片，最大為 %{size}，並將縮小至 %{dimensions} px
         bot: 這個帳號是機械人，所做的事情可能沒有經人為監察
         context: 過濾器應該套用的一項或多項條件
         current_password: 基於保安緣故，請輸入目前帳號的密碼
         current_username: 請輸入目前帳戶的使用者名稱以確認
         digest: 僅在你長時間未登錄，且收到了私信時發送
         email: 你將收到一封確認電郵
-        header: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 %{size}，會縮裁成 %{dimensions}px
+        header: WEBP、PNG、GIF 或 JPG 格式圖片，最大為 %{size}，並將縮小至 %{dimensions} px
         inbox_url: 在你想要使用的中繼站首頁，複製它的網址
         irreversible: 文章過濾是不可還原的，即使日後過濾器被移除，也無法重新看到被它濾走的文章
         locale: 使用者介面、電郵和通知的語言
@@ -77,13 +77,13 @@ zh-HK:
           warn: 將已篩選的內容隱藏在篩選器標題的警告後面。
       form_admin_settings:
         activity_api_enabled: 每週本站發佈的帖文、活躍使用者及新註冊的數量
-        backups_retention_period: 繼續封存生成的使用者到指定的天數。
+        backups_retention_period: 使用者可以生成帖文存檔，以便日後下載。如果設定為正值，這些存檔將在指定天數後自動從你的儲存空間中刪除。
         bootstrap_timeline_accounts: 這些帳號會被置頂在新使用者的追蹤建議上。
         closed_registrations_message: 關閉註冊時顯示
-        content_cache_retention_period: 當設定為正數時，來自其他伺服器的帖文將在指定天數後被刪除。無法還原這個操作。
+        content_cache_retention_period: 所有來自其他伺服器的帖文（包括轉推和回覆），不論本站使用者有否與這些帖文互動，帖文都將在指定天數後被刪除。這包括本地使用者標記為書籤或加入最愛的帖文。不同站點之間的私人提及也將丟失，並且無法恢復。此設定適用於有特殊用途的站點，一般使用可能會破壞使用者體驗。
         custom_css: 你可以在 Mastodon 網頁版套用自訂樣式。
         mascot: 覆蓋進階網頁介面中的插圖。
-        media_cache_retention_period: 當設定為正數時，已下載的媒體檔案將在指定天數後被刪除，並視乎需要重新下載。
+        media_cache_retention_period: 遠端使用者帖文中的媒體檔案會緩存到你的伺服器上。當設定為正值時，媒體將在指定天數後被刪除。如果媒體資料在刪除後被請求，而源內容仍然可用，則會重新下載該媒體。由於連結預覽卡輪詢第三方網站的頻率有限制，建議將此值設定為至少 14 天，否則在此之前不會按需要更新連結預覽卡。
         peers_api_enabled: 本伺服器於聯邦宇宙相遇的網域名單。這裏不包括你與某伺服器有否聯網的數據，僅表示你的伺服器已知的網域。這是供收集一般跨站數據的服務使用。
         profile_directory: 個人檔案目錄羅列了所有選擇被發現的使用者。
         require_invite_text: 如果需要手動審核註冊，請將「為何你想加入？」文字欄設定為必填，而非選填。
@@ -116,6 +116,7 @@ zh-HK:
           sign_up_requires_approval: 新登記申請正等候你審批
         severity: 請設定伺服器將如何處理來自這個 IP 位址的請求
       rule:
+        hint: 選填。提供有關規則的更多細節
         text: 請描述在此伺服器上用戶需要遵守的規則或要求。請盡量保持簡短易明。
       sessions:
         otp: 輸入你手機上生成的雙重認證碼，或者任意一個恢復代碼：
@@ -242,7 +243,7 @@ zh-HK:
         backups_retention_period: 封存使用者保留期
         bootstrap_timeline_accounts: 總是向新使用者推薦這些帳號
         closed_registrations_message: 無法註冊時的自訂訊息
-        content_cache_retention_period: 內容快取保留期
+        content_cache_retention_period: 遠端內容保留期
         custom_css: 自訂 CSS
         mascot: 自訂吉祥物 (舊版)
         media_cache_retention_period: 媒體快取保留期
@@ -299,6 +300,7 @@ zh-HK:
           patch: 通知除錯更新
         trending_tag: 新趨勢須經過審核
       rule:
+        hint: 其他資訊
         text: 規則
       settings:
         indexable: 在搜尋引擎中顯示個人檔案
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a31ad5eb11..b7a67c6a6f 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -8,15 +8,15 @@ zh-TW:
         fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
         indexable: 您的公開嘟文可能會顯示於 Mastodon 之搜尋結果中。曾與您嘟文互動過的人可能無論如何都能搜尋它們。
         note: '您可以 @mention 其他人或者使用 #主題標籤。'
-        show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之人能得知您正在跟隨其帳號。
+        show_collections: 人們將能瀏覽您跟隨中及跟隨者帳號。您所跟隨之使用者能得知您正在跟隨其帳號。
         unlocked: 人們將無需額外請求您的同意便能跟隨您的帳號。取消勾選以審查跟隨請求並選擇是否同意或拒絕新跟隨者。
       account_alias:
-        acct: 指定要移動的帳號的「使用者名稱@網域名稱」
+        acct: 指定要移動的帳號之「使用者名稱@網域名稱」
       account_migration:
-        acct: 指定要移動至的帳號的「使用者名稱@網域名稱」
+        acct: 指定欲移動至帳號之「使用者名稱@網域名稱」
       account_warning_preset:
         text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
-        title: 可選。不會向收件者顯示
+        title: 可選的。不會向收件者顯示
       admin_account_action:
         include_statuses: 使用者可看到導致檢舉或警告的嘟文
         send_email_notification: 使用者將收到帳號發生之事情的解釋
@@ -33,26 +33,26 @@ zh-TW:
         all_day: 當選取時，僅顯示出時間範圍中的日期部分
         ends_at: 可選的。公告會於該時間點自動取消發布
         scheduled_at: 空白則立即發布公告
-        starts_at: 可選的。讓公告於特定時間範圍內顯示
+        starts_at: 可選的。使公告於特定時間範圍內顯示
         text: 您可以使用嘟文語法，但請小心別讓公告太鴨霸而佔據使用者的整個版面。
       appeal:
         text: 您只能對警示提出一次申訴
       defaults:
         autofollow: 通過邀請網址註冊的使用者將自動跟隨您
-        avatar: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
+        avatar: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
         bot: 此帳號主要執行自動化操作且可能未受人為監控
         context: 此過濾器應套用於以下一項或多項情境
         current_password: 因安全因素，請輸入目前帳號的密碼
         current_username: 請輸入目前帳號的使用者名稱以確認
         digest: 僅於您長時間未登入且於未登入期間收到私訊時傳送
         email: 您將收到一封確認電子郵件
-        header: 支援 PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}，會等比例縮減至 %{dimensions} 像素
+        header: 支援 WEBP、PNG、GIF 或 JPG 圖片格式，檔案最大為 %{size}。將等比例縮減至 %{dimensions} 像素
         inbox_url: 從您想要使用的中繼首頁複製網址
         irreversible: 已過濾的嘟文將會不可逆地消失，即便之後移除過濾器也一樣
         locale: 使用者介面、電子郵件與推播通知的語言
         password: 使用至少 8 個字元
         phrase: 無論是嘟文的本文或是內容警告都會被過濾
-        scopes: 允許讓應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
+        scopes: 允許使應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 請勿顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
         setting_always_send_emails: 一般情況下若您活躍使用 Mastodon ，我們不會寄送電子郵件通知
         setting_default_sensitive: 敏感內容媒體預設隱藏，且按一下即可重新顯示
@@ -77,13 +77,15 @@ zh-TW:
           warn: 隱藏過濾內容於過濾器標題之警告後
       form_admin_settings:
         activity_api_enabled: 本站使用者的嘟文數量，以及本站的活躍使用者與一週內新使用者數量
-        backups_retention_period: 將已產生的使用者封存資料保存特定天數。
+        app_icon: WEBP、PNG、GIF、或 JPG。於行動裝置上使用自訂圖示替代預設應用程式圖示。
+        backups_retention_period: 使用者能產生他們嘟文的備份以便日後下載。當設定為正值時，這些嘟文備份將於指定之天數後自您的儲存空間中自動刪除。
         bootstrap_timeline_accounts: 這些帳號將被釘選於新帳號跟隨推薦之上。
         closed_registrations_message: 於註冊關閉時顯示
-        content_cache_retention_period: 所有來自其他伺服器之嘟文及轉嘟將於指定天數後被刪除。這項操作可能是不可逆的。所有相關之書籤、最愛、轉嘟將會遺失並且無法回復。
+        content_cache_retention_period: 所有來自其他伺服器之嘟文（包括轉嘟與回嘟）將於指定之天數後自動刪除，不論這些嘟文與本地使用者間的任何互動。這將包含本地使用者已標記為書籤或最愛之嘟文。不同站點使用者間之私訊亦將遺失且不可回復。此設定應適用於特殊情況，若常規使用將超乎多數使用者預期。
         custom_css: 您於 Mastodon 網頁版本中能套用客製化風格。
+        favicon: WEBP、PNG、GIF、或 JPG。使用自訂圖示替代預設 Mastodon favicon 圖示。
         mascot: 覆寫進階網頁介面中的圖例。
-        media_cache_retention_period: 當設定成正值時，已下載的多媒體檔案會於指定天數後被刪除，並且視需要重新下載。
+        media_cache_retention_period: 來自遠端伺服器嘟文中之多媒體內容將快取於您的伺服器。當設定為正值時，這些多媒體內容將於指定之天數後自您的儲存空間中自動刪除。若多媒體資料於刪除後被請求，且原始內容仍可存取，它們將被重新下載。由於連結預覽中第三方網站查詢頻率限制，建議將其設定為至少 14 日，否則於此之前連結預覽將不被即時更新。
         peers_api_enabled: 浩瀚聯邦宇宙中與此伺服器曾經擦肩而過的網域列表。不包含關於您是否與此伺服器是否有與之串連，僅僅表示您的伺服器已知此網域。這是供收集聯邦宇宙中一般性統計資料服務使用。
         profile_directory: 個人檔案目錄將會列出那些有選擇被發現的使用者。
         require_invite_text: 如果已設定為手動審核註冊，請將「為什麼想要加入呢？」設定為必填項目。
@@ -116,10 +118,11 @@ zh-TW:
           sign_up_requires_approval: 新註冊申請需要先經過您的審核
         severity: 請選擇將如何處理來自這個 IP 位址的請求
       rule:
+        hint: 可選的。提供關於此規則更多細節
         text: 說明使用者於此伺服器上需遵守的規則或條款。試著維持各項條款簡短而明瞭。
       sessions:
         otp: 請輸入產生自您手機 App 的兩階段驗證碼，或輸入其中一個備用驗證碼：
-        webauthn: 如果它是 USB 安全金鑰的話，請確認已正確插入，如有需要請觸擊。
+        webauthn: 若它是 USB 安全金鑰，請確認已正確插入，如有需要請觸擊。
       settings:
         indexable: 個人檔案可能出現於 Google、Bing、或其他搜尋引擎。
         show_application: 將總是顯示您發嘟文之應用程式
@@ -130,7 +133,7 @@ zh-TW:
         role: 角色控制使用者有哪些權限
       user_role:
         color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
-        highlighted: 這會讓角色公開可見
+        highlighted: 這會使角色公開可見
         name: 角色的公開名稱，如果角色設定為顯示為徽章
         permissions_as_keys: 有此角色的使用者將有權存取...
         position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
@@ -164,7 +167,7 @@ zh-TW:
           none: 什麼也不做
           sensitive: 敏感内容
           silence: 安靜
-          suspend: 停權並不可逆的刪除帳號資料
+          suspend: 停權並不可逆地刪除帳號資料
         warning_preset_id: 使用警告預設
       announcement:
         all_day: 全天活動
@@ -200,12 +203,12 @@ zh-TW:
         password: 密碼
         phrase: 關鍵字或片語
         setting_advanced_layout: 啟用進階網頁介面
-        setting_aggregate_reblogs: 時間軸中的群組轉嘟
+        setting_aggregate_reblogs: 於時間軸中不重複顯示轉嘟
         setting_always_send_emails: 總是發送電子郵件通知
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 轉嘟前先詢問我
         setting_default_language: 嘟文語言
-        setting_default_privacy: 嘟文可見範圍
+        setting_default_privacy: 嘟文隱私設定
         setting_default_sensitive: 總是將媒體標記為敏感內容
         setting_delete_modal: 刪除嘟文前先詢問我
         setting_disable_swiping: 停用滑動手勢
@@ -242,7 +245,7 @@ zh-TW:
         backups_retention_period: 使用者封存資料保留期間
         bootstrap_timeline_accounts: 永遠推薦這些帳號給新使用者
         closed_registrations_message: 當註冊關閉時的客製化訊息
-        content_cache_retention_period: 內容快取資料保留期間
+        content_cache_retention_period: 遠端內容保留期限
         custom_css: 自訂 CSS
         mascot: 自訂吉祥物 (legacy)
         media_cache_retention_period: 多媒體快取資料保留期間
@@ -299,6 +302,7 @@ zh-TW:
           patch: 通知錯誤修正更新
         trending_tag: 新熱門趨勢需要審核
       rule:
+        hint: 其他資訊
         text: 規則
       settings:
         indexable: 於搜尋引擎中包含個人檔案頁面
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a91f1d620e..f05887dc33 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -88,7 +88,7 @@ sk:
         remote: Federované
         title: Umiestnenie
       login_status: Stav prihlásenia
-      media_attachments: Prílohy
+      media_attachments: Mediálne prílohy
       memorialize: Zmeň na "Navždy budeme spomínať"
       memorialized: Spomienka na
       memorialized_msg: Úspešne zmenené %{username} na spomienkové konto
@@ -175,6 +175,7 @@ sk:
         approve_user: Odobri užívateľa
         assigned_to_self_report: Priraď hlásenie
         change_email_user: Zmeň email pre užívateľa
+        change_role_user: Zmeň užívateľskú rolu
         confirm_user: Potvrď užívateľa
         create_account_warning: Vytvor výstrahu
         create_announcement: Vytvor oboznámenie
@@ -197,11 +198,14 @@ sk:
         destroy_ip_block: Vymaž IP pravidlo
         destroy_status: Vymaž príspevok
         destroy_unavailable_domain: Vymaž nedostupnú doménu
+        destroy_user_role: Zničiť rolu
         disable_2fa_user: Vypni dvoj-faktorové overovanie
         disable_custom_emoji: Vypni vlastné emotikony
+        disable_sign_in_token_auth_user: Zakázať používateľom overovanie e-mailovým tokenom
         disable_user: Deaktivuj užívateľa
         enable_custom_emoji: Povoľ vlastné emotikony
         enable_user: Povoľ užívateľa
+        memorialize_account: Zmena na „in memoriam“
         promote_user: Povýš užívateľskú rolu
         reject_appeal: Zamietni námietku
         reject_user: Zamietni užívateľa
@@ -232,10 +236,12 @@ sk:
         confirm_user_html: "%{name} potvrdil/a emailovú adresu používateľa %{target}"
         create_account_warning_html: "%{name} poslal/a upozornenie užívateľovi %{target}"
         create_announcement_html: "%{name} vytvoril/a nové oboznámenie %{target}"
+        create_canonical_email_block_html: "%{name} zablokoval/a email s hašom %{target}"
         create_custom_emoji_html: "%{name} nahral/a novú emotikonu %{target}"
         create_domain_allow_html: "%{name} povolil/a federáciu s doménou %{target}"
         create_domain_block_html: "%{name} zablokoval/a doménu %{target}"
         create_email_domain_block_html: "%{name} zablokoval/a e-mailovú doménu %{target}"
+        create_ip_block_html: "%{name} vytvoril/a pravidlo pre IP %{target}"
         create_user_role_html: "%{name} vytvoril/a rolu pre %{target}"
         demote_user_html: "%{name} degradoval/a užívateľa %{target}"
         destroy_announcement_html: "%{name} vymazal/a oboznámenie %{target}"
@@ -248,18 +254,30 @@ sk:
         destroy_status_html: "%{name} zmazal/a príspevok od %{target}"
         destroy_unavailable_domain_html: "%{name} znova spustil/a doručovanie pre doménu %{target}"
         destroy_user_role_html: "%{name} vymazal/a rolu pre %{target}"
+        enable_custom_emoji_html: "%{name} povolil/a emotikonu %{target}"
         enable_user_html: "%{name} povolil/a prihlásenie pre používateľa %{target}"
         memorialize_account_html: "%{name} zmenil/a účet %{target} na pamätnú stránku"
+        promote_user_html: "%{name} povýšil/a užívateľa %{target}"
         reject_appeal_html: "%{name} zamietol/la námietku moderovacieho rozhodnutia od %{target}"
+        reject_user_html: "%{name} odmietol/la registráciu od %{target}"
+        remove_avatar_user_html: "%{name} vymazal/a %{target}/ov/in avatar"
         reopen_report_html: "%{name} znovu otvoril/a nahlásenie %{target}"
         resend_user_html: "%{name} znovu odoslal/a potvrdzovací email pre %{target}"
         reset_password_user_html: "%{name} resetoval/a heslo používateľa %{target}"
         resolve_report_html: "%{name} vyriešil/a nahlásenie %{target}"
-        sensitive_account_html: "%{name} označil médium od %{target} za chúlostivé"
+        sensitive_account_html: "%{name} označil/a médium od %{target} za chúlostivé"
         silence_account_html: "%{name} obmedzil/a účet %{target}"
         suspend_account_html: "%{name} zablokoval/a účet používateľa %{target}"
         unassigned_report_html: "%{name} odobral/a report od %{target}"
+        unblock_email_account_html: "%{name} odblokoval/a %{target}ovu/inu emailovú adresu"
+        unsensitive_account_html: "%{name} odznačil/a médium od %{target} ako chúlostivé"
+        unsilence_account_html: "%{name} zrušil/a obmedzenie %{target}ovho/inho účtu"
         unsuspend_account_html: "%{name} spojazdnil/a účet %{target}"
+        update_announcement_html: "%{name} aktualizoval/a oboznámenie %{target}"
+        update_custom_emoji_html: "%{name} aktualizoval/a emotikonu %{target}"
+        update_domain_block_html: "%{name} aktualizoval/a blokovanie domény pre %{target}"
+        update_ip_block_html: "%{name} zmenil/a pravidlo pre IP %{target}"
+        update_status_html: "%{name} aktualizoval/a príspevok od %{target}"
         update_user_role_html: "%{name} zmenil/a rolu pre %{target}"
       deleted_account: zmazaný účet
       empty: Žiadne záznamy nenájdené.
@@ -363,6 +381,7 @@ sk:
           silence: Obmedz
           suspend: Pozastav
         title: Nové blokovanie domény
+      no_domain_block_selected: Žiadne blokovanie domén nebolo zmenené, keďže žiadne neboli vybrané
       not_permitted: Nemáš povolenie na vykonanie tohto kroku
       obfuscate: Zatemniť názov domény
       private_comment: Súkromný komentár
@@ -430,6 +449,7 @@ sk:
       dashboard:
         instance_accounts_dimension: Najsledovanejšie účty
         instance_accounts_measure: uložené účty
+        instance_followers_measure: naši nasledovatelia tam
         instance_follows_measure: ich sledovatelia tu
         instance_languages_dimension: Najpopulárnejšie jazyky
         instance_media_attachments_measure: uložené mediálne prílohy
@@ -437,10 +457,13 @@ sk:
         instance_statuses_measure: uložené príspevky
       delivery:
         all: Všetko
+        clear: Vymazať chyby doručovania
         failing: Zlyhávajúce
+        restart: Reštartovať doručovanie
         stop: Zastav doručenie
         unavailable: Nedostupné
       delivery_available: Je v dosahu doručovania
+      delivery_error_days: Dni chybného doručovania
       empty: Nenájdené žiadne domény.
       moderation:
         all: Všetky
@@ -448,6 +471,7 @@ sk:
         title: Moderácia
       private_comment: Súkromný komentár
       public_comment: Verejný komentár
+      purge: Vyčisti
       title: Federácia
       total_blocked_by_us: Nami blokované
       total_followed_by_them: Nimi sledované
@@ -505,10 +529,14 @@ sk:
           many: "%{count} poznámok"
           one: "%{count} poznámka"
           other: "%{count} poznámky"
+      action_log: Denník auditu
       action_taken_by: Zákrok vykonal/a
       actions:
         suspend_description_html: Tento účet a všetok jeho obsah bude nedostupný a nakoniec zmazaný, interaktovať s ním bude nemožné. Zvrátiteľné v rámci 30 dní. Uzatvára všetky hlásenia voči tomuto účtu.
       add_to_report: Pridaj viac do hlásenia
+      already_suspended_badges:
+        local: Na tomto serveri už vylúčený/á
+        remote: Už vylúčený/á na ich serveri
       are_you_sure: Si si istý/á?
       assign_to_self: Priraď sebe
       assigned: Priradený moderátor
@@ -518,6 +546,7 @@ sk:
       comment:
         none: Žiadne
       confirm: Potvrď
+      confirm_action: Potvrď moderovací úkon proti @%{acct}
       created_at: Nahlásené
       delete_and_resolve: Vymaž príspevky
       forwarded: Preposlané
@@ -568,11 +597,18 @@ sk:
         administration: Spravovanie
         invites: Pozvánky
         moderation: Moderácia
+        special: Špeciálne
       delete: Vymaž
       edit: Uprav postavenie %{name}
       everyone: Východzie oprávnenia
+      permissions_count:
+        few: "%{count} povolení"
+        many: "%{count} povolení"
+        one: "%{count} povolenie"
+        other: "%{count} povolenia"
       privileges:
         administrator: Správca
+        administrator_description: Užívatelia s týmto povolením, obídu všetky povolenia
         delete_user_data: Vymaž užívateľské dáta
         invite_users: Pozvi užívateľov
         manage_announcements: Spravuj oboznámenia
@@ -600,7 +636,10 @@ sk:
         title: Ohľadom
       appearance:
         title: Vzhľad
+      branding:
+        title: Značka
       content_retention:
+        danger_zone: Riziková zóna
         title: Ponechanie obsahu
       discovery:
         follow_recommendations: Odporúčania pre nasledovanie
@@ -621,6 +660,7 @@ sk:
           approved: Pre registráciu je nutné povolenie
           none: Nikto sa nemôže registrovať
           open: Ktokoľvek sa môže zaregistrovať
+        warning_hint: Odporúčame používať "Pre registráciu je potrebné schválenie", pokiaľ si niesi istý/á, že tvoj moderovací tím vie zvládnuť spam a záškodné registrácie včas.
       title: Nastavenia servera
     site_uploads:
       delete: Vymaž nahratý súbor
@@ -630,6 +670,7 @@ sk:
       documentation_link: Zisti viac
       release_notes: Poznámky k vydaniu
       title: Dostupné aktualizácie
+      type: Druh
       types:
         major: Hlavné vydanie
         patch: Opravné vydanie - opravy a jednoducho uplatniteľné zmeny
@@ -638,6 +679,7 @@ sk:
       account: Autor
       application: Aplikácia
       back_to_account: Späť na účet
+      back_to_report: Späť na stránku hlásenia
       batch:
         remove_from_report: Vymaž z hlásenia
         report: Hlásenie
@@ -703,10 +745,16 @@ sk:
       tags:
         dashboard:
           tag_accounts_measure: unikátnych použití
+          tag_languages_dimension: Najpoužívanejšie jazyky
+          tag_servers_dimension: Najpoužívanejšie servery
           tag_servers_measure: iné servery
           tag_uses_measure: užívateľov celkovo
+        listable: Môže byť navrhnutý
+        not_listable: Nebude navrhnutý
+        not_trendable: Neobjaví sa medzi trendmi
         not_usable: Nemôže byť použitý
         title: Populárne štítky
+        trendable: Môže sa objaviť medzi trendmi
         trending_rank: 'Populárne #%{rank}'
         usable: Môže byť použitý
       title: Trendy
@@ -717,15 +765,21 @@ sk:
       edit_preset: Uprav varovnú predlohu
       title: Spravuj varovné predlohy
     webhooks:
-      delete: Zmazať
+      delete: Vymaž
       disable: Vypni
       disabled: Vypnuté
       enable: Povoľ
+      enabled: Aktívne
       status: Stav
   admin_mailer:
+    auto_close_registrations:
+      subject: Registrácie na %{instance} boli automaticky prepnuté na vyžadujúce schválenie
     new_appeal:
       actions:
+        delete_statuses: vymazať ich príspevky
+        disable: zmraziť ich účet
         none: varovanie
+        silence: obmedziť ich účet
     new_pending_account:
       body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť.
       subject: Nový účet očakáva preverenie na %{instance} (%{username})
@@ -775,7 +829,9 @@ sk:
     captcha_confirmation:
       title: Bezpečnostná kontrola
     confirmations:
+      clicking_this_link: kliknutím na tento odkaz
       login_link: prihlás sa
+      proceed_to_login_html: Teraz môžeš pokračovať na %{login_link}.
       welcome_title: Vitaj, %{name}!
     delete_account: Vymaž účet
     delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak <a href="%{path}">urobiť tu</a>. Budeš požiadaný/á o potvrdenie tohto kroku.
@@ -783,6 +839,7 @@ sk:
       prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
       prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
       suffix: S pomocou účtu budeš môcť nasledovať ľudí, posielať príspevky, a vymieňať si správy s užívateľmi na hocijakom Mastodon serveri, ale aj na iných serveroch!
+    dont_have_your_security_key: Nemáš svoj bezpečnostný kľúč?
     forgot_password: Zabudnuté heslo?
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
     log_in_with: Prihlás sa s
@@ -793,6 +850,8 @@ sk:
     or_log_in_with: Alebo prihlás s
     progress:
       confirm: Potvrď email
+      details: Tvoje údaje
+      rules: Súhlas s pravidlami
     register: Zaregistruj sa
     registration_closed: "%{instance} neprijíma nových členov"
     resend_confirmation: Odošli potvrdzovací odkaz znovu
@@ -853,15 +912,23 @@ sk:
       username_unavailable: Tvoja prezývka ostane neprístupná
   disputes:
     strikes:
+      action_taken: Vykonaný zákrok
       appeal: Namietni
+      appeal_submitted_at: Námietka odoslaná
       appeals:
         submit: Pošli námietku
       approve_appeal: Schváľ námietku
       created_at: Dátumom
       recipient: Adresované pre
+      reject_appeal: Zamietni námietku
       title_actions:
+        disable: Zmrazenie účtu
+        mark_statuses_as_sensitive: Označenie príspevkov za chúlostivé
         none: Varovanie
+        sensitive: Označenie účtu ako chúlostivý
         silence: Obmedzenie účtu
+      your_appeal_approved: Tvoja námietka bola schválená
+      your_appeal_pending: Odoslal si námietku
   domain_validator:
     invalid_domain: nieje správny tvar domény
   edit_profile:
@@ -922,7 +989,11 @@ sk:
       expires_on: Expiruje dňa %{date}
       title: Triedenia
     new:
+      save: Uložiť nový filter
       title: Pridaj nové triedenie
+    statuses:
+      batch:
+        remove: Odstrániť z filtrovania
   generic:
     all: Všetko
     cancel: Zruš
@@ -941,15 +1012,28 @@ sk:
   imports:
     errors:
       over_rows_processing_limit: obsahuje viac než %{count} riadkov
+      too_large: Súbor je príliš veľký
+    failures: Zlyhaní(a)
+    imported: Nahrané
     modes:
       merge: Spoj dohromady
       merge_long: Ponechaj existujúce záznamy a pridaj k nim nové
       overwrite: Prepíš
       overwrite_long: Nahraď súčasné záznamy novými
     preface: Môžeš nahrať dáta ktoré si exportoval/a z iného Mastodon serveru, ako sú napríklad zoznamy ľudí ktorých sleduješ, alebo blokuješ.
+    recent_imports: Nedávne nahrania
+    states:
+      finished: Dokončené
+      unconfirmed: Nepotvrdených
+    status: Stav
     success: Tvoje dáta boli nahraté úspešne, a teraz budú spracované v danom čase
+    titles:
+      bookmarks: Nahrávanie záložiek
+      domain_blocking: Nahrávanie blokovaných domén
+      lists: Nahrávanie zoznamov
     type_groups:
       constructive: Sledovania a záložky
+      destructive: Blokovania a utíšenia
     types:
       blocking: Zoznam blokovaných
       bookmarks: Záložky
@@ -992,6 +1076,9 @@ sk:
       sign_in_token: emailovým bezpečtnostným kódom
       webauthn: bezpečnostnými kľúčmi
     title: História overení
+  mail_subscriptions:
+    unsubscribe:
+      title: Ukonči odber
   media_attachments:
     validations:
       images_and_video: K príspevku ktorý už obsahuje obrázky nemôžeš priložiť video
@@ -1064,7 +1151,6 @@ sk:
   notifications:
     email_events: Udalosti oznamované emailom
     email_events_hint: 'Vyber si udalosti, pre ktoré chceš dostávať oboznámenia:'
-    other_settings: Ostatné oboznamovacie nastavenia
   otp_authentication:
     enable: Povoľ
   pagination:
@@ -1088,11 +1174,18 @@ sk:
     posting_defaults: Východiskové nastavenia príspevkov
     public_timelines: Verejné časové osi
   privacy:
+    privacy: Súkromie
+    search: Vyhľadávanie
     title: Súkromie a dosah
+  privacy_policy:
+    title: Pravidlá ochrany súkromia
   reactions:
     errors:
       limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
       unrecognized_emoji: je neznámy smajlík
+  redirects:
+    prompt: Ak tomuto odkazu veríš, klikni naňho pre pokračovanie.
+    title: Opúšťaš %{instance}.
   relationships:
     activity: Aktivita účtu
     confirm_follow_selected_followers: Si si istý/á, že chceš nasledovať vybraných sledujúcich?
@@ -1116,6 +1209,11 @@ sk:
     status: Stav účtu
   remote_follow:
     missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu
+  rss:
+    content_warning: 'Varovanie o obsahu:'
+    descriptions:
+      account: Verejné príspevky od @%{acct}
+      tag: 'Verejné príspevky otagované #%{hashtag}'
   scheduled_statuses:
     over_daily_limit: Prekročil/a si denný limit %{limit} predplánovaných príspevkov
     over_total_limit: Prekročil/a si limit %{limit} predplánovaných príspevkov
@@ -1134,6 +1232,7 @@ sk:
       unknown_browser: Neznámy prehliadač
       weibo: Sina/Tencent Weibo
     current_session: Aktuálna sezóna
+    date: Dátum
     description: "%{browser} na %{platform}"
     explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
     ip: IP adresa
@@ -1161,11 +1260,15 @@ sk:
     import: Importuj
     import_and_export: Import a export
     migrate: Presuň účet
-    notifications: Oboznámenia
+    notifications: Emailové upozornenia
     preferences: Voľby
     profile: Profil
     relationships: Sledovania a následovatelia
     two_factor_authentication: Dvojfázové overenie
+    webauthn_authentication: Bezpečnostné kľúče
+  severed_relationships:
+    lost_followers: Stratení nasledovatelia
+    lost_follows: Stratené sledovania
   statuses:
     attached:
       description: 'Priložené: %{attached}'
@@ -1176,11 +1279,13 @@ sk:
         other: "%{count} obrázky"
     boosted_from_html: Vyzdvihnuté od %{acct_link}
     content_warning: 'Varovanie o obsahu: %{warning}'
+    default_language: Rovnaký ako jazyk rozhrania
     disallowed_hashtags:
       few: 'obsah nepovolených haštagov: %{tags}'
       many: 'obsah nepovolených haštagov: %{tags}'
       one: 'obsahoval nepovolený haštag: %{tags}'
       other: 'obsahoval nepovolené haštagy: %{tags}'
+    edited_at_html: Upravené %{date}
     errors:
       in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, pravdepodobne neexistuje.
     open_in_web: Otvor v okne na webe
@@ -1205,6 +1310,7 @@ sk:
     show_thread: Ukáž diskusné vlákno
     title: '%{name}: „%{quote}"'
     visibilities:
+      direct: Súkromne
       private: Iba pre sledovateľov
       private_long: Ukáž iba následovateľom
       public: Verejné
@@ -1212,10 +1318,24 @@ sk:
       unlisted: Nezaradené
       unlisted_long: Všetci môžu vidieť, ale nieje zaradené do verejnej osi
   statuses_cleanup:
+    exceptions: Výnimky
+    ignore_favs: Ignoruj obľúbené
+    ignore_reblogs: Ignoruj vyzdvihnutia
+    keep_direct: Ponechaj súkromné správy
     keep_pinned: Ponechaj pripnuté príspevky
     keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov
+    keep_polls: Ponechaj ankety
     keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami
     keep_self_fav: Ponechať príspevky, ktoré si si obľúbil/a
+    min_age:
+      '1209600': 2 týždne
+      '15778476': 6 mesačné
+      '2629746': 1 mesačné
+      '31556952': 1 ročné
+      '5259492': 2 mesačné
+      '604800': 1 týždeň
+      '63113904': 2 ročné
+      '7889238': 3 mesačné
   stream_entries:
     sensitive_content: Senzitívny obsah
   tags:
@@ -1241,34 +1361,58 @@ sk:
     recovery_instructions_html: Keď hocikedy stratíš prístup k svojmu telefónu, môžeš použiť jeden z prístupových kódov nižšie pre obnovenie prístupu k svojmu účtu. <strong>Skladuj tieto prístupové kódy na bezpečnom mieste</strong>. Napríklad ich môžeš vytlačiť a uložiť ich spolu s inými dôležitými dokumentami.
   user_mailer:
     appeal_approved:
-      action: Choď na svoj účet
+      action: Nastavenia účtu
+      title: Námietka schválená
+    appeal_rejected:
+      subtitle: Tvoje odvolanie bolo zamietnuté.
+      title: Námietka zamietnutá
     backup_ready:
-      explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu. Táto záloha je teraz pripravená na stiahnutie!
+      explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu.
+      extra: Teraz je pripravená na stiahnutie!
       subject: Tvoj archív je pripravený na stiahnutie
       title: Odber archívu
+    failed_2fa:
+      details: 'Tu sú podrobnosti o pokuse o prihlásenie:'
+    suspicious_sign_in:
+      change_password: zmeň svoje heslo
+      title: Nové prihlásenie
     warning:
+      appeal: Pošli námietku
+      reason: 'Dôvod:'
       subject:
         disable: Tvoj účet %{acct} bol zamrazený
         none: Varovanie pre %{acct}
         silence: Tvoj účet %{acct} bol obmedzený
         suspend: Tvoj účet %{acct} bol vylúčený
       title:
+        delete_statuses: Príspevky vymazané
         disable: Účet bol zamrazený
+        mark_statuses_as_sensitive: Príspevky označené za chúlostivé
         none: Varovanie
+        sensitive: Účet označený za chúlostivý
         silence: Účet bol obmedzený
         suspend: Tvoj účet bol vylúčený
     welcome:
-      edit_profile_action: Nastav profil
+      apps_android_action: Získaj ju na Google Play
+      apps_ios_action: Stiahni z App Store
+      apps_step: Stiahni naše oficiálne aplikácie.
+      apps_title: Mastodon aplikácie
+      edit_profile_action: Prispôsob
+      edit_profile_title: Prispôsob si svoj profil
       explanation: Tu nájdeš nejaké tipy do začiatku
-      final_action: Začni prispievať
-      full_handle: Adresa tvojho profilu v celom formáte
-      full_handle_hint: Toto je čo musíš dať vedieť svojím priateľom aby ti mohli posielať správy, alebo ťa následovať z iného serveru.
+      feature_action: Zisti viac
+      follow_action: Nasleduj
+      follows_title: Koho nasledovať
+      post_title: Vytvor svoj prvý príspevok
+      share_action: Zdieľaj
+      sign_in_action: Prihlás sa
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!
   users:
     follow_limit_reached: Nemôžeš následovať viac ako %{limit} ľudí
     invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
+    rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.
     seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
     signed_in_as: 'Prihlásená/ý ako:'
   verification:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 83d52ae0e7..6c26511ad6 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -621,6 +621,9 @@ sl:
       actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
       actions_description_remote_html: Odločite se za dejanje, ki bo odločilo o tej prijavi. To bo vplivalo le na to, kako <strong>vaš</strong> strežnik komunicira s tem oddaljenim računom in obravnava njegovo vsebino.
       add_to_report: Dodaj več v prijavo
+      already_suspended_badges:
+        local: Že suspendiran na tem strežniku
+        remote: Že suspendiran na njihovem strežniku
       are_you_sure: Ali ste prepričani?
       assign_to_self: Dodeli meni
       assigned: Dodeljen moderator
@@ -776,6 +779,7 @@ sl:
         desc_html: To se zanaša na zunanje skripte hCaptcha in lahko predstavlja tveganje za varnost in zasebnost. Poleg tega <strong>to lahko nekaterim ljudem (posebno invalidom) občutno oteži dostopnost registracijskega postopka</strong>. Zato svetujemo, da razmislite o drugih ukrepih, kot je na primer registracija na podlagi odobritve ali povabila.
         title: Od novih uporabnikov zahtevaj reševanje CAPTCHA za potrditev računov
       content_retention:
+        danger_zone: Območje nevarnosti
         preamble: Nazdor nad hrambo vsebine uporabnikov v Mastodonu.
         title: Hramba vsebin
       default_noindex:
@@ -795,6 +799,7 @@ sl:
         disabled: Nikomur
         users: Prijavljenim krajevnim uporabnikom
       registrations:
+        moderation_recommandation: Preden prijave odprete za vse poskrbite, da imate v ekipi moderatorjev zadosti aktivnih članov.
         preamble: Nadzirajte, kdo lahko ustvari račun na vašem strežniku.
         title: Registracije
       registrations_mode:
@@ -802,6 +807,7 @@ sl:
           approved: Potrebna je odobritev za prijavo
           none: Nihče se ne more prijaviti
           open: Vsakdo se lahko prijavi
+        warning_hint: Priporočamo uporabo možnosti »Potrebna je odobritev za prijavo«, razen če ste gotovi, da se bo vaša ekipa moderatorjev res zmožna hitro odzvati na neželene vsebine in škodoželjne prijave.
       security:
         authorized_fetch: Od drugih strežnikov v federaciji zahtevaj overitev pristnosti
         authorized_fetch_hint: Zahtevanje overitve pristnosti od drugih strežnikov v federaciji omogoči strožje uveljavljanje uporabniških in strežniških blokad. Vendar je cena za to počasnejše delovanje, zmanjšanje dosega vaših odgovorov in morebitne težave z združljivostjo z nekaterimi storitvami v federaciji. Poleg tega to odločenim akterjem ne bo preprečilo pridobivanja vaših javnih objav in računov.
@@ -1002,6 +1008,9 @@ sl:
       title: Spletne zanke
       webhook: Spletna zanka
   admin_mailer:
+    auto_close_registrations:
+      body: Zaradi pomanjkanja moderiranja v zadnjem času, se je za strežnik %{instance} samodejno vklopilo ročno preverjanje in potrjevanje prijav. S tem se prepreči morebitno zlorabo strežnika %{instance}. Prijave lahko kadarkoli spet spremenite nazaj v odprte.
+      subject: Za strežnik %{instance} se je samodejno vklopilo ročno potrjevanje prijav
     new_appeal:
       actions:
         delete_statuses: brisanje njihovih objav,
@@ -1251,17 +1260,17 @@ sl:
   exports:
     archive_takeout:
       date: Datum
-      download: Prenesi svoj arhiv
-      hint_html: Zahtevate lahko arhiv vaših <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
-      in_progress: Prevajanje arhiva...
+      download: Prenesite svoj arhiv
+      hint_html: Zahtevate lahko arhiv svojih <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
+      in_progress: Pripravljanje vašega arhiva …
       request: Zahtevajte svoj arhiv
       size: Velikost
-    blocks: Blokirate
+    blocks: Blokirani
     bookmarks: Zaznamki
     csv: CSV
-    domain_blocks: Bloki domene
+    domain_blocks: Blokirane domene
     lists: Seznami
-    mutes: Utišate
+    mutes: Utišani
     storage: Shranjeni mediji
   featured_tags:
     add_new: Dodaj novo
@@ -1542,7 +1551,6 @@ sl:
     administration_emails: E-poštna obvestila skrbnika
     email_events: Dogodki za e-obvestila
     email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
-    other_settings: Druge nastavitve obvestil
   number:
     human:
       decimal_units:
@@ -1598,22 +1606,25 @@ sl:
     errors:
       limit_reached: Dosežena omejitev različnih reakcij/odzivov
       unrecognized_emoji: ni prepoznan emotikon
+  redirects:
+    prompt: Če zaupate tej povezavi, jo kliknite za nadaljevanje.
+    title: Zapuščate %{instance}.
   relationships:
     activity: Dejavnost računa
     confirm_follow_selected_followers: Ali ste prepričani, da želite slediti izbranim sledilcem?
     confirm_remove_selected_followers: Ali ste prepričani, da želite odstraniti izbrane sledilce?
     confirm_remove_selected_follows: Ali ste prepričani, da želite odstraniti izbrana sledenja?
-    dormant: Skrit
+    dormant: Nedejavno
     follow_failure: Nekaterim od izbranih računov ni bilo mogoče slediti.
     follow_selected_followers: Sledi izbranim sledilcem
     followers: Sledilci
-    following: Sledi
+    following: Sledeni
     invited: Vabljeni
     last_active: Zadnja dejavnost
-    most_recent: Najnovejša
+    most_recent: Najnovejše
     moved: Prestavljeno
-    mutual: Vzajemna
-    primary: Primarna
+    mutual: Vzajemno
+    primary: Primarno
     relationship: Razmerje
     remove_selected_domains: Odstrani vse sledilce iz izbranih domen
     remove_selected_followers: Odstrani izbrane sledilce
@@ -1660,6 +1671,7 @@ sl:
       unknown_browser: Neznan brskalnik
       weibo: Weibo
     current_session: Trenutna seja
+    date: Datum
     description: "%{browser} na %{platform}"
     explanation: To so spletni brskalniki, ki so trenutno prijavljeni v vaš Mastodon račun.
     ip: IP
@@ -1696,14 +1708,26 @@ sl:
     import: Uvozi
     import_and_export: Uvoz in izvoz
     migrate: Selitev računa
-    notifications: Obvestila
+    notifications: Obvestila po e-pošti
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
+    severed_relationships: Prekinjene veze
     statuses_cleanup: Samodejno brisanje objav
     strikes: Ukrepi morediranja
     two_factor_authentication: Dvofaktorsko overjanje
     webauthn_authentication: Varnostni ključi
+  severed_relationships:
+    download: Prejmi (%{count})
+    event_type:
+      account_suspension: Suspendiranje računa (%{target_name})
+      domain_block: Suspendiranje strežnika (%{target_name})
+      user_domain_block: Blokirali ste %{target_name}
+    lost_followers: Izgubljeni sledilci
+    lost_follows: Izgubljena sledeni
+    preamble: Če blokirate domeno ali če se vaši moderatorji odločijo suspendirati oddaljen strežnik, lahko izgubite sledene in sledilce. Ko se to zgodi, boste lahko prejeli sezname prekinjenih vez za pregled in morebitno uvažanje na drugem strežniku.
+    purged: Podatke o tem strežniku so očistili skrbniki vašega strežnika.
+    type: Dogodek
   statuses:
     attached:
       audio:
@@ -1753,8 +1777,6 @@ sl:
         two: "%{count} glasova"
       vote: Glasuj
     show_more: Pokaži več
-    show_newer: Pokaži novejše
-    show_older: Pokaži starejše
     show_thread: Pokaži nit
     title: "%{name}: »%{quote}«"
     visibilities:
@@ -1811,6 +1833,7 @@ sl:
     contrast: Mastodon (Visok kontrast)
     default: Mastodon (Temna)
     mastodon-light: Mastodon (Svetla)
+    system: Samodejno (uporabi sistemsko temo)
   time:
     formats:
       default: "%b %d %Y, %H:%M"
@@ -1838,18 +1861,27 @@ sl:
     webauthn: Varnostni ključi
   user_mailer:
     appeal_approved:
-      action: Pojdite na svoj račun
+      action: Nastavitve računa
       explanation: Pritožbi na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bilo ugodeno. Vaš račun je znova nesporen.
       subject: Vaši pritožbi z dne %{date} je bilo ugodeno
+      subtitle: Vaš račun je znova na dobrem glasu.
       title: Pritožbi ugodeno
     appeal_rejected:
       explanation: Pritožba na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bila zavrnjena.
       subject: Vaša pritožba z dne %{date} je bila zavrnjena
+      subtitle: Vaša pritožba je bila zavržena.
       title: Pritožba zavrnjena
     backup_ready:
-      explanation: Zahtevali ste popolno varnostno kopijo računa Mastodon. Zdaj je pripravljen za prenos!
+      explanation: Zahtevali ste polno varnostno kopijo svojega računa Mastodon.
+      extra: Zdaj je na voljo za prenos!
       subject: Vaš arhiv je pripravljen za prenos
       title: Prevzem arhiva
+    failed_2fa:
+      details: 'Tukaj so podrobnosti poskusa prijave:'
+      explanation: Nekdo se je poskusil prijaviti v vaš račun, vendar ni podal veljavnega drugega faktorja preverjanja pristnosti.
+      further_actions_html: Če to niste bili vi, priporočamo, da takoj %{action}, ker je lahko ogrožena varnost.
+      subject: Napaka preverjanja pristnosti z drugim faktorjem
+      title: Preverjanje pristnosti z drugim faktorjem je spodletelo
     suspicious_sign_in:
       change_password: spremenite svoje geslo
       details: 'Tukaj so podrobnosti prijave:'
@@ -1889,13 +1921,46 @@ sl:
         silence: Račun je omejen
         suspend: Račun je suspendiran
     welcome:
-      edit_profile_action: Nastavitve profila
-      edit_profile_step: Profil lahko prilagodite tako, da naložite sliko profila, spremenite pojavno ime in drugo. Lahko izberete, da želite pregledati nove sledilce, preden jim dovolite sledenje.
+      apps_android_action: Na voljo v Google Play
+      apps_ios_action: Prenesi iz trgovine App Store
+      apps_step: Prenesite naše uradne aplikacije.
+      apps_title: Programi za Mastodon
+      checklist_subtitle: 'Naj vas pripravimo na doživetja na tej novi družabni meji:'
+      checklist_title: Seznam dobrodošlice
+      edit_profile_action: Poosebite
+      edit_profile_step: Okrepite svoje interakcije z razumljivim profilom.
+      edit_profile_title: Prilagodite svoj profil
       explanation: Tu je nekaj nasvetov za začetek
-      final_action: Začnite objavljati
-      final_step: 'Začnite objavljati! Tudi brez sledilcev bodo vaše javne objave videli drugi, npr. na krajevni časovnici ali v ključnikih. Morda se želite predstaviti s ključnikom #introductions.'
-      full_handle: Vaša polna ročica
-      full_handle_hint: To bi povedali svojim prijateljem, da vam lahko pošljejo sporočila ali vam sledijo iz drugega strežnika.
+      feature_action: Več o tem
+      feature_audience: Mastodon zagotavlja enkratno možnost upravljanja s svojim občinstvom brez posrednika. Mastodon na lastni infrastrukturi omogoča sledenje drugih in drugim na in s poljubljnega povezanega strežnika Masodon in je zgolj pod vašim nadzorom.
+      feature_audience_title: Zaupno razvijajte svoje občinstvo
+      feature_control: Sami najbolje veste, kaj želite videti v svojem viru. Brez algoritmov ali oglasov, ki bi predstavljali izgubo vašega časa. Sledite komur koli prek poljubnega strežnika Mastodon na enem samem računu in prejmite njihove objave v kronološkem zaporedju ter ustvarite svoj kotiček interneta malce bolj po svoji meri in okusu.
+      feature_control_title: Ohranite nadzor nad svojo časovnico
+      feature_creativity: Mastodon podpira zvokovne, video in slikovne objave, opise za dostopnost, ankete, opozorila za vsebino, animirane avatarje, čustvenčke po meri, nadzor na obrezavo oglednih sličic in še veliko drugega. Tako se lahko povsem izrazite na spletu. Najsi želite objaviti svoja likovna dela, glasbo ali podkast, Mastodon vam stoji ob strani.
+      feature_creativity_title: Edinstvena ustvarjalnost
+      feature_moderation: Mastodon vrača odločanje v vaše roke. Vsak strežnik ustvari lastna pravila in predpise, ki se uveljavljajo krajevno in ne od zgoraj navzdol, kot to velja za korporacijske družabne medije. Zato je kar se da prilagodljiv pri odzivanju na potrebe različnih skupin ljudi. Pridružite se strežniku s pravili, s katerimi se strinjate, ali gostite lastnega.
+      feature_moderation_title: Moderiranje, kot bi moralo biti
+      follow_action: Sledite
+      follow_step: Sledenje zanimivim osebam je bistvo Mastodona.
+      follow_title: Poosebite svoj domači vir
+      follows_subtitle: Sledite dobro znanim računom
+      follows_title: Komu slediti
+      follows_view_more: Pokaži več oseb za sledenje
+      hashtags_recent_count:
+        few: "%{people} osebe v zadnjih dveh dneh"
+        one: "%{people} oseba v zadnjih dveh dneh"
+        other: "%{people} oseb v zadnjih dveh dneh"
+        two: "%{people} osebi v zadnjih dveh dneh"
+      hashtags_subtitle: Raziščite, kaj je v trendu zadnja dva dni
+      hashtags_title: Ključniki v trendu
+      hashtags_view_more: Pokaži več ključnikov v trendu
+      post_action: Sestavi
+      post_step: Pozdravite cel svet z besedilom, fotografijami, videoposnetki ali anketami.
+      post_title: Ustvarite svojo prvo objavo
+      share_action: Delite
+      share_step: Naj prijatelji izvejo, kako vas najdejo na Mastodonu.
+      share_title: Delite svoj profil Mastodon z drugimi
+      sign_in_action: Prijava
       subject: Dobrodošli na Mastodon
       title: Dobrodošli, %{name}!
   users:
@@ -1903,6 +1968,7 @@ sl:
     go_to_sso_account_settings: Pojdite na nastavitve svojega računa ponudnika identitete
     invalid_otp_token: Neveljavna dvofaktorska koda
     otp_lost_help_html: Če ste izgubili dostop do obeh, stopite v stik z %{email}
+    rate_limited: Preveč poskusov preverjanja pristnosti, poskusite kasneje.
     seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
     signed_in_as: 'Vpisani kot:'
   verification:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 9ab6e85361..8319cfcaec 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -188,7 +188,7 @@ sq:
         create_user_role: Krijoni Rol
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
-        destroy_canonical_email_block: Fshi Bllokim El-esh
+        destroy_canonical_email_block: Fshi Bllokim Email-esh
         destroy_custom_emoji: Fshi Emotikon Vetjak
         destroy_domain_allow: Fshi Lejim Përkatësie
         destroy_domain_block: Fshi Bllokim Përkatësie
@@ -283,7 +283,7 @@ sq:
         unsuspend_account_html: "%{name} hoqi pezullimin për llogarinë e %{target}"
         update_announcement_html: "%{name} përditësoi lajmërimin %{target}"
         update_custom_emoji_html: "%{name} përditësoi emoxhin %{target}"
-        update_domain_block_html: "%{name} përditësoi bllokimin e përkatësish për %{target}"
+        update_domain_block_html: "%{name} përditësoi bllokim përkatësish për %{target}"
         update_ip_block_html: "%{name} ndryshoi rregull për IP-në %{target}"
         update_status_html: "%{name} përditësoi gjendjen me %{target}"
         update_user_role_html: "%{name} ndryshoi rolin për %{target}"
@@ -596,6 +596,9 @@ sq:
       actions_description_html: Vendosni cili veprim të kryhet për të zgjidhur këtë raportim. Nëse ndërmerrni një veprim ndëshkues kundër llogarisë së raportuar, atyre do t’u dërgohet një njoftim me email, hiq rastin kur përzgjidhet kategoria <strong>I padëshiruar</strong>.
       actions_description_remote_html: Vendosni cili veprim të ndërmerret për zgjidhjen e këtij raportimi. Kjo do të prekë vetëm mënyrën se si shërbyesi <strong>juaj</strong> komunikon me këtë llogari të largët dhe se si e trajtojnë lëndën e saj.
       add_to_report: Shtoni më tepër te raportimi
+      already_suspended_badges:
+        local: Tashmë i pezulluar në këtë shërbyes
+        remote: Tashmë i pezulluar në shërbyesin e vet
       are_you_sure: A jeni i sigurt?
       assign_to_self: Caktojani vetes
       assigned: Iu caktua moderator
@@ -745,6 +748,7 @@ sq:
         desc_html: Kjo bazohet në programthe të jashtëm prej hCaptcha, çka mund të përbëjë një shqetësim për sigurinë dhe privatësinë. Veç kësaj, <strong>kjo mund ta bëjë procesin e regjistrimit në shkallë të madhe më pak të përdorshëm për disa persona (veçanërisht ata me paaftësi)</strong>. Për këto arsye, ju lutemi, shihni mundësinë e masave alternative, fjala vjen, bazuar në miratim, ose regjistrim vetëm me ftesa.
         title: Kërko prej përdoruesve të rinj të zgjidhin një CAPTCHA, si ripohim të llogarisë të tyre
       content_retention:
+        danger_zone: Zonë rreziku
         preamble: Kontrolloni se si depozitohen në Mastodon lënda e prodhuar nga përdoruesit.
         title: Mbajtje lënde
       default_noindex:
@@ -764,6 +768,7 @@ sq:
         disabled: Për askënd
         users: Për përdorues vendorë që kanë bërë hyrjen
       registrations:
+        moderation_recommandation: Ju lutemi, sigurohuni si keni një ekip adekuat dhe reagues moderimi, përpara se të hapni regjistrimet për këdo!
         preamble: Kontrolloni cilët mund të krijojnë llogari në shërbyesin tuaj.
         title: Regjistrime
       registrations_mode:
@@ -771,6 +776,7 @@ sq:
           approved: Për regjistrim, lypset miratimi
           none: S’mund të regjistrohet ndokush
           open: Mund të regjistrohet gjithkush
+        warning_hint: Rekomandojmë përdorimin e “Për regjistrim lypset miratim”. veç nëse jeni i bindur se ekipi juaj i moderimit mund të trajtojë në kohë mesazhe të padëshiruar dhe regjistrime dashakeqe.
       security:
         authorized_fetch: Kërko doemos mirëfilltësim prej shërbyes të federuar
         authorized_fetch_hint: Kërkimi doemos i kryerjes së mirëfilltësimit për shërbyes të federuar aktivizon detyrim më strikt të bllokimeve si në shkallë përdoruesi, ashtu edhe në shkallë shërbyesi. Por kjo vjen me koston e një keqësimi të funksionimit, redukton përhapjen e përgjigjeve tuaja dhe mund të sjellë probleme përputhshmërie me disa shërbime të federuara. Veç kësaj, kjo s’do t’ua pengojë, aktorëve vënë kësaj, të sjellin postimet dhe llogaritë tuaja publike.
@@ -839,10 +845,10 @@ sq:
       elasticsearch_index_mismatch:
         message_html: Përshoqërimet e treguesit të Elasticsearch-it janë të vjetruara. Ju lutemi, xhironi <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
-        action: Shihni documentimin
+        action: Shihni dokumentimin
         message_html: Grupi i instancave tuaja Elasticsearch ka më shumë se një nyjë, por Mastodon-i s’është formësuar t’i përdorë ato.
       elasticsearch_preset_single_node:
-        action: Shihni documentimin
+        action: Shihni dokumentimin
         message_html: Grupi i instancave tuaja Elasticsearch ka vetëm një nyjë, <code>ES_PRESET</code> i duhet dhënë vlera <code>single_node_cluster</code>.
       elasticsearch_reset_chewy:
         message_html: Treguesi juaj i sistemit Elasticsearch është i vjetruar, për shkak të një ndryshimi rregullimesh. Për ta përditësuar, ju lutemi, xhironi <code>tootctl search deploy --reset-chewy</code>.
@@ -962,6 +968,9 @@ sq:
       title: Webhook-ë
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Për shkak mungese veprimtarie moderatori së fundi, regjistrimet te %{instance} janë kaluar automatikisht të kërkojnë shqyrtim dorazi, për të penguar përdorimin e %{instance} si një platformë për aktorë të këqij. Mund të kaloni kurdo te regjistrime të hapura.
+      subject: Regjistrimet te %{instance} janë kaluar automatikisht të kërkojnë miratim
     new_appeal:
       actions:
         delete_statuses: fshirje e postimeve të tij
@@ -1486,7 +1495,6 @@ sq:
     administration_emails: Njoftime email për përgjegjësin
     email_events: Akte për njoftim me email
     email_events_hint: 'Përzgjidhni akte për të cilët doni të merrni njoftime:'
-    other_settings: Rregullimet të tjera njoftimesh
   number:
     human:
       decimal_units:
@@ -1542,6 +1550,9 @@ sq:
     errors:
       limit_reached: U mbërrit në kufirin e reagimeve të ndryshme
       unrecognized_emoji: s’është emotikon i pranuar
+  redirects:
+    prompt: Nëse e besoni këtë lidhje, klikoni që të vazhdohet.
+    title: Po e braktisni %{instance}.
   relationships:
     activity: Veprimtari llogarie
     confirm_follow_selected_followers: Jeni i sigurt se doni të ndiqet ndjekësit e përzgjedhur?
@@ -1604,6 +1615,7 @@ sq:
       unknown_browser: Shfletues i Panjohur
       weibo: Weibo
     current_session: Sesioni i tanishëm
+    date: Datë
     description: "%{browser} në %{platform}"
     explanation: Këta janë shfletuesit e përdorur tani për hyrje te llogaria juaj Mastodon.
     ip: IP
@@ -1640,14 +1652,26 @@ sq:
     import: Importo
     import_and_export: Importim dhe eksportim
     migrate: Migrim llogarie
-    notifications: Njoftime
+    notifications: Njoftime me email
     preferences: Parapëlqime
     profile: Profil
     relationships: Ndjekje dhe ndjekës
+    severed_relationships: Marrëdhënie të ndërprera
     statuses_cleanup: Fshirje e automatizuar postimesh
     strikes: Paralajmërime nga moderimi
     two_factor_authentication: Mirëfilltësim Dyfaktorësh
     webauthn_authentication: Kyçe sigurie
+  severed_relationships:
+    download: Shkarkim (%{count})
+    event_type:
+      account_suspension: Pezullim llogarie (%{target_name})
+      domain_block: Pezullim shërbyesi (%{target_name})
+      user_domain_block: Bllokuat %{target_name}
+    lost_followers: Ndjekës të humbur
+    lost_follows: Ndjekje të humbura
+    preamble: Mund të humbni ndjekje dhe ndjekës, kur bllokoni një përkatësi, ose kur moderatorët tuaj vendosin të pezullojnë një shërbyes të largët. Kur kjo ndodh, do të jeni në gjendje të shkarkoni lista marrëdhëniesh të dëmtuara, për t’i shqyrtuar dhe mundet për t’i importuar në një shërbyes tjetër.
+    purged: Hollësitë rreth këtij shërbyesi janë spastuar nga përgjegjësit e shërbyesit tuaj.
+    type: Akt
   statuses:
     attached:
       audio:
@@ -1685,8 +1709,6 @@ sq:
         other: "%{count} vota"
       vote: Votë
     show_more: Shfaq më tepër
-    show_newer: Shfaq më të reja
-    show_older: Shfaq më të vjetra
     show_thread: Shfaq rrjedhën
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1743,6 +1765,7 @@ sq:
     contrast: Mastodon (Me shumë kontrast)
     default: Mastodon (I errët)
     mastodon-light: Mastodon (I çelët)
+    system: E automatizuar (përdor temë sistemi)
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
@@ -1770,18 +1793,27 @@ sq:
     webauthn: Kyçe sigurie
   user_mailer:
     appeal_approved:
-      action: Kaloni te llogaria juaj
+      action: Rregullime Llogarie
       explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
       subject: Apelimi juaj i datës %{date} u miratua
+      subtitle: Llogaria juaj edhe një herë është e shëndetshme.
       title: Apelimi u miratua
     appeal_rejected:
       explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date}, u hodh poshtë.
       subject: Apelimi juaj prej %{date} është hedhur poshtë
+      subtitle: Apelimi juaj është hedhur poshtë.
       title: Apelimi u hodh poshtë
     backup_ready:
-      explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon. E keni gati për shkarkim!
+      explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon.
+      extra: Tani është gati për shkarkim!
       subject: Arkivi juaj është gati për shkarkim
       title: Marrje arkivi me vete
+    failed_2fa:
+      details: 'Ja hollësitë e përpjekjes për hyrje:'
+      explanation: Dikush ka provuar të hyjë në llogarinë tuaj, por dha faktor të dytë mirëfilltësimi.
+      further_actions_html: Nëse s’qetë ju, rekomandojmë të %{action} menjëherë, ngaqë mund të jetë komprometua.
+      subject: Dështim faktori të dytë mirëfilltësimesh
+      title: Dështoi mirëfilltësimi me faktor të dytë
     suspicious_sign_in:
       change_password: ndryshoni fjalëkalimin tuaj
       details: 'Ja hollësitë për hyrjen:'
@@ -1821,13 +1853,44 @@ sq:
         silence: Llogari e kufizuar
         suspend: Llogari e pezulluar
     welcome:
-      edit_profile_action: Ujdisje profili
-      edit_profile_step: Profilin tuaj mund ta përshtatni duke ngarkuar një figurë, duke ndryshuar emrin tuaj në ekran, etj. Mund të zgjidhni të shqyrtoni ndjekës të rinj, para se të jenë lejuar t’ju ndjekin.
+      apps_android_action: Merreni në Google Play
+      apps_ios_action: Shkarkojeni nga App Store
+      apps_step: Shkarkoni aplikacionet tona zyrtare.
+      apps_title: Aplikacione Mastodon
+      checklist_subtitle: 'Le t’ju vëmë në udhë drejt këtij horizonti të ri rrjetesh shoqërorë:'
+      checklist_title: Listë hapash mirëseardhjeje
+      edit_profile_action: Personalizojeni
+      edit_profile_step: Përforconi ndërveprimet tuaja, duke pasur një profil shterues.
+      edit_profile_title: Personalizoni profilin tuaj
       explanation: Ja disa ndihmëza, sa për t’ia filluar
-      final_action: Filloni të postoni
-      final_step: 'Filloni të postoni! Edhe pa ndjekës, postimet tuaja publike mund të shihen nga të tjerët, për shembull, në rrjedhën kohore vendore, ose në hashtag-ë. Mund të doni të prezantoni veten përmes hashtag-ut #introductions.'
-      full_handle: Identifikuesi juaj i plotë
-      full_handle_hint: Kjo është ajo çka do të duhej t’u tregonit shokëve tuaj, që të mund t’ju dërgojnë mesazhe ose t’ju ndjekin nga një shërbyes tjetër.
+      feature_action: Mësoni më tepër
+      feature_audience: Mastodon-i ju sjell një mundësi unike për administrimin e publikut tuaj pa të tjerë në mes. Mastodon-i i sendërtuar në infrastrukturë tuajën ju lejon të ndiqni dhe të ndiqeni nga cilido shërbyes tjetër Mastodon në internet dhe është nën kontroll vetëm nga ju dhe askush tjetër.
+      feature_audience_title: Krijoni me vetëbesim publikun tuaj
+      feature_control: E dini më mirë se kushdo se ç’doni të shihni në prurjen tuaj të kreut. Pa algoritme apo reklama që ju hanë kot kohën. Ndiqni këdo, në çfarëdo shërbyesi Mastodon, që nga një llogari e vetme dhe merrni postimet e tyre në rend kohor dhe bëjeni këndin tuaj të internetit pak më tepër si ju.
+      feature_control_title: Mbani kontrollin e rrjedhës tuaj kohore
+      feature_creativity: Mastodon-i mbulon postime audio, video dhe foto, përshkrime për persona me aftësi të kufizuara, pyetësorë, sinjalizime rreth lënde, avatarë të animuar, emoxhi vetjake, kontroll qethjeje miniaturash, etj, për t’ju ndihmuar të shpreheni në internet. Qoftë kur po botoni art tuajin, muzikë tuajën apo podkastin tuaj, Mastodon-i është gati.
+      feature_creativity_title: Frymë krijuese e pashoqe
+      feature_moderation: Mastodon-i e rikthen marrjen e vendimeve në duart tuaja. Çdo shërbyes krijon rregullat dhe rregulloren e vet, të cilat vihen në zbatim lokalisht dhe jo nga sipër, si me mediat shoqërore të korporatave, duke e bërë më të zhdërvjellëtin për t’iu përgjigjur nevojave të grupeve të ndryshme të personave. Bëhuni pjesë e një shërbyesi me rregullat e të cilit pajtoheni, ose strehojeni ju vetë një të tillë.
+      feature_moderation_title: Moderim ashtu si duhet bërë
+      follow_action: Ndiqeni
+      follow_step: Ndjekje personash interesantë është ajo çka përbën thelbin e Mastodon-it.
+      follow_title: Personalizoni prurjen tuaj të kreut
+      follows_subtitle: Ndiqni llogari të mirënjohura
+      follows_title: Cilët të ndiqen
+      follows_view_more: Shihni më tepër vetë për ndjekje
+      hashtags_recent_count:
+        one: "%{people} person në 2 ditët e shkuara"
+        other: "%{people} vetë në 2 ditët e shkuara"
+      hashtags_subtitle: Eksploroni ç’është në modëë që prej 2 ditëve të fundit
+      hashtags_title: Hashtag-ë në modë
+      hashtags_view_more: Shihni më tepër hashtagë në modë
+      post_action: Hartoni
+      post_step: Përshëndetni botën me tekst, foto, video, ose pyetësorë.
+      post_title: Shkruani postimin tuaj të parë
+      share_action: Ndajeni me të tjerë
+      share_step: Bëjuni të ditur shokëve si t’ju gjejnë në Mastodon.
+      share_title: Ndani me të tjerët profilin tuaj Mastodon
+      sign_in_action: Hyni
       subject: Mirë se vini te Mastodon-i
       title: Mirë se vini, %{name}!
   users:
@@ -1835,6 +1898,7 @@ sq:
     go_to_sso_account_settings: Kaloni te rregullime llogarie te shërbimi juaj i identitetit
     invalid_otp_token: Kod dyfaktorësh i pavlefshëm
     otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
+    rate_limited: Shumë përpjekje mirëfilltësimi, riprovoni më vonë.
     seamless_external_login: Jeni futur përmes një shërbimi të jashtëm, ndaj s’ka rregullime fjalëkalimi dhe email.
     signed_in_as: 'I futur si:'
   verification:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 02f63ede71..b4976f8985 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -609,6 +609,9 @@ sr-Latn:
       actions_description_html: Odlučite koju radnju da sprovedete radi rešavanja ove prijave. Ukoliko sprovedete kaznenu radnju protiv prijavljenog naloga, vlasnik naloga će biti obavešten putem i-mejla, osim ukoliko oznaka <strong>„Nepoželjne poruke”</strong> nije odabrana.
       actions_description_remote_html: Odlučite koju radnju da preduzmete radi rešavanja ove prijave. Ovo će uticati samo na to kako <strong>Vaš</strong> server komunicira sa ovim udaljenim nalogom i obrađuje njegov sadržaj.
       add_to_report: Dodaj još u prijavu
+      already_suspended_badges:
+        local: Već suspendovan na ovom serveru
+        remote: Već suspendovan na njihovom serveru
       are_you_sure: Da li ste sigurni?
       assign_to_self: Dodeli meni
       assigned: Dodeljeni moderator
@@ -762,6 +765,7 @@ sr-Latn:
         desc_html: Ovo se oslanja na eksterne skripte iz hCaptcha, što može predstavljati zabrinutost za bezbednost i privatnost. Pored toga, <strong>ovo može učiniti proces registracije znatno manje dostupnim nekim (posebno osobama sa invaliditetom)</strong>. Iz ovih razloga, razmotrite alternativne mere kao što je registracija zasnovana na odobrenju ili na pozivu.
         title: Zahtevaj od novih korisnika da reše CAPTCHA da bi potvrdili svoj nalog
       content_retention:
+        danger_zone: Opasna zona
         preamble: Kontrolišite kako se sadržaj generisan od strane korisnika skladišti na Mastodon-u.
         title: Zadržavanje sadržaja
       default_noindex:
@@ -781,13 +785,15 @@ sr-Latn:
         disabled: Nikome
         users: Prijavljenim lokalnim korisnicima
       registrations:
+        moderation_recommandation: Uverite se da imate adekvatan i reaktivan moderatorski tim pre nego što otvorite registraciju za sve!
         preamble: Kontrolišite ko sme da napravi nalog na Vašem serveru.
         title: Registracije
       registrations_mode:
         modes:
-          approved: Odobrenje neophodno za registraciju
+          approved: Neophodno je odobrenje za registraciju
           none: Niko ne može da se registruje
           open: Bilo ko može da se registruje
+        warning_hint: Preporučujemo da koristite „Neophodno je odobrenje za registraciju” osim ako niste sigurni da vaš moderatorski tim može blagovremeno da obradi neželjenu poštu i zlonamerne registracije.
       security:
         authorized_fetch: Zahtevaj autentifikaciju sa združenih servera
         authorized_fetch_hint: Zahtevanje autentifikacije sa združenih servera omogućuje strožiju primenu blokova i na nivou korisnika i na nivou servera. Međutim, ovo dolazi po cenu smanjenja performansi, smanjuje domet vaših odgovora i može dovesti do problema kompatibilnosti sa nekim združenim uslugama. Pored toga, ovo neće sprečiti posvećene aktere da preuzimaju vaše javne objave i naloge.
@@ -984,6 +990,9 @@ sr-Latn:
       title: Veb-presretač
       webhook: Veb-presretač
   admin_mailer:
+    auto_close_registrations:
+      body: Zbog nedostatka nedavnih aktivnosti moderatora, registracije na %{instance} su automatski prebačene na zahtevanje ručnog pregleda, kako bi se sprečilo da se %{instance} koristi kao platforma za potencijalne loše aktere. Možete ih vratiti na otvorene registracije u bilo kom trenutku.
+      subject: Registracije za %{instance} su automatski prebačene na zahtevanje odobrenja
     new_appeal:
       actions:
         delete_statuses: obrisati objave korisnika
@@ -1059,7 +1068,7 @@ sr-Latn:
       hint_html: Samo još jedna stvar! Moramo da potvrdimo da ste ljudsko biće (ovo je da bismo sprečili neželjenu poštu!). Rešite CAPTCHA ispod i kliknite na „Nastavi”.
       title: Bezbedonosna provera
     confirmations:
-      awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
+      awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
       awaiting_review_title: Vaša registracija se pregleda
       clicking_this_link: klikom na ovu vezu
       login_link: prijavi se
@@ -1128,7 +1137,7 @@ sr-Latn:
       functional: Vaš nalog je potpuno operativan.
       pending: Vaš zahtev je na čekanju za pregled od strane našeg osoblja. Ovo može potrajati neko vreme. Primićete imejl poruku ukoliko Vam zahtev bude odobren.
       redirecting_to: Vaš nalog je neaktivan jer preusmerava na %{acct}.
-      self_destruct: Pošto se %{domain} zatvara, dobićete samo ograničen pristup svom nalogu.
+      self_destruct: Pošto se %{domain} zatvara, dobićete samo ograničen pristup svom nalogu.
       view_strikes: Pogledajte prethodne prestupe upisane na Vaše ime
     too_fast: Formular je podnet prebrzo, pokušajte ponovo.
     use_security_key: Koristite sigurnosni ključ
@@ -1391,9 +1400,9 @@ sr-Latn:
       '43200': 12 sati
       '604800': 1 nedelja
       '86400': 1 dan
-    expires_in_prompt: Nikad
+    expires_in_prompt: Nikada
     generate: Generiši
-    invalid: Ova pozivnica nije važeća
+    invalid: Ova pozivnica nije važeća
     invited_by: 'Pozvao Vas je:'
     max_uses:
       few: "%{count} korišćenja"
@@ -1516,7 +1525,6 @@ sr-Latn:
     administration_emails: Obaveštenja e-poštom od administratora
     email_events: Događaji za obaveštenja e-poštom
     email_events_hint: 'Izaberite dešavanja za koja želite da primate obaveštenja:'
-    other_settings: Ostala podešavanja obaveštenja
   number:
     human:
       decimal_units:
@@ -1572,6 +1580,9 @@ sr-Latn:
     errors:
       limit_reached: Dostignuto je ograničenje različitih reakcija
       unrecognized_emoji: nije prepoznat emodži
+  redirects:
+    prompt: Ako verujete ovoj vezi, kliknite na nju za nastavak.
+    title: Napuštate %{instance}.
   relationships:
     activity: Aktivnost naloga
     confirm_follow_selected_followers: Da li ste sigurni da želite da pratite izabrane pratioce?
@@ -1608,7 +1619,7 @@ sr-Latn:
     over_total_limit: Prekoračili ste granicu od %{limit} planiranih objava
     too_soon: Planirani datum mora biti u budućnosti
   self_destruct:
-    lead_html: Nažalost, <strong>%{domain}</strong> se trajno zatvara. Ako ste tamo imali nalog, nećete moći da nastavite da ga koristite, ali i dalje možete da zatražite rezervnu kopiju svojih podataka.
+    lead_html: Nažalost, <strong>%{domain}</strong> se trajno zatvara. Ako ste tamo imali nalog, nećete moći da nastavite da ga koristite, ali i dalje možete da zatražite rezervnu kopiju svojih podataka.
     title: Ovaj server se zatvara
   sessions:
     activity: Poslednja aktivnost
@@ -1634,6 +1645,7 @@ sr-Latn:
       unknown_browser: Nepoznati pregledač
       weibo: Veibo
     current_session: Trenutna sesija
+    date: Datum
     description: "%{browser} sa %{platform}"
     explanation: Ovo su veb pretraživači koji su trenutno prijavljeni na vaš Mastodon nalog.
     ip: IP
@@ -1670,14 +1682,26 @@ sr-Latn:
     import: Uvoz
     import_and_export: Uvoz i izvoz
     migrate: Prebacivanje naloga
-    notifications: Obaveštenja
+    notifications: Obaveštenja e-poštom
     preferences: Podešavanja
     profile: Javni profil
     relationships: Praćenja i pratioci
+    severed_relationships: Prekinute veze
     statuses_cleanup: Automatsko brisanje objava
     strikes: Moderacijski prestupi
     two_factor_authentication: Dvofaktorska identifikacija
     webauthn_authentication: Sigurnosni ključevi
+  severed_relationships:
+    download: Preuzmi (%{count})
+    event_type:
+      account_suspension: Suspenzija naloga (%{target_name})
+      domain_block: Suspenzija servera (%{target_name})
+      user_domain_block: Blokirali ste %{target_name}
+    lost_followers: Izgubljeni pratioci
+    lost_follows: Izgubljena praćenja
+    preamble: Možete izgubiti praćenja i pratioce kada blokirate domen ili kada vaši moderatori odluče da suspenduju udaljeni server. Kada se to desi, moći ćete da preuzmete liste prekinutih veza, koje treba pregledati i eventualno uvesti na drugi server.
+    purged: Administratori vašeg servera su obrisali informacije o ovom serveru.
+    type: Događaj
   statuses:
     attached:
       audio:
@@ -1721,8 +1745,6 @@ sr-Latn:
         other: "%{count} glasova"
       vote: Glasajte
     show_more: Prikaži još
-    show_newer: Nikad ne prikazuj
-    show_older: Prikaži starije
     show_thread: Prikaži niz
     title: "%{name}: „%{quote}”"
     visibilities:
@@ -1777,8 +1799,9 @@ sr-Latn:
     does_not_match_previous_name: ne poklapa se sa prethodnim imenom
   themes:
     contrast: Veliki kontrast
-    default: Mastodon (tamno)
-    mastodon-light: Mastodon (svetlo)
+    default: Mastodon (tamna)
+    mastodon-light: Mastodon (svetla)
+    system: Automatski (korišćenje sistemske teme)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1806,18 +1829,27 @@ sr-Latn:
     webauthn: Sigurnosni ključevi
   user_mailer:
     appeal_approved:
-      action: Idite na svoj nalog
+      action: Podešavanja naloga
       explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je uvažena. Vaš nalog je ponovo u povoljnom položaju.
       subject: Vaša žalba podneta %{date} je uvažena
+      subtitle: Vaš nalog je ponovo na dobrom glasu.
       title: Žalba uvažena
     appeal_rejected:
       explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je odbijena.
       subject: Vaša žalba podneta %{date} je odbijena
+      subtitle: Vaša žalba je odbijena.
       title: Žalba odbijena
     backup_ready:
-      explanation: Tražili ste potpunu rezervnu kopiju vašeg Mastodon naloga. Spremna je za preuzimanje!
+      explanation: Zahtevali ste punu rezervnu kopiju Mastodon naloga.
+      extra: Sada je spremno za preuzimanje!
       subject: Vaša arhiva je spremna za preuzimanje
       title: Izvoz arhive
+    failed_2fa:
+      details: 'Evo detalja o pokušaju prijavljivanja:'
+      explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
+      further_actions_html: Ako to niste bili vi, preporučujemo vam da odmah %{action} jer može biti ugrožena.
+      subject: Neuspeh drugog faktora autentifikacije
+      title: Nije uspeo drugi faktor autentifikacije
     suspicious_sign_in:
       change_password: promenite svoju lozinku
       details: 'Evo detalja o prijavi:'
@@ -1857,13 +1889,45 @@ sr-Latn:
         silence: Nalog ograničen
         suspend: Nalog suspendovan
     welcome:
-      edit_profile_action: Podesi nalog
-      edit_profile_step: Možete prilagoditi svoj profil tako što ćete postaviti profilnu sliku, promeniti ime za prikaz i tako dalje. Možete dati saglasnost da pregledate nove pratioce pre nego što im dozvolite da Vas zaprate.
+      apps_android_action: Nabavite na Google Play
+      apps_ios_action: Preuzmite sa App Store
+      apps_step: Preuzmite naše zvanične aplikacije.
+      apps_title: Mastodon aplikacije
+      checklist_subtitle: 'Započnimo na ovoj novoj društvenoj granici:'
+      checklist_title: Koraci dobrodošlice
+      edit_profile_action: Personalizujte
+      edit_profile_step: Povećajte svoje interakcije tako što ćete imati sveobuhvatan profil.
+      edit_profile_title: Personalizujte svoj profil
       explanation: Evo nekoliko saveta za početak
-      final_action: Počnite objavljivati
-      final_step: 'Počnite da objavljujete! Čak i bez pratilaca, Vaše javne objave su vidljive drugim ljudima, na primer na lokalnoj vremenskoj liniji ili u heš oznakama. Možda želite da se predstavite sa heš oznakom #introductions ili #predstavljanja.'
-      full_handle: Vaš pun nadimak
-      full_handle_hint: Ovo biste rekli svojim prijateljima kako bi vam oni poslali poruku, ili zapratili sa druge instance.
+      feature_action: Saznajte više
+      feature_audience: Mastodon vam pruža jedinstvenu mogućnost upravljanja svojom publikom bez posrednika. Mastodon raspoređen na vašoj sopstvenoj infrastrukturi vam omogućuje da pratite i budete praćeni sa bilo kog drugog Mastodon servera na mreži i nije ni pod čijom kontrolom osim vaše.
+      feature_audience_title: Izgradite svoju publiku u poverenju
+      feature_control: Vi najbolje znate šta želite da vidite na svojoj poetnoj stranici. Nema algoritama ili reklama da troše vaše vreme. Pratite bilo koga na bilo kom Mastodon serveru sa jednog naloga i primajte njihove objave hronološkim redosledom i učinite svoj kutak interneta malo sličnijim vama.
+      feature_control_title: Držite kontrolu nad sopstvenom vremenskom linijom
+      feature_creativity: Mastodon podržava audio, video i slikovne objave, opise pristupačnosti, ankete, upozorenja o sadržaju, animirane avatare, prilagođene emodžije, kontrolu isecanja sličica i još mnogo toga, kako bi vam pomogao da se izrazite na mreži. Bilo da objavljujete svoju umetnost, muziku ili podkast, Mastodon je tu za vas.
+      feature_creativity_title: Kreativnost bez premca
+      feature_moderation: Mastodon vraća donošenje odluka u vaše ruke. Svaki server kreira sopstvena pravila i propise, koji se primenjuju lokalno, a ne odozgo prema dole kao korporativni društveni mediji, što ga čini najfleksibilnijim u odgovaranju na potrebe različitih grupa ljudi. Pridružite se serveru sa pravilima sa kojima se slažete ili hostujte svoja.
+      feature_moderation_title: Moderacija onakva kakva bi trebalo da bude
+      follow_action: Pratite
+      follow_step: Praćenje zanimljivih ljudi je ono o čemu se radi u Mastodon-u.
+      follow_title: Personalizujte svoju početnu stranicu
+      follows_subtitle: Pratite dobro poznate naloge
+      follows_title: Koga pratiti
+      follows_view_more: Pogledajte još ljudi za praćenje
+      hashtags_recent_count:
+        few: "%{people} osobe u poslednja 2 dana"
+        one: "%{people} osoba u poslednja 2 dana"
+        other: "%{people} osoba u poslednja 2 dana"
+      hashtags_subtitle: Istražite šta je u trendu u poslednja 2 dana
+      hashtags_title: Heš oznake u trendu
+      hashtags_view_more: Pogledajte još heš oznaka u trendu
+      post_action: Napišite
+      post_step: Pozdravite svet tekstom, fotografijama, video zapisima ili anketama.
+      post_title: Napišite svoju prvu objavu
+      share_action: Podelite
+      share_step: Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u.
+      share_title: Podelite svoj Mastodon profil
+      sign_in_action: Prijavite se
       subject: Dobro došli na Mastodon
       title: Dobro došli, %{name}!
   users:
@@ -1871,6 +1935,7 @@ sr-Latn:
     go_to_sso_account_settings: Idite na podešavanja naloga svog dobavljača identiteta
     invalid_otp_token: Neispravni dvofaktorski kod
     otp_lost_help_html: Ako izgubite pristup za oba, možete stupiti u kontakt sa %{email}
+    rate_limited: Previše pokušaja autentifikacije, pokušajte ponovo kasnije.
     seamless_external_login: Prijavljeni ste putem spoljašnje usluge, tako da lozinka i podešavanja E-pošte nisu dostupni.
     signed_in_as: 'Prijavljen/a kao:'
   verification:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 51613940bc..aec6d399d5 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -65,7 +65,7 @@ sr:
       disabled: Замрзнут
       display_name: Име за приказ
       domain: Домен
-      edit: Измени
+      edit: Уреди
       email: Е-пошта
       email_status: Статус е-поште
       enable: Омогући
@@ -402,7 +402,7 @@ sr:
       created_msg: Блокирање домена се обрађује
       destroyed_msg: Блокирање домена је опозвано
       domain: Домен
-      edit: Измени блок домена
+      edit: Уреди блок домена
       existing_domain_block: Већ сте успоставили строжа ограничења према кориснику %{name}.
       existing_domain_block_html: Већ сте успоставили строжа ограничења према %{name}, потребно је да га прво <a href="%{unblock_url}">одблокирате</a>.
       export: Извоз
@@ -609,6 +609,9 @@ sr:
       actions_description_html: Одлучите коју радњу да спроведете ради решавања ове пријаве. Уколико спроведете казнену радњу против пријављеног налога, власник налога ће бити обавештен путем и-мејла, осим уколико ознака <strong>„Непожељне поруке”</strong> није одабрана.
       actions_description_remote_html: Одлучите коју радњу да предузмете ради решавања ове пријаве. Ово ће утицати само на то како <strong>Ваш</strong> сервер комуницира са овим удаљеним налогом и обрађује његов садржај.
       add_to_report: Додај још у пријаву
+      already_suspended_badges:
+        local: Већ суспендован на овом серверу
+        remote: Већ суспендован на њиховом серверу
       are_you_sure: Да ли сте сигурни?
       assign_to_self: Додели мени
       assigned: Додељени модератор
@@ -690,7 +693,7 @@ sr:
         special: Посебно
       delete: Избриши
       description_html: Помоћу <strong>корисничких улога</strong> можете да подесите којим функцијама и деловима Mastodon-а ваши корисници могу да приступе.
-      edit: Измени улогу '%{name}'
+      edit: Уреди улогу '%{name}
       everyone: Подразумевана овлашћења
       everyone_full_description_html: Ово је <strong>основна улога</strong> која се односи на <strong>све кориснике</strong>, чак и оне којима није додељена улога. Све друге улоге наслеђују овлашћења од основне улоге.
       permissions_count:
@@ -762,6 +765,7 @@ sr:
         desc_html: Ово се ослања на екстерне скрипте из hCaptcha, што може представљати забринутост за безбедност и приватност. Поред тога, <strong>ово може учинити процес регистрације знатно мање доступним неким (посебно особама са инвалидитетом)</strong>. Из ових разлога, размотрите алтернативне мере као што је регистрација заснована на одобрењу или на позиву.
         title: Захтевај од нових корисника да реше CAPTCHA да би потврдили свој налог
       content_retention:
+        danger_zone: Опасна зона
         preamble: Контролишите како се садржај генерисан од стране корисника складишти на Mastodon-у.
         title: Задржавање садржаја
       default_noindex:
@@ -781,13 +785,15 @@ sr:
         disabled: Никоме
         users: Пријављеним локалним корисницима
       registrations:
+        moderation_recommandation: Уверите се да имате адекватан и реактиван модераторски тим пре него што отворите регистрацију за све!
         preamble: Контролишите ко сме да направи налог на Вашем серверу.
         title: Регистрације
       registrations_mode:
         modes:
-          approved: Одобрење неопходно за регистрацију
+          approved: Неопходно је одобрење за регистрацију
           none: Нико не може да се региструје
           open: Било ко може да се региструје
+        warning_hint: Препоручујемо да користите „Неопходно је одобрење за регистрацију” осим ако нисте сигурни да ваш модераторски тим може благовремено да обради нежељену пошту и злонамерне регистрације.
       security:
         authorized_fetch: Захтевај аутентификацију са здружених сервера
         authorized_fetch_hint: Захтевање аутентификације са здружених сервера омогућује строжију примену блокова и на нивоу корисника и на нивоу сервера. Међутим, ово долази по цену смањења перформанси, смањује домет ваших одговора и може довести до проблема компатибилности са неким здруженим услугама. Поред тога, ово неће спречити посвећене актере да преузимају ваше јавне објаве и налоге.
@@ -968,7 +974,7 @@ sr:
       description_html: "<strong>Webhook</strong> омогућава Mastodon-у да вашој апликацији испоручује <strong>обавештења у реалном времену</strong> о одабраним догађајима, тако да ваша апликација може да <strong>aутоматски изазове реакцију</strong>."
       disable: Онемогући
       disabled: Онемогућено
-      edit: Измени крајњу тачку
+      edit: Уреди крајњу тачку
       empty: Још увек немате ниједну конфигурисану webhook крајњу тачку.
       enable: Омогући
       enabled: Активно
@@ -984,6 +990,9 @@ sr:
       title: Веб-пресретач
       webhook: Веб-пресретач
   admin_mailer:
+    auto_close_registrations:
+      body: Због недостатка недавних активности модератора, регистрације на %{instance} су аутоматски пребачене на захтевање ручног прегледа, како би се спречило да се %{instance} користи као платформа за потенцијалне лоше актере. Можете их вратити на отворене регистрације у било ком тренутку.
+      subject: Регистрације за %{instance} су аутоматски пребачене на захтевање одобрења
     new_appeal:
       actions:
         delete_statuses: обрисати објаве корисника
@@ -1262,7 +1271,7 @@ sr:
       keywords: Кључне речи
       statuses: Засебне објаве
       statuses_hint_html: Овај филтер важи за одабране засебне објаве без обзира на то да ли садрже кључне речи наведене испод. <a href="%{path}">Прегледајте или уклоните објаве из филтера</a>.
-      title: Измени филтер
+      title: Уреди филтер
     errors:
       deprecated_api_multiple_keywords: Ови параметри не могу бити промењени у овој апликацији зато што се односе на више од једне кључне речи. Користите ажурнију апликацију или веб интерфејс.
       invalid_context: Ниједан или неважећи контекст испоручен
@@ -1391,7 +1400,7 @@ sr:
       '43200': 12 сати
       '604800': 1 недеља
       '86400': 1 дан
-    expires_in_prompt: Никад
+    expires_in_prompt: Никада
     generate: Генериши
     invalid: Ова позивница није важећа
     invited_by: 'Позвао Вас је:'
@@ -1511,12 +1520,11 @@ sr:
     status:
       subject: "%{name} jе управо поставио/-ла објаву"
     update:
-      subject: "%{name} је изменио/-ла објаву"
+      subject: "%{name} је уредио/-ла објаву"
   notifications:
     administration_emails: Обавештења е-поштом од администратора
     email_events: Догађаји за обавештења е-поштом
     email_events_hint: 'Изаберите дешавања за која желите да примате обавештења:'
-    other_settings: Остала подешавања обавештења
   number:
     human:
       decimal_units:
@@ -1572,6 +1580,9 @@ sr:
     errors:
       limit_reached: Достигнуто је ограничење различитих реакција
       unrecognized_emoji: није препознат емоџи
+  redirects:
+    prompt: Ако верујете овој вези, кликните на њу за наставак.
+    title: Напуштате %{instance}.
   relationships:
     activity: Активност налога
     confirm_follow_selected_followers: Да ли сте сигурни да желите да пратите изабране пратиоце?
@@ -1634,6 +1645,7 @@ sr:
       unknown_browser: Непознати прегледач
       weibo: Веибо
     current_session: Тренутна сесија
+    date: Датум
     description: "%{browser} са %{platform}"
     explanation: Ово су веб претраживачи који су тренутно пријављени на ваш Mastodon налог.
     ip: IP
@@ -1670,14 +1682,26 @@ sr:
     import: Увоз
     import_and_export: Увоз и извоз
     migrate: Пребацивање налога
-    notifications: Обавештења
+    notifications: Обавештења е-поштом
     preferences: Подешавања
     profile: Јавни профил
     relationships: Праћења и пратиоци
+    severed_relationships: Прекинуте везе
     statuses_cleanup: Аутоматско брисање објава
     strikes: Модерацијски преступи
     two_factor_authentication: Двофакторска идентификација
     webauthn_authentication: Сигурносни кључеви
+  severed_relationships:
+    download: Преузми (%{count})
+    event_type:
+      account_suspension: Суспензија налога (%{target_name})
+      domain_block: Суспензија сервера (%{target_name})
+      user_domain_block: Блокирали сте %{target_name}
+    lost_followers: Изгубљени пратиоци
+    lost_follows: Изгубљена праћења
+    preamble: Можете изгубити праћења и пратиоце када блокирате домен или када ваши модератори одлуче да суспендују удаљени сервер. Када се то деси, моћи ћете да преузмете листе прекинутих веза, које треба прегледати и евентуално увести на други сервер.
+    purged: Администратори вашег сервера су обрисали информације о овом серверу.
+    type: Догађај
   statuses:
     attached:
       audio:
@@ -1700,7 +1724,7 @@ sr:
       few: 'садржи забрањене хеш ознаке: %{tags}'
       one: 'садржи забрањену хеш ознаку: %{tags}'
       other: 'садржи забрањене хеш ознаке: %{tags}'
-    edited_at_html: Измењено %{date}
+    edited_at_html: Уређено %{date}
     errors:
       in_reply_not_found: Објава на коју покушавате да одговорите наизглед не постоји.
     open_in_web: Отвори у вебу
@@ -1721,8 +1745,6 @@ sr:
         other: "%{count} гласова"
       vote: Гласајте
     show_more: Прикажи још
-    show_newer: Никад не приказуј
-    show_older: Прикажи старије
     show_thread: Прикажи низ
     title: "%{name}: „%{quote}”"
     visibilities:
@@ -1777,8 +1799,9 @@ sr:
     does_not_match_previous_name: не поклапа се са претходним именом
   themes:
     contrast: Велики контраст
-    default: Mastodon (тамно)
-    mastodon-light: Mastodon (светло)
+    default: Mastodon (тамна)
+    mastodon-light: Mastodon (светла)
+    system: Аутоматски (коришћење системске теме)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1793,7 +1816,7 @@ sr:
     add: Додај
     disable: Искључи
     disabled_success: Двофакторска аутентификација је успешно онемогућена
-    edit: Измени
+    edit: Уреди
     enabled: Двофакторска идентификација је укључена
     enabled_success: Двофакторска идентификација је успешно укључена
     generate_recovery_codes: Генериши кодове за опоравак
@@ -1806,18 +1829,27 @@ sr:
     webauthn: Сигурносни кључеви
   user_mailer:
     appeal_approved:
-      action: Идите на свој налог
+      action: Подешавања налога
       explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је уважена. Ваш налог је поново у повољном положају.
       subject: Ваша жалба поднета %{date} је уважена
+      subtitle: Ваш налог је поново на добром гласу.
       title: Жалба уважена
     appeal_rejected:
       explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је одбијена.
       subject: Ваша жалба поднета %{date} је одбијена
+      subtitle: Ваша жалба је одбијена.
       title: Жалба одбијена
     backup_ready:
-      explanation: Тражили сте потпуну резервну копију вашег Mastodon налога. Спремна је за преузимање!
+      explanation: Захтевали сте пуну резервну копију Mastodon налога.
+      extra: Сада је спремно за преузимање!
       subject: Ваша архива је спремна за преузимање
       title: Извоз архиве
+    failed_2fa:
+      details: 'Ево детаља о покушају пријављивања:'
+      explanation: Неко је покушао да се пријави на ваш налог али је дао неважећи други фактор аутентификације.
+      further_actions_html: Ако то нисте били ви, препоручујемо вам да одмах %{action} јер може бити угрожена.
+      subject: Неуспех другог фактора аутентификације
+      title: Није успео други фактор аутентификације
     suspicious_sign_in:
       change_password: промените своју лозинку
       details: 'Ево детаља о пријави:'
@@ -1857,13 +1889,45 @@ sr:
         silence: Налог ограничен
         suspend: Налог суспендован
     welcome:
-      edit_profile_action: Подеси налог
-      edit_profile_step: Можете прилагодити свој профил тако што ћете поставити профилну слику, променити име за приказ и тако даље. Можете дати сагласност да прегледате нове пратиоце пре него што им дозволите да Вас запрате.
+      apps_android_action: Набавите на Google Play
+      apps_ios_action: Преузмите са App Store
+      apps_step: Преузмите наше званичне апликације.
+      apps_title: Mastodon апликације
+      checklist_subtitle: 'Започнимо на овој новој друштвеној граници:'
+      checklist_title: Кораци добродошлице
+      edit_profile_action: Персонализујте
+      edit_profile_step: Повећајте своје интеракције тако што ћете имати свеобухватан профил.
+      edit_profile_title: Персонализујте свој профил
       explanation: Ево неколико савета за почетак
-      final_action: Почните објављивати
-      final_step: 'Почните да објављујете! Чак и без пратилаца, Ваше јавне објаве су видљиве другим људима, на пример на локалној временској линији или у хеш ознакама. Можда желите да се представите са хеш ознаком #introductions или #представљања.'
-      full_handle: Ваш пун надимак
-      full_handle_hint: Ово бисте рекли својим пријатељима како би вам они послали поруку, или запратили са друге инстанце.
+      feature_action: Сазнајте више
+      feature_audience: Mastodon вам пружа јединствену могућност управљања својом публиком без посредника. Mastodon распоређен на вашој сопственој инфраструктури вам омогућује да пратите и будете праћени са било ког другог Mastodon сервера на мрежи и није ни под чијом контролом осим ваше.
+      feature_audience_title: Изградите своју публику у поверењу
+      feature_control: Ви најбоље знате шта желите да видите на својој поетној страници. Нема алгоритама или реклама да троше ваше време. Пратите било кога на било ком Mastodon серверу са једног налога и примајте њихове објаве хронолошким редоследом и учините свој кутак интернета мало сличнијим вама.
+      feature_control_title: Држите контролу над сопственом временском линијом
+      feature_creativity: Mastodon подржава аудио, видео и сликовне објаве, описе приступачности, анкете, упозорења о садржају, анимиране аватаре, прилагођене емоџије, контролу исецања сличица и још много тога, како би вам помогао да се изразите на мрежи. Било да објављујете своју уметност, музику или подкаст, Mastodon је ту за вас.
+      feature_creativity_title: Креативност без премца
+      feature_moderation: Mastodon враћа доношење одлука у ваше руке. Сваки сервер креира сопствена правила и прописе, који се примењују локално, а не одозго према доле као корпоративни друштвени медији, што га чини најфлексибилнијим у одговарању на потребе различитих група људи. Придружите се серверу са правилима са којима се слажете или хостујте своја.
+      feature_moderation_title: Модерација онаква каква би требало да буде
+      follow_action: Пратите
+      follow_step: Праћење занимљивих људи је оно о чему се ради у Mastodon-у.
+      follow_title: Персонализујте своју почетну страницу
+      follows_subtitle: Пратите добро познате налоге
+      follows_title: Кога пратити
+      follows_view_more: Погледајте још људи за праћење
+      hashtags_recent_count:
+        few: "%{people} особе у последња 2 дана"
+        one: "%{people} особа у последња 2 дана"
+        other: "%{people} особа у последња 2 дана"
+      hashtags_subtitle: Истражите шта је у тренду у последња 2 дана
+      hashtags_title: Хеш ознаке у тренду
+      hashtags_view_more: Погледајте још хеш ознака у тренду
+      post_action: Напишите
+      post_step: Поздравите свет текстом, фотографијама, видео записима или анкетама.
+      post_title: Напишите своју прву објаву
+      share_action: Поделите
+      share_step: Нека ваши пријатељи знају како да вас пронађу на Mastodon-у.
+      share_title: Поделите свој Mastodon профил
+      sign_in_action: Пријавите се
       subject: Добро дошли на Mastodon
       title: Добро дошли, %{name}!
   users:
@@ -1871,6 +1935,7 @@ sr:
     go_to_sso_account_settings: Идите на подешавања налога свог добављача идентитета
     invalid_otp_token: Неисправни двофакторски код
     otp_lost_help_html: Ако изгубите приступ за оба, можете ступити у контакт са %{email}
+    rate_limited: Превише покушаја аутентификације, покушајте поново касније.
     seamless_external_login: Пријављени сте путем спољашње услуге, тако да лозинка и подешавања Е-поште нису доступни.
     signed_in_as: 'Пријављен/а као:'
   verification:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9a2bedbdfe..11e1fce3fe 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -597,6 +597,9 @@ sv:
       actions_description_html: Välj vilken åtgärd som skall vidtas för att lösa denna rapport. Om du vidtar en bestraffningsåtgärd mot det rapporterade kontot kommer en e-postnotis att skickas till dem, förutom om du valt kategorin <strong>Skräppost</strong>.
       actions_description_remote_html: Bestäm vilka åtgärder som ska vidtas för att lösa denna rapport. Detta kommer bara att påverka hur <strong>din</strong> server kommunicerar med detta fjärrkonto och hanterar dess innehåll.
       add_to_report: Lägg till mer i rapporten
+      already_suspended_badges:
+        local: Redan avstängd på denna server
+        remote: Redan avstängd på deras server
       are_you_sure: Är du säker?
       assign_to_self: Tilldela till mig
       assigned: Tilldelad moderator
@@ -612,6 +615,7 @@ sv:
       created_at: Anmäld
       delete_and_resolve: Ta bort inlägg
       forwarded: Vidarebefordrad
+      forwarded_replies_explanation: Den här rapporten är från en annans instans användare och handlar om annans instans inlägg. Det har vidarebefordrats till dig eftersom det rapporterade innehållet är som svar till en av dina användare.
       forwarded_to: Vidarebefordrad till %{domain}
       mark_as_resolved: Markera som löst
       mark_as_sensitive: Markera som känslig
@@ -747,6 +751,7 @@ sv:
         desc_html: Detta bygger på externa skript från hCaptcha vilket kan vara ett säkerhets- och integritetsproblem. Dessutom,<strong>kan detta göra registreringsprocessen betydligt mindre tillgänglig för vissa personer (särskilt funktionsnedsatta)</strong>. Av dessa skäl bör du överväga alternativa åtgärder såsom godkänningsbaserad eller inbjudningsbaserad registrering.
         title: Kräv att nya användare löser en CAPTCHA för att erkänna sitt konto
       content_retention:
+        danger_zone: Farozon
         preamble: Kontrollera hur användargenererat innehåll lagras i Mastodon.
         title: Bibehållande av innehåll
       default_noindex:
@@ -766,6 +771,7 @@ sv:
         disabled: För ingen
         users: För inloggade lokala användare
       registrations:
+        moderation_recommandation: Se till att du har ett tillräckligt och reaktivt modereringsteam innan du öppnar registreringar till alla!
         preamble: Kontrollera vem som kan skapa ett konto på din server.
         title: Registreringar
       registrations_mode:
@@ -773,6 +779,7 @@ sv:
           approved: Godkännande krävs för registrering
           none: Ingen kan registrera
           open: Alla kan registrera
+        warning_hint: Vi rekommenderar att du använder “Godkännande krävs för registrering” om du inte är säker på att ditt moderatorsteam kan hantera skräppost och skadliga registreringar i tid.
       security:
         authorized_fetch: Kräv autentisering från federerade servrar
         authorized_fetch_hint: Att kräva autentisering från federerade servrar möjliggör striktare tillämpning av både blockering på användarnivå och servernivå. Detta sker dock på bekostnad av prestanda, minskar räckvidden på dina svar, och kan införa kompatibilitet problem med vissa federerade tjänster. Dessutom kommer detta inte att hindra dedikerade aktörer från att hämta dina offentliga inlägg och konton.
@@ -965,6 +972,9 @@ sv:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: På grund av brist på moderatoraktivitet har registreringar på %{instance} automatiskt bytts till att kräva manuell granskning, för att förhindra att %{instance} används som plattform för potentiella dåliga aktörer. Du kan när som helst byta tillbaka den till öppna registreringar.
+      subject: Registreringar för %{instance} har automatiskt bytts till att kräva godkännande
     new_appeal:
       actions:
         delete_statuses: att radera deras inlägg
@@ -1489,7 +1499,6 @@ sv:
     administration_emails: Admin e-postaviseringar
     email_events: Händelser för e-postnotiser
     email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
-    other_settings: Andra aviseringsinställningar
   number:
     human:
       decimal_units:
@@ -1545,6 +1554,9 @@ sv:
     errors:
       limit_reached: Gränsen för unika reaktioner uppnådd
       unrecognized_emoji: är inte en igenkänd emoji
+  redirects:
+    prompt: Om du litar på denna länk, klicka på den för att fortsätta.
+    title: Du lämnar %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Är du säker på att du vill följa valda följare?
@@ -1607,6 +1619,7 @@ sv:
       unknown_browser: Okänd browser
       weibo: Weibo
     current_session: Nuvarande session
+    date: Datum
     description: "%{browser} på %{platform}"
     explanation: Detta är inloggade webbläsare på Mastodon just nu.
     ip: IP
@@ -1643,14 +1656,26 @@ sv:
     import: Importera
     import_and_export: Import och export
     migrate: Kontoflytt
-    notifications: Aviseringar
+    notifications: E-postaviseringar
     preferences: Inställningar
     profile: Profil
     relationships: Följer och följare
+    severed_relationships: Avbrutna relationer
     statuses_cleanup: Automatisk radering av inlägg
     strikes: Modereringsprickar
     two_factor_authentication: Tvåfaktorsautentisering
     webauthn_authentication: Säkerhetsnycklar
+  severed_relationships:
+    download: Hämta (%{count})
+    event_type:
+      account_suspension: Kontoavstängning (%{target_name})
+      domain_block: Serveravstängning (%{target_name})
+      user_domain_block: Du blockerade %{target_name}
+    lost_followers: Förlorade följare
+    lost_follows: Förlorade följare
+    preamble: Du kan förlora följer och följare när du blockerar en domän eller när din moderator väljer att stänga av en fjärrserver. När det händer kommer du kunna hämta listor över avbrutna relationer som kan inspekteras och eventuellt importeras på en annan server.
+    purged: Information om denna server har rensats av din servers administratörer.
+    type: Händelse
   statuses:
     attached:
       audio:
@@ -1688,8 +1713,6 @@ sv:
         other: "%{count} röster"
       vote: Rösta
     show_more: Visa mer
-    show_newer: Visa nyare
-    show_older: Visa äldre
     show_thread: Visa tråd
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1746,6 +1769,7 @@ sv:
     contrast: Hög kontrast
     default: Mastodon
     mastodon-light: Mastodon (ljust)
+    system: Automatisk (använd systemtema)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
@@ -1773,18 +1797,27 @@ sv:
     webauthn: Säkerhetsnycklar
   user_mailer:
     appeal_approved:
-      action: Gå till ditt konto
+      action: Kontoinställningar
       explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har godkänts. Ditt konto har återigen bra anseende.
       subject: Din överklagan den %{date} har godkänts
+      subtitle: Ditt konto är återigen i gott skick.
       title: Överklagan godkänd
     appeal_rejected:
       explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har avslagits.
       subject: Din överklagan den %{date} har avslagits
+      subtitle: Din överklagan har avvisats.
       title: Överklagan avslagen
     backup_ready:
-      explanation: Du begärde en fullständig säkerhetskopiering av ditt Mastodon-konto. Det är nu klart för nedladdning!
+      explanation: Du begärde en fullständig säkerhetskopia av ditt Mastodon-konto.
+      extra: Nu redo för nedladdning!
       subject: Ditt arkiv är klart för nedladdning
       title: Arkivuttagning
+    failed_2fa:
+      details: 'Här är detaljerna för inloggningsförsöket:'
+      explanation: Någon har försökt att logga in på ditt konto men tillhandahållit en ogiltig andra autentiseringsfaktor.
+      further_actions_html: Om detta inte var du, rekommenderar vi att du %{action} omedelbart eftersom ditt konto kan ha äventyrats.
+      subject: Andra faktorns autentiseringsfel
+      title: Misslyckad tvåfaktorsautentisering
     suspicious_sign_in:
       change_password: Ändra ditt lösenord
       details: 'Här är inloggningsdetaljerna:'
@@ -1824,13 +1857,44 @@ sv:
         silence: Kontot begränsat
         suspend: Konto avstängt
     welcome:
-      edit_profile_action: Profilinställning
-      edit_profile_step: Du kan anpassa din profil genom att ladda upp en profilbild, ändra ditt visningsnamn med mera. Du kan välja att granska nya följare innan de får följa dig.
+      apps_android_action: Ladda ned på Google Play
+      apps_ios_action: Ladda ner på App Store
+      apps_step: Ladda ner våra officiella appar.
+      apps_title: Mastodon-appar
+      checklist_subtitle: 'Låt oss komma igång med denna nya sociala upplevelse:'
+      checklist_title: Välkomstchecklista
+      edit_profile_action: Gör mer personlig
+      edit_profile_step: Öka din interaktion genom att ha en omfattande profil.
+      edit_profile_title: Anpassa din profil
       explanation: Här är några tips för att komma igång
-      final_action: Börja göra inlägg
-      final_step: 'Börja skriv inlägg! Även utan följare kan dina offentliga inlägg ses av andra, exempelvis på den lokala tidslinjen eller i hashtaggar. Du kanske vill introducera dig själv under hashtaggen #introduktion eller #introductions.'
-      full_handle: Ditt fullständiga användarnamn/mastodonadress
-      full_handle_hint: Det här är vad du skulle berätta för dina vänner så att de kan meddela eller följa dig från en annan instans.
+      feature_action: Lär dig mer
+      feature_audience: Mastodon ger dig en unik möjlighet att hantera din publik utan mellanhänder. Mastodon distribueras på din egen infrastruktur gör att du kan följa och följas från någon annan Mastodon-server online och är under ingen kontroll men din.
+      feature_audience_title: Skapa förtroende hos din publik
+      feature_control: Du vet bäst vad du vill se i ditt hemflöde. Inga algoritmer eller annonser som slösar din tid. Följ vem som helst på vilken Mastodon-server som helst från ett enda konto, få deras inlägg i kronologisk ordning och gör ditt hörn av internet lite mer du.
+      feature_control_title: Håll kontroll över din egen tidslinje
+      feature_creativity: Mastodon stöder ljud-, video- och bildinlägg, tillgänglighetsbeskrivningar, omröstningar, innehållsvarningar, animerade avatarer, anpassade emojis, miniatyrbildskontroll och mer, för att hjälpa dig att uttrycka dig själv online. Oavsett om du publicerar din konst, din musik eller din podcast finns Mastodon där för dig.
+      feature_creativity_title: Oöverträffad kreativitet
+      feature_moderation: Mastodon lägger tillbaka beslutsfattandet i dina händer. Varje server skapar sina egna regler och förordningar som tillämpas lokalt istället för toppstyrt som i företagens sociala medier vilket gör det maximalt flexibelt i att tillgodose behoven hos olika grupper av människor. Gå med i en server med de regler du samtycker till eller var värd för din egen.
+      feature_moderation_title: Moderering som det borde vara
+      follow_action: Följ
+      follow_step: Att följa intressanta människor är vad Mastodon handlar om.
+      follow_title: Anpassa ditt hemflöde
+      follows_subtitle: Följ välkända konton
+      follows_title: Rekommenderade profiler
+      follows_view_more: Visa fler personer att följa
+      hashtags_recent_count:
+        one: "%{people} personer de senaste 2 dagarna"
+        other: "%{people} personer under de senaste 2 dagarna"
+      hashtags_subtitle: Utforska vad som har trendat de senaste 2 dagarna
+      hashtags_title: Trendande hashtaggar
+      hashtags_view_more: Visa fler trendande hashtaggar
+      post_action: Skriv
+      post_step: Säg hej till världen med text, foton, videor eller omröstningar.
+      post_title: Skapa ditt första inlägg
+      share_action: Dela
+      share_step: Låt dina vänner veta hur de hittar dig på Mastodon.
+      share_title: Dela din Mastodon-profil
+      sign_in_action: Logga in
       subject: Välkommen till Mastodon
       title: Välkommen ombord, %{name}!
   users:
@@ -1838,6 +1902,7 @@ sv:
     go_to_sso_account_settings: Gå till din identitetsleverantörs kontoinställningar
     invalid_otp_token: Ogiltig tvåfaktorskod
     otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
+    rate_limited: För många autentiseringsförsök, försök igen senare.
     seamless_external_login: Du är inloggad via en extern tjänst, inställningar för lösenord och e-post är därför inte tillgängliga.
     signed_in_as: 'Inloggad som:'
   verification:
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index b035a602c2..3a22b572b1 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -212,7 +212,6 @@ ta:
   notifications:
     email_events: மின்னஞ்சல் அறிவிப்புகளுக்கான நிகழ்வுகள்
     email_events_hint: 'எந்த நிகழ்வுகளுக்கு அறிவிப்புகளைப் பெற வேண்டும் என்று தேர்வு செய்க:'
-    other_settings: அறிவிப்புகள் குறித்த பிற அமைப்புகள்
   polls:
     errors:
       invalid_choice: நீங்கள் தேர்வு செய்த விருப்பம் கிடைக்கவில்லை
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f553f6a41c..56b7bea69a 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -23,11 +23,11 @@ th:
   admin:
     account_actions:
       action: ทำการกระทำ
-      title: ทำการกระทำการควบคุม %{acct}
+      title: ทำการกระทำการกลั่นกรองต่อ %{acct}
     account_moderation_notes:
       create: เขียนหมายเหตุ
-      created_msg: สร้างหมายเหตุการควบคุมสำเร็จ!
-      destroyed_msg: ทำลายหมายเหตุการควบคุมสำเร็จ!
+      created_msg: สร้างหมายเหตุการกลั่นกรองสำเร็จ!
+      destroyed_msg: ทำลายหมายเหตุการกลั่นกรองสำเร็จ!
     accounts:
       add_email_domain_block: ปิดกั้นโดเมนอีเมล
       approve: อนุมัติ
@@ -93,8 +93,8 @@ th:
         pending: รอดำเนินการ
         silenced: จำกัดอยู่
         suspended: ระงับอยู่
-        title: การควบคุม
-      moderation_notes: หมายเหตุการควบคุม
+        title: การกลั่นกรอง
+      moderation_notes: หมายเหตุการกลั่นกรอง
       most_recent_activity: กิจกรรมล่าสุด
       most_recent_ip: IP ล่าสุด
       no_account_selected: ไม่มีการเปลี่ยนแปลงบัญชีเนื่องจากไม่มีการเลือก
@@ -226,7 +226,7 @@ th:
         update_status: อัปเดตโพสต์
         update_user_role: อัปเดตบทบาท
       actions:
-        approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        approve_appeal_html: "%{name} ได้อนุมัติการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         approve_user_html: "%{name} ได้อนุมัติการลงทะเบียนจาก %{target}"
         assigned_to_self_report_html: "%{name} ได้มอบหมายรายงาน %{target} ให้กับตนเอง"
         change_email_user_html: "%{name} ได้เปลี่ยนที่อยู่อีเมลของผู้ใช้ %{target}"
@@ -263,7 +263,7 @@ th:
         enable_user_html: "%{name} ได้เปิดใช้งานการเข้าสู่ระบบสำหรับผู้ใช้ %{target}"
         memorialize_account_html: "%{name} ได้เปลี่ยนบัญชีของ %{target} เป็นหน้าอนุสรณ์"
         promote_user_html: "%{name} ได้เลื่อนขั้นผู้ใช้ %{target}"
-        reject_appeal_html: "%{name} ได้ปฏิเสธการอุทธรณ์การตัดสินใจในการควบคุมจาก %{target}"
+        reject_appeal_html: "%{name} ได้ปฏิเสธการอุทธรณ์การตัดสินใจในการกลั่นกรองจาก %{target}"
         reject_user_html: "%{name} ได้ปฏิเสธการลงทะเบียนจาก %{target}"
         remove_avatar_user_html: "%{name} ได้เอาภาพประจำตัวของ %{target} ออก"
         reopen_report_html: "%{name} ได้เปิดรายงาน %{target} ใหม่"
@@ -395,7 +395,7 @@ th:
       import: นำเข้า
       new:
         create: สร้างการปิดกั้น
-        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะนำไปใช้วิธีการควบคุมที่เฉพาะเจาะจงกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
+        hint: การปิดกั้นโดเมนจะไม่ป้องกันการสร้างรายการบัญชีในฐานข้อมูล แต่จะนำไปใช้วิธีการกลั่นกรองที่เฉพาะเจาะจงกับบัญชีเหล่านั้นย้อนหลังและโดยอัตโนมัติ
         severity:
           desc_html: "<strong>จำกัด</strong> จะทำให้โพสต์จากบัญชีที่โดเมนนี้ไม่ปรากฏแก่ใครก็ตามที่ไม่ได้กำลังติดตามเขา <strong>ระงับ</strong> จะเอาข้อมูลเนื้อหา, สื่อ และโปรไฟล์ทั้งหมดสำหรับบัญชีของโดเมนนี้ออกจากเซิร์ฟเวอร์ของคุณ ใช้ <strong>ไม่มี</strong> หากคุณแค่ต้องการปฏิเสธไฟล์สื่อ"
           noop: ไม่มี
@@ -407,7 +407,7 @@ th:
       obfuscate: ทำให้ชื่อโดเมนคลุมเครือ
       obfuscate_hint: ทำให้ชื่อโดเมนในรายการคลุมเครือบางส่วนหากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       private_comment: ความคิดเห็นส่วนตัว
-      private_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับการใช้งานภายในโดยผู้ควบคุม
+      private_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับการใช้งานภายในโดยผู้กลั่นกรอง
       public_comment: ความคิดเห็นสาธารณะ
       public_comment_hint: ความคิดเห็นเกี่ยวกับการจำกัดโดเมนนี้สำหรับสาธารณชนทั่วไป หากมีการเปิดใช้งานการประกาศรายการการจำกัดโดเมน
       reject_media: ปฏิเสธไฟล์สื่อ
@@ -452,7 +452,7 @@ th:
         title: นำเข้าการปิดกั้นโดเมน
       no_file: ไม่ได้เลือกไฟล์
     follow_recommendations:
-      description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามส่วนบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
+      description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามเฉพาะบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
       language: สำหรับภาษา
       status: สถานะ
       suppress: ระงับคำแนะนำการติดตาม
@@ -512,7 +512,7 @@ th:
       moderation:
         all: ทั้งหมด
         limited: จำกัดอยู่
-        title: การควบคุม
+        title: การกลั่นกรอง
       private_comment: ความคิดเห็นส่วนตัว
       public_comment: ความคิดเห็นสาธารณะ
       purge: ล้างข้อมูล
@@ -585,9 +585,12 @@ th:
       actions_description_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ หากคุณใช้การกระทำที่เป็นการลงโทษต่อบัญชีที่รายงาน จะส่งการแจ้งเตือนอีเมลถึงเขา ยกเว้นเมื่อมีการเลือกหมวดหมู่ <strong>สแปม</strong>
       actions_description_remote_html: ตัดสินใจว่าการกระทำใดที่จะใช้เพื่อแก้ปัญหารายงานนี้ นี่จะมีผลต่อวิธีที่เซิร์ฟเวอร์ <strong>ของคุณ</strong> สื่อสารกับบัญชีระยะไกลนี้และจัดการเนื้อหาของบัญชีเท่านั้น
       add_to_report: เพิ่มข้อมูลเพิ่มเติมไปยังรายงาน
+      already_suspended_badges:
+        local: ระงับในเซิร์ฟเวอร์นี้อยู่แล้ว
+        remote: ระงับในเซิร์ฟเวอร์ของเขาอยู่แล้ว
       are_you_sure: คุณแน่ใจหรือไม่?
       assign_to_self: มอบหมายให้ฉัน
-      assigned: ผู้ควบคุมที่ได้รับมอบหมาย
+      assigned: ผู้กลั่นกรองที่ได้รับมอบหมาย
       by_target_domain: โดเมนของบัญชีที่ได้รับการรายงาน
       cancel: ยกเลิก
       category: หมวดหมู่
@@ -596,7 +599,7 @@ th:
         none: ไม่มี
       comment_description_html: 'เพื่อให้ข้อมูลเพิ่มเติม %{name} ได้เขียน:'
       confirm: ยืนยัน
-      confirm_action: ยืนยันการกระทำการควบคุมต่อ @%{acct}
+      confirm_action: ยืนยันการกระทำการกลั่นกรองต่อ @%{acct}
       created_at: รายงานเมื่อ
       delete_and_resolve: ลบโพสต์
       forwarded: ส่งต่อแล้ว
@@ -613,7 +616,7 @@ th:
         delete: ลบ
         placeholder: อธิบายว่ามีการใช้การกระทำใด หรือการอัปเดตที่เกี่ยวข้องอื่นใด...
         title: หมายเหตุ
-      notes_description_html: ดูและฝากหมายเหตุถึงผู้ควบคุมอื่น ๆ และตัวคุณเองในอนาคต
+      notes_description_html: ดูและฝากหมายเหตุถึงผู้กลั่นกรองอื่น ๆ และตัวคุณเองในอนาคต
       processed_msg: 'ประมวลผลรายงาน #%{id} สำเร็จ'
       quick_actions_description_html: 'ดำเนินการอย่างรวดเร็วหรือเลื่อนลงเพื่อดูเนื้อหาที่รายงาน:'
       remote_user_placeholder: ผู้ใช้ระยะไกลจาก %{instance}
@@ -644,7 +647,7 @@ th:
         preview_preamble_html: "<strong>@%{acct}</strong> จะได้รับคำเตือนโดยมีเนื้อหาดังต่อไปนี้:"
         record_strike_html: บันทึกการดำเนินการต่อ <strong>@%{acct}</strong> เพื่อช่วยให้คุณเลื่อนระดับการละเมิดในอนาคตจากบัญชีนี้
         send_email_html: ส่งอีเมลคำเตือนถึง <strong>@%{acct}</strong>
-        warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการควบคุม
+        warning_placeholder: การให้เหตุผลเพิ่มเติมที่ไม่จำเป็นสำหรับการกระทำการกลั่นกรอง
       target_origin: จุดเริ่มต้นของบัญชีที่ได้รับการรายงาน
       title: รายงาน
       unassign: เลิกมอบหมาย
@@ -660,7 +663,7 @@ th:
         administration: การดูแล
         devops: DevOps
         invites: คำเชิญ
-        moderation: การควบคุม
+        moderation: การกลั่นกรอง
         special: พิเศษ
       delete: ลบ
       description_html: ด้วย <strong>บทบาทผู้ใช้</strong> คุณสามารถปรับแต่งว่าฟังก์ชันและพื้นที่ใดของ Mastodon ที่ผู้ใช้ของคุณสามารถเข้าถึง
@@ -679,7 +682,7 @@ th:
         manage_announcements: จัดการประกาศ
         manage_announcements_description: อนุญาตให้ผู้ใช้จัดการประกาศในเซิร์ฟเวอร์
         manage_appeals: จัดการการอุทธรณ์
-        manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการควบคุม
+        manage_appeals_description: อนุญาตให้ผู้ใช้ตรวจทานการอุทธรณ์ต่อการกระทำการกลั่นกรอง
         manage_blocks: จัดการการปิดกั้น
         manage_blocks_description: อนุญาตให้ผู้ใช้ปิดกั้นผู้ให้บริการอีเมลและที่อยู่ IP
         manage_custom_emojis: จัดการอีโมจิที่กำหนดเอง
@@ -689,7 +692,7 @@ th:
         manage_invites: จัดการคำเชิญ
         manage_invites_description: อนุญาตให้ผู้ใช้เรียกดูและปิดใช้งานลิงก์เชิญ
         manage_reports: จัดการรายงาน
-        manage_reports_description: อนุญาตให้ผู้ใช้ตรวจทานรายงานและทำการกระทำการควบคุมต่อรายงานเหล่านั้น
+        manage_reports_description: อนุญาตให้ผู้ใช้ตรวจทานรายงานและทำการกระทำการกลั่นกรองต่อรายงานเหล่านั้น
         manage_roles: จัดการบทบาท
         manage_roles_description: อนุญาตให้ผู้ใช้จัดการและกำหนดบทบาทที่ต่ำกว่าบทบาทของเขา
         manage_rules: จัดการกฎ
@@ -701,7 +704,7 @@ th:
         manage_user_access: จัดการการเข้าถึงของผู้ใช้
         manage_user_access_description: อนุญาตให้ผู้ใช้ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยของผู้ใช้อื่น เปลี่ยนที่อยู่อีเมลของเขา และตั้งรหัสผ่านของเขาใหม่
         manage_users: จัดการผู้ใช้
-        manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการควบคุมต่อผู้ใช้เหล่านั้น
+        manage_users_description: อนุญาตให้ผู้ใช้ดูรายละเอียดของผู้ใช้อื่น ๆ และทำการกระทำการกลั่นกรองต่อผู้ใช้เหล่านั้น
         manage_webhooks: จัดการเว็บฮุค
         manage_webhooks_description: อนุญาตให้ผู้ใช้ตั้งค่าเว็บฮุคสำหรับเหตุการณ์การดูแล
         view_audit_log: ดูรายการบันทึกการตรวจสอบ
@@ -721,7 +724,7 @@ th:
     settings:
       about:
         manage_rules: จัดการกฎของเซิร์ฟเวอร์
-        preamble: ให้ข้อมูลเชิงลึกเกี่ยวกับวิธีที่เซิร์ฟเวอร์ได้รับการดำเนินงาน ควบคุม ได้รับทุน
+        preamble: ให้ข้อมูลเชิงลึกเกี่ยวกับวิธีที่เซิร์ฟเวอร์ได้รับการดำเนินงาน กลั่นกรอง ได้รับทุน
         rules_hint: มีพื้นที่เฉพาะสำหรับกฎที่คาดหวังให้ผู้ใช้ของคุณปฏิบัติตาม
         title: เกี่ยวกับ
       appearance:
@@ -734,6 +737,7 @@ th:
         desc_html: สิ่งนี้พึ่งพาสคริปต์ภายนอกจาก hCaptcha ซึ่งอาจเป็นข้อกังวลด้านความปลอดภัยและความเป็นส่วนตัว นอกจากนี้ <strong>สิ่งนี้สามารถทำให้กระบวนการการลงทะเบียนเข้าถึงได้น้อยลงอย่างมีนัยสำคัญสำหรับผู้คนบางส่วน (โดยเฉพาะอย่างยิ่งผู้พิการ)</strong> ด้วยเหตุผลเหล่านี้ โปรดพิจารณามาตรการทางเลือก เช่น การลงทะเบียนตามการอนุมัติหรือตามคำเชิญ
         title: ต้องให้ผู้ใช้ใหม่แก้ CAPTCHA เพื่อยืนยันบัญชีของเขา
       content_retention:
+        danger_zone: โซนอันตราย
         preamble: ควบคุมวิธีการจัดเก็บเนื้อหาที่ผู้ใช้สร้างขึ้นใน Mastodon
         title: การเก็บรักษาเนื้อหา
       default_noindex:
@@ -753,6 +757,7 @@ th:
         disabled: ให้กับไม่มีใคร
         users: ให้กับผู้ใช้ในเซิร์ฟเวอร์ที่เข้าสู่ระบบ
       registrations:
+        moderation_recommandation: โปรดตรวจสอบให้แน่ใจว่าคุณมีทีมการกลั่นกรองที่เพียงพอและมีปฏิกิริยาตอบสนองก่อนที่คุณจะเปิดการลงทะเบียนให้กับทุกคน!
         preamble: ควบคุมผู้ที่สามารถสร้างบัญชีในเซิร์ฟเวอร์ของคุณ
         title: การลงทะเบียน
       registrations_mode:
@@ -760,6 +765,7 @@ th:
           approved: ต้องการการอนุมัติสำหรับการลงทะเบียน
           none: ไม่มีใครสามารถลงทะเบียน
           open: ใครก็ตามสามารถลงทะเบียน
+        warning_hint: เราแนะนำให้ใช้ “ต้องการการอนุมัติสำหรับการลงทะเบียน” เว้นแต่คุณมั่นใจว่าทีมการกลั่นกรองของคุณสามารถจัดการกับสแปมและการลงทะเบียนที่เป็นอันตรายได้อย่างทันท่วงที
       security:
         authorized_fetch: ต้องมีการรับรองความถูกต้องจากเซิร์ฟเวอร์ที่ติดต่อกับภายนอก
         authorized_fetch_hint: การต้องการการรับรองความถูกต้องจากเซิร์ฟเวอร์ที่ติดต่อกับภายนอกทำให้การบังคับใช้การปิดกั้นทั้งระดับผู้ใช้และระดับเซิร์ฟเวอร์เข้มงวดขึ้น อย่างไรก็ตาม สิ่งนี้มาพร้อมกับต้นทุนที่ต้องแลกด้วยผลเสียด้านประสิทธิภาพ ลดการเข้าถึงการตอบกลับของคุณ และอาจก่อให้เกิดปัญหาความเข้ากันได้กับบริการที่ติดต่อกับภายนอกบางอย่าง นอกจากนี้ สิ่งนี้จะไม่ป้องกันตัวดำเนินการเฉพาะจากการดึงข้อมูลโพสต์และบัญชีสาธารณะของคุณ
@@ -771,7 +777,7 @@ th:
       destroyed_msg: ลบการอัปโหลดไซต์สำเร็จ!
     software_updates:
       critical_update: สำคัญ — โปรดอัปเดตอย่างรวดเร็ว
-      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon ในเวลาที่เหมาะสมเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
+      description: ขอแนะนำให้ทำให้การติดตั้ง Mastodon ของคุณทันสมัยอยู่เสมอเพื่อรับประโยชน์จากการแก้ไขและคุณลักษณะล่าสุด ยิ่งไปกว่านั้น บางครั้งก็เป็นสิ่งสำคัญที่จะอัปเดต Mastodon อย่างทันท่วงทีเพื่อหลีกเลี่ยงปัญหาความปลอดภัย ด้วยเหตุผลเหล่านี้ Mastodon จึงตรวจสอบการอัปเดตทุก 30 นาที และจะแจ้งเตือนคุณตามการกำหนดลักษณะการแจ้งเตือนอีเมลของคุณ
       documentation_link: เรียนรู้เพิ่มเติม
       release_notes: บันทึกประจำรุ่น
       title: การอัปเดตที่พร้อมใช้งาน
@@ -847,7 +853,7 @@ th:
         message_html: ไม่มีกระบวนการ Sidekiq ที่กำลังทำงานสำหรับคิว %{value} โปรดตรวจทานการกำหนดค่า Sidekiq ของคุณ
       software_version_critical_check:
         action: ดูการอัปเดตที่พร้อมใช้งาน
-        message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้
+        message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้
       software_version_patch_check:
         action: ดูการอัปเดตที่พร้อมใช้งาน
         message_html: มีการอัปเดต Mastodon ที่แก้ไขข้อบกพร่องพร้อมใช้งาน
@@ -948,6 +954,9 @@ th:
       title: เว็บฮุค
       webhook: เว็บฮุค
   admin_mailer:
+    auto_close_registrations:
+      body: เนื่องจากการขาดกิจกรรมของผู้กลั่นกรองล่าสุด จึงมีการสลับการลงทะเบียนใน %{instance} เป็นการต้องการการตรวจทานด้วยตนเองโดยอัตโนมัติ เพื่อป้องกันไม่ให้มีการใช้ %{instance} เป็นแพลตฟอร์มสำหรับผู้ไม่ประสงค์ดี คุณสามารถสลับการลงทะเบียนกลับเป็นการลงทะเบียนแบบเปิดเมื่อใดก็ได้
+      subject: มีการสลับการลงทะเบียนสำหรับ %{instance} เป็นการต้องการการอนุมัติโดยอัตโนมัติ
     new_appeal:
       actions:
         delete_statuses: เพื่อลบโพสต์ของเขา
@@ -957,11 +966,11 @@ th:
         sensitive: เพื่อทำเครื่องหมายบัญชีของเขาว่าละเอียดอ่อน
         silence: เพื่อจำกัดบัญชีของเขา
         suspend: เพื่อระงับบัญชีของเขา
-      body: "%{target} กำลังอุทธรณ์การตัดสินใจในการควบคุมโดย %{action_taken_by} จาก %{date} ซึ่งเป็น %{type} เขาเขียนว่า:"
-      next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการควบคุม หรือเพิกเฉยต่อการอุทธรณ์
-      subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
+      body: "%{target} กำลังอุทธรณ์การตัดสินใจในการกลั่นกรองโดย %{action_taken_by} จาก %{date} ซึ่งก็คือ %{type} เขาเขียนว่า:"
+      next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการกลั่นกรอง หรือเพิกเฉยต่อการอุทธรณ์
+      subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการกลั่นกรองใน %{instance}"
     new_critical_software_updates:
-      body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้!
+      body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้!
       subject: การอัปเดต Mastodon สำคัญพร้อมใช้งานสำหรับ %{instance}!
     new_pending_account:
       body: รายละเอียดของบัญชีใหม่อยู่ด้านล่าง คุณสามารถอนุมัติหรือปฏิเสธใบสมัครนี้
@@ -1067,8 +1076,8 @@ th:
       accept: ยอมรับ
       back: ย้อนกลับ
       invited_by: 'คุณสามารถเข้าร่วม %{domain} ได้ด้วยคำเชิญที่คุณได้รับจาก:'
-      preamble: มีการตั้งและบังคับใช้กฎโดยผู้ควบคุมของ %{domain}
-      preamble_invited: ก่อนที่คุณจะดำเนินการต่อ โปรดพิจารณากฎพื้นฐานที่ตั้งโดยผู้ควบคุมของ %{domain}
+      preamble: มีการตั้งและบังคับใช้กฎโดยผู้กลั่นกรองของ %{domain}
+      preamble_invited: ก่อนที่คุณจะดำเนินการต่อ โปรดพิจารณากฎพื้นฐานที่ตั้งโดยผู้กลั่นกรองของ %{domain}
       title: กฎพื้นฐานบางประการ
       title_invited: คุณได้รับการเชิญ
     security: ความปลอดภัย
@@ -1083,7 +1092,7 @@ th:
       preamble_html: เข้าสู่ระบบด้วยข้อมูลประจำตัว <strong>%{domain}</strong> ของคุณ หากบัญชีของคุณได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น คุณจะไม่สามารถเข้าสู่ระบบได้ที่นี่
       title: เข้าสู่ระบบ %{domain}
     sign_up:
-      manual_review: การลงทะเบียนใน %{domain} จะผ่านการตรวจทานด้วยตนเองโดยผู้ควบคุมของเรา เพื่อช่วยให้เราประมวลผลการลงทะเบียนของคุณ เขียนสักนิดเกี่ยวกับตัวคุณเองและเหตุผลที่คุณต้องการบัญชีใน %{domain}
+      manual_review: การลงทะเบียนใน %{domain} จะผ่านการตรวจทานด้วยตนเองโดยผู้กลั่นกรองของเรา เพื่อช่วยให้เราประมวลผลการลงทะเบียนของคุณ เขียนสักนิดเกี่ยวกับตัวคุณเองและเหตุผลที่คุณต้องการบัญชีใน %{domain}
       preamble: ด้วยบัญชีในเซิร์ฟเวอร์ Mastodon นี้ คุณจะสามารถติดตามบุคคลอื่นใดในเครือข่าย โดยไม่คำนึงถึงที่ซึ่งบัญชีของเขาได้รับการโฮสต์
       title: มาตั้งค่าของคุณใน %{domain} กันเลย
     status:
@@ -1364,7 +1373,7 @@ th:
       webauthn: กุญแจความปลอดภัย
     description_html: หากคุณเห็นกิจกรรมที่คุณไม่รู้จัก พิจารณาเปลี่ยนรหัสผ่านของคุณและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัย
     empty: ไม่มีประวัติการรับรองความถูกต้อง
-    failed_sign_in_html: ความพยายามลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) ล้มเหลว
+    failed_sign_in_html: ความพยายามในการลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) ล้มเหลว
     successful_sign_in_html: ลงชื่อเข้าด้วย %{method} จาก %{ip} (%{browser}) สำเร็จ
     title: ประวัติการรับรองความถูกต้อง
   mail_subscriptions:
@@ -1419,7 +1428,7 @@ th:
       other_data: จะไม่ย้ายข้อมูลอื่น ๆ โดยอัตโนมัติ
       redirect: จะอัปเดตโปรไฟล์ของบัญชีปัจจุบันของคุณด้วยข้อสังเกตการเปลี่ยนเส้นทางและจะไม่รวมอยู่ในการค้นหา
   moderation:
-    title: การควบคุม
+    title: การกลั่นกรอง
   move_handler:
     carry_blocks_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ปิดกั้น
     carry_mutes_over_text: ผู้ใช้นี้ได้ย้ายจาก %{acct} ซึ่งคุณได้ซ่อน
@@ -1464,7 +1473,6 @@ th:
     administration_emails: การแจ้งเตือนอีเมลผู้ดูแล
     email_events: เหตุการณ์สำหรับการแจ้งเตือนอีเมล
     email_events_hint: 'เลือกเหตุการณ์ที่คุณต้องการรับการแจ้งเตือน:'
-    other_settings: การตั้งค่าการแจ้งเตือนอื่น ๆ
   number:
     human:
       decimal_units:
@@ -1520,6 +1528,9 @@ th:
     errors:
       limit_reached: ถึงขีดจำกัดของการตอบสนองต่าง ๆ แล้ว
       unrecognized_emoji: ไม่ใช่อีโมจิที่รู้จัก
+  redirects:
+    prompt: หากคุณเชื่อถือลิงก์นี้ ให้คลิกลิงก์เพื่อดำเนินการต่อ
+    title: คุณกำลังจะออกจาก %{instance}
   relationships:
     activity: กิจกรรมบัญชี
     confirm_follow_selected_followers: คุณแน่ใจหรือไม่ว่าต้องการติดตามผู้ติดตามที่เลือก?
@@ -1582,6 +1593,7 @@ th:
       unknown_browser: เบราว์เซอร์ที่ไม่รู้จัก
       weibo: Weibo
     current_session: เซสชันปัจจุบัน
+    date: วันที่
     description: "%{browser} ใน %{platform}"
     explanation: นี่คือเว็บเบราว์เซอร์ที่เข้าสู่ระบบบัญชี Mastodon ของคุณในปัจจุบัน
     ip: IP
@@ -1618,14 +1630,26 @@ th:
     import: การนำเข้า
     import_and_export: การนำเข้าและการส่งออก
     migrate: การโยกย้ายบัญชี
-    notifications: การแจ้งเตือน
+    notifications: การแจ้งเตือนทางอีเมล
     preferences: การกำหนดลักษณะ
     profile: โปรไฟล์สาธารณะ
     relationships: การติดตามและผู้ติดตาม
+    severed_relationships: ความสัมพันธ์ที่ตัดขาด
     statuses_cleanup: การลบโพสต์แบบอัตโนมัติ
-    strikes: การดำเนินการการควบคุม
+    strikes: การดำเนินการการกลั่นกรอง
     two_factor_authentication: การรับรองความถูกต้องด้วยสองปัจจัย
     webauthn_authentication: กุญแจความปลอดภัย
+  severed_relationships:
+    download: ดาวน์โหลด (%{count})
+    event_type:
+      account_suspension: การระงับบัญชี (%{target_name})
+      domain_block: การระงับเซิร์ฟเวอร์ (%{target_name})
+      user_domain_block: คุณได้ปิดกั้น %{target_name}
+    lost_followers: ผู้ติดตามที่หายไป
+    lost_follows: การติดตามที่หายไป
+    preamble: คุณอาจสูญเสียการติดตามและผู้ติดตามเมื่อคุณปิดกั้นโดเมนหรือเมื่อผู้กลั่นกรองของคุณตัดสินใจที่จะระงับเซิร์ฟเวอร์ระยะไกล เมื่อสิ่งนั้นเกิดขึ้น คุณจะสามารถดาวน์โหลดรายการความสัมพันธ์ที่ตัดขาด เพื่อตรวจสอบและอาจนำเข้าในเซิร์ฟเวอร์อื่น
+    purged: มีการล้างข้อมูลเกี่ยวกับเซิร์ฟเวอร์นี้โดยผู้ดูแลของเซิร์ฟเวอร์ของคุณ
+    type: เหตุการณ์
   statuses:
     attached:
       audio:
@@ -1657,8 +1681,6 @@ th:
         other: "%{count} การลงคะแนน"
       vote: ลงคะแนน
     show_more: แสดงเพิ่มเติม
-    show_newer: แสดงที่ใหม่กว่า
-    show_older: แสดงที่เก่ากว่า
     show_thread: แสดงกระทู้
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1715,6 +1737,7 @@ th:
     contrast: Mastodon (ความคมชัดสูง)
     default: Mastodon (มืด)
     mastodon-light: Mastodon (สว่าง)
+    system: อัตโนมัติ (ใช้ชุดรูปแบบของระบบ)
   time:
     formats:
       default: "%d %b %Y %H:%M น."
@@ -1742,18 +1765,27 @@ th:
     webauthn: กุญแจความปลอดภัย
   user_mailer:
     appeal_approved:
-      action: ไปยังบัญชีของคุณ
+      action: การตั้งค่าบัญชี
       explanation: อนุมัติการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
       subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
+      subtitle: บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
       title: อนุมัติการอุทธรณ์แล้ว
     appeal_rejected:
       explanation: ปฏิเสธการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว
       subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
+      subtitle: ปฏิเสธการอุทธรณ์ของคุณแล้ว
       title: ปฏิเสธการอุทธรณ์แล้ว
     backup_ready:
-      explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
+      explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ
+      extra: ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
       subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
       title: การส่งออกการเก็บถาวร
+    failed_2fa:
+      details: 'นี่คือรายละเอียดของความพยายามในการลงชื่อเข้า:'
+      explanation: ใครสักคนได้ลองลงชื่อเข้าบัญชีของคุณแต่ให้การรับรองความถูกต้องด้วยปัจจัยที่สองที่ไม่ถูกต้อง
+      further_actions_html: หากนี่ไม่ใช่คุณ เราแนะนำให้คุณ %{action} ทันทีเนื่องจากอาจมีการบุกรุกบัญชี
+      subject: ความล้มเหลวการรับรองความถูกต้องด้วยปัจจัยที่สอง
+      title: การรับรองความถูกต้องด้วยปัจจัยที่สองล้มเหลว
     suspicious_sign_in:
       change_password: เปลี่ยนรหัสผ่านของคุณ
       details: 'นี่คือรายละเอียดของการลงชื่อเข้า:'
@@ -1768,9 +1800,9 @@ th:
         spam: สแปม
         violation: เนื้อหาละเมิดหลักเกณฑ์ชุมชนดังต่อไปนี้
       explanation:
-        delete_statuses: มีการพบว่าโพสต์บางส่วนของคุณละเมิดหลักเกณฑ์ชุมชนจำนวนหนึ่งหรือมากกว่าและได้รับการเอาออกโดยผู้ควบคุมของ %{instance} ในเวลาต่อมา
+        delete_statuses: มีการพบว่าโพสต์บางส่วนของคุณละเมิดหลักเกณฑ์ชุมชนจำนวนหนึ่งหรือมากกว่าและได้รับการเอาออกโดยผู้กลั่นกรองของ %{instance} ในเวลาต่อมา
         disable: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป แต่โปรไฟล์และข้อมูลอื่น ๆ ของคุณยังคงอยู่ในสภาพเดิม คุณสามารถขอข้อมูลสำรองของข้อมูลของคุณ เปลี่ยนการตั้งค่าบัญชี หรือลบบัญชีของคุณ
-        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนโดยผู้ควบคุมของ %{instance} แล้ว นี่หมายความว่าผู้คนจะต้องแตะสื่อในโพสต์ก่อนที่จะแสดงตัวอย่าง คุณสามารถทำเครื่องหมายสื่อว่าละเอียดอ่อนด้วยตัวคุณเองเมื่อโพสต์ในอนาคต
+        mark_statuses_as_sensitive: ทำเครื่องหมายโพสต์บางส่วนของคุณว่าละเอียดอ่อนโดยผู้กลั่นกรองของ %{instance} แล้ว นี่หมายความว่าผู้คนจะต้องแตะสื่อในโพสต์ก่อนที่จะแสดงตัวอย่าง คุณสามารถทำเครื่องหมายสื่อว่าละเอียดอ่อนด้วยตัวคุณเองเมื่อโพสต์ในอนาคต
         sensitive: จากนี้ไป จะทำเครื่องหมายไฟล์สื่อที่อัปโหลดทั้งหมดของคุณว่าละเอียดอ่อนและซ่อนอยู่หลังการคลิกไปยังคำเตือน
         silence: คุณยังคงสามารถใช้บัญชีของคุณแต่เฉพาะผู้คนที่กำลังติดตามคุณอยู่แล้วเท่านั้นที่จะเห็นโพสต์ของคุณในเซิร์ฟเวอร์นี้ และอาจไม่รวมคุณอยู่ในคุณลักษณะการค้นพบต่าง ๆ อย่างไรก็ตาม ผู้อื่นอาจยังติดตามคุณด้วยตนเอง
         suspend: คุณไม่สามารถใช้บัญชีของคุณได้อีกต่อไป และจะไม่สามารถเข้าถึงโปรไฟล์และข้อมูลอื่น ๆ ของคุณได้อีกต่อไป คุณยังคงสามารถเข้าสู่ระบบเพื่อขอข้อมูลสำรองของข้อมูลของคุณจนกว่าจะเอาข้อมูลออกอย่างสมบูรณ์ในเวลาประมาณ 30 วัน แต่เราจะเก็บรักษาข้อมูลพื้นฐานบางอย่างไว้เพื่อป้องกันไม่ให้คุณหลบเลี่ยงการระงับ
@@ -1793,13 +1825,40 @@ th:
         silence: จำกัดบัญชีอยู่
         suspend: ระงับบัญชีอยู่
     welcome:
-      edit_profile_action: ตั้งค่าโปรไฟล์
-      edit_profile_step: คุณสามารถปรับแต่งโปรไฟล์ของคุณได้โดยอัปโหลดรูปภาพโปรไฟล์ เปลี่ยนชื่อที่แสดงของคุณ และอื่น ๆ คุณสามารถเลือกรับการตรวจทานผู้ติดตามใหม่ก่อนที่จะอนุญาตให้เขาติดตามคุณ
+      apps_android_action: รับแอปใน Google Play
+      apps_ios_action: ดาวน์โหลดใน App Store
+      apps_step: ดาวน์โหลดแอปอย่างเป็นทางการของเรา
+      apps_title: แอป Mastodon
+      checklist_subtitle: 'มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:'
+      checklist_title: รายการตรวจสอบยินดีต้อนรับ
+      edit_profile_action: ปรับแต่ง
+      edit_profile_step: เพิ่มการโต้ตอบของคุณโดยการมีโปรไฟล์ที่ครอบคลุม
+      edit_profile_title: ปรับแต่งโปรไฟล์ของคุณ
       explanation: นี่คือเคล็ดลับบางส่วนที่จะช่วยให้คุณเริ่มต้นใช้งาน
-      final_action: เริ่มโพสต์
-      final_step: 'เริ่มโพสต์! แม้ว่าไม่มีผู้ติดตาม โพสต์สาธารณะของคุณอาจเห็นโดยผู้อื่น ตัวอย่างเช่น ในเส้นเวลาในเซิร์ฟเวอร์หรือในแฮชแท็ก คุณอาจต้องการแนะนำตัวเองในแฮชแท็ก #introductions'
-      full_handle: นามเต็มของคุณ
-      full_handle_hint: นี่คือสิ่งที่คุณจะบอกเพื่อน ๆ ของคุณเพื่อให้เขาสามารถส่งข้อความหรือติดตามคุณจากเซิร์ฟเวอร์อื่น
+      feature_action: เรียนรู้เพิ่มเติม
+      feature_audience: Mastodon มีความพิเศษที่ให้คุณจัดการผู้รับสารของคุณได้โดยไม่มีตัวกลาง นอกจากนี้ การติดตั้ง Mastodon บนโครงสร้างพื้นฐานของคุณจะทำให้คุณสามารถติดตาม (และติดตามโดย) เซิร์ฟเวอร์ Mastodon แห่งไหนก็ได้ที่ทำงานอยู่ โดยไม่มีใครสามารถควบคุมได้นอกจากคุณ
+      feature_audience_title: สร้างผู้ชมของคุณด้วยความมั่นใจ
+      feature_control_title: การควบคุมเส้นเวลาของคุณเอง
+      feature_creativity_title: ความคิดสร้างสรรค์ที่ไม่มีใครเทียบได้
+      feature_moderation_title: การกลั่นกรองในแบบที่ควรจะเป็น
+      follow_action: ติดตาม
+      follow_step: การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ
+      follow_title: ปรับแต่งฟีดหน้าแรกของคุณ
+      follows_subtitle: ติดตามบัญชีที่มีชื่อเสียง
+      follows_title: ติดตามใครดี
+      follows_view_more: ดูผู้คนที่จะติดตามเพิ่มเติม
+      hashtags_recent_count:
+        other: "%{people} คนใน 2 วันที่ผ่านมา"
+      hashtags_subtitle: สำรวจสิ่งที่กำลังนิยมตั้งแต่ 2 วันที่ผ่านมา
+      hashtags_title: แฮชแท็กที่กำลังนิยม
+      hashtags_view_more: ดูแฮชแท็กที่กำลังนิยมเพิ่มเติม
+      post_action: เขียน
+      post_step: กล่าวสวัสดีชาวโลกด้วยข้อความ, รูปภาพ, วิดีโอ หรือการสำรวจความคิดเห็น
+      post_title: สร้างโพสต์แรกของคุณ
+      share_action: แชร์
+      share_step: แจ้งให้เพื่อน ๆ ของคุณทราบวิธีค้นหาคุณใน Mastodon
+      share_title: แชร์โปรไฟล์ Mastodon ของคุณ
+      sign_in_action: ลงชื่อเข้า
       subject: ยินดีต้อนรับสู่ Mastodon
       title: ยินดีต้อนรับ %{name}!
   users:
@@ -1807,6 +1866,7 @@ th:
     go_to_sso_account_settings: ไปยังการตั้งค่าบัญชีของผู้ให้บริการข้อมูลประจำตัวของคุณ
     invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
     otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
+    rate_limited: มีความพยายามในการรับรองความถูกต้องมากเกินไป ลองอีกครั้งในภายหลัง
     seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นจึงไม่มีการตั้งค่ารหัสผ่านและอีเมล
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
diff --git a/config/locales/tok.yml b/config/locales/tok.yml
new file mode 100644
index 0000000000..9f962d2b53
--- /dev/null
+++ b/config/locales/tok.yml
@@ -0,0 +1,5 @@
+---
+tok:
+  admin:
+    accounts:
+      are_you_sure: ni li pona ala pona?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index da8935f6ca..7b9cf50aaf 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -10,7 +10,7 @@ tr:
     follow: Takip et
     followers:
       one: Takipçi
-      other: Takipçi
+      other: Takipçiler
     following: Takip ediliyor
     instance_actor_flash: Bu hesap, herhangi bir bireysel kullanıcı değil, sunucunun kendisini temsil etmek için kullanılan sanal bir aktördür. Birleştirme amacıyla kullanılmaktadır ve askıya alınmamalıdır.
     last_active: son etkinlik
@@ -597,6 +597,9 @@ tr:
       actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
       add_to_report: Bildirime daha fazlasını ekle
+      already_suspended_badges:
+        local: Bu sunucuda zaten askıya alınmış
+        remote: Sunucularında zaten askıya alınmış
       are_you_sure: Emin misiniz?
       assign_to_self: Bana ata
       assigned: Denetleyici atandı
@@ -748,6 +751,7 @@ tr:
         desc_html: Bu, güvenlik ve gizlilikle ilgili bir endişe kaynağı olabilecek hCaptcha'nın harici komut dosyalarına dayanır. Ayrıca <strong>bu, kayıt sürecini bazı (özellikle engelli) kişiler için önemli ölçüde daha az erişilebilir hale getirebilir</strong>. Bu nedenlerle, lütfen onaya dayalı veya davete dayalı kayıt gibi alternatif önlemleri göz önünde bulundurun.
         title: Yeni kullanıcıların hesaplarını doğrulamaları için bir CAPTCHA çözmelerini gerektir
       content_retention:
+        danger_zone: Tehlikeli bölge
         preamble: Kullanıcıların ürettiği içeriğin Mastodon'da nasıl saklanacağını denetleyin.
         title: İçerik saklama
       default_noindex:
@@ -767,6 +771,7 @@ tr:
         disabled: Hiç kimseye
         users: Oturum açan yerel kullanıcılara
       registrations:
+        moderation_recommandation: Lütfen kayıtları herkese açmadan önce yeterli ve duyarlı bir denetleyici ekibine sahip olduğunuzdan emin olun!
         preamble: Sunucunuzda kimin hesap oluşturabileceğini denetleyin.
         title: Kayıtlar
       registrations_mode:
@@ -774,6 +779,7 @@ tr:
           approved: Kayıt için onay gerekli
           none: Hiç kimse kayıt olamaz
           open: Herkes kaydolabilir
+        warning_hint: Denetleyici ekibinizin istenmeyen ve kötü niyetli kayıtları ele alabilecekleri konusunda emin değilseniz "Kayıt için onay gerekli" seçeneğini kullanmanızı öneririz.
       security:
         authorized_fetch: Dağıtık sunuculardan kimlik doğrulama gerektir
         authorized_fetch_hint: Dağıtık sunuculardan kimlik doğrulaması istemek, hem kullanıcı düzeyinde hem de sunucu düzeyinde blokların daha sıkı bir şekilde uygulanmasını sağlar. Ancak bu performans kaybına sebep olur, yanıtlarınızın erişimini azaltır ve bazı dağıtık hizmetlerle uyumluluk sorunları ortaya çıkarabilir. Ayrıca bu, özel aktörlerin herkese açık gönderilerinizi ve hesaplarınızı getirilmesini engellemez.
@@ -966,6 +972,9 @@ tr:
       title: Web kancaları
       webhook: Web kancası
   admin_mailer:
+    auto_close_registrations:
+      body: Son zamanlardaki denetleyi faaliyeti eksikliğinden dolayı, %{instance} üzerindeki kayıtlar, %{instance} sunucusunun olası kötü aktörler tarafından bir platform olarak kullanımını engellemek için otomatik olarak elle onay gerektirecek şekilde değiştirilmiştir. İstediğiniz zaman açık kayıtlara çevirebilirsiniz.
+      subject: "%{instance} üzerindeki kayıtlar otomatik olarak onay gerektirecek şekilde değiştirilmiştir"
     new_appeal:
       actions:
         delete_statuses: gönderilerini silme
@@ -1201,8 +1210,8 @@ tr:
     '406': Bu sayfa istenen formatta mevcut değil.
     '410': Aradığınız sayfa artık yok.
     '422':
-      content: Güvenlik doğrulaması başarısız oldu. Site cookie'lerini engellemiş olabilirsiniz.
-      title: Güvenlik doğrulamasu başarısız
+      content: Güvenlik doğrulaması başarısız oldu. Site çerezlerini engellemiş olabilirmisiniz?
+      title: Güvenlik doğrulaması başarısız
     '429': Kısıtlandı
     '500':
       content: Üzgünüz, ancak bir şey ters gitti.
@@ -1243,15 +1252,15 @@ tr:
       add_keyword: Anahtar sözcük ekle
       keywords: Anahtar Sözcükler
       statuses: Tekil gönderiler
-      statuses_hint_html: Bu filtre, aşağıdaki anahtar kelimelerle eşleşip eşleşmediklerinden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. <a href="%{path}">Filtredeki gönderileri inceleyin veya kaldırın</a>.
-      title: Filtreyi düzenle
+      statuses_hint_html: Bu süzgeçlere, aşağıdaki anahtar kelimelerle eşleşip eşleşmediklerinden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. <a href="%{path}">Süzgeçlerdeki gönderileri inceleyin veya kaldırın</a>.
+      title: Süzgeci düzenle
     errors:
-      deprecated_api_multiple_keywords: Bu parametreler, birden fazla filtre anahtar sözcüğü için geçerli olduğundan dolayı bu uygulama içerisinden değiştirilemezler. Daha yeni bir uygulama veya web arayüzünü kullanın.
+      deprecated_api_multiple_keywords: Bu parametreler, birden fazla süzgeç anahtar sözcüğü için geçerli olduğundan dolayı bu uygulama içerisinden değiştirilemezler. Daha yeni bir uygulama veya web arayüzünü kullanın.
       invalid_context: Sıfır ya da geçersiz içerik sağlandı
     index:
       contexts: "%{contexts} içindeki filtreler"
       delete: Sil
-      empty: Hiç filtreniz yok.
+      empty: Hiç süzgeciniz yok.
       expires_in: "%{distance} sürede sona eriyor"
       expires_on: "%{date} tarihinde sona eriyor"
       keywords:
@@ -1263,16 +1272,16 @@ tr:
       statuses_long:
         one: "%{count} tekil gönderi gizli"
         other: "%{count} tekil gönderi gizli"
-      title: Filtreler
+      title: Süzgeçler
     new:
-      save: Yeni filtre kaydet
-      title: Yeni filtre ekle
+      save: Yeni süzgeç kaydet
+      title: Yeni süzgeç ekle
     statuses:
-      back_to_filter: Filtreye dön
+      back_to_filter: Süzgeçe dön
       batch:
-        remove: Filtreden kaldır
+        remove: Süzgeçden kaldır
       index:
-        hint: Bu filtre diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu filtreye daha fazla gönderi ekleyebilirsiniz.
+        hint: Bu süzgece diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu süzgece daha fazla gönderi ekleyebilirsiniz.
         title: Süzgeçlenmiş gönderiler
   generic:
     all: Tümü
@@ -1480,8 +1489,8 @@ tr:
       subject: Anket %{name} tarafından sonlandırıldı
     reblog:
       body: "%{name} durumunuzu boostladı:"
-      subject: "%{name} durumunuzu boostladı"
-      title: Yeni boost
+      subject: "%{name} durumunuzu paylaştı"
+      title: Yeni paylaşım
     status:
       subject: "%{name} az önce gönderdi"
     update:
@@ -1490,7 +1499,6 @@ tr:
     administration_emails: Yönetici e-posta bildirimleri
     email_events: E-posta bildirimi gönderilecek etkinlikler
     email_events_hint: 'Bildirim almak istediğiniz olayları seçin:'
-    other_settings: Diğer bildirim ayarları
   number:
     human:
       decimal_units:
@@ -1544,8 +1552,11 @@ tr:
     title: Gizlilik Politikası
   reactions:
     errors:
-      limit_reached: Farklı reaksiyonların sınırına ulaşıldı
+      limit_reached: Farklı tepkilerin sınırına ulaşıldı
       unrecognized_emoji: tanınan bir emoji değil
+  redirects:
+    prompt: Eğer bu bağlantıya güveniyorsanız, tıklayıp devam edebilirsiniz.
+    title: "%{instance} sunucusundan ayrılıyorsunuz."
   relationships:
     activity: Hesap etkinliği
     confirm_follow_selected_followers: Seçili takipçileri takip etmek istediğinizden emin misiniz?
@@ -1608,6 +1619,7 @@ tr:
       unknown_browser: Bilinmeyen Tarayıcı
       weibo: Weibo
     current_session: Geçerli oturum
+    date: Tarih
     description: "%{platform} - %{browser}"
     explanation: Bunlar, Mastodon hesabınızda şu anda oturum açmış web tarayıcılarıdır.
     ip: IP
@@ -1644,14 +1656,26 @@ tr:
     import: İçe aktar
     import_and_export: İçe ve dışa aktar
     migrate: Hesap taşıma
-    notifications: Bildirimler
+    notifications: E-posta bildirimleri
     preferences: Tercihler
     profile: Profil
     relationships: Takip edilenler ve takipçiler
+    severed_relationships: Kopmuş ilişkiler
     statuses_cleanup: Otomatik gönderi silme
     strikes: Moderasyon eylemleri
     two_factor_authentication: İki adımlı doğrulama
     webauthn_authentication: Güvenlik anahtarları
+  severed_relationships:
+    download: İndir (%{count})
+    event_type:
+      account_suspension: Hesap askıya alma (%{target_name})
+      domain_block: Sunucu askıya alma (%{target_name})
+      user_domain_block: 'Engellediniz: %{target_name}'
+    lost_followers: Kaybedilen takipçiler
+    lost_follows: Kaybedilen takipler
+    preamble: Bir alan adını engellediğinizde veya denetleyicileriniz uzak bir sunucuyu askıya almaya karar verdiğinde takipçilerinizi ve takiplerinizi kaybedebilirsiniz. Bu olduğunda, kopan ilişkilerin bir listesini, incelemek ve başka bir sunucuya aktarmak için indirebileceksiniz.
+    purged: Bu sunucu hakkındaki bilgiler, sunucunun yöneticileri tarafından temizlenmiş.
+    type: Olay
   statuses:
     attached:
       audio:
@@ -1659,17 +1683,17 @@ tr:
         other: "%{count} ses"
       description: 'Ekli: %{attached}'
       image:
-        one: "%{count} resim"
-        other: "%{count} resim"
+        one: "%{count} görsel"
+        other: "%{count} görseller"
       video:
         one: "%{count} video"
-        other: "%{count} video"
-    boosted_from_html: "%{acct_link} kişisinden boostladı"
+        other: "%{count} videolar"
+    boosted_from_html: "%{acct_link} kişisinden paylaştı"
     content_warning: 'İçerik uyarısı: %{warning}'
     default_language: Arayüz diliyle aynı
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket içeriyordu: %{tags}'
-      other: 'izin verilmeyen hashtag''leri içeriyordu: %{tags}'
+      other: 'izin verilmeyen etiketler içeriyordu: %{tags}'
     edited_at_html: "%{date} tarihinde düzenlendi"
     errors:
       in_reply_not_found: Yanıtlamaya çalıştığınız durum yok gibi görünüyor.
@@ -1679,18 +1703,16 @@ tr:
       direct: Sadece değinilen kullanıcıların görebileceği gönderiler üstte tutulamaz
       limit: Halihazırda maksimum sayıda gönderi sabitlediniz
       ownership: Başkasının gönderisi sabitlenemez
-      reblog: Bir boost sabitlenemez
+      reblog: Bir gönderi sabitlenemez
     poll:
       total_people:
         one: "%{count} kişi"
-        other: "%{count} kişi"
+        other: "%{count} kişiler"
       total_votes:
         one: "%{count} oy"
-        other: "%{count} oy"
+        other: "%{count} oylar"
       vote: Oy Ver
     show_more: Daha fazlasını göster
-    show_newer: Yenileri göster
-    show_older: Eskileri göster
     show_thread: Konuyu göster
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1747,12 +1769,13 @@ tr:
     contrast: Mastodon (Yüksek karşıtlık)
     default: Mastodon (Karanlık)
     mastodon-light: Mastodon (Açık)
+    system: Otomatik (sistem temasını kullan)
   time:
     formats:
       default: "%d %b %Y %H:%M"
       month: "%b %Y"
       time: "%H:%M"
-      with_time_zone: "%d.%m.%Y %H:%M %Z"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
       quota_exceeded: Çeviri hizmetinin sunucu kapsamındaki kullanım kotası aşıldı.
@@ -1770,22 +1793,31 @@ tr:
     otp: Authenticator uygulaması
     recovery_codes: Kurtarma kodlarını yedekle
     recovery_codes_regenerated: Kurtarma kodları başarıyla yeniden oluşturuldu
-    recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. Kurtarma kodlarınızı güvenli halde tutunuz. Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
+    recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. <strong>Kurtarma kodlarınızı güvenli halde tutunuz.</strong> Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
     webauthn: Güvenlik anahtarları
   user_mailer:
     appeal_approved:
-      action: Hesabınıza gidin
+      action: Hesap Ayarları
       explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız onaylandı. Hesabınız artık tekrar iyi durumda."
       subject: "%{date} tarihli itirazınız kabul edildi"
+      subtitle: Hesabınız yeniden iyi bir halde.
       title: İtiraz onaylandı
     appeal_rejected:
       explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız reddedildi."
       subject: "%{date} tarihli itirazınız reddedildi"
+      subtitle: İtirazınız reddedildi.
       title: İtiraz reddedildi
     backup_ready:
-      explanation: Mastodon hesabınızın tam yedeğini istemiştiniz. Şimdi indirilebilir durumda!
+      explanation: Mastodon hesabınız tam bir yedeğini istediniz.
+      extra: Şimdi indirebilirsiniz!
       subject: Arşiviniz indirilmeye hazır
       title: Arşiv paketlemesi
+    failed_2fa:
+      details: 'İşte oturum açma girişiminin ayrıntıları:'
+      explanation: Birisi hesabınızda oturum açmaya çalıştı ancak hatalı bir iki aşamalı doğrulama kodu kullandı.
+      further_actions_html: Eğer bu kişi siz değilseniz, hemen %{action} yapmanızı öneriyoruz çünkü hesabınız ifşa olmuş olabilir.
+      subject: İki aşamalı doğrulama başarısızlığı
+      title: Başarısız iki aşamalı kimlik doğrulama
     suspicious_sign_in:
       change_password: parolanızı değiştirin
       details: 'Oturum açma ayrıntıları şöyledir:'
@@ -1825,13 +1857,44 @@ tr:
         silence: Hesap sınırlandırıldı
         suspend: Hesap askıya alındı
     welcome:
-      edit_profile_action: Profil kurulumu
-      edit_profile_step: Bir profil resmi yükleyerek, ekran adınızı değiştirerek ve daha fazlasını yaparak profilinizi kişiselleştirebilirsiniz. Sizi takip etmelerine izin verilmeden önce yeni takipçileri incelemeyi tercih edebilirsiniz.
+      apps_android_action: Google Play'den edinin
+      apps_ios_action: App Store'dan İndirin
+      apps_step: Resmi uygulamalarımızı indirin.
+      apps_title: Mastodon uygulamaları
+      checklist_subtitle: 'Bu yeni sosyal sınırda başlamanızı sağlar:'
+      checklist_title: Hoşgeldiniz Yapılacaklar Listesi
+      edit_profile_action: Kişiselleştir
+      edit_profile_step: Kapsamlı bir profille etkileşimlerinizi arttırın.
+      edit_profile_title: Profilinizi kişiselleştirin
       explanation: İşte sana başlangıç için birkaç ipucu
-      final_action: Gönderi yazmaya başlayın
-      final_step: 'Gönderi yazmaya başlayın! Takipçiler olmadan bile, herkese açık gönderileriniz başkaları tarafından görülebilir, örneğin yerel zaman tünelinde veya etiketlerde. Kendinizi #introductions etiketinde tanıtmak isteyebilirsiniz.'
-      full_handle: Tanıtıcınız
-      full_handle_hint: Arkadaşlarınıza, size başka bir sunucudan mesaj atabilmeleri veya sizi takip edebilmeleri için söyleyeceğiniz şey budur.
+      feature_action: Daha fazlası
+      feature_audience: Mastodon, hedef kitlenizi aracılar olmadan yönetmeniz için size eşsiz bir olanak sağlar. Kendi altyapınızda barındırdığınız Mastodon sunucusu, çevrimiçi olarak başka bir Mastodon sunucusundan takip etmenizi ve takip edilmenizi sağlar ve sizden başka kimsenin kontrolü altında değildir.
+      feature_audience_title: Kitlenizi güvenle oluşturun
+      feature_control: Ana akışınızda ne görmek istediğinizi en iyi siz biliyorsunuz. Algoritma veya zamanınızı harcayan reklamlar yok. Tek bir hesapla herhangi bir Mastodon sunucusunda olan bir kimseyi takip edin ve gönderilere zamana göre sıralanmış şekilde erişin. Kendi internet köşenizi biraz daha kendinize benzetin.
+      feature_control_title: Zaman akışınızın denetimi sizde kalsın
+      feature_creativity: Mastodon kendinizi çevrimiçi ifade edebilmenize yardımcı olmak için ses, video ve görsel, erişilebilirlik açıklamaları, anketler, içerik uyarıları, hareketli avatarlar, özel emojiler, önizleme resmini kesme denetimi ve daha fazlasını destekliyor. Kendi sanatınızı, müziğinizi veya podcastinizi yayınlıyorsanız Mastodon kullanımınıza açık.
+      feature_creativity_title: Benzersiz yaratıcılık
+      feature_moderation: Mastodon karar vermeyi yeniden size bırakıyor. Her sunucu kendi kurallarını ve düzenlemelerini oluşturur. Bu kurallar da kurumsal sosyal medyalar gibi tepeden değil, yerel olarak uygulanıyor; bu da Mastodon'u farklı insan gruplarının ihtiyaçlarına yanıt vermede esnek kılıyor. Kurallarına katıldığınız bir sunucuya katılın veya kendi sunucunuzu barındırın.
+      feature_moderation_title: Olması gerektiği gibi moderasyon
+      follow_action: Takip et
+      follow_step: Kendi akışınızı düzenliyorsunuz. Hadi onu ilginç kullanıcılarla dolduralım.
+      follow_title: Anasayfa akışınızı kişiselleştirin
+      follows_subtitle: Tanınmış hesapları takip edin
+      follows_title: Takip edebileceklerin
+      follows_view_more: Takip edecek daha fazla kişi görüntüleyin
+      hashtags_recent_count:
+        one: Son 2 günde %{people} kişi
+        other: Son 2 günde %{people} kişi
+      hashtags_subtitle: Son 2 günde öne çıkanları keşfedin
+      hashtags_title: Öne çıkan etiketler
+      hashtags_view_more: Daha fazla öne çıkan etiket görüntüleyin
+      post_action: Oluştur
+      post_step: Dünyaya metin, fotoğraf, video ve anketlerle merhaba deyin.
+      post_title: İlk gönderinizi oluşturun
+      share_action: Paylaş
+      share_step: Arkadaşlarınıza Mastodon'da size nasıl ulaşabileceklerini söyleyin.
+      share_title: Mastodon profilinizi paylaşın
+      sign_in_action: Oturum aç
       subject: Mastodon'a hoş geldiniz
       title: Gemiye hoşgeldin, %{name}!
   users:
@@ -1839,6 +1902,7 @@ tr:
     go_to_sso_account_settings: Kimlik sağlayıcı hesap ayarlarına gidin
     invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
     otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
+    rate_limited: Çok fazla kimlik doğrulama denemesi. Daha sonra tekrar deneyin.
     seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
     signed_in_as: 'Oturum açtı:'
   verification:
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 845b33a021..82bb18c9ae 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -6,7 +6,7 @@ tt:
   accounts:
     follow: Языл
     followers:
-      other: Язылучы
+      other: язылучы
     following: Язылгансыз
     posts:
       other: Язма
@@ -137,14 +137,14 @@ tt:
       new_users: яңа кулланучылар
       software: Программа тәэминаты
       title: Идарә аслыгы
-      website: Вебсайт
+      website: Веб-сайт
     domain_allows:
-      export: Экспортлау
-      import: Импортлау
+      export: Экспорт
+      import: Импорт
     domain_blocks:
       domain: Домен
-      export: Экспортлау
-      import: Импортлау
+      export: Экспорт
+      import: Импорт
       new:
         severity:
           noop: Бернинди дә
@@ -438,8 +438,8 @@ tt:
       decimal_units:
         format: "%n %u"
         units:
-          billion: Млрд
-          million: Млн
+          billion: млрд
+          million: млн
           quadrillion: Квадрлн
           thousand: Мең
           trillion: Трлн
@@ -455,7 +455,7 @@ tt:
   preferences:
     other: Башка
   privacy_policy:
-    title: Хосусыйлык Сәясәте
+    title: Хосусыйлык сәясәте
   relationships:
     dormant: Актив түгел
     followers: Язылучылар
@@ -511,7 +511,6 @@ tt:
     development: Ясаучылар өчен
     edit_profile: Профильне үзгәртү
     import: Импортлау
-    notifications: Искәртүләр
     preferences: Caylaw
     profile: Профиль
     two_factor_authentication: Ике-факторлы авторизация
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7a1957eba7..71e84a1d54 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -621,6 +621,9 @@ uk:
       actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
       add_to_report: Додати ще подробиць до скарги
+      already_suspended_badges:
+        local: Вже призупинено на цьому сервері
+        remote: Уже призупинено на їх сервері
       are_you_sure: Ви впевнені?
       assign_to_self: Призначити мені
       assigned: Призначений модератор
@@ -668,7 +671,7 @@ uk:
           delete_html: 'Ви збираєтеся <strong>вилучити</strong> деякі з дописів <strong>@%{acct}</strong>. Це буде:'
           mark_as_sensitive_html: 'Ви збираєтеся <strong>позначити</strong> деякі з дописів <strong>@%{acct}</strong> <strong>делікатними</strong>. Це буде:'
           silence_html: 'Ви збираєтеся <strong>обмежити</strong> обліковий запис <strong>@%{acct}</strong>. Це буде:'
-          suspend_html: 'Ви збираєтесь <strong>призупинити</strong> обліковий запис <strong>@%%{acct}</strong>. Це буде:'
+          suspend_html: 'Ви збираєтесь <strong>призупинити</strong> обліковий запис <strong>@%{acct}</strong>. Це буде:'
         actions:
           delete_html: Вилучити образливі дописи
           mark_as_sensitive_html: Позначити медіа образливих дописів делікатними
@@ -776,6 +779,7 @@ uk:
         desc_html: Це залежить від зовнішніх скриптів hCaptcha, що може становити загрозу безпеці та приватності. Крім того, <strong>це може зробити процес реєстрації значно менш доступним для деяких людей (особливо з обмеженими можливостями)</strong>. З цих причин, будь ласка, розгляньте альтернативні заходи, такі як реєстрація на основі схвалення або на основі запрошення.
         title: Вимагати нових користувачів розв'язувати CAPTCHA для підтвердження облікового запису
       content_retention:
+        danger_zone: Зони небезпеки
         preamble: Контролюйте, як зберігаються користувацькі матеріали в Mastodon.
         title: Зберігання вмісту
       default_noindex:
@@ -795,6 +799,7 @@ uk:
         disabled: Нікого
         users: Для авторизованих локальних користувачів
       registrations:
+        moderation_recommandation: Переконайтеся, що у вас є адекватна і швидка команда модерації, перш ніж ви відкриєте реєстрацію для всіх!
         preamble: Контролюйте, хто може створити обліковий запис на вашому сервері.
         title: Реєстрації
       registrations_mode:
@@ -802,6 +807,7 @@ uk:
           approved: Для входу потрібне схвалення
           none: Ніхто не може увійти
           open: Будь-хто може увійти
+        warning_hint: Радимо використовувати "Обов'язкове затвердження", якщо ви не впевнені, що ваша команда модерації може вчасно обробляти спам та зловмисні реєстрації.
       security:
         authorized_fetch: Вимагати аутентифікацію з федеративних серверів
         authorized_fetch_hint: Вимога автентифікації від федеративних серверів забезпечує суворіше застосування блокування як на рівні користувача, так і на рівні сервера. Однак це призводить до зниження продуктивності, зменшує охоплення ваших відповідей і може спричинити проблеми сумісності з деякими федеративними сервісами. Крім того, це не завадить зловмисникам отримувати ваші загальнодоступні дописи та облікові записи.
@@ -1002,6 +1008,9 @@ uk:
       title: Вебхуки
       webhook: Вебхук
   admin_mailer:
+    auto_close_registrations:
+      body: Через нестачу нещодавньої активності модератора реєстрація на %{instance} автоматично перемкнута на обов'язковий розгляд вручну, для запобігання використанню %{instance} платформою для потенційних зловмисників. Ви можете будь-коли перемкнутися на відкриту реєстрацію.
+      subject: Реєстрації для %{instance} автоматично перейшли на такі, що вимагають схвалення
     new_appeal:
       actions:
         delete_statuses: щоб видалити їхні дописи
@@ -1542,7 +1551,6 @@ uk:
     administration_emails: Сповіщення е-пошти адміністратора
     email_events: Події, про які сповіщати електронною поштою
     email_events_hint: 'Оберіть події, про які ви хочете отримувати сповіщення:'
-    other_settings: Інші налаштування сповіщень
   number:
     human:
       decimal_units:
@@ -1598,6 +1606,9 @@ uk:
     errors:
       limit_reached: Досягнуто обмеження різних реакцій
       unrecognized_emoji: не є розпізнаним емоджі
+  redirects:
+    prompt: Якщо ви довіряєте цьому посиланню, натисніть, щоб продовжити.
+    title: Ви покидаєте %{instance}.
   relationships:
     activity: Діяльність облікового запису
     confirm_follow_selected_followers: Ви справді бажаєте підписатися на обраних підписників?
@@ -1660,6 +1671,7 @@ uk:
       unknown_browser: Невідомий браузер
       weibo: Weibo
     current_session: Поточний сеанс
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Це веб-браузери, авторизовані у вашому обліковому записі Mastodon.
     ip: IP
@@ -1696,14 +1708,26 @@ uk:
     import: Імпорт
     import_and_export: Імпорт та експорт
     migrate: Міграція облікового запису
-    notifications: Сповіщення
+    notifications: E-mail сповіщення
     preferences: Налаштування
     profile: Загальнодоступний профіль
     relationships: Підписки та підписники
+    severed_relationships: Розірвані зв'язки
     statuses_cleanup: Автовидалення допису
     strikes: Попередження модераторів
     two_factor_authentication: Двофакторна автентифікація
     webauthn_authentication: Ключі безпеки
+  severed_relationships:
+    download: Завантажити (%{count})
+    event_type:
+      account_suspension: Призупинення облікового запису (%{target_name})
+      domain_block: Призупинення сервера (%{target_name})
+      user_domain_block: Ви заблокували %{target_name}
+    lost_followers: Втрачені підписники
+    lost_follows: Втрачені підписки
+    preamble: Ви можете втратити підписки та підписників, коли ви блокуєте домен або коли модератори вирішують призупинити віддалений сервер. Коли це станеться, ви зможете завантажити списки розірваних зв'язків, які мають бути перевірені та, можливо, імпортовані на іншому сервері.
+    purged: Інформацію про цей сервер очищені адміністраторами вашого сервера.
+    type: Подія
   statuses:
     attached:
       audio:
@@ -1753,8 +1777,6 @@ uk:
         other: "%{count} голоси"
       vote: Проголосувати
     show_more: Розгорнути
-    show_newer: Показати новіші
-    show_older: Показати давніші
     show_thread: Відкрити обговорення
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1811,6 +1833,7 @@ uk:
     contrast: Mastodon (Висока контрастність)
     default: Mastodon (Темна)
     mastodon-light: Mastodon (світла)
+    system: Автоматично (використовувати системну тему)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -1838,18 +1861,27 @@ uk:
     webauthn: Ключі безпеки
   user_mailer:
     appeal_approved:
-      action: Перейти у ваш обліковий запис
+      action: Налаштування облікового запису
       explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було схвалено. Ваш обліковий запис знову вважається добропорядним.
       subject: Вашу апеляцію від %{date} було схвалено
+      subtitle: Ваш обліковий запис знову готовий до користування.
       title: Апеляцію схвалено
     appeal_rejected:
       explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було відхилено.
       subject: Вашу апеляцію від %{date} було відхилено
+      subtitle: Вашу апеляцію відхилено.
       title: Апеляцію відхилено
     backup_ready:
-      explanation: Ви робили запит повної резервної копії вашого облікового запису Mastodon. Вона вже готова для завантаження!
+      explanation: Ви просили про створення резервної копії вашого облікового запису Mastodon.
+      extra: Вона готова до завантаження!
       subject: Ваш архів готовий до завантаження
       title: Винесення архіву
+    failed_2fa:
+      details: 'Подробиці спроби входу:'
+      explanation: Хтось намагався ввійти у ваш обліковий запис, але надав недійсний другий фактор автентифікації.
+      further_actions_html: Якщо це не ви, ми радимо вам негайно %{action}, оскільки обліковий запис може бути скомпрометованим.
+      subject: Помилка другого фактору автентифікації
+      title: Помилка другого фактора автентифікації
     suspicious_sign_in:
       change_password: змінити свій пароль
       details: 'Відомості про вхід:'
@@ -1889,13 +1921,46 @@ uk:
         silence: Ообліковий запис обмежено
         suspend: Обліковий запис призупинено
     welcome:
-      edit_profile_action: Налаштувати профіль
-      edit_profile_step: Ви можете налаштувати свій профіль, завантаживши зображення профілю, змінивши відображуване ім'я та інше. Ви можете включити для перегляду нових підписників до того, як вони матимуть змогу підписатися на вас.
+      apps_android_action: Завантажити з Google Play
+      apps_ios_action: Завантажити з App Store
+      apps_step: Завантажити наші офіційні застосунки.
+      apps_title: Застосунки Mastodon
+      checklist_subtitle: 'Розпочнімо у цій новій соціальній межі:'
+      checklist_title: Контрольний список привітання
+      edit_profile_action: Персоналізувати
+      edit_profile_step: Інші, ймовірно, швидше взаємодіятимуть з вами, якщо ви заповните профіль.
+      edit_profile_title: Персоналізуйте свій профіль
       explanation: Ось кілька порад для початку
-      final_action: Почати писати
-      final_step: 'Почніть дописувати! Навіть не підписавшись на вас, інші зможуть побачити ваші дописи, наприклад, у локальній стрічці та у хештеґах. Якщо ви хочете представитися, можете скористатися хештеґом #introductions.'
-      full_handle: Ваше звернення
-      full_handle_hint: Те, що ви хочете сказати друзям, щоб вони могли написати вам або підписатися з інших сайтів.
+      feature_action: Докладніше
+      feature_audience: Mastodon надає унікальну можливість керувати своєю аудиторією без посередників. Маючи сервер Mastodon, розгорнутий на власній інфраструктурі, його користувачі можуть взаємодіяти з будь-яким іншим сервером Mastodon, не віддаючи контроль у чужі руки.
+      feature_audience_title: Формуйте свою аудиторію з впевненістю
+      feature_control: Тільки ви знаєте, що саме хочете бачити на своєму сервері. Немає алгоритмів або реклами, що марнують ваш час. Слідкуйте за будь-яким сервером Mastodon з одного облікового запису та отримуйте повідомлення в хронологічному порядку, і зробіть ваш куточок інтернету трохи схожим на вас.
+      feature_control_title: Керуйте своєю стрічкою
+      feature_creativity: Mastodon підтримує дописи з аудіо, відео та зображеннями, опис для доступності, опитування, попередження про вміст, анімовані аватари, користувацькі емодзі, мініатюри, керування кадруванням мініатюр та багато іншого. Чи викладаєте ви своє мистецтво, чи музику або подкаст, Mastodon тут для вас.
+      feature_creativity_title: Необмежена творчість
+      feature_moderation: Mastodon повертає прийняття рішень у ваші руки. На відміну від соціальних мереж, що належать корпораціям, які спускають свої правила згори, кожен сервер Mastodon встановлює свої правила і норми, яких дотримуються на місцевому рівні, що робить їх найгнучкішими для задовільнення потреб різних груп людей. Приєднуйтесь до сервера з правилами, з якими ви згодні, або створіть свій власний.
+      feature_moderation_title: Модерація, якою вона має бути
+      follow_action: Підписатися
+      follow_step: Ви керуєте головною стрічкою. Заповнюйте її цікавими людьми.
+      follow_title: Персоналізуйте домашню стрічку
+      follows_subtitle: Стежте за відомими обліковими записами
+      follows_title: На кого підписатися
+      follows_view_more: Переглянути більше людей, щоб підписатися
+      hashtags_recent_count:
+        few: "%{people} особи за останні 2 дні"
+        many: "%{people} осіб за останні 2 дні"
+        one: "%{people} особа за останні 2 дні"
+        other: "%{people} особа за останні 2 дні"
+      hashtags_subtitle: Дізнавайтеся, що було популярним минулі 2 дні
+      hashtags_title: Популярні хештеги
+      hashtags_view_more: Переглянути більше популярних хештеґів
+      post_action: Створити
+      post_step: Привітайтеся зі світом, з текстом, світлинами, відео та опитуваннями.
+      post_title: Напишіть свій перший допис
+      share_action: Поділитися
+      share_step: Розкажіть друзям, як знайти вас на Mastodon.
+      share_title: Поділіться своїм профілем Mastodon
+      sign_in_action: Увійти
       subject: Ласкаво просимо до Mastodon
       title: Ласкаво просимо, %{name}!
   users:
@@ -1903,6 +1968,7 @@ uk:
     go_to_sso_account_settings: Перейдіть до налаштувань облікового запису постачальника ідентифікації
     invalid_otp_token: Введено неправильний код
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
+    rate_limited: Забагато спроб з'єднання. Спробуйте ще раз пізніше.
     seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
   verification:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index f37132b6eb..5d9e881ea4 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -585,6 +585,9 @@ vi:
       actions_description_html: Nếu áp đặt trừng phạt, một email thông báo sẽ được gửi cho người này, ngoại trừ <strong>Spam</strong>.
       actions_description_remote_html: Chọn hành động cần thực hiện để xử lý báo cáo này. Điều này sẽ chỉ ảnh hưởng đến cách máy chủ <strong>của bạn</strong> giao tiếp với tài khoản này và xử lý nội dung của nó.
       add_to_report: Bổ sung báo cáo
+      already_suspended_badges:
+        local: Đã vô hiệu hóa trên máy chủ này
+        remote: Đã vô hiệu hóa trên máy chủ khác
       are_you_sure: Bạn có chắc không?
       assign_to_self: Giao cho tôi
       assigned: Người xử lý
@@ -734,6 +737,7 @@ vi:
         desc_html: Điều này phụ thuộc vào các mã lệnh bên ngoài từ hCaptcha, đây có thể là mối lo ngại về bảo mật và quyền riêng tư. Thêm vào đó, <strong>điều này có thể làm cho quá trình đăng ký khó hơn đối với một số người (đặc biệt là người khuyết tật)</strong>. Vì những lý do này, vui lòng xem xét các biện pháp thay thế như duyệt đăng ký thủ công hoặc tạo thư mời.
         title: Yêu cầu người dùng mới dùng CAPTCHA để xác minh tài khoản của họ
       content_retention:
+        danger_zone: Khu vực nguy hiểm
         preamble: Kiểm soát cách lưu trữ nội dung cá nhân trong Mastodon.
         title: Lưu giữ nội dung
       default_noindex:
@@ -753,6 +757,7 @@ vi:
         disabled: Không ai
         users: Để đăng nhập người cục bộ
       registrations:
+        moderation_recommandation: Vui lòng đảm bảo rằng bạn có một đội ngũ kiểm duyệt và phản ứng nhanh trước khi mở đăng ký cho mọi người!
         preamble: Kiểm soát những ai có thể tạo tài khoản trên máy chủ của bạn.
         title: Đăng ký
       registrations_mode:
@@ -760,6 +765,7 @@ vi:
           approved: Yêu cầu phê duyệt để đăng ký
           none: Không ai có thể đăng ký
           open: Bất cứ ai cũng có thể đăng ký
+        warning_hint: Chúng tôi khuyên bạn nên sử dụng "Duyệt đăng ký thủ công" trừ khi bạn tin tưởng đội ngũ kiểm duyệt của mình có thể xử lý kịp thời các đăng ký spam và độc hại.
       security:
         authorized_fetch: Yêu cầu xác thực từ các máy chủ liên hợp
         authorized_fetch_hint: Yêu cầu xác thực từ các máy chủ liên hợp cho phép thực thi chặt chẽ hơn việc chặn cấp độ người dùng và cấp độ máy chủ. Tuy nhiên, điều này phải trả giá bằng một hình phạt về hiệu suất, làm giảm phạm vi tiếp cận của các lượt trả lời của bạn và có thể gây ra các vấn đề về khả năng tương thích với một số dịch vụ được liên hợp. Ngoài ra, điều này sẽ không ngăn cản các tác nhân chuyên dụng tìm nạp các tút và tài khoản công khai của bạn.
@@ -948,6 +954,9 @@ vi:
       title: Webhook
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: Do gần đây thiếu kiểm duyệt viên nên việc đăng ký trên %{instance} sẽ tự động chuyển thành duyệt thủ công, để tránh %{instance} bị sử dụng làm nền tảng cho những kẻ xấu. Bạn có thể chuyển nó trở lại trạng thái đăng ký mở bất kỳ lúc nào.
+      subject: Đăng ký mới %{instance} đã được tự động chuyển sang duyệt thủ công
     new_appeal:
       actions:
         delete_statuses: xóa tút của họ
@@ -1464,7 +1473,6 @@ vi:
     administration_emails: Email thông báo admin
     email_events: Email
     email_events_hint: 'Chọn những hoạt động sẽ gửi thông báo qua email:'
-    other_settings: Chặn thông báo từ
   number:
     human:
       decimal_units:
@@ -1520,6 +1528,9 @@ vi:
     errors:
       limit_reached: Bạn không nên thao tác liên tục
       unrecognized_emoji: không phải là emoji
+  redirects:
+    prompt: Nếu bạn tin tưởng, hãy nhấn tiếp tục.
+    title: Bạn đang thoát khỏi %{instance}.
   relationships:
     activity: Tương tác
     confirm_follow_selected_followers: Bạn có chắc muốn theo dõi những người đã chọn?
@@ -1582,6 +1593,7 @@ vi:
       unknown_browser: Trình duyệt khác
       weibo: Weibo
     current_session: Phiên hiện tại
+    date: Thời gian
     description: "%{browser} trên %{platform}"
     explanation: Đây là các ứng dụng đã từng đăng nhập vào tài khoản Mastodon của bạn.
     ip: IP
@@ -1618,14 +1630,26 @@ vi:
     import: Nhập dữ liệu
     import_and_export: Dữ liệu
     migrate: Chuyển tài khoản sang máy chủ khác
-    notifications: Thông báo
+    notifications: Thông báo email
     preferences: Chung
     profile: Hồ sơ
     relationships: Quan hệ
+    severed_relationships: Mối quan hệ bị cắt đứt
     statuses_cleanup: Tự động xóa tút cũ
     strikes: Lần cảnh cáo
     two_factor_authentication: Xác minh 2 bước
     webauthn_authentication: Khóa bảo mật
+  severed_relationships:
+    download: Tải xuống (%{count})
+    event_type:
+      account_suspension: Người bị vô hiệu hóa (%{target_name})
+      domain_block: Máy chủ bị vô hiệu hóa (%{target_name})
+      user_domain_block: Bạn đã chặn %{target_name}
+    lost_followers: Mất người theo dõi
+    lost_follows: Mất người đang theo dõi
+    preamble: Bạn có thể mất số lượt theo dõi và người theo dõi khi chặn một máy chủ hoặc khi kiểm duyệt viên của bạn quyết định tạm dừng máy chủ từ xa. Khi điều đó xảy ra, bạn sẽ có thể tải xuống danh sách các mối quan hệ đã bị cắt đứt, để kiểm tra và nhập vào máy chủ khác.
+    purged: Thông tin về máy chủ này đã bị quản trị viên máy chủ của bạn xóa sạch.
+    type: Sự kiện
   statuses:
     attached:
       audio:
@@ -1657,8 +1681,6 @@ vi:
         other: "%{count} người bình chọn"
       vote: Bình chọn
     show_more: Đọc thêm
-    show_newer: Mới hơn
-    show_older: Cũ hơn
     show_thread: Nội dung gốc
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1715,6 +1737,7 @@ vi:
     contrast: Mastodon (Tương phản)
     default: Mastodon (Tối)
     mastodon-light: Mastodon (Sáng)
+    system: Tự động (chủ đề hệ thống)
   time:
     formats:
       default: "%-d.%m.%Y %H:%M"
@@ -1742,18 +1765,27 @@ vi:
     webauthn: Khóa bảo mật
   user_mailer:
     appeal_approved:
-      action: Đến trang hồ sơ của bạn
+      action: Cài đặt tài khoản
       explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã được chấp nhận. Tài khoản của bạn đã có thể sử dụng bình thường.
       subject: Khiếu nại của bạn từ %{date} đã được chấp nhận
+      subtitle: Tài khoản của bạn có thể hoạt động lại bình thường.
       title: Khiếu nại đã được chấp nhận
     appeal_rejected:
       explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã bị từ chối.
       subject: Khiếu nại của bạn từ %{date} đã bị từ chối
+      subtitle: Khiếu nại của bạn bị từ chối.
       title: Khiếu nại bị từ chối
     backup_ready:
-      explanation: Bạn đã yêu cầu sao lưu toàn bộ tài khoản Mastodon của mình. Bây giờ có thể tải về!
+      explanation: Bạn đã yêu cầu bản sao tài khoản Mastodon của mình.
+      extra: Hiện nó đã sẵn sàng tải xuống!
       subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
       title: Nhận dữ liệu cá nhân
+    failed_2fa:
+      details: 'Chi tiết thông tin đăng nhập:'
+      explanation: Ai đó đã cố đăng nhập vào tài khoản của bạn nhưng cung cấp yếu tố xác thực thứ hai không hợp lệ.
+      further_actions_html: Nếu không phải bạn, hãy lập tức %{action} vì có thể có rủi ro.
+      subject: Xác minh hai bước thất bại
+      title: Xác minh hai bước thất bại
     suspicious_sign_in:
       change_password: đổi mật khẩu của bạn
       details: 'Chi tiết thông tin đăng nhập:'
@@ -1793,13 +1825,43 @@ vi:
         silence: Tài khoản bị hạn chế
         suspend: Tài khoản bị vô hiệu hóa
     welcome:
-      edit_profile_action: Cài đặt trang hồ sơ
-      edit_profile_step: Bạn có thể chỉnh sửa trang hồ sơ của mình bằng cách tải lên ảnh đại diện, ảnh bìa, đổi biệt danh và hơn thế nữa. Bạn cũng có thể tự phê duyệt những người theo dõi mới.
+      apps_android_action: Tải trên Google Play
+      apps_ios_action: Tải trên App Store
+      apps_step: Tải ứng dụng chính thức.
+      apps_title: Ứng dụng Mastodon
+      checklist_subtitle: 'Hãy bắt đầu trên mạng xã hội mới này:'
+      checklist_title: Danh sách việc cần làm
+      edit_profile_action: Cá nhân hoá
+      edit_profile_step: Tạo sự tương tác bằng một hồ sơ hoàn chỉnh.
+      edit_profile_title: Tùy biến hồ sơ
       explanation: Dưới đây là một số mẹo để giúp bạn bắt đầu
-      final_action: Soạn tút mới
-      final_step: 'Viết tút mới! Ngay cả khi chưa có người theo dõi, người khác vẫn có thể xem tút công khai của bạn trên bảng tin máy chủ và qua hashtag. Hãy giới thiệu bản thân với hashtag #introductions.'
-      full_handle: Tên đầy đủ của bạn
-      full_handle_hint: Đây cũng là địa chỉ được dùng để giao tiếp với tất cả mọi người.
+      feature_action: Tìm hiểu
+      feature_audience: Mastodon cung cấp cho bạn khả năng độc đáo để quản lý người theo dõi của bạn mà không cần bên trung gian. Mastodon có thể triển khai trên cơ sở hạ tầng của riêng bạn, cho phép bạn theo dõi và được theo dõi từ bất kỳ máy chủ Mastodon nào khác và không nằm dưới sự kiểm soát của ai ngoài bạn.
+      feature_audience_title: Tạo cộng đồng của riêng bạn
+      feature_control: Bạn biết rõ nhất những gì bạn muốn xem trên bảng tin. Không có thuật toán hoặc quảng cáo để lãng phí thời gian của bạn. Theo dõi bất kỳ ai trên bất kỳ máy chủ Mastodon nào từ một tài khoản và nhận các tút của họ theo thứ tự thời gian — làm cho góc internet của bạn là của bạn.
+      feature_control_title: Kiểm soát bảng tin của bạn
+      feature_creativity: Mastodon hỗ trợ đăng âm thanh, video, hình ảnh, mô tả trợ năng, thăm dò ý kiến, cảnh báo nội dung, hình đại diện Gif, emoji tùy chỉnh, kiểm soát cắt hình thu nhỏ... để giúp bạn thể hiện cá tính. Cho dù bạn đang xuất bản tác phẩm nghệ thuật, âm nhạc hay podcast của mình, Mastodon luôn hợp cho bạn.
+      feature_creativity_title: Sáng tạo không giới hạn
+      feature_moderation: Mastodon giành quyền tự quyết về tay bạn. Mỗi máy chủ tạo ra các nội quy của riêng họ, được thực thi nội bộ chứ không phải từ trên xuống như dịch vụ mạng xã hội của Big Tech, giúp linh hoạt trong việc đáp ứng nhu cầu của các nhóm người dùng khác nhau. Tham gia một máy chủ với các quy tắc bạn đồng ý hoặc tự chạy máy chủ của riêng bạn.
+      feature_moderation_title: Kiểm duyệt đúng nghĩa
+      follow_action: Theo dõi
+      follow_step: Theo dõi những người thú vị trên Mastodon.
+      follow_title: Cá nhân hóa bảng tin của bạn
+      follows_subtitle: Theo dõi những người thú vị
+      follows_title: Gợi ý theo dõi
+      follows_view_more: Xem thêm những người khác
+      hashtags_recent_count:
+        other: "%{people} người dùng trong 2 ngày qua"
+      hashtags_subtitle: Khám phá xu hướng 2 ngày qua
+      hashtags_title: Hashtag xu hướng
+      hashtags_view_more: Xem thêm hashtag xu hướng
+      post_action: Soạn tút
+      post_step: Chào cộng đồng bằng lời nói, ảnh hoặc video.
+      post_title: Đăng tút đầu tiên
+      share_action: Chia sẻ
+      share_step: Hãy để bạn bè của bạn biết cách tìm thấy bạn trên Mastodon.
+      share_title: Chia sẻ hồ sơ Mastodon của bạn
+      sign_in_action: Đăng nhập
       subject: Chào mừng đến với Mastodon
       title: Xin chào %{name}!
   users:
@@ -1807,6 +1869,7 @@ vi:
     go_to_sso_account_settings: Thiết lập tài khoản nhà cung cấp danh tính
     invalid_otp_token: Mã xác minh 2 bước không hợp lệ
     otp_lost_help_html: Nếu bạn mất quyền truy cập vào cả hai, bạn có thể đăng nhập bằng %{email}
+    rate_limited: Quá nhiều lần thử, vui lòng thử lại sau.
     seamless_external_login: Bạn đã đăng nhập thông qua một dịch vụ bên ngoài, vì vậy mật khẩu và email không khả dụng.
     signed_in_as: 'Đăng nhập bằng:'
   verification:
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index 1db573369a..180fcf2f16 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -110,5 +110,4 @@ zgh:
     account_settings: ⵜⵉⵙⵖⴰⵍ ⵏ ⵓⵎⵉⴹⴰⵏ
     back: ⴰⵖⵓⵍ ⵖⵔ ⵎⴰⵙⵜⵓⴷⵓⵏ
     edit_profile: ⵙⵏⴼⵍ ⵉⴼⵔⵙ
-    notifications: ⵜⵉⵏⵖⵎⵉⵙⵉⵏ
     profile: ⵉⴼⵔⵙ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a573c8f99b..3140ebdd30 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -585,6 +585,9 @@ zh-CN:
       actions_description_html: 决定采取何种措施处理此举报。如果对被举报账号采取惩罚性措施，将向其发送一封电子邮件通知。但若选中<strong>垃圾信息</strong>类别则不会发送通知。
       actions_description_remote_html: 决定采取何种行动来解决此举报。 这只会影响<strong>您的</strong>服务器如何与该远程帐户的通信并处理其内容。
       add_to_report: 增加更多举报内容
+      already_suspended_badges:
+        local: 已经在此服务器上暂停
+        remote: 已在其所属服务器被封禁
       are_you_sure: 你确定吗？
       assign_to_self: 接管
       assigned: 已接管的监察员
@@ -734,6 +737,7 @@ zh-CN:
         desc_html: 这依赖于来自hCaptcha的外部脚本，可能会带来安全和隐私问题。此外，<strong>这可能使注册过程对某些人（尤其是残疾人）的注册简易程度大幅下降</strong>。出于这些原因，请考虑采取其他措施，如基于批准或邀请的注册方式。
         title: 要求新用户输入验证码以确认他们的账户
       content_retention:
+        danger_zone: 危险操作区
         preamble: 控制用户生成的内容在 Mastodon 中如何存储。
         title: 内容保留
       default_noindex:
@@ -753,6 +757,7 @@ zh-CN:
         disabled: 不对任何人
         users: 对本地已登录用户
       registrations:
+        moderation_recommandation: 在向所有人开放注册之前，请确保您拥有一个人手足够且反应迅速的管理团队！
         preamble: 控制谁可以在你的服务器上创建账号。
         title: 注册
       registrations_mode:
@@ -760,6 +765,7 @@ zh-CN:
           approved: 注册时需要批准
           none: 关闭注册
           open: 开放注册
+        warning_hint: 我们建议使用“注册必须经过批准”，除非您确信您的管理团队能够及时处理骚扰和恶意注册。
       security:
         authorized_fetch: 需要跨站认证
         authorized_fetch_hint: 要求外站请求通过验证能够使用户级别与服务器级别的封锁更为严格。然而，这将带来额外的性能负担、减少回复触达范围、并可能导致与一些联邦宇宙服务的兼容性问题。此外，这并不能阻止他人针对性地获取公开嘟文与账户。
@@ -772,13 +778,13 @@ zh-CN:
     software_updates:
       critical_update: 紧急 — 请尽快更新
       description: 建议您及时更新Mastodon实例，以便获得最新修复和功能。此外，为避免安全问题，有时候及时更新Mastodon是至关重要的。出于这些原因，Mastodon每30分钟检查一次更新，并根据您的电子邮件通知偏好向您发送通知。
-      documentation_link: 了解详情
-      release_notes: 更新日志
+      documentation_link: 详细了解
+      release_notes: 发行说明
       title: 可用的更新
       type: 类型
       types:
-        major: 大版本更新
-        minor: 小版本更新
+        major: 重大更新
+        minor: 次要更新
         patch: 补丁级更新 - 修复了错误并进行了易于应用的更改
       version: 版本
     statuses:
@@ -948,6 +954,9 @@ zh-CN:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由于近期缺乏管理员活动， %{instance} 上的注册已自动切换为需要手动审核，以防止 %{instance} 被潜在的不良行为者用作平台。您可以随时将其切换回开放注册。
+      subject: "%{instance} 的注册已自动切换为需要批准"
     new_appeal:
       actions:
         delete_statuses: 删除其嘟文
@@ -1464,7 +1473,6 @@ zh-CN:
     administration_emails: 管理员电子邮件通知
     email_events: 电子邮件通知事件
     email_events_hint: 选择你想要收到通知的事件：
-    other_settings: 其它通知设置
   number:
     human:
       decimal_units:
@@ -1520,6 +1528,9 @@ zh-CN:
     errors:
       limit_reached: 互动种类的限制
       unrecognized_emoji: 不是一个可识别的表情
+  redirects:
+    prompt: 如果您信任此链接，请单击以继续跳转。
+    title: 您正在离开 %{instance} 。
   relationships:
     activity: 账号活动
     confirm_follow_selected_followers: 您确定想要关注所选的关注者吗？
@@ -1582,6 +1593,7 @@ zh-CN:
       unknown_browser: 未知浏览器
       weibo: 新浪微博
     current_session: 当前会话
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 你的 Mastodon 账户目前已在这些浏览器上登录。
     ip: IP 地址
@@ -1618,14 +1630,26 @@ zh-CN:
     import: 导入
     import_and_export: 导入和导出
     migrate: 账户迁移
-    notifications: 通知
+    notifications: 电子邮件通知
     preferences: 首选项
     profile: 个人资料
     relationships: 关注管理
+    severed_relationships: 已断开的关系
     statuses_cleanup: 自动删除嘟文
     strikes: 操作记录
     two_factor_authentication: 双因素认证
     webauthn_authentication: 安全密钥
+  severed_relationships:
+    download: 下载 (%{count})
+    event_type:
+      account_suspension: 账户被封禁 (%{target_name})
+      domain_block: 服务器被封禁 (%{target_name})
+      user_domain_block: 你屏蔽了 %{target_name}
+    lost_followers: 失去的关注者
+    lost_follows: 失去的关注
+    preamble: 当你屏蔽一个域名或你的管理员决定封禁一个外站服务器时，你可能会失去关注和粉丝。在这种情况下，你可以下载被切断的关系的列表，进行检查以便导入另一个服务器。
+    purged: 关于此服务器的信息已被你所在服务器的管理员清除。
+    type: 事件
   statuses:
     attached:
       audio:
@@ -1657,8 +1681,6 @@ zh-CN:
         other: "%{count} 票"
       vote: 投票
     show_more: 显示更多
-    show_newer: 显示更新内容
-    show_older: 显示更早内容
     show_thread: 显示全部对话
     title: "%{name}：“%{quote}”"
     visibilities:
@@ -1715,6 +1737,7 @@ zh-CN:
     contrast: Mastodon（高对比度）
     default: Mastodon（暗色主题）
     mastodon-light: Mastodon（亮色主题）
+    system: 自动切换（使用系统主题）
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
@@ -1742,18 +1765,27 @@ zh-CN:
     webauthn: 安全密钥
   user_mailer:
     appeal_approved:
-      action: 前往你的账号
+      action: 账户设置
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
       subject: 你于 %{date} 提出的申诉已被批准
+      subtitle: 您的账户已再次回到良好状态。
       title: 申诉已批准
     appeal_rejected:
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
       subject: 你于 %{date} 提出的申诉已被驳回
+      subtitle: 您的申诉已被驳回。
       title: 申诉已驳回
     backup_ready:
-      explanation: 你请求了一份 Mastodon 账户的完整备份。现在你可以下载了！
+      explanation: 您之前请求为您的 Mastodon 账户创建一份完整的备份。
+      extra: 现在它可以下载了！
       subject: 你的存档已经准备完毕
       title: 存档导出
+    failed_2fa:
+      details: 以下是该次登录尝试的详情：
+      explanation: 有人试图登录到您的账户，但提供了无效的辅助认证因子。
+      further_actions_html: 如果这不是您所为，您的密码可能已经泄露，建议您立即 %{action} 。
+      subject: 辅助认证失败
+      title: 辅助认证失败
     suspicious_sign_in:
       change_password: 更改密码
       details: 以下是该次登录的详细信息：
@@ -1793,13 +1825,43 @@ zh-CN:
         silence: 账户被隐藏
         suspend: 账号被封禁
     welcome:
-      edit_profile_action: 设置个人资料
-      edit_profile_step: 您可以通过上传个人资料图片、更改您的昵称等来自定义您的个人资料。 您可以选择在新关注者关注您之前对其进行审核。
+      apps_android_action: 从 Google Play 下载
+      apps_ios_action: 从 App Store 下载
+      apps_step: 下载我们的官方应用。
+      apps_title: Mastodon应用
+      checklist_subtitle: 让我们带您开启这片社交新天地：
+      checklist_title: 欢迎清单
+      edit_profile_action: 个性化
+      edit_profile_step: 完善个人资料，提升您的互动体验。
+      edit_profile_title: 个性化您的个人资料
       explanation: 下面是几个小贴士，希望它们能帮到你
-      final_action: 开始嘟嘟
-      final_step: '开始发布嘟文！ 即使没有关注者，您的公开嘟文也可能会被其他人看到，例如在本地时间轴或话题标签中。 您可能想在 #introductions 话题标签上介绍自己。'
-      full_handle: 你的完整用户地址
-      full_handle_hint: 你需要把这个告诉你的朋友们，这样他们就能从另一台服务器向你发送信息或者关注你。
+      feature_action: 了解更多
+      feature_audience: Mastodon为您提供了无需中间商即可管理受众的独特可能。Mastodon可被部署在您自己的基础设施上，允许您关注其它任何Mastodon在线服务器的用户，或被任何其他在线 Mastodon 服务器的用户关注，并且不受您之外的任何人控制。
+      feature_audience_title: 放手去建立起您的受众
+      feature_control: 您最清楚您想在你自己的主页中看到什么动态。没有算法或广告浪费您的时间。您可以用一个账号关注任何 Mastodon 服务器上的任何人，并按时间顺序获得他们发布的嘟文，让您的互联网的角落更合自己的心意。
+      feature_control_title: 掌控自己的时间线
+      feature_creativity: Mastodon支持音频、视频和图片、无障碍描述、投票、内容警告， 动画头像、自定义表情包、缩略图裁剪控制等功能，帮助您在网上尽情表达自己。无论您是要发布您的艺术作品、音乐还是播客，Mastodon 都能为您服务。
+      feature_creativity_title: 无与伦比的创造力
+      feature_moderation: Mastodon将决策权交还给您。每个服务器都会创建自己的规则和条例，并在站点内施行，而不是像企业社交媒体那样居高临下，这使得它可以最灵活地响应不同人群的需求。加入一个您认同其规则的服务器，或托管您自己的服务器。
+      feature_moderation_title: 管理，本应如此
+      follow_action: 关注
+      follow_step: 关注有趣的人，这就是Mastodon的意义所在。
+      follow_title: 个性化您的首页动态
+      follows_subtitle: 关注知名账户
+      follows_title: 推荐关注
+      follows_view_more: 查看更多可关注的人
+      hashtags_recent_count:
+        other: 过去2天内有 %{people} 人
+      hashtags_subtitle: 探索过去2天以来的热门内容
+      hashtags_title: 热门话题标签
+      hashtags_view_more: 查看更多热门话题标签
+      post_action: 撰写
+      post_step: 向世界打个招呼吧。
+      post_title: 发布您的第一条嘟文
+      share_action: 分享
+      share_step: 让您的朋友知道如何在Mastodon找到你。
+      share_title: 分享您的Mastodon个人资料
+      sign_in_action: 登录
       subject: 欢迎来到 Mastodon
       title: "%{name}，欢迎你的加入！"
   users:
@@ -1807,6 +1869,7 @@ zh-CN:
     go_to_sso_account_settings: 转到您的身份提供商进行账户设置
     invalid_otp_token: 输入的双因素认证代码无效
     otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
+    rate_limited: 验证尝试次数过多，请稍后再试。
     seamless_external_login: 因为你是通过外部服务登录的，所以密码和电子邮件地址设置都不可用。
     signed_in_as: 当前登录的账户：
   verification:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 61355a4c53..1bfbe38bb5 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -585,6 +585,9 @@ zh-HK:
       actions_description_html: 決定對此檢舉採取哪種措施。如果對被檢舉帳號採取懲罰措施，除非選取了<strong>垃圾訊息</strong>分類，否則將向他們發送一封電郵通知。
       actions_description_remote_html: 決定對此檢舉採取哪種動作。這只會影響<strong>你的伺服器</strong>與此遠端帳號的通訊和處理其內容的方式。
       add_to_report: 加入更多到檢舉
+      already_suspended_badges:
+        local: 已在此伺服器被停權
+        remote: 已在他們的伺服器被停權
       are_you_sure: 你確認嗎？
       assign_to_self: 指派給自己
       assigned: 指派版主
@@ -734,6 +737,7 @@ zh-HK:
         desc_html: 這倚賴 hCaptcha 的外部腳本，或會引起安全和私隱疑慮。此外，<strong>此註冊流程亦可能對特定人士（尤其是殘疾人士）有較多障礙</strong>。有鑑於此，請考慮使用其他以審核或邀請的註冊方式。
         title: 要求新使用者解答 CAPTCHA 以驗證帳號
       content_retention:
+        danger_zone: 危險區域
         preamble: 控制使用者生成的內容如何儲存在 Mastodon。
         title: 內容留存
       default_noindex:
@@ -753,6 +757,7 @@ zh-HK:
         disabled: 給沒有人
         users: 所有已登入的帳號
       registrations:
+        moderation_recommandation: 在向所有人開放註冊之前，請確保擁有一個準備充足且反應迅速的審核團隊！
         preamble: 控制誰可在你的伺服器上建立帳號。
         title: 註冊
       registrations_mode:
@@ -760,6 +765,7 @@ zh-HK:
           approved: 註冊需要核准
           none: 沒有人可註冊
           open: 任何人皆能註冊
+        warning_hint: 我們建議你使用「需要審核註冊」的設定，除非你確信審核團隊能夠及時處理垃圾訊息和惡意註冊。
       security:
         authorized_fetch: 要求跨站驗證
         authorized_fetch_hint: 要求跨站驗證可更嚴謹地執行使用者級及伺服器級的封鎖。然而，這會犧牲性能，降低你回覆的觸及範圍，跨站服務亦可能出現兼容問題。此外，這並無法阻止他人蓄意擷取你的公開帖文和帳號。
@@ -948,6 +954,9 @@ zh-HK:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由於管理員最近較少活動，為防止 %{instance} 被惡意利用，註冊流程已自動改為手動審核。你可以隨時將它切換回開放註冊。
+      subject: "%{instance} 上的註冊已自動切換為需要審核批准"
     new_appeal:
       actions:
         delete_statuses: 刪除他們的帖文
@@ -1464,7 +1473,6 @@ zh-HK:
     administration_emails: 管理員電郵通知
     email_events: 電郵通知活動
     email_events_hint: 選擇你想接收通知的活動：
-    other_settings: 其他通知設定
   number:
     human:
       decimal_units:
@@ -1520,6 +1528,9 @@ zh-HK:
     errors:
       limit_reached: 已達到可以給予反應極限
       unrecognized_emoji: 不能識別這個emoji
+  redirects:
+    prompt: 如果你信任此連結，點擊它繼續。
+    title: 你即將離開 %{instance}。
   relationships:
     activity: 帳戶活動
     confirm_follow_selected_followers: 你確定要追蹤選取的追蹤者嗎？
@@ -1582,6 +1593,7 @@ zh-HK:
       unknown_browser: 未知的瀏覽器
       weibo: 新浪微博
     current_session: 目前的作業階段
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 這些是現在正登入於你的 Mastodon 帳號的瀏覽器。
     ip: IP 位址
@@ -1618,14 +1630,26 @@ zh-HK:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳戶遷移
-    notifications: 通知
+    notifications: 電郵通知
     preferences: 偏好設定
     profile: 個人資料
     relationships: 關注及追隨者
+    severed_relationships: 已切斷關係
     statuses_cleanup: 自動嘟文刪除
     strikes: 審核警告
     two_factor_authentication: 雙重認證
     webauthn_authentication: 安全鑰匙
+  severed_relationships:
+    download: 下載 (%{count})
+    event_type:
+      account_suspension: 停權帳號 (%{target_name})
+      domain_block: 停權伺服器 (%{target_name})
+      user_domain_block: 你封鎖了 %{target_name}
+    lost_followers: 已流失追蹤者
+    lost_follows: 已流失追蹤
+    preamble: 當你封鎖網域或你的管理員決定暫停遠端伺服器，可能會令你失去追蹤中的對象和追蹤者。屆時你可以下載紀錄了被切斷關係的對象的清單進行檢查，或將其匯入到另一台伺服器上。
+    purged: 有關此伺服器的資訊已被你伺服器的管理員清除。
+    type: 事件
   statuses:
     attached:
       audio:
@@ -1657,8 +1681,6 @@ zh-HK:
         other: "%{count} 票"
       vote: 投票
     show_more: 顯示更多
-    show_newer: 顯示較新嘟文
-    show_older: 顯示較舊嘟文
     show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
@@ -1715,6 +1737,7 @@ zh-HK:
     contrast: 高對比
     default: 萬象
     mastodon-light: 萬象（亮色主題）
+    system: 自動（使用系統主題）
   time:
     formats:
       default: "%Y年%-m月%d日 %H:%M"
@@ -1742,18 +1765,27 @@ zh-HK:
     webauthn: 安全密鑰
   user_mailer:
     appeal_approved:
-      action: 前往你的帳號
+      action: 帳號設定
       explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已獲得批准。你的帳號再次回到良好狀態。
       subject: 你在 %{date} 提出的申訴已獲批准
+      subtitle: 你的帳號再次恢復正常。
       title: 申訴已批准
     appeal_rejected:
       explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已被駁回。
       subject: 你在 %{date} 提出的申訴已被駁回
+      subtitle: 你的申訴已被駁回.
       title: 申訴被駁回
     backup_ready:
-      explanation: 你要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載。
+      explanation: 你要求完整備份你的 Mastodon 帳號。
+      extra: 現在可以下載了！
       subject: 你的備份檔已可供下載
       title: 檔案匯出
+    failed_2fa:
+      details: 以下是嘗試登入的細節：
+      explanation: 有人嘗試登入你的帳號，但沒有通過雙重認證。
+      further_actions_html: 如果這不是你，我們建議你立刻%{action}，因為你的帳號或已遭到侵害。
+      subject: 雙重認證失敗
+      title: 雙重認證失敗
     suspicious_sign_in:
       change_password: 更改你的密碼
       details: 以下是登入的細節：
@@ -1793,13 +1825,43 @@ zh-HK:
         silence: 賬戶已被限制
         suspend: 帳號已停用
     welcome:
-      edit_profile_action: 設定個人資料
-      edit_profile_step: 你可以透過上傳頭像、更改顯示名稱等來自訂個人檔案。你可以選擇讓新使用者追蹤你之前先審查他們。
+      apps_android_action: 從 Google Play 下載
+      apps_ios_action: 從 App Store 下載
+      apps_step: 下載官方應用程式。
+      apps_title: Mastodon 應用程式
+      checklist_subtitle: 讓我們帶你進入全新的社交領域：
+      checklist_title: 歡迎清單
+      edit_profile_action: 自訂
+      edit_profile_step: 完善個人檔案來促進互動。
+      edit_profile_title: 自訂你的個人檔案。
       explanation: 下面是幾個小貼士，希望它們能幫到你
-      final_action: 開始發文
-      final_step: '開始發文吧！即使你沒有追蹤者，其他人仍然能在本站時間軸或標籤等地方，看到你的公開帖文。試着用 #introductions 標籤來介紹自己吧。'
-      full_handle: 你的完整 Mastodon 地址
-      full_handle_hint: 這訊息將顯示給你朋友們，讓他們能從另一個服務站發信息給你，或者關注你的。
+      feature_action: 了解更多
+      feature_audience: 在 Mastodon 上，無需仲介，你也可以管理受眾。將 Mastodon 部署在自己的基礎架構上，既可以追蹤來自其他 Mastodon 伺服器上的人，也可以被他們追蹤。完全不受他人控制，一切由你掌控。
+      feature_audience_title: 自信地建立受眾
+      feature_control: 由你決定首頁時間軸的內容，不讓演算法和廣告干擾你！你可以使用同一帳號追蹤 Mastodon 伺服器上的使用者，並按時序瀏覽帖文，打造你專屬的網絡世界，讓這角落更貼近你的喜好。
+      feature_control_title: 掌控自己的時間軸
+      feature_creativity: Mastodon 囊括多元格式，助你盡情表達自我：干台支援音訊、影片、圖片帖文、無障礙描述、投票、內容警告，還有動態頭像、自訂表情符號、縮圖裁剪控制等功能。無論你想發佈藝術作品、音樂還是 podcast，Mastodon 都是你的理想平台。
+      feature_creativity_title: 無與倫比的創意
+      feature_moderation: 在 Mastodon，一切由你掌控。每台伺服器都能各自制訂並實施自身守則，而非像企業社交媒體那樣由上而下。這讓 Mastodon 能夠靈活地滿足不同群體的需要。你可以加入你認同其規則的伺服器，也可以自行架設。
+      feature_moderation_title: 以應有的方式管理社群
+      follow_action: 追蹤
+      follow_step: 追蹤有趣的人正是 Mastodon 的核心所在。
+      follow_title: 自訂你的首頁時間軸
+      follows_subtitle: 追蹤知名帳號
+      follows_title: 追蹤對象
+      follows_view_more: 查看更多追蹤對象
+      hashtags_recent_count:
+        other: 過去兩天內有 %{people} 人
+      hashtags_subtitle: 查看過去兩天的流行話題
+      hashtags_title: 熱門標籤
+      hashtags_view_more: 查看更多熱門標籤
+      post_action: 撰寫
+      post_step: 用文字、相片、影片或投票跟大家打個招呼吧。
+      post_title: 發表你的第一則帖文
+      share_action: 分享
+      share_step: 讓你的朋友知道如何在 Mastodon 上找到你。
+      share_title: 分享你的 Mastodon 個人檔案
+      sign_in_action: 登入
       subject: 歡迎來到 Mastodon (萬象)
       title: 歡迎 %{name} 加入！
   users:
@@ -1807,6 +1869,7 @@ zh-HK:
     go_to_sso_account_settings: 前往你身份提供者的帳號設定
     invalid_otp_token: 雙重認證碼不正確
     otp_lost_help_html: 如果這兩者你均無法登入，你可以聯繫 %{email}
+    rate_limited: 嘗試認證次數太多，請稍後再試。
     seamless_external_login: 因為你正在使用第三方服務登入，所以不能設定密碼和電郵。
     signed_in_as: 目前登入的帳戶：
   verification:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3f3057cc05..cdedd759ea 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -57,7 +57,7 @@ zh-TW:
       destroyed_msg: 即將刪除 %{username} 的資料
       disable: 停用
       disable_sign_in_token_auth: 停用電子郵件 token 驗證
-      disable_two_factor_authentication: 停用兩階段認證
+      disable_two_factor_authentication: 停用兩階段驗證
       disabled: 已停用
       display_name: 暱稱
       domain: 站點
@@ -148,8 +148,8 @@ zh-TW:
       subscribe: 訂閱
       suspend: 停權
       suspended: 已停權
-      suspension_irreversible: 已永久刪除此帳號的資料。您可以取消這個帳號的停權狀態，但無法還原已刪除的資料。
-      suspension_reversible_hint_html: 這個帳號已被暫停，所有數據將於 %{date} 被刪除。於此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的數據，您能於下面進行操作。
+      suspension_irreversible: 已永久刪除此帳號的資料。您可以取消這個帳號之停權狀態，但無法還原已刪除的資料。
+      suspension_reversible_hint_html: 這個帳號已被停權，所有資料將於 %{date} 被刪除。於此之前，您可以完全回復您的帳號。如果您想即時刪除這個帳號的資料，您能於下面進行操作。
       title: 帳號
       unblock_email: 解除封鎖電子郵件地址
       unblocked_email_msg: 成功解除封鎖 %{username} 的電子郵件地址
@@ -176,7 +176,7 @@ zh-TW:
         create_account_warning: 新增警告
         create_announcement: 新增公告
         create_canonical_email_block: 新增 E-mail 封鎖
-        create_custom_emoji: 新增自訂顏文字
+        create_custom_emoji: 新增自訂 emoji 表情符號
         create_domain_allow: 新增允許網域
         create_domain_block: 新增網域封鎖
         create_email_domain_block: 新增電子郵件網域封鎖
@@ -186,7 +186,7 @@ zh-TW:
         demote_user: 將用戶降級
         destroy_announcement: 刪除公告
         destroy_canonical_email_block: 刪除 E-mail 封鎖
-        destroy_custom_emoji: 刪除自訂顏文字
+        destroy_custom_emoji: 刪除自訂 emoji 表情符號
         destroy_domain_allow: 刪除允許網域
         destroy_domain_block: 刪除網域封鎖
         destroy_email_domain_block: 刪除電子郵件網域封鎖
@@ -195,11 +195,11 @@ zh-TW:
         destroy_status: 刪除狀態
         destroy_unavailable_domain: 刪除無法存取的網域
         destroy_user_role: 移除角色
-        disable_2fa_user: 停用兩階段認證
-        disable_custom_emoji: 停用自訂顏文字
+        disable_2fa_user: 停用兩階段驗證
+        disable_custom_emoji: 停用自訂 emoji 表情符號
         disable_sign_in_token_auth_user: 停用使用者電子郵件 token 驗證
         disable_user: 停用帳號
-        enable_custom_emoji: 啓用自訂顏文字
+        enable_custom_emoji: 啟用自訂 emoji 表情符號
         enable_sign_in_token_auth_user: 啟用使用者電子郵件 token 驗證
         enable_user: 啓用帳號
         memorialize_account: 設定成追悼帳號
@@ -218,9 +218,9 @@ zh-TW:
         unblock_email_account: 解除封鎖電子郵件地址
         unsensitive_account: 取消將媒體強制標記為敏感內容
         unsilence_account: 取消帳號的靜音狀態
-        unsuspend_account: 取消帳號的暫停狀態
+        unsuspend_account: 取消帳號之停權狀態
         update_announcement: 更新公告
-        update_custom_emoji: 更新自訂顏文字
+        update_custom_emoji: 更新自訂 emoji 表情符號
         update_domain_block: 更新網域封鎖
         update_ip_block: 更新 IP 規則
         update_status: 更新狀態
@@ -235,7 +235,7 @@ zh-TW:
         create_account_warning_html: "%{name} 已對 %{target} 送出警告"
         create_announcement_html: "%{name} 已新增公告 %{target}"
         create_canonical_email_block_html: "%{name} 已封鎖 hash 為 %{target} 的 e-mail"
-        create_custom_emoji_html: "%{name} 已上傳新自訂表情符號 %{target}"
+        create_custom_emoji_html: "%{name} 已上傳新自訂 emoji 表情符號 %{target}"
         create_domain_allow_html: "%{name} 允許 %{target} 網域加入聯邦宇宙"
         create_domain_block_html: "%{name} 已封鎖網域 %{target}"
         create_email_domain_block_html: "%{name} 已封鎖電子郵件網域 %{target}"
@@ -245,7 +245,7 @@ zh-TW:
         demote_user_html: "%{name} 將使用者 %{target} 降級"
         destroy_announcement_html: "%{name} 已刪除公告 %{target}"
         destroy_canonical_email_block_html: "%{name} 已解除封鎖 hash 為 %{target} 的電子郵件"
-        destroy_custom_emoji_html: "%{name} 已刪除表情符號 %{target}"
+        destroy_custom_emoji_html: "%{name} 已刪除 emoji 表情符號 %{target}"
         destroy_domain_allow_html: "%{name} 不允許與網域 %{target} 加入聯邦宇宙"
         destroy_domain_block_html: "%{name} 已解除封鎖網域 %{target}"
         destroy_email_domain_block_html: "%{name} 已解除封鎖電子郵件網域 %{target}"
@@ -254,11 +254,11 @@ zh-TW:
         destroy_status_html: "%{name} 已刪除 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 已恢復對網域 %{target} 的發送"
         destroy_user_role_html: "%{name} 已刪除 %{target} 角色"
-        disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段認證 (2FA) "
-        disable_custom_emoji_html: "%{name} 已停用自訂表情符號 %{target}"
+        disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段驗證 (2FA) "
+        disable_custom_emoji_html: "%{name} 已停用自訂 emoji 表情符號 %{target}"
         disable_sign_in_token_auth_user_html: "%{name} 已停用 %{target} 之使用者電子郵件 token 驗證"
         disable_user_html: "%{name} 將使用者 %{target} 設定為禁止登入"
-        enable_custom_emoji_html: "%{name} 已啟用自訂表情符號 %{target}"
+        enable_custom_emoji_html: "%{name} 已啟用自訂 emoji 表情符號 %{target}"
         enable_sign_in_token_auth_user_html: "%{name} 已啟用 %{target} 之使用者電子郵件 token 驗證"
         enable_user_html: "%{name} 將使用者 %{target} 設定為允許登入"
         memorialize_account_html: "%{name} 將 %{target} 設定為追悼帳號"
@@ -279,7 +279,7 @@ zh-TW:
         unsilence_account_html: "%{name} 已取消使用者 %{target} 的靜音狀態"
         unsuspend_account_html: "%{name} 已取消停權 %{target} 的帳號"
         update_announcement_html: "%{name} 已更新公告 %{target}"
-        update_custom_emoji_html: "%{name} 已更新自訂表情符號 %{target}"
+        update_custom_emoji_html: "%{name} 已更新自訂 emoji 表情符號 %{target}"
         update_domain_block_html: "%{name} 已更新 %{target} 之網域封鎖"
         update_ip_block_html: "%{name} 已變更 IP %{target} 之規則"
         update_status_html: "%{name} 已更新 %{target} 的嘟文"
@@ -309,37 +309,37 @@ zh-TW:
     critical_update_pending: 重要更新待升級
     custom_emojis:
       assign_category: 指定分類
-      by_domain: 站點
+      by_domain: 伺服器
       copied_msg: 成功建立 emoji 表情符號之本地備份
       copy: 複製
-      copy_failed_msg: 無法將表情複製到本地
+      copy_failed_msg: 無法將該 emoji 表情符號複製至本地
       create_new_category: 建立新分類
-      created_msg: 已新增表情符號！
+      created_msg: 已新增 emoji 表情符號！
       delete: 刪除
-      destroyed_msg: 已刪除表情符號！
+      destroyed_msg: 已刪除 emoji 表情符號！
       disable: 停用
       disabled: 已停用
-      disabled_msg: 已停用該表情符號
-      emoji: 表情符號
+      disabled_msg: 已停用該 emoji 表情符號
+      emoji: emoji 表情符號
       enable: 啟用
       enabled: 已啟用
-      enabled_msg: 已啟用該表情符號
+      enabled_msg: 已啟用該 emoji 表情符號
       image_hint: 檔案大小最大至 %{size} 之 PNG 或 GIF
       list: 列表
       listed: 已顯示
       new:
-        title: 加入新的自訂表情符號
-      no_emoji_selected: 未選取任何 emoji，所以什麼事都沒發生
+        title: 新增自訂 emoji 表情符號
+      no_emoji_selected: 未選取任何 emoji 表情符號，所以什麼事都沒發生
       not_permitted: 您無權執行此操作
       overwrite: 覆蓋
-      shortcode: 短代碼
-      shortcode_hint: 至少 2 個字元，只能使用字母、數字與下劃線
-      title: 自訂表情符號
+      shortcode: 短碼
+      shortcode_hint: 至少 2 個字元，只能使用字母、數字與底線
+      title: 自訂 emoji 表情符號
       uncategorized: 未分類
       unlist: 不公開
       unlisted: 已隱藏
-      update_failed_msg: 無法更新表情符號
-      updated_msg: 已更新表情符號！
+      update_failed_msg: 無法更新該 emoji 表情符號
+      updated_msg: 已更新 emoji 表情符號！
       upload: 上傳新的表情符號
     dashboard:
       active_users: 活躍使用者
@@ -397,7 +397,7 @@ zh-TW:
         create: 新增封鎖
         hint: 站點封鎖動作並不會阻止帳號紀錄被新增至資料庫，但會自動回溯性地對那些帳號套用特定管理設定。
         severity:
-          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨的人會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
+          desc_html: "「<strong>靜音</strong>」令該站點下使用者的嘟文，設定為只對跟隨者顯示，沒有跟隨之使用者會看不到。「<strong>停權</strong>」會刪除將該站點下使用者的嘟文、媒體檔案與個人檔案。「<strong>無</strong>」則會拒絕接收來自該站點的媒體檔案。"
           noop: 無
           silence: 靜音
           suspend: 停權
@@ -418,7 +418,7 @@ zh-TW:
       view: 顯示已封鎖網域
     email_domain_blocks:
       add_new: 加入新項目
-      allow_registrations_with_approval: 經允許後可註冊
+      allow_registrations_with_approval: 經審核後可註冊
       attempts_over_week:
         other: 上週共有 %{count} 次註冊嘗試
       created_msg: 已成功將電子郵件網域加入黑名單
@@ -505,7 +505,7 @@ zh-TW:
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 日皆無法遞送 ，則會自動標記無法遞送。
-      destroyed_msg: 來自 %{domain} 的資料現在正在佇列中等待刪除。
+      destroyed_msg: 來自 %{domain} 的資料目前正在佇列中等待刪除。
       empty: 找不到網域
       known_accounts:
         other: "%{count} 個已知帳號"
@@ -585,6 +585,9 @@ zh-TW:
       actions_description_html: 決定應對此報告採取何種行動。若您對檢舉之帳號採取懲罰措施，則將對他們發送 e-mail 通知，如非選擇了 <strong>垃圾郵件</strong> 類別。
       actions_description_remote_html: 決定將對此檢舉報告採取何種動作。這將僅作用於<strong>您的伺服器</strong>與此遠端帳號及其內容之通訊行為。
       add_to_report: 加入更多至報告
+      already_suspended_badges:
+        local: 已自此伺服器停權
+        remote: 已自該伺服器停權
       are_you_sure: 您確定嗎？
       assign_to_self: 指派給自己
       assigned: 指派站務
@@ -640,7 +643,7 @@ zh-TW:
           suspend_html: 停權 <strong>@%{acct}</strong>，將他們的個人檔案與內容標記為無法存取及無法與之互動
         close_report: '將檢舉報告 #%{id} 標記為已處理'
         close_reports_html: 將 <strong>所有</strong> 對於 <strong>@%{acct}</strong> 之檢舉報告標記為已處理
-        delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除暫停
+        delete_data_html: 於即日起 30 天後刪除 <strong>@%{acct}</strong>之個人檔案與內容，除非他們於期限前被解除停權
         preview_preamble_html: "<strong>@%{acct}</strong> 將收到關於以下內容之警告："
         record_strike_html: 紀錄關於 <strong>@%{acct}</strong>之警示有助於您升級對此帳號未來違規處理
         send_email_html: 寄一封警告 e-mail 給 <strong>@%{acct}</strong>
@@ -682,8 +685,8 @@ zh-TW:
         manage_appeals_description: 允許使用者審閱針對站務動作之申訴
         manage_blocks: 管理封鎖
         manage_blocks_description: 允許使用者封鎖電子郵件提供者與 IP 位置
-        manage_custom_emojis: 管理自訂表情符號
-        manage_custom_emojis_description: 允許使用者管理伺服器上的自訂表情符號
+        manage_custom_emojis: 管理自訂 emoji 表情符號
+        manage_custom_emojis_description: 允許使用者管理伺服器上之自訂 emoji 表情符號
         manage_federation: 管理聯邦宇宙
         manage_federation_description: 允許使用者封鎖或允許與其他網域的聯邦宇宙，並控制傳遞能力
         manage_invites: 管理邀請
@@ -714,7 +717,7 @@ zh-TW:
     rules:
       add_new: 新增規則
       delete: 刪除
-      description_html: 雖然大多數人皆宣稱已閱讀並同意服務條款，通常直到某些問題發生時人們從未讀過。<strong>以透過提供條列式規則的方式讓您的伺服器規則可以一目了然。</strong>試著維持各項條款簡短而明瞭，但也試著不要將條款切割為許多分開的項目。
+      description_html: 雖然大多數人皆宣稱已閱讀並同意服務條款，通常直到某些問題發生時人們從未讀過。<strong>以透過提供條列式規則的方式使您的伺服器規則可以一目了然。</strong>試著維持各項條款簡短而明瞭，但也試著不要將條款切割為許多分開的項目。
       edit: 編輯規則
       empty: 未曾定義任何伺服器規則
       title: 伺服器規則
@@ -736,6 +739,7 @@ zh-TW:
           此外，<strong>這將大幅降低註冊流程對某些族群之易用性，特別是無障礙需求人士</strong>。基於此因，請考慮其他替代性方案，例如審核制或是邀請制之註冊流程。
         title: 要求新使用者完成 CAPTCHA 挑戰以確認帳號
       content_retention:
+        danger_zone: 危險區域！
         preamble: 控制使用者產生內容如何儲存於 Mastodon 上。
         title: 內容保留期間
       default_noindex:
@@ -755,13 +759,15 @@ zh-TW:
         disabled: 給沒有人
         users: 套用至所有登入的本站使用者
       registrations:
+        moderation_recommandation: 對所有人開放註冊之前，請確保您有人手充足且反應靈敏的管理員團隊！
         preamble: 控制誰能於您伺服器上建立帳號。
         title: 註冊
       registrations_mode:
         modes:
-          approved: 註冊需要核准
+          approved: 註冊需要審核
           none: 沒有人可註冊
           open: 任何人皆能註冊
+        warning_hint: 建議您使用「需要審核註冊」除非您相信您的管理員團隊能即時處理垃圾訊息與惡意帳號註冊。
       security:
         authorized_fetch: 要求自聯邦宇宙伺服器之驗證
         authorized_fetch_hint: 要求聯邦宇宙伺服器進行驗證將更嚴格地執行使用者層級及伺服器層級之封鎖。然而，這將會帶來一些性能損失、減少您的回嘟觸及量、並可能會引入與某些聯邦宇宙伺服器之相容性問題。 此外，這無法阻止專門服務抓取您的公開嘟文及帳號資料。
@@ -779,7 +785,7 @@ zh-TW:
       title: 可取得的更新
       type: 類型
       types:
-        major: 主要版本更新 (major release)
+        major: 主要版本更新
         minor: 次要版本更新 (minor release)
         patch: 修正版本 (patch release) — 錯誤修正及易於套用之變更
       version: 版本
@@ -870,7 +876,7 @@ zh-TW:
       links:
         allow: 允許連結
         allow_provider: 允許發行者
-        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索現在世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
+        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索目前世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
         disallow: 不允許連結
         disallow_provider: 不允許發行者
         no_link_selected: 因未選取任何連結，所以什麼事都沒發生
@@ -933,7 +939,7 @@ zh-TW:
     webhooks:
       add_new: 新增端點
       delete: 刪除
-      description_html: "<strong>Webhook</strong> 讓 Mastodon 可以將關於選定的事件的<strong>即時通知</strong>推送到您自己的應用程式，如此您的應用程式就可以<strong>自動觸發反應</strong>。"
+      description_html: "<strong>Webhook</strong> 使 Mastodon 可以將關於選定的事件的<strong>即時通知</strong>推送到您自己的應用程式，如此您的應用程式就可以<strong>自動觸發反應</strong>。"
       disable: 停用
       disabled: 已停用
       edit: 編輯端點
@@ -950,6 +956,9 @@ zh-TW:
       title: Webhooks
       webhook: Webhook
   admin_mailer:
+    auto_close_registrations:
+      body: 由於近日缺少管理員活動，%{instance} 上之註冊已自動切換為需要人工審核，以防止 %{instance} 被作為潛在不良行為者之跳板。您隨時能將其切換回開放註冊。
+      subject: "%{instance} 之註冊已自動切換為需要審核"
     new_appeal:
       actions:
         delete_statuses: 要刪除他們的嘟文
@@ -985,15 +994,15 @@ zh-TW:
         title: 熱門主題標籤
       subject: "%{instance} 有待審核之新熱門"
   aliases:
-    add_new: 建立別名
-    created_msg: 成功建立別名。您可以自舊帳號開始轉移。
+    add_new: 新增別名
+    created_msg: 成功新增別名。您可以自舊帳號開始轉移。
     deleted_msg: 成功移除別名。您將無法再由舊帳號轉移至目前的帳號。
     empty: 您目前沒有任何別名。
     hint_html: 如果想由其他帳號轉移至此帳號，您能於此處新增別名，稍後系統將容許您將跟隨者由舊帳號轉移至此。此項作業是<strong>無害且可復原的</strong>。 <strong>帳號的遷移程序需要於舊帳號啟動</strong>。
     remove: 取消連結別名
   appearance:
     advanced_web_interface: 進階網頁介面
-    advanced_web_interface_hint: 進階網頁介面可讓您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表與主題標籤。
+    advanced_web_interface_hint: 進階網頁介面能使您設定許多不同的欄位來善用螢幕空間，依需要同時查看許多不同的資訊如：首頁、通知、聯邦宇宙時間軸、任意數量的列表與主題標籤。
     animations_and_accessibility: 動畫與無障礙設定
     confirmation_dialogs: 確認對話框
     discovery: 探索
@@ -1011,7 +1020,7 @@ zh-TW:
     view_profile: 檢視個人檔案
     view_status: 檢視嘟文
   applications:
-    created: 已建立應用程式
+    created: 已新增應用程式
     destroyed: 已刪除應用程式
     logout: 登出
     regenerate_token: 重新產生存取 token
@@ -1062,7 +1071,7 @@ zh-TW:
       cas: CAS
       saml: SAML
     register: 註冊
-    registration_closed: "%{instance} 現在不開放新成員"
+    registration_closed: "%{instance} 目前不開放新成員"
     resend_confirmation: 重新傳送確認連結
     reset_password: 重設密碼
     rules:
@@ -1086,7 +1095,7 @@ zh-TW:
       title: 登入 %{domain}
     sign_up:
       manual_review: "%{domain} 上的註冊由我們的管理員進行人工審核。為協助我們處理您的註冊，請寫一些關於您自己的資訊以及您欲於 %{domain} 上註冊帳號之原因。"
-      preamble: 於此 Mastodon 伺服器擁有帳號的話，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
+      preamble: 若於此 Mastodon 伺服器擁有帳號，您將能跟隨聯邦宇宙網路中任何一份子，無論他們的帳號託管於何處。
       title: 讓我們一起設定 %{domain} 吧！
     status:
       account_status: 帳號狀態
@@ -1323,7 +1332,7 @@ zh-TW:
       muting: 正在匯入已靜音帳號
     type: 匯入類型
     type_groups:
-      constructive: 跟隨者與書籤
+      constructive: 跟隨中與書籤
       destructive: 封鎖與靜音
     types:
       blocking: 您封鎖的使用者列表
@@ -1344,20 +1353,20 @@ zh-TW:
       '604800': 1 週後
       '86400': 1 天後
     expires_in_prompt: 永不過期
-    generate: 建立邀請連結
+    generate: 產生邀請連結
     invalid: 此邀請是無效的
     invited_by: 您的邀請人是：
     max_uses:
       other: "%{count} 則"
     max_uses_prompt: 無限制
-    prompt: 建立分享連結，邀請他人於本伺服器註冊
+    prompt: 產生分享連結，邀請他人於本伺服器註冊
     table:
       expires_at: 失效時間
       uses: 已使用次數
     title: 邀請使用者
   lists:
     errors:
-      limit: 您所建立的列表數量已達上限
+      limit: 您所建立之列表數量已達上限
   login_activities:
     authentication_methods:
       otp: 兩階段驗證應用程式
@@ -1402,7 +1411,7 @@ zh-TW:
       on_cooldown: 您正在處於冷卻（CD）狀態
     followers_count: 轉移時的跟隨者
     incoming_migrations: 自另一個帳號轉移
-    incoming_migrations_html: 要從其他帳號移動到此帳號的話，首先您必須<a href="%{path}">建立帳號別名</a>。
+    incoming_migrations_html: 若欲自其他帳號移動至此帳號，首先您必須<a href="%{path}">新增帳號別名</a>。
     moved_msg: 您的帳號正被重新導向到 %{acct}，您的跟隨者也會同步轉移至該帳號。
     not_redirecting: 您的帳號目前尚未重新導向到任何其他帳號。
     on_cooldown: 您最近已轉移過您的帳號。此功能將於 %{count} 天後可再度使用。
@@ -1449,7 +1458,7 @@ zh-TW:
       title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 於嘟文中提及您:"
+      body: "%{name} 於嘟文中提及您："
       subject: "%{name} 於嘟文中提及您"
       title: 新的提及
     poll:
@@ -1466,7 +1475,6 @@ zh-TW:
     administration_emails: 管理員電子郵件通知
     email_events: 電子郵件通知設定
     email_events_hint: 選取您想接收通知的事件：
-    other_settings: 其他通知設定
   number:
     human:
       decimal_units:
@@ -1508,11 +1516,11 @@ zh-TW:
     posting_defaults: 嘟文預設值
     public_timelines: 公開時間軸
   privacy:
-    hint_html: "<strong>自訂您希望如何讓您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
+    hint_html: "<strong>自訂您希望如何使您的個人檔案及嘟文被發現。</strong>藉由啟用一系列 Mastodon 功能以幫助您觸及更廣的受眾。煩請花些時間確認您是否欲啟用這些設定。"
     privacy: 隱私權
     privacy_hint_html: 控制您希望向其他人揭露之內容。人們透過瀏覽其他人的跟隨者與其發嘟之應用程式發現有趣的個人檔案與酷炫的 Mastodon 應用程式，但您能選擇將其隱藏。
     reach: 觸及
-    reach_hint_html: 控制您希望被新使用者探索或跟隨之方式。想讓您的嘟文出現於探索頁面嗎？想讓其他人透過他們的跟隨建議找到您嗎？想自動接受所有新跟隨者嗎？或是想逐一控制跟隨請求嗎？
+    reach_hint_html: 控制您希望被新使用者探索或跟隨之方式。想使您的嘟文出現於探索頁面嗎？想使其他人透過他們的跟隨建議找到您嗎？想自動接受所有新跟隨者嗎？或是想逐一控制跟隨請求嗎？
     search: 搜尋
     search_hint_html: 控制您希望如何被發現。您想透過您的公開嘟文被人們發現嗎？您想透過網頁搜尋被 Mastodon 以外的人找到您的個人檔案嗎？請注意，公開資訊可能無法全面地被所有搜尋引擎所排除。
     title: 隱私權及觸及
@@ -1521,7 +1529,10 @@ zh-TW:
   reactions:
     errors:
       limit_reached: 達到可回應之上限
-      unrecognized_emoji: 並非一個可識別的 emoji
+      unrecognized_emoji: 並非可識別之 emoji 表情符號
+  redirects:
+    prompt: 若您信任此連結，請點擊以繼續。
+    title: 您將要離開 %{instance} 。
   relationships:
     activity: 帳號動態
     confirm_follow_selected_followers: 您確定要跟隨選取的跟隨者嗎？
@@ -1584,6 +1595,7 @@ zh-TW:
       unknown_browser: 未知的瀏覽器
       weibo: 新浪微博
     current_session: 目前的 session
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
     ip: IP 位址
@@ -1620,14 +1632,26 @@ zh-TW:
     import: 匯入
     import_and_export: 匯入及匯出
     migrate: 帳號搬遷
-    notifications: 通知
+    notifications: 電子郵件通知
     preferences: 偏好設定
     profile: 個人檔案
     relationships: 跟隨中與跟隨者
+    severed_relationships: 已斷絕服務關係
     statuses_cleanup: 自動嘟文刪除
     strikes: 管理警告
-    two_factor_authentication: 兩階段認證
+    two_factor_authentication: 兩階段驗證
     webauthn_authentication: 安全金鑰
+  severed_relationships:
+    download: 下載 (%{count} 份)
+    event_type:
+      account_suspension: 停權帳號 (%{target_name})
+      domain_block: 停權伺服器 (%{target_name})
+      user_domain_block: 您已封鎖 %{target_name}
+    lost_followers: 失去之跟隨者
+    lost_follows: 失去之跟隨中
+    preamble: 當您封鎖網域或您的管理員決定停權遠端伺服器時，您可能失去跟隨中或跟隨者。當此發生時，您能下載斷絕服務關係之列表並於其他伺服器中檢視或匯入資料。
+    purged: 關於此伺服器已被您的伺服器管理員清除之資訊
+    type: 事件
   statuses:
     attached:
       audio:
@@ -1659,8 +1683,6 @@ zh-TW:
         other: "%{count} 票"
       vote: 投票
     show_more: 顯示更多
-    show_newer: 顯示較新嘟文
-    show_older: 顯示較舊嘟文
     show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
@@ -1717,6 +1739,7 @@ zh-TW:
     contrast: Mastodon（高對比）
     default: Mastodon（深色）
     mastodon-light: Mastodon（亮色）
+    system: 自動（使用系統佈景主題）
   time:
     formats:
       default: "%Y 年 %b 月 %d 日 %H:%M"
@@ -1732,11 +1755,11 @@ zh-TW:
     disable: 停用兩階段驗證
     disabled_success: 已成功啟用兩階段驗證
     edit: 編輯
-    enabled: 兩階段認證已啟用
-    enabled_success: 已成功啟用兩階段認證
+    enabled: 兩階段驗證已啟用
+    enabled_success: 兩階段驗證已成功啟用
     generate_recovery_codes: 產生備用驗證碼
-    lost_recovery_codes: 讓您能於遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
-    methods: 兩步驟方式
+    lost_recovery_codes: 使您能於遺失手機時，透過備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
+    methods: 兩階段驗證
     otp: 驗證應用程式
     recovery_codes: 備份備用驗證碼
     recovery_codes_regenerated: 成功產生新的備用驗證碼
@@ -1744,18 +1767,27 @@ zh-TW:
     webauthn: 安全金鑰
   user_mailer:
     appeal_approved:
-      action: 前往您的帳號
+      action: 帳號設定
       explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已獲批准。您的帳號再次享有良好的信譽。
       subject: 您於 %{date} 提出之申訴已獲批准
+      subtitle: 您的帳號再次保持良好信譽。
       title: 申訴已批准
     appeal_rejected:
       explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已被駁回。
       subject: 您於 %{date} 提出之申訴已被駁回
+      subtitle: 您的申訴已被駁回。
       title: 申訴被駁回
     backup_ready:
-      explanation: 您要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載！
+      explanation: 您要求完整備份您的 Mastodon 帳號。
+      extra: 準備好可供下載了！
       subject: 您的備份檔已可供下載
       title: 檔案匯出
+    failed_2fa:
+      details: 以下是該登入嘗試之詳細資訊：
+      explanation: 有人嘗試登入您的帳號，但提供了無效的兩階段驗證。
+      further_actions_html: 若這並非您所為，我們建議您立刻 %{action}，因為其可能已被入侵。
+      subject: 兩階段驗證失敗
+      title: 兩階段驗證失敗
     suspicious_sign_in:
       change_password: 變更密碼
       details: 以下是該登入之詳細資訊：
@@ -1795,20 +1827,51 @@ zh-TW:
         silence: 帳號已被限制
         suspend: 帳號己被停權
     welcome:
-      edit_profile_action: 設定個人檔案
-      edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇於新的跟隨者跟隨前，先對他們進行審核。
+      apps_android_action: 於 Google Play 下載
+      apps_ios_action: 於 App Store 下載
+      apps_step: 下載官方應用程式。
+      apps_title: Mastodon APP
+      checklist_subtitle: 讓我們協助您於這個嶄新的社交平台上啟程：
+      checklist_title: 新手任務清單
+      edit_profile_action: 個人化設定
+      edit_profile_step: 若您完整填寫個人檔案，其他人比較願意與您互動。
+      edit_profile_title: 客製化您的個人檔案
       explanation: 以下是幾個小技巧，希望它們能幫到您
-      final_action: 開始嘟嘟
-      final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能於本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
-      full_handle: 您的完整帳號名稱
-      full_handle_hint: 您需要將這告訴您的朋友們，這樣他們就能從另一個伺服器向您發送訊息或跟隨您。
+      feature_action: 了解更多
+      feature_audience: Mastodon 為您打開了一扇獨特的門，使您不受平台干擾，自由地管理您的受眾。只需將 Mastodon 部署於您自己的基礎設施上，您便能與線上任何 Mastodon 伺服器互動，而且控制權只在您手中。
+      feature_audience_title: 自信地建立您的受眾
+      feature_control: 您最清楚自己想於首頁動態看到什麼內容，別讓演算法與廣告浪費您寶貴的時間。自同一帳號跟隨任何 Mastodon 伺服器上的任何一個人，依時間順序接收他們的嘟文，建立屬於自己的網路小角落。
+      feature_control_title: 掌控自己的時間軸
+      feature_creativity: Mastodon 支援音訊、影片及圖片嘟文、無障礙說明文字、投票、內容警告、動畫大頭貼、自訂 emoji 表情符號、縮圖裁剪控制等等，協助您表達自我。無論是發佈藝術作品、音樂，或是 podcast，Mastodon 將隨時陪伴著您。
+      feature_creativity_title: 無與倫比的創意
+      feature_moderation: Mastodon 將決策權交還於您。每台伺服器皆能制定自己的規則與管理規範，並於該伺服器上實施。這與社交媒體公司由上而下的規範大不相同，因此能更有彈性地滿足不同群體的需求。您可以加入認同其規則之伺服器，或者自行架設伺服器。
+      feature_moderation_title: 管理方式，如您所願
+      follow_action: 跟隨
+      follow_step: Mastodon 的趣味就是跟隨那些有趣的人們！
+      follow_title: 客製化您的首頁時間軸
+      follows_subtitle: 跟隨家喻戶曉的熱門帳號
+      follows_title: 推薦跟隨帳號
+      follows_view_more: 檢視更多人以跟隨
+      hashtags_recent_count:
+        other: 於過去二天 %{people} 人
+      hashtags_subtitle: 探索過去兩天內的熱門主題標籤
+      hashtags_title: 熱門主題標籤
+      hashtags_view_more: 檢視更多熱門主題標籤
+      post_action: 撰寫
+      post_step: 透過文字、照片、影片或投票向新世界打聲招呼吧。
+      post_title: 撰寫您第一則嘟文
+      share_action: 分享
+      share_step: 讓您的朋友們知道如何於 Mastodon 找到您。
+      share_title: 分享您 Mastodon 個人檔案
+      sign_in_action: 登入
       subject: 歡迎來到 Mastodon
       title: "%{name} 誠摯歡迎您的加入！"
   users:
     follow_limit_reached: 您無法跟隨多於 %{limit} 個人
     go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
-    invalid_otp_token: 兩階段認證碼不正確
+    invalid_otp_token: 兩階段驗證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
+    rate_limited: 過多次身份驗證嘗試，請稍後再試。
     seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
     signed_in_as: 目前登入的帳號：
   verification:
@@ -1825,7 +1888,7 @@ zh-TW:
       success: 您已成功加入安全金鑰。
     delete: 刪除
     delete_confirmation: 您確定要移除這把安全金鑰嗎？
-    description_html: 如果您啟用<strong>安全金鑰驗證</strong>的話，您將於登入時需要使用其中一把安全金鑰。
+    description_html: 若您啟用<strong>安全金鑰驗證</strong>，您將於登入時需要使用其中一把安全金鑰。
     destroy:
       error: 移除安全金鑰時出現了問題。請再試一次。
       success: 您已成功將安全金鑰移除。
diff --git a/config/navigation.rb b/config/navigation.rb
index 1e7acf3b9c..a64b3544d6 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -6,18 +6,28 @@ SimpleNavigation::Configuration.run do |navigation|
   navigation.items do |n|
     n.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_path
 
-    n.item :software_updates, safe_join([fa_icon('exclamation-circle fw'), t('admin.critical_update_pending')]), admin_software_updates_path, if: -> { ENV['UPDATE_CHECK_URL'] != '' && current_user.can?(:view_devops) && SoftwareUpdate.urgent_pending? }, html: { class: 'warning' }
+    if ENV['UPDATE_CHECK_URL'] != '' && current_user.can?(:view_devops)
+      n.item :software_updates, safe_join([fa_icon('exclamation-circle fw'), t('admin.critical_update_pending')]), admin_software_updates_path, if: -> { SoftwareUpdate.urgent_pending? }, html: { class: 'warning' }
+      n.item :software_updates, safe_join([fa_icon('exclamation-circle fw'), t('admin.update_pendings.major')]), admin_software_updates_path, if: -> { !SoftwareUpdate.urgent_pending? && SoftwareUpdate.major_pending? }, html: { class: 'warning' }
+      n.item :software_updates, safe_join([fa_icon('exclamation-circle fw'), t('admin.update_pendings.patch')]), admin_software_updates_path, if: -> { !SoftwareUpdate.urgent_pending? && SoftwareUpdate.patch_pending? }, html: { class: 'warning' }
+    end
 
     n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_path, if: -> { current_user.functional? && !self_destruct }, highlights_on: %r{/settings/profile|/settings/featured_tags|/settings/verification|/settings/privacy}
 
     n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
       s.item :appearance, safe_join([fa_icon('desktop fw'), t('settings.appearance')]), settings_preferences_appearance_path
-      s.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_preferences_notifications_path
+      s.item :notifications, safe_join([fa_icon('envelope fw'), t('settings.notifications')]), settings_preferences_notifications_path
+      s.item :reaching, safe_join([fa_icon('search fw'), t('preferences.reaching')]), settings_preferences_reaching_path
       s.item :other, safe_join([fa_icon('cog fw'), t('preferences.other')]), settings_preferences_other_path
     end
 
-    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct }
+    n.item :relationships, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path, if: -> { current_user.functional? && !self_destruct } do |s|
+      s.item :current, safe_join([fa_icon('users fw'), t('settings.relationships')]), relationships_path
+      s.item :severed_relationships, safe_join([fa_icon('unlink fw'), t('settings.severed_relationships')]), severed_relationships_path
+    end
+
     n.item :filters, safe_join([fa_icon('filter fw'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
+    n.item :antennas, safe_join([fa_icon('wifi fw'), t('antennas.index.title')]), antennas_path, highlights_on: %r{/antennas}, if: -> { current_user.functional? && !self_destruct }
     n.item :statuses_cleanup, safe_join([fa_icon('history fw'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }
 
     n.item :security, safe_join([fa_icon('lock fw'), t('settings.account')]), edit_user_registration_path do |s|
@@ -32,7 +42,7 @@ SimpleNavigation::Configuration.run do |navigation|
     end
 
     n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
-    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, if: -> { current_user.functional? && !self_destruct }
+    n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }
 
     n.item :trends, safe_join([fa_icon('fire fw'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
       s.item :statuses, safe_join([fa_icon('comments-o fw'), t('admin.trends.statuses.title')]), admin_trends_statuses_path, highlights_on: %r{/admin/trends/statuses}
@@ -40,12 +50,19 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :links, safe_join([fa_icon('newspaper-o fw'), t('admin.trends.links.title')]), admin_trends_links_path, highlights_on: %r{/admin/trends/links}
     end
 
-    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s|
-      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports}, if: -> { current_user.can?(:manage_reports) }
-      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+    n.item :moderation, safe_join([fa_icon('gavel fw'), t('moderation.title')]), nil, if: lambda {
+                                                                                            current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks, :manage_ng_words, :manage_sensitive_words) && !self_destruct
+                                                                                          } do |s|
+      s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) }
+      s.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/disputes|/admin/users}, if: -> { current_user.can?(:manage_users) }
+      s.item :ng_words, safe_join([fa_icon('list fw'), t('admin.ng_words.title')]), admin_ng_words_keywords_path, highlights_on: %r{/admin/(ng_words|ngword_histories)}, if: -> { current_user.can?(:manage_ng_words) }
+      s.item :ng_rules, safe_join([fa_icon('rub fw'), t('admin.ng_rules.title')]), admin_ng_rules_path, highlights_on: %r{/admin/(ng_rules|ng_rule_histories)}, if: -> { current_user.can?(:manage_ng_words) }
+      s.item :sensitive_words, safe_join([fa_icon('list fw'), t('admin.sensitive_words.title')]), admin_sensitive_words_path, highlights_on: %r{/admin/sensitive_words}, if: -> { current_user.can?(:manage_sensitive_words) }
       s.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
       s.item :follow_recommendations, safe_join([fa_icon('user-plus fw'), t('admin.follow_recommendations.title')]), admin_follow_recommendations_path, highlights_on: %r{/admin/follow_recommendations}, if: -> { current_user.can?(:manage_taxonomies) }
       s.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
+      s.item :special_instances, safe_join([fa_icon('list fw'), t('admin.special_instances.title')]), admin_special_instances_path, highlights_on: %r{/admin/special_instances}, if: -> { current_user.can?(:manage_federation) }
+      s.item :special_domains, safe_join([fa_icon('list fw'), t('admin.special_domains.title')]), admin_special_domains_path, highlights_on: %r{/admin/special_domains}, if: -> { current_user.can?(:manage_federation) }
       s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
       s.item :ip_blocks, safe_join([fa_icon('ban fw'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
       s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
@@ -60,6 +77,7 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }
       s.item :webhooks, safe_join([fa_icon('inbox fw'), t('admin.webhooks.title')]), admin_webhooks_path, highlights_on: %r{/admin/webhooks}, if: -> { current_user.can?(:manage_webhooks) }
       s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_path, highlights_on: %r{/admin/relays}, if: -> { !limited_federation_mode? && current_user.can?(:manage_federation) }
+      s.item :friend_servers, safe_join([fa_icon('users fw'), t('admin.friend_servers.title')]), admin_friend_servers_path, highlights_on: %r{/admin/friend_servers}, if: -> { current_user.can?(:manage_federation) }
     end
 
     n.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_path, link_html: { target: 'sidekiq' }, if: -> { current_user.can?(:view_devops) }
diff --git a/config/roles.yml b/config/roles.yml
index f443250d17..0439c9f741 100644
--- a/config/roles.yml
+++ b/config/roles.yml
@@ -28,6 +28,7 @@ admin:
     - manage_custom_emojis
     - manage_webhooks
     - manage_roles
+    - invite_users
 owner:
   name: Owner
   position: 1000
diff --git a/config/routes.rb b/config/routes.rb
index 85c3b18556..c86fcc82ba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sidekiq_unique_jobs/web'
+require 'sidekiq_unique_jobs/web' if ENV['ENABLE_SIDEKIQ_UNIQUE_JOBS_UI'] == true
 require 'sidekiq-scheduler/web'
 
 class RedirectWithVary < ActionDispatch::Routing::PathRedirect
@@ -24,13 +24,20 @@ Rails.application.routes.draw do
     /home
     /public
     /public/local
+    /public/local/fixed
     /public/remote
     /conversations
     /lists/(*any)
-    /notifications
+    /antennasw/(*any)
+    /antennast/(*any)
+    /circles/(*any)
+    /notifications/(*any)
     /favourites
+    /emoji_reactions
     /bookmarks
+    /bookmark_categories/(*any)
     /pinned
+    /reaction_deck
     /start/(*any)
     /directory
     /explore/(*any)
@@ -62,6 +69,7 @@ Rails.application.routes.draw do
                 tokens: 'oauth/tokens'
   end
 
+  get '.well-known/oauth-authorization-server', to: 'well_known/oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
   get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
   get '.well-known/nodeinfo', to: 'well_known/node_info#index', as: :nodeinfo, defaults: { format: 'json' }
   get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
@@ -77,8 +85,10 @@ Rails.application.routes.draw do
   get 'remote_interaction_helper', to: 'remote_interaction_helper#index'
 
   resource :instance_actor, path: 'actor', only: [:show] do
-    resource :inbox, only: [:create], module: :activitypub
-    resource :outbox, only: [:show], module: :activitypub
+    scope module: :activitypub do
+      resource :inbox, only: [:create]
+      resource :outbox, only: [:show]
+    end
   end
 
   get '/invite/:invite_code', constraints: ->(req) { req.format == :json }, to: 'api/v1/invites#show'
@@ -104,12 +114,12 @@ Rails.application.routes.draw do
     confirmations: 'auth/confirmations',
   }
 
-  # rubocop:disable Style/FormatStringToken - those do not go through the usual formatting functions and are not safe to correct
-  get '/users/:username', to: redirect_with_vary('/@%{username}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/following', to: redirect_with_vary('/@%{username}/following'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}'), constraints: ->(req) { req.format.nil? || req.format.html? }
-  # rubocop:enable Style/FormatStringToken
+  with_options constraints: ->(req) { req.format.nil? || req.format.html? } do
+    get '/users/:username', to: redirect_with_vary('/@%{username}')
+    get '/users/:username/following', to: redirect_with_vary('/@%{username}/following')
+    get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers')
+    get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}')
+  end
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 
@@ -121,27 +131,33 @@ Rails.application.routes.draw do
       end
 
       resources :replies, only: [:index], module: :activitypub
+      resources :references, only: [:index], module: :activitypub
     end
 
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
 
-    resource :outbox, only: [:show], module: :activitypub
-    resource :inbox, only: [:create], module: :activitypub
-    resource :claim, only: [:create], module: :activitypub
-    resources :collections, only: [:show], module: :activitypub
-    resource :followers_synchronization, only: [:show], module: :activitypub
+    scope module: :activitypub do
+      resource :outbox, only: [:show]
+      resource :inbox, only: [:create]
+      resource :claim, only: [:create]
+      resources :collections, only: [:show]
+      resource :followers_synchronization, only: [:show]
+    end
   end
 
   resource :inbox, only: [:create], module: :activitypub
+  resources :contexts, only: [:show], module: :activitypub
 
-  get '/:encoded_at(*path)', to: redirect("/@%{path}"), constraints: { encoded_at: /%40/ }
+  get '/:encoded_at(*path)', to: redirect('/@%{path}'), constraints: { encoded_at: /%40/ }
 
   constraints(username: %r{[^@/.]+}) do
-    get '/@:username', to: 'accounts#show', as: :short_account
-    get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
-    get '/@:username/media', to: 'accounts#show', as: :short_account_media
-    get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag
+    with_options to: 'accounts#show' do
+      get '/@:username', as: :short_account
+      get '/@:username/with_replies', as: :short_account_with_replies
+      get '/@:username/media', as: :short_account_media
+      get '/@:username/tagged/:tag', as: :short_account_tag
+    end
   end
 
   constraints(account_username: %r{[^@/.]+}) do
@@ -162,6 +178,11 @@ Rails.application.routes.draw do
     end
   end
 
+  namespace :redirect do
+    resources :accounts, only: :show
+    resources :statuses, only: :show
+  end
+
   resources :media, only: [:show] do
     get :player
   end
@@ -176,8 +197,17 @@ Rails.application.routes.draw do
       end
     end
   end
+  resources :antennas, except: [:show]
 
   resource :relationships, only: [:show, :update]
+  resources :severed_relationships, only: [:index] do
+    member do
+      constraints(format: :csv) do
+        get :followers
+        get :following
+      end
+    end
+  end
   resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
 
   get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 207cb0580d..9fe57b2967 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -32,6 +32,21 @@ namespace :admin do
 
   resources :action_logs, only: [:index]
   resources :warning_presets, except: [:new, :show]
+  namespace :ng_words do
+    resource :keywords, only: [:show, :create], controller: 'keywords'
+    resource :white_list, only: [:show, :create], controller: 'white_list'
+    resource :settings, only: [:show, :create], controller: 'settings'
+  end
+  resources :ngword_histories, only: [:index]
+  resources :ng_rules, except: [:show] do
+    member do
+      post :duplicate
+    end
+  end
+  resources :ng_rule_histories, only: [:show]
+  resource :sensitive_words, only: [:show, :create]
+  resource :special_instances, only: [:show, :create]
+  resource :special_domains, only: [:show, :create]
 
   resources :announcements, except: [:show] do
     member do
@@ -67,6 +82,15 @@ namespace :admin do
     end
   end
 
+  resources :friend_servers, only: [:index, :new, :edit, :create, :update, :destroy] do
+    member do
+      post :follow
+      post :unfollow
+      post :accept
+      post :reject
+    end
+  end
+
   resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} }, format: 'html' do
     member do
       post :clear_delivery_errors
@@ -117,6 +141,8 @@ namespace :admin do
       post :memorialize
       post :approve
       post :reject
+      post :approve_remote
+      post :reject_remote
       post :unblock_email
     end
 
@@ -129,6 +155,14 @@ namespace :admin do
     resource :action, only: [:new, :create], controller: 'account_actions'
 
     resources :statuses, only: [:index, :show] do
+      member do
+        post :remove_history
+        post :remove_media
+        post :force_sensitive
+        post :force_cw
+        post :remove_status
+      end
+
       collection do
         post :batch
       end
@@ -148,7 +182,7 @@ namespace :admin do
     resource :role, only: [:show, :update], controller: 'users/roles'
   end
 
-  resources :custom_emojis, only: [:index, :new, :create] do
+  resources :custom_emojis, only: [:index, :new, :create, :edit, :update] do
     collection do
       post :batch
     end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 0fe9f69abc..07332a4498 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -6,10 +6,14 @@ namespace :api, format: false do
 
   # JSON / REST API
   namespace :v1 do
-    resources :statuses, only: [:create, :show, :update, :destroy] do
+    resources :statuses, only: [:index, :create, :show, :update, :destroy] do
       scope module: :statuses do
         resources :reblogged_by, controller: :reblogged_by_accounts, only: :index
         resources :favourited_by, controller: :favourited_by_accounts, only: :index
+        resources :emoji_reactioned_by, controller: :emoji_reactioned_by_accounts, only: :index
+        resources :referred_by, controller: :referred_by_statuses, only: :index
+        resources :mentioned_by, controller: :mentioned_accounts, only: :index
+        resources :bookmark_categories, only: :index
         resource :reblog, only: :create
         post :unreblog, to: 'reblogs#destroy'
 
@@ -29,6 +33,11 @@ namespace :api, format: false do
         resource :source, only: :show
 
         post :translate, to: 'translations#create'
+
+        resources :emoji_reactions, only: [:create, :update, :destroy], constraints: { id: %r{[^/]+} }
+        post :emoji_unreaction, to: 'emoji_reactions#destroy'
+        post '/react/:id', to: 'emoji_reactions#create', constraints: { id: %r{[^/]+} }
+        post '/unreact/:id', to: 'emoji_reactions#destroy', constraints: { id: %r{[^/]+} }
       end
 
       member do
@@ -41,16 +50,24 @@ namespace :api, format: false do
       resource :public, only: :show, controller: :public
       resources :tag, only: :show
       resources :list, only: :show
+      resources :antenna, only: :show
     end
 
     get '/streaming', to: 'streaming#index'
     get '/streaming/(*any)', to: 'streaming#index'
 
     resources :custom_emojis, only: [:index]
+    resources :reaction_deck, only: [:index, :create]
     resources :suggestions, only: [:index, :destroy]
     resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
     resources :preferences, only: [:index]
 
+    resources :annual_reports, only: [:index] do
+      member do
+        post :read
+      end
+    end
+
     resources :announcements, only: [:index] do
       scope module: :announcements do
         resources :reactions, only: [:update, :destroy]
@@ -89,6 +106,7 @@ namespace :api, format: false do
     resources :blocks, only: [:index]
     resources :mutes, only: [:index]
     resources :favourites, only: [:index]
+    resources :emoji_reactions, only: [:index]
     resources :bookmarks, only: [:index]
     resources :reports, only: [:create]
     resources :trends, only: [:index], controller: 'trends/tags'
@@ -119,14 +137,16 @@ namespace :api, format: false do
     end
 
     resource :instance, only: [:show] do
-      resources :peers, only: [:index], controller: 'instances/peers'
-      resources :rules, only: [:index], controller: 'instances/rules'
-      resources :domain_blocks, only: [:index], controller: 'instances/domain_blocks'
-      resource :privacy_policy, only: [:show], controller: 'instances/privacy_policies'
-      resource :extended_description, only: [:show], controller: 'instances/extended_descriptions'
-      resource :translation_languages, only: [:show], controller: 'instances/translation_languages'
-      resource :languages, only: [:show], controller: 'instances/languages'
-      resource :activity, only: [:show], controller: 'instances/activity'
+      scope module: :instances do
+        resources :peers, only: [:index]
+        resources :rules, only: [:index]
+        resources :domain_blocks, only: [:index]
+        resource :privacy_policy, only: [:show]
+        resource :extended_description, only: [:show]
+        resource :translation_languages, only: [:show]
+        resource :languages, only: [:show]
+        resource :activity, only: [:show], controller: :activity
+      end
     end
 
     namespace :peers do
@@ -144,6 +164,17 @@ namespace :api, format: false do
       end
     end
 
+    namespace :notifications do
+      resources :requests, only: [:index, :show] do
+        member do
+          post :accept
+          post :dismiss
+        end
+      end
+
+      resource :policy, only: [:show, :update]
+    end
+
     resources :notifications, only: [:index, :show] do
       collection do
         post :clear
@@ -163,13 +194,18 @@ namespace :api, format: false do
       resources :familiar_followers, only: :index
     end
 
-    resources :accounts, only: [:create, :show] do
-      resources :statuses, only: :index, controller: 'accounts/statuses'
-      resources :followers, only: :index, controller: 'accounts/follower_accounts'
-      resources :following, only: :index, controller: 'accounts/following_accounts'
-      resources :lists, only: :index, controller: 'accounts/lists'
-      resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'
-      resources :featured_tags, only: :index, controller: 'accounts/featured_tags'
+    resources :accounts, only: [:index, :create, :show] do
+      scope module: :accounts do
+        resources :statuses, only: :index
+        resources :followers, only: :index, controller: :follower_accounts
+        resources :following, only: :index, controller: :following_accounts
+        resources :lists, only: :index
+        resources :antennas, only: :index
+        resources :exclude_antennas, only: :index
+        resources :circlues, only: :index
+        resources :identity_proofs, only: :index
+        resources :featured_tags, only: :index
+      end
 
       member do
         post :follow
@@ -199,6 +235,26 @@ namespace :api, format: false do
       resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
     end
 
+    resources :antennas, only: [:index, :create, :show, :update, :destroy] do
+      resource :accounts, only: [:show, :create, :destroy], controller: 'antennas/accounts'
+      resource :domains, only: [:show, :create, :destroy], controller: 'antennas/domains'
+      resource :keywords, only: [:show, :create, :destroy], controller: 'antennas/keywords'
+      resource :tags, only: [:show, :create, :destroy], controller: 'antennas/tags'
+      resource :exclude_accounts, only: [:show, :create, :destroy], controller: 'antennas/exclude_accounts'
+      resource :exclude_domains, only: [:create, :destroy], controller: 'antennas/exclude_domains'
+      resource :exclude_keywords, only: [:create, :destroy], controller: 'antennas/exclude_keywords'
+      resource :exclude_tags, only: [:create, :destroy], controller: 'antennas/exclude_tags'
+    end
+
+    resources :circles, only: [:index, :create, :show, :update, :destroy] do
+      resource :accounts, only: [:show, :create, :destroy], controller: 'circles/accounts'
+      resource :statuses, only: [:show], controller: 'circles/statuses'
+    end
+
+    resources :bookmark_categories, only: [:index, :create, :show, :update, :destroy] do
+      resource :statuses, only: [:show, :create, :destroy], controller: 'bookmark_categories/statuses'
+    end
+
     namespace :featured_tags do
       get :suggestions, to: 'suggestions#index'
     end
diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index 888fa9ecb5..7b7ed21dd6 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -10,6 +10,7 @@ namespace :settings do
   namespace :preferences do
     resource :appearance, only: [:show, :update], controller: :appearance
     resource :notifications, only: [:show, :update]
+    resource :reaching, only: [:show, :update], controller: :reaching
     resource :other, only: [:show, :update], controller: :other
   end
 
@@ -62,6 +63,7 @@ namespace :settings do
   resource :migration, only: [:show, :create]
   resource :verification, only: :show
   resource :privacy, only: [:show, :update], controller: 'privacy'
+  resource :privacy_extra, only: [:show, :update], controller: 'privacy_extra'
 
   namespace :migration do
     resource :redirect, only: [:new, :create, :destroy]
diff --git a/config/settings.yml b/config/settings.yml
index 67297c26ce..eb8a733195 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -9,14 +9,20 @@ defaults: &defaults
   site_terms: ''
   site_contact_username: ''
   site_contact_email: ''
-  registrations_mode: 'open'
+  registrations_mode: 'none'
+  registrations_limit: 0
+  registrations_limit_per_day: 0
+  registrations_start_hour: 0
+  registrations_end_hour: 24
+  registrations_secondary_start_hour: 0
+  registrations_secondary_end_hour: 0
   profile_directory: true
   closed_registrations_message: ''
   timeline_preview: true
   show_staff_badge: true
   preview_sensitive_media: false
   noindex: false
-  theme: 'default'
+  theme: 'system'
   trends: true
   trends_as_landing_page: true
   trendable_by_default: false
@@ -37,7 +43,19 @@ defaults: &defaults
   show_domain_blocks_rationale: 'disabled'
   require_invite_text: false
   backups_retention_period: 7
+  delete_content_cache_without_reaction: false
   captcha_enabled: false
+  receive_other_servers_emoji_reaction: false
+  streaming_other_servers_emoji_reaction: false
+  streaming_local_emoji_reaction: true
+  enable_emoji_reaction: true
+  check_lts_version_only: true
+  enable_public_visibility: true
+  enable_public_unlisted_visibility: true
+  unlocked_friend: false
+  stranger_mention_from_local_ng: true
+  enable_local_timeline: true
+  emoji_reaction_disallow_domains: []
 
 development:
   <<: *defaults
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 3f9cbd9a7a..4b28670817 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -4,6 +4,7 @@
   - [default, 8]
   - [push, 6]
   - [ingress, 4]
+  - [perishable, 4]
   - [mailers, 2]
   - [pull]
   - [scheduler]
@@ -63,3 +64,7 @@
       interval: 30 minutes
       class: Scheduler::SoftwareUpdateCheckScheduler
       queue: scheduler
+    auto_close_registrations_scheduler:
+      interval: 1 hour
+      class: Scheduler::AutoCloseRegistrationsScheduler
+      queue: scheduler
diff --git a/config/templates/privacy-policy.md b/config/templates/privacy-policy.md
new file mode 100644
index 0000000000..9e042af80a
--- /dev/null
+++ b/config/templates/privacy-policy.md
@@ -0,0 +1,128 @@
+This privacy policy describes how %{domain}s ("%{domain}s", "we", "us")
+collects, protects and uses the personally identifiable information you may
+provide through the %{domain}s website or its API. The policy also
+describes the choices available to you regarding our use of your personal
+information and how you can access and update this information. This policy
+does not apply to the practices of companies that %{domain}s does not own
+or control, or to individuals that %{domain}s does not employ or manage.
+
+# What information do we collect?
+
+- **Basic account information**: If you register on this server, you may be
+  asked to enter a username, an e-mail address and a password. You may also
+  enter additional profile information such as a display name and biography, and
+  upload a profile picture and header image. The username, display name,
+  biography, profile picture and header image are always listed publicly.
+- **Posts, following and other public information**: The list of people you
+  follow is listed publicly, the same is true for your followers. When you
+  submit a message, the date and time is stored as well as the application you
+  submitted the message from. Messages may contain media attachments, such as
+  pictures and videos. Public and unlisted posts are available publicly. When
+  you feature a post on your profile, that is also publicly available
+  information. Your posts are delivered to your followers, in some cases it
+  means they are delivered to different servers and copies are stored there.
+  When you delete posts, this is likewise delivered to your followers. The
+  action of reblogging or favouriting another post is always public.
+- **Direct and followers-only posts**: All posts are stored and processed on the
+  server. Followers-only posts are delivered to your followers and users who are
+  mentioned in them, and direct posts are delivered only to users mentioned in
+  them. In some cases it means they are delivered to different servers and
+  copies are stored there. We make a good faith effort to limit the access to
+  those posts only to authorized persons, but other servers may fail to do so.
+  Therefore it's important to review servers your followers belong to. You may
+  toggle an option to approve and reject new followers manually in the settings.
+  **Please keep in mind that the operators of the server and any receiving
+  server may view such messages**, and that recipients may screenshot, copy or
+  otherwise re-share them. **Do not share any sensitive information over
+  Mastodon.**
+- **IPs and other metadata**: When you log in, we record the IP address you log
+  in from, as well as the name of your browser application. All the logged in
+  sessions are available for your review and revocation in the settings. The
+  latest IP address used is stored for up to 12 months. We also may retain
+  server logs which include the IP address of every request to our server.
+
+# What do we use your information for?
+
+Any of the information we collect from you may be used in the following ways:
+
+- To provide the core functionality of Mastodon. You can only interact with
+  other people's content and post your own content when you are logged in. For
+  example, you may follow other people to view their combined posts in your own
+  personalized home timeline.
+- To aid moderation of the community, for example comparing your IP address with
+  other known ones to determine ban evasion or other violations.
+- The email address you provide may be used to send you information,
+  notifications about other people interacting with your content or sending you
+  messages, and to respond to inquiries, and/or other requests or questions.
+
+# How do we protect your information?
+
+We implement a variety of security measures to maintain the safety of your
+personal information when you enter, submit, or access your personal
+information. Among other things, your browser session, as well as the traffic
+between your applications and the API, are secured with SSL, and your password
+is hashed using a strong one-way algorithm. You may enable two-factor
+authentication to further secure access to your account.
+
+# What is our data retention policy?
+
+We will make a good faith effort to:
+
+- Retain server logs containing the IP address of all requests to this server,
+  in so far as such logs are kept, no more than 90 days.
+- Retain the IP addresses associated with registered users no more than 12
+  months.
+
+You can request and download an archive of your content, including your posts,
+media attachments, profile picture, and header image.
+
+You may irreversibly delete your account at any time.
+
+# Do we use cookies?
+
+Yes. Cookies are small files that a site or its service provider transfers to
+your computer's hard drive through your Web browser (if you allow). These
+cookies enable the site to recognize your browser and, if you have a registered
+account, associate it with your registered account.
+
+We use cookies to understand and save your preferences for future visits.
+
+# Do we disclose any information to outside parties?
+
+We do not sell, trade, or otherwise transfer to outside parties your personally
+identifiable information. This does not include trusted third parties who assist
+us in operating our site, conducting our business, or servicing you, so long as
+those parties agree to keep this information confidential. We may also release
+your information when we believe release is appropriate to comply with the law,
+enforce our site policies, or protect ours or others rights, property, or
+safety.
+
+Your public content may be downloaded by other servers in the network. Your
+public and followers-only posts are delivered to the servers where your
+followers reside, and direct messages are delivered to the servers of the
+recipients, in so far as those followers or recipients reside on a different
+server than this.
+
+When you authorize an application to use your account, depending on the scope of
+permissions you approve, it may access your public profile information, your
+following list, your followers, your lists, all your posts, and your favourites.
+Applications can never access your e-mail address or password.
+
+# Site usage by children
+
+If this server is in the EU or the EEA: Our site, products and services are all
+directed to people who are at least 16 years old. If you are under the age of
+16, per the requirements of the GDPR (General Data Protection Regulation) do not
+use this site.
+
+If this server is in the USA: Our site, products and services are all directed
+to people who are at least 13 years old. If you are under the age of 13, per the
+requirements of COPPA (Children's Online Privacy Protection Act) do not use this
+site.
+
+Law requirements can be different if this server is in another jurisdiction.
+
+---
+
+This document is CC-BY-SA. Originally adapted from the [Discourse privacy
+policy](https://github.com/discourse/discourse).
diff --git a/config/themes.yml b/config/themes.yml
index 9c21c9459f..7ba74bbd35 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,3 +1,4 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+full-dark: styles/full-dark.scss
diff --git a/config/webpack/rules/index.js b/config/webpack/rules/index.js
index 4be59f1b64..b026857887 100644
--- a/config/webpack/rules/index.js
+++ b/config/webpack/rules/index.js
@@ -2,6 +2,7 @@ const babel = require('./babel');
 const css = require('./css');
 const file = require('./file');
 const materialIcons = require('./material_icons');
+const nodeModules = require('./node_modules');
 const tesseract = require('./tesseract');
 
 // Webpack loaders are processed in reverse order
@@ -12,5 +13,6 @@ module.exports = {
   file,
   tesseract,
   css,
+  nodeModules,
   babel,
 };
diff --git a/config/webpack/rules/node_modules.js b/config/webpack/rules/node_modules.js
new file mode 100644
index 0000000000..8dbf92adb7
--- /dev/null
+++ b/config/webpack/rules/node_modules.js
@@ -0,0 +1,23 @@
+const { join } = require('path');
+
+const { settings, env } = require('../configuration');
+
+module.exports = {
+  test: /\.(js|mjs)$/,
+  include: /node_modules\/@hello-pangea/,
+  use: [
+    {
+      loader: 'babel-loader',
+      options: {
+        babelrc: false,
+        plugins: [
+          'transform-react-remove-prop-types',
+        ],
+        cacheDirectory: join(settings.cache_path, 'babel-loader-node-modules'),
+        cacheCompression: env.NODE_ENV === 'production',
+        compact: false,
+        sourceMaps: false,
+      },
+    },
+  ],
+};
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 7c00d85d36..8e77a840a5 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -96,6 +96,9 @@ module.exports = {
       resolve(settings.source_path),
       'node_modules',
     ],
+    alias: {
+      "@": resolve(settings.source_path),
+    }
   },
 
   resolveLoader: {
diff --git a/config/webpacker.yml b/config/webpacker.yml
index f8462e53a0..e07f577c5e 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -2,7 +2,7 @@
 
 default: &default
   source_path: app/javascript
-  source_entry_path: packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 401b7a83b7..9764196fab 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
-MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
-                         ActiveRecord::Migration[5.0]
-                       else
-                         ActiveRecord::Migration[4.2]
-                       end
-
-class RailsSettingsMigration < MIGRATION_BASE_CLASS
+class RailsSettingsMigration < ActiveRecord::Migration[5.0]
   def self.up
     create_table :settings do |t|
       t.string     :var, null: false
diff --git a/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
index 111c48610d..398978b0d5 100644
--- a/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
+++ b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
@@ -3,6 +3,8 @@
 class AddInReplyToAccountIdToStatuses < ActiveRecord::Migration[5.0]
   def up
     add_column :statuses, :in_reply_to_account_id, :integer, null: true, default: nil
+    add_column :statuses, :searchability, :integer
+    add_column :statuses, :limited_scope, :integer
 
     ActiveRecord::Base.transaction do
       Status.unscoped.where.not(in_reply_to_id: nil).includes(:thread).find_each do |status|
@@ -12,6 +14,9 @@ class AddInReplyToAccountIdToStatuses < ActiveRecord::Migration[5.0]
         status.save(validate: false)
       end
     end
+
+    remove_column :statuses, :searchability
+    remove_column :statuses, :limited_scope
   end
 
   def down
diff --git a/db/migrate/20170317193015_add_search_index_to_accounts.rb b/db/migrate/20170317193015_add_search_index_to_accounts.rb
index e29da61b15..0edc381549 100644
--- a/db/migrate/20170317193015_add_search_index_to_accounts.rb
+++ b/db/migrate/20170317193015_add_search_index_to_accounts.rb
@@ -2,7 +2,17 @@
 
 class AddSearchIndexToAccounts < ActiveRecord::Migration[5.0]
   def up
-    execute 'CREATE INDEX search_index ON accounts USING gin((setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\')));'
+    execute <<~SQL.squish
+      CREATE INDEX search_index
+      ON accounts
+      USING gin(
+        (
+          setweight(to_tsvector('simple', accounts.display_name), 'A') ||
+          setweight(to_tsvector('simple', accounts.username), 'B') ||
+          setweight(to_tsvector('simple', coalesce(accounts.domain, '')), 'C')
+        )
+      )
+    SQL
   end
 
   def down
diff --git a/db/migrate/20170918125918_ids_to_bigints.rb b/db/migrate/20170918125918_ids_to_bigints.rb
index 83c5ab971b..64f1d0093a 100644
--- a/db/migrate/20170918125918_ids_to_bigints.rb
+++ b/db/migrate/20170918125918_ids_to_bigints.rb
@@ -7,80 +7,73 @@ class IdsToBigints < ActiveRecord::Migration[5.1]
   include Mastodon::MigrationHelpers
   include Mastodon::MigrationWarning
 
+  TABLE_COLUMN_MAPPING = [
+    [:account_domain_blocks, :account_id],
+    [:account_domain_blocks, :id],
+    [:accounts, :id],
+    [:blocks, :account_id],
+    [:blocks, :id],
+    [:blocks, :target_account_id],
+    [:conversation_mutes, :account_id],
+    [:conversation_mutes, :id],
+    [:domain_blocks, :id],
+    [:favourites, :account_id],
+    [:favourites, :id],
+    [:favourites, :status_id],
+    [:follow_requests, :account_id],
+    [:follow_requests, :id],
+    [:follow_requests, :target_account_id],
+    [:follows, :account_id],
+    [:follows, :id],
+    [:follows, :target_account_id],
+    [:imports, :account_id],
+    [:imports, :id],
+    [:media_attachments, :account_id],
+    [:media_attachments, :id],
+    [:mentions, :account_id],
+    [:mentions, :id],
+    [:mutes, :account_id],
+    [:mutes, :id],
+    [:mutes, :target_account_id],
+    [:notifications, :account_id],
+    [:notifications, :from_account_id],
+    [:notifications, :id],
+    [:oauth_access_grants, :application_id],
+    [:oauth_access_grants, :id],
+    [:oauth_access_grants, :resource_owner_id],
+    [:oauth_access_tokens, :application_id],
+    [:oauth_access_tokens, :id],
+    [:oauth_access_tokens, :resource_owner_id],
+    [:oauth_applications, :id],
+    [:oauth_applications, :owner_id],
+    [:reports, :account_id],
+    [:reports, :action_taken_by_account_id],
+    [:reports, :id],
+    [:reports, :target_account_id],
+    [:session_activations, :access_token_id],
+    [:session_activations, :user_id],
+    [:session_activations, :web_push_subscription_id],
+    [:settings, :id],
+    [:settings, :thing_id],
+    [:statuses, :account_id],
+    [:statuses, :application_id],
+    [:statuses, :in_reply_to_account_id],
+    [:stream_entries, :account_id],
+    [:stream_entries, :id],
+    [:subscriptions, :account_id],
+    [:subscriptions, :id],
+    [:tags, :id],
+    [:users, :account_id],
+    [:users, :id],
+    [:web_settings, :id],
+    [:web_settings, :user_id],
+  ].freeze
+
   disable_ddl_transaction!
 
   def migrate_columns(to_type)
-    included_columns = [
-      [:account_domain_blocks, :account_id],
-      [:account_domain_blocks, :id],
-      [:accounts, :id],
-      [:blocks, :account_id],
-      [:blocks, :id],
-      [:blocks, :target_account_id],
-      [:conversation_mutes, :account_id],
-      [:conversation_mutes, :id],
-      [:domain_blocks, :id],
-      [:favourites, :account_id],
-      [:favourites, :id],
-      [:favourites, :status_id],
-      [:follow_requests, :account_id],
-      [:follow_requests, :id],
-      [:follow_requests, :target_account_id],
-      [:follows, :account_id],
-      [:follows, :id],
-      [:follows, :target_account_id],
-      [:imports, :account_id],
-      [:imports, :id],
-      [:media_attachments, :account_id],
-      [:media_attachments, :id],
-      [:mentions, :account_id],
-      [:mentions, :id],
-      [:mutes, :account_id],
-      [:mutes, :id],
-      [:mutes, :target_account_id],
-      [:notifications, :account_id],
-      [:notifications, :from_account_id],
-      [:notifications, :id],
-      [:oauth_access_grants, :application_id],
-      [:oauth_access_grants, :id],
-      [:oauth_access_grants, :resource_owner_id],
-      [:oauth_access_tokens, :application_id],
-      [:oauth_access_tokens, :id],
-      [:oauth_access_tokens, :resource_owner_id],
-      [:oauth_applications, :id],
-      [:oauth_applications, :owner_id],
-      [:reports, :account_id],
-      [:reports, :action_taken_by_account_id],
-      [:reports, :id],
-      [:reports, :target_account_id],
-      [:session_activations, :access_token_id],
-      [:session_activations, :user_id],
-      [:session_activations, :web_push_subscription_id],
-      [:settings, :id],
-      [:settings, :thing_id],
-      [:statuses, :account_id],
-      [:statuses, :application_id],
-      [:statuses, :in_reply_to_account_id],
-      [:stream_entries, :account_id],
-      [:stream_entries, :id],
-      [:subscriptions, :account_id],
-      [:subscriptions, :id],
-      [:tags, :id],
-      [:users, :account_id],
-      [:users, :id],
-      [:web_settings, :id],
-      [:web_settings, :user_id],
-    ]
-    included_columns << [:deprecated_preview_cards, :id] if table_exists?(:deprecated_preview_cards)
+    display_warning
 
-    migration_duration_warning(<<~EXPLANATION)
-      This migration has some sections that can be safely interrupted
-      and restarted later, and will tell you when those are occurring.
-
-      For more information, see https://github.com/mastodon/mastodon/pull/5088
-    EXPLANATION
-
-    tables = included_columns.map(&:first).uniq
     table_sizes = {}
 
     # Sort tables by their size
@@ -103,6 +96,25 @@ class IdsToBigints < ActiveRecord::Migration[5.1]
     end
   end
 
+  def display_warning
+    migration_duration_warning(<<~EXPLANATION)
+      This migration has some sections that can be safely interrupted
+      and restarted later, and will tell you when those are occurring.
+
+      For more information, see https://github.com/mastodon/mastodon/pull/5088
+    EXPLANATION
+  end
+
+  def tables
+    included_columns.map(&:first).uniq
+  end
+
+  def included_columns
+    TABLE_COLUMN_MAPPING.dup.tap do |included_columns|
+      included_columns << [:deprecated_preview_cards, :id] if table_exists?(:deprecated_preview_cards)
+    end
+  end
+
   def up
     migrate_columns(:bigint)
   end
diff --git a/db/migrate/20180812173710_copy_status_stats.rb b/db/migrate/20180812173710_copy_status_stats.rb
index 52ab43b762..5933fb36d7 100644
--- a/db/migrate/20180812173710_copy_status_stats.rb
+++ b/db/migrate/20180812173710_copy_status_stats.rb
@@ -5,11 +5,15 @@ class CopyStatusStats < ActiveRecord::Migration[5.2]
 
   def up
     safety_assured do
+      add_column :statuses, :searchability, :integer
+      add_column :statuses, :limited_scope, :integer
       if supports_upsert?
         up_fast
       else
         up_slow
       end
+      remove_column :statuses, :searchability
+      remove_column :statuses, :limited_scope
     end
   end
 
@@ -20,8 +24,7 @@ class CopyStatusStats < ActiveRecord::Migration[5.2]
   private
 
   def supports_upsert?
-    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    version >= 90_500
+    ActiveRecord::Base.connection.database_version >= 90_500
   end
 
   def up_fast
diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb
index 9070200fee..e5faee0cb5 100644
--- a/db/migrate/20181116173541_copy_account_stats.rb
+++ b/db/migrate/20181116173541_copy_account_stats.rb
@@ -24,8 +24,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2]
   private
 
   def supports_upsert?
-    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    version >= 90_500
+    ActiveRecord::Base.connection.database_version >= 90_500
   end
 
   def up_fast
diff --git a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
index 3f3da937a5..76b5d54428 100644
--- a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
+++ b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
@@ -4,6 +4,8 @@ class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
+    CustomEmoji.connection.execute('CREATE TABLE IF NOT EXISTS emoji_reactions (id integer, custom_emoji_id integer, created_at timestamp NOT NULL, updated_at timestamp NOT NULL)')
+
     duplicates = CustomEmoji.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM custom_emojis GROUP BY shortcode, lower(domain) HAVING count(*) > 1').to_ary
 
     duplicates.each do |row|
@@ -11,6 +13,8 @@ class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
     end
 
     CustomEmoji.in_batches.update_all('domain = lower(domain)')
+
+    CustomEmoji.connection.execute('DROP TABLE IF EXISTS emoji_reactions')
   end
 
   def down; end
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index 3785dc2553..6871b37bdf 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -5,6 +5,8 @@ class AddInstanceActor < ActiveRecord::Migration[5.2]
     # Dummy class, to make migration possible across version changes
     validates :username, uniqueness: { scope: :domain, case_sensitive: false }
 
+    INSTANCE_ACTOR_ID = -99
+
     before_create :generate_keys
 
     def generate_keys
@@ -15,10 +17,10 @@ class AddInstanceActor < ActiveRecord::Migration[5.2]
   end
 
   def up
-    Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
+    Account.create!(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
   end
 
   def down
-    Account.find_by(id: -99, actor_type: 'Application').destroy!
+    Account.find_by(id: Account::INSTANCE_ACTOR_ID, actor_type: 'Application').destroy!
   end
 end
diff --git a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
index f2d3aa8ee8..02f073e14f 100644
--- a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
+++ b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
@@ -9,9 +9,32 @@ class AddCaseInsensitiveIndexToTags < ActiveRecord::Migration[5.2]
       redundant_tag_ids = row['ids'].split(',')[1..]
 
       safety_assured do
-        execute "UPDATE accounts_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')}) AND NOT EXISTS (SELECT t1.tag_id FROM accounts_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)"
-        execute "UPDATE statuses_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')}) AND NOT EXISTS (SELECT t1.tag_id FROM statuses_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.status_id = t0.status_id)"
-        execute "UPDATE featured_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')})  AND NOT EXISTS (SELECT t1.tag_id FROM featured_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)"
+        execute <<~SQL.squish
+          UPDATE accounts_tags
+          AS t0
+          SET tag_id = #{canonical_tag_id}
+          WHERE
+            tag_id IN (#{redundant_tag_ids.join(', ')})
+            AND NOT EXISTS (SELECT t1.tag_id FROM accounts_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE statuses_tags
+          AS t0
+          SET tag_id = #{canonical_tag_id}
+          WHERE
+            tag_id IN (#{redundant_tag_ids.join(', ')})
+            AND NOT EXISTS (SELECT t1.tag_id FROM statuses_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.status_id = t0.status_id)
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE featured_tags
+            AS t0
+            SET tag_id = #{canonical_tag_id}
+            WHERE
+              tag_id IN (#{redundant_tag_ids.join(', ')})
+              AND NOT EXISTS (SELECT t1.tag_id FROM featured_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)
+        SQL
       end
 
       Tag.where(id: redundant_tag_ids).in_batches.delete_all
diff --git a/db/migrate/20210322164601_create_account_summaries.rb b/db/migrate/20210322164601_create_account_summaries.rb
index 8d18e9eeb4..5c93291e0a 100644
--- a/db/migrate/20210322164601_create_account_summaries.rb
+++ b/db/migrate/20210322164601_create_account_summaries.rb
@@ -2,7 +2,7 @@
 
 class CreateAccountSummaries < ActiveRecord::Migration[5.2]
   def change
-    create_view :account_summaries, materialized: { no_data: true }
+    create_view :account_summaries, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
index 22c27a0e7a..3a9024ffcb 100644
--- a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
+++ b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
@@ -6,7 +6,7 @@ class UpdateFollowRecommendationsToVersion2 < ActiveRecord::Migration[6.1]
 
   def up
     drop_view :follow_recommendations
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
 
     # To be able to refresh the view concurrently,
     # at least one unique index is required
diff --git a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
index 9b475966bb..90a1b1a5cf 100644
--- a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
+++ b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
@@ -3,13 +3,26 @@
 class FixCanonicalEmailBlocksForeignKey < ActiveRecord::Migration[6.1]
   def up
     safety_assured do
-      execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id) ON DELETE CASCADE;'
+      execute <<~SQL.squish
+        ALTER TABLE canonical_email_blocks
+          DROP CONSTRAINT fk_rails_1ecb262096,
+          ADD CONSTRAINT fk_rails_1ecb262096
+            FOREIGN KEY (reference_account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
     end
   end
 
   def down
     safety_assured do
-      execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id);'
+      execute <<~SQL.squish
+        ALTER TABLE canonical_email_blocks
+          DROP CONSTRAINT fk_rails_1ecb262096,
+          ADD CONSTRAINT fk_rails_1ecb262096
+            FOREIGN KEY (reference_account_id)
+            REFERENCES accounts(id)
+      SQL
     end
   end
 end
diff --git a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
index e347a874ff..a82cf4afa2 100644
--- a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
+++ b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
@@ -4,7 +4,7 @@ class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
   def up
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 2, materialized: { no_data: true }
+      create_view :account_summaries, version: 2, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -12,7 +12,7 @@ class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
   def down
     reapplication_follow_recommendations_v2 do
       drop_view :account_summaries, materialized: true
-      create_view :account_summaries, version: 1, materialized: { no_data: true }
+      create_view :account_summaries, version: 1, materialized: true
       safety_assured { add_index :account_summaries, :account_id, unique: true }
     end
   end
@@ -20,7 +20,7 @@ class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
   def reapplication_follow_recommendations_v2
     drop_view :follow_recommendations, materialized: true
     yield
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/migrate/20220309213005_fix_reblog_deleted_at.rb b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
index e3474beeb1..7fb9bff26c 100644
--- a/db/migrate/20220309213005_fix_reblog_deleted_at.rb
+++ b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
@@ -4,7 +4,16 @@ class FixReblogDeletedAt < ActiveRecord::Migration[6.1]
   disable_ddl_transaction!
 
   def up
-    safety_assured { execute 'UPDATE statuses s SET deleted_at = r.deleted_at FROM statuses r WHERE s.reblog_of_id = r.id AND r.deleted_at IS NOT NULL' }
+    safety_assured do
+      execute <<~SQL.squish
+        UPDATE statuses s
+        SET deleted_at = r.deleted_at
+        FROM statuses r
+        WHERE
+          s.reblog_of_id = r.id
+          AND r.deleted_at IS NOT NULL
+      SQL
+    end
   end
 
   def down; end
diff --git a/db/migrate/20230215074423_move_user_settings.rb b/db/migrate/20230215074423_move_user_settings.rb
index 86231e49e8..20fd168434 100644
--- a/db/migrate/20230215074423_move_user_settings.rb
+++ b/db/migrate/20230215074423_move_user_settings.rb
@@ -7,8 +7,13 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
 
   MAPPING = {
     default_privacy: 'default_privacy',
+    default_searchability: 'default_searchability',
     default_sensitive: 'web.default_sensitive',
     default_language: 'default_language',
+    public_post_to_unlisted: 'public_post_to_unlisted',
+    reject_public_unlisted_subscription: 'reject_public_unlisted_subscription',
+    reject_unlisted_subscription: 'reject_unlisted_subscription',
+    send_without_domain_blocks: 'send_without_domain_blocks',
     noindex: 'noindex',
     theme: 'theme',
     trends: 'web.trends',
@@ -17,6 +22,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
     delete_modal: 'web.delete_modal',
     auto_play_gif: 'web.auto_play',
     display_media: 'web.display_media',
+    display_media_expand: 'web.display_media_expand',
     expand_spoilers: 'web.expand_content_warnings',
     reduce_motion: 'web.reduce_motion',
     disable_swiping: 'web.disable_swiping',
diff --git a/db/migrate/20230222232121_create_emoji_reactions.rb b/db/migrate/20230222232121_create_emoji_reactions.rb
new file mode 100644
index 0000000000..d0a4d4572e
--- /dev/null
+++ b/db/migrate/20230222232121_create_emoji_reactions.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateEmojiReactions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :emoji_reactions do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.string :name, null: false, default: ''
+      t.belongs_to :custom_emoji, foreign_key: { on_delete: :cascade }
+      t.string :uri
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230223102416_add_emoji_reactions_to_status_stats.rb b/db/migrate/20230223102416_add_emoji_reactions_to_status_stats.rb
new file mode 100644
index 0000000000..6156db26c1
--- /dev/null
+++ b/db/migrate/20230223102416_add_emoji_reactions_to_status_stats.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEmojiReactionsToStatusStats < ActiveRecord::Migration[6.1]
+  def change
+    add_column :status_stats, :emoji_reactions, :string
+  end
+end
diff --git a/db/migrate/20230308061833_add_image_size_to_custom_emojis.rb b/db/migrate/20230308061833_add_image_size_to_custom_emojis.rb
new file mode 100644
index 0000000000..02655ebff4
--- /dev/null
+++ b/db/migrate/20230308061833_add_image_size_to_custom_emojis.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddImageSizeToCustomEmojis < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :custom_emojis, bulk: true do |t|
+        t.integer :image_width
+        t.integer :image_height
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      change_table :custom_emojis, bulk: true do |t|
+        t.remove :image_width
+        t.remove :image_height
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb b/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb
new file mode 100644
index 0000000000..4712e9dd3e
--- /dev/null
+++ b/db/migrate/20230314021909_add_group_message_following_only_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupMessageFollowingOnlyToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :group_message_following_only, :boolean
+  end
+end
diff --git a/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb b/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb
new file mode 100644
index 0000000000..367e1c1d0a
--- /dev/null
+++ b/db/migrate/20230314081013_add_group_allow_private_message_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupAllowPrivateMessageToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :group_allow_private_message, :boolean
+  end
+end
diff --git a/db/migrate/20230314121142_add_group_activitypub_count_to_account_stats.rb b/db/migrate/20230314121142_add_group_activitypub_count_to_account_stats.rb
new file mode 100644
index 0000000000..d4f06bae19
--- /dev/null
+++ b/db/migrate/20230314121142_add_group_activitypub_count_to_account_stats.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddGroupActivityPubCountToAccountStats < ActiveRecord::Migration[6.1]
+  def change
+    add_column :account_stats, :group_activitypub_count, :integer
+  end
+end
diff --git a/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb b/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb
new file mode 100644
index 0000000000..9fa1e634f8
--- /dev/null
+++ b/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateScheduledExpirationStatuses < ActiveRecord::Migration[6.1]
+  def change
+    create_table :scheduled_expiration_statuses do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.datetime :scheduled_at, index: true
+
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230405121613_add_searchability_to_statuses.rb b/db/migrate/20230405121613_add_searchability_to_statuses.rb
new file mode 100644
index 0000000000..33ee7cfec5
--- /dev/null
+++ b/db/migrate/20230405121613_add_searchability_to_statuses.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSearchabilityToStatuses < ActiveRecord::Migration[6.1]
+  def change
+    add_column :statuses, :searchability, :integer
+  end
+end
diff --git a/db/migrate/20230405121625_add_searchability_to_accounts.rb b/db/migrate/20230405121625_add_searchability_to_accounts.rb
new file mode 100644
index 0000000000..e1b7a216e4
--- /dev/null
+++ b/db/migrate/20230405121625_add_searchability_to_accounts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddSearchabilityToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :accounts, :searchability, :integer, null: false, default: 0
+    end
+  end
+end
diff --git a/db/migrate/20230406041523_change_searchability_default_value.rb b/db/migrate/20230406041523_change_searchability_default_value.rb
new file mode 100644
index 0000000000..238ae2cd87
--- /dev/null
+++ b/db/migrate/20230406041523_change_searchability_default_value.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeSearchabilityDefaultValue < ActiveRecord::Migration[6.1]
+  def change
+    change_column_default :accounts, :searchability, from: 0, to: 2
+  end
+end
diff --git a/db/migrate/20230410004651_add_emoji_reactions_count_to_status_stats.rb b/db/migrate/20230410004651_add_emoji_reactions_count_to_status_stats.rb
new file mode 100644
index 0000000000..71231c37b2
--- /dev/null
+++ b/db/migrate/20230410004651_add_emoji_reactions_count_to_status_stats.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddEmojiReactionsCountToStatusStats < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :status_stats, :emoji_reactions_count, :integer, null: false, default: 0
+    end
+  end
+end
diff --git a/db/migrate/20230412005311_add_markdown_to_statuses.rb b/db/migrate/20230412005311_add_markdown_to_statuses.rb
new file mode 100644
index 0000000000..a9730796e5
--- /dev/null
+++ b/db/migrate/20230412005311_add_markdown_to_statuses.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddMarkdownToStatuses < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :statuses, :markdown, :boolean, default: false
+    end
+  end
+end
diff --git a/db/migrate/20230412073021_add_markdown_to_status_edits.rb b/db/migrate/20230412073021_add_markdown_to_status_edits.rb
new file mode 100644
index 0000000000..8dd5711487
--- /dev/null
+++ b/db/migrate/20230412073021_add_markdown_to_status_edits.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddMarkdownToStatusEdits < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :status_edits, :markdown, :boolean, default: false
+    end
+  end
+end
diff --git a/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb b/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb
new file mode 100644
index 0000000000..1725a7515e
--- /dev/null
+++ b/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddEmojiReactionsCountPerAccountToStatusStats < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :status_stats, :emoji_reaction_accounts_count, :integer, null: false, default: 0
+    end
+  end
+end
diff --git a/db/migrate/20230420081634_add_min_emojis_to_account_statuses_cleanup_policies.rb b/db/migrate/20230420081634_add_min_emojis_to_account_statuses_cleanup_policies.rb
new file mode 100644
index 0000000000..814861fab7
--- /dev/null
+++ b/db/migrate/20230420081634_add_min_emojis_to_account_statuses_cleanup_policies.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddMinEmojisToAccountStatusesCleanupPolicies < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :account_statuses_cleanup_policies, bulk: true do |t|
+        t.integer :min_emojis
+        t.boolean :keep_self_emoji, default: true, null: false
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230423002728_create_antennas.rb b/db/migrate/20230423002728_create_antennas.rb
new file mode 100644
index 0000000000..9c7e33c08a
--- /dev/null
+++ b/db/migrate/20230423002728_create_antennas.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class CreateAntennas < ActiveRecord::Migration[6.1]
+  def change
+    create_table :antennas do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :list, null: false, foreign_key: { on_delete: :cascade }
+      t.string :title, null: false, default: ''
+      t.jsonb :keywords
+      t.jsonb :exclude_keywords
+      t.boolean :any_domains, null: false, default: true, index: true
+      t.boolean :any_tags, null: false, default: true, index: true
+      t.boolean :any_accounts, null: false, default: true, index: true
+      t.boolean :any_keywords, null: false, default: true, index: true
+      t.boolean :available, null: false, default: true, index: true
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.datetime :expires_at
+    end
+    create_table :antenna_domains do |t|
+      t.belongs_to :antenna, null: false, foreign_key: { on_delete: :cascade }
+      t.string :name, index: true
+      t.boolean :exclude, null: false, default: false, index: true
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+    create_table :antenna_tags do |t|
+      t.belongs_to :antenna, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :tag, null: false, foreign_key: { on_delete: :cascade }
+      t.boolean :exclude, null: false, default: false, index: true
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+    create_table :antenna_accounts do |t|
+      t.belongs_to :antenna, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.boolean :exclude, null: false, default: false, index: true
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230423233429_add_dissubscribable_to_accounts.rb b/db/migrate/20230423233429_add_dissubscribable_to_accounts.rb
new file mode 100644
index 0000000000..3735e36100
--- /dev/null
+++ b/db/migrate/20230423233429_add_dissubscribable_to_accounts.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddDissubscribableToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :antennas, :with_media_only, :boolean, null: false, default: false
+      add_index :antennas, :with_media_only
+      add_column :accounts, :dissubscribable, :boolean, null: false, default: false
+    end
+  end
+end
diff --git a/db/migrate/20230426013738_add_excludes_to_antennas.rb b/db/migrate/20230426013738_add_excludes_to_antennas.rb
new file mode 100644
index 0000000000..33a7d16874
--- /dev/null
+++ b/db/migrate/20230426013738_add_excludes_to_antennas.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddExcludesToAntennas < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :antennas, bulk: true do |t|
+        t.jsonb :exclude_domains
+        t.jsonb :exclude_accounts
+        t.jsonb :exclude_tags
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      change_table :antennas, bulk: true do |t|
+        t.remove :exclude_domains
+        t.remove :exclude_accounts
+        t.remove :exclude_tags
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230427022606_add_reject_favourite_to_domain_blocks.rb b/db/migrate/20230427022606_add_reject_favourite_to_domain_blocks.rb
new file mode 100644
index 0000000000..2d7ce13b6a
--- /dev/null
+++ b/db/migrate/20230427022606_add_reject_favourite_to_domain_blocks.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddRejectFavouriteToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.boolean :reject_favourite, null: false, default: false
+        t.boolean :reject_reply, null: false, default: false
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230427072650_add_reject_sending_to_domain_blocks.rb b/db/migrate/20230427072650_add_reject_sending_to_domain_blocks.rb
new file mode 100644
index 0000000000..fbb398edf1
--- /dev/null
+++ b/db/migrate/20230427072650_add_reject_sending_to_domain_blocks.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AddRejectSendingToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.boolean :reject_send_not_public_searchability, null: false, default: false
+        t.boolean :reject_send_unlisted_dissubscribable, null: false, default: false
+        t.boolean :reject_send_public_unlisted, null: false, default: false
+        t.boolean :reject_send_dissubscribable, null: false, default: false
+        t.boolean :reject_send_media, null: false, default: false
+        t.boolean :reject_send_sensitive, null: false, default: false
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.remove :reject_send_not_public_searchability
+        t.remove :reject_send_unlisted_dissubscribable
+        t.remove :reject_send_public_unlisted
+        t.remove :reject_send_dissubscribable
+        t.remove :reject_send_media
+        t.remove :reject_send_sensitive
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230427122753_add_some_to_domain_blocks.rb b/db/migrate/20230427122753_add_some_to_domain_blocks.rb
new file mode 100644
index 0000000000..ca2a1876a6
--- /dev/null
+++ b/db/migrate/20230427122753_add_some_to_domain_blocks.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddSomeToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.boolean :reject_hashtag, null: false, default: false
+        t.boolean :reject_straight_follow, null: false, default: false
+        t.boolean :reject_new_follow, null: false, default: false
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.remove :reject_hashtag
+        t.remove :reject_straight_follow
+        t.remove :reject_new_follow
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230427233749_add_hidden_to_domain_blocks.rb b/db/migrate/20230427233749_add_hidden_to_domain_blocks.rb
new file mode 100644
index 0000000000..37511b314f
--- /dev/null
+++ b/db/migrate/20230427233749_add_hidden_to_domain_blocks.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddHiddenToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.boolean :hidden, null: false, default: false
+        t.boolean :hidden_anonymous, null: false, default: false
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      change_table :domain_blocks, bulk: true do |t|
+        t.remove :hidden
+        t.remove :hidden_anonymous
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb b/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb
new file mode 100644
index 0000000000..43c7df805d
--- /dev/null
+++ b/db/migrate/20230428111230_add_emoji_reaction_streaming_to_accounts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddEmojiReactionStreamingToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, default: false
+    end
+  end
+end
diff --git a/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb b/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb
new file mode 100644
index 0000000000..cf63d2f25e
--- /dev/null
+++ b/db/migrate/20230430110057_add_reject_invalid_subscription_to_domain_blocks.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddRejectInvalidSubscriptionToDomainBlocks < ActiveRecord::Migration[6.1]
+  def up
+    safety_assured do
+      remove_column :domain_blocks, :reject_send_unlisted_dissubscribable
+
+      change_table :domain_blocks do |t|
+        t.boolean :detect_invalid_subscription, null: false, default: false
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      remove_column :domain_blocks, :detect_invalid_subscription
+
+      change_table :domain_blocks do |t|
+        t.boolean :reject_send_unlisted_dissubscribable, null: false, default: false
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230509045358_change_antennas_list_to_nullable.rb b/db/migrate/20230509045358_change_antennas_list_to_nullable.rb
new file mode 100644
index 0000000000..bb962fc625
--- /dev/null
+++ b/db/migrate/20230509045358_change_antennas_list_to_nullable.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ChangeAntennasListToNullable < ActiveRecord::Migration[6.1]
+  def up
+    safety_assured do
+      remove_foreign_key :antennas, :lists
+    end
+  end
+
+  def down
+    safety_assured do
+      add_foreign_key :antennas, :lists
+    end
+  end
+end
diff --git a/db/migrate/20230510000439_add_stl_to_antennas.rb b/db/migrate/20230510000439_add_stl_to_antennas.rb
new file mode 100644
index 0000000000..3d4ec6d3be
--- /dev/null
+++ b/db/migrate/20230510000439_add_stl_to_antennas.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddStlToAntennas < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :antennas, :stl, :boolean, null: false, default: false
+      add_index :antennas, :stl
+    end
+  end
+end
diff --git a/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb b/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb
new file mode 100644
index 0000000000..3bc96d3893
--- /dev/null
+++ b/db/migrate/20230510004621_remove_stop_emoji_reaction_streaming_from_accounts.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveStopEmojiReactionStreamingFromAccounts < ActiveRecord::Migration[6.1]
+  def up
+    safety_assured do
+      remove_column :accounts, :stop_emoji_reaction_streaming
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column :accounts, :stop_emoji_reaction_streaming, :boolean, null: true, default: false
+    end
+  end
+end
diff --git a/db/migrate/20230510033040_add_ignore_reblog_to_antennas.rb b/db/migrate/20230510033040_add_ignore_reblog_to_antennas.rb
new file mode 100644
index 0000000000..f6667e45cf
--- /dev/null
+++ b/db/migrate/20230510033040_add_ignore_reblog_to_antennas.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddIgnoreReblogToAntennas < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :antennas, :ignore_reblog, :boolean, null: false, default: false
+      add_index :antennas, :ignore_reblog
+    end
+  end
+end
diff --git a/db/migrate/20230512122757_add_reject_reply_exclude_followers_to_domain_blocks.rb b/db/migrate/20230512122757_add_reject_reply_exclude_followers_to_domain_blocks.rb
new file mode 100644
index 0000000000..22e6787917
--- /dev/null
+++ b/db/migrate/20230512122757_add_reject_reply_exclude_followers_to_domain_blocks.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddRejectReplyExcludeFollowersToDomainBlocks < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :domain_blocks do |t|
+        t.boolean :reject_reply_exclude_followers, null: false, default: false
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230514030455_add_settings_to_accounts.rb b/db/migrate/20230514030455_add_settings_to_accounts.rb
new file mode 100644
index 0000000000..98d9a8195b
--- /dev/null
+++ b/db/migrate/20230514030455_add_settings_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSettingsToAccounts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :accounts, :settings, :jsonb
+  end
+end
diff --git a/db/migrate/20230521122642_add_aliases_to_custom_emoji.rb b/db/migrate/20230521122642_add_aliases_to_custom_emoji.rb
new file mode 100644
index 0000000000..3717f4172c
--- /dev/null
+++ b/db/migrate/20230521122642_add_aliases_to_custom_emoji.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAliasesToCustomEmoji < ActiveRecord::Migration[6.1]
+  def change
+    add_column :custom_emojis, :aliases, :jsonb
+  end
+end
diff --git a/db/migrate/20230522082252_add_is_sensitive_to_custom_emojis.rb b/db/migrate/20230522082252_add_is_sensitive_to_custom_emojis.rb
new file mode 100644
index 0000000000..683133de4b
--- /dev/null
+++ b/db/migrate/20230522082252_add_is_sensitive_to_custom_emojis.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddIsSensitiveToCustomEmojis < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      change_table :custom_emojis do |t|
+        t.boolean :is_sensitive, null: false, default: false
+      end
+    end
+  end
+end
diff --git a/db/migrate/20230522093135_add_license_to_custom_emojis.rb b/db/migrate/20230522093135_add_license_to_custom_emojis.rb
new file mode 100644
index 0000000000..9e96552023
--- /dev/null
+++ b/db/migrate/20230522093135_add_license_to_custom_emojis.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLicenseToCustomEmojis < ActiveRecord::Migration[6.1]
+  def change
+    add_column :custom_emojis, :license, :string, null: true
+  end
+end
diff --git a/db/migrate/20230705232953_create_status_references.rb b/db/migrate/20230705232953_create_status_references.rb
new file mode 100644
index 0000000000..88669fda06
--- /dev/null
+++ b/db/migrate/20230705232953_create_status_references.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateStatusReferences < ActiveRecord::Migration[6.1]
+  def change
+    create_table :status_references do |t|
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :target_status, null: false, foreign_key: { on_delete: :cascade, to_table: :statuses }
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230706031715_add_status_referred_by_count_to_status_stats.rb b/db/migrate/20230706031715_add_status_referred_by_count_to_status_stats.rb
new file mode 100644
index 0000000000..8836079984
--- /dev/null
+++ b/db/migrate/20230706031715_add_status_referred_by_count_to_status_stats.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddStatusReferredByCountToStatusStats < ActiveRecord::Migration[6.1]
+  def up
+    safety_assured do
+      add_column :status_stats, :status_referred_by_count, :integer, null: false, default: 0
+    end
+  end
+
+  def down
+    remove_column :status_stats, :status_referred_by_count
+  end
+end
diff --git a/db/migrate/20230714004824_add_exclude_options_to_filters.rb b/db/migrate/20230714004824_add_exclude_options_to_filters.rb
new file mode 100644
index 0000000000..07ca56eb06
--- /dev/null
+++ b/db/migrate/20230714004824_add_exclude_options_to_filters.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddExcludeOptionsToFilters < ActiveRecord::Migration[6.1]
+  def change
+    safety_assured do
+      add_column :custom_filters, :exclude_follows, :boolean, null: false, default: false
+      add_column :custom_filters, :exclude_localusers, :boolean, null: false, default: false
+      change_column_default :custom_filter_keywords, :whole_word, from: true, to: false
+    end
+  end
+end
diff --git a/db/migrate/20230804222017_create_instance_infoes.rb b/db/migrate/20230804222017_create_instance_infoes.rb
new file mode 100644
index 0000000000..c1d1ccbdc9
--- /dev/null
+++ b/db/migrate/20230804222017_create_instance_infoes.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateInstanceInfoes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :instance_infos do |t|
+      t.string :domain, null: false, default: '', index: { unique: true }
+      t.string :software, null: false, default: ''
+      t.string :version, null: false, default: ''
+      t.jsonb :data, null: false, default: {}
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230812083752_create_status_capability_token.rb b/db/migrate/20230812083752_create_status_capability_token.rb
new file mode 100644
index 0000000000..f4deaa9c9e
--- /dev/null
+++ b/db/migrate/20230812083752_create_status_capability_token.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateStatusCapabilityToken < ActiveRecord::Migration[7.0]
+  def change
+    create_table :status_capability_tokens do |t|
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.string :token
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230812130612_add_limited_scope_to_statuses.rb b/db/migrate/20230812130612_add_limited_scope_to_statuses.rb
new file mode 100644
index 0000000000..b11e0862be
--- /dev/null
+++ b/db/migrate/20230812130612_add_limited_scope_to_statuses.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLimitedScopeToStatuses < ActiveRecord::Migration[7.0]
+  def change
+    add_column :statuses, :limited_scope, :integer
+  end
+end
diff --git a/db/migrate/20230818141056_create_global_follow_recommendations.rb b/db/migrate/20230818141056_create_global_follow_recommendations.rb
index b88c71b9d7..1a3f23d228 100644
--- a/db/migrate/20230818141056_create_global_follow_recommendations.rb
+++ b/db/migrate/20230818141056_create_global_follow_recommendations.rb
@@ -2,7 +2,7 @@
 
 class CreateGlobalFollowRecommendations < ActiveRecord::Migration[7.0]
   def change
-    create_view :global_follow_recommendations, materialized: { no_data: true }
+    create_view :global_follow_recommendations, materialized: true
     safety_assured { add_index :global_follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/migrate/20230819084858_add_no_insert_feeds_to_antennas.rb b/db/migrate/20230819084858_add_no_insert_feeds_to_antennas.rb
new file mode 100644
index 0000000000..9e60137a77
--- /dev/null
+++ b/db/migrate/20230819084858_add_no_insert_feeds_to_antennas.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddNoInsertFeedsToAntennas < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class Antenna < ApplicationRecord
+  end
+
+  def up
+    safety_assured do
+      add_column :antennas, :insert_feeds, :boolean, default: false, null: false
+      Antenna.where(insert_feeds: false).update_all(insert_feeds: true)
+    end
+  end
+
+  def down
+    remove_column :antennas, :insert_feeds
+  end
+end
diff --git a/db/migrate/20230821061713_create_circles.rb b/db/migrate/20230821061713_create_circles.rb
new file mode 100644
index 0000000000..c91e0fc13e
--- /dev/null
+++ b/db/migrate/20230821061713_create_circles.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CreateCircles < ActiveRecord::Migration[7.0]
+  def change
+    create_table :circles do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.string :title, null: false, default: ''
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+    create_table :circle_accounts do |t|
+      t.belongs_to :circle, null: true, foreign_key: { on_delete: :cascade }
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :follow, null: false, foreign_key: { on_delete: :cascade }
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+
+    add_index :circle_accounts, [:circle_id, :account_id], unique: true
+  end
+end
diff --git a/db/migrate/20230822041804_add_antenna_elements_uniqueness.rb b/db/migrate/20230822041804_add_antenna_elements_uniqueness.rb
new file mode 100644
index 0000000000..6654180efd
--- /dev/null
+++ b/db/migrate/20230822041804_add_antenna_elements_uniqueness.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddAntennaElementsUniqueness < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_index :antenna_accounts, [:antenna_id, :account_id], unique: true
+      add_index :antenna_domains, [:antenna_id, :name], unique: true
+      add_index :antenna_tags, [:antenna_id, :tag_id], unique: true
+    end
+  end
+end
diff --git a/db/migrate/20230826023400_create_bookmark_categories.rb b/db/migrate/20230826023400_create_bookmark_categories.rb
new file mode 100644
index 0000000000..17da42fbd1
--- /dev/null
+++ b/db/migrate/20230826023400_create_bookmark_categories.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class CreateBookmarkCategories < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    create_table :bookmark_categories do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }
+      t.string :title, null: false, default: ''
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+    create_table :bookmark_category_statuses do |t|
+      t.belongs_to :bookmark_category, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+      t.belongs_to :bookmark, null: true, foreign_key: { on_delete: :cascade }
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+
+    add_index :bookmark_category_statuses, [:bookmark_category_id, :status_id], unique: true, algorithm: :concurrently, name: 'index_bc_statuses'
+  end
+end
diff --git a/db/migrate/20230911022527_add_ltl_to_antennas.rb b/db/migrate/20230911022527_add_ltl_to_antennas.rb
new file mode 100644
index 0000000000..6a83839ab6
--- /dev/null
+++ b/db/migrate/20230911022527_add_ltl_to_antennas.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddLtlToAntennas < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :antennas, :ltl, :boolean, default: false, null: false
+    end
+  end
+end
diff --git a/db/migrate/20230919232836_add_attribute_to_status_references.rb b/db/migrate/20230919232836_add_attribute_to_status_references.rb
new file mode 100644
index 0000000000..ea77b3eddb
--- /dev/null
+++ b/db/migrate/20230919232836_add_attribute_to_status_references.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddAttributeToStatusReferences < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :status_references, :attribute_type, :string
+    end
+  end
+end
diff --git a/db/migrate/20230923103430_create_circle_statuses.rb b/db/migrate/20230923103430_create_circle_statuses.rb
new file mode 100644
index 0000000000..9c14bb808a
--- /dev/null
+++ b/db/migrate/20230923103430_create_circle_statuses.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class CreateCircleStatuses < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      create_table :circle_statuses do |t|
+        t.belongs_to :circle, null: true, foreign_key: { on_delete: :cascade }
+        t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+        t.datetime :created_at, null: false
+        t.datetime :updated_at, null: false
+      end
+
+      add_index :circle_statuses, [:circle_id, :status_id], unique: true
+    end
+  end
+end
diff --git a/db/migrate/20230930233930_add_quote_to_status_references.rb b/db/migrate/20230930233930_add_quote_to_status_references.rb
new file mode 100644
index 0000000000..ed9cc1cb00
--- /dev/null
+++ b/db/migrate/20230930233930_add_quote_to_status_references.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddQuoteToStatusReferences < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class StatusReference < ApplicationRecord; end
+
+  def up
+    safety_assured do
+      add_column :status_references, :quote, :boolean, default: false, null: false
+      StatusReference.where(attribute_type: 'QT').update_all(quote: true)
+    end
+  end
+
+  def down
+    safety_assured do
+      remove_column :status_references, :quote
+    end
+  end
+end
diff --git a/db/migrate/20231001031337_add_quote_to_statuses.rb b/db/migrate/20231001031337_add_quote_to_statuses.rb
new file mode 100644
index 0000000000..cd484b61dc
--- /dev/null
+++ b/db/migrate/20231001031337_add_quote_to_statuses.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddQuoteToStatuses < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class StatusReference < ApplicationRecord
+    belongs_to :status
+    belongs_to :target_status, class_name: 'Status'
+  end
+
+  def up
+    safety_assured do
+      add_column :statuses, :quote_of_id, :bigint, default: nil, null: true
+
+      StatusReference.transaction do
+        StatusReference.where(quote: true).includes(:status).find_each do |ref|
+          ref.status.update(quote_of_id: ref.target_status_id)
+        end
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      remove_column :statuses, :quote_of_id
+    end
+  end
+end
diff --git a/db/migrate/20231001050733_add_with_quote_to_custom_filters.rb b/db/migrate/20231001050733_add_with_quote_to_custom_filters.rb
new file mode 100644
index 0000000000..f732c38b13
--- /dev/null
+++ b/db/migrate/20231001050733_add_with_quote_to_custom_filters.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddWithQuoteToCustomFilters < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :custom_filters, :with_quote, :boolean, default: true, null: false
+    end
+  end
+end
diff --git a/db/migrate/20231005074832_create_friend_domains.rb b/db/migrate/20231005074832_create_friend_domains.rb
new file mode 100644
index 0000000000..95eaf8a74c
--- /dev/null
+++ b/db/migrate/20231005074832_create_friend_domains.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class CreateFriendDomains < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    create_table :friend_domains do |t|
+      t.string :domain, null: false, default: '', index: { unique: true }
+      t.string :inbox_url, null: false, default: '', index: { unique: true }
+      t.integer :active_state, null: false, default: 0
+      t.integer :passive_state, null: false, default: 0
+      t.string :active_follow_activity_id, null: true
+      t.string :passive_follow_activity_id, null: true
+      t.boolean :available, null: false, default: true
+      t.boolean :pseudo_relay, null: false, default: false
+      t.boolean :unlocked, null: false, default: false
+      t.boolean :allow_all_posts, null: false, default: true
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20231006030102_add_reject_friend_to_domain_blocks.rb b/db/migrate/20231006030102_add_reject_friend_to_domain_blocks.rb
new file mode 100644
index 0000000000..cc91b4a416
--- /dev/null
+++ b/db/migrate/20231006030102_add_reject_friend_to_domain_blocks.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddRejectFriendToDomainBlocks < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :domain_blocks, :reject_friend, :boolean, default: false, null: false
+    end
+  end
+end
diff --git a/db/migrate/20231007090808_improve_search_for_account_statuses.rb b/db/migrate/20231007090808_improve_search_for_account_statuses.rb
new file mode 100644
index 0000000000..e1817ed95c
--- /dev/null
+++ b/db/migrate/20231007090808_improve_search_for_account_statuses.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class ImproveSearchForAccountStatuses < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_index :statuses, [:account_id, :reblog_of_id, :deleted_at, :searchability], name: 'index_statuses_for_get_following_accounts_to_search', where: 'deleted_at IS NULL AND reblog_of_id IS NULL AND searchability IN (0, 10, 1)'
+    end
+  end
+end
diff --git a/db/migrate/20231009235215_add_delivery_local_to_friend_domains.rb b/db/migrate/20231009235215_add_delivery_local_to_friend_domains.rb
new file mode 100644
index 0000000000..f15ce432e0
--- /dev/null
+++ b/db/migrate/20231009235215_add_delivery_local_to_friend_domains.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddDeliveryLocalToFriendDomains < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column :friend_domains, :delivery_local, :boolean, default: true, null: false
+      remove_column :friend_domains, :unlocked
+    end
+  end
+
+  def down
+    safety_assured do
+      remove_column :friend_domains, :delivery_local
+      add_column :friend_domains, :unlocked, :boolean, default: false, null: false
+    end
+  end
+end
diff --git a/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb b/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb
new file mode 100644
index 0000000000..2e608eeade
--- /dev/null
+++ b/db/migrate/20231018192110_add_index_to_webauthn_credentials_user_id_nickname.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToWebauthnCredentialsUserIdNickname < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :webauthn_credentials, [:user_id, :nickname], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :webauthn_credentials, [:user_id, :nickname]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM webauthn_credentials
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(user_id, nickname) id FROM webauthn_credentials
+          ORDER BY user_id, nickname, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb b/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb
new file mode 100644
index 0000000000..4d9036fdf8
--- /dev/null
+++ b/db/migrate/20231018193209_add_index_to_account_alias_uri_account_id.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToAccountAliasUriAccountId < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :account_aliases, [:account_id, :uri], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :account_aliases, [:account_id, :uri]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM account_aliases
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(account_id, uri) id FROM account_aliases
+          ORDER BY account_id, uri, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb b/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb
new file mode 100644
index 0000000000..4a23a8a943
--- /dev/null
+++ b/db/migrate/20231018193355_add_index_to_custom_filter_statuses_status_custom_filter.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToCustomFilterStatusesStatusCustomFilter < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :custom_filter_statuses, [:status_id, :custom_filter_id], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :custom_filter_statuses, [:status_id, :custom_filter_id]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM custom_filter_statuses
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(status_id, custom_filter_id) id FROM custom_filter_statuses
+          ORDER BY status_id, custom_filter_id, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb b/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb
new file mode 100644
index 0000000000..f0ba08b57b
--- /dev/null
+++ b/db/migrate/20231018193659_add_index_to_identities_uid_provider.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddIndexToIdentitiesUidProvider < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index_to_table
+  rescue ActiveRecord::RecordNotUnique
+    remove_duplicates_and_reindex
+  end
+
+  def down
+    remove_index_from_table
+  end
+
+  private
+
+  def remove_duplicates_and_reindex
+    deduplicate_records
+    reindex_records
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def reindex_records
+    remove_index_from_table
+    add_index_to_table
+  end
+
+  def add_index_to_table
+    add_index :identities, [:uid, :provider], unique: true, algorithm: :concurrently
+  end
+
+  def remove_index_from_table
+    remove_index :identities, [:uid, :provider]
+  end
+
+  def deduplicate_records
+    safety_assured do
+      execute <<~SQL.squish
+        DELETE FROM identities
+          WHERE id NOT IN (
+          SELECT DISTINCT ON(uid, provider) id FROM identities
+          ORDER BY uid, provider, id ASC
+        )
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20231023083359_convert_dtl_force_settings.rb b/db/migrate/20231023083359_convert_dtl_force_settings.rb
new file mode 100644
index 0000000000..165b73671e
--- /dev/null
+++ b/db/migrate/20231023083359_convert_dtl_force_settings.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class ConvertDtlForceSettings < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class User < ApplicationRecord; end
+
+  def up
+    safety_assured do
+      User.transaction do
+        User.find_in_batches do |users|
+          users.filter { |user| user.settings.present? }.each do |user|
+            json = Oj.load(user.settings, symbol_keys: true)
+            dtl_force_with_tag = json.delete(:dtl_force_with_tag)
+            next if dtl_force_with_tag.blank?
+
+            json[:dtl_force_visibility] = dtl_force_with_tag == 'full' ? 'unlisted' : 'unchange'
+            json[:dtl_force_searchability] = dtl_force_with_tag == 'none' ? 'unchange' : 'public'
+            user.update(settings: Oj.dump(json))
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      User.transaction do
+        User.find_in_batches do |users|
+          users.filter { |user| user.settings.present? }.each do |user|
+            json = Oj.load(user.settings, symbol_keys: true)
+            dtl_force_visibility = json.delete(:dtl_force_visibility)
+            dtl_force_searchability = json.delete(:dtl_force_searchability)
+            next unless dtl_force_visibility.present? || dtl_force_searchability.present?
+
+            json[:dtl_force_with_tag] = case dtl_force_visibility
+                                        when 'unlisted'
+                                          'full'
+                                        else
+                                          dtl_force_searchability == 'unchange' ? 'none' : 'searchability'
+                                        end
+            user.update(settings: Oj.dump(json))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20231028004612_create_list_statuses.rb b/db/migrate/20231028004612_create_list_statuses.rb
new file mode 100644
index 0000000000..30cd2da9df
--- /dev/null
+++ b/db/migrate/20231028004612_create_list_statuses.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class CreateListStatuses < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      create_table :list_statuses do |t|
+        t.belongs_to :list, null: false, foreign_key: { on_delete: :cascade }
+        t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }
+        t.datetime :created_at, null: false
+        t.datetime :updated_at, null: false
+      end
+
+      add_index :list_statuses, [:list_id, :status_id], unique: true
+    end
+  end
+end
diff --git a/db/migrate/20231028005948_add_notify_to_list.rb b/db/migrate/20231028005948_add_notify_to_list.rb
new file mode 100644
index 0000000000..cdaa6f6e3a
--- /dev/null
+++ b/db/migrate/20231028005948_add_notify_to_list.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddNotifyToList < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :lists, :notify, :boolean, default: false, null: false
+    end
+  end
+end
diff --git a/db/migrate/20231105225839_add_master_settings_to_accounts.rb b/db/migrate/20231105225839_add_master_settings_to_accounts.rb
new file mode 100644
index 0000000000..b639dd737e
--- /dev/null
+++ b/db/migrate/20231105225839_add_master_settings_to_accounts.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddMasterSettingsToAccounts < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class Account < ApplicationRecord; end
+
+  def up
+    safety_assured do
+      add_column :accounts, :master_settings, :jsonb
+
+      ActiveRecord::Base.connection.execute("UPDATE accounts SET master_settings = json_build_object('subscription_policy', 'block') WHERE accounts.dissubscribable IS TRUE")
+      ActiveRecord::Base.connection.execute("UPDATE accounts SET master_settings = json_build_object('subscription_policy', 'allow') WHERE accounts.dissubscribable IS FALSE")
+
+      remove_column :accounts, :dissubscribable
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column :accounts, :dissubscribable, :boolean, default: false, null: false
+
+      ActiveRecord::Base.connection.execute("UPDATE accounts SET dissubscribable = TRUE WHERE master_settings ->> 'subscription_policy' = 'block'")
+      ActiveRecord::Base.connection.execute("UPDATE accounts SET dissubscribable = FALSE WHERE master_settings ->> 'subscription_policy' = 'allow'")
+
+      remove_column :accounts, :master_settings
+    end
+  end
+end
diff --git a/db/migrate/20231115001356_add_inbox_url_to_conversations.rb b/db/migrate/20231115001356_add_inbox_url_to_conversations.rb
new file mode 100644
index 0000000000..9dccb633b3
--- /dev/null
+++ b/db/migrate/20231115001356_add_inbox_url_to_conversations.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddInboxURLToConversations < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      add_column :conversations, :inbox_url, :string, default: nil, null: true
+      add_column :conversations, :ancestor_status_id, :bigint, default: nil, null: true
+    end
+  end
+end
diff --git a/db/migrate/20231130031209_add_index_on_conversations_ancestor_status_id.rb b/db/migrate/20231130031209_add_index_on_conversations_ancestor_status_id.rb
new file mode 100644
index 0000000000..20d86c6dfa
--- /dev/null
+++ b/db/migrate/20231130031209_add_index_on_conversations_ancestor_status_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexOnConversationsAncestorStatusId < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :conversations, :ancestor_status_id, where: 'ancestor_status_id IS NOT NULL', algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20231130083634_add_index_on_statuses_conversation_id.rb b/db/migrate/20231130083634_add_index_on_statuses_conversation_id.rb
new file mode 100644
index 0000000000..171be04fd7
--- /dev/null
+++ b/db/migrate/20231130083634_add_index_on_statuses_conversation_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexOnStatusesConversationId < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :conversation_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20231210154528_add_otp_secret_to_user.rb b/db/migrate/20231210154528_add_otp_secret_to_user.rb
new file mode 100644
index 0000000000..b2ce0a4f79
--- /dev/null
+++ b/db/migrate/20231210154528_add_otp_secret_to_user.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddOtpSecretToUser < ActiveRecord::Migration[7.1]
+  def change
+    add_column :users, :otp_secret, :string
+  end
+end
diff --git a/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb b/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb
new file mode 100644
index 0000000000..5902df0802
--- /dev/null
+++ b/db/migrate/20231212225737_improve_index_for_public_timeline_speed.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class ImproveIndexForPublicTimelineSpeed < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def up
+    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20231213, algorithm: :concurrently, order: { id: :desc },
+                                             where: '(local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
+    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20231213, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
+    remove_index :statuses, name: :index_statuses_local_20190824
+    remove_index :statuses, name: :index_statuses_public_20200119
+  end
+
+  def down
+    add_index :statuses, [:id, :account_id], name: :index_statuses_local_20190824, algorithm: :concurrently, order: { id: :desc }, where: '(local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
+    add_index :statuses, [:id, :account_id], name: :index_statuses_public_20200119, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))'
+    remove_index :statuses, name: :index_statuses_local_20231213
+    remove_index :statuses, name: :index_statuses_public_20231213
+  end
+end
diff --git a/db/migrate/20231214225249_index_to_statuses_url.rb b/db/migrate/20231214225249_index_to_statuses_url.rb
new file mode 100644
index 0000000000..ab3eff41ab
--- /dev/null
+++ b/db/migrate/20231214225249_index_to_statuses_url.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class IndexToStatusesURL < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    add_index :statuses, :url, name: :index_statuses_on_url, algorithm: :concurrently, opclass: :text_pattern_ops, where: 'url IS NOT NULL AND url <> uri'
+  end
+
+  def down
+    remove_index :statuses, name: :index_statuses_on_url
+  end
+end
diff --git a/db/migrate/20240109035435_remove_hidden_anonymous_from_domain_blocks.rb b/db/migrate/20240109035435_remove_hidden_anonymous_from_domain_blocks.rb
new file mode 100644
index 0000000000..d1272cd79f
--- /dev/null
+++ b/db/migrate/20240109035435_remove_hidden_anonymous_from_domain_blocks.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class RemoveHiddenAnonymousFromDomainBlocks < ActiveRecord::Migration[7.0]
+  class DomainBlock < ApplicationRecord; end
+
+  def up
+    safety_assured do
+      DomainBlock.where(hidden_anonymous: true, hidden: false).update_all(hidden: true)
+      remove_column :domain_blocks, :hidden_anonymous
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column :domain_blocks, :hidden_anonymous, :boolean, null: false, default: false
+    end
+  end
+end
diff --git a/db/migrate/20240111033014_create_generated_annual_reports.rb b/db/migrate/20240111033014_create_generated_annual_reports.rb
new file mode 100644
index 0000000000..2a755fb14e
--- /dev/null
+++ b/db/migrate/20240111033014_create_generated_annual_reports.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateGeneratedAnnualReports < ActiveRecord::Migration[7.1]
+  def change
+    create_table :generated_annual_reports do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_cascade: :delete }, index: false
+      t.integer :year, null: false
+      t.jsonb :data, null: false
+      t.integer :schema_version, null: false
+      t.datetime :viewed_at
+
+      t.timestamps
+    end
+
+    add_index :generated_annual_reports, [:account_id, :year], unique: true
+  end
+end
diff --git a/db/migrate/20240117021025_remove_unused_table.rb b/db/migrate/20240117021025_remove_unused_table.rb
new file mode 100644
index 0000000000..945c704f70
--- /dev/null
+++ b/db/migrate/20240117021025_remove_unused_table.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class RemoveUnusedTable < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      execute('DROP TABLE IF EXISTS account_groups CASCADE')
+      execute('ALTER TABLE status_stats DROP COLUMN IF EXISTS test')
+    end
+  end
+
+  def down; end
+end
diff --git a/db/migrate/20240121231131_add_block_trends_to_domain_blocks.rb b/db/migrate/20240121231131_add_block_trends_to_domain_blocks.rb
new file mode 100644
index 0000000000..98c832dbd6
--- /dev/null
+++ b/db/migrate/20240121231131_add_block_trends_to_domain_blocks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddBlockTrendsToDomainBlocks < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_column :domain_blocks, :block_trends, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20240212224800_add_uri_to_favourites.rb b/db/migrate/20240212224800_add_uri_to_favourites.rb
new file mode 100644
index 0000000000..c718b5419d
--- /dev/null
+++ b/db/migrate/20240212224800_add_uri_to_favourites.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddUriToFavourites < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_column :favourites, :uri, :string
+    add_index :favourites, :uri, unique: true, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20240216042730_create_ngword_histories.rb b/db/migrate/20240216042730_create_ngword_histories.rb
new file mode 100644
index 0000000000..46cedbed73
--- /dev/null
+++ b/db/migrate/20240216042730_create_ngword_histories.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateNgwordHistories < ActiveRecord::Migration[7.1]
+  def change
+    create_table :ngword_histories do |t|
+      t.string :uri, null: false
+      t.integer :target_type, null: false
+      t.integer :reason, null: false
+      t.string :text, null: false
+      t.string :keyword, null: false
+
+      t.timestamps
+    end
+
+    add_index :ngword_histories, [:uri, :keyword, :created_at], unique: false
+  end
+end
diff --git a/db/migrate/20240217022038_add_count_to_ngword_histories.rb b/db/migrate/20240217022038_add_count_to_ngword_histories.rb
new file mode 100644
index 0000000000..ca3909bb45
--- /dev/null
+++ b/db/migrate/20240217022038_add_count_to_ngword_histories.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddCountToNgwordHistories < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_column :ngword_histories, :count, :integer, null: false, default: 0
+
+    add_index :ngword_histories, [:uri, :reason, :created_at], unique: false, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20240217093511_add_remote_pending_to_accounts.rb b/db/migrate/20240217093511_add_remote_pending_to_accounts.rb
new file mode 100644
index 0000000000..60b60b4d2f
--- /dev/null
+++ b/db/migrate/20240217093511_add_remote_pending_to_accounts.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddRemotePendingToAccounts < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_column :accounts, :remote_pending, :boolean, null: false, default: false
+
+    add_index :accounts, :remote_pending, unique: false, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
new file mode 100644
index 0000000000..301371a02d
--- /dev/null
+++ b/db/migrate/20240217171534_remove_defaults_for_status_pins_timestamps.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveDefaultsForStatusPinsTimestamps < ActiveRecord::Migration[7.1]
+  def change
+    change_column_default :status_pins, :created_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+    change_column_default :status_pins, :updated_at, from: -> { 'CURRENT_TIMESTAMP' }, to: nil
+  end
+end
diff --git a/db/migrate/20240217230006_create_pending_follow_requests.rb b/db/migrate/20240217230006_create_pending_follow_requests.rb
new file mode 100644
index 0000000000..9d5565ce21
--- /dev/null
+++ b/db/migrate/20240217230006_create_pending_follow_requests.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreatePendingFollowRequests < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    create_table :pending_follow_requests do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }, index: false
+      t.references :target_account, null: false, foreign_key: { to_table: 'accounts', on_delete: :cascade }
+      t.string :uri, null: false, index: { unique: true }
+
+      t.timestamps
+    end
+
+    add_index :pending_follow_requests, [:account_id, :target_account_id], unique: true
+  end
+end
diff --git a/db/migrate/20240218233621_create_ng_rules.rb b/db/migrate/20240218233621_create_ng_rules.rb
new file mode 100644
index 0000000000..55c2f13809
--- /dev/null
+++ b/db/migrate/20240218233621_create_ng_rules.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+class CreateNgRules < ActiveRecord::Migration[7.1]
+  def change
+    create_table :ng_rules do |t|
+      t.string :title, null: false, default: ''
+      t.boolean :available, null: false, default: true
+      t.boolean :record_history_also_local, null: false, default: true
+      t.string :account_domain, null: false, default: ''
+      t.string :account_username, null: false, default: ''
+      t.string :account_display_name, null: false, default: ''
+      t.string :account_note, null: false, default: ''
+      t.string :account_field_name, null: false, default: ''
+      t.string :account_field_value, null: false, default: ''
+      t.integer :account_avatar_state, null: false, default: 0
+      t.integer :account_header_state, null: false, default: 0
+      t.boolean :account_include_local, null: false, default: true
+      t.boolean :account_allow_followed_by_local, null: false, default: false
+      t.string :status_spoiler_text, null: false, default: ''
+      t.string :status_text, null: false, default: ''
+      t.string :status_tag, null: false, default: ''
+      t.string :status_visibility, null: false, default: [], array: true
+      t.string :status_searchability, null: false, default: [], array: true
+      t.integer :status_media_state, null: false, default: 0
+      t.integer :status_sensitive_state, null: false, default: 0
+      t.integer :status_cw_state, null: false, default: 0
+      t.integer :status_poll_state, null: false, default: 0
+      t.integer :status_quote_state, null: false, default: 0
+      t.integer :status_reply_state, null: false, default: 0
+      t.integer :status_mention_state, null: false, default: 0
+      t.integer :status_reference_state, null: false, default: 0
+      t.integer :status_tag_threshold, null: false, default: -1
+      t.integer :status_media_threshold, null: false, default: -1
+      t.integer :status_poll_threshold, null: false, default: -1
+      t.integer :status_mention_threshold, null: false, default: -1
+      t.boolean :status_allow_follower_mention, null: false, default: true
+      t.integer :status_reference_threshold, null: false, default: -1
+      t.string :reaction_type, null: false, default: [], array: true
+      t.boolean :reaction_allow_follower, null: false, default: true
+      t.string :emoji_reaction_name, null: false, default: ''
+      t.string :emoji_reaction_origin_domain, null: false, default: ''
+      t.datetime :expires_at
+
+      t.timestamps
+    end
+
+    create_table :ng_rule_histories do |t|
+      t.belongs_to :ng_rule, null: false, foreign_key: { on_cascade: :delete }, index: false
+      t.belongs_to :account, foreign_key: { on_cascade: :nullify }, index: false
+      t.string :text
+      t.string :uri, index: true
+      t.integer :reason, null: false
+      t.integer :reason_action, null: false
+      t.boolean :local, null: false, default: true
+      t.boolean :hidden, null: false, default: false
+      t.jsonb :data
+
+      t.timestamps
+    end
+
+    add_index :ng_rule_histories, [:ng_rule_id, :account_id]
+    add_index :ng_rule_histories, :created_at
+  end
+end
diff --git a/db/migrate/20240221195424_add_filtered_to_notifications.rb b/db/migrate/20240221195424_add_filtered_to_notifications.rb
new file mode 100644
index 0000000000..99e98a58b8
--- /dev/null
+++ b/db/migrate/20240221195424_add_filtered_to_notifications.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFilteredToNotifications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notifications, :filtered, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20240221195828_create_notification_requests.rb b/db/migrate/20240221195828_create_notification_requests.rb
new file mode 100644
index 0000000000..98aa630408
--- /dev/null
+++ b/db/migrate/20240221195828_create_notification_requests.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateNotificationRequests < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_requests do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }, index: false
+      t.references :from_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }
+      t.references :last_status, null: false, foreign_key: { to_table: :statuses, on_delete: :nullify }
+      t.bigint :notifications_count, null: false, default: 0
+      t.boolean :dismissed, null: false, default: false
+
+      t.timestamps
+    end
+
+    add_index :notification_requests, [:account_id, :from_account_id], unique: true
+    add_index :notification_requests, [:account_id, :id], where: 'dismissed = false', order: { id: :desc }
+  end
+end
diff --git a/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb b/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb
new file mode 100644
index 0000000000..8503f452fe
--- /dev/null
+++ b/db/migrate/20240221211359_notification_request_ids_to_timestamp_ids.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class NotificationRequestIdsToTimestampIds < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute("ALTER TABLE notification_requests ALTER COLUMN id SET DEFAULT timestamp_id('notification_requests')")
+    end
+  end
+
+  def down
+    execute('LOCK notification_requests')
+    execute("SELECT setval('notification_requests_id_seq', (SELECT MAX(id) FROM notification_requests))")
+    execute("ALTER TABLE notification_requests ALTER COLUMN id SET DEFAULT nextval('notification_requests_id_seq')")
+  end
+end
diff --git a/db/migrate/20240222193403_create_notification_permissions.rb b/db/migrate/20240222193403_create_notification_permissions.rb
new file mode 100644
index 0000000000..6e2b6196c2
--- /dev/null
+++ b/db/migrate/20240222193403_create_notification_permissions.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateNotificationPermissions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_permissions do |t|
+      t.references :account, null: false, foreign_key: true
+      t.references :from_account, null: false, foreign_key: { to_table: :accounts }
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240222203722_create_notification_policies.rb b/db/migrate/20240222203722_create_notification_policies.rb
new file mode 100644
index 0000000000..e9d35510a8
--- /dev/null
+++ b/db/migrate/20240222203722_create_notification_policies.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateNotificationPolicies < ActiveRecord::Migration[7.1]
+  def change
+    create_table :notification_policies do |t|
+      t.references :account, null: false, foreign_key: true, index: { unique: true }
+      t.boolean :filter_not_following, null: false, default: false
+      t.boolean :filter_not_followers, null: false, default: false
+      t.boolean :filter_new_accounts, null: false, default: false
+      t.boolean :filter_private_mentions, null: false, default: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240227033337_remove_group_attrs_from_accounts.rb b/db/migrate/20240227033337_remove_group_attrs_from_accounts.rb
new file mode 100644
index 0000000000..c339bf6efa
--- /dev/null
+++ b/db/migrate/20240227033337_remove_group_attrs_from_accounts.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class RemoveGroupAttrsFromAccounts < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured do
+      remove_column :accounts, :group_allow_private_message, :boolean
+      remove_column :account_stats, :group_activitypub_count, :integer
+    end
+  end
+end
diff --git a/db/migrate/20240227191620_add_filtered_index_on_notifications.rb b/db/migrate/20240227191620_add_filtered_index_on_notifications.rb
new file mode 100644
index 0000000000..ca34452472
--- /dev/null
+++ b/db/migrate/20240227191620_add_filtered_index_on_notifications.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddFilteredIndexOnNotifications < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :notifications, [:account_id, :id, :type], where: 'filtered = false', order: { id: :desc }, name: 'index_notifications_on_filtered', algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20240227225017_create_pending_statuses.rb b/db/migrate/20240227225017_create_pending_statuses.rb
new file mode 100644
index 0000000000..dd471631f8
--- /dev/null
+++ b/db/migrate/20240227225017_create_pending_statuses.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreatePendingStatuses < ActiveRecord::Migration[7.1]
+  def change
+    create_table :pending_statuses do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }
+      t.references :fetch_account, null: false, foreign_key: { to_table: 'accounts', on_delete: :cascade }
+      t.string :uri, null: false, index: { unique: true }
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240229233617_remove_reject_reply_from_domain_blocks.rb b/db/migrate/20240229233617_remove_reject_reply_from_domain_blocks.rb
new file mode 100644
index 0000000000..a60162966e
--- /dev/null
+++ b/db/migrate/20240229233617_remove_reject_reply_from_domain_blocks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveRejectReplyFromDomainBlocks < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :domain_blocks, :reject_reply, :boolean, null: false, default: false }
+  end
+end
diff --git a/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
new file mode 100644
index 0000000000..ea4cfccdf9
--- /dev/null
+++ b/db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class MigrateInteractionSettingsToPolicy < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class User < ApplicationRecord
+    belongs_to :notification_policy, foreign_key: 'account_id', primary_key: 'account_id', optional: true, inverse_of: false
+  end
+
+  class NotificationPolicy < ApplicationRecord; end
+
+  def up
+    User.includes(:notification_policy).in_batches do |users|
+      NotificationPolicy.upsert_all(users.filter_map { |user| policy_for_user(user) })
+    end
+  end
+
+  def down; end
+
+  private
+
+  def policy_for_user(user)
+    deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    return if deserialized_settings.nil?
+
+    requires_new_policy = false
+
+    policy = {
+      account_id: user.account_id,
+      filter_not_followers: false,
+      filter_not_following: false,
+      filter_private_mentions: true,
+    }
+
+    if deserialized_settings['interactions.must_be_follower']
+      policy[:filter_not_followers] = true
+      requires_new_policy = true
+    end
+
+    if deserialized_settings['interactions.must_be_following']
+      policy[:filter_not_following] = true
+      requires_new_policy = true
+    end
+
+    unless deserialized_settings['interactions.must_be_following_dm']
+      policy[:filter_private_mentions] = false
+      requires_new_policy = true
+    end
+
+    policy if requires_new_policy
+  end
+end
diff --git a/db/migrate/20240310123453_add_hint_to_rules.rb b/db/migrate/20240310123453_add_hint_to_rules.rb
new file mode 100644
index 0000000000..06822ad96a
--- /dev/null
+++ b/db/migrate/20240310123453_add_hint_to_rules.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHintToRules < ActiveRecord::Migration[7.1]
+  def change
+    add_column :rules, :hint, :text, null: false, default: ''
+  end
+end
diff --git a/db/migrate/20240312100644_create_relationship_severance_events.rb b/db/migrate/20240312100644_create_relationship_severance_events.rb
new file mode 100644
index 0000000000..8c55fe330f
--- /dev/null
+++ b/db/migrate/20240312100644_create_relationship_severance_events.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateRelationshipSeveranceEvents < ActiveRecord::Migration[7.0]
+  def change
+    create_table :relationship_severance_events do |t|
+      t.integer :type, null: false
+      t.string :target_name, null: false
+      t.boolean :purged, null: false, default: false
+
+      t.timestamps
+
+      t.index [:type, :target_name]
+    end
+  end
+end
diff --git a/db/migrate/20240312105620_create_severed_relationships.rb b/db/migrate/20240312105620_create_severed_relationships.rb
new file mode 100644
index 0000000000..1ed911cd55
--- /dev/null
+++ b/db/migrate/20240312105620_create_severed_relationships.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class CreateSeveredRelationships < ActiveRecord::Migration[7.0]
+  def change
+    create_table :severed_relationships do |t|
+      # No need to have an index on this foreign key as it is covered by `index_severed_relationships_on_unique_tuples`
+      t.references :relationship_severance_event, null: false, foreign_key: { on_delete: :cascade }, index: false
+
+      # No need to have an index on this foregin key as it is covered by `index_severed_relationships_on_local_account_and_event`
+      t.references :local_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }, index: false
+      t.references :remote_account, null: false, foreign_key: { to_table: :accounts, on_delete: :cascade }
+
+      # Used to describe whether `local_account` is the active (follower) or passive (followed) part of the relationship
+      t.integer :direction, null: false
+
+      # Those attributes are carried over from the `follows` table
+      t.boolean :show_reblogs
+      t.boolean :notify
+      t.string :languages, array: true
+
+      t.timestamps
+
+      t.index [:relationship_severance_event_id, :local_account_id, :direction, :remote_account_id], name: 'index_severed_relationships_on_unique_tuples', unique: true
+      t.index [:local_account_id, :relationship_severance_event_id], name: 'index_severed_relationships_on_local_account_and_event'
+    end
+  end
+end
diff --git a/db/migrate/20240312230204_create_sensitive_words.rb b/db/migrate/20240312230204_create_sensitive_words.rb
new file mode 100644
index 0000000000..a33f492088
--- /dev/null
+++ b/db/migrate/20240312230204_create_sensitive_words.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+class CreateSensitiveWords < ActiveRecord::Migration[7.1]
+  class Setting < ApplicationRecord
+    def value
+      YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol]) if self[:value].present?
+    end
+
+    def value=(new_value)
+      self[:value] = new_value.to_yaml
+    end
+  end
+
+  class SensitiveWord < ApplicationRecord; end
+
+  def normalized_keyword(keyword)
+    if regexp?(keyword)
+      keyword[1..]
+    else
+      keyword
+    end
+  end
+
+  def regexp?(keyword)
+    keyword.start_with?('?') && keyword.size >= 2
+  end
+
+  def up
+    create_table :sensitive_words do |t|
+      t.string :keyword, null: false
+      t.boolean :regexp, null: false, default: false
+      t.boolean :remote, null: false, default: false
+      t.boolean :spoiler, null: false, default: true
+
+      t.timestamps
+    end
+
+    settings = Setting.where(var: %i(sensitive_words sensitive_words_for_full sensitive_words_all sensitive_words_all_for_full))
+    sensitive_words = settings.find { |s| s.var == 'sensitive_words' }&.value&.compact_blank&.uniq || []
+    sensitive_words_for_full = settings.find { |s| s.var == 'sensitive_words_for_full' }&.value&.compact_blank&.uniq || []
+    sensitive_words_all = settings.find { |s| s.var == 'sensitive_words_all' }&.value&.compact_blank&.uniq || []
+    sensitive_words_all_for_full = settings.find { |s| s.var == 'sensitive_words_all_for_full' }&.value&.compact_blank&.uniq || []
+
+    (sensitive_words + sensitive_words_for_full + sensitive_words_all + sensitive_words_all_for_full).compact.uniq.each do |word|
+      SensitiveWord.create!(
+        keyword: normalized_keyword(word),
+        regexp: regexp?(word),
+        remote: (sensitive_words_all + sensitive_words_all_for_full).include?(word),
+        spoiler: (sensitive_words_for_full + sensitive_words_all_for_full).include?(word)
+      )
+    end
+
+    settings.destroy_all
+  end
+
+  def down
+    sensitive_words = SensitiveWord.where(remote: false, spoiler: false).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+    sensitive_words_for_full = SensitiveWord.where(remote: false, spoiler: true).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+    sensitive_words_all = SensitiveWord.where(remote: true, spoiler: false).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+    sensitive_words_all_for_full = SensitiveWord.where(remote: true, spoiler: true).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+
+    Setting.where(var: %i(sensitive_words sensitive_words_for_full sensitive_words_all sensitive_words_all_for_full)).destroy_all
+
+    Setting.new(var: :sensitive_words).tap { |s| s.value = sensitive_words }.save!
+    Setting.new(var: :sensitive_words_for_full).tap { |s| s.value = sensitive_words_for_full }.save!
+    Setting.new(var: :sensitive_words_all).tap { |s| s.value = sensitive_words_all }.save!
+    Setting.new(var: :sensitive_words_all_for_full).tap { |s| s.value = sensitive_words_all_for_full }.save!
+
+    drop_table :sensitive_words
+  end
+end
diff --git a/db/migrate/20240320140159_create_account_relationship_severance_events.rb b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
new file mode 100644
index 0000000000..5262c508fe
--- /dev/null
+++ b/db/migrate/20240320140159_create_account_relationship_severance_events.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    create_table :account_relationship_severance_events do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
+      t.belongs_to :relationship_severance_event, foreign_key: { on_delete: :cascade }, null: false
+
+      t.integer :relationships_count, default: 0, null: false
+
+      t.index [:account_id, :relationship_severance_event_id], unique: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
new file mode 100644
index 0000000000..afc3df5aa4
--- /dev/null
+++ b/db/migrate/20240320163441_change_notification_request_last_status_id_nullable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeNotificationRequestLastStatusIdNullable < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :notification_requests, :last_status_id, true
+  end
+end
diff --git a/db/migrate/20240320231633_create_ng_words.rb b/db/migrate/20240320231633_create_ng_words.rb
new file mode 100644
index 0000000000..faa8964710
--- /dev/null
+++ b/db/migrate/20240320231633_create_ng_words.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class CreateNgWords < ActiveRecord::Migration[7.1]
+  class Setting < ApplicationRecord
+    def value
+      YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol]) if self[:value].present?
+    end
+
+    def value=(new_value)
+      self[:value] = new_value.to_yaml
+    end
+  end
+
+  class NgWord < ApplicationRecord; end
+
+  def normalized_keyword(keyword)
+    if regexp?(keyword)
+      keyword[1..]
+    else
+      keyword
+    end
+  end
+
+  def regexp?(keyword)
+    keyword.start_with?('?') && keyword.size >= 2
+  end
+
+  def up
+    create_table :ng_words do |t|
+      t.string :keyword, null: false
+      t.boolean :regexp, null: false, default: false
+      t.boolean :stranger, null: false, default: true
+
+      t.timestamps
+    end
+
+    settings = Setting.where(var: %i(ng_words ng_words_for_stranger_mention))
+    ng_words = settings.find { |s| s.var == 'ng_words' }&.value&.compact_blank&.uniq || []
+    ng_words_for_stranger_mention = settings.find { |s| s.var == 'ng_words_for_stranger_mention' }&.value&.compact_blank&.uniq || []
+
+    (ng_words + ng_words_for_stranger_mention).compact.uniq.each do |word|
+      NgWord.create!(
+        keyword: normalized_keyword(word),
+        regexp: regexp?(word),
+        stranger: ng_words_for_stranger_mention.include?(word)
+      )
+    end
+
+    settings.destroy_all
+  end
+
+  def down
+    ng_words = NgWord.where(stranger: false).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+    ng_words_for_stranger_mention = NgWord.where(stranger: true).map { |s| s.regexp ? "?#{s.keyword}" : s.keyword }
+
+    Setting.where(var: %i(ng_words ng_words_for_stranger_mention)).destroy_all
+
+    Setting.new(var: :ng_words).tap { |s| s.value = ng_words }.save!
+    Setting.new(var: :ng_words_for_stranger_mention).tap { |s| s.value = ng_words_for_stranger_mention }.save!
+
+    drop_table :ng_words
+  end
+end
diff --git a/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb
new file mode 100644
index 0000000000..ab5752b7a5
--- /dev/null
+++ b/db/migrate/20240322125607_add_followers_and_following_counts_to_account_relationship_severance_events.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddFollowersAndFollowingCountsToAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    add_column :account_relationship_severance_events, :followers_count, :integer, default: 0, null: false
+    add_column :account_relationship_severance_events, :following_count, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20240401222541_create_specified_domains.rb b/db/migrate/20240401222541_create_specified_domains.rb
new file mode 100644
index 0000000000..c053ecb659
--- /dev/null
+++ b/db/migrate/20240401222541_create_specified_domains.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class CreateSpecifiedDomains < ActiveRecord::Migration[7.1]
+  class Setting < ApplicationRecord
+    def value
+      YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol]) if self[:value].present?
+    end
+
+    def value=(new_value)
+      self[:value] = new_value.to_yaml
+    end
+  end
+
+  class SpecifiedDomain < ApplicationRecord; end
+
+  def up
+    create_table :specified_domains do |t|
+      t.string :domain, null: false
+      t.integer :table, default: 0, null: false
+      t.jsonb :options, null: false, default: {}
+
+      t.timestamps
+    end
+
+    add_index :specified_domains, %i(domain table), unique: true
+
+    setting = Setting.find_by(var: :permit_new_account_domains)
+
+    (setting&.value || []).compact.uniq.each do |domain|
+      SpecifiedDomain.create!(domain: domain, table: 0)
+    end
+    setting&.destroy
+  end
+
+  def down
+    Setting.find_by(var: :permit_new_account_domains)&.destroy
+    Setting.new(var: :permit_new_account_domains).tap { |s| s.value = SpecifiedDomain.where(table: 0).pluck(:domain) }.save!
+
+    drop_table :specified_domains
+  end
+end
diff --git a/db/migrate/20240426000034_move_account_warning_notifications.rb b/db/migrate/20240426000034_move_account_warning_notifications.rb
new file mode 100644
index 0000000000..fdabf0218c
--- /dev/null
+++ b/db/migrate/20240426000034_move_account_warning_notifications.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MoveAccountWarningNotifications < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class Notification < ApplicationRecord; end
+
+  def up
+    Notification.where(type: 'warning').in_batches.update_all(type: 'moderation_warning')
+  end
+
+  def down
+    Notification.where(type: 'moderation_warning').in_batches.update_all(type: 'warning')
+  end
+end
diff --git a/db/migrate/20240426233435_migrate_moderation_warning_notifications_from_account.rb b/db/migrate/20240426233435_migrate_moderation_warning_notifications_from_account.rb
new file mode 100644
index 0000000000..65baf952f1
--- /dev/null
+++ b/db/migrate/20240426233435_migrate_moderation_warning_notifications_from_account.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class MigrateModerationWarningNotificationsFromAccount < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class Notification < ApplicationRecord; end
+
+  def up
+    Notification.where(type: 'moderation_warning').in_batches.update_all('from_account_id = account_id')
+  end
+
+  # No need to reinstate this information as it is a privacy issue.
+  def down; end
+end
diff --git a/db/migrate/20240509220635_revert_media_file_size_column_to_big_int.rb b/db/migrate/20240509220635_revert_media_file_size_column_to_big_int.rb
new file mode 100644
index 0000000000..eb75e56924
--- /dev/null
+++ b/db/migrate/20240509220635_revert_media_file_size_column_to_big_int.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/mastodon/migration_helpers'
+
+class RevertMediaFileSizeColumnToBigInt < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  TABLE_COLUMN_MAPPING = [
+    [:accounts, :avatar_file_size],
+    [:accounts, :header_file_size],
+    [:custom_emojis, :image_file_size],
+    [:imports, :data_file_size],
+    [:media_attachments, :file_file_size],
+    [:media_attachments, :thumbnail_file_size],
+    [:preview_cards, :image_file_size],
+    [:site_uploads, :file_file_size],
+  ].freeze
+
+  disable_ddl_transaction!
+
+  def migrate_columns(to_type)
+    TABLE_COLUMN_MAPPING.each do |column_parts|
+      table, column = column_parts
+
+      # Skip this if we're resuming and already did this one.
+      next if column_for(table, column).sql_type == to_type.to_s
+
+      safety_assured do
+        change_column_type_concurrently table, column, to_type
+        cleanup_concurrent_column_type_change table, column
+      end
+    end
+  end
+
+  def up
+    migrate_columns(:integer)
+  end
+
+  def down
+    migrate_columns(:integer)
+  end
+end
diff --git a/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb b/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb
new file mode 100644
index 0000000000..7bb134ecff
--- /dev/null
+++ b/db/migrate/20240510192043_fix_notification_policies_foreign_key.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class FixNotificationPoliciesForeignKey < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_policies
+          DROP CONSTRAINT fk_rails_506d62f0da,
+          ADD CONSTRAINT fk_rails_506d62f0da
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
+    end
+  end
+
+  def down
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_policies
+          DROP CONSTRAINT fk_rails_506d62f0da,
+          ADD CONSTRAINT fk_rails_506d62f0da
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+      SQL
+    end
+  end
+end
diff --git a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
index 00afee26d0..42dc37f08b 100644
--- a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
+++ b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
@@ -3,7 +3,9 @@
 class MigrateSettingsToUserRoles < ActiveRecord::Migration[6.1]
   disable_ddl_transaction!
 
-  class UserRole < ApplicationRecord; end
+  class UserRole < ApplicationRecord
+    EVERYONE_ROLE_ID = -99
+  end
 
   def up
     process_role_everyone
@@ -17,7 +19,7 @@ class MigrateSettingsToUserRoles < ActiveRecord::Migration[6.1]
   private
 
   def process_role_everyone
-    everyone_role = UserRole.find_by(id: -99)
+    everyone_role = UserRole.find_by(id: UserRole::EVERYONE_ROLE_ID)
     return unless everyone_role
 
     everyone_role.permissions &= ~::UserRole::FLAGS[:invite_users] unless min_invite_role == 'user'
diff --git a/db/post_migrate/20230314120530_remove_group_message_following_only_from_accounts.rb b/db/post_migrate/20230314120530_remove_group_message_following_only_from_accounts.rb
new file mode 100644
index 0000000000..2c140d9a16
--- /dev/null
+++ b/db/post_migrate/20230314120530_remove_group_message_following_only_from_accounts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveGroupMessageFollowingOnlyFromAccounts < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { remove_column :accounts, :group_message_following_only, :boolean }
+  end
+end
diff --git a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
index d29d7847c5..4271f8c08a 100644
--- a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
+++ b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
@@ -17,8 +17,7 @@ class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
 
   def supports_concurrent_reindex?
     @supports_concurrent_reindex ||= begin
-      version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-      version >= 120_000
+      ActiveRecord::Base.connection.database_version >= 120_000
     end
   end
 
diff --git a/db/post_migrate/20230818142253_drop_follow_recommendations.rb b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
index 95913d6caa..e0a24753ca 100644
--- a/db/post_migrate/20230818142253_drop_follow_recommendations.rb
+++ b/db/post_migrate/20230818142253_drop_follow_recommendations.rb
@@ -6,7 +6,7 @@ class DropFollowRecommendations < ActiveRecord::Migration[7.0]
   end
 
   def down
-    create_view :follow_recommendations, version: 2, materialized: { no_data: true }
+    create_view :follow_recommendations, version: 2, materialized: true
     safety_assured { add_index :follow_recommendations, :account_id, unique: true }
   end
 end
diff --git a/db/post_migrate/20231021005339_remove_remote_uri_from_local_custom_emojis.rb b/db/post_migrate/20231021005339_remove_remote_uri_from_local_custom_emojis.rb
new file mode 100644
index 0000000000..4e87008e46
--- /dev/null
+++ b/db/post_migrate/20231021005339_remove_remote_uri_from_local_custom_emojis.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class RemoveRemoteUriFromLocalCustomEmojis < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  class CustomEmoji < ApplicationRecord; end
+
+  def up
+    safety_assured do
+      CustomEmoji.transaction do
+        CustomEmoji.where(domain: nil).update_all(image_remote_url: nil, uri: nil)
+      end
+    end
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20231022074913_add_statuses_quote_index.rb b/db/post_migrate/20231022074913_add_statuses_quote_index.rb
new file mode 100644
index 0000000000..98025700fc
--- /dev/null
+++ b/db/post_migrate/20231022074913_add_statuses_quote_index.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddStatusesQuoteIndex < ActiveRecord::Migration[7.0]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured { add_index :statuses, [:quote_of_id, :account_id], unique: false }
+  end
+end
diff --git a/db/post_migrate/20240117022353_remove_legacy_domain_block_columns.rb b/db/post_migrate/20240117022353_remove_legacy_domain_block_columns.rb
new file mode 100644
index 0000000000..958d7491e5
--- /dev/null
+++ b/db/post_migrate/20240117022353_remove_legacy_domain_block_columns.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class RemoveLegacyDomainBlockColumns < ActiveRecord::Migration[7.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :domain_blocks, :reject_send_not_public_searchability, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_public_unlisted, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_dissubscribable, :boolean, null: false, default: false
+      remove_column :domain_blocks, :reject_send_media, :boolean, null: false, default: false
+    end
+  end
+end
diff --git a/db/post_migrate/20240212230358_fix_uri_index_to_emoji_reactions.rb b/db/post_migrate/20240212230358_fix_uri_index_to_emoji_reactions.rb
new file mode 100644
index 0000000000..2a5721d814
--- /dev/null
+++ b/db/post_migrate/20240212230358_fix_uri_index_to_emoji_reactions.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class FixUriIndexToEmojiReactions < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class EmojiReaction < ApplicationRecord
+  end
+
+  def up
+    # Remove duplications (very old kmyblue code [2023/03-04] maybe made some duplications)
+    duplications = EmojiReaction.where('uri IN (SELECT uri FROM emoji_reactions GROUP BY uri HAVING COUNT(*) > 1)')
+                                .to_a.group_by(&:uri).to_h
+
+    if duplications.any?
+      EmojiReaction.transaction do
+        duplications.each do |h|
+          h[1].drop(1).each(&:destroy)
+        end
+      end
+    end
+
+    add_index :emoji_reactions, :uri, unique: true, algorithm: :concurrently
+  end
+
+  def down
+    remove_index :emoji_reactions, :uri
+  end
+end
diff --git a/db/post_migrate/20240217215134_improve_remote_pending_accounts_index.rb b/db/post_migrate/20240217215134_improve_remote_pending_accounts_index.rb
new file mode 100644
index 0000000000..66d5e0d180
--- /dev/null
+++ b/db/post_migrate/20240217215134_improve_remote_pending_accounts_index.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ImproveRemotePendingAccountsIndex < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :accounts, :remote_pending, unique: false, algorithm: :concurrently
+
+    add_index :accounts, :id, name: 'index_remote_pending_users', unique: false, algorithm: :concurrently, where: 'domain IS NOT NULL AND remote_pending AND suspended_at IS NOT NULL'
+  end
+end
diff --git a/db/post_migrate/20240227222450_index_to_sort_for_ng_word_created_date.rb b/db/post_migrate/20240227222450_index_to_sort_for_ng_word_created_date.rb
new file mode 100644
index 0000000000..672eb3c8a7
--- /dev/null
+++ b/db/post_migrate/20240227222450_index_to_sort_for_ng_word_created_date.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class IndexToSortForNgWordCreatedDate < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :ngword_histories, :created_at, algorithm: :concurrently
+  end
+end
diff --git a/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
new file mode 100644
index 0000000000..360e4806da
--- /dev/null
+++ b/db/post_migrate/20240307180905_migrate_devise_two_factor_secrets.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class MigrateDeviseTwoFactorSecrets < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  class MigrationUser < ApplicationRecord
+    self.table_name = :users
+
+    devise :two_factor_authenticatable,
+           otp_secret_encryption_key: Rails.configuration.x.otp_secret
+
+    include LegacyOtpSecret # Must be after the above `devise` line in order to override the legacy method
+  end
+
+  def up
+    MigrationUser.reset_column_information
+
+    users_with_otp_enabled.find_each do |user|
+      # Gets the new value on already-updated users
+      # Falls back to legacy value on not-yet-migrated users
+      otp_secret = user.otp_secret
+
+      Rails.logger.debug { "Processing #{user.email}" }
+
+      # This is a no-op for migrated users and updates format for not migrated
+      user.update!(otp_secret: otp_secret)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def users_with_otp_enabled
+    MigrationUser.where(otp_required_for_login: true, otp_secret: nil)
+  end
+end
diff --git a/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
new file mode 100644
index 0000000000..c789b63951
--- /dev/null
+++ b/db/post_migrate/20240321160706_migrate_interaction_settings_to_policy_again.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class MigrateInteractionSettingsToPolicyAgain < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class User < ApplicationRecord
+    belongs_to :notification_policy, foreign_key: 'account_id', primary_key: 'account_id', optional: true, inverse_of: false
+  end
+
+  class NotificationPolicy < ApplicationRecord; end
+
+  def up
+    User.includes(:notification_policy).in_batches do |users|
+      NotificationPolicy.insert_all(users.filter_map { |user| policy_for_user(user) })
+    end
+  end
+
+  def down; end
+
+  private
+
+  def policy_for_user(user)
+    deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
+    return if deserialized_settings.nil?
+    return if user.notification_policy.present?
+
+    requires_new_policy = false
+
+    policy = {
+      account_id: user.account_id,
+      filter_not_followers: false,
+      filter_not_following: false,
+      filter_private_mentions: true,
+    }
+
+    if deserialized_settings['interactions.must_be_follower']
+      policy[:filter_not_followers] = true
+      requires_new_policy = true
+    end
+
+    if deserialized_settings['interactions.must_be_following']
+      policy[:filter_not_following] = true
+      requires_new_policy = true
+    end
+
+    unless deserialized_settings['interactions.must_be_following_dm']
+      policy[:filter_private_mentions] = false
+      requires_new_policy = true
+    end
+
+    policy if requires_new_policy
+  end
+end
diff --git a/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb
new file mode 100644
index 0000000000..76f2d325fe
--- /dev/null
+++ b/db/post_migrate/20240322130318_remove_relationships_count_from_account_relationship_severance_events.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveRelationshipsCountFromAccountRelationshipSeveranceEvents < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured { remove_column :account_relationship_severance_events, :relationships_count, :integer, default: 0, null: false }
+  end
+end
diff --git a/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb
new file mode 100644
index 0000000000..8a46a1d7d3
--- /dev/null
+++ b/db/post_migrate/20240322161611_remove_obsolete_roles_from_users.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveObsoleteRolesFromUsers < ActiveRecord::Migration[7.1]
+  def change
+    safety_assured { remove_column :users, :admin, :boolean, default: false, null: false }
+    safety_assured { remove_column :users, :moderator, :boolean, default: false, null: false }
+  end
+end
diff --git a/db/post_migrate/20240326231854_improve_preview_cards_vacuum.rb b/db/post_migrate/20240326231854_improve_preview_cards_vacuum.rb
new file mode 100644
index 0000000000..a61c23ceef
--- /dev/null
+++ b/db/post_migrate/20240326231854_improve_preview_cards_vacuum.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class ImprovePreviewCardsVacuum < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :preview_cards, :id, name: 'index_preview_cards_vacuum', where: "image_file_name IS NOT NULL AND image_file_name <> ''", algorithm: :concurrently
+    add_index :media_attachments, :id, name: 'index_media_attachments_vacuum', where: "file_file_name IS NOT NULL AND remote_url <> ''", algorithm: :concurrently
+  end
+end
diff --git a/db/post_migrate/20240327234026_fix_duplicate_indices_for_kmyblue_original_functions.rb b/db/post_migrate/20240327234026_fix_duplicate_indices_for_kmyblue_original_functions.rb
new file mode 100644
index 0000000000..f35b916781
--- /dev/null
+++ b/db/post_migrate/20240327234026_fix_duplicate_indices_for_kmyblue_original_functions.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class FixDuplicateIndicesForKmyblueOriginalFunctions < ActiveRecord::Migration[7.1]
+  def change
+    remove_index :antenna_accounts, :antenna_id
+    remove_index :antenna_domains, :antenna_id
+    remove_index :antenna_tags, :antenna_id
+    remove_index :bookmark_category_statuses, :bookmark_category_id
+    remove_index :circle_accounts, :circle_id
+    remove_index :circle_statuses, :circle_id
+    remove_index :list_statuses, :list_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cbe54c1db7..cccdc74edb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
+ActiveRecord::Schema[7.1].define(version: 2024_05_10_192043) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -20,6 +20,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "uri", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["account_id", "uri"], name: "index_account_aliases_on_account_id_and_uri", unique: true
     t.index ["account_id"], name: "index_account_aliases_on_account_id"
   end
 
@@ -90,6 +91,18 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["target_account_id"], name: "index_account_pins_on_target_account_id"
   end
 
+  create_table "account_relationship_severance_events", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "relationship_severance_event_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "followers_count", default: 0, null: false
+    t.integer "following_count", default: 0, null: false
+    t.index ["account_id", "relationship_severance_event_id"], name: "idx_on_account_id_relationship_severance_event_id_7bd82bf20e", unique: true
+    t.index ["account_id"], name: "index_account_relationship_severance_events_on_account_id"
+    t.index ["relationship_severance_event_id"], name: "idx_on_relationship_severance_event_id_403f53e707"
+  end
+
   create_table "account_stats", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "statuses_count", default: 0, null: false
@@ -116,6 +129,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.integer "min_reblogs"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "min_emojis"
+    t.boolean "keep_self_emoji", default: true, null: false
     t.index ["account_id"], name: "index_account_statuses_cleanup_policies_on_account_id"
   end
 
@@ -153,11 +168,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "url"
     t.string "avatar_file_name"
     t.string "avatar_content_type"
-    t.integer "avatar_file_size"
     t.datetime "avatar_updated_at", precision: nil
     t.string "header_file_name"
     t.string "header_content_type"
-    t.integer "header_file_size"
     t.datetime "header_updated_at", precision: nil
     t.string "avatar_remote_url"
     t.boolean "locked", default: false, null: false
@@ -186,10 +199,17 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.boolean "trendable"
     t.datetime "reviewed_at", precision: nil
     t.datetime "requested_review_at", precision: nil
+    t.integer "searchability", default: 2, null: false
+    t.jsonb "settings"
     t.boolean "indexable", default: false, null: false
+    t.jsonb "master_settings"
+    t.boolean "remote_pending", default: false, null: false
+    t.integer "avatar_file_size"
+    t.integer "header_file_size"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["domain", "id"], name: "index_accounts_on_domain_and_id"
+    t.index ["id"], name: "index_accounts_on_id", where: "((domain IS NOT NULL) AND remote_pending AND (suspended_at IS NOT NULL))"
     t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id", where: "(moved_to_account_id IS NOT NULL)"
     t.index ["uri"], name: "index_accounts_on_uri"
     t.index ["url"], name: "index_accounts_on_url", opclass: :text_pattern_ops, where: "(url IS NOT NULL)"
@@ -249,6 +269,72 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.bigint "status_ids", array: true
   end
 
+  create_table "antenna_accounts", force: :cascade do |t|
+    t.bigint "antenna_id", null: false
+    t.bigint "account_id", null: false
+    t.boolean "exclude", default: false, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["account_id"], name: "index_antenna_accounts_on_account_id"
+    t.index ["antenna_id", "account_id"], name: "index_antenna_accounts_on_antenna_id_and_account_id", unique: true
+    t.index ["exclude"], name: "index_antenna_accounts_on_exclude"
+  end
+
+  create_table "antenna_domains", force: :cascade do |t|
+    t.bigint "antenna_id", null: false
+    t.string "name"
+    t.boolean "exclude", default: false, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["antenna_id", "name"], name: "index_antenna_domains_on_antenna_id_and_name", unique: true
+    t.index ["exclude"], name: "index_antenna_domains_on_exclude"
+    t.index ["name"], name: "index_antenna_domains_on_name"
+  end
+
+  create_table "antenna_tags", force: :cascade do |t|
+    t.bigint "antenna_id", null: false
+    t.bigint "tag_id", null: false
+    t.boolean "exclude", default: false, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["antenna_id", "tag_id"], name: "index_antenna_tags_on_antenna_id_and_tag_id", unique: true
+    t.index ["exclude"], name: "index_antenna_tags_on_exclude"
+    t.index ["tag_id"], name: "index_antenna_tags_on_tag_id"
+  end
+
+  create_table "antennas", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "list_id", null: false
+    t.string "title", default: "", null: false
+    t.jsonb "keywords"
+    t.jsonb "exclude_keywords"
+    t.boolean "any_domains", default: true, null: false
+    t.boolean "any_tags", default: true, null: false
+    t.boolean "any_accounts", default: true, null: false
+    t.boolean "any_keywords", default: true, null: false
+    t.boolean "available", default: true, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "expires_at", precision: nil
+    t.boolean "with_media_only", default: false, null: false
+    t.jsonb "exclude_domains"
+    t.jsonb "exclude_accounts"
+    t.jsonb "exclude_tags"
+    t.boolean "stl", default: false, null: false
+    t.boolean "ignore_reblog", default: false, null: false
+    t.boolean "insert_feeds", default: false, null: false
+    t.boolean "ltl", default: false, null: false
+    t.index ["account_id"], name: "index_antennas_on_account_id"
+    t.index ["any_accounts"], name: "index_antennas_on_any_accounts"
+    t.index ["any_domains"], name: "index_antennas_on_any_domains"
+    t.index ["any_keywords"], name: "index_antennas_on_any_keywords"
+    t.index ["any_tags"], name: "index_antennas_on_any_tags"
+    t.index ["available"], name: "index_antennas_on_available"
+    t.index ["ignore_reblog"], name: "index_antennas_on_ignore_reblog"
+    t.index ["list_id"], name: "index_antennas_on_list_id"
+    t.index ["stl"], name: "index_antennas_on_stl"
+  end
+
   create_table "appeals", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "account_warning_id", null: false
@@ -287,6 +373,25 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["target_account_id"], name: "index_blocks_on_target_account_id"
   end
 
+  create_table "bookmark_categories", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "title", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_bookmark_categories_on_account_id"
+  end
+
+  create_table "bookmark_category_statuses", force: :cascade do |t|
+    t.bigint "bookmark_category_id", null: false
+    t.bigint "status_id", null: false
+    t.bigint "bookmark_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["bookmark_category_id", "status_id"], name: "index_bc_statuses", unique: true
+    t.index ["bookmark_id"], name: "index_bookmark_category_statuses_on_bookmark_id"
+    t.index ["status_id"], name: "index_bookmark_category_statuses_on_status_id"
+  end
+
   create_table "bookmarks", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
@@ -330,6 +435,34 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["reference_account_id"], name: "index_canonical_email_blocks_on_reference_account_id"
   end
 
+  create_table "circle_accounts", force: :cascade do |t|
+    t.bigint "circle_id"
+    t.bigint "account_id", null: false
+    t.bigint "follow_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_circle_accounts_on_account_id"
+    t.index ["circle_id", "account_id"], name: "index_circle_accounts_on_circle_id_and_account_id", unique: true
+    t.index ["follow_id"], name: "index_circle_accounts_on_follow_id"
+  end
+
+  create_table "circle_statuses", force: :cascade do |t|
+    t.bigint "circle_id"
+    t.bigint "status_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["circle_id", "status_id"], name: "index_circle_statuses_on_circle_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_circle_statuses_on_status_id"
+  end
+
+  create_table "circles", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "title", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_circles_on_account_id"
+  end
+
   create_table "conversation_mutes", force: :cascade do |t|
     t.bigint "conversation_id", null: false
     t.bigint "account_id", null: false
@@ -340,6 +473,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "uri"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.string "inbox_url"
+    t.bigint "ancestor_status_id"
+    t.index ["ancestor_status_id"], name: "index_conversations_on_ancestor_status_id", where: "(ancestor_status_id IS NOT NULL)"
     t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
@@ -355,7 +491,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "domain"
     t.string "image_file_name"
     t.string "image_content_type"
-    t.integer "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
@@ -365,13 +500,19 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.boolean "visible_in_picker", default: true, null: false
     t.bigint "category_id"
     t.integer "image_storage_schema_version"
+    t.integer "image_width"
+    t.integer "image_height"
+    t.jsonb "aliases"
+    t.boolean "is_sensitive", default: false, null: false
+    t.string "license"
+    t.integer "image_file_size"
     t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true
   end
 
   create_table "custom_filter_keywords", force: :cascade do |t|
     t.bigint "custom_filter_id", null: false
     t.text "keyword", default: "", null: false
-    t.boolean "whole_word", default: true, null: false
+    t.boolean "whole_word", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["custom_filter_id"], name: "index_custom_filter_keywords_on_custom_filter_id"
@@ -383,6 +524,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["custom_filter_id"], name: "index_custom_filter_statuses_on_custom_filter_id"
+    t.index ["status_id", "custom_filter_id"], name: "index_custom_filter_statuses_on_status_id_and_custom_filter_id", unique: true
     t.index ["status_id"], name: "index_custom_filter_statuses_on_status_id"
   end
 
@@ -394,6 +536,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.integer "action", default: 0, null: false
+    t.boolean "exclude_follows", default: false, null: false
+    t.boolean "exclude_localusers", default: false, null: false
+    t.boolean "with_quote", default: true, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end
 
@@ -427,6 +572,16 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.text "private_comment"
     t.text "public_comment"
     t.boolean "obfuscate", default: false, null: false
+    t.boolean "reject_favourite", default: false, null: false
+    t.boolean "reject_send_sensitive", default: false, null: false
+    t.boolean "reject_hashtag", default: false, null: false
+    t.boolean "reject_straight_follow", default: false, null: false
+    t.boolean "reject_new_follow", default: false, null: false
+    t.boolean "hidden", default: false, null: false
+    t.boolean "detect_invalid_subscription", default: false, null: false
+    t.boolean "reject_reply_exclude_followers", default: false, null: false
+    t.boolean "reject_friend", default: false, null: false
+    t.boolean "block_trends", default: false, null: false
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
@@ -439,6 +594,20 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true
   end
 
+  create_table "emoji_reactions", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "status_id", null: false
+    t.string "name", default: "", null: false
+    t.bigint "custom_emoji_id"
+    t.string "uri"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["account_id"], name: "index_emoji_reactions_on_account_id"
+    t.index ["custom_emoji_id"], name: "index_emoji_reactions_on_custom_emoji_id"
+    t.index ["status_id"], name: "index_emoji_reactions_on_status_id"
+    t.index ["uri"], name: "index_emoji_reactions_on_uri", unique: true
+  end
+
   create_table "encrypted_messages", id: :bigint, default: -> { "timestamp_id('encrypted_messages'::text)" }, force: :cascade do |t|
     t.bigint "device_id"
     t.bigint "from_account_id"
@@ -458,9 +627,11 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
+    t.string "uri"
     t.index ["account_id", "id"], name: "index_favourites_on_account_id_and_id"
     t.index ["account_id", "status_id"], name: "index_favourites_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_favourites_on_status_id"
+    t.index ["uri"], name: "index_favourites_on_uri", unique: true
   end
 
   create_table "featured_tags", force: :cascade do |t|
@@ -516,12 +687,41 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["target_account_id"], name: "index_follows_on_target_account_id"
   end
 
+  create_table "friend_domains", force: :cascade do |t|
+    t.string "domain", default: "", null: false
+    t.string "inbox_url", default: "", null: false
+    t.integer "active_state", default: 0, null: false
+    t.integer "passive_state", default: 0, null: false
+    t.string "active_follow_activity_id"
+    t.string "passive_follow_activity_id"
+    t.boolean "available", default: true, null: false
+    t.boolean "pseudo_relay", default: false, null: false
+    t.boolean "allow_all_posts", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "delivery_local", default: true, null: false
+    t.index ["domain"], name: "index_friend_domains_on_domain", unique: true
+    t.index ["inbox_url"], name: "index_friend_domains_on_inbox_url", unique: true
+  end
+
+  create_table "generated_annual_reports", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.integer "year", null: false
+    t.jsonb "data", null: false
+    t.integer "schema_version", null: false
+    t.datetime "viewed_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "year"], name: "index_generated_annual_reports_on_account_id_and_year", unique: true
+  end
+
   create_table "identities", force: :cascade do |t|
     t.string "provider", default: "", null: false
     t.string "uid", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "user_id"
+    t.index ["uid", "provider"], name: "index_identities_on_uid_and_provider", unique: true
     t.index ["user_id"], name: "index_identities_on_user_id"
   end
 
@@ -532,10 +732,20 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "updated_at", precision: nil, null: false
     t.string "data_file_name"
     t.string "data_content_type"
-    t.integer "data_file_size"
     t.datetime "data_updated_at", precision: nil
     t.bigint "account_id", null: false
     t.boolean "overwrite", default: false, null: false
+    t.integer "data_file_size"
+  end
+
+  create_table "instance_infos", force: :cascade do |t|
+    t.string "domain", default: "", null: false
+    t.string "software", default: "", null: false
+    t.string "version", default: "", null: false
+    t.jsonb "data", default: {}, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["domain"], name: "index_instance_infos_on_domain", unique: true
   end
 
   create_table "invites", force: :cascade do |t|
@@ -573,6 +783,15 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"
   end
 
+  create_table "list_statuses", force: :cascade do |t|
+    t.bigint "list_id", null: false
+    t.bigint "status_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["list_id", "status_id"], name: "index_list_statuses_on_list_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_list_statuses_on_status_id"
+  end
+
   create_table "lists", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.string "title", default: "", null: false
@@ -580,6 +799,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "updated_at", precision: nil, null: false
     t.integer "replies_policy", default: 0, null: false
     t.boolean "exclusive", default: false, null: false
+    t.boolean "notify", default: false, null: false
     t.index ["account_id"], name: "index_lists_on_account_id"
   end
 
@@ -609,7 +829,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.bigint "status_id"
     t.string "file_file_name"
     t.string "file_content_type"
-    t.integer "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.string "remote_url", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -625,10 +844,12 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.integer "file_storage_schema_version"
     t.string "thumbnail_file_name"
     t.string "thumbnail_content_type"
-    t.integer "thumbnail_file_size"
     t.datetime "thumbnail_updated_at", precision: nil
     t.string "thumbnail_remote_url"
+    t.integer "file_file_size"
+    t.integer "thumbnail_file_size"
     t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
+    t.index ["id"], name: "index_media_attachments_vacuum", where: "((file_file_name IS NOT NULL) AND ((remote_url)::text <> ''::text))"
     t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id", where: "(scheduled_status_id IS NOT NULL)"
     t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true, opclass: :text_pattern_ops, where: "(shortcode IS NOT NULL)"
     t.index ["status_id"], name: "index_media_attachments_on_status_id"
@@ -655,6 +876,121 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
   end
 
+  create_table "ng_rule_histories", force: :cascade do |t|
+    t.bigint "ng_rule_id", null: false
+    t.bigint "account_id"
+    t.string "text"
+    t.string "uri"
+    t.integer "reason", null: false
+    t.integer "reason_action", null: false
+    t.boolean "local", default: true, null: false
+    t.boolean "hidden", default: false, null: false
+    t.jsonb "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_at"], name: "index_ng_rule_histories_on_created_at"
+    t.index ["ng_rule_id", "account_id"], name: "index_ng_rule_histories_on_ng_rule_id_and_account_id"
+    t.index ["uri"], name: "index_ng_rule_histories_on_uri"
+  end
+
+  create_table "ng_rules", force: :cascade do |t|
+    t.string "title", default: "", null: false
+    t.boolean "available", default: true, null: false
+    t.boolean "record_history_also_local", default: true, null: false
+    t.string "account_domain", default: "", null: false
+    t.string "account_username", default: "", null: false
+    t.string "account_display_name", default: "", null: false
+    t.string "account_note", default: "", null: false
+    t.string "account_field_name", default: "", null: false
+    t.string "account_field_value", default: "", null: false
+    t.integer "account_avatar_state", default: 0, null: false
+    t.integer "account_header_state", default: 0, null: false
+    t.boolean "account_include_local", default: true, null: false
+    t.boolean "account_allow_followed_by_local", default: false, null: false
+    t.string "status_spoiler_text", default: "", null: false
+    t.string "status_text", default: "", null: false
+    t.string "status_tag", default: "", null: false
+    t.string "status_visibility", default: [], null: false, array: true
+    t.string "status_searchability", default: [], null: false, array: true
+    t.integer "status_media_state", default: 0, null: false
+    t.integer "status_sensitive_state", default: 0, null: false
+    t.integer "status_cw_state", default: 0, null: false
+    t.integer "status_poll_state", default: 0, null: false
+    t.integer "status_quote_state", default: 0, null: false
+    t.integer "status_reply_state", default: 0, null: false
+    t.integer "status_mention_state", default: 0, null: false
+    t.integer "status_reference_state", default: 0, null: false
+    t.integer "status_tag_threshold", default: -1, null: false
+    t.integer "status_media_threshold", default: -1, null: false
+    t.integer "status_poll_threshold", default: -1, null: false
+    t.integer "status_mention_threshold", default: -1, null: false
+    t.boolean "status_allow_follower_mention", default: true, null: false
+    t.integer "status_reference_threshold", default: -1, null: false
+    t.string "reaction_type", default: [], null: false, array: true
+    t.boolean "reaction_allow_follower", default: true, null: false
+    t.string "emoji_reaction_name", default: "", null: false
+    t.string "emoji_reaction_origin_domain", default: "", null: false
+    t.datetime "expires_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "ng_words", force: :cascade do |t|
+    t.string "keyword", null: false
+    t.boolean "regexp", default: false, null: false
+    t.boolean "stranger", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "ngword_histories", force: :cascade do |t|
+    t.string "uri", null: false
+    t.integer "target_type", null: false
+    t.integer "reason", null: false
+    t.string "text", null: false
+    t.string "keyword", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "count", default: 0, null: false
+    t.index ["created_at"], name: "index_ngword_histories_on_created_at"
+    t.index ["uri", "keyword", "created_at"], name: "index_ngword_histories_on_uri_and_keyword_and_created_at"
+    t.index ["uri", "reason", "created_at"], name: "index_ngword_histories_on_uri_and_reason_and_created_at"
+  end
+
+  create_table "notification_permissions", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "from_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_notification_permissions_on_account_id"
+    t.index ["from_account_id"], name: "index_notification_permissions_on_from_account_id"
+  end
+
+  create_table "notification_policies", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.boolean "filter_not_following", default: false, null: false
+    t.boolean "filter_not_followers", default: false, null: false
+    t.boolean "filter_new_accounts", default: false, null: false
+    t.boolean "filter_private_mentions", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_notification_policies_on_account_id", unique: true
+  end
+
+  create_table "notification_requests", id: :bigint, default: -> { "timestamp_id('notification_requests'::text)" }, force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "from_account_id", null: false
+    t.bigint "last_status_id"
+    t.bigint "notifications_count", default: 0, null: false
+    t.boolean "dismissed", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "from_account_id"], name: "index_notification_requests_on_account_id_and_from_account_id", unique: true
+    t.index ["account_id", "id"], name: "index_notification_requests_on_account_id_and_id", order: { id: :desc }, where: "(dismissed = false)"
+    t.index ["from_account_id"], name: "index_notification_requests_on_from_account_id"
+    t.index ["last_status_id"], name: "index_notification_requests_on_last_status_id"
+  end
+
   create_table "notifications", force: :cascade do |t|
     t.bigint "activity_id", null: false
     t.string "activity_type", null: false
@@ -663,7 +999,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.bigint "account_id", null: false
     t.bigint "from_account_id", null: false
     t.string "type"
+    t.boolean "filtered", default: false, null: false
     t.index ["account_id", "id", "type"], name: "index_notifications_on_account_id_and_id_and_type", order: { id: :desc }
+    t.index ["account_id", "id", "type"], name: "index_notifications_on_filtered", order: { id: :desc }, where: "(filtered = false)"
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
     t.index ["from_account_id"], name: "index_notifications_on_from_account_id"
   end
@@ -726,6 +1064,28 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["key_id"], name: "index_one_time_keys_on_key_id"
   end
 
+  create_table "pending_follow_requests", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
+    t.string "uri", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "idx_on_account_id_target_account_id_46f2a00f12", unique: true
+    t.index ["target_account_id"], name: "index_pending_follow_requests_on_target_account_id"
+    t.index ["uri"], name: "index_pending_follow_requests_on_uri", unique: true
+  end
+
+  create_table "pending_statuses", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "fetch_account_id", null: false
+    t.string "uri", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_pending_statuses_on_account_id"
+    t.index ["fetch_account_id"], name: "index_pending_statuses_on_fetch_account_id"
+    t.index ["uri"], name: "index_pending_statuses_on_uri", unique: true
+  end
+
   create_table "pghero_space_stats", force: :cascade do |t|
     t.text "database"
     t.text "schema"
@@ -793,7 +1153,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "description", default: "", null: false
     t.string "image_file_name"
     t.string "image_content_type"
-    t.integer "image_file_size"
     t.datetime "image_updated_at", precision: nil
     t.integer "type", default: 0, null: false
     t.text "html", default: "", null: false
@@ -815,6 +1174,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.integer "link_type"
     t.datetime "published_at"
     t.string "image_description", default: "", null: false
+    t.integer "image_file_size"
+    t.index ["id"], name: "index_preview_cards_vacuum", where: "((image_file_name IS NOT NULL) AND ((image_file_name)::text <> ''::text))"
     t.index ["url"], name: "index_preview_cards_on_url", unique: true
   end
 
@@ -824,6 +1185,15 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "url"
   end
 
+  create_table "relationship_severance_events", force: :cascade do |t|
+    t.integer "type", null: false
+    t.string "target_name", null: false
+    t.boolean "purged", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["type", "target_name"], name: "index_relationship_severance_events_on_type_and_target_name"
+  end
+
   create_table "relays", force: :cascade do |t|
     t.string "inbox_url", default: "", null: false
     t.string "follow_activity_id"
@@ -868,6 +1238,18 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.text "text", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.text "hint", default: "", null: false
+  end
+
+  create_table "scheduled_expiration_statuses", force: :cascade do |t|
+    t.bigint "account_id"
+    t.bigint "status_id", null: false
+    t.datetime "scheduled_at", precision: nil
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.index ["account_id"], name: "index_scheduled_expiration_statuses_on_account_id"
+    t.index ["scheduled_at"], name: "index_scheduled_expiration_statuses_on_scheduled_at"
+    t.index ["status_id"], name: "index_scheduled_expiration_statuses_on_status_id"
   end
 
   create_table "scheduled_statuses", force: :cascade do |t|
@@ -878,6 +1260,15 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["scheduled_at"], name: "index_scheduled_statuses_on_scheduled_at"
   end
 
+  create_table "sensitive_words", force: :cascade do |t|
+    t.string "keyword", null: false
+    t.boolean "regexp", default: false, null: false
+    t.boolean "remote", default: false, null: false
+    t.boolean "spoiler", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "session_activations", force: :cascade do |t|
     t.string "session_id", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -902,16 +1293,31 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
   end
 
+  create_table "severed_relationships", force: :cascade do |t|
+    t.bigint "relationship_severance_event_id", null: false
+    t.bigint "local_account_id", null: false
+    t.bigint "remote_account_id", null: false
+    t.integer "direction", null: false
+    t.boolean "show_reblogs"
+    t.boolean "notify"
+    t.string "languages", array: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["local_account_id", "relationship_severance_event_id"], name: "index_severed_relationships_on_local_account_and_event"
+    t.index ["relationship_severance_event_id", "local_account_id", "direction", "remote_account_id"], name: "index_severed_relationships_on_unique_tuples", unique: true
+    t.index ["remote_account_id"], name: "index_severed_relationships_on_remote_account_id"
+  end
+
   create_table "site_uploads", force: :cascade do |t|
     t.string "var", default: "", null: false
     t.string "file_file_name"
     t.string "file_content_type"
-    t.integer "file_file_size"
     t.datetime "file_updated_at", precision: nil
     t.json "meta"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.string "blurhash"
+    t.integer "file_file_size"
     t.index ["var"], name: "index_site_uploads_on_var", unique: true
   end
 
@@ -925,6 +1331,23 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["version"], name: "index_software_updates_on_version", unique: true
   end
 
+  create_table "specified_domains", force: :cascade do |t|
+    t.string "domain", null: false
+    t.integer "table", default: 0, null: false
+    t.jsonb "options", default: {}, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["domain", "table"], name: "index_specified_domains_on_domain_and_table", unique: true
+  end
+
+  create_table "status_capability_tokens", force: :cascade do |t|
+    t.bigint "status_id", null: false
+    t.string "token"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["status_id"], name: "index_status_capability_tokens_on_status_id"
+  end
+
   create_table "status_edits", force: :cascade do |t|
     t.bigint "status_id", null: false
     t.bigint "account_id"
@@ -936,6 +1359,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.text "media_descriptions", array: true
     t.string "poll_options", array: true
     t.boolean "sensitive"
+    t.boolean "markdown", default: false
     t.index ["account_id"], name: "index_status_edits_on_account_id"
     t.index ["status_id"], name: "index_status_edits_on_status_id"
   end
@@ -943,12 +1367,23 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   create_table "status_pins", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "status_id", null: false
-    t.datetime "created_at", precision: nil, default: -> { "now()" }, null: false
-    t.datetime "updated_at", precision: nil, default: -> { "now()" }, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_status_pins_on_status_id"
   end
 
+  create_table "status_references", force: :cascade do |t|
+    t.bigint "status_id", null: false
+    t.bigint "target_status_id", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.string "attribute_type"
+    t.boolean "quote", default: false, null: false
+    t.index ["status_id"], name: "index_status_references_on_status_id"
+    t.index ["target_status_id"], name: "index_status_references_on_target_status_id"
+  end
+
   create_table "status_stats", force: :cascade do |t|
     t.bigint "status_id", null: false
     t.bigint "replies_count", default: 0, null: false
@@ -956,6 +1391,10 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.bigint "favourites_count", default: 0, null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.string "emoji_reactions"
+    t.integer "emoji_reactions_count", default: 0, null: false
+    t.integer "emoji_reaction_accounts_count", default: 0, null: false
+    t.integer "status_referred_by_count", default: 0, null: false
     t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
   end
 
@@ -993,15 +1432,23 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "edited_at", precision: nil
     t.boolean "trendable"
     t.bigint "ordered_media_attachment_ids", array: true
+    t.integer "searchability"
+    t.boolean "markdown", default: false
+    t.integer "limited_scope"
+    t.bigint "quote_of_id"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
+    t.index ["account_id", "reblog_of_id", "deleted_at", "searchability"], name: "index_statuses_for_get_following_accounts_to_search", where: "((deleted_at IS NULL) AND (reblog_of_id IS NULL) AND (searchability = ANY (ARRAY[0, 10, 1])))"
     t.index ["account_id"], name: "index_statuses_on_account_id"
+    t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
-    t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
-    t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
+    t.index ["id", "account_id"], name: "index_statuses_local_20231213", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = ANY (ARRAY[0, 10, 11])) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
+    t.index ["id", "account_id"], name: "index_statuses_public_20231213", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = ANY (ARRAY[0, 10, 11])) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id", where: "(in_reply_to_account_id IS NOT NULL)"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", where: "(in_reply_to_id IS NOT NULL)"
+    t.index ["quote_of_id", "account_id"], name: "index_statuses_on_quote_of_id_and_account_id"
     t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
     t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
+    t.index ["url"], name: "index_statuses_on_url", opclass: :text_pattern_ops, where: "((url IS NOT NULL) AND ((url)::text <> (uri)::text))"
   end
 
   create_table "statuses_tags", primary_key: ["tag_id", "status_id"], force: :cascade do |t|
@@ -1086,7 +1533,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at", precision: nil
     t.datetime "last_sign_in_at", precision: nil
-    t.boolean "admin", default: false, null: false
     t.string "confirmation_token"
     t.datetime "confirmed_at", precision: nil
     t.datetime "confirmation_sent_at", precision: nil
@@ -1101,7 +1547,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.string "otp_backup_codes", array: true
     t.bigint "account_id", null: false
     t.boolean "disabled", default: false, null: false
-    t.boolean "moderator", default: false, null: false
     t.bigint "invite_id"
     t.string "chosen_languages", array: true
     t.bigint "created_by_application_id"
@@ -1114,6 +1559,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.bigint "role_id"
     t.text "settings"
     t.string "time_zone"
+    t.string "otp_secret"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"
@@ -1153,6 +1599,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["external_id"], name: "index_webauthn_credentials_on_external_id", unique: true
+    t.index ["user_id", "nickname"], name: "index_webauthn_credentials_on_user_id_and_nickname", unique: true
     t.index ["user_id"], name: "index_webauthn_credentials_on_user_id"
   end
 
@@ -1180,6 +1627,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "account_notes", "accounts", on_delete: :cascade
   add_foreign_key "account_pins", "accounts", column: "target_account_id", on_delete: :cascade
   add_foreign_key "account_pins", "accounts", on_delete: :cascade
+  add_foreign_key "account_relationship_severance_events", "accounts", on_delete: :cascade
+  add_foreign_key "account_relationship_severance_events", "relationship_severance_events", on_delete: :cascade
   add_foreign_key "account_stats", "accounts", on_delete: :cascade
   add_foreign_key "account_statuses_cleanup_policies", "accounts", on_delete: :cascade
   add_foreign_key "account_warnings", "accounts", column: "target_account_id", on_delete: :cascade
@@ -1192,6 +1641,12 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "announcement_reactions", "accounts", on_delete: :cascade
   add_foreign_key "announcement_reactions", "announcements", on_delete: :cascade
   add_foreign_key "announcement_reactions", "custom_emojis", on_delete: :cascade
+  add_foreign_key "antenna_accounts", "accounts", on_delete: :cascade
+  add_foreign_key "antenna_accounts", "antennas", on_delete: :cascade
+  add_foreign_key "antenna_domains", "antennas", on_delete: :cascade
+  add_foreign_key "antenna_tags", "antennas", on_delete: :cascade
+  add_foreign_key "antenna_tags", "tags", on_delete: :cascade
+  add_foreign_key "antennas", "accounts", on_delete: :cascade
   add_foreign_key "appeals", "account_warnings", on_delete: :cascade
   add_foreign_key "appeals", "accounts", column: "approved_by_account_id", on_delete: :nullify
   add_foreign_key "appeals", "accounts", column: "rejected_by_account_id", on_delete: :nullify
@@ -1199,11 +1654,21 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "backups", "users", on_delete: :nullify
   add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade
   add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
+  add_foreign_key "bookmark_categories", "accounts", on_delete: :cascade
+  add_foreign_key "bookmark_category_statuses", "bookmark_categories", on_delete: :cascade
+  add_foreign_key "bookmark_category_statuses", "bookmarks", on_delete: :cascade
+  add_foreign_key "bookmark_category_statuses", "statuses", on_delete: :cascade
   add_foreign_key "bookmarks", "accounts", on_delete: :cascade
   add_foreign_key "bookmarks", "statuses", on_delete: :cascade
   add_foreign_key "bulk_import_rows", "bulk_imports", on_delete: :cascade
   add_foreign_key "bulk_imports", "accounts", on_delete: :cascade
   add_foreign_key "canonical_email_blocks", "accounts", column: "reference_account_id", on_delete: :cascade
+  add_foreign_key "circle_accounts", "accounts", on_delete: :cascade
+  add_foreign_key "circle_accounts", "circles", on_delete: :cascade
+  add_foreign_key "circle_accounts", "follows", on_delete: :cascade
+  add_foreign_key "circle_statuses", "circles", on_delete: :cascade
+  add_foreign_key "circle_statuses", "statuses", on_delete: :cascade
+  add_foreign_key "circles", "accounts", on_delete: :cascade
   add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
   add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
   add_foreign_key "custom_filter_keywords", "custom_filters", on_delete: :cascade
@@ -1213,6 +1678,9 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "devices", "accounts", on_delete: :cascade
   add_foreign_key "devices", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
   add_foreign_key "email_domain_blocks", "email_domain_blocks", column: "parent_id", on_delete: :cascade
+  add_foreign_key "emoji_reactions", "accounts", on_delete: :cascade
+  add_foreign_key "emoji_reactions", "custom_emojis", on_delete: :cascade
+  add_foreign_key "emoji_reactions", "statuses", on_delete: :cascade
   add_foreign_key "encrypted_messages", "accounts", column: "from_account_id", on_delete: :cascade
   add_foreign_key "encrypted_messages", "devices", on_delete: :cascade
   add_foreign_key "favourites", "accounts", name: "fk_5eb6c2b873", on_delete: :cascade
@@ -1226,6 +1694,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
   add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
   add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
+  add_foreign_key "generated_annual_reports", "accounts"
   add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
   add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
   add_foreign_key "invites", "users", on_delete: :cascade
@@ -1233,6 +1702,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "list_accounts", "follow_requests", on_delete: :cascade
   add_foreign_key "list_accounts", "follows", on_delete: :cascade
   add_foreign_key "list_accounts", "lists", on_delete: :cascade
+  add_foreign_key "list_statuses", "lists", on_delete: :cascade
+  add_foreign_key "list_statuses", "statuses", on_delete: :cascade
   add_foreign_key "lists", "accounts", on_delete: :cascade
   add_foreign_key "login_activities", "users", on_delete: :cascade
   add_foreign_key "markers", "users", on_delete: :cascade
@@ -1243,6 +1714,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "mentions", "statuses", on_delete: :cascade
   add_foreign_key "mutes", "accounts", column: "target_account_id", name: "fk_eecff219ea", on_delete: :cascade
   add_foreign_key "mutes", "accounts", name: "fk_b8d8daf315", on_delete: :cascade
+  add_foreign_key "ng_rule_histories", "accounts"
+  add_foreign_key "ng_rule_histories", "ng_rules"
+  add_foreign_key "notification_permissions", "accounts"
+  add_foreign_key "notification_permissions", "accounts", column: "from_account_id"
+  add_foreign_key "notification_policies", "accounts", on_delete: :cascade
+  add_foreign_key "notification_requests", "accounts", column: "from_account_id", on_delete: :cascade
+  add_foreign_key "notification_requests", "accounts", on_delete: :cascade
+  add_foreign_key "notification_requests", "statuses", column: "last_status_id", on_delete: :nullify
   add_foreign_key "notifications", "accounts", column: "from_account_id", name: "fk_fbd6b0bf9e", on_delete: :cascade
   add_foreign_key "notifications", "accounts", name: "fk_c141c8ee55", on_delete: :cascade
   add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id", name: "fk_34d54b0a33", on_delete: :cascade
@@ -1251,6 +1730,10 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "oauth_access_tokens", "users", column: "resource_owner_id", name: "fk_e84df68546", on_delete: :cascade
   add_foreign_key "oauth_applications", "users", column: "owner_id", name: "fk_b0988c7c0a", on_delete: :cascade
   add_foreign_key "one_time_keys", "devices", on_delete: :cascade
+  add_foreign_key "pending_follow_requests", "accounts", column: "target_account_id", on_delete: :cascade
+  add_foreign_key "pending_follow_requests", "accounts", on_delete: :cascade
+  add_foreign_key "pending_statuses", "accounts", column: "fetch_account_id", on_delete: :cascade
+  add_foreign_key "pending_statuses", "accounts", on_delete: :cascade
   add_foreign_key "poll_votes", "accounts", on_delete: :cascade
   add_foreign_key "poll_votes", "polls", on_delete: :cascade
   add_foreign_key "polls", "accounts", on_delete: :cascade
@@ -1262,13 +1745,21 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "reports", "accounts", column: "assigned_account_id", on_delete: :nullify
   add_foreign_key "reports", "accounts", column: "target_account_id", name: "fk_eb37af34f0", on_delete: :cascade
   add_foreign_key "reports", "accounts", name: "fk_4b81f7522c", on_delete: :cascade
+  add_foreign_key "scheduled_expiration_statuses", "accounts", on_delete: :cascade
+  add_foreign_key "scheduled_expiration_statuses", "statuses", on_delete: :cascade
   add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade
   add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade
   add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade
+  add_foreign_key "severed_relationships", "accounts", column: "local_account_id", on_delete: :cascade
+  add_foreign_key "severed_relationships", "accounts", column: "remote_account_id", on_delete: :cascade
+  add_foreign_key "severed_relationships", "relationship_severance_events", on_delete: :cascade
+  add_foreign_key "status_capability_tokens", "statuses", on_delete: :cascade
   add_foreign_key "status_edits", "accounts", on_delete: :nullify
   add_foreign_key "status_edits", "statuses", on_delete: :cascade
   add_foreign_key "status_pins", "accounts", name: "fk_d4cb435b62", on_delete: :cascade
   add_foreign_key "status_pins", "statuses", on_delete: :cascade
+  add_foreign_key "status_references", "statuses", column: "target_status_id", on_delete: :cascade
+  add_foreign_key "status_references", "statuses", on_delete: :cascade
   add_foreign_key "status_stats", "statuses", on_delete: :cascade
   add_foreign_key "status_trends", "accounts", on_delete: :cascade
   add_foreign_key "status_trends", "statuses", on_delete: :cascade
diff --git a/db/seeds/02_instance_actor.rb b/db/seeds/02_instance_actor.rb
index 55e83e8a08..2b6befec0d 100644
--- a/db/seeds/02_instance_actor.rb
+++ b/db/seeds/02_instance_actor.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Account.create_with(actor_type: 'Application', locked: true, username: 'mastodon.internal').find_or_create_by(id: -99)
+Account.create_with(actor_type: 'Application', locked: true, username: 'mastodon.internal').find_or_create_by(id: Account::INSTANCE_ACTOR_ID)
diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb
index c9b0369c9f..887b4a2213 100644
--- a/db/seeds/04_admin.rb
+++ b/db/seeds/04_admin.rb
@@ -7,5 +7,7 @@ if Rails.env.development?
   admin = Account.where(username: 'admin').first_or_initialize(username: 'admin')
   admin.save(validate: false)
 
-  User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true).save!
+  user = User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true)
+  user.save!
+  user.approve!
 end
diff --git a/dist/nginx-before-certbot.conf b/dist/nginx-before-certbot.conf
new file mode 100644
index 0000000000..bc8aedfe77
--- /dev/null
+++ b/dist/nginx-before-certbot.conf
@@ -0,0 +1,7 @@
+server {
+  listen 80;
+  listen [::]:80;
+  server_name example.com;
+  root /home/mastodon/live/public;
+  location /.well-known/acme-challenge/ { allow all; }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 93451d9611..e9b5b0a478 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   db:
     restart: always
@@ -56,7 +55,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -76,8 +75,10 @@ services:
       - ./public/system:/mastodon/public/system
 
   streaming:
-    build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    build:
+      context: .
+      dockerfile: streaming/Dockerfile
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -95,7 +96,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.2.0
+    image: ghcr.io/mastodon/mastodon:v4.2.7
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/install/12.0/setup-imagemagick-7.sh b/install/12.0/setup-imagemagick-7.sh
new file mode 100644
index 0000000000..6a769001dd
--- /dev/null
+++ b/install/12.0/setup-imagemagick-7.sh
@@ -0,0 +1,82 @@
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Remove old ImageMagick
+
+EOF
+
+apt remove -y imagemagick
+apt autoremove -y
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Download source
+
+EOF
+
+git clone https://github.com/ImageMagick/ImageMagick.git ImageMagick
+cd ImageMagick
+git checkout $(git tag -l | grep -E '^7' | sort -V | tail -n 1)
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Install dependent packages
+
+EOF
+
+apt update
+apt install -y \
+    libjpeg-dev libpng-dev libpng16-16 libltdl-dev libheif-dev libraw-dev libtiff-dev libopenjp2-tools \
+    libopenjp2-7-dev libjpeg-turbo-progs libfreetype6-dev libheif-dev libfreetype6-dev libopenexr-dev \
+    libwebp-dev libgif-dev
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Configure
+
+EOF
+
+./configure --with-modules --enable-file-type --with-quantum-depth=32 --with-jpeg=yes --with-png=yes \
+    --with-gif=yes --with-webp=yes --with-heic=yes --with-raw=yes --with-tiff=yes --with-openjp2 \
+    --with-freetype=yes --with-webp=yes --with-openexr=yes --with-gslib=yes --with-gif=yes --with-perl=yes \
+    --with-jxl=yes
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make
+
+EOF
+
+make
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make install
+
+EOF
+
+make install
+ldconfig /usr/local/lib
+
+cat << EOF
+
+=========== [imagemagick 7 setup script completed] ===============
+ImageMagick 7 setup is completed!
+Please check AVIF format on your Mastodon.
+
+To check ImageMagick version:
+  exec bash
+  convert -version
+
+Or
+  sudo su - mastodon
+  convert -version
+
+EOF
+
diff --git a/install/12.0/setup1.sh b/install/12.0/setup1.sh
new file mode 100755
index 0000000000..180bc1832b
--- /dev/null
+++ b/install/12.0/setup1.sh
@@ -0,0 +1,209 @@
+VERSION=12.0
+
+cat << EOF
+
+Hello, new kmyblue admin.
+
+================== [kmyblue setup script 1] ======================
+INPUT kmyblue version for install
+
+  - lts   : [RECOMMENDED] The long time support version
+  - latest: The latest version
+
+  - debug : [deprecated] The version in development
+  - abort : Abort the setup script
+
+EOF
+
+KMYBLUE_VERSION=unset
+until [ "$KMYBLUE_VERSION" == "lts" ] || [ "$KMYBLUE_VERSION" == "latest" ] || [ "$KMYBLUE_VERSION" == "debug" ] || [ "$KMYBLUE_VERSION" == "abort" ]
+do
+  echo -n "kmyblue version for install [lts/latest/debug/abort]: "
+  read KMYBLUE_VERSION
+done
+
+if [ "$KMYBLUE_VERSION" == "abort" ]; then
+  echo Good bye.
+  exit
+fi
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+apt updates and upgrades
+
+EOF
+
+apt update && apt upgrade -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install basis softwares
+
+EOF
+
+apt install -y curl wget gnupg apt-transport-https lsb-release ca-certificates
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install Node.js
+
+EOF
+
+# Node.js
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+sudo apt-get update && sudo apt-get install nodejs -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install PostgreSQL
+
+EOF
+
+# PostgreSQL
+wget -O /usr/share/keyrings/postgresql.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc
+echo "deb [signed-by=/usr/share/keyrings/postgresql.asc] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install packages
+
+EOF
+
+# 必要なパッケージをまとめてインストール
+apt update
+apt install -y \
+  imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core \
+  g++ libprotobuf-dev protobuf-compiler pkg-config nodejs gcc autoconf \
+  bison build-essential libssl-dev libyaml-dev libreadline6-dev \
+  zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev \
+  nginx redis-server redis-tools postgresql postgresql-contrib \
+  certbot python3-certbot-nginx libidn11-dev libicu-dev libjemalloc-dev
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Initialize yarn
+
+EOF
+
+corepack enable
+yarn set version classic
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install requested package
+
+EOF
+
+# Mastodonパッケージにもnode-gypは入ってるけど、npmのほうからグローバルにインストールしないと
+# yarn installで一部のOptionalパッケージインストール時にエラーが出てしまう様子
+npm i -g node-gyp
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Add mastodon user
+
+Input user information (No need to type)
+
+EOF
+
+# mastodonユーザーを追加
+adduser --disabled-login mastodon
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Create PostgreSQL mastodon user
+
+EOF
+
+# PostgreSQLにmastodonユーザーを追加
+sudo -u postgres psql << EOF
+  CREATE USER mastodon WITH PASSWORD 'ohagi' CREATEDB;
+EOF
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Download kmyblue
+
+EOF
+
+# kmyblueソースコードをダウンロード
+# 続きのシェルスクリプトをgit管理外にコピーし権限を与える
+su - mastodon <<EOF
+git clone https://github.com/kmycode/mastodon.git live
+cp /home/mastodon/live/install/$VERSION/setup2.sh /home/mastodon/setup2.sh
+chmod +x /home/mastodon/setup2.sh
+EOF
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Checkout tag on kmyblue repository
+
+EOF
+
+# kmyblueのリポジトリをチェックアウト
+cd /home/mastodon/live
+git config --global --add safe.directory /home/mastodon/live
+if [ "$KMYBLUE_VERSION" == "debug" ]; then
+  echo 'DEBUG'
+elif [ "$KMYBLUE_VERSION" == "newest" ] || [ "$KMYBLUE_VERSION" == "latest" ]; then
+  sudo -u mastodon git checkout $(git tag -l | grep -E '^kb[0-9]' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+else
+  # LTS
+  sudo -u mastodon git checkout $(git tag -l | grep -E '^kb[0-9].*lts$' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+fi
+git config --global --unset safe.directory /home/mastodon/live
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install rbenv to control Ruby versions
+
+EOF
+
+# Rubyバージョン管理用のrbenvをインストール、初期設定
+su - mastodon <<EOF
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+cd ~/.rbenv && src/configure && make -C src
+echo 'export PATH="\$HOME/.rbenv/bin:\$PATH"' >> ~/.bashrc
+echo 'eval "\$(rbenv init -)"' >> ~/.bashrc
+EOF
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Copy setting files and services
+
+EOF
+
+# これを設定しておかないと、Web表示時にNginxがPermission Errorを起こす
+chmod o+x /home/mastodon
+
+# 必要なファイルをコピー
+cp /home/mastodon/live/dist/nginx.conf /etc/nginx/sites-available/mastodon
+ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
+cp /home/mastodon/live/dist/mastodon-*.service /etc/systemd/system/
+systemctl daemon-reload
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 1 completed] ================
+
+Input this command to continue setup:
+  sudo su - mastodon
+  ./setup2.sh
+
+EOF
diff --git a/install/12.0/setup2.sh b/install/12.0/setup2.sh
new file mode 100644
index 0000000000..847cc62dd5
--- /dev/null
+++ b/install/12.0/setup2.sh
@@ -0,0 +1,68 @@
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install Ruby
+
+EOF
+
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 3.2.3
+rbenv global 3.2.3
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install Ruby bundler
+
+EOF
+
+gem install bundler --no-document
+
+cd ~/live
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install yarn packages
+
+EOF
+
+yarn install
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install bundle packages
+
+EOF
+
+bundle config deployment 'true'
+bundle config without 'development test'
+bundle install -j$(getconf _NPROCESSORS_ONLN)
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 2 completed] ================
+
+PostgreSQL and Redis are now available on localhost.
+
+* PostgreSQL
+    host     : /var/run/postgresql
+    user     : mastodon
+    database : mastodon_production
+    password : ohagi
+
+* Redis
+    host     : localhost
+    password is empty
+
+[IMPORTANT] Check PostgreSQL password before setup!
+
+Input this command to finish setup:
+  cd live
+  RAILS_ENV=production bundle exec rake mastodon:setup
+
+EOF
+
diff --git a/install/5.0/setup-imagemagick-7.sh b/install/5.0/setup-imagemagick-7.sh
new file mode 100644
index 0000000000..6a769001dd
--- /dev/null
+++ b/install/5.0/setup-imagemagick-7.sh
@@ -0,0 +1,82 @@
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Remove old ImageMagick
+
+EOF
+
+apt remove -y imagemagick
+apt autoremove -y
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Download source
+
+EOF
+
+git clone https://github.com/ImageMagick/ImageMagick.git ImageMagick
+cd ImageMagick
+git checkout $(git tag -l | grep -E '^7' | sort -V | tail -n 1)
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Install dependent packages
+
+EOF
+
+apt update
+apt install -y \
+    libjpeg-dev libpng-dev libpng16-16 libltdl-dev libheif-dev libraw-dev libtiff-dev libopenjp2-tools \
+    libopenjp2-7-dev libjpeg-turbo-progs libfreetype6-dev libheif-dev libfreetype6-dev libopenexr-dev \
+    libwebp-dev libgif-dev
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Configure
+
+EOF
+
+./configure --with-modules --enable-file-type --with-quantum-depth=32 --with-jpeg=yes --with-png=yes \
+    --with-gif=yes --with-webp=yes --with-heic=yes --with-raw=yes --with-tiff=yes --with-openjp2 \
+    --with-freetype=yes --with-webp=yes --with-openexr=yes --with-gslib=yes --with-gif=yes --with-perl=yes \
+    --with-jxl=yes
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make
+
+EOF
+
+make
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make install
+
+EOF
+
+make install
+ldconfig /usr/local/lib
+
+cat << EOF
+
+=========== [imagemagick 7 setup script completed] ===============
+ImageMagick 7 setup is completed!
+Please check AVIF format on your Mastodon.
+
+To check ImageMagick version:
+  exec bash
+  convert -version
+
+Or
+  sudo su - mastodon
+  convert -version
+
+EOF
+
diff --git a/install/5.0/setup1.sh b/install/5.0/setup1.sh
new file mode 100644
index 0000000000..a6a40723c2
--- /dev/null
+++ b/install/5.0/setup1.sh
@@ -0,0 +1,140 @@
+VERSION=5.0
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+apt updates and upgrades
+
+EOF
+
+apt update && apt upgrade -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install basis softwares
+
+EOF
+
+apt install -y curl wget gnupg apt-transport-https lsb-release ca-certificates
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install Node.js
+
+EOF
+
+# Node.js
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+sudo apt-get update && sudo apt-get install nodejs -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install PostgreSQL
+
+EOF
+
+# PostgreSQL
+wget -O /usr/share/keyrings/postgresql.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc
+echo "deb [signed-by=/usr/share/keyrings/postgresql.asc] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install packages
+
+EOF
+
+# 必要なパッケージをまとめてインストール
+apt update
+apt install -y \
+  imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core \
+  g++ libprotobuf-dev protobuf-compiler pkg-config nodejs gcc autoconf \
+  bison build-essential libssl-dev libyaml-dev libreadline6-dev \
+  zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev \
+  nginx redis-server redis-tools postgresql postgresql-contrib \
+  certbot python3-certbot-nginx libidn11-dev libicu-dev libjemalloc-dev
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Initialize yarn
+
+EOF
+
+corepack enable
+yarn set version classic
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install requested package
+
+EOF
+
+# Mastodonパッケージにもnode-gypは入ってるけど、npmのほうからグローバルにインストールしないと
+# yarn installで一部のOptionalパッケージインストール時にエラーが出てしまう様子
+npm i -g node-gyp
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Add mastodon user
+
+Input user information (No need to type)
+
+EOF
+
+# mastodonユーザーを追加
+adduser --disabled-login mastodon
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Create PostgreSQL mastodon user
+
+EOF
+
+# PostgreSQLにmastodonユーザーを追加
+sudo -u postgres psql << EOF
+  CREATE USER mastodon WITH PASSWORD 'ohagi' CREATEDB;
+EOF
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Download kmyblue
+
+EOF
+
+# kmyblueソースコードをダウンロード
+# 続きのシェルスクリプトをgit管理外にコピーし権限を与える
+su - mastodon <<EOF
+git clone https://github.com/kmycode/mastodon.git live
+cp /home/mastodon/live/install/$VERSION/setup2.sh /home/mastodon/setup2.sh
+cp /home/mastodon/live/install/$VERSION/setup3.sh /home/mastodon/setup3.sh
+cp /home/mastodon/live/install/$VERSION/setup4.sh /home/mastodon/setup4.sh
+chmod +x /home/mastodon/setup2.sh
+chmod +x /home/mastodon/setup3.sh
+chmod +x /home/mastodon/setup4.sh
+EOF
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 1 completed] ================
+
+Input this command to continue setup:
+  sudo su - mastodon
+  ./setup2.sh
+
+./setup2.sh parameters (kmyblue version selection):
+  ./setup2.sh          -- LTS
+  ./setup2.sh newest   -- Newest version
+  ./setup2.sh debug    -- [Deprecated] Newest commit
+
+EOF
diff --git a/install/5.0/setup2.sh b/install/5.0/setup2.sh
new file mode 100644
index 0000000000..be9667767d
--- /dev/null
+++ b/install/5.0/setup2.sh
@@ -0,0 +1,44 @@
+cd ~/live
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Checkout tag on kmyblue repository
+
+EOF
+
+# kmyblueの最新タグを取り込む
+if [ "$1" == "debug" ]; then
+  echo 'DEBUG'
+elif [ "$1" == "newest" ]; then
+  git checkout $(git tag -l | grep -E '^kb[0-9]' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+else
+  # LTS
+  git checkout $(git tag -l | grep -E '^kb[0-9].*lts$' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+fi
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install rbenv to control Ruby versions
+
+EOF
+
+# Rubyバージョン管理用のrbenvをインストール、初期設定
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+cd ~/.rbenv && src/configure && make -C src
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 2 completed] ================
+
+Input this command to continue setup:
+  exec bash
+  exit
+  sudo /home/mastodon/setup3.sh
+
+EOF
diff --git a/install/5.0/setup3.sh b/install/5.0/setup3.sh
new file mode 100644
index 0000000000..46d40b8b09
--- /dev/null
+++ b/install/5.0/setup3.sh
@@ -0,0 +1,27 @@
+cat << EOF
+
+================== [kmyblue setup script 3] ======================
+Copy setting files and services
+
+EOF
+
+# これを設定しておかないと、Web表示時にNginxがPermission Errorを起こす
+chmod o+x /home/mastodon
+
+# 必要なファイルをコピー
+cp /home/mastodon/live/dist/nginx.conf /etc/nginx/sites-available/mastodon
+ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
+cp /home/mastodon/live/dist/mastodon-*.service /etc/systemd/system/
+systemctl daemon-reload
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 3 completed] ================
+
+Input this command to continue setup:
+  sudo su - mastodon
+  ./setup4.sh
+
+EOF
diff --git a/install/5.0/setup4.sh b/install/5.0/setup4.sh
new file mode 100644
index 0000000000..4c946d9a41
--- /dev/null
+++ b/install/5.0/setup4.sh
@@ -0,0 +1,72 @@
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install Ruby
+
+EOF
+
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 3.2.3
+rbenv global 3.2.3
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install Ruby bundler
+
+EOF
+
+gem install bundler --no-document
+
+cd ~/live
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install yarn packages
+
+EOF
+
+yarn install --pure-lockfile
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install bundle packages
+
+EOF
+
+bundle config deployment 'true'
+bundle config without 'development test'
+bundle install -j$(getconf _NPROCESSORS_ONLN)
+
+rm ~/setup2.sh
+rm ~/setup3.sh
+rm ~/setup4.sh
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 4 completed] ================
+
+PostgreSQL and Redis are now available on localhost.
+
+* PostgreSQL
+    host     : /var/run/postgresql
+    user     : mastodon
+    database : mastodon_production
+    password : ohagi
+
+* Redis
+    host     : localhost
+    password is empty
+
+[IMPORTANT] Check PostgreSQL password before setup!
+
+Input this command to finish setup:
+  cd live
+  RAILS_ENV=production bundle exec rake mastodon:setup
+
+EOF
+
diff --git a/install/9.0/setup-imagemagick-7.sh b/install/9.0/setup-imagemagick-7.sh
new file mode 100644
index 0000000000..6a769001dd
--- /dev/null
+++ b/install/9.0/setup-imagemagick-7.sh
@@ -0,0 +1,82 @@
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Remove old ImageMagick
+
+EOF
+
+apt remove -y imagemagick
+apt autoremove -y
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Download source
+
+EOF
+
+git clone https://github.com/ImageMagick/ImageMagick.git ImageMagick
+cd ImageMagick
+git checkout $(git tag -l | grep -E '^7' | sort -V | tail -n 1)
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Install dependent packages
+
+EOF
+
+apt update
+apt install -y \
+    libjpeg-dev libpng-dev libpng16-16 libltdl-dev libheif-dev libraw-dev libtiff-dev libopenjp2-tools \
+    libopenjp2-7-dev libjpeg-turbo-progs libfreetype6-dev libheif-dev libfreetype6-dev libopenexr-dev \
+    libwebp-dev libgif-dev
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Configure
+
+EOF
+
+./configure --with-modules --enable-file-type --with-quantum-depth=32 --with-jpeg=yes --with-png=yes \
+    --with-gif=yes --with-webp=yes --with-heic=yes --with-raw=yes --with-tiff=yes --with-openjp2 \
+    --with-freetype=yes --with-webp=yes --with-openexr=yes --with-gslib=yes --with-gif=yes --with-perl=yes \
+    --with-jxl=yes
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make
+
+EOF
+
+make
+
+cat << EOF
+
+================ [imagemagick 7 setup script] ====================
+Make install
+
+EOF
+
+make install
+ldconfig /usr/local/lib
+
+cat << EOF
+
+=========== [imagemagick 7 setup script completed] ===============
+ImageMagick 7 setup is completed!
+Please check AVIF format on your Mastodon.
+
+To check ImageMagick version:
+  exec bash
+  convert -version
+
+Or
+  sudo su - mastodon
+  convert -version
+
+EOF
+
diff --git a/install/9.0/setup1.sh b/install/9.0/setup1.sh
new file mode 100644
index 0000000000..243525be1a
--- /dev/null
+++ b/install/9.0/setup1.sh
@@ -0,0 +1,140 @@
+VERSION=9.0
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+apt updates and upgrades
+
+EOF
+
+apt update && apt upgrade -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install basis softwares
+
+EOF
+
+apt install -y curl wget gnupg apt-transport-https lsb-release ca-certificates
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install Node.js
+
+EOF
+
+# Node.js
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+sudo apt-get update && sudo apt-get install nodejs -y
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install PostgreSQL
+
+EOF
+
+# PostgreSQL
+wget -O /usr/share/keyrings/postgresql.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc
+echo "deb [signed-by=/usr/share/keyrings/postgresql.asc] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install packages
+
+EOF
+
+# 必要なパッケージをまとめてインストール
+apt update
+apt install -y \
+  imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core \
+  g++ libprotobuf-dev protobuf-compiler pkg-config nodejs gcc autoconf \
+  bison build-essential libssl-dev libyaml-dev libreadline6-dev \
+  zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev \
+  nginx redis-server redis-tools postgresql postgresql-contrib \
+  certbot python3-certbot-nginx libidn11-dev libicu-dev libjemalloc-dev
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Initialize yarn
+
+EOF
+
+corepack enable
+yarn set version classic
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Install requested package
+
+EOF
+
+# Mastodonパッケージにもnode-gypは入ってるけど、npmのほうからグローバルにインストールしないと
+# yarn installで一部のOptionalパッケージインストール時にエラーが出てしまう様子
+npm i -g node-gyp
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Add mastodon user
+
+Input user information (No need to type)
+
+EOF
+
+# mastodonユーザーを追加
+adduser --disabled-login mastodon
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Create PostgreSQL mastodon user
+
+EOF
+
+# PostgreSQLにmastodonユーザーを追加
+sudo -u postgres psql << EOF
+  CREATE USER mastodon WITH PASSWORD 'ohagi' CREATEDB;
+EOF
+
+cat << EOF
+
+================== [kmyblue setup script 1] ======================
+Download kmyblue
+
+EOF
+
+# kmyblueソースコードをダウンロード
+# 続きのシェルスクリプトをgit管理外にコピーし権限を与える
+su - mastodon <<EOF
+git clone https://github.com/kmycode/mastodon.git live
+cp /home/mastodon/live/install/$VERSION/setup2.sh /home/mastodon/setup2.sh
+cp /home/mastodon/live/install/$VERSION/setup3.sh /home/mastodon/setup3.sh
+cp /home/mastodon/live/install/$VERSION/setup4.sh /home/mastodon/setup4.sh
+chmod +x /home/mastodon/setup2.sh
+chmod +x /home/mastodon/setup3.sh
+chmod +x /home/mastodon/setup4.sh
+EOF
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 1 completed] ================
+
+Input this command to continue setup:
+  sudo su - mastodon
+  ./setup2.sh
+
+./setup2.sh parameters (kmyblue version selection):
+  ./setup2.sh          -- LTS
+  ./setup2.sh latest   -- Latest version
+  ./setup2.sh debug    -- [Deprecated] Newest commit
+
+EOF
diff --git a/install/9.0/setup2.sh b/install/9.0/setup2.sh
new file mode 100644
index 0000000000..5daa13b300
--- /dev/null
+++ b/install/9.0/setup2.sh
@@ -0,0 +1,44 @@
+cd ~/live
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Checkout tag on kmyblue repository
+
+EOF
+
+# kmyblueの最新タグを取り込む
+if [ "$1" == "debug" ]; then
+  echo 'DEBUG'
+elif [ "$1" == "newest" ] || [ "$1" == "latest" ]; then
+  git checkout $(git tag -l | grep -E '^kb[0-9]' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+else
+  # LTS
+  git checkout $(git tag -l | grep -E '^kb[0-9].*lts$' | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+fi
+
+cat << EOF
+
+================== [kmyblue setup script 2] ======================
+Install rbenv to control Ruby versions
+
+EOF
+
+# Rubyバージョン管理用のrbenvをインストール、初期設定
+git clone https://github.com/rbenv/rbenv.git ~/.rbenv
+cd ~/.rbenv && src/configure && make -C src
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 2 completed] ================
+
+Input this command to continue setup:
+  exec bash
+  exit
+  sudo /home/mastodon/setup3.sh
+
+EOF
diff --git a/install/9.0/setup3.sh b/install/9.0/setup3.sh
new file mode 100644
index 0000000000..46d40b8b09
--- /dev/null
+++ b/install/9.0/setup3.sh
@@ -0,0 +1,27 @@
+cat << EOF
+
+================== [kmyblue setup script 3] ======================
+Copy setting files and services
+
+EOF
+
+# これを設定しておかないと、Web表示時にNginxがPermission Errorを起こす
+chmod o+x /home/mastodon
+
+# 必要なファイルをコピー
+cp /home/mastodon/live/dist/nginx.conf /etc/nginx/sites-available/mastodon
+ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon
+cp /home/mastodon/live/dist/mastodon-*.service /etc/systemd/system/
+systemctl daemon-reload
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 3 completed] ================
+
+Input this command to continue setup:
+  sudo su - mastodon
+  ./setup4.sh
+
+EOF
diff --git a/install/9.0/setup4.sh b/install/9.0/setup4.sh
new file mode 100644
index 0000000000..a278c21fed
--- /dev/null
+++ b/install/9.0/setup4.sh
@@ -0,0 +1,72 @@
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install Ruby
+
+EOF
+
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 3.2.3
+rbenv global 3.2.3
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install Ruby bundler
+
+EOF
+
+gem install bundler --no-document
+
+cd ~/live
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install yarn packages
+
+EOF
+
+yarn install
+
+cat << EOF
+
+================== [kmyblue setup script 4] ======================
+Install bundle packages
+
+EOF
+
+bundle config deployment 'true'
+bundle config without 'development test'
+bundle install -j$(getconf _NPROCESSORS_ONLN)
+
+rm ~/setup2.sh
+rm ~/setup3.sh
+rm ~/setup4.sh
+
+# ---------------------------------------------------
+
+cat << EOF
+
+============== [kmyblue setup script 4 completed] ================
+
+PostgreSQL and Redis are now available on localhost.
+
+* PostgreSQL
+    host     : /var/run/postgresql
+    user     : mastodon
+    database : mastodon_production
+    password : ohagi
+
+* Redis
+    host     : localhost
+    password is empty
+
+[IMPORTANT] Check PostgreSQL password before setup!
+
+Input this command to finish setup:
+  cd live
+  RAILS_ENV=production bundle exec rake mastodon:setup
+
+EOF
+
diff --git a/lib/devise/strategies/two_factor_ldap_authenticatable.rb b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
index 065aa2de88..c8258deb16 100644
--- a/lib/devise/strategies/two_factor_ldap_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_ldap_authenticatable.rb
@@ -16,7 +16,7 @@ module Devise
         if resource && !resource.otp_required_for_login?
           success!(resource)
         else
-          fail(:invalid)
+          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
         end
       end
 
diff --git a/lib/devise/strategies/two_factor_pam_authenticatable.rb b/lib/devise/strategies/two_factor_pam_authenticatable.rb
index 5ce723b331..a9db1b6a29 100644
--- a/lib/devise/strategies/two_factor_pam_authenticatable.rb
+++ b/lib/devise/strategies/two_factor_pam_authenticatable.rb
@@ -15,7 +15,7 @@ module Devise
         if resource && !resource.otp_required_for_login?
           success!(resource)
         else
-          fail(:invalid)
+          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
         end
       end
 
diff --git a/lib/elasticsearch/client_extensions.rb b/lib/elasticsearch/client_extensions.rb
new file mode 100644
index 0000000000..700bfa4a1c
--- /dev/null
+++ b/lib/elasticsearch/client_extensions.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Elasticsearch
+  module ClientExtensions
+    def verify_elasticsearch
+      @verified = true
+    end
+  end
+end
+
+Elasticsearch::Client.prepend(Elasticsearch::ClientExtensions)
diff --git a/lib/http_extensions.rb b/lib/http_extensions.rb
deleted file mode 100644
index 048f85f87b..0000000000
--- a/lib/http_extensions.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey patching until https://github.com/httprb/http/pull/757 is merged
-unless HTTP::Request::METHODS.include?(:purge)
-  methods = HTTP::Request::METHODS.dup
-  HTTP::Request.send(:remove_const, :METHODS)
-  HTTP::Request.const_set(:METHODS, methods.push(:purge).freeze)
-end
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 4146753035..d3b7ebe580 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -39,8 +39,7 @@ module Mastodon::CLI
         rotate_keys_for_account(Account.find_local(username))
         say('OK', :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -74,10 +73,7 @@ module Mastodon::CLI
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         role_id = role.id
       end
@@ -105,7 +101,7 @@ module Mastodon::CLI
       if user.save
         if options[:confirmed]
           user.confirmed_at = nil
-          user.confirm!
+          user.mark_email_as_confirmed!
         end
 
         user.approve! if options[:approve]
@@ -114,7 +110,6 @@ module Mastodon::CLI
         say("New password: #{password}")
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -152,18 +147,12 @@ module Mastodon::CLI
     def modify(username)
       user = Account.find_local(username)&.user
 
-      if user.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if user.nil?
 
       if options[:role]
         role = UserRole.find_by(name: options[:role])
 
-        if role.nil?
-          say('Cannot find user role with that name', :red)
-          exit(1)
-        end
+        fail_with_message 'Cannot find user role with that name' if role.nil?
 
         user.role_id = role.id
       elsif options[:remove_role]
@@ -185,7 +174,6 @@ module Mastodon::CLI
         say("New password: #{password}") if options[:reset_password]
       else
         report_errors(user.errors)
-        exit(1)
       end
     end
 
@@ -200,27 +188,19 @@ module Mastodon::CLI
     LONG_DESC
     def delete(username = nil)
       if username.present? && options[:email].present?
-        say('Use username or --email, not both', :red)
-        exit(1)
+        fail_with_message  'Use username or --email, not both'
       elsif username.blank? && options[:email].blank?
-        say('No username provided', :red)
-        exit(1)
+        fail_with_message 'No username provided'
       end
 
       account = nil
 
       if username.present?
         account = Account.find_local(username)
-        if account.nil?
-          say('No user with such username', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such username' if account.nil?
       else
         account = Account.left_joins(:user).find_by(user: { email: options[:email] })
-        if account.nil?
-          say('No user with such email', :red)
-          exit(1)
-        end
+        fail_with_message 'No user with such email' if account.nil?
       end
 
       say("Deleting user with #{account.statuses_count} statuses, this might take a while...#{dry_run_mode_suffix}")
@@ -243,23 +223,18 @@ module Mastodon::CLI
       username, domain = from_acct.split('@')
       from_account = Account.find_remote(username, domain)
 
-      if from_account.nil? || from_account.local?
-        say("No such account (#{from_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{from_acct})" if from_account.nil? || from_account.local?
 
       username, domain = to_acct.split('@')
       to_account = Account.find_remote(username, domain)
 
-      if to_account.nil? || to_account.local?
-        say("No such account (#{to_acct})", :red)
-        exit(1)
-      end
+      fail_with_message "No such account (#{to_acct})" if to_account.nil? || to_account.local?
 
       if from_account.public_key != to_account.public_key && !options[:force]
-        say("Accounts don't have the same public key, might not be duplicates!", :red)
-        say('Override with --force', :red)
-        exit(1)
+        fail_with_message <<~ERROR
+          Accounts don't have the same public key, might not be duplicates!
+          Override with --force
+        ERROR
       end
 
       to_account.merge_with!(from_account)
@@ -298,10 +273,7 @@ module Mastodon::CLI
     def backup(username)
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No user with such username', :red)
-        exit(1)
-      end
+      fail_with_message 'No user with such username' if account.nil?
 
       backup = account.user.backups.create!
       BackupWorker.perform_async(backup.id)
@@ -323,7 +295,7 @@ module Mastodon::CLI
       skip_threshold = 7.days.ago
       skip_domains   = Concurrent::Set.new
 
-      query = Account.remote.where(protocol: :activitypub)
+      query = Account.remote.activitypub
       query = query.where(domain: domains) unless domains.empty?
 
       processed, culled = parallelize_with_progress(query.partitioned) do |account|
@@ -387,10 +359,7 @@ module Mastodon::CLI
           user, domain = user.split('@')
           account = Account.find_remote(user, domain)
 
-          if account.nil?
-            say('No such account', :red)
-            exit(1)
-          end
+          fail_with_message 'No such account' if account.nil?
 
           next if dry_run?
 
@@ -405,8 +374,7 @@ module Mastodon::CLI
 
         say("OK#{dry_run_mode_suffix}", :green)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -416,10 +384,7 @@ module Mastodon::CLI
     def follow(username)
       target_account = Account.find_local(username)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(Account.local.without_suspended) do |account|
         FollowService.new.call(account, target_account, bypass_limit: true)
@@ -435,10 +400,7 @@ module Mastodon::CLI
       username, domain = acct.split('@')
       target_account = Account.find_remote(username, domain)
 
-      if target_account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if target_account.nil?
 
       processed, = parallelize_with_progress(target_account.followers.local) do |account|
         UnfollowService.new.call(account, target_account)
@@ -459,17 +421,11 @@ module Mastodon::CLI
       With the --followers option, the command removes all followers of the account.
     LONG_DESC
     def reset_relationships(username)
-      unless options[:follows] || options[:followers]
-        say('Please specify either --follows or --followers, or both', :red)
-        exit(1)
-      end
+      fail_with_message 'Please specify either --follows or --followers, or both' unless options[:follows] || options[:followers]
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       total     = 0
       total    += account.following.reorder(nil).count if options[:follows]
@@ -515,6 +471,8 @@ module Mastodon::CLI
       account identified by its username.
     LONG_DESC
     def approve(username = nil)
+      fail_with_message 'Number must be positive' if options[:number]&.negative?
+
       if options[:all]
         User.pending.find_each(&:approve!)
         say('OK', :green)
@@ -524,16 +482,10 @@ module Mastodon::CLI
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         account.user&.approve!
         say('OK', :green)
-      else
-        say('Number must be positive', :red) if options[:number]
-        exit(1)
       end
     end
 
@@ -587,56 +539,34 @@ module Mastodon::CLI
       redirects to a different account that the one specified.
     LONG_DESC
     def migrate(username)
-      if options[:replay].present? && options[:target].present?
-        say('Use --replay or --target, not both', :red)
-        exit(1)
-      end
+      fail_with_message 'Use --replay or --target, not both' if options[:replay].present? && options[:target].present?
 
-      if options[:replay].blank? && options[:target].blank?
-        say('Use either --replay or --target', :red)
-        exit(1)
-      end
+      fail_with_message 'Use either --replay or --target' if options[:replay].blank? && options[:target].blank?
 
       account = Account.find_local(username)
 
-      if account.nil?
-        say("No such account: #{username}", :red)
-        exit(1)
-      end
+      fail_with_message "No such account: #{username}" if account.nil?
 
       migration = nil
 
       if options[:replay]
         migration = account.migrations.last
-        if migration.nil?
-          say('The specified account has not performed any migration', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account has not performed any migration' if migration.nil?
 
-        unless options[:force] || migration.target_account_id == account.moved_to_account_id
-          say('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway' unless options[:force] || migration.target_account_id == account.moved_to_account_id
       end
 
       if options[:target]
         target_account = ResolveAccountService.new.call(options[:target])
 
-        if target_account.nil?
-          say("The specified target account could not be found: #{options[:target]}", :red)
-          exit(1)
-        end
+        fail_with_message "The specified target account could not be found: #{options[:target]}" if target_account.nil?
 
-        unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
-          say('The specified account is redirecting to a different target account. Use --force if you want to change the migration target', :red)
-          exit(1)
-        end
+        fail_with_message 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target' unless options[:force] || account.moved_to_account_id.nil? || account.moved_to_account_id == target_account.id
 
         begin
           migration = account.migrations.create!(acct: target_account.acct)
         rescue ActiveRecord::RecordInvalid => e
-          say("Error: #{e.message}", :red)
-          exit(1)
+          fail_with_message "Error: #{e.message}"
         end
       end
 
@@ -648,18 +578,18 @@ module Mastodon::CLI
     private
 
     def report_errors(errors)
-      errors.each do |error|
-        say('Failure/Error: ', :red)
-        say(error.attribute)
-        say("    #{error.type}", :red)
-      end
+      message = errors.map do |error|
+        <<~STRING
+          Failure/Error: #{error.attribute}
+              #{error.type}
+        STRING
+      end.join
+
+      fail_with_message message
     end
 
     def rotate_keys_for_account(account, delay = 0)
-      if account.nil?
-        say('No such account', :red)
-        exit(1)
-      end
+      fail_with_message 'No such account' if account.nil?
 
       old_key = account.private_key
       new_key = OpenSSL::PKey::RSA.new(2048)
diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index 8c222bbb2b..93dec1fb8f 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -18,6 +18,10 @@ module Mastodon
 
       private
 
+      def fail_with_message(message)
+        raise Thor::Error, message
+      end
+
       def pastel
         @pastel ||= Pastel.new
       end
diff --git a/lib/mastodon/cli/cache.rb b/lib/mastodon/cli/cache.rb
index e8a2ac1610..0edc4b01d6 100644
--- a/lib/mastodon/cli/cache.rb
+++ b/lib/mastodon/cli/cache.rb
@@ -31,8 +31,7 @@ module Mastodon::CLI
           recount_status_stats(status)
         end
       else
-        say("Unknown type: #{type}", :red)
-        exit(1)
+        fail_with_message "Unknown type: #{type}"
       end
 
       say
@@ -64,6 +63,7 @@ module Mastodon::CLI
         status_stat.replies_count    = status.replies.where.not(visibility: :direct).count
         status_stat.reblogs_count    = status.reblogs.count
         status_stat.favourites_count = status.favourites.count
+        status_stat.emoji_reactions  = status.generate_emoji_reactions_grouped_by_name
 
         status_stat.save if status_stat.changed?
       end
diff --git a/lib/mastodon/cli/domains.rb b/lib/mastodon/cli/domains.rb
index e092497dc9..c247463af5 100644
--- a/lib/mastodon/cli/domains.rb
+++ b/lib/mastodon/cli/domains.rb
@@ -41,11 +41,9 @@ module Mastodon::CLI
 
       # Sanity check on command arguments
       if options[:limited_federation_mode] && !domains.empty?
-        say('DOMAIN parameter not supported with --limited-federation-mode', :red)
-        exit(1)
+        fail_with_message 'DOMAIN parameter not supported with --limited-federation-mode'
       elsif domains.empty? && !options[:limited_federation_mode]
-        say('No domain(s) given', :red)
-        exit(1)
+        fail_with_message 'No domain(s) given'
       end
 
       # Build scopes from command arguments
diff --git a/lib/mastodon/cli/email_domain_blocks.rb b/lib/mastodon/cli/email_domain_blocks.rb
index 022b1dcbb1..6b9107c8ad 100644
--- a/lib/mastodon/cli/email_domain_blocks.rb
+++ b/lib/mastodon/cli/email_domain_blocks.rb
@@ -30,10 +30,7 @@ module Mastodon::CLI
       it at the root.
     LONG_DESC
     def add(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
@@ -76,10 +73,7 @@ module Mastodon::CLI
 
     desc 'remove DOMAIN...', 'Remove e-mail domain blocks'
     def remove(*domains)
-      if domains.empty?
-        say('No domain(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No domain(s) given' if domains.empty?
 
       skipped = 0
       processed = 0
diff --git a/lib/mastodon/cli/emoji.rb b/lib/mastodon/cli/emoji.rb
index 912c099124..f43e6fdf9d 100644
--- a/lib/mastodon/cli/emoji.rb
+++ b/lib/mastodon/cli/emoji.rb
@@ -86,14 +86,8 @@ module Mastodon::CLI
       category         = CustomEmojiCategory.find_by(name: options[:category])
       export_file_name = File.join(path, 'export.tar.gz')
 
-      if File.file?(export_file_name) && !options[:overwrite]
-        say("Archive already exists! Use '--overwrite' to overwrite it!")
-        exit 1
-      end
-      if category.nil? && options[:category]
-        say("Unable to find category '#{options[:category]}'!")
-        exit 1
-      end
+      fail_with_message "Archive already exists! Use '--overwrite' to overwrite it!" if File.file?(export_file_name) && !options[:overwrite]
+      fail_with_message "Unable to find category '#{options[:category]}'!" if category.nil? && options[:category]
 
       File.open(export_file_name, 'wb') do |file|
         Zlib::GzipWriter.wrap(file) do |gzip|
@@ -125,6 +119,22 @@ module Mastodon::CLI
       say('OK', :green)
     end
 
+    desc 'size', 'Set custom emojis width/height'
+    long_desc <<-LONG_DESC
+      Set custom emojis width/height if width/height is nil or zero.
+    LONG_DESC
+    def size
+      scope = CustomEmoji.where(image_width: nil).or(CustomEmoji.where(image_height: [0, nil]))
+      size = scope.size
+      count = 0
+      scope.find_each do |emoji|
+        emoji.update_size
+        emoji.save!
+        count += 1
+        say("(#{count}/#{size}) proceed #{emoji.shortcode}@#{emoji.domain}")
+      end
+    end
+
     private
 
     def color(green, _yellow, red)
diff --git a/lib/mastodon/cli/federation.rb b/lib/mastodon/cli/federation.rb
index 8bb46ecb1a..c738796557 100644
--- a/lib/mastodon/cli/federation.rb
+++ b/lib/mastodon/cli/federation.rb
@@ -43,10 +43,10 @@ module Mastodon::CLI
             say('Every deletion notice has been sent! You can safely delete all data and decomission your servers!', :green)
           end
 
-          exit(0)
+          raise(SystemExit)
         end
 
-        exit(1) unless ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+        fail_with_message 'Domains do not match. Stopping self-destruct initiation.' unless domain_match_confirmed?
 
         say(<<~WARNING, :yellow)
           This operation WILL NOT be reversible.
@@ -54,19 +54,25 @@ module Mastodon::CLI
           The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).
         WARNING
 
-        exit(1) if no?('Are you sure you want to proceed?')
+        fail_with_message 'Operation cancelled. Self-destruct will not begin.' if proceed_prompt_negative?
 
         say(<<~INSTRUCTIONS, :green)
           To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:
             SELF_DESTRUCT=#{self_destruct_value}
           You can re-run this command to see the state of the self-destruct process.
         INSTRUCTIONS
-      rescue Interrupt
-        exit(1)
       end
 
       private
 
+      def domain_match_confirmed?
+        ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
+      end
+
+      def proceed_prompt_negative?
+        no?('Are you sure you want to proceed?')
+      end
+
       def self_destruct_value
         Rails
           .application
diff --git a/lib/mastodon/cli/feeds.rb b/lib/mastodon/cli/feeds.rb
index 3467dd427c..9d25cd7859 100644
--- a/lib/mastodon/cli/feeds.rb
+++ b/lib/mastodon/cli/feeds.rb
@@ -27,17 +27,13 @@ module Mastodon::CLI
       elsif username.present?
         account = Account.find_local(username)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         PrecomputeFeedService.new.call(account) unless dry_run?
 
         say("OK #{dry_run_mode_suffix}", :green, true)
       else
-        say('No account(s) given', :red)
-        exit(1)
+        fail_with_message 'No account(s) given'
       end
     end
 
@@ -48,10 +44,35 @@ module Mastodon::CLI
       say('OK', :green)
     end
 
+    desc 'remove_legacy', 'Remove old list and antenna feeds from Redis'
+    def remove_legacy
+      current_id = 1
+      List.reorder(:id).select(:id).find_in_batches do |lists|
+        current_id = remove_legacy_feeds(:list, lists, current_id)
+      end
+
+      current_id = 1
+      Antenna.reorder(:id).select(:id).find_in_batches do |antennas|
+        current_id = remove_legacy_feeds(:antenna, antennas, current_id)
+      end
+
+      say('OK', :green)
+    end
+
     private
 
     def active_user_accounts
       Account.joins(:user).merge(User.active)
     end
+
+    def remove_legacy_feeds(type, items, current_id)
+      exist_ids = items.pluck(:id)
+      last_id = exist_ids.max
+
+      ids = Range.new(current_id, last_id).to_a - exist_ids
+      FeedManager.instance.clean_feeds!(type, ids)
+
+      last_id + 1
+    end
   end
 end
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index d12919c360..3c5fdb275c 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -20,10 +20,7 @@ module Mastodon::CLI
       option to overwrite it.
     LONG_DESC
     def add(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       skipped   = 0
       processed = 0
@@ -70,10 +67,7 @@ module Mastodon::CLI
       cover the given IP(s).
     LONG_DESC
     def remove(*addresses)
-      if addresses.empty?
-        say('No IP(s) given', :red)
-        exit(1)
-      end
+      fail_with_message 'No IP(s) given' if addresses.empty?
 
       processed = 0
       skipped   = 0
@@ -111,7 +105,7 @@ module Mastodon::CLI
       tools. Only blocks with no_access severity are returned.
     LONG_DESC
     def export
-      IpBlock.where(severity: :no_access).find_each do |ip_block|
+      IpBlock.severity_no_access.find_each do |ip_block|
         case options[:format]
         when 'nginx'
           say "deny #{ip_block.ip}/#{ip_block.ip.prefix};"
diff --git a/lib/mastodon/cli/main.rb b/lib/mastodon/cli/main.rb
index ef40b81f33..7052dfe596 100644
--- a/lib/mastodon/cli/main.rb
+++ b/lib/mastodon/cli/main.rb
@@ -13,6 +13,7 @@ require_relative 'feeds'
 require_relative 'ip_blocks'
 require_relative 'maintenance'
 require_relative 'media'
+require_relative 'ohagi'
 require_relative 'preview_cards'
 require_relative 'search'
 require_relative 'settings'
@@ -66,6 +67,9 @@ module Mastodon::CLI
     desc 'maintenance SUBCOMMAND ...ARGS', 'Various maintenance utilities'
     subcommand 'maintenance', Maintenance
 
+    desc 'ohagi SUBCOMMAND ...ARGS', 'Ohagis'
+    subcommand 'ohagi', Ohagi
+
     include Federation
 
     map %w(--version -v) => :version
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index f37662aa06..0b84047a1c 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -5,7 +5,7 @@ require_relative 'base'
 module Mastodon::CLI
   class Maintenance < Base
     MIN_SUPPORTED_VERSION = 2019_10_01_213028
-    MAX_SUPPORTED_VERSION = 2023_09_07_150100
+    MAX_SUPPORTED_VERSION = 2023_10_23_105620
 
     # Stubs to enjoy ActiveRecord queries while not depending on a particular
     # version of the code/database
@@ -26,6 +26,9 @@ module Mastodon::CLI
     class ListAccount < ApplicationRecord; end
     class PollVote < ApplicationRecord; end
     class Mention < ApplicationRecord; end
+    class Notification < ApplicationRecord; end
+    class NotificationPermission < ApplicationRecord; end
+    class NotificationRequest < ApplicationRecord; end
     class AccountDomainBlock < ApplicationRecord; end
     class AnnouncementReaction < ApplicationRecord; end
     class FeaturedTag < ApplicationRecord; end
@@ -39,9 +42,10 @@ module Mastodon::CLI
     class Webhook < ApplicationRecord; end
     class BulkImport < ApplicationRecord; end
     class SoftwareUpdate < ApplicationRecord; end
+    class SeveredRelationship < ApplicationRecord; end
 
     class DomainBlock < ApplicationRecord
-      enum severity: { silence: 0, suspend: 1, noop: 2 }
+      enum :severity, { silence: 0, suspend: 1, noop: 2 }
       scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
     end
 
@@ -72,6 +76,10 @@ module Mastodon::CLI
         local? ? username : "#{username}@#{domain}"
       end
 
+      def db_table_exists?(table)
+        ActiveRecord::Base.connection.table_exists?(table)
+      end
+
       # This is a duplicate of the Account::Merging concern because we need it
       # to be independent from code version.
       def merge_with!(other_account)
@@ -88,12 +96,12 @@ module Mastodon::CLI
           AccountModerationNote, AccountPin, AccountStat, ListAccount,
           PollVote, Mention
         ]
-        owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
-        owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
-        owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
-        owned_classes << AccountIdentityProof if ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
-        owned_classes << Appeal if ActiveRecord::Base.connection.table_exists?(:appeals)
-        owned_classes << BulkImport if ActiveRecord::Base.connection.table_exists?(:bulk_imports)
+        owned_classes << AccountDeletionRequest if db_table_exists?(:account_deletion_requests)
+        owned_classes << AccountNote if db_table_exists?(:account_notes)
+        owned_classes << FollowRecommendationSuppression if db_table_exists?(:follow_recommendation_suppressions)
+        owned_classes << AccountIdentityProof if db_table_exists?(:account_identity_proofs)
+        owned_classes << Appeal if db_table_exists?(:appeals)
+        owned_classes << BulkImport if db_table_exists?(:bulk_imports)
 
         owned_classes.each do |klass|
           klass.where(account_id: other_account.id).find_each do |record|
@@ -103,8 +111,20 @@ module Mastodon::CLI
           end
         end
 
+        from_classes = [Notification]
+        from_classes << NotificationPermission if db_table_exists?(:notification_permissions)
+        from_classes << NotificationRequest if db_table_exists?(:notification_requests)
+
+        from_classes.each do |klass|
+          klass.where(from_account_id: other_account.id).find_each do |record|
+            record.update_attribute(:from_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
+
         target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin]
-        target_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+        target_classes << AccountNote if db_table_exists?(:account_notes)
 
         target_classes.each do |klass|
           klass.where(target_account_id: other_account.id).find_each do |record|
@@ -114,17 +134,31 @@ module Mastodon::CLI
           end
         end
 
-        if ActiveRecord::Base.connection.table_exists?(:canonical_email_blocks)
+        if db_table_exists?(:canonical_email_blocks)
           CanonicalEmailBlock.where(reference_account_id: other_account.id).find_each do |record|
             record.update_attribute(:reference_account_id, id)
           end
         end
 
-        if ActiveRecord::Base.connection.table_exists?(:appeals)
+        if db_table_exists?(:appeals)
           Appeal.where(account_warning_id: other_account.id).find_each do |record|
             record.update_attribute(:account_warning_id, id)
           end
         end
+
+        if db_table_exists?(:severed_relationships)
+          SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
+            record.update_attribute(:local_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+
+          SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
+            record.update_attribute(:remote_account_id, id)
+          rescue ActiveRecord::RecordNotUnique
+            next
+          end
+        end
       end
     end
 
@@ -195,26 +229,24 @@ module Mastodon::CLI
 
     def verify_schema_version!
       if migrator_version < MIN_SUPPORTED_VERSION
-        say 'Your version of the database schema is too old and is not supported by this script.', :red
-        say 'Please update to at least Mastodon 3.0.0 before running this script.', :red
-        exit(1)
+        fail_with_message <<~ERROR
+          Your version of the database schema is too old and is not supported by this script.
+          Please update to at least Mastodon 3.0.0 before running this script.
+        ERROR
       elsif migrator_version > MAX_SUPPORTED_VERSION
         say 'Your version of the database schema is more recent than this script, this may cause unexpected errors.', :yellow
-        exit(1) unless yes?('Continue anyway? (Yes/No)')
+        fail_with_message 'Stopping maintenance script because data is more recent than script version.' unless yes?('Continue anyway? (Yes/No)')
       end
     end
 
     def verify_sidekiq_not_active!
-      if Sidekiq::ProcessSet.new.any?
-        say 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.', :red
-        exit(1)
-      end
+      fail_with_message 'It seems Sidekiq is running. All Mastodon processes need to be stopped when using this script.' if Sidekiq::ProcessSet.new.any?
     end
 
     def verify_backup_warning!
       say 'This task will take a long time to run and is potentially destructive.', :yellow
       say 'Please make sure to stop Mastodon and have a backup.', :yellow
-      exit(1) unless yes?('Continue? (Yes/No)')
+      fail_with_message 'Maintenance process stopped.' unless yes?('Continue? (Yes/No)')
     end
 
     def deduplicate_accounts!
@@ -222,8 +254,8 @@ module Mastodon::CLI
 
       say 'Deduplicating accounts… for local accounts, you will be asked to chose which account to keep unchanged.'
 
-      find_duplicate_accounts.each do |row|
-        accounts = Account.where(id: row['ids'].split(',')).to_a
+      duplicate_record_ids(:accounts, "lower(username), COALESCE(lower(domain), '')").each do |row|
+        accounts = Account.where(id: row['ids'].split(','))
 
         if accounts.first.local?
           deduplicate_local_accounts!(accounts)
@@ -234,16 +266,16 @@ module Mastodon::CLI
 
       say 'Restoring index_accounts_on_username_and_domain_lower…'
       if migrator_version < 2020_06_20_164023
-        ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
+        database_connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
       else
-        ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
+        database_connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
       end
 
       say 'Reindexing textual indexes on accounts…'
-      ActiveRecord::Base.connection.execute('REINDEX INDEX search_index;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_uri;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_url;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
+      rebuild_index(:search_index)
+      rebuild_index(:index_accounts_on_uri)
+      rebuild_index(:index_accounts_on_url)
+      rebuild_index(:index_accounts_on_domain_and_id) if migrator_version >= 2023_05_24_190515
     end
 
     def deduplicate_users!
@@ -260,22 +292,22 @@ module Mastodon::CLI
       deduplicate_users_process_password_token
 
       say 'Restoring users indexes…'
-      ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
+      database_connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
+      database_connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
+      database_connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
 
       if migrator_version < 2022_03_10_060641
-        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+        database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
       else
-        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
       end
 
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
+      rebuild_index(:index_users_on_unconfirmed_email) if migrator_version >= 2023_07_02_151753
     end
 
     def deduplicate_users_process_email
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
+      duplicate_record_ids(:users, 'email').each do |row|
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
         say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -288,8 +320,8 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_confirmation_token
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
+      duplicate_record_ids_without_nulls(:users, 'confirmation_token').each do |row|
+        users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -300,8 +332,8 @@ module Mastodon::CLI
 
     def deduplicate_users_process_remember_token
       if migrator_version < 2022_01_18_183010
-        ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
-          users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+        duplicate_record_ids_without_nulls(:users, 'remember_token').each do |row|
+          users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
           say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
           users.each do |user|
@@ -312,8 +344,8 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_password_token
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+      duplicate_record_ids_without_nulls(:users, 'reset_password_token').each do |row|
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -326,48 +358,48 @@ module Mastodon::CLI
       remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')
 
       say 'Removing duplicate account domain blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:account_domain_blocks, 'account_id, domain').each do |row|
         AccountDomainBlock.where(id: row['ids'].split(',').drop(1)).delete_all
       end
 
       say 'Restoring account domain blocks indexes…'
-      ActiveRecord::Base.connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
+      database_connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
     end
 
     def deduplicate_account_identity_proofs!
-      return unless ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+      return unless db_table_exists?(:account_identity_proofs)
 
       remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
 
       say 'Removing duplicate account identity proofs…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
-        AccountIdentityProof.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:account_identity_proofs, 'account_id, provider, provider_username').each do |row|
+        AccountIdentityProof.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring account identity proofs indexes…'
-      ActiveRecord::Base.connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
+      database_connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
     end
 
     def deduplicate_announcement_reactions!
-      return unless ActiveRecord::Base.connection.table_exists?(:announcement_reactions)
+      return unless db_table_exists?(:announcement_reactions)
 
       remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
 
       say 'Removing duplicate announcement reactions…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
-        AnnouncementReaction.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:announcement_reactions, 'account_id, announcement_id, name').each do |row|
+        AnnouncementReaction.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring announcement_reactions indexes…'
-      ActiveRecord::Base.connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
+      database_connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
     end
 
     def deduplicate_conversations!
       remove_index_if_exists!(:conversations, 'index_conversations_on_uri')
 
       say 'Deduplicating conversations…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
-        conversations = Conversation.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+      duplicate_record_ids_without_nulls(:conversations, 'uri').each do |row|
+        conversations = Conversation.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_conversation = conversations.shift
 
@@ -379,9 +411,9 @@ module Mastodon::CLI
 
       say 'Restoring conversations indexes…'
       if migrator_version < 2022_03_07_083603
-        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+        database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
       else
-        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -389,8 +421,8 @@ module Mastodon::CLI
       remove_index_if_exists!(:custom_emojis, 'index_custom_emojis_on_shortcode_and_domain')
 
       say 'Deduplicating custom_emojis…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
-        emojis = CustomEmoji.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+      duplicate_record_ids(:custom_emojis, 'shortcode, domain').each do |row|
+        emojis = CustomEmoji.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_emoji = emojis.shift
 
@@ -401,15 +433,15 @@ module Mastodon::CLI
       end
 
       say 'Restoring custom_emojis indexes…'
-      ActiveRecord::Base.connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
+      database_connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
     end
 
     def deduplicate_custom_emoji_categories!
       remove_index_if_exists!(:custom_emoji_categories, 'index_custom_emoji_categories_on_name')
 
       say 'Deduplicating custom_emoji_categories…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
-        categories = CustomEmojiCategory.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+      duplicate_record_ids(:custom_emoji_categories, 'name').each do |row|
+        categories = CustomEmojiCategory.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_category = categories.shift
 
@@ -420,26 +452,26 @@ module Mastodon::CLI
       end
 
       say 'Restoring custom_emoji_categories indexes…'
-      ActiveRecord::Base.connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
+      database_connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
     end
 
     def deduplicate_domain_allows!
       remove_index_if_exists!(:domain_allows, 'index_domain_allows_on_domain')
 
       say 'Deduplicating domain_allows…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
-        DomainAllow.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:domain_allows, 'domain').each do |row|
+        DomainAllow.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring domain_allows indexes…'
-      ActiveRecord::Base.connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
+      database_connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
     end
 
     def deduplicate_domain_blocks!
       remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
 
       say 'Deduplicating domain_blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+      duplicate_record_ids(:domain_blocks, 'domain').each do |row|
         domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
 
         reject_media = domain_blocks.any?(&:reject_media?)
@@ -456,49 +488,49 @@ module Mastodon::CLI
       end
 
       say 'Restoring domain_blocks indexes…'
-      ActiveRecord::Base.connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
+      database_connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
     end
 
     def deduplicate_unavailable_domains!
-      return unless ActiveRecord::Base.connection.table_exists?(:unavailable_domains)
+      return unless db_table_exists?(:unavailable_domains)
 
       remove_index_if_exists!(:unavailable_domains, 'index_unavailable_domains_on_domain')
 
       say 'Deduplicating unavailable_domains…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
-        UnavailableDomain.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:unavailable_domains, 'domain').each do |row|
+        UnavailableDomain.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring unavailable_domains indexes…'
-      ActiveRecord::Base.connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
+      database_connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
     end
 
     def deduplicate_email_domain_blocks!
       remove_index_if_exists!(:email_domain_blocks, 'index_email_domain_blocks_on_domain')
 
       say 'Deduplicating email_domain_blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
-        domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).sort_by { |b| b.parent.nil? ? 1 : 0 }.to_a
+      duplicate_record_ids(:email_domain_blocks, 'domain').each do |row|
+        domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).order(EmailDomainBlock.arel_table[:parent_id].asc.nulls_first).to_a
         domain_blocks.drop(1).each(&:destroy)
       end
 
       say 'Restoring email_domain_blocks indexes…'
-      ActiveRecord::Base.connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
+      database_connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
     end
 
     def deduplicate_media_attachments!
       remove_index_if_exists!(:media_attachments, 'index_media_attachments_on_shortcode')
 
       say 'Deduplicating media_attachments…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
+      duplicate_record_ids_without_nulls(:media_attachments, 'shortcode').each do |row|
         MediaAttachment.where(id: row['ids'].split(',').drop(1)).update_all(shortcode: nil)
       end
 
       say 'Restoring media_attachments indexes…'
       if migrator_version < 2022_03_10_060626
-        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+        database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
       else
-        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -506,20 +538,20 @@ module Mastodon::CLI
       remove_index_if_exists!(:preview_cards, 'index_preview_cards_on_url')
 
       say 'Deduplicating preview_cards…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
-        PreviewCard.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:preview_cards, 'url').each do |row|
+        PreviewCard.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring preview_cards indexes…'
-      ActiveRecord::Base.connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
+      database_connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
     end
 
     def deduplicate_statuses!
       remove_index_if_exists!(:statuses, 'index_statuses_on_uri')
 
       say 'Deduplicating statuses…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
-        statuses = Status.where(id: row['ids'].split(',')).sort_by(&:id)
+      duplicate_record_ids_without_nulls(:statuses, 'uri').each do |row|
+        statuses = Status.where(id: row['ids'].split(',')).order(id: :asc).to_a
         ref_status = statuses.shift
         statuses.each do |status|
           merge_statuses!(ref_status, status) if status.account_id == ref_status.account_id
@@ -529,9 +561,9 @@ module Mastodon::CLI
 
       say 'Restoring statuses indexes…'
       if migrator_version < 2022_03_10_060706
-        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+        database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
       else
-        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -540,8 +572,8 @@ module Mastodon::CLI
       remove_index_if_exists!(:tags, 'index_tags_on_name_lower_btree')
 
       say 'Deduplicating tags…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
-        tags = Tag.where(id: row['ids'].split(',')).sort_by { |t| [t.usable?, t.trendable?, t.listable?].count(false) }
+      duplicate_record_ids(:tags, 'lower((name)::text)').each do |row|
+        tags = Tag.where(id: row['ids'].split(',')).order(Arel.sql('(usable::int + trendable::int + listable::int) desc')).to_a
         ref_tag = tags.shift
         tags.each do |tag|
           merge_tags!(ref_tag, tag)
@@ -551,38 +583,38 @@ module Mastodon::CLI
 
       say 'Restoring tags indexes…'
       if migrator_version < 2021_04_21_121431
-        ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+        database_connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
       else
-        ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
+        database_connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
       end
     end
 
     def deduplicate_webauthn_credentials!
-      return unless ActiveRecord::Base.connection.table_exists?(:webauthn_credentials)
+      return unless db_table_exists?(:webauthn_credentials)
 
       remove_index_if_exists!(:webauthn_credentials, 'index_webauthn_credentials_on_external_id')
 
       say 'Deduplicating webauthn_credentials…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
-        WebauthnCredential.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:webauthn_credentials, 'external_id').each do |row|
+        WebauthnCredential.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring webauthn_credentials indexes…'
-      ActiveRecord::Base.connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
+      database_connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
     end
 
     def deduplicate_webhooks!
-      return unless ActiveRecord::Base.connection.table_exists?(:webhooks)
+      return unless db_table_exists?(:webhooks)
 
       remove_index_if_exists!(:webhooks, 'index_webhooks_on_url')
 
       say 'Deduplicating webhooks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
-        Webhook.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+      duplicate_record_ids(:webhooks, 'url').each do |row|
+        Webhook.where(id: row['ids'].split(',')).order(id: :desc).drop(1).each(&:destroy)
       end
 
       say 'Restoring webhooks indexes…'
-      ActiveRecord::Base.connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
+      database_connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
     end
 
     def deduplicate_software_updates!
@@ -590,8 +622,8 @@ module Mastodon::CLI
       SoftwareUpdate.delete_all
     end
 
-    def deduplicate_local_accounts!(accounts)
-      accounts = accounts.sort_by(&:id).reverse
+    def deduplicate_local_accounts!(scope)
+      accounts = scope.order(id: :desc).includes(:account_stat, :user).to_a
 
       say "Multiple local accounts were found for username '#{accounts.first.username}'.", :yellow
       say 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.', :yellow
@@ -629,8 +661,8 @@ module Mastodon::CLI
       end
     end
 
-    def deduplicate_remote_accounts!(accounts)
-      accounts = accounts.sort_by(&:updated_at).reverse
+    def deduplicate_remote_accounts!(scope)
+      accounts = scope.order(updated_at: :desc).to_a
 
       reference_account = accounts.shift
 
@@ -672,7 +704,7 @@ module Mastodon::CLI
 
     def merge_statuses!(main_status, duplicate_status)
       owned_classes = [Favourite, Mention, Poll]
-      owned_classes << Bookmark if ActiveRecord::Base.connection.table_exists?(:bookmarks)
+      owned_classes << Bookmark if db_table_exists?(:bookmarks)
       owned_classes.each do |klass|
         klass.where(status_id: duplicate_status.id).find_each do |record|
           record.update_attribute(:status_id, main_status.id)
@@ -714,14 +746,41 @@ module Mastodon::CLI
       ActiveRecord::Migrator.current_version
     end
 
-    def find_duplicate_accounts
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
+    def duplicate_record_ids_without_nulls(table, group_by)
+      database_connection.select_all(<<~SQL.squish)
+        SELECT string_agg(id::text, ',') AS ids
+        FROM #{table}
+        WHERE #{group_by} IS NOT NULL
+        GROUP BY #{group_by}
+        HAVING COUNT(*) > 1
+      SQL
+    end
+
+    def duplicate_record_ids(table, group_by)
+      database_connection.select_all(<<~SQL.squish)
+        SELECT string_agg(id::text, ',') AS ids
+        FROM #{table}
+        GROUP BY #{group_by}
+        HAVING COUNT(*) > 1
+      SQL
     end
 
     def remove_index_if_exists!(table, name)
-      ActiveRecord::Base.connection.remove_index(table, name: name) if ActiveRecord::Base.connection.index_name_exists?(table, name)
+      database_connection.remove_index(table, name: name) if database_connection.index_name_exists?(table, name)
     rescue ArgumentError, ActiveRecord::StatementInvalid
       nil
     end
+
+    def database_connection
+      ActiveRecord::Base.connection
+    end
+
+    def db_table_exists?(table)
+      database_connection.table_exists?(table)
+    end
+
+    def rebuild_index(name)
+      database_connection.execute("REINDEX INDEX #{name}")
+    end
   end
 end
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index a796bb729a..509d11a819 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -31,15 +31,9 @@ module Mastodon::CLI
       following anyone locally are pruned.
     DESC
     def remove
-      if options[:prune_profiles] && options[:remove_headers]
-        say('--prune-profiles and --remove-headers should not be specified simultaneously', :red, true)
-        exit(1)
-      end
+      fail_with_message '--prune-profiles and --remove-headers should not be specified simultaneously' if options[:prune_profiles] && options[:remove_headers]
 
-      if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
-        say('--include-follows can only be used with --prune-profiles or --remove-headers', :red, true)
-        exit(1)
-      end
+      fail_with_message '--include-follows can only be used with --prune-profiles or --remove-headers' if options[:include_follows] && !(options[:prune_profiles] || options[:remove_headers])
       time_ago = options[:days].days.ago
 
       if options[:prune_profiles] || options[:remove_headers]
@@ -64,7 +58,7 @@ module Mastodon::CLI
       end
 
       unless options[:prune_profiles] || options[:remove_headers]
-        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where(created_at: ..time_ago)) do |media_attachment|
+        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.remote.where(created_at: ..time_ago)) do |media_attachment|
           next if media_attachment.file.blank?
 
           size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
@@ -134,7 +128,7 @@ module Mastodon::CLI
 
             model_name      = path_segments.first.classify
             attachment_name = path_segments[1].singularize
-            record_id       = path_segments[2..-2].join.to_i
+            record_id       = path_segments[2...-2].join.to_i
             file_name       = path_segments.last
             record          = record_map.dig(model_name, record_id)
             attachment      = record&.public_send(attachment_name)
@@ -156,11 +150,9 @@ module Mastodon::CLI
           end
         end
       when :fog
-        say('The fog storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The fog storage driver is not supported for this operation at this time'
       when :azure
-        say('The azure storage driver is not supported for this operation at this time', :red)
-        exit(1)
+        fail_with_message 'The azure storage driver is not supported for this operation at this time'
       when :filesystem
         require 'find'
 
@@ -180,7 +172,7 @@ module Mastodon::CLI
           end
 
           model_name      = path_segments.first.classify
-          record_id       = path_segments[2..-2].join.to_i
+          record_id       = path_segments[2...-2].join.to_i
           attachment_name = path_segments[1].singularize
           file_name       = path_segments.last
 
@@ -254,10 +246,7 @@ module Mastodon::CLI
         username, domain = options[:account].split('@')
         account = Account.find_remote(username, domain)
 
-        if account.nil?
-          say('No such account', :red)
-          exit(1)
-        end
+        fail_with_message 'No such account' if account.nil?
 
         scope = MediaAttachment.where(account_id: account.id)
       elsif options[:domain]
@@ -265,8 +254,7 @@ module Mastodon::CLI
       elsif options[:days].present?
         scope = MediaAttachment.remote
       else
-        say('Specify the source of media attachments', :red)
-        exit(1)
+        fail_with_message 'Specify the source of media attachments'
       end
 
       scope = scope.where('media_attachments.id > ?', Mastodon::Snowflake.id_at(options[:days].days.ago, with_random: false)) if options[:days].present?
@@ -289,7 +277,7 @@ module Mastodon::CLI
 
     desc 'usage', 'Calculate disk space consumed by Mastodon'
     def usage
-      say("Attachments:\t#{number_to_human_size(MediaAttachment.sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} (#{number_to_human_size(MediaAttachment.where(account: Account.local).sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')))} local)")
+      say("Attachments:\t#{number_to_human_size(media_attachment_storage_size)} (#{number_to_human_size(local_media_attachment_storage_size)} local)")
       say("Custom emoji:\t#{number_to_human_size(CustomEmoji.sum(:image_file_size))} (#{number_to_human_size(CustomEmoji.local.sum(:image_file_size))} local)")
       say("Preview cards:\t#{number_to_human_size(PreviewCard.sum(:image_file_size))}")
       say("Avatars:\t#{number_to_human_size(Account.sum(:avatar_file_size))} (#{number_to_human_size(Account.local.sum(:avatar_file_size))} local)")
@@ -306,42 +294,45 @@ module Mastodon::CLI
       path_segments = path.split('/')[2..]
       path_segments.delete('cache')
 
-      unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
-        say('Not a media URL', :red)
-        exit(1)
-      end
+      fail_with_message 'Not a media URL' unless VALID_PATH_SEGMENTS_SIZE.include?(path_segments.size)
 
       model_name = path_segments.first.classify
-      record_id  = path_segments[2..-2].join.to_i
+      record_id  = path_segments[2...-2].join.to_i
 
-      unless PRELOAD_MODEL_WHITELIST.include?(model_name)
-        say("Cannot find corresponding model: #{model_name}", :red)
-        exit(1)
-      end
+      fail_with_message "Cannot find corresponding model: #{model_name}" unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 
       record = model_name.constantize.find_by(id: record_id)
       record = record.status if record.respond_to?(:status)
 
-      unless record
-        say('Cannot find corresponding record', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot find corresponding record' unless record
 
       display_url = ActivityPub::TagManager.instance.url_for(record)
 
-      if display_url.blank?
-        say('No public URL for this type of record', :red)
-        exit(1)
-      end
+      fail_with_message 'No public URL for this type of record' if display_url.blank?
 
       say(display_url, :blue)
     rescue Addressable::URI::InvalidURIError
-      say('Invalid URL', :red)
-      exit(1)
+      fail_with_message 'Invalid URL'
     end
 
     private
 
+    def media_attachment_storage_size
+      MediaAttachment.sum(file_and_thumbnail_size_sql)
+    end
+
+    def local_media_attachment_storage_size
+      MediaAttachment.where(account: Account.local).sum(file_and_thumbnail_size_sql)
+    end
+
+    def file_and_thumbnail_size_sql
+      Arel.sql(
+        <<~SQL.squish
+          COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
+        SQL
+      )
+    end
+
     PRELOAD_MODEL_WHITELIST = %w(
       Account
       Backup
@@ -362,7 +353,7 @@ module Mastodon::CLI
         next unless VALID_PATH_SEGMENTS_SIZE.include?(segments.size)
 
         model_name = segments.first.classify
-        record_id  = segments[2..-2].join.to_i
+        record_id  = segments[2...-2].join.to_i
 
         next unless PRELOAD_MODEL_WHITELIST.include?(model_name)
 
diff --git a/lib/mastodon/cli/ohagi.rb b/lib/mastodon/cli/ohagi.rb
new file mode 100644
index 0000000000..dd78dea22a
--- /dev/null
+++ b/lib/mastodon/cli/ohagi.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+require_relative 'base'
+
+module Mastodon::CLI
+  class Ohagi < Base
+    desc 'good', 'Ohagi is good'
+    def good
+      say('Thanks!', :green)
+    end
+
+    desc 'bad', 'Ohagi is bad'
+    def bad
+      say('Sorry...', :red)
+    end
+
+    desc 'tsubuan', 'Ohagi is tsubuan'
+    def tsubuan
+      say('Thanks! You are knight in shining armor!', :green)
+    end
+
+    desc 'koshian', 'Ohagi is koshian'
+    def koshian
+      say('Let the WAR begin.', :red)
+    end
+
+    desc 'oguraan', 'Ohagi is oguraan'
+    def oguraan
+      say('I hate you.', :yellow)
+    end
+  end
+end
diff --git a/lib/mastodon/cli/progress_helper.rb b/lib/mastodon/cli/progress_helper.rb
index 1fa2745c18..f22492afcf 100644
--- a/lib/mastodon/cli/progress_helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -25,10 +25,7 @@ module Mastodon::CLI
     end
 
     def parallelize_with_progress(scope)
-      if options[:concurrency] < 1
-        say('Cannot run with this concurrency setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
 
       reset_connection_pools!
 
@@ -38,10 +35,8 @@ module Mastodon::CLI
       aggregate = Concurrent::AtomicFixnum.new(0)
 
       scope.reorder(nil).find_in_batches do |items|
-        futures = []
-
-        items.each do |item|
-          futures << Concurrent::Future.execute(executor: pool) do
+        futures = items.map do |item|
+          Concurrent::Future.execute(executor: pool) do
             if !progress.total.nil? && progress.progress + 1 > progress.total
               # The number of items has changed between start and now,
               # since there is no good way to predict the final count from
diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 77c455f049..1b428c0125 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -20,6 +20,9 @@ module Mastodon::CLI
     option :import, type: :boolean, default: true, desc: 'Import data from the database to the index'
     option :clean, type: :boolean, default: true, desc: 'Remove outdated documents from the index'
     option :reset_chewy, type: :boolean, default: false, desc: "Reset Chewy's internal index"
+    option :full, type: :boolean, default: false, desc: 'Import full data over Mastodon default importer'
+    option :from, type: :string, default: nil, desc: 'Statuses start date'
+    option :to, type: :string, default: nil, desc: 'Statuses end date'
     desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them'
     long_desc <<~LONG_DESC
       If Elasticsearch is empty, this command will create the necessary indices
@@ -41,7 +44,7 @@ module Mastodon::CLI
                 end
 
       pool      = Concurrent::FixedThreadPool.new(options[:concurrency], max_queue: options[:concurrency] * 10)
-      importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) }
+      importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool, full: options[:full], from: options[:from], to: options[:to]) }
       progress  = ProgressBar.create(
         {
           total: nil,
@@ -100,6 +103,14 @@ module Mastodon::CLI
       progress.finish
 
       say("Indexed #{added} records, de-indexed #{removed}", :green, true)
+    rescue Elasticsearch::Transport::Transport::ServerError => e
+      fail_with_message <<~ERROR
+        There was an issue connecting to the search server. Make sure the
+        server is configured and running correctly, and that the environment
+        variable settings match what the server is expecting.
+
+        #{e.message}
+      ERROR
     end
 
     private
@@ -110,17 +121,11 @@ module Mastodon::CLI
     end
 
     def verify_deploy_concurrency!
-      return unless options[:concurrency] < 1
-
-      say('Cannot run with this concurrency setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this concurrency setting, must be at least 1' if options[:concurrency] < 1
     end
 
     def verify_deploy_batch_size!
-      return unless options[:batch_size] < 1
-
-      say('Cannot run with this batch_size setting, must be at least 1', :red)
-      exit(1)
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
     end
 
     def progress_output_options
diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 7acf3f9b77..f441dbcd84 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -26,10 +26,7 @@ module Mastodon::CLI
       indices before commencing, and removes them afterward.
     LONG_DESC
     def remove
-      if options[:batch_size] < 1
-        say('Cannot run with this batch_size setting, must be at least 1', :red)
-        exit(1)
-      end
+      fail_with_message 'Cannot run with this batch_size setting, must be at least 1' if options[:batch_size] < 1
 
       remove_statuses
       vacuum_and_analyze_statuses
@@ -120,7 +117,7 @@ module Mastodon::CLI
 
       say('Beginning removal of now-orphaned media attachments to free up disk space...')
 
-      scope     = MediaAttachment.unattached.where('created_at < ?', options[:days].pred.days.ago)
+      scope     = MediaAttachment.unattached.created_before(options[:days].pred.days.ago)
       processed = 0
       removed   = 0
       progress  = create_progress_bar(scope.count)
@@ -194,24 +191,24 @@ module Mastodon::CLI
 
     def vacuum_and_analyze_statuses
       if options[:compress_database]
-        say('Run VACUUM FULL ANALYZE to statuses...')
+        say('Running "VACUUM FULL ANALYZE statuses"...')
         ActiveRecord::Base.connection.execute('VACUUM FULL ANALYZE statuses')
-        say('Run REINDEX to statuses...')
+        say('Running "REINDEX TABLE statuses"...')
         ActiveRecord::Base.connection.execute('REINDEX TABLE statuses')
       else
-        say('Run ANALYZE to statuses...')
+        say('Running "ANALYZE statuses"...')
         ActiveRecord::Base.connection.execute('ANALYZE statuses')
       end
     end
 
     def vacuum_and_analyze_conversations
       if options[:compress_database]
-        say('Run VACUUM FULL ANALYZE to conversations...')
+        say('Running "VACUUM FULL ANALYZE conversations"...')
         ActiveRecord::Base.connection.execute('VACUUM FULL ANALYZE conversations')
-        say('Run REINDEX to conversations...')
+        say('Running "REINDEX TABLE conversations"...')
         ActiveRecord::Base.connection.execute('REINDEX TABLE conversations')
       else
-        say('Run ANALYZE to conversations...')
+        say('Running "ANALYZE conversations"...')
         ActiveRecord::Base.connection.execute('ANALYZE conversations')
       end
     end
diff --git a/lib/mastodon/cli/upgrade.rb b/lib/mastodon/cli/upgrade.rb
index cf83986844..2cb5105794 100644
--- a/lib/mastodon/cli/upgrade.rb
+++ b/lib/mastodon/cli/upgrade.rb
@@ -103,13 +103,11 @@ module Mastodon::CLI
     end
 
     def upgrade_storage_fog(_progress, _attachment, _style)
-      say('The fog storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The fog storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_azure(_progress, _attachment, _style)
-      say('The azure storage driver is not supported for this operation at this time', :red)
-      exit(1)
+      fail_with_message 'The azure storage driver is not supported for this operation at this time'
     end
 
     def upgrade_storage_filesystem(progress, attachment, style)
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 1a2ce6420f..9997e42523 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -8,15 +8,15 @@
 # shorten temporary column names.
 
 # Documentation on using these functions (and why one might do so):
-# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/what_requires_downtime.md
+# https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/doc/development/database/avoiding_downtime_in_migrations.md
 
-# The file itself:
-# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/database/migration_helpers.rb
+# The original file (since updated):
+# https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/gitlab/database/migration_helpers.rb
 
 # It is licensed as follows:
 
-# Copyright (c) 2011-2017 GitLab B.V.
-
+# Copyright (c) 2011-present GitLab B.V.
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
@@ -24,16 +24,16 @@
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 # This is bad form, but there are enough differences that it's impractical to do
 # otherwise:
@@ -77,37 +77,12 @@ module Mastodon
       end
     end
 
-    BACKGROUND_MIGRATION_BATCH_SIZE = 1000 # Number of rows to process per job
-    BACKGROUND_MIGRATION_JOB_BUFFER_SIZE = 1000 # Number of jobs to bulk queue at a time
-
     # Gets an estimated number of rows for a table
     def estimate_rows_in_table(table_name)
       exec_query('SELECT reltuples FROM pg_class WHERE relname = ' +
         "'#{table_name}'").to_a.first['reltuples']
     end
 
-    # Adds `created_at` and `updated_at` columns with timezone information.
-    #
-    # This method is an improved version of Rails' built-in method `add_timestamps`.
-    #
-    # Available options are:
-    # default - The default value for the column.
-    # null - When set to `true` the column will allow NULL values.
-    #        The default is to not allow NULL values.
-    def add_timestamps_with_timezone(table_name, **options)
-      options[:null] = false if options[:null].nil?
-
-      [:created_at, :updated_at].each do |column_name|
-        if options[:default] && transaction_open?
-          raise '`add_timestamps_with_timezone` with default value cannot be run inside a transaction. ' \
-            'You can disable transactions by calling `disable_ddl_transaction!` ' \
-            'in the body of your migration class'
-        end
-
-        add_column(table_name, column_name, :datetime_with_timezone, **options)
-      end
-    end
-
     # Creates a new index, concurrently when supported
     #
     # On PostgreSQL this method creates an index concurrently, on MySQL this
@@ -746,39 +721,6 @@ module Mastodon
       rename_index table_name, "#{index_name}_new", index_name
     end
 
-    # This will replace the first occurrence of a string in a column with
-    # the replacement
-    # On postgresql we can use `regexp_replace` for that.
-    # On mysql we find the location of the pattern, and overwrite it
-    # with the replacement
-    def replace_sql(column, pattern, replacement)
-      quoted_pattern = Arel::Nodes::Quoted.new(pattern.to_s)
-      quoted_replacement = Arel::Nodes::Quoted.new(replacement.to_s)
-
-      replace = Arel::Nodes::NamedFunction
-        .new("regexp_replace", [column, quoted_pattern, quoted_replacement])
-      Arel::Nodes::SqlLiteral.new(replace.to_sql)
-    end
-
-    def remove_foreign_key_without_error(*args)
-      remove_foreign_key(*args)
-    rescue ArgumentError
-    end
-
-    def sidekiq_queue_migrate(queue_from, to:)
-      while sidekiq_queue_length(queue_from) > 0
-        Sidekiq.redis do |conn|
-          conn.rpoplpush "queue:#{queue_from}", "queue:#{to}"
-        end
-      end
-    end
-
-    def sidekiq_queue_length(queue_name)
-      Sidekiq.redis do |conn|
-        conn.llen("queue:#{queue_name}")
-      end
-    end
-
     def check_trigger_permissions!(table)
       unless Grant.create_and_execute_trigger?(table)
         dbname = ActiveRecord::Base.configurations[Rails.env]['database']
@@ -799,94 +741,10 @@ into similar problems in the future (e.g. when new tables are created).
       end
     end
 
-    # Bulk queues background migration jobs for an entire table, batched by ID range.
-    # "Bulk" meaning many jobs will be pushed at a time for efficiency.
-    # If you need a delay interval per job, then use `queue_background_migration_jobs_by_range_at_intervals`.
-    #
-    # model_class - The table being iterated over
-    # job_class_name - The background migration job class as a string
-    # batch_size - The maximum number of rows per job
-    #
-    # Example:
-    #
-    #     class Route < ActiveRecord::Base
-    #       include EachBatch
-    #       self.table_name = 'routes'
-    #     end
-    #
-    #     bulk_queue_background_migration_jobs_by_range(Route, 'ProcessRoutes')
-    #
-    # Where the model_class includes EachBatch, and the background migration exists:
-    #
-    #     class Gitlab::BackgroundMigration::ProcessRoutes
-    #       def perform(start_id, end_id)
-    #         # do something
-    #       end
-    #     end
-    def bulk_queue_background_migration_jobs_by_range(model_class, job_class_name, batch_size: BACKGROUND_MIGRATION_BATCH_SIZE)
-      raise "#{model_class} does not have an ID to use for batch ranges" unless model_class.column_names.include?('id')
-
-      jobs = []
-
-      model_class.each_batch(of: batch_size) do |relation|
-        start_id, end_id = relation.pluck('MIN(id), MAX(id)').first
-
-        if jobs.length >= BACKGROUND_MIGRATION_JOB_BUFFER_SIZE
-          # Note: This code path generally only helps with many millions of rows
-          # We push multiple jobs at a time to reduce the time spent in
-          # Sidekiq/Redis operations. We're using this buffer based approach so we
-          # don't need to run additional queries for every range.
-          BackgroundMigrationWorker.perform_bulk(jobs)
-          jobs.clear
-        end
-
-        jobs << [job_class_name, [start_id, end_id]]
-      end
-
-      BackgroundMigrationWorker.perform_bulk(jobs) unless jobs.empty?
-    end
-
-    # Queues background migration jobs for an entire table, batched by ID range.
-    # Each job is scheduled with a `delay_interval` in between.
-    # If you use a small interval, then some jobs may run at the same time.
-    #
-    # model_class - The table being iterated over
-    # job_class_name - The background migration job class as a string
-    # delay_interval - The duration between each job's scheduled time (must respond to `to_f`)
-    # batch_size - The maximum number of rows per job
-    #
-    # Example:
-    #
-    #     class Route < ActiveRecord::Base
-    #       include EachBatch
-    #       self.table_name = 'routes'
-    #     end
-    #
-    #     queue_background_migration_jobs_by_range_at_intervals(Route, 'ProcessRoutes', 1.minute)
-    #
-    # Where the model_class includes EachBatch, and the background migration exists:
-    #
-    #     class Gitlab::BackgroundMigration::ProcessRoutes
-    #       def perform(start_id, end_id)
-    #         # do something
-    #       end
-    #     end
-    def queue_background_migration_jobs_by_range_at_intervals(model_class, job_class_name, delay_interval, batch_size: BACKGROUND_MIGRATION_BATCH_SIZE)
-      raise "#{model_class} does not have an ID to use for batch ranges" unless model_class.column_names.include?('id')
-
-      model_class.each_batch(of: batch_size) do |relation, index|
-        start_id, end_id = relation.pluck('MIN(id), MAX(id)').first
-
-        # `BackgroundMigrationWorker.bulk_perform_in` schedules all jobs for
-        # the same time, which is not helpful in most cases where we wish to
-        # spread the work over time.
-        BackgroundMigrationWorker.perform_in(delay_interval * index, job_class_name, [start_id, end_id])
-      end
-    end
-
     private
 
-    # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L678-L684
+    # Private method copied from:
+    # https://github.com/rails/rails/blob/v7.1.3.2/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L974-L980
     def extract_foreign_key_action(specifier)
       case specifier
       when 'c'; :cascade
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 587e89303b..853d05a0fb 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -4,6 +4,20 @@ module Mastodon
   module Version
     module_function
 
+    def kmyblue_major
+      13
+    end
+
+    def kmyblue_minor
+      0
+    end
+
+    def kmyblue_flag
+      # 'LTS'
+      'dev'
+      # nil
+    end
+
     def major
       4
     end
@@ -17,14 +31,35 @@ module Mastodon
     end
 
     def default_prerelease
-      'alpha.0'
+      'alpha.3'
     end
 
     def prerelease
       ENV['MASTODON_VERSION_PRERELEASE'].presence || default_prerelease
     end
 
+    def to_a_of_kmyblue
+      [kmyblue_major, kmyblue_minor].compact
+    end
+
+    def to_s_of_kmyblue
+      components = [to_a_of_kmyblue.join('.')]
+      components << "-#{kmyblue_flag}" if kmyblue_flag.present?
+      components.join
+    end
+
+    def to_s_of_mastodon
+      components = [to_a.join('.')]
+      components << "-#{prerelease}" if prerelease.present?
+      components << "+#{build_metadata_of_mastodon}" if build_metadata_of_mastodon.present?
+      components.join
+    end
+
     def build_metadata
+      ['kmyblue', to_s_of_kmyblue, build_metadata_of_mastodon].compact.join('.')
+    end
+
+    def build_metadata_of_mastodon
       ENV.fetch('MASTODON_VERSION_METADATA', nil)
     end
 
@@ -40,11 +75,23 @@ module Mastodon
     end
 
     def gem_version
-      @gem_version ||= Gem::Version.new(to_s.split('+')[0])
+      @gem_version ||= if ENV.fetch('UPDATE_CHECK_SOURCE', 'kmyblue') == 'kmyblue'
+                         Gem::Version.new("#{kmyblue_major}.#{kmyblue_minor}")
+                       else
+                         Gem::Version.new(to_s.split('+')[0])
+                       end
+    end
+
+    def lts?
+      kmyblue_flag == 'LTS'
+    end
+
+    def dev?
+      kmyblue_flag == 'dev'
     end
 
     def repository
-      ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
+      ENV.fetch('GITHUB_REPOSITORY', 'kmycode/mastodon')
     end
 
     def source_base_url
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 7f82138aa8..401da11290 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -84,13 +84,11 @@ module Paperclip
       # Don't go through Stoplight if we don't have anything object-storage-oriented to do
       return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty?
 
-      Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle|
-        if error.is_a?(Seahorse::Client::NetworkingError)
-          handle.call(error)
-        else
-          raise error
-        end
-      end.run
+      Stoplight('object-storage')
+        .with_threshold(STOPLIGHT_THRESHOLD)
+        .with_cool_off_time(STOPLIGHT_COOLDOWN)
+        .with_error_handler { |error, handle| error.is_a?(Seahorse::Client::NetworkingError) ? handle.call(error) : raise(error) }
+        .run { super }
     end
   end
 end
diff --git a/lib/paperclip/image_extractor.rb b/lib/paperclip/image_extractor.rb
index 17fe4326fd..8a565d0469 100644
--- a/lib/paperclip/image_extractor.rb
+++ b/lib/paperclip/image_extractor.rb
@@ -35,7 +35,7 @@ module Paperclip
       dst.binmode
 
       begin
-        command = Terrapin::CommandLine.new('ffmpeg', '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger)
+        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, '-i :source -loglevel :loglevel -y :destination', logger: Paperclip.logger)
         command.run(source: @file.path, destination: dst.path, loglevel: 'fatal')
       rescue Terrapin::ExitStatusError
         dst.close(true)
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index deb89717a4..ff7a938abb 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -16,7 +16,7 @@ module Paperclip
     private
 
     def cache_current_values
-      @original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+      @original_filename = truncated_filename
       @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@tempfile.path).detect
       @size = File.size(@tempfile)
@@ -43,6 +43,13 @@ module Paperclip
       source.response.connection.close
     end
 
+    def truncated_filename
+      filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+      extension = File.extname(filename)
+      basename = File.basename(filename, extension)
+      [basename[...20], extension[..4]].compact_blank.join
+    end
+
     def filename_from_content_disposition
       disposition = @target.response.headers['content-disposition']
       disposition&.match(/filename="([^"]*)"/)&.captures&.first
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index d2d946d3ad..3efffa355a 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -61,7 +61,7 @@ module Paperclip
       command_arguments, interpolations = prepare_command(destination)
 
       begin
-        command = Terrapin::CommandLine.new('ffmpeg', command_arguments.join(' '), logger: Paperclip.logger)
+        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, command_arguments.join(' '), logger: Paperclip.logger)
         command.run(interpolations)
       rescue Terrapin::ExitStatusError => e
         raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}"
diff --git a/lib/premailer_webpack_strategy.rb b/lib/premailer_bundled_asset_strategy.rb
similarity index 80%
rename from lib/premailer_webpack_strategy.rb
rename to lib/premailer_bundled_asset_strategy.rb
index 6816d04745..fbe50cd4fc 100644
--- a/lib/premailer_webpack_strategy.rb
+++ b/lib/premailer_bundled_asset_strategy.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-module PremailerWebpackStrategy
+module PremailerBundledAssetStrategy
   def load(url)
-    asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']
+    asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV.fetch('LOCAL_DOMAIN', nil)
 
     if Webpacker.dev_server.running?
       asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}"
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 70efe7c1ae..b1bf1e58cd 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -55,6 +55,29 @@ class Sanitize
       current_node.replace(Nokogiri::XML::Text.new(current_node.text, current_node.document)) unless LINK_PROTOCOLS.include?(scheme)
     end
 
+    PHISHING_SCAM_HREF_TRANSFORMER = lambda do |env|
+      return unless env[:node_name] == 'a'
+
+      current_node = env[:node]
+      href = current_node['href'] || ''
+      text = current_node.text
+      cls = current_node['class'] || ''
+
+      dot_pos = text.index('.')
+      return unless dot_pos.present? && dot_pos.positive? && dot_pos < text.size - 1
+
+      scheme = if href =~ Sanitize::REGEX_PROTOCOL
+                 Regexp.last_match(1).downcase
+               else
+                 :relative
+               end
+
+      if LINK_PROTOCOLS.include?(scheme) && href != text && href != "https://#{text}" && !text.start_with?('#') && !text.start_with?('@')
+        current_node['class'] = "#{cls} kmy-dangerous-link"
+        current_node.before(Nokogiri::XML::Text.new('⚠', current_node.document))
+      end
+    end
+
     UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
       return unless %w(h1 h2 h3 h4 h5 h6).include?(env[:node_name])
 
@@ -88,6 +111,7 @@ class Sanitize
         TRANSLATE_TRANSFORMER,
         UNSUPPORTED_ELEMENTS_TRANSFORMER,
         UNSUPPORTED_HREF_TRANSFORMER,
+        PHISHING_SCAM_HREF_TRANSFORMER,
       ]
     )
 
diff --git a/lib/tasks/dangerous.rake b/lib/tasks/dangerous.rake
new file mode 100644
index 0000000000..f258efd7b7
--- /dev/null
+++ b/lib/tasks/dangerous.rake
@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+# rubocop:disable all
+
+namespace :dangerous do
+  task :back_upstream do
+    require './config/environment'
+
+    prompt = TTY::Prompt.new
+
+    unless ENV['BACK_UPSTREAM_FORCE']
+      exit(0) unless prompt.yes?('[1/3] Do you really want to go back to the original Mastodon?', default: false)
+      exit(0) unless prompt.yes?('[2/3] All proprietary data of kmyblue will be deleted and cannot be restored. Are you sure?', default: false)
+      exit(0) unless prompt.yes?('[3/3] This operation is irreversible. You have backups in case this operation causes a system malfunction, do you not?', default: false)
+    end
+
+    target_migrations = %w(
+      20240426233435
+      20240426000034
+      20240401222541
+      20240327234026
+      20240326231854
+      20240320231633
+      20240312230204
+      20240229233617
+      20240227225017
+      20240227222450
+      20240227033337
+      20240218233621
+      20240217230006
+      20240217093511
+      20240217022038
+      20240216042730
+      20240212230358
+      20240212224800
+      20240121231131
+      20240117022353
+      20240117021025
+      20240109035435
+      20231214225249
+      20231212225737
+      20231130083634
+      20231130031209
+      20231115001356
+      20231105225839
+      20231028005948
+      20231028004612
+      20231023083359
+      20231022074913
+      20231021005339
+      20231009235215
+      20231007090808
+      20231006030102
+      20231005074832
+      20231001050733
+      20231001031337
+      20230930233930
+      20230923103430
+      20230919232836
+      20230911022527
+      20230826023400
+      20230821061713
+      20230819084858
+      20230812130612
+      20230812083752
+      20230804222017
+      20230714004824
+      20230706031715
+      20230705232953
+      20230522093135
+      20230522082252
+      20230521122642
+      20230514030455
+      20230512122757
+      20230510033040
+      20230510004621
+      20230510000439
+      20230509045358
+      20230430110057
+      20230428111230
+      20230427233749
+      20230427122753
+      20230427072650
+      20230427022606
+      20230426013738
+      20230423233429
+      20230423002728
+      20230420081634
+      20230414010523
+      20230412073021
+      20230412005311
+      20230410004651
+      20230406041523
+      20230405121625
+      20230405121613
+      20230320234918
+      20230314121142
+      20230314120530
+      20230314081013
+      20230314021909
+      20230308061833
+      20230223102416
+      20230222232121
+    )
+    # Removed: account_groups
+    target_tables = %w(
+      antennas
+      antenna_accounts
+      antenna_domains
+      antenna_tags
+      bookmark_categories
+      bookmark_category_statuses
+      circles
+      circle_accounts
+      circle_statuses
+      emoji_reactions
+      friend_domains
+      instance_infos
+      list_statuses
+      ng_rules
+      ng_rule_histories
+      ngword_histories
+      ng_words
+      pending_follow_requests
+      pending_statuses
+      scheduled_expiration_statuses
+      sensitive_words
+      specified_domains
+      status_capability_tokens
+      status_references
+    )
+    target_table_columns = [
+      # Removed: accounts dissubscribable
+      # Removed: accounts group_allow_private_message
+      # Removed: accounts group_message_following_only
+      %w(accounts master_settings),
+      %w(accounts remote_pending),
+      %w(accounts searchability),
+      %w(accounts settings),
+      # Removed: accounts stop_emoji_reaction_streaming
+      # Removed: account_stats group_activitypub_count
+      %w(account_statuses_cleanup_policies keep_self_emoji),
+      %w(account_statuses_cleanup_policies min_emojis),
+      %w(conversations ancestor_status_id),
+      %w(conversations inbox_url),
+      %w(custom_emojis aliases),
+      %w(custom_emojis image_height),
+      %w(custom_emojis image_width),
+      %w(custom_emojis is_sensitive),
+      %w(custom_emojis license),
+      %w(custom_filters exclude_follows),
+      %w(custom_filters exclude_localusers),
+      %w(custom_filters with_quote),
+      %w(domain_blocks block_trends),
+      %w(domain_blocks detect_invalid_subscription),
+      %w(domain_blocks hidden),
+      # Removed: domain_blocks hidden_anonymous
+      %w(domain_blocks reject_favourite),
+      %w(domain_blocks reject_friend),
+      %w(domain_blocks reject_hashtag),
+      %w(domain_blocks reject_new_follow),
+      # Removed: domain_blocks reject_reply
+      %w(domain_blocks reject_reply_exclude_followers),
+      # Removed: domain_blocks reject_send_dissubscribable
+      # Removed: domain_blocks reject_send_media
+      # Removed: domain_blocks reject_send_not_public_searchability
+      # Removed: domain_blocks reject_send_public_unlisted
+      # Removed: domain_blocks reject_send_unlisted_dissubscribable
+      %w(domain_blocks reject_send_sensitive),
+      %w(domain_blocks reject_straight_follow),
+      %w(favourites uri),
+      %w(lists notify),
+      %w(statuses limited_scope),
+      %w(statuses markdown),
+      %w(statuses quote_of_id),
+      %w(statuses searchability),
+      %w(status_edits markdown),
+      %w(status_stats emoji_reactions),
+      %w(status_stats emoji_reactions_count),
+      %w(status_stats emoji_reaction_accounts_count),
+      %w(status_stats status_referred_by_count),
+      # Removed: status_stats test
+    ]
+    target_indices = %w(
+      index_statuses_on_url
+      index_statuses_on_conversation_id
+      index_preview_cards_vacuum
+      index_media_attachments_vacuum
+    )
+
+    prompt.say 'Processing...'
+    ActiveRecord::Base.connection.execute('UPDATE statuses SET visibility = 1 WHERE visibility IN (10, 11)')
+    ActiveRecord::Base.connection.execute('UPDATE custom_filters SET action = 0 WHERE action = 2')
+    ActiveRecord::Base.connection.execute('UPDATE account_warnings SET action = 1250 WHERE action = 1200')
+    ActiveRecord::Base.connection.execute('CREATE INDEX IF NOT EXISTS index_statuses_local_20190824 ON statuses USING btree (id DESC, account_id) WHERE (local OR (uri IS NULL)) AND deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))')
+    ActiveRecord::Base.connection.execute('CREATE INDEX IF NOT EXISTS index_statuses_public_20200119 ON statuses USING btree (id DESC, account_id) WHERE deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))')
+    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_statuses_local_20231213')
+    ActiveRecord::Base.connection.execute('DROP INDEX IF EXISTS index_statuses_public_20231213')
+    ActiveRecord::Base.connection.execute('ALTER TABLE ONLY custom_filter_keywords ALTER COLUMN whole_word SET DEFAULT true')
+    prompt.ok 'Proceed'
+
+    prompt.say 'Removing migration histories...'
+    ActiveRecord::Base.connection.execute("DELETE FROM schema_migrations WHERE version IN ('#{target_migrations.join("','")}')")
+    prompt.ok 'Removed'
+
+    prompt.say 'Removing tables...'
+    target_tables.each do |table_name|
+      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{table_name} CASCADE")
+    end
+    prompt.ok 'Removed'
+
+    prompt.say 'Removing table columns...'
+    target_table_columns.each do |table_name, column_name|
+      ActiveRecord::Base.connection.execute("ALTER TABLE #{table_name} DROP COLUMN IF EXISTS #{column_name}")
+    end
+    prompt.ok 'Removed'
+
+    prompt.say 'Removing indices...'
+    target_indices.each do |index_name|
+      ActiveRecord::Base.connection.execute("DROP INDEX IF EXISTS #{index_name}")
+    end
+    prompt.ok 'Removed'
+
+    prompt.ok 'Done!'
+    prompt.say "\n"
+    prompt.ok 'Thanks for using kmyblue. Good bye!'
+  end
+end
+
+# rubocop:enable all
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e8a64b8fb2..d6377c9c82 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,6 +1,22 @@
 # frozen_string_literal: true
 
+# We are providing our own task with our own format
+Rake::Task['db:encryption:init'].clear
+
 namespace :db do
+  namespace :encryption do
+    desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
+    task :init do # rubocop:disable Rails/RakeEnvironment
+      puts <<~MSG
+        Add these environment variables to your Mastodon environment:#{' '}
+
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=#{SecureRandom.alphanumeric(32)}
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=#{SecureRandom.alphanumeric(32)}
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=#{SecureRandom.alphanumeric(32)}
+      MSG
+    end
+  end
+
   namespace :migrate do
     desc 'Setup the db or migrate depending on state of db'
     task setup: :environment do
@@ -15,9 +31,9 @@ namespace :db do
     end
   end
 
-  task :pre_migration_check do
-    version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
+  task pre_migration_check: :environment do
+    version = ActiveRecord::Base.connection.database_version
+    abort 'This version of Mastodon requires PostgreSQL 12.0 or newer. Please update PostgreSQL before updating Mastodon.' if version < 120_000
   end
 
   Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
index 3e3d0daac5..374ea149fe 100644
--- a/lib/tasks/icons.rake
+++ b/lib/tasks/icons.rake
@@ -22,7 +22,7 @@ def find_used_icons
 
   Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path|
     File.open(path, 'r') do |file|
-      pattern = %r{\Aimport .* from 'mastodon/../material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
+      pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
       file.each_line do |line|
         match = pattern.match(line)
         next if match.blank?
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index f50ef4bbff..b5d4861328 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -36,6 +36,15 @@ namespace :mastodon do
         env[key] = SecureRandom.hex(64)
       end
 
+      # Required by ActiveRecord encryption feature
+      %w(
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+      ).each do |key|
+        env[key] = SecureRandom.alphanumeric(32)
+      end
+
       vapid_key = Webpush.generate_key
 
       env['VAPID_PRIVATE_KEY'] = vapid_key.private_key
@@ -449,7 +458,7 @@ namespace :mastodon do
 
       prompt.say "\n"
 
-      env['UPDATE_CHECK_URL'] = '' unless prompt.yes?('Do you want Mastodon to periodically check for important updates and notify you? (Recommended)', default: true)
+      env['UPDATE_CHECK_URL'] = '' unless prompt.yes?('Do you want kmyblue to periodically check for important updates and notify you? (Recommended)', default: true)
 
       prompt.say "\n"
       prompt.say 'This configuration will be written to .env.production'
@@ -544,6 +553,7 @@ namespace :mastodon do
           owner_role = UserRole.find_by(name: 'Owner')
           user = User.new(email: email, password: password, confirmed_at: Time.now.utc, account_attributes: { username: username }, bypass_invite_request_check: true, role: owner_role)
           user.save(validate: false)
+          user.approve!
 
           Setting.site_contact_username = username
 
diff --git a/lib/tasks/sidekiq_unique_jobs.rake b/lib/tasks/sidekiq_unique_jobs.rake
new file mode 100644
index 0000000000..bedc8fe4c6
--- /dev/null
+++ b/lib/tasks/sidekiq_unique_jobs.rake
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+namespace :sidekiq_unique_jobs do
+  task delete_all_locks: :environment do
+    digests = SidekiqUniqueJobs::Digests.new
+    digests.delete_by_pattern('*', count: digests.count)
+
+    expiring_digests = SidekiqUniqueJobs::ExpiringDigests.new
+    expiring_digests.delete_by_pattern('*', count: expiring_digests.count)
+  end
+end
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
deleted file mode 100644
index d505a47195..0000000000
--- a/lib/tasks/spec.rake
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-if Rake::Task.task_defined?('spec:system')
-  namespace :spec do
-    task :enable_system_specs do # rubocop:disable Rails/RakeEnvironment
-      ENV['LOCAL_DOMAIN'] = 'localhost:3000'
-      ENV['LOCAL_HTTPS'] = 'false'
-      ENV['RUN_SYSTEM_SPECS'] = 'true'
-    end
-  end
-
-  Rake::Task['spec:system'].enhance ['spec:enable_system_specs']
-end
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index c3a9dbfd73..e3336c2ef4 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -2,6 +2,23 @@
 
 namespace :tests do
   namespace :migrations do
+    desc 'Prepares all migrations and test data for consistency checks'
+    task prepare_database: :environment do
+      {
+        '2' => 2017_10_10_025614,
+        '2_4' => 2018_05_14_140000,
+        '2_4_3' => 2018_07_07_154237,
+        '3_3_0' => 2020_12_18_054746,
+      }.each do |release, version|
+        ActiveRecord::Tasks::DatabaseTasks
+          .migration_connection
+          .migration_context
+          .migrate(version)
+        Rake::Task["tests:migrations:populate_v#{release}"]
+          .invoke
+      end
+    end
+
     desc 'Check that database state is consistent with a successful migration from populated data'
     task check_database: :environment do
       unless Account.find_by(username: 'admin', domain: nil)&.hide_collections? == false
@@ -24,7 +41,7 @@ namespace :tests do
         exit(1)
       end
 
-      if Account.where(domain: Rails.configuration.x.local_domain).exists?
+      if Account.exists?(domain: Rails.configuration.x.local_domain)
         puts 'Faux remote accounts not properly cleaned up'
         exit(1)
       end
@@ -34,7 +51,7 @@ namespace :tests do
         exit(1)
       end
 
-      if Account.find(-99).private_key.blank?
+      if Account.find(Account::INSTANCE_ACTOR_ID).private_key.blank?
         puts 'Instance actor does not have a private key'
         exit(1)
       end
@@ -88,6 +105,54 @@ namespace :tests do
         puts 'Locale for fr-QC users not updated to fr-CA as expected'
         exit(1)
       end
+
+      policy = NotificationPolicy.find_by(account: User.find(1).account)
+      unless policy.filter_private_mentions == false && policy.filter_not_following == true
+        puts 'Notification policy not migrated as expected'
+        exit(1)
+      end
+
+      unless Identity.where(provider: 'foo', uid: 0).count == 1
+        puts 'Identities not deduplicated as expected'
+        exit(1)
+      end
+
+      unless WebauthnCredential.where(user_id: 1, nickname: 'foo').count == 1
+        puts 'Webauthn credentials not deduplicated as expected'
+        exit(1)
+      end
+
+      unless AccountAlias.where(account_id: 1, uri: 'https://example.com/users/foobar').count == 1
+        puts 'Account aliases not deduplicated as expected'
+        exit(1)
+      end
+
+      # This is checking the attribute rather than the method, to avoid the legacy fallback
+      # and ensure the data has been migrated
+      unless Account.find_local('qcuser').user[:otp_secret] == 'anotpsecretthatshouldbeencrypted'
+        puts "DEBUG: #{Account.find_local('qcuser').user.inspect}"
+        puts 'OTP secret for user not preserved as expected'
+        exit(1)
+      end
+
+      puts 'No errors found. Database state is consistent with a successful migration process.'
+    end
+
+    desc 'Populate the database with test data for 3.3.0'
+    task populate_v3_3_0: :environment do # rubocop:disable Naming/VariableNumber
+      ActiveRecord::Base.connection.execute(<<~SQL.squish)
+        INSERT INTO "webauthn_credentials"
+          (user_id, nickname, external_id, public_key, created_at, updated_at)
+        VALUES
+          (1, 'foo', 1, 'foo', now(), now()),
+          (1, 'foo', 2, 'bar', now(), now());
+
+        INSERT INTO "account_aliases"
+          (account_id, uri, acct, created_at, updated_at)
+        VALUES
+          (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now()),
+          (1, 'https://example.com/users/foobar', 'foobar@example.com', now(), now());
+      SQL
     end
 
     desc 'Populate the database with test data for 2.4.3'
@@ -141,7 +206,7 @@ namespace :tests do
         INSERT INTO "settings"
           (id, thing_type, thing_id, var, value, created_at, updated_at)
         VALUES
-          (3, 'User', 1, 'notification_emails', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nfollow: false\nreblog: true\nfavourite: true\nmention: false\nfollow_request: true\ndigest: true\nreport: true\npending_account: false\ntrending_tag: true\nappeal: true\n', now(), now()),
+          (3, 'User', 1, 'notification_emails', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nfollow: false\nreblog: true\nfavourite: true\nmention: false\nfollow_request: true\ndigest: true\nreport: true\npending_account: false\npending_friend_server: true\ntrending_tag: true\nappeal: true\n', now(), now()),
           (4, 'User', 1, 'trends', E'--- false\n', now(), now());
 
         INSERT INTO "accounts"
@@ -156,14 +221,27 @@ namespace :tests do
           (4, 10, 'kmruser@localhost', now(), now(), false, 'ku', '{en,kmr,ku,ckb}');
 
         INSERT INTO "users"
-          (id, account_id, email, created_at, updated_at, locale)
+          (id, account_id, email, created_at, updated_at, locale,
+           encrypted_otp_secret, encrypted_otp_secret_iv, encrypted_otp_secret_salt,
+           otp_required_for_login)
         VALUES
-          (5, 11, 'qcuser@localhost', now(), now(), 'fr-QC');
+          (5, 11, 'qcuser@localhost', now(), now(), 'fr-QC',
+           E'Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n',
+           'rys3THICkr60BoWC',
+           '_LMkAGvdg7a+sDIKjI3mR2Q==',
+           true);
 
         INSERT INTO "settings"
           (id, thing_type, thing_id, var, value, created_at, updated_at)
         VALUES
-          (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now());
+          (5, 'User', 4, 'default_language', E'--- kmr\n', now(), now()),
+          (6, 'User', 1, 'interactions', E'--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nmust_be_follower: false\nmust_be_following: true\nmust_be_following_dm: false\n', now(), now());
+
+        INSERT INTO "identities"
+          (provider, uid, user_id, created_at, updated_at)
+        VALUES
+          ('foo', 0, 1, now(), now()),
+          ('foo', 0, 1, now(), now());
       SQL
     end
 
diff --git a/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml.tt
similarity index 100%
rename from lib/templates/haml/scaffold/_form.html.haml
rename to lib/templates/haml/scaffold/_form.html.haml.tt
diff --git a/lib/webpacker/manifest_extensions.rb b/lib/webpacker/manifest_extensions.rb
index 789eb81ccf..8a184bc52f 100644
--- a/lib/webpacker/manifest_extensions.rb
+++ b/lib/webpacker/manifest_extensions.rb
@@ -5,9 +5,9 @@ module Webpacker::ManifestExtensions
     asset = super
 
     if pack_type[:with_integrity] && asset.respond_to?(:dig)
-      [asset.dig('src'), asset.dig('integrity')]
+      [asset['src'], asset['integrity']]
     elsif asset.respond_to?(:dig)
-      asset.dig('src')
+      asset['src']
     else
       asset
     end
diff --git a/package.json b/package.json
index d0b1b2e71c..6216d6bc47 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": ">=18"
   },
@@ -12,22 +12,22 @@
   "scripts": {
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
-    "fix:js": "yarn lint:js --fix",
-    "fix:json": "prettier --write \"**/*.{json,json5}\"",
-    "fix:md": "prettier --write \"**/*.md\"",
-    "fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
-    "fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
-    "fix": "yarn fix:js && yarn fix:json && yarn fix:sass && yarn fix:yml",
-    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
+    "clean:all": "yarn clean:kbdraft & yarn clean:kbtopic & yarn clean:upstream",
+    "clean:kbdraft": "git branch | grep kb-draft- | xargs git branch -d",
+    "clean:kbtopic": "git branch | grep kbtopic- | xargs git branch -d",
+    "clean:upstream": "git branch | grep upstream- | xargs git branch -d",
+    "fix:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives --fix",
+    "fix:css": "stylelint --fix \"**/*.{css,scss}\"",
+    "fix": "yarn fix:js && yarn fix:css",
+    "format": "prettier --write --log-level warn .",
+    "format:check": "prettier --check --ignore-unknown .",
+    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' --ignore '**/*.d.ts' --out-file app/javascript/mastodon/locales/en.json --format config/formatjs-formatter.js",
     "jest": "cross-env NODE_ENV=test jest",
     "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
-    "lint:json": "prettier --check \"**/*.{json,json5}\"",
-    "lint:md": "prettier --check \"**/*.md\"",
-    "lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
-    "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
-    "lint": "yarn lint:js && yarn lint:json && yarn lint:sass && yarn lint:yml",
+    "lint:css": "stylelint \"**/*.{css,scss}\"",
+    "lint": "yarn lint:js && yarn lint:css",
     "postversion": "git push --tags",
-    "prepare": "husky install",
+    "prepare": "husky",
     "start": "node ./streaming/index.js",
     "test": "yarn lint && yarn run typecheck && yarn jest",
     "typecheck": "tsc --noEmit"
@@ -45,15 +45,16 @@
     "@babel/preset-env": "^7.22.4",
     "@babel/preset-react": "^7.22.3",
     "@babel/preset-typescript": "^7.21.5",
-    "@babel/runtime": "^7.22.3",
+    "@babel/runtime": "^7.23.7",
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@rails/ujs": "^7.1.1",
+    "@hello-pangea/dnd": "^16.3.0",
+    "@rails/ujs": "7.1.3-2",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
-    "async-mutex": "^0.4.0",
+    "async-mutex": "^0.5.0",
     "autoprefixer": "^10.4.14",
     "axios": "^1.4.0",
     "babel-loader": "^8.3.0",
@@ -70,7 +71,7 @@
     "core-js": "^3.30.2",
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.7",
-    "cssnano": "^6.0.1",
+    "cssnano": "^7.0.0",
     "detect-passive-events": "^2.0.3",
     "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "escape-html": "^1.0.3",
@@ -89,10 +90,10 @@
     "mark-loader": "^0.1.6",
     "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
-    "mkdirp": "^3.0.1",
     "path-complete-extname": "^1.0.0",
     "postcss": "^8.4.24",
     "postcss-loader": "^4.3.0",
+    "postcss-preset-env": "^9.5.2",
     "prop-types": "^15.8.1",
     "punycode": "^2.3.0",
     "react": "^18.2.0",
@@ -118,7 +119,6 @@
     "redux-immutable": "^4.0.0",
     "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
-    "rimraf": "^5.0.1",
     "sass": "^1.62.1",
     "sass-loader": "^10.2.0",
     "stacktrace-js": "^2.0.2",
@@ -144,7 +144,7 @@
   "devDependencies": {
     "@formatjs/cli": "^6.1.1",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^15.0.0",
     "@types/babel__core": "^7.20.1",
     "@types/emoji-mart": "^3.0.9",
     "@types/escape-html": "^1.0.2",
@@ -163,35 +163,30 @@
     "@types/react-helmet": "^6.1.6",
     "@types/react-immutable-proptypes": "^2.1.0",
     "@types/react-motion": "^0.0.40",
-    "@types/react-overlays": "^3.1.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
-    "@types/react-select": "^5.0.1",
     "@types/react-sparklines": "^1.7.2",
     "@types/react-swipeable-views": "^0.13.1",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/react-textarea-autosize": "^8.0.0",
     "@types/react-toggle": "^4.0.3",
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
-    "@types/yargs": "^17.0.24",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@types/webpack-env": "^1.18.4",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
-    "eslint-config-prettier": "^9.0.0",
     "eslint-define-config": "^2.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-jsx-a11y": "~6.8.0",
-    "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^8.0.3",
+    "husky": "^9.0.11",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^15.0.0",
@@ -200,8 +195,7 @@
     "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
-    "webpack-dev-server": "^3.11.3",
-    "yargs": "^17.7.2"
+    "webpack-dev-server": "^3.11.3"
   },
   "resolutions": {
     "kind-of": "^6.0.3",
diff --git a/postcss.config.js b/postcss.config.js
index 5d58d74e34..63aeafb36d 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,10 @@
-module.exports = ({ env }) => ({
+/** @type {import('postcss-load-config').Config} */
+const config = ({ env }) => ({
   plugins: [
-    'autoprefixer',
-    env === 'production' ? 'cssnano' : '',
+    require('postcss-preset-env'),
+    require('autoprefixer'),
+    env === 'production' ? require('cssnano') : '',
   ],
 });
+
+module.exports = config;
diff --git a/public/embed.js b/public/embed.js
index defba403e4..f8e6a22db4 100644
--- a/public/embed.js
+++ b/public/embed.js
@@ -31,6 +31,8 @@
 
       var iframe = iframes.get(data.id);
 
+      if(!iframe) return;
+
       if ('source' in e && iframe.contentWindow !== e.source) {
         return;
       }
@@ -38,7 +40,7 @@
       iframe.height = data.height;
     });
 
-    [].forEach.call(document.querySelectorAll('iframe.mastodon-embed'), function (iframe) {
+    document.querySelectorAll('iframe.mastodon-embed').forEach(iframe => {
       // select unique id for each iframe
       var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
       while (id === 0 || iframes.has(id)) {
diff --git a/public/favicon.ico b/public/favicon.ico
old mode 100644
new mode 100755
index b09a98bb9b..fc5e475d42
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/robots.txt b/public/robots.txt
index 6672eeba1f..3bd45adaef 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -3,6 +3,9 @@
 User-agent: GPTBot
 Disallow: /
 
+User-agent: CCBot
+Disallow: /
+
 User-agent: *
 Disallow: /media_proxy/
 Disallow: /interact/
diff --git a/spec/config/initializers/rack/attack_spec.rb b/spec/config/initializers/rack/attack_spec.rb
index c9ce9e27d0..e25b7dfde9 100644
--- a/spec/config/initializers/rack/attack_spec.rb
+++ b/spec/config/initializers/rack/attack_spec.rb
@@ -13,7 +13,7 @@ describe Rack::Attack, type: :request do
       # to avoid crossing period boundaries.
 
       # The code Rack::Attack uses to set periods is the following:
-      # https://github.com/rack/rack-attack/blob/v6.6.1/lib/rack/attack/cache.rb#L64-L66
+      # https://github.com/rack/rack-attack/blob/v6.7.0/lib/rack/attack/cache.rb#L70-L72
       # So we want to minimize `Time.now.to_i % period`
 
       travel_to Time.zone.at(counter_prefix * period.seconds)
diff --git a/spec/controllers/.rubocop.yml b/spec/controllers/.rubocop.yml
index 525479be81..51d7c23de1 100644
--- a/spec/controllers/.rubocop.yml
+++ b/spec/controllers/.rubocop.yml
@@ -1,6 +1,6 @@
 inherit_from: ../../.rubocop.yml
 
-# Anonymous controllers in specs cannot access described_class
-# https://github.com/rubocop/rubocop-rspec/blob/master/lib/rubocop/cop/rspec/described_class.rb#L36-L39
+# Anonymous controllers in specs cannot access `described_class`, explanation:
+# https://github.com/rubocop/rubocop-rspec/blob/v2.26.1/lib/rubocop/cop/rspec/described_class.rb#L36-L56
 RSpec/DescribedClass:
   SkipBlocks: true
diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index cf484ff5a4..11ef03c842 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -17,34 +17,27 @@ RSpec.describe ActivityPub::CollectionsController do
   end
 
   describe 'GET #show' do
-    context 'when id is "featured"' do
-      context 'without signature' do
-        subject(:response) { get :show, params: { id: 'featured', account_username: account.username } }
+    subject(:response) { get :show, params: { id: id, account_username: account.username } }
 
-        let(:body) { body_as_json }
+    context 'when id is "featured"' do
+      let(:id) { 'featured' }
+
+      context 'without signature' do
         let(:remote_account) { nil }
 
-        it 'returns http success' do
+        it 'returns http success and correct media type' do
           expect(response).to have_http_status(200)
-        end
-
-        it 'returns application/activity+json' do
           expect(response.media_type).to eq 'application/activity+json'
         end
 
         it_behaves_like 'cacheable response'
 
-        it 'returns orderedItems with pinned statuses' do
-          expect(body[:orderedItems]).to be_an Array
-          expect(body[:orderedItems].size).to eq 3
-        end
-
-        it 'includes URI of private pinned status' do
-          expect(body[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
-        end
-
-        it 'does not include contents of private pinned status' do
-          expect(response.body).to_not include(private_pinned.text)
+        it 'returns orderedItems with correct items' do
+          expect(body_as_json[:orderedItems])
+            .to be_an(Array)
+            .and have_attributes(size: 3)
+            .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+            .and not_include(private_pinned.text)
         end
 
         context 'when account is permanently suspended' do
@@ -73,33 +66,19 @@ RSpec.describe ActivityPub::CollectionsController do
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
         context 'when getting a featured resource' do
-          before do
-            get :show, params: { id: 'featured', account_username: account.username }
-          end
-
-          it 'returns http success' do
+          it 'returns http success and correct media type' do
             expect(response).to have_http_status(200)
-          end
-
-          it 'returns application/activity+json' do
             expect(response.media_type).to eq 'application/activity+json'
           end
 
           it_behaves_like 'cacheable response'
 
-          it 'returns orderedItems with pinned statuses' do
-            json = body_as_json
-            expect(json[:orderedItems]).to be_an Array
-            expect(json[:orderedItems].size).to eq 3
-          end
-
-          it 'includes URI of private pinned status' do
-            json = body_as_json
-            expect(json[:orderedItems]).to include(ActivityPub::TagManager.instance.uri_for(private_pinned))
-          end
-
-          it 'does not include contents of private pinned status' do
-            expect(response.body).to_not include(private_pinned.text)
+          it 'returns orderedItems with expected items' do
+            expect(body_as_json[:orderedItems])
+              .to be_an(Array)
+              .and have_attributes(size: 3)
+              .and include(ActivityPub::TagManager.instance.uri_for(private_pinned))
+              .and not_include(private_pinned.text)
           end
         end
 
@@ -111,50 +90,36 @@ RSpec.describe ActivityPub::CollectionsController do
           context 'when signed request account is blocked' do
             before do
               account.block!(remote_account)
-              get :show, params: { id: 'featured', account_username: account.username }
             end
 
-            it 'returns http success' do
+            it 'returns http success and correct media type and cache headers' do
               expect(response).to have_http_status(200)
-            end
-
-            it 'returns application/activity+json' do
               expect(response.media_type).to eq 'application/activity+json'
-            end
-
-            it 'returns private Cache-Control header' do
               expect(response.headers['Cache-Control']).to include 'private'
             end
 
             it 'returns empty orderedItems' do
-              json = body_as_json
-              expect(json[:orderedItems]).to be_an Array
-              expect(json[:orderedItems].size).to eq 0
+              expect(body_as_json[:orderedItems])
+                .to be_an(Array)
+                .and have_attributes(size: 0)
             end
           end
 
           context 'when signed request account is domain blocked' do
             before do
               account.block_domain!(remote_account.domain)
-              get :show, params: { id: 'featured', account_username: account.username }
             end
 
-            it 'returns http success' do
+            it 'returns http success and correct media type and cache headers' do
               expect(response).to have_http_status(200)
-            end
-
-            it 'returns application/activity+json' do
               expect(response.media_type).to eq 'application/activity+json'
-            end
-
-            it 'returns private Cache-Control header' do
               expect(response.headers['Cache-Control']).to include 'private'
             end
 
             it 'returns empty orderedItems' do
-              json = body_as_json
-              expect(json[:orderedItems]).to be_an Array
-              expect(json[:orderedItems].size).to eq 0
+              expect(body_as_json[:orderedItems])
+                .to be_an(Array)
+                .and have_attributes(size: 0)
             end
           end
         end
@@ -162,8 +127,9 @@ RSpec.describe ActivityPub::CollectionsController do
     end
 
     context 'when id is not "featured"' do
+      let(:id) { 'hoge' }
+
       it 'returns http not found' do
-        get :show, params: { id: 'hoge', account_username: account.username }
         expect(response).to have_http_status(404)
       end
     end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index 6b5a69d42a..db7f60d3f8 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe ActivityPub::RepliesController do
         context 'when there are few self-replies' do
           it 'points next to replies from other people' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=true', 'page=true')
           end
         end
 
@@ -101,7 +101,7 @@ RSpec.describe ActivityPub::RepliesController do
 
           it 'points next to other self-replies' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=false', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=false', 'page=true')
           end
         end
       end
@@ -140,7 +140,7 @@ RSpec.describe ActivityPub::RepliesController do
 
           it 'points next to other replies' do
             expect(page_json).to be_a Hash
-            expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
+            expect(parsed_uri_query_values(page_json[:next])).to include('only_other_accounts=true', 'page=true')
           end
         end
       end
@@ -196,6 +196,13 @@ RSpec.describe ActivityPub::RepliesController do
 
   private
 
+  def parsed_uri_query_values(uri)
+    Addressable::URI
+      .parse(uri)
+      .query
+      .split('&')
+  end
+
   def ap_public_collection
     ActivityPub::TagManager::COLLECTIONS[:public]
   end
diff --git a/spec/controllers/admin/account_moderation_notes_controller_spec.rb b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
index 8d24a7af37..5ea546f418 100644
--- a/spec/controllers/admin/account_moderation_notes_controller_spec.rb
+++ b/spec/controllers/admin/account_moderation_notes_controller_spec.rb
@@ -24,10 +24,19 @@ RSpec.describe Admin::AccountModerationNotesController do
       end
     end
 
-    context 'when parameters are invalid' do
+    context 'when the content is too short' do
       let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: '' } } }
 
-      it 'falls to create a note' do
+      it 'fails to create a note' do
+        expect { subject }.to_not change(AccountModerationNote, :count)
+        expect(response).to render_template 'admin/accounts/show'
+      end
+    end
+
+    context 'when the content is too long' do
+      let(:params) { { account_moderation_note: { target_account_id: target_account.id, content: 'test' * AccountModerationNote::CONTENT_SIZE_LIMIT } } }
+
+      it 'fails to create a note' do
         expect { subject }.to_not change(AccountModerationNote, :count)
         expect(response).to render_template 'admin/accounts/show'
       end
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 1882ea8388..b90bb414b0 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -9,18 +9,8 @@ RSpec.describe Admin::AccountsController do
 
   describe 'GET #index' do
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
-
-    around do |example|
-      default_per_page = Account.default_per_page
-      Account.paginates_per 1
-      example.run
-      Account.paginates_per default_per_page
-    end
-
-    it 'filters with parameters' do
-      account_filter = instance_double(AccountFilter, results: Account.all)
-      allow(AccountFilter).to receive(:new).and_return(account_filter)
-      params = {
+    let(:params) do
+      {
         origin: 'local',
         by_domain: 'domain',
         status: 'active',
@@ -29,25 +19,35 @@ RSpec.describe Admin::AccountsController do
         email: 'local-part@domain',
         ip: '0.0.0.42',
       }
-
-      get :index, params: params
-
-      expect(AccountFilter).to have_received(:new).with(hash_including(params))
     end
 
-    it 'paginates accounts' do
+    around do |example|
+      default_per_page = Account.default_per_page
+      Account.paginates_per 1
+      example.run
+      Account.paginates_per default_per_page
+    end
+
+    before do
       Fabricate(:account)
 
-      get :index, params: { page: 2 }
-
-      accounts = assigns(:accounts)
-      expect(accounts.count).to eq 1
-      expect(accounts.klass).to be Account
+      account_filter = instance_double(AccountFilter, results: Account.all)
+      allow(AccountFilter).to receive(:new).and_return(account_filter)
     end
 
-    it 'returns http success' do
-      get :index
-      expect(response).to have_http_status(200)
+    it 'returns success and paginates and filters with parameters' do
+      get :index, params: params.merge(page: 2)
+
+      expect(response)
+        .to have_http_status(200)
+      expect(assigns(:accounts))
+        .to have_attributes(
+          count: eq(1),
+          klass: be(Account)
+        )
+      expect(AccountFilter)
+        .to have_received(:new)
+        .with(hash_including(params))
     end
   end
 
@@ -153,13 +153,9 @@ RSpec.describe Admin::AccountsController do
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in approving account' do
+      it 'succeeds in approving account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
         expect(user.reload).to be_approved
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -195,12 +191,8 @@ RSpec.describe Admin::AccountsController do
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in rejecting account' do
+      it 'succeeds in rejecting account and logs action' do
         expect(subject).to redirect_to admin_accounts_path(status: 'pending')
-      end
-
-      it 'logs action' do
-        expect(subject).to have_http_status 302
 
         expect(latest_admin_action_log)
           .to be_present
@@ -286,12 +278,9 @@ RSpec.describe Admin::AccountsController do
     context 'when user is admin' do
       let(:role) { UserRole.find_by(name: 'Admin') }
 
-      it 'succeeds in removing email blocks' do
+      it 'succeeds in removing email blocks and redirects to admin account path' do
         expect { subject }.to change { CanonicalEmailBlock.where(reference_account: account).count }.from(1).to(0)
-      end
 
-      it 'redirects to admin account path' do
-        subject
         expect(response).to redirect_to admin_account_path(account.id)
       end
     end
diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index f830c3b95c..bf7f9bd704 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -30,42 +30,48 @@ RSpec.describe Admin::Disputes::AppealsController do
   end
 
   describe 'POST #approve' do
+    subject { post :approve, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :approve, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
+      emails = capture_emails { subject }
 
-    it 'unsuspends a suspended account' do
-      expect(target_account.reload.suspended?).to be false
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(target_account.reload)
+        .to_not be_suspended
 
-    it 'notifies target account about approved appeal', :sidekiq_inline do
-      expect(UserMailer.deliveries.size).to eq(1)
-      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
-      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
+      expect(emails.size)
+        .to eq(1)
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(target_account.user.email),
+          subject: eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
+        )
     end
   end
 
   describe 'POST #reject' do
+    subject { post :reject, params: { id: appeal.id } }
+
     let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
-    before do
-      post :reject, params: { id: appeal.id }
-    end
+    it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
+      emails = capture_emails { subject }
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(appeal.strike))
-    end
+      expect(response)
+        .to redirect_to(disputes_strike_path(appeal.strike))
 
-    it 'notifies target account about rejected appeal', :sidekiq_inline do
-      expect(UserMailer.deliveries.size).to eq(1)
-      expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
-      expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
+      expect(emails.size)
+        .to eq(1)
+
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(target_account.user.email),
+          subject: eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
+        )
     end
   end
 end
diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
index bfcccfa06c..991387400f 100644
--- a/spec/controllers/admin/export_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe Admin::ExportDomainBlocksController do
       Fabricate(:domain_block, domain: 'bad.domain', severity: 'silence', public_comment: 'bad server')
       Fabricate(:domain_block, domain: 'worse.domain', severity: 'suspend', reject_media: true, reject_reports: true, public_comment: 'worse server', obfuscate: true)
       Fabricate(:domain_block, domain: 'reject.media', severity: 'noop', reject_media: true, public_comment: 'reject media and test unicode characters ♥')
+      Fabricate(:domain_block, domain: 'little.spam', severity: 'noop', public_comment: 'has some spams', reject_favourite: true, reject_straight_follow: true)
       Fabricate(:domain_block, domain: 'no.op', severity: 'noop', public_comment: 'noop')
 
       get :export, params: { format: :csv }
@@ -43,7 +44,16 @@ RSpec.describe Admin::ExportDomainBlocksController do
       end
 
       it 'renders page with expected domain blocks' do
-        expect(assigns(:domain_blocks).map { |block| [block.domain, block.severity.to_sym] }).to contain_exactly(['bad.domain', :silence], ['worse.domain', :suspend], ['reject.media', :noop])
+        expect(assigns(:domain_blocks).map { |block| [block.domain, block.severity.to_sym] }).to contain_exactly(['bad.domain', :silence], ['worse.domain', :suspend], ['reject.media', :noop], ['little.spam', :noop])
+      end
+
+      it 'renders page with extended domain blocks' do
+        expect(assigns(:domain_blocks).map { |block| [block.domain, block.reject_favourite, block.reject_friend] }).to contain_exactly(
+          ['bad.domain', false, false],
+          ['worse.domain', false, false],
+          ['reject.media', false, false],
+          ['little.spam', true, false]
+        )
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index c8f566f68b..71748cbbec 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -44,14 +44,13 @@ describe Admin::InvitesController do
   end
 
   describe 'POST #deactivate_all' do
+    before { Fabricate(:invite, expires_at: nil) }
+
     it 'expires all invites, then redirects to admin_invites_path' do
-      invites = Fabricate.times(1, :invite, expires_at: nil)
-
-      post :deactivate_all
-
-      invites.each do |invite|
-        expect(invite.reload).to be_expired
-      end
+      expect { post :deactivate_all }
+        .to change { Invite.exists?(expires_at: nil) }
+        .from(true)
+        .to(false)
 
       expect(response).to redirect_to admin_invites_path
     end
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
index 4ddf4a4e24..8d5b5c7aec 100644
--- a/spec/controllers/admin/report_notes_controller_spec.rb
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::ReportNotesController do
         let(:account_id) { nil }
 
         context 'when create_and_resolve flag is on' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' }, create_and_resolve: nil } }
 
           it 'creates a report note and resolves report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -32,7 +32,7 @@ describe Admin::ReportNotesController do
         end
 
         context 'when create_and_resolve flag is false' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' } } }
 
           it 'creates a report note and does not resolve report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -47,7 +47,7 @@ describe Admin::ReportNotesController do
         let(:account_id) { user.account.id }
 
         context 'when create_and_unresolve flag is on' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' }, create_and_unresolve: nil } }
 
           it 'creates a report note and unresolves report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -57,7 +57,7 @@ describe Admin::ReportNotesController do
         end
 
         context 'when create_and_unresolve flag is false' do
-          let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+          let(:params) { { report_note: { report_id: report.id, content: 'test content' } } }
 
           it 'creates a report note and does not unresolve report' do
             expect { subject }.to change(ReportNote, :count).by(1)
@@ -68,12 +68,24 @@ describe Admin::ReportNotesController do
       end
     end
 
-    context 'when parameter is invalid' do
-      let(:params) { { report_note: { content: '', report_id: report.id } } }
+    context 'when content is too short' do
+      let(:params) { { report_note: { report_id: report.id, content: '' } } }
       let(:action_taken) { nil }
       let(:account_id) { nil }
 
       it 'renders admin/reports/show' do
+        expect { subject }.to_not change(ReportNote, :count)
+        expect(subject).to render_template 'admin/reports/show'
+      end
+    end
+
+    context 'when content is too long' do
+      let(:params) { { report_note: { report_id: report.id, content: 'test' * ReportNote::CONTENT_SIZE_LIMIT } } }
+      let(:action_taken) { nil }
+      let(:account_id) { nil }
+
+      it 'renders admin/reports/show' do
+        expect { subject }.to_not change(ReportNote, :count)
         expect(subject).to render_template 'admin/reports/show'
       end
     end
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 97daaf8da9..02760154fb 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -58,6 +58,7 @@ describe Admin::ReportsController do
       report.reload
       expect(report.action_taken_by_account).to eq user.account
       expect(report.action_taken?).to be true
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -70,6 +71,7 @@ describe Admin::ReportsController do
       report.reload
       expect(report.action_taken_by_account).to be_nil
       expect(report.action_taken?).to be false
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -81,6 +83,7 @@ describe Admin::ReportsController do
       expect(response).to redirect_to(admin_report_path(report))
       report.reload
       expect(report.assigned_account).to eq user.account
+      expect(last_action_log.target).to eq(report)
     end
   end
 
@@ -92,6 +95,13 @@ describe Admin::ReportsController do
       expect(response).to redirect_to(admin_report_path(report))
       report.reload
       expect(report.assigned_account).to be_nil
+      expect(last_action_log.target).to eq(report)
     end
   end
+
+  private
+
+  def last_action_log
+    Admin::ActionLog.last
+  end
 end
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index e82a3a6afa..10ed2cf969 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -5,6 +5,8 @@ require 'rails_helper'
 describe Admin::ResetsController do
   render_views
 
+  subject { post :create, params: { account_id: account.id } }
+
   let(:account) { Fabricate(:account) }
 
   before do
@@ -13,11 +15,11 @@ describe Admin::ResetsController do
 
   describe 'POST #create', :sidekiq_inline do
     it 'redirects to admin accounts page' do
-      expect do
-        post :create, params: { account_id: account.id }
-      end.to change(Devise.mailer.deliveries, :size).by(2)
+      emails = capture_emails { subject }
 
-      expect(Devise.mailer.deliveries).to have_attributes(
+      expect(emails.size)
+        .to eq(2)
+      expect(emails).to have_attributes(
         first: have_attributes(
           to: include(account.user.email),
           subject: I18n.t('devise.mailer.password_change.subject')
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index dc5e28e972..4e8bf9ead6 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -60,16 +60,14 @@ describe Admin::StatusesController do
     shared_examples 'when action is report' do
       let(:action) { 'report' }
 
-      it 'creates a report' do
+      it 'creates a report and redirects to report page' do
         subject
 
-        report = Report.last
-        expect(report.target_account_id).to eq account.id
-        expect(report.status_ids).to eq status_ids
-      end
-
-      it 'redirects to report page' do
-        subject
+        expect(Report.last)
+          .to have_attributes(
+            target_account_id: eq(account.id),
+            status_ids: eq(status_ids)
+          )
 
         expect(response).to redirect_to(admin_report_path(Report.last.id))
       end
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index db1e8777f7..659d55f801 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -3,16 +3,12 @@
 require 'rails_helper'
 
 describe Api::BaseController do
-  before do
-    stub_const('FakeService', Class.new)
-  end
-
   controller do
     def success
       head 200
     end
 
-    def error
+    def failure
       FakeService.new
     end
   end
@@ -30,7 +26,7 @@ describe Api::BaseController do
 
     it 'does not protect from forgery' do
       ActionController::Base.allow_forgery_protection = true
-      post 'success'
+      post :success
       expect(response).to have_http_status(200)
     end
   end
@@ -50,50 +46,26 @@ describe Api::BaseController do
 
     it 'returns http forbidden for unconfirmed accounts' do
       user.update(confirmed_at: nil)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for pending accounts' do
       user.update(approved: false)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for disabled accounts' do
       user.update(disabled: true)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for suspended accounts' do
       user.account.suspend!
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
   end
-
-  describe 'error handling' do
-    before do
-      routes.draw { get 'error' => 'api/base#error' }
-    end
-
-    {
-      ActiveRecord::RecordInvalid => 422,
-      Mastodon::ValidationError => 422,
-      ActiveRecord::RecordNotFound => 404,
-      Mastodon::UnexpectedResponseError => 503,
-      HTTP::Error => 503,
-      OpenSSL::SSL::SSLError => 503,
-      Mastodon::NotPermittedError => 403,
-    }.each do |error, code|
-      it "Handles error class of #{error}" do
-        allow(FakeService).to receive(:new).and_raise(error)
-
-        get 'error'
-        expect(response).to have_http_status(code)
-        expect(FakeService).to have_received(:new)
-      end
-    end
-  end
 end
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
deleted file mode 100644
index a62fa54e60..0000000000
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::CredentialsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
-  context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #show' do
-      let(:scopes) { 'read:accounts' }
-
-      it 'returns http success' do
-        get :show
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    describe 'PATCH #update' do
-      let(:scopes) { 'write:accounts' }
-
-      describe 'with valid data' do
-        before do
-          allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
-
-          patch :update, params: {
-            display_name: "Alice Isn't Dead",
-            note: "Hi!\n\nToot toot!",
-            avatar: fixture_file_upload('avatar.gif', 'image/gif'),
-            header: fixture_file_upload('attachment.jpg', 'image/jpeg'),
-            source: {
-              privacy: 'unlisted',
-              sensitive: true,
-            },
-          }
-        end
-
-        it 'updates account info', :aggregate_failures do
-          expect(response).to have_http_status(200)
-
-          user.reload
-          user.account.reload
-
-          expect(user.account.display_name).to eq("Alice Isn't Dead")
-          expect(user.account.note).to eq("Hi!\n\nToot toot!")
-          expect(user.account.avatar).to exist
-          expect(user.account.header).to exist
-          expect(user.setting_default_privacy).to eq('unlisted')
-          expect(user.setting_default_sensitive).to be(true)
-
-          expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(user.account_id)
-        end
-      end
-
-      describe 'with empty source list' do
-        before do
-          patch :update, params: {
-            display_name: "I'm a cat",
-            source: {},
-          }, as: :json
-        end
-
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
-        end
-      end
-
-      describe 'with invalid data' do
-        before do
-          patch :update, params: { note: 'This is too long. ' * 30 }
-        end
-
-        it 'returns http unprocessable entity' do
-          expect(response).to have_http_status(422)
-        end
-      end
-    end
-  end
-
-  context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
-    end
-
-    describe 'GET #show' do
-      it 'returns http unauthorized' do
-        get :show
-        expect(response).to have_http_status(401)
-      end
-    end
-
-    describe 'PATCH #update' do
-      it 'returns http unauthorized' do
-        patch :update, params: { note: 'Foo' }
-        expect(response).to have_http_status(401)
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
deleted file mode 100644
index df71e94ace..0000000000
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::StatusesController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns expected headers', :aggregate_failures do
-      Fabricate(:status, account: user.account)
-      get :index, params: { account_id: user.account.id, limit: 1 }
-
-      expect(response).to have_http_status(200)
-      expect(response.headers['Link'].links.size).to eq(2)
-    end
-
-    context 'with only media' do
-      it 'returns http success' do
-        get :index, params: { account_id: user.account.id, only_media: true }
-
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    context 'with exclude replies' do
-      let!(:status) { Fabricate(:status, account: user.account) }
-      let!(:status_self_reply) { Fabricate(:status, account: user.account, thread: status) }
-
-      before do
-        Fabricate(:status, account: user.account, thread: Fabricate(:status)) # Reply to another user
-        get :index, params: { account_id: user.account.id, exclude_replies: true }
-      end
-
-      it 'returns posts along with self replies', :aggregate_failures do
-        json = body_as_json
-        post_ids = json.map { |item| item[:id].to_i }.sort
-
-        expect(response).to have_http_status(200)
-        expect(post_ids).to eq [status.id, status_self_reply.id]
-      end
-    end
-
-    context 'with only own pinned' do
-      before do
-        Fabricate(:status_pin, account: user.account, status: Fabricate(:status, account: user.account))
-      end
-
-      it 'returns http success' do
-        get :index, params: { account_id: user.account.id, pinned: true }
-
-        expect(response).to have_http_status(200)
-      end
-    end
-
-    context "with someone else's pinned statuses" do
-      let(:account)        { Fabricate(:account, username: 'bob', domain: 'example.com') }
-      let(:status)         { Fabricate(:status, account: account) }
-      let(:private_status) { Fabricate(:status, account: account, visibility: :private) }
-
-      before do
-        Fabricate(:status_pin, account: account, status: status)
-        Fabricate(:status_pin, account: account, status: private_status)
-      end
-
-      it 'returns http success' do
-        get :index, params: { account_id: account.id, pinned: true }
-        expect(response).to have_http_status(200)
-      end
-
-      context 'when user does not follow account' do
-        it 'lists the public status only' do
-          get :index, params: { account_id: account.id, pinned: true }
-          json = body_as_json
-          expect(json.map { |item| item[:id].to_i }).to eq [status.id]
-        end
-      end
-
-      context 'when user follows account' do
-        before do
-          user.account.follow!(account)
-        end
-
-        it 'lists both the public and the private statuses' do
-          get :index, params: { account_id: account.id, pinned: true }
-          json = body_as_json
-          expect(json.map { |item| item[:id].to_i }).to contain_exactly(status.id, private_status.id)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/circles/statuses_controller_spec.rb b/spec/controllers/api/v1/circles/statuses_controller_spec.rb
new file mode 100644
index 0000000000..2a323aa0f8
--- /dev/null
+++ b/spec/controllers/api/v1/circles/statuses_controller_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Circles::StatusesController do
+  render_views
+
+  let(:user)  { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
+  let(:circle) { Fabricate(:circle, account: user.account) }
+  let(:status) { Fabricate(:status, account: user.account, visibility: 'limited', limited_scope: 'circle') }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+    Fabricate(:circle_status, status: status, circle: circle)
+    other_circle = Fabricate(:circle)
+    Fabricate(:circle_status, status: Fabricate(:status, visibility: 'limited', limited_scope: 'circle', account: other_circle.account), circle: other_circle)
+  end
+
+  describe 'GET #index' do
+    it 'returns http success' do
+      get :show, params: { circle_id: circle.id, limit: 5 }
+
+      expect(response).to have_http_status(200)
+      json = body_as_json
+      expect(json.map { |item| item[:id].to_i }).to eq [status.id]
+    end
+
+    context "with someone else's statuses" do
+      let(:other_account)  { Fabricate(:account) }
+      let(:other_circle)   { Fabricate(:circle, account: other_account) }
+
+      before do
+        Fabricate(:circle_status, circle: other_circle, status: Fabricate(:status, account: other_account, visibility: 'limited', limited_scope: 'circle'))
+      end
+
+      it 'returns http failed' do
+        get :show, params: { circle_id: other_circle.id }
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
deleted file mode 100644
index 2734e4a07b..0000000000
--- a/spec/controllers/api/v1/conversations_controller_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::ConversationsController do
-  render_views
-
-  let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:other) { Fabricate(:user) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index', :sidekiq_inline do
-    let(:scopes) { 'read:statuses' }
-
-    before do
-      PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
-      PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
-    end
-
-    it 'returns pagination headers', :aggregate_failures do
-      get :index, params: { limit: 1 }
-
-      expect(response).to have_http_status(200)
-      expect(response.headers['Link'].links.size).to eq(2)
-    end
-
-    it 'returns conversations', :aggregate_failures do
-      get :index
-      json = body_as_json
-      expect(json.size).to eq 2
-      expect(json[0][:accounts].size).to eq 1
-    end
-
-    context 'with since_id' do
-      context 'when requesting old posts' do
-        it 'returns conversations' do
-          get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }
-          json = body_as_json
-          expect(json.size).to eq 2
-        end
-      end
-
-      context 'when requesting posts in the future' do
-        it 'returns no conversation' do
-          get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.from_now, with_random: false) }
-          json = body_as_json
-          expect(json.size).to eq 0
-        end
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/controllers/api/v1/lists_controller_spec.rb
similarity index 78%
rename from spec/controllers/api/v1/timelines/list_controller_spec.rb
rename to spec/controllers/api/v1/lists_controller_spec.rb
index 4ef5d41af8..ed4edbf760 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/controllers/api/v1/lists_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::V1::Timelines::ListController do
+describe Api::V1::ListsController do
   render_views
 
   let(:user) { Fabricate(:user) }
@@ -16,17 +16,24 @@ describe Api::V1::Timelines::ListController do
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
 
     describe 'GET #show' do
-      before do
-        follow = Fabricate(:follow, account: user.account)
-        list.accounts << follow.target_account
-        PostStatusService.new.call(follow.target_account, text: 'New status for user home timeline.')
-      end
-
       it 'returns http success' do
         get :show, params: { id: list.id }
         expect(response).to have_http_status(200)
       end
     end
+
+    describe 'GET #index' do
+      it 'returns http success' do
+        list_id = list.id.to_s
+        Fabricate(:list)
+        get :index
+        expect(response).to have_http_status(200)
+
+        list_ids = body_as_json.pluck(:id)
+        expect(list_ids.size).to eq 1
+        expect(list_ids).to include list_id
+      end
+    end
   end
 
   context 'with the wrong user context' do
diff --git a/spec/controllers/api/v1/push/subscriptions_controller_spec.rb b/spec/controllers/api/v1/push/subscriptions_controller_spec.rb
deleted file mode 100644
index 1681914680..0000000000
--- a/spec/controllers/api/v1/push/subscriptions_controller_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Push::SubscriptionsController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-  let(:create_payload) do
-    {
-      subscription: {
-        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
-        keys: {
-          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
-          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
-        },
-      },
-    }.with_indifferent_access
-  end
-  let(:alerts_payload) do
-    {
-      data: {
-        policy: 'all',
-
-        alerts: {
-          follow: true,
-          follow_request: true,
-          favourite: false,
-          reblog: true,
-          mention: false,
-          poll: true,
-          status: false,
-        },
-      },
-    }.with_indifferent_access
-  end
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'push') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    before do
-      post :create, params: create_payload
-    end
-
-    it 'saves push subscriptions' do
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
-
-      expect(push_subscription.endpoint).to eq(create_payload[:subscription][:endpoint])
-      expect(push_subscription.key_p256dh).to eq(create_payload[:subscription][:keys][:p256dh])
-      expect(push_subscription.key_auth).to eq(create_payload[:subscription][:keys][:auth])
-      expect(push_subscription.user_id).to eq user.id
-      expect(push_subscription.access_token_id).to eq token.id
-    end
-
-    it 'replaces old subscription on repeat calls' do
-      post :create, params: create_payload
-      expect(Web::PushSubscription.where(endpoint: create_payload[:subscription][:endpoint]).count).to eq 1
-    end
-
-    it 'returns the expected JSON' do
-      expect(body_as_json.with_indifferent_access).to include({ endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' })
-    end
-  end
-
-  describe 'PUT #update' do
-    before do
-      post :create, params: create_payload
-      put :update, params: alerts_payload
-    end
-
-    it 'changes alert settings' do
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
-
-      expect(push_subscription.data['policy']).to eq(alerts_payload[:data][:policy])
-
-      %w(follow follow_request favourite reblog mention poll status).each do |type|
-        expect(push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
-      end
-    end
-
-    it 'returns the expected JSON' do
-      expect(body_as_json.with_indifferent_access).to include({ endpoint: create_payload[:subscription][:endpoint], alerts: alerts_payload[:data][:alerts], policy: alerts_payload[:data][:policy] })
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    before do
-      post :create, params: create_payload
-      delete :destroy
-    end
-
-    it 'removes the subscription' do
-      expect(Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])).to be_nil
-    end
-  end
-end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index e9d4796035..f595e8ca19 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -22,13 +22,10 @@ describe ApplicationController do
   end
 
   shared_examples 'respond_with_error' do |code|
-    it "returns http #{code} for http" do
-      subject
-      expect(response).to have_http_status(code)
-    end
-
-    it 'renders template for http' do
+    it "returns http #{code} for http and renders template" do
       expect(subject).to render_template("errors/#{code}", layout: 'error')
+
+      expect(response).to have_http_status(code)
     end
   end
 
@@ -221,39 +218,4 @@ describe ApplicationController do
 
     include_examples 'respond_with_error', 422
   end
-
-  describe 'cache_collection' do
-    subject do
-      Class.new(ApplicationController) do
-        public :cache_collection
-      end
-    end
-
-    shared_examples 'receives :with_includes' do |fabricator, klass|
-      it 'uses raw if it is not an ActiveRecord::Relation' do
-        record = Fabricate(fabricator)
-        expect(subject.new.cache_collection([record], klass)).to eq [record]
-      end
-    end
-
-    shared_examples 'cacheable' do |fabricator, klass|
-      include_examples 'receives :with_includes', fabricator, klass
-
-      it 'calls cache_ids of raw if it is an ActiveRecord::Relation' do
-        record = Fabricate(fabricator)
-        relation = klass.none
-        allow(relation).to receive(:cache_ids).and_return([record])
-        expect(subject.new.cache_collection(relation, klass)).to eq [record]
-      end
-    end
-
-    it 'returns raw unless class responds to :with_includes' do
-      raw = Object.new
-      expect(subject.new.cache_collection(raw, Object)).to eq raw
-    end
-
-    context 'with a Status' do
-      include_examples 'cacheable', :status, Status
-    end
-  end
 end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index bd1c616595..a30fffe6d1 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -44,27 +44,93 @@ RSpec.describe Auth::RegistrationsController do
     end
   end
 
-  describe 'GET #update' do
-    let(:user) { Fabricate(:user) }
+  describe 'PUT #update' do
+    let(:current_password) { 'current password' }
+    let(:user) { Fabricate(:user, password: current_password) }
 
     before do
       request.env['devise.mapping'] = Devise.mappings[:user]
       sign_in(user, scope: :user)
-      post :update
     end
 
     it 'returns http success' do
+      put :update
       expect(response).to have_http_status(200)
     end
 
     it 'returns private cache control headers' do
+      put :update
       expect(response.headers['Cache-Control']).to include('private, no-store')
     end
 
+    it 'can update the user email' do
+      expect do
+        put :update, params: {
+          user: {
+            email: 'newemail@example.com',
+            current_password: current_password,
+          },
+        }
+        expect(response).to redirect_to(edit_user_registration_path)
+      end.to change { user.reload.unconfirmed_email }.to('newemail@example.com')
+    end
+
+    it 'requires the current password to update the email' do
+      expect do
+        put :update, params: {
+          user: {
+            email: 'newemail@example.com',
+            current_password: 'something',
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.unconfirmed_email })
+    end
+
+    it 'can update the user password' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'new password',
+            current_password: current_password,
+          },
+        }
+        expect(response).to redirect_to(edit_user_registration_path)
+      end.to(change { user.reload.encrypted_password })
+    end
+
+    it 'requires the password confirmation' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'something else',
+            current_password: current_password,
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.encrypted_password })
+    end
+
+    it 'requires the current password to update the password' do
+      expect do
+        put :update, params: {
+          user: {
+            password: 'new password',
+            password_confirmation: 'new password',
+            current_password: 'something',
+          },
+        }
+        expect(response).to have_http_status(200)
+      end.to_not(change { user.reload.encrypted_password })
+    end
+
     context 'when suspended' do
       let(:user) { Fabricate(:user, account_attributes: { username: 'test', suspended_at: Time.now.utc }) }
 
       it 'returns http forbidden' do
+        put :update
         expect(response).to have_http_status(403)
       end
     end
@@ -137,12 +203,49 @@ RSpec.describe Auth::RegistrationsController do
 
     context 'when user has an email address requiring approval' do
       subject do
-        Setting.registrations_mode = 'open'
-        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'example.com')
         request.headers['Accept-Language'] = accept_language
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
       end
 
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'example.com')
+      end
+
+      it 'creates unapproved user and redirects to setup' do
+        subject
+        expect(response).to redirect_to auth_setup_path
+
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+        expect(user.approved).to be(false)
+      end
+    end
+
+    context 'when user has an email address requiring approval through a MX record' do
+      subject do
+        request.headers['Accept-Language'] = accept_language
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'mail.example.com')
+        allow(User).to receive(:skip_mx_check?).and_return(false)
+
+        resolver = instance_double(Resolv::DNS, :timeouts= => nil)
+
+        allow(resolver).to receive(:getresources)
+          .with('example.com', Resolv::DNS::Resource::IN::MX)
+          .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
+        allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      end
+
       it 'creates unapproved user and redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
@@ -243,6 +346,170 @@ RSpec.describe Auth::RegistrationsController do
       end
     end
 
+    context 'when max user count is set' do
+      subject do
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      let(:users_max) { 3 }
+
+      before do
+        Fabricate(:user)
+        Fabricate(:user)
+        Setting.registrations_mode = 'open'
+        Setting.registrations_limit = users_max
+        request.headers['Accept-Language'] = accept_language
+      end
+
+      it 'redirects to setup' do
+        subject
+        expect(response).to redirect_to auth_setup_path
+      end
+
+      it 'creates user' do
+        subject
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+      end
+
+      context 'when limit is reached' do
+        let(:users_max) { 2 }
+
+        it 'does not create user' do
+          subject
+          user = User.find_by(email: 'test@example.com')
+          expect(user).to be_nil
+        end
+
+        context 'with invite' do
+          subject do
+            post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } }
+          end
+
+          let(:invite) { Fabricate(:invite) }
+
+          it 'creates user' do
+            subject
+            user = User.find_by(email: 'test@example.com')
+            expect(user).to_not be_nil
+            expect(user.locale).to eq(accept_language)
+          end
+        end
+      end
+    end
+
+    context 'when max user count per day is set' do
+      subject do
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      let(:users_max) { 2 }
+      let(:created_at) { Time.now.utc }
+      let(:precreate_users) { true }
+
+      before do
+        Fabricate(:user, created_at: created_at) if precreate_users
+        Setting.registrations_mode = 'open'
+        Setting.registrations_limit_per_day = users_max
+        request.headers['Accept-Language'] = accept_language
+      end
+
+      it 'creates user' do
+        subject
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+      end
+
+      context 'when limit is reached' do
+        let(:users_max) { 2 }
+        let(:created_at) { Time.now.utc - 1.day }
+        let(:precreate_users) { false }
+
+        before do
+          travel_to Time.now.utc - 1.day
+          Fabricate(:user)
+          create_other_user
+        end
+
+        it 'does not create user yesterday' do
+          subject
+          user = User.find_by(email: 'test@example.com')
+          expect(user).to be_nil
+        end
+
+        it 'creates user' do
+          travel_to Time.now.utc + 1.day
+          subject
+          user = User.find_by(email: 'test@example.com')
+          expect(user).to_not be_nil
+          expect(user.locale).to eq(accept_language)
+        end
+      end
+
+      def create_other_user
+        post :create, params: { user: { account_attributes: { username: 'ohagi' }, email: 'test@ohagi.com', password: 'ohagi_must_be_tsubuan', password_confirmation: 'ohagi_must_be_tsubuan', agreement: 'true' } }
+      end
+    end
+
+    context 'when registration time range is set' do
+      subject do
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      shared_examples 'registration with time' do |header, start_hour_val, end_hour_val, secondary_start_hour_val, secondary_end_hour_val, result| # rubocop:disable Metrics/ParameterLists
+        context header do
+          let(:start_hour) { start_hour_val }
+          let(:end_hour) { end_hour_val }
+          let(:secondary_start_hour) { secondary_start_hour_val }
+          let(:secondary_end_hour) { secondary_end_hour_val }
+
+          before do
+            Setting.registrations_mode = 'open'
+            Setting.registrations_start_hour = start_hour
+            Setting.registrations_end_hour = end_hour
+            Setting.registrations_secondary_start_hour = secondary_start_hour
+            Setting.registrations_secondary_end_hour = secondary_end_hour
+            request.headers['Accept-Language'] = accept_language
+
+            current = Time.now.utc
+            today = current.beginning_of_day
+            today += 1.day if current.hour >= 10
+            travel_to today + 10.hours
+          end
+
+          if result
+            it 'creates user' do
+              subject
+              user = User.find_by(email: 'test@example.com')
+              expect(user).to_not be_nil
+              expect(user.locale).to eq(accept_language)
+              expect(user.approved?).to be true
+            end
+          else
+            it 'does not create user' do
+              subject
+              user = User.find_by(email: 'test@example.com')
+              expect(user).to_not be_nil
+              expect(user.approved?).to be false
+            end
+          end
+        end
+      end
+
+      it_behaves_like 'registration with time', 'time range is not set', 0, 24, 0, 0, true
+      it_behaves_like 'registration with time', 'time range is default values', 0, 0, 0, 0, true
+      it_behaves_like 'registration with time', 'time range is set', 9, 12, 0, 0, true
+      it_behaves_like 'registration with time', 'time range is out of range', 12, 15, 0, 0, false
+      it_behaves_like 'registration with time', 'time range is invalid', 20, 15, 0, 0, true
+      it_behaves_like 'registration with time', 'secondary time range is set', 0, 4, 9, 12, true
+      it_behaves_like 'registration with time', 'secondary time range is out of range', 0, 4, 12, 15, false
+      it_behaves_like 'registration with time', 'secondary time range is invalid', 0, 4, 20, 15, false
+      it_behaves_like 'registration with time', 'both time range are invalid', 4, 0, 20, 15, true
+      it_behaves_like 'registration with time', 'only secondary time range is set', 0, 0, 9, 12, true
+    end
+
     include_examples 'checks for enabled registrations', :create
   end
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index e3f2b278bd..e78554ec7d 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -57,11 +57,9 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: 'pam_user1', password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to be_instance_of(User)
         end
       end
@@ -71,11 +69,9 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: 'pam_user1', password: 'WRONGPW' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -92,11 +88,9 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: user.email, password: '123456' } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -110,16 +104,16 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
 
       context 'when using a valid password on a previously-used account with a new IP address' do
+        subject { post :create, params: { user: { email: user.email, password: user.password } } }
+
         let(:previous_ip) { '1.2.3.4' }
         let(:current_ip)  { '4.3.2.1' }
 
@@ -127,21 +121,24 @@ RSpec.describe Auth::SessionsController do
           Fabricate(:login_activity, user: user, ip: previous_ip)
           allow(controller.request).to receive(:remote_ip).and_return(current_ip)
           user.update(current_sign_in_at: 1.month.ago)
-          post :create, params: { user: { email: user.email, password: user.password } }
         end
 
-        it 'redirects to home' do
-          expect(response).to redirect_to(root_path)
-        end
+        it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
+          emails = capture_emails { subject }
 
-        it 'logs the user in' do
-          expect(controller.current_user).to eq user
-        end
+          expect(response)
+            .to redirect_to(root_path)
 
-        it 'sends a suspicious sign-in mail', :sidekiq_inline do
-          expect(UserMailer.deliveries.size).to eq(1)
-          expect(UserMailer.deliveries.first.to.first).to eq(user.email)
-          expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
+          expect(controller.current_user)
+            .to eq user
+
+          expect(emails.size)
+            .to eq(1)
+          expect(emails.first)
+            .to have_attributes(
+              to: contain_exactly(user.email),
+              subject: eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
+            )
         end
       end
 
@@ -150,11 +147,9 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: user.email.upcase, password: user.password } }
         end
 
-        it 'redirects to home' do
+        it 'redirects to home and logs the user in' do
           expect(response).to redirect_to(root_path)
-        end
 
-        it 'logs the user in' do
           expect(controller.current_user).to eq user
         end
       end
@@ -164,11 +159,9 @@ RSpec.describe Auth::SessionsController do
           post :create, params: { user: { email: user.email, password: 'wrongpw' } }
         end
 
-        it 'shows a login error' do
+        it 'shows a login error and does not log the user in' do
           expect(flash[:alert]).to match I18n.t('devise.failure.invalid', authentication_keys: I18n.t('activerecord.attributes.user.email'))
-        end
 
-        it "doesn't log the user in" do
           expect(controller.current_user).to be_nil
         end
       end
@@ -262,16 +255,47 @@ RSpec.describe Auth::SessionsController do
           end
         end
 
+        context 'when repeatedly using an invalid TOTP code before using a valid code' do
+          before do
+            stub_const('Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR', 2)
+
+            # Travel to the beginning of an hour to avoid crossing rate-limit buckets
+            travel_to '2023-12-20T10:00:00Z'
+          end
+
+          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
+            emails = capture_emails do
+              Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+                post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+                expect(controller.current_user).to be_nil
+              end
+              post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+            end
+
+            expect(controller.current_user)
+              .to be_nil
+
+            expect(flash[:alert])
+              .to match I18n.t('users.rate_limited')
+
+            expect(emails.size)
+              .to eq(1)
+            expect(emails.first)
+              .to have_attributes(
+                to: contain_exactly(user.email),
+                subject: eq(I18n.t('user_mailer.failed_2fa.subject'))
+              )
+          end
+        end
+
         context 'when using a valid OTP' do
           before do
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -284,11 +308,9 @@ RSpec.describe Auth::SessionsController do
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -298,11 +320,9 @@ RSpec.describe Auth::SessionsController do
             post :create, params: { user: { otp_attempt: recovery_codes.first } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'redirects to home' do
+          it 'redirects to home and logs the user in' do
             expect(response).to redirect_to(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
           end
         end
@@ -312,11 +332,9 @@ RSpec.describe Auth::SessionsController do
             post :create, params: { user: { otp_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'shows a login error' do
+          it 'shows a login error and does not log the user in' do
             expect(flash[:alert]).to match I18n.t('users.invalid_otp_token')
-          end
 
-          it "doesn't log the user in" do
             expect(controller.current_user).to be_nil
           end
         end
@@ -383,15 +401,11 @@ RSpec.describe Auth::SessionsController do
             post :create, params: { user: { credential: fake_credential } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
           end
 
-          it 'instructs the browser to redirect to home' do
+          it 'instructs the browser to redirect to home, logs the user in, and updates the sign count' do
             expect(body_as_json[:redirect_path]).to eq(root_path)
-          end
 
-          it 'logs the user in' do
             expect(controller.current_user).to eq user
-          end
 
-          it 'updates the sign count' do
             expect(webauthn_credential.reload.sign_count).to eq(sign_count)
           end
         end
@@ -400,15 +414,17 @@ RSpec.describe Auth::SessionsController do
   end
 
   describe 'GET #webauthn_options' do
+    subject { get :webauthn_options, session: { attempt_user_id: user.id } }
+
+    let!(:user) do
+      Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+    end
+
     context 'with WebAuthn and OTP enabled as second factor' do
       let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}" }
 
       let(:fake_client) { WebAuthn::FakeClient.new(domain) }
 
-      let!(:user) do
-        Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
-      end
-
       before do
         user.update(webauthn_id: WebAuthn.generate_user_id)
         public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
@@ -422,9 +438,18 @@ RSpec.describe Auth::SessionsController do
       end
 
       it 'returns http success' do
-        get :webauthn_options
+        subject
+
         expect(response).to have_http_status 200
       end
     end
+
+    context 'when WebAuthn not enabled' do
+      it 'returns http unauthorized' do
+        subject
+
+        expect(response).to have_http_status 401
+      end
+    end
   end
 end
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index e3295204aa..6eb970dedb 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -49,22 +49,21 @@ describe AccountControllerConcern do
   end
 
   context 'when account is not suspended' do
-    it 'assigns @account' do
-      account = Fabricate(:account)
+    let(:account) { Fabricate(:account, username: 'username') }
+
+    it 'assigns @account, returns success, and sets link headers' do
       get 'success', params: { account_username: account.username }
+
       expect(assigns(:account)).to eq account
-    end
-
-    it 'sets link headers' do
-      Fabricate(:account, username: 'username')
-      get 'success', params: { account_username: 'username' }
-      expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"'
-    end
-
-    it 'returns http success' do
-      account = Fabricate(:account)
-      get 'success', params: { account_username: account.username }
       expect(response).to have_http_status(200)
+      expect(response.headers['Link'].to_s).to eq(expected_link_headers)
+    end
+
+    def expected_link_headers
+      [
+        '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json"',
+        '<https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"',
+      ].join(', ')
     end
   end
 end
diff --git a/spec/controllers/concerns/api/error_handling_spec.rb b/spec/controllers/concerns/api/error_handling_spec.rb
new file mode 100644
index 0000000000..9b36fc20a3
--- /dev/null
+++ b/spec/controllers/concerns/api/error_handling_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::ErrorHandling do
+  before do
+    stub_const('FakeService', Class.new)
+  end
+
+  controller(Api::BaseController) do
+    def failure
+      FakeService.new
+    end
+  end
+
+  describe 'error handling' do
+    before do
+      routes.draw { get 'failure' => 'api/base#failure' }
+    end
+
+    {
+      ActiveRecord::RecordInvalid => 422,
+      ActiveRecord::RecordNotFound => 404,
+      ActiveRecord::RecordNotUnique => 422,
+      Date::Error => 422,
+      HTTP::Error => 503,
+      Mastodon::InvalidParameterError => 400,
+      Mastodon::NotPermittedError => 403,
+      Mastodon::RaceConditionError => 503,
+      Mastodon::RateLimitExceededError => 429,
+      Mastodon::UnexpectedResponseError => 503,
+      Mastodon::ValidationError => 422,
+      OpenSSL::SSL::SSLError => 503,
+      Seahorse::Client::NetworkingError => 503,
+      Stoplight::Error::RedLight => 503,
+    }.each do |error, code|
+      it "Handles error class of #{error}" do
+        allow(FakeService)
+          .to receive(:new)
+          .and_raise(error)
+
+        get :failure
+
+        expect(response)
+          .to have_http_status(code)
+        expect(FakeService)
+          .to have_received(:new)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/concerns/cache_concern_spec.rb b/spec/controllers/concerns/preloading_concern_spec.rb
similarity index 79%
rename from spec/controllers/concerns/cache_concern_spec.rb
rename to spec/controllers/concerns/preloading_concern_spec.rb
index fffd2b266e..795afbc45e 100644
--- a/spec/controllers/concerns/cache_concern_spec.rb
+++ b/spec/controllers/concerns/preloading_concern_spec.rb
@@ -2,20 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe CacheConcern do
+RSpec.describe PreloadingConcern do
   controller(ApplicationController) do
-    include CacheConcern
+    include PreloadingConcern
 
     def empty_array
-      render plain: cache_collection([], Status).size
+      render plain: preload_collection([], Status).size
     end
 
     def empty_relation
-      render plain: cache_collection(Status.none, Status).size
+      render plain: preload_collection(Status.none, Status).size
     end
 
     def account_statuses_favourites
-      render plain: cache_collection(Status.where(account_id: params[:id]), Status).map(&:favourites_count)
+      render plain: preload_collection(Status.where(account_id: params[:id]), Status).map(&:favourites_count)
     end
   end
 
@@ -27,7 +27,7 @@ RSpec.describe CacheConcern do
     end
   end
 
-  describe '#cache_collection' do
+  describe '#preload_collection' do
     context 'when given an empty array' do
       it 'returns an empty array' do
         get :empty_array
diff --git a/spec/controllers/custom_css_controller_spec.rb b/spec/controllers/custom_css_controller_spec.rb
index 99d36d21b9..405fa0bcf3 100644
--- a/spec/controllers/custom_css_controller_spec.rb
+++ b/spec/controllers/custom_css_controller_spec.rb
@@ -14,17 +14,6 @@ describe CustomCssController do
       expect(response).to have_http_status(200)
     end
 
-    it 'returns public cache control header' do
-      expect(response.headers['Cache-Control']).to include('public')
-    end
-
-    it 'does not set cookies' do
-      expect(response.cookies).to be_empty
-      expect(response.headers['Set-Cookies']).to be_nil
-    end
-
-    it 'does not set sessions' do
-      expect(session).to be_empty
-    end
+    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index da2f86ade5..99d5a8b17f 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -10,19 +10,23 @@ RSpec.describe Disputes::AppealsController do
   let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   describe '#create' do
+    subject { post :create, params: params }
+
     context 'with valid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
-      end
+      it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
+        emails = capture_emails { subject }
 
-      it 'notifies staff about new appeal', :sidekiq_inline do
-        expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-      end
-
-      it 'redirects back to the strike page' do
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(I18n.t('admin_mailer.new_appeal.subject', username: current_user.account.acct, instance: Rails.configuration.x.local_domain))
+          )
         expect(response).to redirect_to(disputes_strike_path(strike.id))
       end
     end
@@ -30,16 +34,12 @@ RSpec.describe Disputes::AppealsController do
     context 'with invalid params' do
       let(:current_user) { Fabricate(:user) }
       let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+      let(:params) { { strike_id: strike.id, appeal: { text: '' } } }
 
-      before do
-        post :create, params: { strike_id: strike.id, appeal: { text: '' } }
-      end
+      it 'does not send email and renders strike show page', :sidekiq_inline do
+        emails = capture_emails { subject }
 
-      it 'does not send email', :sidekiq_inline do
-        expect(ActionMailer::Base.deliveries.size).to eq(0)
-      end
-
-      it 'renders the strike show page' do
+        expect(emails).to be_empty
         expect(response).to render_template('disputes/strikes/show')
       end
     end
diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb
index 8406094311..42ffb67988 100644
--- a/spec/controllers/instance_actors_controller_spec.rb
+++ b/spec/controllers/instance_actors_controller_spec.rb
@@ -12,31 +12,18 @@ RSpec.describe InstanceActorsController do
           get :show, params: { format: format }
         end
 
-        it 'returns http success' do
-          expect(response).to have_http_status(200)
+        it 'returns http success with correct media type and body' do
+          expect(response)
+            .to have_http_status(200)
+            .and have_attributes(
+              media_type: eq('application/activity+json')
+            )
+
+          expect(body_as_json)
+            .to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
         end
 
-        it 'returns application/activity+json' do
-          expect(response.media_type).to eq 'application/activity+json'
-        end
-
-        it 'does not set cookies' do
-          expect(response.cookies).to be_empty
-          expect(response.headers['Set-Cookies']).to be_nil
-        end
-
-        it 'does not set sessions' do
-          expect(session).to be_empty
-        end
-
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
-
-        it 'renders account' do
-          json = body_as_json
-          expect(json).to include(:id, :type, :preferredUsername, :inbox, :publicKey, :inbox, :outbox, :url)
-        end
+        it_behaves_like 'cacheable response'
       end
 
       before do
@@ -54,6 +41,14 @@ RSpec.describe InstanceActorsController do
 
         it_behaves_like 'shared behavior'
       end
+
+      context 'with a suspended instance actor' do
+        let(:authorized_fetch_mode) { false }
+
+        before { Account.representative.update(suspended_at: 10.days.ago) }
+
+        it_behaves_like 'shared behavior'
+      end
     end
   end
 end
diff --git a/spec/controllers/manifests_controller_spec.rb b/spec/controllers/manifests_controller_spec.rb
index d0699c438b..9279fae024 100644
--- a/spec/controllers/manifests_controller_spec.rb
+++ b/spec/controllers/manifests_controller_spec.rb
@@ -14,17 +14,6 @@ describe ManifestsController do
       expect(response).to have_http_status(200)
     end
 
-    it 'returns public cache control header' do
-      expect(response.headers['Cache-Control']).to include('public')
-    end
-
-    it 'does not set cookies' do
-      expect(response.cookies).to be_empty
-      expect(response.headers['Set-Cookies']).to be_nil
-    end
-
-    it 'does not set sessions' do
-      expect(session).to be_empty
-    end
+    it_behaves_like 'cacheable response'
   end
 end
diff --git a/spec/controllers/settings/preferences/notifications_controller_spec.rb b/spec/controllers/settings/preferences/notifications_controller_spec.rb
index b61d7461ce..e0f0bc55a7 100644
--- a/spec/controllers/settings/preferences/notifications_controller_spec.rb
+++ b/spec/controllers/settings/preferences/notifications_controller_spec.rb
@@ -24,14 +24,13 @@ describe Settings::Preferences::NotificationsController do
 
   describe 'PUT #update' do
     it 'updates notifications settings' do
-      user.settings.update('notification_emails.follow': false, 'interactions.must_be_follower': true)
+      user.settings.update('notification_emails.follow': false)
       user.save
 
       put :update, params: {
         user: {
           settings_attributes: {
             'notification_emails.follow': '1',
-            'interactions.must_be_follower': '0',
           },
         },
       }
@@ -39,7 +38,6 @@ describe Settings::Preferences::NotificationsController do
       expect(response).to redirect_to(settings_preferences_notifications_path)
       user.reload
       expect(user.settings['notification_emails.follow']).to be true
-      expect(user.settings['interactions.must_be_follower']).to be false
     end
   end
 end
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index d41e707d43..2bb0c8de3b 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -20,13 +20,7 @@ RSpec.describe TagsController do
           expect(response).to have_http_status(200)
         end
 
-        it 'returns Vary header' do
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-        end
-
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
 
       context 'when requested as JSON' do
@@ -36,13 +30,7 @@ RSpec.describe TagsController do
           expect(response).to have_http_status(200)
         end
 
-        it 'returns Vary header' do
-          expect(response.headers['Vary']).to eq 'Accept, Accept-Language, Cookie'
-        end
-
-        it 'returns public Cache-Control header' do
-          expect(response.headers['Cache-Control']).to include 'public'
-        end
+        it_behaves_like 'cacheable response', expects_vary: 'Accept, Accept-Language, Cookie'
       end
     end
 
diff --git a/spec/fabrication/fabricators_spec.rb b/spec/fabrication/fabricators_spec.rb
index 53193378c8..2cf45041a4 100644
--- a/spec/fabrication/fabricators_spec.rb
+++ b/spec/fabrication/fabricators_spec.rb
@@ -6,9 +6,9 @@ Fabrication.manager.load_definitions if Fabrication.manager.empty?
 
 Fabrication.manager.schematics.map(&:first).each do |factory_name|
   describe "The #{factory_name} factory" do
-    it 'is valid' do
-      factory = Fabricate(factory_name)
-      expect(factory).to be_valid
+    it 'is able to create valid records' do
+      records = Fabricate.times(2, factory_name) # Create multiple of each to uncover uniqueness issues
+      expect(records).to all(be_valid)
     end
   end
 end
diff --git a/spec/fabricators/account_relationship_severance_event_fabricator.rb b/spec/fabricators/account_relationship_severance_event_fabricator.rb
new file mode 100644
index 0000000000..5580d52092
--- /dev/null
+++ b/spec/fabricators/account_relationship_severance_event_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:account_relationship_severance_event) do
+  account
+  relationship_severance_event
+end
diff --git a/spec/fabricators/antenna_account_fabricator.rb b/spec/fabricators/antenna_account_fabricator.rb
new file mode 100644
index 0000000000..43e27cfbaf
--- /dev/null
+++ b/spec/fabricators/antenna_account_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:antenna_account) do
+  antenna { Fabricate.build(:antenna) }
+  account { Fabricate.build(:account) }
+  exclude false
+end
diff --git a/spec/fabricators/antenna_domain_fabricator.rb b/spec/fabricators/antenna_domain_fabricator.rb
new file mode 100644
index 0000000000..4299138462
--- /dev/null
+++ b/spec/fabricators/antenna_domain_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:antenna_domain) do
+  antenna { Fabricate.build(:antenna) }
+  name 'example.com'
+  exclude false
+end
diff --git a/spec/fabricators/antenna_fabricator.rb b/spec/fabricators/antenna_fabricator.rb
new file mode 100644
index 0000000000..9d4a582db7
--- /dev/null
+++ b/spec/fabricators/antenna_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:antenna) do
+  account { Fabricate.build(:account) }
+  title 'MyString'
+  list_id 0
+end
diff --git a/spec/fabricators/antenna_tag_fabricator.rb b/spec/fabricators/antenna_tag_fabricator.rb
new file mode 100644
index 0000000000..24e0bc6444
--- /dev/null
+++ b/spec/fabricators/antenna_tag_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:antenna_tag) do
+  antenna { Fabricate.build(:antenna) }
+  tag { Fabricate.build(:tag) }
+  exclude false
+end
diff --git a/spec/fabricators/bookmark_category_fabricator.rb b/spec/fabricators/bookmark_category_fabricator.rb
new file mode 100644
index 0000000000..484d6f0692
--- /dev/null
+++ b/spec/fabricators/bookmark_category_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:bookmark_category) do
+  account { Fabricate.build(:account) }
+  title 'MyString'
+end
diff --git a/spec/fabricators/bookmark_category_status_fabricator.rb b/spec/fabricators/bookmark_category_status_fabricator.rb
new file mode 100644
index 0000000000..5f19f31da3
--- /dev/null
+++ b/spec/fabricators/bookmark_category_status_fabricator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Fabricator(:bookmark_category_status) do
+  bookmark_category
+  status
+  before_create do |_bookmark_category_status, _|
+    Bookmark.create!(status: status, account: bookmark_category.account) unless bookmark_category.account.bookmarked?(status)
+  end
+end
diff --git a/spec/fabricators/canonical_email_block_fabricator.rb b/spec/fabricators/canonical_email_block_fabricator.rb
index 1ef53ff4a4..2f979df794 100644
--- a/spec/fabricators/canonical_email_block_fabricator.rb
+++ b/spec/fabricators/canonical_email_block_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:canonical_email_block) do
-  email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
+  email { |attrs| attrs[:reference_account] ? attrs[:reference_account].user_email : sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   reference_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/circle_account_fabricator.rb b/spec/fabricators/circle_account_fabricator.rb
new file mode 100644
index 0000000000..9850a49ce2
--- /dev/null
+++ b/spec/fabricators/circle_account_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:circle_account) do
+  circle { Fabricate(:circle) }
+  account { Fabricate(:account) }
+  before_create { |circle_account, _| circle_account.account.follow!(circle_account.circle.account) }
+end
diff --git a/spec/fabricators/circle_fabricator.rb b/spec/fabricators/circle_fabricator.rb
new file mode 100644
index 0000000000..874b41fa13
--- /dev/null
+++ b/spec/fabricators/circle_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:circle) do
+  account { Fabricate.build(:account) }
+  title 'MyString'
+end
diff --git a/spec/fabricators/circle_status_fabricator.rb b/spec/fabricators/circle_status_fabricator.rb
new file mode 100644
index 0000000000..649d4f4438
--- /dev/null
+++ b/spec/fabricators/circle_status_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:circle_status) do
+  circle
+  status
+  before_create { |circle_status, _| circle_status.status.account = circle.account }
+end
diff --git a/spec/fabricators/custom_filter_fabricator.rb b/spec/fabricators/custom_filter_fabricator.rb
index 766cc3b115..09df0e492a 100644
--- a/spec/fabricators/custom_filter_fabricator.rb
+++ b/spec/fabricators/custom_filter_fabricator.rb
@@ -5,4 +5,6 @@ Fabricator(:custom_filter) do
   expires_at nil
   phrase     'discourse'
   context    %w(home notifications)
+  exclude_follows false
+  exclude_localusers false
 end
diff --git a/spec/fabricators/emoji_reaction_fabricator.rb b/spec/fabricators/emoji_reaction_fabricator.rb
new file mode 100644
index 0000000000..2605a9f232
--- /dev/null
+++ b/spec/fabricators/emoji_reaction_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:emoji_reaction) do
+  account { Fabricate.build(:account) }
+  status { Fabricate.build(:status) }
+  name '😀'
+end
diff --git a/spec/fabricators/featured_tag_fabricator.rb b/spec/fabricators/featured_tag_fabricator.rb
index 0803dc43a7..6003099dbd 100644
--- a/spec/fabricators/featured_tag_fabricator.rb
+++ b/spec/fabricators/featured_tag_fabricator.rb
@@ -2,6 +2,6 @@
 
 Fabricator(:featured_tag) do
   account { Fabricate.build(:account) }
-  tag { Fabricate.build(:tag) }
+  tag { nil }
   name { sequence(:name) { |i| "Tag#{i}" } }
 end
diff --git a/spec/fabricators/friend_domain_fabricator.rb b/spec/fabricators/friend_domain_fabricator.rb
new file mode 100644
index 0000000000..139cc9ab94
--- /dev/null
+++ b/spec/fabricators/friend_domain_fabricator.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Fabricator(:friend_domain) do
+  domain { sequence(:domain) { |i| "info-#{i}.example.com" } }
+  inbox_url { sequence(:inbox_url) { |i| "https://info-#{i}.example.com/inbox" } }
+  active_state :idle
+  passive_state :idle
+  available true
+  before_create { |friend_domain, _| friend_domain.inbox_url = "https://#{friend_domain.domain}/inbox" if friend_domain.inbox_url.blank? }
+end
diff --git a/spec/fabricators/identity_fabricator.rb b/spec/fabricators/identity_fabricator.rb
index 83655ee839..6e125a4e72 100644
--- a/spec/fabricators/identity_fabricator.rb
+++ b/spec/fabricators/identity_fabricator.rb
@@ -3,5 +3,5 @@
 Fabricator(:identity) do
   user { Fabricate.build(:user) }
   provider 'MyString'
-  uid      'MyString'
+  uid { sequence(:uid) { |i| "uid_string_#{i}" } }
 end
diff --git a/spec/fabricators/instance_info_fabricator.rb b/spec/fabricators/instance_info_fabricator.rb
new file mode 100644
index 0000000000..ff53833a28
--- /dev/null
+++ b/spec/fabricators/instance_info_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:instance_info) do
+  domain { sequence(:domain) { |i| "info-#{i}.example.com" } }
+  software 'mastodon'
+  version '4.1.0'
+end
diff --git a/spec/fabricators/list_status_fabricator.rb b/spec/fabricators/list_status_fabricator.rb
new file mode 100644
index 0000000000..6324d92558
--- /dev/null
+++ b/spec/fabricators/list_status_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:list_status) do
+  list { Fabricate.build(:list) }
+  status
+end
diff --git a/spec/fabricators/ng_rule_fabricator.rb b/spec/fabricators/ng_rule_fabricator.rb
new file mode 100644
index 0000000000..f448c22c08
--- /dev/null
+++ b/spec/fabricators/ng_rule_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:ng_rule) do
+  status_visibility %w(public)
+  status_searchability %w(direct unset)
+  reaction_type %w(favourite)
+end
diff --git a/spec/fabricators/ng_rule_history_fabricator.rb b/spec/fabricators/ng_rule_history_fabricator.rb
new file mode 100644
index 0000000000..75c40880da
--- /dev/null
+++ b/spec/fabricators/ng_rule_history_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:ng_rule_history) do
+  ng_rule { Fabricate.build(:ng_rule) }
+  account { Fabricate.build(:account) }
+  reason 0
+  reason_action 0
+end
diff --git a/spec/fabricators/ng_word_fabricator.rb b/spec/fabricators/ng_word_fabricator.rb
new file mode 100644
index 0000000000..b044f70528
--- /dev/null
+++ b/spec/fabricators/ng_word_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:ng_word) do
+  keyword { sequence(:keyword) { |i| "keyword_#{i}" } }
+end
diff --git a/spec/fabricators/ngword_history_fabricator.rb b/spec/fabricators/ngword_history_fabricator.rb
new file mode 100644
index 0000000000..35d3b02669
--- /dev/null
+++ b/spec/fabricators/ngword_history_fabricator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Fabricator(:ngword_history) do
+  uri 'https://test.com/'
+  target_type 0
+  reason 0
+  text 'this is an invalid text'
+  keyword 'invalid'
+end
diff --git a/spec/fabricators/notification_permission_fabricator.rb b/spec/fabricators/notification_permission_fabricator.rb
new file mode 100644
index 0000000000..d421ddd81f
--- /dev/null
+++ b/spec/fabricators/notification_permission_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_permission) do
+  account
+  from_account { Fabricate.build(:account) }
+end
diff --git a/spec/fabricators/notification_policy_fabricator.rb b/spec/fabricators/notification_policy_fabricator.rb
new file mode 100644
index 0000000000..f33438fec7
--- /dev/null
+++ b/spec/fabricators/notification_policy_fabricator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_policy) do
+  account
+  filter_not_following false
+  filter_not_followers false
+  filter_new_accounts false
+  filter_private_mentions true
+end
diff --git a/spec/fabricators/notification_request_fabricator.rb b/spec/fabricators/notification_request_fabricator.rb
new file mode 100644
index 0000000000..05a13b8ef8
--- /dev/null
+++ b/spec/fabricators/notification_request_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:notification_request) do
+  account
+  from_account { Fabricate.build(:account) }
+  last_status { Fabricate.build(:status) }
+  dismissed false
+end
diff --git a/spec/fabricators/pending_follow_request_fabricator.rb b/spec/fabricators/pending_follow_request_fabricator.rb
new file mode 100644
index 0000000000..b1ef929e3b
--- /dev/null
+++ b/spec/fabricators/pending_follow_request_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:pending_follow_request) do
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account, locked: true) }
+  uri { sequence(:uri) { |i| "https://info-#{i}.example.com/follow" } }
+end
diff --git a/spec/fabricators/pending_status_fabricator.rb b/spec/fabricators/pending_status_fabricator.rb
new file mode 100644
index 0000000000..0184987533
--- /dev/null
+++ b/spec/fabricators/pending_status_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:pending_status) do
+  account { Fabricate.build(:account) }
+  fetch_account { Fabricate.build(:account) }
+  uri { sequence(:uri) { |i| "https://example.com/note-#{i}" } }
+end
diff --git a/spec/fabricators/preview_card_provider_fabricator.rb b/spec/fabricators/preview_card_provider_fabricator.rb
index 78db710003..3a027623f7 100644
--- a/spec/fabricators/preview_card_provider_fabricator.rb
+++ b/spec/fabricators/preview_card_provider_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:preview_card_provider) do
-  domain { Faker::Internet.domain_name }
+  domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
 end
diff --git a/spec/fabricators/relationship_severance_event_fabricator.rb b/spec/fabricators/relationship_severance_event_fabricator.rb
new file mode 100644
index 0000000000..7fec14e9f2
--- /dev/null
+++ b/spec/fabricators/relationship_severance_event_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:relationship_severance_event) do
+  type { :domain_block }
+  target_name { 'example.com' }
+end
diff --git a/spec/fabricators/relay_fabricator.rb b/spec/fabricators/relay_fabricator.rb
index ad8ba86fcf..07fc6f88c5 100644
--- a/spec/fabricators/relay_fabricator.rb
+++ b/spec/fabricators/relay_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:relay) do
-  inbox_url 'https://example.com/inbox'
+  inbox_url { sequence(:inbox_url) { |i| "https://example.com/inboxes/#{i}" } }
   state :idle
 end
diff --git a/spec/fabricators/sensitive_word_fabricator.rb b/spec/fabricators/sensitive_word_fabricator.rb
new file mode 100644
index 0000000000..0339f015b9
--- /dev/null
+++ b/spec/fabricators/sensitive_word_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:sensitive_word) do
+  keyword { sequence(:keyword) { |i| "keyword_#{i}" } }
+end
diff --git a/spec/fabricators/severed_relationship_fabricator.rb b/spec/fabricators/severed_relationship_fabricator.rb
new file mode 100644
index 0000000000..6600b72cdf
--- /dev/null
+++ b/spec/fabricators/severed_relationship_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:severed_relationship) do
+  local_account { Fabricate.build(:account) }
+  remote_account { Fabricate.build(:account) }
+  relationship_severance_event { Fabricate.build(:relationship_severance_event) }
+  direction { :active }
+end
diff --git a/spec/fabricators/site_upload_fabricator.rb b/spec/fabricators/site_upload_fabricator.rb
index 87553ccb8a..cbe42d3b4c 100644
--- a/spec/fabricators/site_upload_fabricator.rb
+++ b/spec/fabricators/site_upload_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:site_upload) do
   file { Rails.root.join('spec', 'fabricators', 'assets', 'utah_teapot.png').open }
-  var 'thumbnail'
+  var { sequence(:var) { |i| "thumbnail_#{i}" } }
 end
diff --git a/spec/fabricators/software_update_fabricator.rb b/spec/fabricators/software_update_fabricator.rb
index 622fff66e8..f4b607da0a 100644
--- a/spec/fabricators/software_update_fabricator.rb
+++ b/spec/fabricators/software_update_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:software_update) do
-  version '99.99.99'
+  version { sequence(:version) { |point| "99.99.#{point}" } }
   urgent false
   type 'patch'
 end
diff --git a/spec/fabricators/specified_domain_fabricator.rb b/spec/fabricators/specified_domain_fabricator.rb
new file mode 100644
index 0000000000..1f18fc7c71
--- /dev/null
+++ b/spec/fabricators/specified_domain_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:specified_domain) do
+  domain { sequence(:domain) { |i| "example_#{i}.com" } }
+end
diff --git a/spec/fabricators/status_reference_fabricator.rb b/spec/fabricators/status_reference_fabricator.rb
new file mode 100644
index 0000000000..0eff89c14b
--- /dev/null
+++ b/spec/fabricators/status_reference_fabricator.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Fabricator(:status_reference) do
+  status         { Fabricate.build(:status) }
+  target_status  { Fabricate.build(:status) }
+  attribute_type 'BT'
+  quote          false
+end
diff --git a/spec/fabricators/unavailable_domain_fabricator.rb b/spec/fabricators/unavailable_domain_fabricator.rb
index cb9707020a..88e605c36e 100644
--- a/spec/fabricators/unavailable_domain_fabricator.rb
+++ b/spec/fabricators/unavailable_domain_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:unavailable_domain) do
-  domain { Faker::Internet.domain_name }
+  domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
 end
diff --git a/spec/fixtures/files/domain_blocks.csv b/spec/fixtures/files/domain_blocks.csv
index 9dbfb4eaf7..bb9daa1f68 100644
--- a/spec/fixtures/files/domain_blocks.csv
+++ b/spec/fixtures/files/domain_blocks.csv
@@ -1,4 +1,5 @@
-#domain,#severity,#reject_media,#reject_reports,#public_comment,#obfuscate
-bad.domain,silence,false,false,bad server,false
-worse.domain,suspend,true,true,worse server,true
-reject.media,noop,true,false,reject media and test unicode characters ♥,false
+#domain,#severity,#reject_media,#reject_reports,#public_comment,#obfuscate,#reject_favourite,#reject_send_sensitive,#reject_hashtag,#reject_straight_follow,#reject_new_follow,#hidden,#detect_invalid_subscription,#reject_reply_exclude_followers,#reject_friend,#block_trends
+bad.domain,silence,false,false,bad server,false,false,false,false,false,false,false,false,false,false,false
+worse.domain,suspend,true,true,worse server,true,false,false,false,false,false,false,false,false,false,false
+reject.media,noop,true,false,reject media and test unicode characters ♥,false,false,false,false,false,false,false,false,false,false,false
+little.spam,noop,false,false,has some spams,false,true,false,false,true,false,false,false,false,false,false
diff --git a/spec/fixtures/files/text.png b/spec/fixtures/files/text.png
new file mode 100644
index 0000000000..7463b54fd5
Binary files /dev/null and b/spec/fixtures/files/text.png differ
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ef1463e64c..f7ee51f6d8 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -3,30 +3,6 @@
 require 'rails_helper'
 
 describe ApplicationHelper do
-  describe 'active_nav_class' do
-    it 'returns active when on the current page' do
-      allow(helper).to receive(:current_page?).and_return(true)
-
-      result = helper.active_nav_class('/test')
-      expect(result).to eq 'active'
-    end
-
-    it 'returns active when on a current page' do
-      allow(helper).to receive(:current_page?).with('/foo').and_return(false)
-      allow(helper).to receive(:current_page?).with('/test').and_return(true)
-
-      result = helper.active_nav_class('/foo', '/test')
-      expect(result).to eq 'active'
-    end
-
-    it 'returns empty string when not on current page' do
-      allow(helper).to receive(:current_page?).and_return(false)
-
-      result = helper.active_nav_class('/test')
-      expect(result).to eq ''
-    end
-  end
-
   describe 'body_classes' do
     context 'with a body class string from a controller' do
       before { helper.extend controller_helpers }
@@ -86,6 +62,10 @@ describe ApplicationHelper do
   describe 'open_registrations?' do
     it 'returns true when open for registrations' do
       allow(Setting).to receive(:[]).with('registrations_mode').and_return('open')
+      allow(Setting).to receive(:[]).with('registrations_start_hour').and_return(0)
+      allow(Setting).to receive(:[]).with('registrations_end_hour').and_return(0)
+      allow(Setting).to receive(:[]).with('registrations_secondary_start_hour').and_return(0)
+      allow(Setting).to receive(:[]).with('registrations_secondary_end_hour').and_return(0)
 
       expect(helper.open_registrations?).to be true
       expect(Setting).to have_received(:[]).with('registrations_mode')
@@ -99,36 +79,6 @@ describe ApplicationHelper do
     end
   end
 
-  describe 'show_landing_strip?', :without_verify_partial_doubles do
-    describe 'when signed in' do
-      before do
-        allow(helper).to receive(:user_signed_in?).and_return(true)
-      end
-
-      it 'does not show landing strip' do
-        expect(helper.show_landing_strip?).to be false
-      end
-    end
-
-    describe 'when signed out' do
-      before do
-        allow(helper).to receive(:user_signed_in?).and_return(false)
-      end
-
-      it 'does not show landing strip on single user instance' do
-        allow(helper).to receive(:single_user_mode?).and_return(true)
-
-        expect(helper.show_landing_strip?).to be false
-      end
-
-      it 'shows landing strip on multi user instance' do
-        allow(helper).to receive(:single_user_mode?).and_return(false)
-
-        expect(helper.show_landing_strip?).to be true
-      end
-    end
-  end
-
   describe 'available_sign_up_path' do
     context 'when registrations are closed' do
       before do
@@ -339,4 +289,33 @@ describe ApplicationHelper do
       end
     end
   end
+
+  describe 'favicon' do
+    context 'when an icon exists' do
+      let!(:favicon) { Fabricate(:site_upload, var: 'favicon') }
+      let!(:app_icon) { Fabricate(:site_upload, var: 'app_icon') }
+
+      it 'returns the URL of the icon' do
+        expect(helper.favicon_path).to eq(favicon.file.url('48'))
+        expect(helper.app_icon_path).to eq(app_icon.file.url('48'))
+      end
+
+      it 'returns the URL of the icon with size parameter' do
+        expect(helper.favicon_path(16)).to eq(favicon.file.url('16'))
+        expect(helper.app_icon_path(16)).to eq(app_icon.file.url('16'))
+      end
+    end
+
+    context 'when an icon does not exist' do
+      it 'returns nil' do
+        expect(helper.favicon_path).to be_nil
+        expect(helper.app_icon_path).to be_nil
+      end
+
+      it 'returns nil with size parameter' do
+        expect(helper.favicon_path(16)).to be_nil
+        expect(helper.app_icon_path(16)).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index 99857278a1..132f2e02f8 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -56,15 +56,15 @@ describe JsonLdHelper do
   describe '#fetch_resource' do
     context 'when the second argument is false' do
       it 'returns resource even if the retrieved ID and the given URI does not match' do
-        stub_request(:get, 'https://bob.test/').to_return body: '{"id": "https://alice.test/"}'
-        stub_request(:get, 'https://alice.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://bob.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://alice.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
 
         expect(fetch_resource('https://bob.test/', false)).to eq({ 'id' => 'https://alice.test/' })
       end
 
       it 'returns nil if the object identified by the given URI and the object identified by the retrieved ID does not match' do
-        stub_request(:get, 'https://mallory.test/').to_return body: '{"id": "https://marvin.test/"}'
-        stub_request(:get, 'https://marvin.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://mallory.test/').to_return(body: '{"id": "https://marvin.test/"}', headers: { 'Content-Type': 'application/activity+json' })
+        stub_request(:get, 'https://marvin.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
 
         expect(fetch_resource('https://mallory.test/', false)).to be_nil
       end
@@ -72,7 +72,7 @@ describe JsonLdHelper do
 
     context 'when the second argument is true' do
       it 'returns nil if the retrieved ID and the given URI does not match' do
-        stub_request(:get, 'https://mallory.test/').to_return body: '{"id": "https://alice.test/"}'
+        stub_request(:get, 'https://mallory.test/').to_return(body: '{"id": "https://alice.test/"}', headers: { 'Content-Type': 'application/activity+json' })
         expect(fetch_resource('https://mallory.test/', true)).to be_nil
       end
     end
@@ -80,12 +80,12 @@ describe JsonLdHelper do
 
   describe '#fetch_resource_without_id_validation' do
     it 'returns nil if the status code is not 200' do
-      stub_request(:get, 'https://host.test/').to_return status: 400, body: '{}'
+      stub_request(:get, 'https://host.test/').to_return(status: 400, body: '{}', headers: { 'Content-Type': 'application/activity+json' })
       expect(fetch_resource_without_id_validation('https://host.test/')).to be_nil
     end
 
     it 'returns hash' do
-      stub_request(:get, 'https://host.test/').to_return status: 200, body: '{}'
+      stub_request(:get, 'https://host.test/').to_return(status: 200, body: '{}', headers: { 'Content-Type': 'application/activity+json' })
       expect(fetch_resource_without_id_validation('https://host.test/')).to eq({})
     end
   end
@@ -100,6 +100,9 @@ describe JsonLdHelper do
             'obsolete' => 'http://ostatus.org#',
             'convo' => 'obsolete:conversation',
             'new' => 'https://obscure-unreleased-test.joinmastodon.org/#',
+            'fedibird' => 'http://fedibird.com/ns#',
+            'searchableBy' => { '@id' => 'fedibird:searchableBy', '@type' => '@id' },
+            'references' => { '@id' => 'fedibird:references', '@type' => '@id' },
           },
         ],
         'type' => 'Create',
@@ -115,6 +118,16 @@ describe JsonLdHelper do
               'href' => ['foo'],
             },
           ],
+          'searchableBy' => [nil],
+          'references' => {
+            'id' => 'https://streaming.kmy.blue/users/askyq/statuses/111091802894103697/references',
+            'type' => 'Collection',
+            'first' => {
+              'type' => 'CollectionPage',
+              'partOf' => 'https://streaming.kmy.blue/users/askyq/statuses/111091802894103697/references',
+              'items' => ['https://kmy.blue/users/askyq/statuses/111086477431146139'],
+            },
+          },
         },
         'signature' => {
           'type' => 'RsaSignature2017',
@@ -152,6 +165,14 @@ describe JsonLdHelper do
         expect(compacted.dig('object', 'tag', 0, 'href')).to eq ['foo']
         expect(safe_for_forwarding?(json, compacted)).to be true
       end
+
+      it 'is work with invalid array' do
+        json['object'].delete('convo')
+        compacted = compact(json)
+        patch_for_forwarding!(json, compacted)
+        expect(compacted.dig('object', 'searchableBy')).to eq []
+        expect(compacted.dig('object', 'references', 'first', 'items')).to eq ['https://kmy.blue/users/askyq/statuses/111086477431146139']
+      end
     end
 
     describe 'safe_for_forwarding?' do
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index c67e1f3f2b..73d7d80e46 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -29,26 +29,6 @@ describe StatusesHelper do
     I18n.t('statuses.content_warning', warning: status.spoiler_text)
   end
 
-  describe 'link_to_newer' do
-    it 'returns a link to newer content' do
-      url = 'https://example.com'
-      result = helper.link_to_newer(url)
-
-      expect(result).to match('load-more')
-      expect(result).to match(I18n.t('statuses.show_newer'))
-    end
-  end
-
-  describe 'link_to_older' do
-    it 'returns a link to older content' do
-      url = 'https://example.com'
-      result = helper.link_to_older(url)
-
-      expect(result).to match('load-more')
-      expect(result).to match(I18n.t('statuses.show_older'))
-    end
-  end
-
   describe 'fa_visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }
diff --git a/spec/helpers/theme_helper_spec.rb b/spec/helpers/theme_helper_spec.rb
new file mode 100644
index 0000000000..c0b6380a1f
--- /dev/null
+++ b/spec/helpers/theme_helper_spec.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ThemeHelper do
+  describe 'theme_style_tags' do
+    let(:result) { helper.theme_style_tags(theme) }
+
+    context 'when using system theme' do
+      let(:theme) { 'system' }
+
+      it 'returns the mastodon-light and default stylesheets with correct color schemes' do
+        expect(html_links.first.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/mastodon-light/)),
+            media: have_attributes(value: 'not all and (prefers-color-scheme: dark)')
+          )
+        expect(html_links.last.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/default/)),
+            media: have_attributes(value: '(prefers-color-scheme: dark)')
+          )
+      end
+    end
+
+    context 'when using other theme' do
+      let(:theme) { 'contrast' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_links.first.attributes.symbolize_keys)
+          .to include(
+            href: have_attributes(value: match(/contrast/)),
+            media: have_attributes(value: 'all')
+          )
+      end
+    end
+  end
+
+  describe 'theme_color_tags' do
+    let(:result) { helper.theme_color_tags(theme) }
+
+    context 'when using system theme' do
+      let(:theme) { 'system' }
+
+      it 'returns the mastodon-light and default stylesheets with correct color schemes' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:dark]),
+            media: have_attributes(value: '(prefers-color-scheme: dark)')
+          )
+        expect(html_theme_colors.last.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:light]),
+            media: have_attributes(value: '(prefers-color-scheme: light)')
+          )
+      end
+    end
+
+    context 'when using mastodon-light theme' do
+      let(:theme) { 'mastodon-light' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:light])
+          )
+      end
+    end
+
+    context 'when using other theme' do
+      let(:theme) { 'contrast' }
+
+      it 'returns the theme stylesheet without color scheme information' do
+        expect(html_theme_colors.first.attributes.symbolize_keys)
+          .to include(
+            content: have_attributes(value: Themes::THEME_COLORS[:dark])
+          )
+      end
+    end
+  end
+
+  private
+
+  def html_links
+    Nokogiri::HTML5.fragment(result).css('link')
+  end
+
+  def html_theme_colors
+    Nokogiri::HTML5.fragment(result).css('meta[name=theme-color]')
+  end
+end
diff --git a/spec/lib/account_statuses_filter_spec.rb b/spec/lib/account_statuses_filter_spec.rb
index 7774585124..fd5357c1bb 100644
--- a/spec/lib/account_statuses_filter_spec.rb
+++ b/spec/lib/account_statuses_filter_spec.rb
@@ -42,13 +42,18 @@ RSpec.describe AccountStatusesFilter do
 
     before do
       status!(:public)
+      status!(:public_unlisted)
       status!(:unlisted)
+      status!(:login)
       status!(:private)
+      status!(:direct)
+      status!(:limited)
       status_with_parent!(:public)
       status_with_reblog!(:public)
       status_with_tag!(:public, tag)
       status_with_mention!(:direct)
       status_with_media_attachment!(:public)
+      status_with_mention!(:limited)
     end
 
     shared_examples 'filter params' do
@@ -90,7 +95,7 @@ RSpec.describe AccountStatusesFilter do
       let(:direct_status) { nil }
 
       it 'returns only public statuses, public replies, and public reblogs' do
-        expect(results_unique_visibilities).to match_array %w(unlisted public)
+        expect(results_unique_visibilities).to match_array %w(unlisted public_unlisted public)
 
         expect(results_in_reply_to_ids).to_not be_empty
 
@@ -116,7 +121,7 @@ RSpec.describe AccountStatusesFilter do
       let(:current_account) { account }
 
       it 'returns all statuses, replies, and reblogs' do
-        expect(results_unique_visibilities).to match_array %w(direct private unlisted public)
+        expect(results_unique_visibilities).to match_array %w(direct private login unlisted public_unlisted public limited)
 
         expect(results_in_reply_to_ids).to_not be_empty
 
@@ -134,7 +139,7 @@ RSpec.describe AccountStatusesFilter do
       end
 
       it 'returns private statuses, replies, and reblogs' do
-        expect(results_unique_visibilities).to match_array %w(private unlisted public)
+        expect(results_unique_visibilities).to match_array %w(private login unlisted public_unlisted public)
 
         expect(results_in_reply_to_ids).to_not be_empty
 
@@ -149,6 +154,30 @@ RSpec.describe AccountStatusesFilter do
         end
       end
 
+      context 'when there is a direct status mentioning other user' do
+        let!(:direct_status) { status_with_mention!(:direct) }
+
+        it 'not returns the direct status' do
+          expect(results_ids).to_not include(direct_status.id)
+        end
+      end
+
+      context 'when there is a limited status mentioning the non-follower' do
+        let!(:limited_status) { status_with_mention!(:limited, current_account) }
+
+        it 'returns the limited status' do
+          expect(results_ids).to include(limited_status.id)
+        end
+      end
+
+      context 'when there is a limited status mentioning other user' do
+        let!(:limited_status) { status_with_mention!(:limited) }
+
+        it 'not returns the limited status' do
+          expect(results_ids).to_not include(limited_status.id)
+        end
+      end
+
       it_behaves_like 'filter params'
     end
 
@@ -156,7 +185,7 @@ RSpec.describe AccountStatusesFilter do
       let(:current_account) { Fabricate(:account) }
 
       it 'returns only public statuses, replies, and reblogs' do
-        expect(results_unique_visibilities).to match_array %w(unlisted public)
+        expect(results_unique_visibilities).to match_array %w(login unlisted public_unlisted public)
 
         expect(results_in_reply_to_ids).to_not be_empty
 
@@ -238,6 +267,80 @@ RSpec.describe AccountStatusesFilter do
       it_behaves_like 'filter params'
     end
 
+    context 'when accessed by a remote account' do
+      let(:current_account) { Fabricate(:account, uri: 'https://example.com/', domain: 'example.com') }
+      let!(:sensitive_status_with_cw) { Fabricate(:status, account: account, visibility: :public, spoiler_text: 'CW', sensitive: true) }
+      let!(:sensitive_status_with_media) do
+        Fabricate(:status, account: account, visibility: :public, sensitive: true).tap do |status|
+          Fabricate(:media_attachment, account: account, status: status)
+        end
+      end
+
+      shared_examples 'as_like_public_visibility' do
+        it 'returns private statuses, replies, and reblogs' do
+          expect(results_unique_visibilities).to match_array %w(login unlisted public_unlisted public)
+
+          expect(results_in_reply_to_ids).to_not be_empty
+
+          expect(results_reblog_of_ids).to_not be_empty
+        end
+
+        context 'when there is a direct status mentioning the non-follower' do
+          let!(:direct_status) { status_with_mention!(:direct, current_account) }
+
+          it 'returns the direct status' do
+            expect(results_ids).to include(direct_status.id)
+          end
+        end
+
+        context 'when there is a direct status mentioning other user' do
+          let!(:direct_status) { status_with_mention!(:direct) }
+
+          it 'not returns the direct status' do
+            expect(results_ids).to_not include(direct_status.id)
+          end
+        end
+
+        context 'when there is a limited status mentioning the non-follower' do
+          let!(:limited_status) { status_with_mention!(:limited, current_account) }
+
+          it 'returns the limited status' do
+            expect(results_ids).to include(limited_status.id)
+          end
+        end
+
+        context 'when there is a limited status mentioning other user' do
+          let!(:limited_status) { status_with_mention!(:limited) }
+
+          it 'not returns the limited status' do
+            expect(results_ids).to_not include(limited_status.id)
+          end
+        end
+      end
+
+      it_behaves_like 'as_like_public_visibility'
+      it_behaves_like 'filter params'
+
+      it 'returns the sensitive status' do
+        expect(results_ids).to include(sensitive_status_with_cw.id)
+        expect(results_ids).to include(sensitive_status_with_media.id)
+      end
+
+      context 'when domain-blocked reject_media' do
+        before do
+          Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_send_sensitive: true)
+        end
+
+        it_behaves_like 'as_like_public_visibility'
+        it_behaves_like 'filter params'
+
+        it 'does not return the sensitive status' do
+          expect(results_ids).to_not include(sensitive_status_with_cw.id)
+          expect(results_ids).to_not include(sensitive_status_with_media.id)
+        end
+      end
+    end
+
     private
 
     def results_unique_visibilities
diff --git a/spec/lib/activitypub/activity/accept_spec.rb b/spec/lib/activitypub/activity/accept_spec.rb
index d6b6071279..24dbcbff7c 100644
--- a/spec/lib/activitypub/activity/accept_spec.rb
+++ b/spec/lib/activitypub/activity/accept_spec.rb
@@ -43,6 +43,35 @@ RSpec.describe ActivityPub::Activity::Accept do
     end
   end
 
+  context 'when sender is from friend server' do
+    subject { described_class.new(json, sender) }
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+    let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', active_state: :pending, active_follow_activity_id: 'https://abc-123/456') }
+
+    before do
+      allow(RemoteAccountRefreshWorker).to receive(:perform_async)
+      Fabricate(:follow_request, account: recipient, target_account: sender)
+      subject.perform
+    end
+
+    it 'creates a follow relationship' do
+      expect(recipient.following?(sender)).to be true
+    end
+
+    it 'removes the follow request' do
+      expect(recipient.requested?(sender)).to be false
+    end
+
+    it 'queues a refresh' do
+      expect(RemoteAccountRefreshWorker).to have_received(:perform_async).with(sender.id)
+    end
+
+    it 'friend server is not changed' do
+      expect(friend.reload.i_am_pending?).to be true
+    end
+  end
+
   context 'when given a relay' do
     subject { described_class.new(json, sender) }
 
@@ -68,4 +97,47 @@ RSpec.describe ActivityPub::Activity::Accept do
       expect(relay.reload.accepted?).to be true
     end
   end
+
+  context 'when given a friend server' do
+    subject { described_class.new(json, sender) }
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+    let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', active_state: :pending, active_follow_activity_id: 'https://abc-123/456') }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Accept',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: 'https://abc-123/456',
+      }.with_indifferent_access
+    end
+
+    it 'marks the friend as accepted' do
+      subject.perform
+      expect(friend.reload.i_am_accepted?).to be true
+    end
+
+    it 'when the friend server is pending' do
+      friend.update(passive_state: :pending)
+      subject.perform
+      expect(friend.reload.they_are_idle?).to be true
+      expect(friend.i_am_accepted?).to be true
+    end
+
+    it 'when the friend server is accepted' do
+      friend.update(passive_state: :accepted)
+      subject.perform
+      expect(friend.reload.they_are_idle?).to be true
+      expect(friend.i_am_accepted?).to be true
+    end
+
+    it 'when my server is not pending' do
+      friend.update(active_state: :idle)
+      subject.perform
+      expect(friend.reload.i_am_idle?).to be true
+      expect(friend.they_are_idle?).to be true
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/add_spec.rb b/spec/lib/activitypub/activity/add_spec.rb
index ec6df01716..c0abd9f393 100644
--- a/spec/lib/activitypub/activity/add_spec.rb
+++ b/spec/lib/activitypub/activity/add_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe ActivityPub::Activity::Add do
         end
 
         it 'fetches the status and pins it' do
-          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, request_id: nil| # rubocop:disable Lint/UnusedBlockArgument
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, **|
             expect(uri).to eq 'https://example.com/unknown'
             expect(id).to be true
             expect(on_behalf_of&.following?(sender)).to be true
@@ -64,7 +64,7 @@ RSpec.describe ActivityPub::Activity::Add do
 
       context 'when there is no local follower' do
         it 'tries to fetch the status' do
-          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, request_id: nil| # rubocop:disable Lint/UnusedBlockArgument
+          allow(service_stub).to receive(:call) do |uri, id: true, on_behalf_of: nil, **|
             expect(uri).to eq 'https://example.com/unknown'
             expect(id).to be true
             expect(on_behalf_of).to be_nil
diff --git a/spec/lib/activitypub/activity/announce_spec.rb b/spec/lib/activitypub/activity/announce_spec.rb
index 8ad892975d..4505964574 100644
--- a/spec/lib/activitypub/activity/announce_spec.rb
+++ b/spec/lib/activitypub/activity/announce_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe ActivityPub::Activity::Announce do
     context 'when sender is followed by a local account' do
       before do
         Fabricate(:account).follow!(sender)
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
         subject.perform
       end
 
@@ -111,6 +111,38 @@ RSpec.describe ActivityPub::Activity::Announce do
       end
     end
 
+    context 'when ng rule is existing' do
+      context 'when ng rule is match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['reblog'])
+          subject.perform
+        end
+
+        let(:object_json) do
+          ActivityPub::TagManager.instance.uri_for(status)
+        end
+
+        it 'does not create a reblog by sender of status' do
+          expect(sender.reblogged?(status)).to be false
+        end
+      end
+
+      context 'when ng rule is not match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['reblog'])
+          subject.perform
+        end
+
+        let(:object_json) do
+          ActivityPub::TagManager.instance.uri_for(status)
+        end
+
+        it 'creates a reblog by sender of status' do
+          expect(sender.reblogged?(status)).to be true
+        end
+      end
+    end
+
     context 'when the sender is relayed' do
       subject { described_class.new(json, sender, relayed_through_actor: relay_account) }
 
@@ -120,7 +152,7 @@ RSpec.describe ActivityPub::Activity::Announce do
       let(:object_json) { 'https://example.com/actor/hello-world' }
 
       before do
-        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json))
+        stub_request(:get, 'https://example.com/actor/hello-world').to_return(body: Oj.dump(unknown_object_json), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       context 'when the relay is enabled' do
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 3e3a4978c8..d9cd0494f0 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -3,7 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Create do
-  let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+  let(:sender_bio) { '' }
+  let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor', note: sender_bio) }
 
   let(:json) do
     {
@@ -15,12 +16,22 @@ RSpec.describe ActivityPub::Activity::Create do
     }.with_indifferent_access
   end
 
+  let(:conversation_hash) do
+    {
+      id: 'http://example.com/conversation',
+      type: 'Group',
+      inbox: 'http://example.com/actor/inbox',
+    }.with_indifferent_access
+  end
+
   before do
     sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender))
 
     stub_request(:get, 'http://example.com/attachment.png').to_return(request_fixture('avatar.txt'))
     stub_request(:get, 'http://example.com/emoji.png').to_return(body: attachment_fixture('emojo.png'))
     stub_request(:get, 'http://example.com/emojib.png').to_return(body: attachment_fixture('emojo.png'), headers: { 'Content-Type' => 'application/octet-stream' })
+    stub_request(:get, 'http://example.com/conversation').to_return(body: Oj.dump(conversation_hash), headers: { 'Content-Type': 'application/activity+json' })
+    stub_request(:get, 'http://example.com/invalid-conversation').to_return(status: 404)
   end
 
   describe 'processing posts received out of order' do
@@ -121,10 +132,17 @@ RSpec.describe ActivityPub::Activity::Create do
 
   describe '#perform' do
     context 'when fetching' do
-      subject { described_class.new(json, sender) }
+      subject { delivered_to_account_id ? described_class.new(json, sender, delivered_to_account_id: delivered_to_account_id) : described_class.new(json, sender) }
+
+      let(:sender_software) { 'mastodon' }
+      let(:custom_before) { false }
+      let(:active_friend) { false }
+      let(:delivered_to_account_id) { nil }
 
       before do
-        subject.perform
+        Fabricate(:instance_info, domain: 'example.com', software: sender_software)
+        Fabricate(:friend_domain, domain: 'example.com', active_state: :accepted) if active_friend
+        subject.perform unless custom_before
       end
 
       context 'when object publication date is below ISO8601 range' do
@@ -363,6 +381,45 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'when public_unlisted with kmyblue:LocalPublic' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: ['http://example.com/followers', 'kmyblue:LocalPublic'],
+            cc: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'unlisted'
+        end
+      end
+
+      context 'when public_unlisted with kmyblue:LocalPublic from friend-server' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: ['http://example.com/followers', 'kmyblue:LocalPublic'],
+            cc: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+        let(:active_friend) { true }
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'public_unlisted'
+        end
+      end
+
       context 'when private' do
         let(:object_json) do
           {
@@ -420,6 +477,7 @@ RSpec.describe ActivityPub::Activity::Create do
 
           expect(status).to_not be_nil
           expect(status.visibility).to eq 'limited'
+          expect(status.limited_scope).to eq 'none'
         end
 
         it 'creates silent mention' do
@@ -428,6 +486,50 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'when limited_scope' do
+        let(:recipient) { Fabricate(:account) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: ActivityPub::TagManager.instance.uri_for(recipient),
+            limitedScope: 'Mutual',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'limited'
+          expect(status.limited_scope).to eq 'mutual'
+        end
+      end
+
+      context 'when invalid limited_scope' do
+        let(:recipient) { Fabricate(:account) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: ActivityPub::TagManager.instance.uri_for(recipient),
+            limitedScope: 'IdosdsazsF',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.visibility).to eq 'limited'
+          expect(status.limited_scope).to eq 'none'
+        end
+      end
+
       context 'when direct' do
         let(:recipient) { Fabricate(:account) }
 
@@ -452,6 +554,253 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'when searchability' do
+        let(:searchable_by) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            searchableBy: searchable_by,
+          }
+        end
+
+        context 'with explicit public address' do
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'public'
+          end
+        end
+
+        context 'with public with as:Public' do
+          let(:searchable_by) { 'as:Public' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'public'
+          end
+        end
+
+        context 'with public with Public' do
+          let(:searchable_by) { 'Public' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'public'
+          end
+        end
+
+        context 'with public_unlisted with kmyblue:LocalPublic' do
+          let(:searchable_by) { ['http://example.com/followers', 'kmyblue:LocalPublic'] }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'private'
+          end
+        end
+
+        context 'with public_unlisted with kmyblue:LocalPublic from friend-server' do
+          let(:searchable_by) { ['http://example.com/followers', 'kmyblue:LocalPublic'] }
+          let(:active_friend) { true }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'public_unlisted'
+          end
+        end
+
+        context 'with private' do
+          let(:searchable_by) { 'http://example.com/followers' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'private'
+          end
+        end
+
+        context 'with direct' do
+          let(:searchable_by) { '' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'direct'
+          end
+        end
+
+        context 'with direct when not specify' do
+          let(:searchable_by) { nil }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to be_nil
+          end
+        end
+
+        context 'with limited' do
+          let(:searchable_by) { 'kmyblue:Limited' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'limited'
+          end
+        end
+
+        context 'with limited old spec' do
+          let(:searchable_by) { 'as:Limited' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'limited'
+          end
+        end
+
+        context 'with bio' do
+          let(:searchable_by) { nil }
+
+          context 'with public' do
+            let(:sender_bio) { '#searchable_by_all_users' }
+
+            it 'create status' do
+              status = sender.statuses.first
+
+              expect(status).to_not be_nil
+              expect(status.searchability).to eq 'public'
+            end
+          end
+
+          context 'with private' do
+            let(:sender_bio) { '#searchable_by_followers_only' }
+
+            it 'create status' do
+              status = sender.statuses.first
+
+              expect(status).to_not be_nil
+              expect(status.searchability).to eq 'private'
+            end
+          end
+
+          context 'with direct' do
+            let(:sender_bio) { '#searchable_by_reacted_users_only' }
+
+            it 'create status' do
+              status = sender.statuses.first
+
+              expect(status).to_not be_nil
+              expect(status.searchability).to eq 'direct'
+            end
+          end
+
+          context 'with limited' do
+            let(:sender_bio) { '#searchable_by_nobody' }
+
+            it 'create status' do
+              status = sender.statuses.first
+
+              expect(status).to_not be_nil
+              expect(status.searchability).to eq 'limited'
+            end
+          end
+
+          context 'without hashtags' do
+            let(:sender_bio) { '' }
+
+            it 'create status' do
+              status = sender.statuses.first
+
+              expect(status).to_not be_nil
+              expect(status.searchability).to be_nil
+            end
+          end
+        end
+      end
+
+      context 'when searchability from misskey server' do
+        let(:sender_software) { 'misskey' }
+        let(:to) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: to,
+          }
+        end
+
+        context 'without specify searchability from misskey' do
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'public'
+          end
+        end
+
+        context 'without specify searchability from misskey which visibility is private' do
+          let(:to) { 'http://example.com/followers' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'limited'
+          end
+        end
+      end
+
+      context 'with multible searchabilities' do
+        let(:sender_bio) { '#searchable_by_nobody' }
+        let(:searchable_by) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            searchableBy: searchable_by,
+          }
+        end
+
+        it 'create status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.searchability).to eq 'public'
+        end
+
+        context 'with misskey' do
+          let(:sender_software) { 'misskey' }
+          let(:searchable_by) { 'kmyblue:Limited' }
+
+          it 'create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.searchability).to eq 'limited'
+          end
+        end
+      end
+
       context 'with a reply' do
         let(:original_status) { Fabricate(:status) }
 
@@ -520,6 +869,303 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'with mentions domain block reject_reply_exclude_followers' do
+        before do
+          Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_reply_exclude_followers: true)
+          recipient.follow!(sender) if follow
+          subject.perform
+        end
+
+        let(:custom_before) { true }
+        let(:follow) { false }
+        let(:recipient) { Fabricate(:account) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            tag: [
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(recipient),
+              },
+            ],
+          }
+        end
+
+        context 'when follower' do
+          let(:follow) { true }
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+          end
+        end
+
+        context 'when not follower' do
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to be_nil
+          end
+        end
+      end
+
+      context 'with a context' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            context: 'http://example.com/conversation',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.conversation).to_not be_nil
+          expect(status.conversation.uri).to eq 'http://example.com/conversation'
+          expect(status.conversation.inbox_url).to eq 'http://example.com/actor/inbox'
+        end
+
+        context 'when existing' do
+          let(:custom_before) { true }
+          let!(:existing) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/invalid') }
+
+          before do
+            subject.perform
+          end
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.conversation).to_not be_nil
+            expect(status.conversation.id).to eq existing.id
+            expect(status.conversation.inbox_url).to eq 'http://example.com/actor/inbox'
+          end
+        end
+      end
+
+      context 'with an invalid context' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            context: 'http://example.com/invalid-conversation',
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.text).to eq 'Lorem ipsum'
+          expect(status.conversation).to_not be_nil
+          expect(status.conversation.uri).to eq 'http://example.com/invalid-conversation'
+        end
+      end
+
+      context 'with a local context' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            context: "https://cb6e6126.ngrok.io/contexts/#{existing.id}",
+          }
+        end
+
+        let(:existing) { Fabricate(:conversation, id: 3500) }
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.conversation).to_not be_nil
+          expect(status.conversation.uri).to be_nil
+          expect(status.conversation.id).to eq existing.id
+        end
+      end
+
+      context 'with a context as a reply' do
+        let(:custom_before) { true }
+        let(:custom_before_sub) { false }
+        let(:ancestor_account) { Fabricate(:account, domain: 'or.example.com', inbox_url: 'http://or.example.com/actor/inbox') }
+        let(:mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/bob', inbox_url: 'http://example.com/bob/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
+        let(:local_mentioned_account) { Fabricate(:account, domain: nil) }
+        let(:original_status) { Fabricate(:status, conversation: conversation, account: ancestor_account) }
+        let!(:conversation) { Fabricate(:conversation) }
+        let(:recipient) { Fabricate(:account) }
+        let(:delivered_to_account_id) { recipient.id }
+
+        let(:json) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#foo'].join,
+            type: 'Create',
+            actor: ActivityPub::TagManager.instance.uri_for(sender),
+            object: object_json,
+            signature: 'dummy',
+          }.with_indifferent_access
+        end
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            context: ActivityPub::TagManager.instance.uri_for(conversation),
+            inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status),
+          }
+        end
+
+        before do
+          original_status.mentions << Fabricate(:mention, account: mentioned_account, silent: true)
+          original_status.mentions << Fabricate(:mention, account: local_mentioned_account, silent: true)
+          original_status.save!
+          conversation.update(ancestor_status: original_status)
+
+          stub_request(:post, 'http://or.example.com/actor/inbox').to_return(status: 200)
+          stub_request(:post, 'http://example.com/bob/inbox').to_return(status: 200)
+
+          subject.perform unless custom_before_sub
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.conversation_id).to eq conversation.id
+          expect(status.thread.id).to eq original_status.id
+          expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id, ancestor_account.id, mentioned_account.id, local_mentioned_account.id)
+        end
+
+        it 'forwards to observers', :sidekiq_inline do
+          expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
+          expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
+        end
+
+        context 'when new mention is added' do
+          let(:custom_before_sub) { true }
+
+          let(:new_mentioned_account) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/alice', inbox_url: 'http://example.com/alice/inbox', shared_inbox_url: 'http://exmaple.com/inbox') }
+          let(:new_local_mentioned_account) { Fabricate(:account, domain: nil) }
+
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: 'Lorem ipsum',
+              context: ActivityPub::TagManager.instance.uri_for(conversation),
+              inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status),
+              tag: [
+                {
+                  type: 'Mention',
+                  href: ActivityPub::TagManager.instance.uri_for(new_mentioned_account),
+                },
+                {
+                  type: 'Mention',
+                  href: ActivityPub::TagManager.instance.uri_for(new_local_mentioned_account),
+                },
+              ],
+            }
+          end
+
+          before do
+            stub_request(:post, 'http://example.com/alice/inbox').to_return(status: 200)
+            subject.perform
+          end
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id, ancestor_account.id, mentioned_account.id, local_mentioned_account.id, new_mentioned_account.id, new_local_mentioned_account.id)
+          end
+
+          it 'forwards to observers', :sidekiq_inline do
+            expect(a_request(:post, 'http://or.example.com/actor/inbox')).to have_been_made.once
+            expect(a_request(:post, 'http://example.com/bob/inbox')).to have_been_made.once
+            expect(a_request(:post, 'http://example.com/alice/inbox')).to have_been_made.once
+          end
+        end
+
+        context 'when unknown mentioned account' do
+          let(:custom_before_sub) { true }
+
+          let(:actor_json) do
+            {
+              '@context': 'https://www.w3.org/ns/activitystreams',
+              id: 'https://foo.test',
+              type: 'Person',
+              preferredUsername: 'actor',
+              name: 'Tomas Cat',
+              inbox: 'https://foo.test/inbox',
+            }.with_indifferent_access
+          end
+          let!(:webfinger) { { subject: 'acct:actor@foo.test', links: [{ rel: 'self', href: 'https://foo.test' }] } }
+
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: 'Lorem ipsum',
+              context: ActivityPub::TagManager.instance.uri_for(conversation),
+              inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status),
+              tag: [
+                {
+                  type: 'Mention',
+                  href: 'https://foo.test',
+                },
+              ],
+            }
+          end
+
+          before do
+            stub_request(:get, 'https://foo.test').to_return(status: 200, body: Oj.dump(actor_json), headers: { 'Content-Type': 'application/activity+json' })
+            stub_request(:get, 'https://foo.test/.well-known/webfinger?resource=acct:actor@foo.test').to_return(status: 200, body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/activity+json' })
+            stub_request(:post, 'https://foo.test/inbox').to_return(status: 200)
+            stub_request(:get, 'https://foo.test/.well-known/nodeinfo').to_return(status: 200, headers: { 'Content-Type': 'application/activity+json' })
+            subject.perform
+          end
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.mentioned_accounts.map(&:uri)).to include 'https://foo.test'
+          end
+
+          it 'forwards to observers', :sidekiq_inline do
+            expect(a_request(:post, 'https://foo.test/inbox')).to have_been_made.once
+          end
+        end
+
+        context 'when remote conversation' do
+          let(:conversation) { Fabricate(:conversation, uri: 'http://example.com/conversation', inbox_url: 'http://example.com/actor/inbox') }
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.conversation_id).to eq conversation.id
+            expect(status.thread.id).to eq original_status.id
+            expect(status.mentions.map(&:account_id)).to contain_exactly(recipient.id)
+          end
+
+          it 'do not forward to observers', :sidekiq_inline do
+            expect(a_request(:post, 'http://or.example.com/actor/inbox')).to_not have_been_made
+            expect(a_request(:post, 'http://example.com/bob/inbox')).to_not have_been_made
+          end
+        end
+      end
+
       context 'with media attachments' do
         let(:object_json) do
           {
@@ -668,6 +1314,22 @@ RSpec.describe ActivityPub::Activity::Create do
           expect(status).to_not be_nil
           expect(status.tags.map(&:name)).to include('test')
         end
+
+        context 'with domain-block' do
+          let(:custom_before) { true }
+
+          before do
+            Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_hashtag: true)
+            subject.perform
+          end
+
+          it 'does not create status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.tags.map(&:name)).to eq []
+          end
+        end
       end
 
       context 'with hashtags missing name' do
@@ -868,6 +1530,32 @@ RSpec.describe ActivityPub::Activity::Create do
           expect(vote.uri).to eq object_json[:id]
           expect(poll.reload.cached_tallies).to eq [1, 0]
         end
+
+        context 'when ng rule is existing' do
+          let(:custom_before) { true }
+
+          context 'when ng rule is match' do
+            before do
+              Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['vote'])
+              subject.perform
+            end
+
+            it 'does not create a reblog by sender of status' do
+              expect(poll.votes.first).to be_nil
+            end
+          end
+
+          context 'when ng rule is not match' do
+            before do
+              Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['vote'])
+              subject.perform
+            end
+
+            it 'creates a reblog by sender of status' do
+              expect(poll.votes.first).to_not be_nil
+            end
+          end
+        end
       end
 
       context 'when a vote to an expired local poll' do
@@ -891,6 +1579,787 @@ RSpec.describe ActivityPub::Activity::Create do
           expect(poll.votes.first).to be_nil
         end
       end
+
+      context 'with references' do
+        let(:recipient) { Fabricate(:account) }
+        let!(:target_status) { Fabricate(:status, account: Fabricate(:account, domain: nil)) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            references: {
+              id: 'target_status',
+              type: 'Collection',
+              first: {
+                type: 'CollectionPage',
+                next: nil,
+                partOf: 'target_status',
+                items: [
+                  ActivityPub::TagManager.instance.uri_for(target_status),
+                ],
+              },
+            },
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.quote).to be_nil
+          expect(status.references.pluck(:id)).to eq [target_status.id]
+        end
+      end
+
+      context 'with quote' do
+        let(:recipient) { Fabricate(:account) }
+        let!(:target_status) { Fabricate(:status, account: Fabricate(:account, domain: nil)) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            quote: ActivityPub::TagManager.instance.uri_for(target_status),
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.references.pluck(:id)).to eq [target_status.id]
+          expect(status.quote).to_not be_nil
+          expect(status.quote.id).to eq target_status.id
+        end
+      end
+
+      context 'with quote as feb-e232 object links' do
+        let(:recipient) { Fabricate(:account) }
+        let!(:target_status) { Fabricate(:status, account: Fabricate(:account, domain: nil)) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            tag: [
+              {
+                type: 'Link',
+                mediaType: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+                href: ActivityPub::TagManager.instance.uri_for(target_status),
+              },
+            ],
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.references.pluck(:id)).to eq [target_status.id]
+          expect(status.quote).to_not be_nil
+          expect(status.quote.id).to eq target_status.id
+        end
+      end
+
+      context 'with references and quote' do
+        let(:recipient) { Fabricate(:account) }
+        let!(:target_status) { Fabricate(:status, account: Fabricate(:account, domain: nil)) }
+
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            quote: ActivityPub::TagManager.instance.uri_for(target_status),
+            references: {
+              id: 'target_status',
+              type: 'Collection',
+              first: {
+                type: 'CollectionPage',
+                next: nil,
+                partOf: 'target_status',
+                items: [
+                  ActivityPub::TagManager.instance.uri_for(target_status),
+                ],
+              },
+            },
+          }
+        end
+
+        it 'creates status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.references.pluck(:id)).to eq [target_status.id]
+          expect(status.quote).to_not be_nil
+          expect(status.quote.id).to eq target_status.id
+        end
+      end
+
+      context 'with language' do
+        let(:to) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: to,
+            contentMap: { ja: 'Lorem ipsum' },
+          }
+        end
+
+        it 'create status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.language).to eq 'ja'
+        end
+      end
+
+      context 'without language' do
+        let(:to) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: to,
+          }
+        end
+
+        it 'create status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.language).to be_nil
+        end
+      end
+
+      context 'without language when misskey server' do
+        let(:sender_software) { 'misskey' }
+        let(:to) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: to,
+          }
+        end
+
+        it 'create status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.language).to eq 'ja'
+        end
+      end
+
+      context 'with language when misskey server' do
+        let(:sender_software) { 'misskey' }
+        let(:to) { 'https://www.w3.org/ns/activitystreams#Public' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: to,
+            contentMap: { 'en-US': 'Lorem ipsum' },
+          }
+        end
+
+        it 'create status' do
+          status = sender.statuses.first
+
+          expect(status).to_not be_nil
+          expect(status.language).to eq 'en-US'
+        end
+      end
+
+      context 'when ng word is set' do
+        let(:custom_before) { true }
+        let(:custom_before_sub) { false }
+        let(:content) { 'Lorem ipsum' }
+        let(:ng_word) { 'hello' }
+        let(:ng_word_for_stranger_mention) { 'ohagi' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: content,
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+
+        before do
+          Fabricate(:ng_word, keyword: ng_word, stranger: false)
+          Fabricate(:ng_word, keyword: ng_word_for_stranger_mention, stranger: true)
+          subject.perform unless custom_before_sub
+        end
+
+        context 'when not contains ng words' do
+          let(:content) { 'ohagi, world! <a href="https://hello.org">OH GOOD</a>' }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+          end
+        end
+
+        context 'when hit ng words' do
+          let(:content) { 'hello, world!' }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+          end
+
+          it 'records history' do
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to_not be_nil
+            expect(history.status_blocked?).to be true
+            expect(history.within_ng_words?).to be true
+            expect(history.keyword).to eq ng_word
+          end
+        end
+
+        context 'when hit ng words but does not public visibility' do
+          let(:content) { 'hello, world!' }
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: content,
+            }
+          end
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+          end
+        end
+
+        context 'when mention from tags' do
+          let(:recipient) { Fabricate(:user).account }
+
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: content,
+              to: 'https://www.w3.org/ns/activitystreams#Public',
+              tag: [
+                {
+                  type: 'Mention',
+                  href: ActivityPub::TagManager.instance.uri_for(recipient),
+                },
+              ],
+            }
+          end
+
+          context 'with not using ng words for stranger' do
+            let(:content) { 'among us' }
+
+            it 'creates status' do
+              expect(sender.statuses.first).to_not be_nil
+            end
+          end
+
+          context 'with using ng words for stranger' do
+            let(:content) { 'oh, ohagi!' }
+
+            it 'creates status' do
+              expect(sender.statuses.first).to be_nil
+            end
+          end
+
+          context 'with using ng words for stranger but receiver is following him' do
+            let(:content) { 'oh, ohagi!' }
+            let(:custom_before_sub) { true }
+
+            before do
+              recipient.follow!(sender)
+              subject.perform
+            end
+
+            it 'creates status' do
+              expect(sender.statuses.first).to_not be_nil
+            end
+          end
+
+          context 'with using ng words for stranger but multiple receivers are partically following him' do
+            let(:content) { 'oh, ohagi' }
+            let(:custom_before_sub) { true }
+
+            let(:object_json) do
+              {
+                id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+                type: 'Note',
+                content: content,
+                to: 'https://www.w3.org/ns/activitystreams#Public',
+                tag: [
+                  {
+                    type: 'Mention',
+                    href: ActivityPub::TagManager.instance.uri_for(recipient),
+                  },
+                  {
+                    type: 'Mention',
+                    href: ActivityPub::TagManager.instance.uri_for(Fabricate(:user).account),
+                  },
+                ],
+              }
+            end
+
+            before do
+              recipient.follow!(sender)
+              subject.perform
+            end
+
+            it 'creates status' do
+              expect(sender.statuses.first).to be_nil
+            end
+          end
+        end
+
+        context 'when a reply' do
+          let(:recipient) { Fabricate(:user).account }
+          let(:original_status) { Fabricate(:status, account: recipient) }
+
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: 'ohagi peers',
+              to: 'https://www.w3.org/ns/activitystreams#Public',
+              inReplyTo: ActivityPub::TagManager.instance.uri_for(original_status),
+            }
+          end
+
+          context 'with a simple case' do
+            it 'creates status' do
+              expect(sender.statuses.first).to be_nil
+            end
+          end
+
+          context 'with following' do
+            let(:custom_before_sub) { true }
+
+            before do
+              recipient.follow!(sender)
+              subject.perform
+            end
+
+            it 'creates status' do
+              expect(sender.statuses.first).to_not be_nil
+            end
+          end
+        end
+
+        context 'with references' do
+          let(:recipient) { Fabricate(:account) }
+          let!(:target_status) { Fabricate(:status, account: recipient) }
+
+          let(:object_json) do
+            {
+              id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+              type: 'Note',
+              content: 'ohagi is bad',
+              references: {
+                id: 'target_status',
+                type: 'Collection',
+                first: {
+                  type: 'CollectionPage',
+                  next: nil,
+                  partOf: 'target_status',
+                  items: [
+                    ActivityPub::TagManager.instance.uri_for(target_status),
+                  ],
+                },
+              },
+            }
+          end
+
+          context 'with a simple case' do
+            it 'creates status' do
+              expect(sender.statuses.first).to be_nil
+            end
+          end
+
+          context 'with following' do
+            let(:custom_before_sub) { true }
+
+            before do
+              recipient.follow!(sender)
+              subject.perform
+            end
+
+            it 'creates status' do
+              expect(sender.statuses.first).to_not be_nil
+            end
+          end
+        end
+      end
+
+      context 'when ng rule is set' do
+        let(:custom_before) { true }
+        let(:content) { 'Lorem ipsum <a href="https://amely.net/">GOOD LINK</a>' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: content,
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+
+        context 'when rule hits' do
+          before do
+            Fabricate(:ng_rule, status_text: 'ipsum', status_allow_follower_mention: false)
+            subject.perform
+          end
+
+          it 'creates status' do
+            status = sender.statuses.first
+            expect(status).to be_nil
+          end
+        end
+
+        context 'when rule does not hit' do
+          before do
+            Fabricate(:ng_rule, status_text: 'amely', status_allow_follower_mention: false)
+            subject.perform
+          end
+
+          it 'creates status' do
+            status = sender.statuses.first
+            expect(status).to_not be_nil
+          end
+        end
+      end
+
+      context 'when sensitive word is set' do
+        let(:custom_before) { true }
+        let(:content) { 'Lorem ipsum' }
+        let(:sensitive_words_all) { 'hello' }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: content,
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+
+        before do
+          Fabricate(:sensitive_word, keyword: sensitive_words_all, remote: true, spoiler: false) if sensitive_words_all.present?
+          Fabricate(:sensitive_word, keyword: 'ipsum')
+          subject.perform
+        end
+
+        context 'when not contains sensitive words' do
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.spoiler_text).to eq ''
+          end
+        end
+
+        context 'when contains sensitive words' do
+          let(:content) { 'hello world' }
+
+          it 'creates status' do
+            status = sender.statuses.first
+
+            expect(status).to_not be_nil
+            expect(status.spoiler_text).to_not eq ''
+          end
+        end
+      end
+
+      context 'when hashtags limit is set' do
+        let(:post_hash_tags_max) { 2 }
+        let(:custom_before) { true }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            tag: [
+              {
+                type: 'Hashtag',
+                href: 'http://example.com/blah',
+                name: '#test',
+              },
+              {
+                type: 'Hashtag',
+                href: 'http://example.com/blah2',
+                name: '#test2',
+              },
+            ],
+          }
+        end
+
+        before do
+          Form::AdminSettings.new(post_hash_tags_max: post_hash_tags_max).save
+          subject.perform
+        end
+
+        context 'when limit is enough' do
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to be_nil
+          end
+        end
+
+        context 'when limit is over' do
+          let(:post_hash_tags_max) { 1 }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to_not be_nil
+            expect(history.status_blocked?).to be true
+            expect(history.within_hashtag_count?).to be true
+            expect(history.count).to eq 2
+            expect(history.text).to eq "\nLorem ipsum"
+          end
+        end
+      end
+
+      context 'when mentions limit is set' do
+        let(:post_mentions_max) { 3 }
+        let(:post_stranger_mentions_max) { 0 }
+        let(:custom_before) { true }
+        let(:mention_recipient_alice) { Fabricate(:account) }
+        let(:mention_recipient_bob) { Fabricate(:account) }
+        let(:mention_recipient_ohagi) { Fabricate(:account) }
+        let(:mention_recipient_ohagi_follow) { true }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            tag: [
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(mention_recipient_alice),
+              },
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(mention_recipient_bob),
+              },
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(mention_recipient_ohagi),
+              },
+            ],
+          }
+        end
+
+        before do
+          Form::AdminSettings.new(post_mentions_max: post_mentions_max, post_stranger_mentions_max: post_stranger_mentions_max).save
+
+          mention_recipient_alice.follow!(sender)
+          mention_recipient_bob.follow!(sender)
+          mention_recipient_ohagi.follow!(sender) if mention_recipient_ohagi_follow
+
+          subject.perform
+        end
+
+        context 'when limit is enough' do
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to be_nil
+          end
+        end
+
+        context 'when limit is over' do
+          let(:post_mentions_max) { 1 }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to_not be_nil
+            expect(history.status_blocked?).to be true
+            expect(history.within_mention_count?).to be true
+            expect(history.count).to eq 3
+          end
+        end
+
+        context 'when limit for stranger is over but normal limit is not reach' do
+          let(:post_stranger_mentions_max) { 1 }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to be_nil
+          end
+        end
+
+        context 'when limit for stranger is over and following partically' do
+          let(:post_stranger_mentions_max) { 1 }
+          let(:mention_recipient_ohagi_follow) { false }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to_not be_nil
+            expect(history.status_blocked?).to be true
+            expect(history.within_stranger_mention_count?).to be true
+            expect(history.count).to eq 3
+          end
+        end
+      end
+
+      context 'when mentions limit for stranger is set' do
+        let(:post_stranger_mentions_max) { 2 }
+        let(:custom_before) { true }
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            tag: [
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(Fabricate(:account)),
+              },
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(Fabricate(:account)),
+              },
+            ],
+          }
+        end
+
+        before do
+          Form::AdminSettings.new(post_stranger_mentions_max: post_stranger_mentions_max).save
+          subject.perform
+        end
+
+        context 'when limit is enough' do
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to be_nil
+          end
+        end
+
+        context 'when limit is over' do
+          let(:post_stranger_mentions_max) { 1 }
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+
+            history = NgwordHistory.find_by(uri: object_json[:id])
+            expect(history).to_not be_nil
+            expect(history.status_blocked?).to be true
+            expect(history.within_stranger_mention_count?).to be true
+            expect(history.count).to eq 2
+          end
+        end
+      end
+
+      context 'when stranger mention for domain' do
+        let(:object_json) do
+          {
+            id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+            type: 'Note',
+            content: 'Lorem ipsum',
+            to: 'https://www.w3.org/ns/activitystreams#Public',
+            tag: [
+              {
+                type: 'Mention',
+                href: ActivityPub::TagManager.instance.uri_for(Fabricate(:account)),
+              },
+            ],
+          }
+        end
+
+        context 'when the domain does not have follower' do
+          let(:custom_before) { true }
+
+          before do
+            Setting.block_unfollow_account_mention = true
+            subject.perform
+          end
+
+          it 'creates status' do
+            expect(sender.statuses.first).to be_nil
+          end
+        end
+
+        context 'when other account following' do
+          let(:custom_before) { true }
+
+          before do
+            Setting.block_unfollow_account_mention = true
+            Fabricate(:account).follow!(sender)
+            subject.perform
+          end
+
+          it 'creates status' do
+            expect(sender.statuses.first).to_not be_nil
+          end
+        end
+      end
+    end
+
+    context 'when object URI uses bearcaps' do
+      subject { described_class.new(json, sender) }
+
+      let(:token) { 'foo' }
+
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#foo'].join,
+          type: 'Create',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: Addressable::URI.new(scheme: 'bear', query_values: { t: token, u: object_json[:id] }).to_s,
+        }.with_indifferent_access
+      end
+
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          to: 'https://www.w3.org/ns/activitystreams#Public',
+        }
+      end
+
+      before do
+        stub_request(:get, object_json[:id])
+          .with(headers: { Authorization: "Bearer #{token}" })
+          .to_return(body: Oj.dump(object_json), headers: { 'Content-Type': 'application/activity+json' })
+
+        subject.perform
+      end
+
+      it 'creates status' do
+        status = sender.statuses.first
+
+        expect(status).to_not be_nil
+        expect(status).to have_attributes(
+          visibility: 'public',
+          text: 'Lorem ipsum'
+        )
+      end
     end
 
     context 'with an encrypted message' do
@@ -927,12 +2396,15 @@ RSpec.describe ActivityPub::Activity::Create do
       it 'creates an encrypted message' do
         encrypted_message = target_device.encrypted_messages.reload.first
 
-        expect(encrypted_message).to_not be_nil
-        expect(encrypted_message.from_device_id).to eq '1234'
-        expect(encrypted_message.from_account).to eq sender
-        expect(encrypted_message.type).to eq 1
-        expect(encrypted_message.body).to eq 'Foo'
-        expect(encrypted_message.digest).to eq 'Foo123'
+        expect(encrypted_message)
+          .to be_present
+          .and have_attributes(
+            from_device_id: eq('1234'),
+            from_account: eq(sender),
+            type: eq(1),
+            body: eq('Foo'),
+            digest: eq('Foo123')
+          )
       end
 
       it 'creates a message franking' do
@@ -948,6 +2420,40 @@ RSpec.describe ActivityPub::Activity::Create do
       end
     end
 
+    context 'when sender is in remote pending' do
+      subject { described_class.new(json, sender, delivery: true) }
+
+      let!(:local_account) { Fabricate(:account) }
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          to: local_account ? ActivityPub::TagManager.instance.uri_for(local_account) : 'https://www.w3.org/ns/activitystreams#Public',
+        }
+      end
+
+      before do
+        sender.update(suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
+        subject.perform
+      end
+
+      it 'does not create a status' do
+        status = sender.statuses.first
+
+        expect(status).to be_nil
+      end
+
+      it 'pending data is created' do
+        pending = PendingStatus.find_by(account: sender)
+
+        expect(pending).to_not be_nil
+        expect(pending.uri).to eq object_json[:id]
+        expect(pending.account_id).to eq sender.id
+        expect(pending.fetch_account_id).to eq local_account.id
+      end
+    end
+
     context 'when sender is followed by local users' do
       subject { described_class.new(json, sender, delivery: true) }
 
@@ -997,6 +2503,53 @@ RSpec.describe ActivityPub::Activity::Create do
       end
     end
 
+    context 'when sender quotes to local status' do
+      subject { described_class.new(json, sender, delivery: true) }
+
+      let!(:local_status) { Fabricate(:status) }
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          quote: ActivityPub::TagManager.instance.uri_for(local_status),
+        }
+      end
+
+      before do
+        subject.perform
+      end
+
+      it 'creates status' do
+        status = sender.statuses.first
+
+        expect(status).to_not be_nil
+        expect(status.text).to eq 'Lorem ipsum'
+      end
+    end
+
+    context 'when sender quotes to non-local status' do
+      subject { described_class.new(json, sender, delivery: true) }
+
+      let!(:remote_status) { Fabricate(:status, uri: 'https://foo.bar/among', account: Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/account')) }
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          quote: ActivityPub::TagManager.instance.uri_for(remote_status),
+        }
+      end
+
+      before do
+        subject.perform
+      end
+
+      it 'creates status' do
+        expect(sender.statuses.count).to eq 0
+      end
+    end
+
     context 'when sender targets a local user' do
       subject { described_class.new(json, sender, delivery: true) }
 
@@ -1047,6 +2600,35 @@ RSpec.describe ActivityPub::Activity::Create do
       end
     end
 
+    context 'when sender is in friend server' do
+      subject { described_class.new(json, sender, delivery: true) }
+
+      let!(:friend) { Fabricate(:friend_domain, domain: sender.domain, active_state: :accepted) }
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+        }
+      end
+
+      it 'creates status' do
+        subject.perform
+        status = sender.statuses.first
+
+        expect(status).to_not be_nil
+        expect(status.text).to eq 'Lorem ipsum'
+      end
+
+      it 'whey no-relay not creates status' do
+        friend.update(allow_all_posts: false)
+        subject.perform
+        status = sender.statuses.first
+
+        expect(status).to be_nil
+      end
+    end
+
     context 'when the sender has no relevance to local activity' do
       subject { described_class.new(json, sender, delivery: true) }
 
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index 48421a1162..f1631f73da 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -77,4 +77,51 @@ RSpec.describe ActivityPub::Activity::Delete do
       end
     end
   end
+
+  context 'when the status is limited post and has conversation' do
+    subject { described_class.new(json, sender) }
+
+    let(:conversation) { Fabricate(:conversation, ancestor_status: status) }
+
+    before do
+      status.update(conversation: conversation, visibility: :limited)
+      status.mentions << Fabricate(:mention, silent: true, account: Fabricate(:account, protocol: :activitypub, domain: 'example.com', inbox_url: 'https://example.com/actor/inbox', shared_inbox_url: 'https://example.com/inbox'))
+      status.save
+      stub_request(:post, 'https://example.com/inbox').to_return(status: 200)
+      subject.perform
+    end
+
+    it 'forwards to parent status holder', :sidekiq_inline do
+      expect(a_request(:post, 'https://example.com/inbox').with(body: hash_including({
+        type: 'Delete',
+        signature: 'foo',
+      }))).to have_been_made.once
+    end
+  end
+
+  context 'when given a friend server' do
+    subject { described_class.new(json, sender) }
+
+    before do
+      Fabricate(:friend_domain, domain: 'abc.com', inbox_url: 'https://abc.com/inbox', passive_state: :accepted)
+      stub_request(:post, 'https://abc.com/inbox')
+    end
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Delete',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: 'https://www.w3.org/ns/activitystreams#Public',
+      }.with_indifferent_access
+    end
+
+    it 'marks the friend as deleted' do
+      subject.perform
+      expect(FriendDomain.find_by(domain: 'abc.com')).to be_nil
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/follow_spec.rb b/spec/lib/activitypub/activity/follow_spec.rb
index c1829cb8d7..ef8ff24321 100644
--- a/spec/lib/activitypub/activity/follow_spec.rb
+++ b/spec/lib/activitypub/activity/follow_spec.rb
@@ -3,7 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Follow do
-  let(:sender)    { Fabricate(:account) }
+  let(:actor_type) { 'Person' }
+  let(:display_name) { '' }
+  let(:sender)    { Fabricate(:account, domain: 'example.com', inbox_url: 'https://example.com/inbox', actor_type: actor_type, display_name: display_name) }
   let(:recipient) { Fabricate(:account) }
 
   let(:json) do
@@ -35,6 +37,23 @@ RSpec.describe ActivityPub::Activity::Follow do
         end
       end
 
+      context 'with an unlocked account from friend server' do
+        let!(:friend) { Fabricate(:friend_domain, domain: sender.domain, passive_state: :idle) }
+
+        before do
+          subject.perform
+        end
+
+        it 'creates a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be true
+          expect(sender.active_relationships.find_by(target_account: recipient).uri).to eq 'foo'
+        end
+
+        it 'does not change friend server passive status' do
+          expect(friend.they_are_idle?).to be true
+        end
+      end
+
       context 'when silenced account following an unlocked account' do
         before do
           sender.touch(:silenced_at)
@@ -81,6 +100,176 @@ RSpec.describe ActivityPub::Activity::Follow do
           expect(sender.requested?(recipient)).to be true
           expect(sender.follow_requests.find_by(target_account: recipient).uri).to eq 'foo'
         end
+
+        it 'does not create pending request' do
+          expect(sender.pending_follow_requests.find_by(target_account: recipient)).to be_nil
+        end
+      end
+
+      context 'when unlocked account but locked from bot' do
+        let(:actor_type) { 'Service' }
+
+        before do
+          recipient.user.settings['lock_follow_from_bot'] = true
+          recipient.user.save!
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+        end
+
+        it 'creates a follow request' do
+          expect(sender.requested?(recipient)).to be true
+          expect(sender.follow_requests.find_by(target_account: recipient).uri).to eq 'foo'
+        end
+      end
+
+      context 'when unlocked misskey proxy account but locked from bot' do
+        let(:display_name) { 'i am proxy.' }
+
+        before do
+          Fabricate(:instance_info, domain: 'example.com', software: 'misskey')
+          recipient.user.settings['lock_follow_from_bot'] = true
+          recipient.user.save!
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+        end
+
+        it 'creates a follow request' do
+          expect(sender.requested?(recipient)).to be true
+          expect(sender.follow_requests.find_by(target_account: recipient).uri).to eq 'foo'
+        end
+      end
+
+      context 'when unlocked mastodon proxy account but locked from bot' do
+        let(:display_name) { 'i am proxy.' }
+
+        before do
+          Fabricate(:instance_info, domain: 'example.com', software: 'mastodon')
+          recipient.user.settings['lock_follow_from_bot'] = true
+          recipient.user.save!
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be true
+        end
+      end
+
+      context 'when unlocked misskey normal account but locked from bot' do
+        before do
+          Fabricate(:instance_info, domain: 'example.com', software: 'misskey')
+          recipient.user.settings['lock_follow_from_bot'] = true
+          recipient.user.save!
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be true
+        end
+      end
+
+      context 'when remote pending account follows unlocked account' do
+        before do
+          sender.update(suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
+          allow(LocalNotificationWorker).to receive(:perform_async).and_return(nil)
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+        end
+
+        it 'does not notify' do
+          expect(LocalNotificationWorker).to_not have_received(:perform_async)
+        end
+
+        it 'creates a follow request' do
+          expect(sender.requested?(recipient)).to be false
+
+          follow_request = sender.pending_follow_requests.find_by(target_account: recipient)
+          expect(follow_request).to_not be_nil
+          expect(follow_request.uri).to eq 'foo'
+        end
+      end
+
+      context 'when remote pending account follows unlocked account but has already existing request' do
+        before do
+          sender.update(suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
+          Fabricate(:pending_follow_request, account: sender, target_account: recipient, uri: 'old')
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+          expect(sender.requested?(recipient)).to be false
+        end
+
+        it 'changes follow request uri' do
+          follow_request = sender.pending_follow_requests.find_by(target_account: recipient)
+          expect(follow_request).to_not be_nil
+          expect(follow_request.uri).to eq 'foo'
+        end
+      end
+
+      context 'when domain block reject_straight_follow' do
+        before do
+          Fabricate(:domain_block, domain: 'example.com', reject_straight_follow: true)
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+        end
+
+        it 'creates a follow request' do
+          expect(sender.requested?(recipient)).to be true
+          expect(sender.follow_requests.find_by(target_account: recipient).uri).to eq 'foo'
+        end
+      end
+
+      context 'when domain block reject_new_follow' do
+        before do
+          Fabricate(:domain_block, domain: 'example.com', reject_new_follow: true)
+          stub_request(:post, 'https://example.com/inbox').to_return(status: 200, body: '', headers: {})
+          subject.perform
+        end
+
+        it 'does not create a follow from sender to recipient' do
+          expect(sender.following?(recipient)).to be false
+          expect(sender.requested?(recipient)).to be false
+        end
+      end
+
+      context 'when ng rule is existing' do
+        context 'when ng rule is match' do
+          before do
+            Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['follow'])
+            stub_request(:post, 'https://example.com/inbox').to_return(status: 200, body: '', headers: {})
+            subject.perform
+          end
+
+          it 'does not create a reblog by sender of status' do
+            expect(sender.following?(recipient)).to be false
+            expect(sender.requested?(recipient)).to be false
+          end
+        end
+
+        context 'when ng rule is not match' do
+          before do
+            Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['follow'])
+            subject.perform
+          end
+
+          it 'creates a reblog by sender of status' do
+            expect(sender.following?(recipient)).to be true
+            expect(sender.requested?(recipient)).to be false
+          end
+        end
       end
     end
 
@@ -187,4 +376,179 @@ RSpec.describe ActivityPub::Activity::Follow do
       end
     end
   end
+
+  context 'when given a friend server' do
+    subject { described_class.new(json, sender) }
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+    let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', inbox_url: 'https://example.com/inbox', passive_state: :idle) }
+    let!(:owner_user) { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }
+    let!(:patch_user) { Fabricate(:user, role: Fabricate(:user_role, name: 'OhagiOps', permissions: UserRole::FLAGS[:manage_federation])) }
+    let(:inbox_url) { nil }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Follow',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: 'https://www.w3.org/ns/activitystreams#Public',
+        inboxUrl: inbox_url,
+      }.with_indifferent_access
+    end
+
+    it 'marks the friend as pending' do
+      subject.perform
+      expect(friend.reload.they_are_pending?).to be true
+      expect(friend.passive_follow_activity_id).to eq 'foo'
+    end
+
+    context 'when no record' do
+      before do
+        friend.destroy!
+      end
+
+      it 'marks the friend as pending' do
+        subject.perform
+
+        friend = FriendDomain.find_by(domain: 'abc.com')
+        expect(friend).to_not be_nil
+        expect(friend.they_are_pending?).to be true
+        expect(friend.passive_follow_activity_id).to eq 'foo'
+        expect(friend.inbox_url).to eq 'https://abc.com/inbox'
+      end
+    end
+
+    context 'when no record and inbox_url is specified' do
+      let(:inbox_url) { 'https://ohagi.com/inbox' }
+
+      before do
+        friend.destroy!
+      end
+
+      it 'marks the friend as pending' do
+        subject.perform
+
+        friend = FriendDomain.find_by(domain: 'abc.com')
+        expect(friend).to_not be_nil
+        expect(friend.they_are_pending?).to be true
+        expect(friend.passive_follow_activity_id).to eq 'foo'
+        expect(friend.inbox_url).to eq 'https://ohagi.com/inbox'
+      end
+    end
+
+    context 'when my server is pending' do
+      before do
+        friend.update(active_state: :pending)
+      end
+
+      it 'marks me as idle' do
+        subject.perform
+        expect(friend.reload.they_are_pending?).to be true
+        expect(friend.i_am_idle?).to be true
+      end
+    end
+
+    context 'when my server is already accepted' do
+      before do
+        friend.update(active_state: :accepted)
+        stub_request(:post, 'https://example.com/inbox')
+      end
+
+      it 'marks me as idle and the friend as accepted', :sidekiq_inline do
+        subject.perform
+        expect(friend.reload.they_are_accepted?).to be true
+        expect(friend.i_am_idle?).to be true
+        expect(a_request(:post, 'https://example.com/inbox').with(body: hash_including({
+          id: 'foo#accepts/friends',
+          type: 'Accept',
+          object: 'foo',
+        }))).to have_been_made.once
+      end
+    end
+
+    context 'with sending email' do
+      around do |example|
+        queue_adapter = ActiveJob::Base.queue_adapter
+        ActiveJob::Base.queue_adapter = :test
+
+        example.run
+
+        ActiveJob::Base.queue_adapter = queue_adapter
+      end
+
+      it 'perform' do
+        expect { subject.perform }.to have_enqueued_mail(AdminMailer, :new_pending_friend_server)
+          .with(hash_including(params: { recipient: owner_user.account })).once
+          .and(have_enqueued_mail(AdminMailer, :new_pending_friend_server).with(hash_including(params: { recipient: patch_user.account })).once)
+          .and(have_enqueued_mail.at_most(2))
+      end
+    end
+
+    context 'when after rejected' do
+      before do
+        friend.update(passive_state: :rejected)
+      end
+
+      it 'marks the friend as pending' do
+        subject.perform
+        expect(friend.reload.they_are_pending?).to be true
+        expect(friend.passive_follow_activity_id).to eq 'foo'
+      end
+    end
+
+    context 'when unlocked on admin settings' do
+      before do
+        Form::AdminSettings.new(unlocked_friend: '1').save
+        stub_request(:post, 'https://example.com/inbox')
+      end
+
+      it 'marks the friend as accepted', :sidekiq_inline do
+        subject.perform
+
+        friend = FriendDomain.find_by(domain: 'abc.com')
+        expect(friend).to_not be_nil
+        expect(friend.they_are_accepted?).to be true
+        expect(a_request(:post, 'https://example.com/inbox').with(body: hash_including({
+          id: 'foo#accepts/friends',
+          type: 'Accept',
+          object: 'foo',
+        }))).to have_been_made.once
+      end
+    end
+
+    context 'when already accepted' do
+      before do
+        friend.update(passive_state: :accepted)
+        stub_request(:post, 'https://example.com/inbox')
+      end
+
+      it 'marks the friend as accepted', :sidekiq_inline do
+        subject.perform
+
+        friend = FriendDomain.find_by(domain: 'abc.com')
+        expect(friend).to_not be_nil
+        expect(friend.they_are_accepted?).to be true
+        expect(a_request(:post, 'https://example.com/inbox').with(body: hash_including({
+          id: 'foo#accepts/friends',
+          type: 'Accept',
+          object: 'foo',
+        }))).to have_been_made.once
+      end
+    end
+
+    context 'when domain blocked' do
+      before do
+        friend.destroy!
+      end
+
+      it 'marks the friend rejected' do
+        Fabricate(:domain_block, domain: 'abc.com', reject_friend: true)
+        subject.perform
+
+        friend = FriendDomain.find_by(domain: 'abc.com')
+        expect(friend).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/like_spec.rb b/spec/lib/activitypub/activity/like_spec.rb
index 640d61ab36..f255bc955e 100644
--- a/spec/lib/activitypub/activity/like_spec.rb
+++ b/spec/lib/activitypub/activity/like_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Like do
-  let(:sender)    { Fabricate(:account) }
+  let(:sender)    { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/') }
   let(:recipient) { Fabricate(:account) }
   let(:status)    { Fabricate(:status, account: recipient) }
 
@@ -16,6 +16,28 @@ RSpec.describe ActivityPub::Activity::Like do
       object: ActivityPub::TagManager.instance.uri_for(status),
     }.with_indifferent_access
   end
+  let(:original_emoji) do
+    {
+      id: 'https://example.com/aaa',
+      type: 'Emoji',
+      icon: {
+        url: 'http://example.com/emoji.png',
+      },
+      name: 'tinking',
+      license: 'This is ohagi',
+    }
+  end
+  let(:original_invalid_emoji) do
+    {
+      id: 'https://example.com/invalid',
+      type: 'Emoji',
+      icon: {
+        url: 'http://example.com/emoji.png',
+      },
+      name: 'other',
+      license: 'This is other ohagi',
+    }
+  end
 
   describe '#perform' do
     subject { described_class.new(json, sender) }
@@ -27,5 +49,624 @@ RSpec.describe ActivityPub::Activity::Like do
     it 'creates a favourite from sender to status' do
       expect(sender.favourited?(status)).to be true
     end
+
+    it 'creates a favourite and set uri' do
+      expect(status.favourites.first.uri).to eq 'foo'
+    end
+  end
+
+  context 'when ng rule is existing' do
+    subject { described_class.new(json, sender) }
+
+    context 'when ng rule is match' do
+      before do
+        Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['favourite'])
+        subject.perform
+      end
+
+      it 'does not create a reblog by sender of status' do
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when ng rule is not match' do
+      before do
+        Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['favourite'])
+        subject.perform
+      end
+
+      it 'creates a reblog by sender of status' do
+        expect(sender.favourited?(status)).to be true
+      end
+    end
+  end
+
+  describe '#perform when receive emoji reaction' do
+    subject do
+      described_class.new(json, sender).perform
+      EmojiReaction.where(status: status)
+    end
+
+    before do
+      stub_request(:get, 'http://example.com/emoji.png').to_return(body: attachment_fixture('emojo.png'))
+      stub_request(:get, 'http://foo.bar/emoji2.png').to_return(body: attachment_fixture('emojo.png'))
+      stub_request(:get, 'https://example.com/aaa').to_return(status: 200, body: Oj.dump(original_emoji), headers: { 'Content-Type': 'application/activity+json' })
+      stub_request(:get, 'https://example.com/invalid').to_return(status: 200, body: Oj.dump(original_invalid_emoji), headers: { 'Content-Type': 'application/activity+json' })
+    end
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Like',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: ActivityPub::TagManager.instance.uri_for(status),
+        content: content,
+        tag: tag,
+      }.with_indifferent_access
+    end
+    let(:content) { nil }
+    let(:tag) { nil }
+
+    context 'with unicode emoji' do
+      let(:content) { '😀' }
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq '😀'
+        expect(subject.first.account).to eq sender
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+          license: 'Everyone but Ohagi',
+        }
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq 'tinking'
+        expect(subject.first.account).to eq sender
+        expect(subject.first.custom_emoji).to_not be_nil
+        expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+        expect(subject.first.custom_emoji.domain).to eq 'example.com'
+        expect(sender.favourited?(status)).to be false
+      end
+
+      it 'custom emoji license is saved' do
+        expect(subject.first.custom_emoji.license).to eq 'Everyone but Ohagi'
+      end
+    end
+
+    context 'with custom emoji but that is existing on local server' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+          license: 'Everyone but Ohagi',
+        }
+      end
+
+      before do
+        Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', image_remote_url: 'http://example.com/emoji.png', shortcode: 'tinking', license: 'Everyone but Ohagi')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq 'tinking'
+        expect(subject.first.account).to eq sender
+        expect(subject.first.custom_emoji).to_not be_nil
+        expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+        expect(subject.first.custom_emoji.domain).to eq 'example.com'
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji from non-original server account' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+        }
+      end
+
+      before do
+        sender.update(domain: 'ohagi.com')
+        Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', shortcode: 'tinking')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq 'tinking'
+        expect(subject.first.account).to eq sender
+        expect(subject.first.custom_emoji).to_not be_nil
+        expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+        expect(subject.first.custom_emoji.domain).to eq 'example.com'
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji and update license from non-original server account' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+          license: 'Old license',
+        }
+      end
+
+      before do
+        sender.update(domain: 'ohagi.com')
+        Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', shortcode: 'tinking')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.custom_emoji.license).to eq 'This is ohagi'
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji but icon url is not valid' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://foo.bar/emoji.png',
+          },
+          name: 'tinking',
+          license: 'Good for using darwin',
+        }
+      end
+
+      before do
+        sender.update(domain: 'ohagi.com')
+        Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', shortcode: 'tinking', image_remote_url: 'http://example.com/emoji.png')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.custom_emoji.reload.license).to eq 'This is ohagi'
+        expect(subject.first.custom_emoji.image_remote_url).to eq 'http://example.com/emoji.png'
+      end
+    end
+
+    context 'with custom emoji but uri is not valid' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/invalid',
+          type: 'Emoji',
+          icon: {
+            url: 'http://foo.bar/emoji2.png',
+          },
+          name: 'tinking',
+          license: 'Good for using darwin',
+        }
+      end
+
+      before do
+        sender.update(domain: 'ohagi.com')
+        Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', shortcode: 'tinking', image_remote_url: 'http://example.com/emoji.png')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'with custom emoji but invalid id' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+        }
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq 'tinking'
+        expect(subject.first.account).to eq sender
+        expect(subject.first.custom_emoji).to_not be_nil
+        expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+        expect(subject.first.custom_emoji.domain).to eq 'example.com'
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji but local domain' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://cb6e6126.ngrok.io/aaa',
+          type: 'Emoji',
+          domain: Rails.configuration.x.local_domain,
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+          license: 'Ohagi but everyone',
+        }
+      end
+
+      before do
+        Fabricate(:custom_emoji, domain: nil, shortcode: 'tinking', license: 'Everyone but Ohagi')
+      end
+
+      it 'create emoji reaction' do # rubocop:disable RSpec/MultipleExpectations
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq 'tinking'
+        expect(subject.first.account).to eq sender
+        expect(subject.first.custom_emoji).to_not be_nil
+        expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+        expect(subject.first.custom_emoji.domain).to be_nil
+        expect(subject.first.custom_emoji.license).to eq 'Everyone but Ohagi'
+        expect(sender.favourited?(status)).to be false
+      end
+
+      it 'not change license' do
+        expect(subject.first.custom_emoji.reload.license).to eq 'Everyone but Ohagi'
+        expect(subject.first.custom_emoji.reload.uri).to be_nil
+      end
+    end
+
+    context 'with unicode emoji and reject_media enabled' do
+      let(:content) { '😀' }
+
+      before do
+        Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_media: true)
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq '😀'
+        expect(subject.first.account).to eq sender
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'with custom emoji and reject_media enabled' do
+      let(:content) { ':tinking:' }
+      let(:tag) do
+        {
+          id: 'https://example.com/aaa',
+          type: 'Emoji',
+          icon: {
+            url: 'http://example.com/emoji.png',
+          },
+          name: 'tinking',
+        }
+      end
+
+      before do
+        Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_media: true)
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when emoji reaction is disabled' do
+      let(:content) { '😀' }
+
+      before do
+        Form::AdminSettings.new(enable_emoji_reaction: false).save
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+        expect(sender.favourited?(status)).to be true
+      end
+    end
+
+    context 'when sender is silenced' do
+      let(:content) { '😀' }
+
+      before do
+        sender.silence!
+      end
+
+      it 'does not create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'when sender is silenced but following recipient' do
+      let(:content) { '😀' }
+
+      before do
+        recipient.follow!(sender)
+        sender.silence!
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq '😀'
+        expect(subject.first.account).to eq sender
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when sender is silenced but reacted to remote account' do
+      let(:content) { '😀' }
+      let(:recipient) { Fabricate(:account, domain: 'kirakira.com', uri: 'https://kirakira.com/actor') }
+
+      before do
+        sender.silence!
+      end
+
+      it 'does not create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'when emoji reaction between other servers is disabled' do
+      let(:recipient) { Fabricate(:account, domain: 'narrow.com', uri: 'https://narrow.com/') }
+      let(:content) { '😀' }
+
+      before do
+        Form::AdminSettings.new(receive_other_servers_emoji_reaction: false).save
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when emoji reaction between other servers is disabled but that status is local' do
+      let(:content) { '😀' }
+
+      before do
+        Form::AdminSettings.new(receive_other_servers_emoji_reaction: false).save
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+        expect(subject.first.name).to eq '😀'
+        expect(subject.first.account).to eq sender
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when receiver is blocking sender' do
+      let(:content) { '😀' }
+
+      before do
+        recipient.block!(sender)
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'when receiver is blocking emoji reactions' do
+      let(:content) { '😀' }
+
+      before do
+        recipient.user.settings['emoji_reaction_policy'] = 'block'
+        recipient.user.save!
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'when receiver is domain-blocking emoji reactions' do
+      let(:content) { '😀' }
+
+      before do
+        recipient.domain_blocks.create!(domain: 'example.com')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 0
+      end
+    end
+
+    context 'when receiver is not domain-blocking emoji reactions' do
+      let(:content) { '😀' }
+
+      before do
+        recipient.domain_blocks.create!(domain: 'other-example.com')
+      end
+
+      it 'create emoji reaction' do
+        expect(subject.count).to eq 1
+      end
+    end
+
+    context 'when my server is silencing sender server' do
+      let(:block_domain) { 'example.com' }
+      let(:follow) { false }
+
+      before do
+        Fabricate(:domain_block, domain: block_domain, severity: :silence)
+        recipient.follow!(sender) if follow
+      end
+
+      context 'with unicode emoji' do
+        let(:content) { '😀' }
+
+        it 'does not create emoji reaction' do
+          expect(subject.count).to eq 0
+        end
+
+        context 'when following' do
+          let(:follow) { true }
+
+          it 'create emoji reaction' do
+            expect(subject.count).to eq 1
+            expect(subject.first.name).to eq '😀'
+            expect(subject.first.account).to eq sender
+            expect(sender.favourited?(status)).to be false
+          end
+        end
+
+        context 'when recipient is remote user' do
+          let(:recipient) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor') }
+
+          it 'does not create emoji reaction' do
+            expect(subject.count).to eq 0
+          end
+        end
+      end
+
+      context 'with custom emoji' do
+        let(:content) { ':tinking:' }
+        let(:tag) do
+          {
+            id: 'https://example.com/aaa',
+            type: 'Emoji',
+            icon: {
+              url: 'http://example.com/emoji.png',
+            },
+            name: 'tinking',
+            license: 'Everyone but Ohagi',
+          }
+        end
+
+        it 'does not create emoji reaction' do
+          expect(subject.count).to eq 0
+        end
+
+        context 'when following' do
+          let(:follow) { true }
+
+          it 'create emoji reaction' do
+            expect(subject.count).to eq 1
+            expect(subject.first.name).to eq 'tinking'
+            expect(subject.first.account).to eq sender
+            expect(subject.first.custom_emoji).to_not be_nil
+            expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+            expect(subject.first.custom_emoji.domain).to eq 'example.com'
+            expect(sender.favourited?(status)).to be false
+          end
+        end
+      end
+
+      context 'with custom emoji from non-original server account' do
+        let(:content) { ':tinking:' }
+        let(:tag) do
+          {
+            id: 'https://example.com/aaa',
+            type: 'Emoji',
+            icon: {
+              url: 'http://example.com/emoji.png',
+            },
+            name: 'tinking',
+          }
+        end
+
+        before do
+          sender.update(domain: 'ohagi.com')
+          Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/aaa', shortcode: 'tinking')
+        end
+
+        it 'does not create emoji reaction' do
+          expect(subject.count).to eq 0
+        end
+
+        context 'when following' do
+          let(:follow) { true }
+
+          it 'create emoji reaction' do
+            expect(subject.count).to eq 1
+            expect(subject.first.name).to eq 'tinking'
+            expect(subject.first.account).to eq sender
+            expect(subject.first.custom_emoji).to_not be_nil
+            expect(subject.first.custom_emoji.shortcode).to eq 'tinking'
+            expect(subject.first.custom_emoji.domain).to eq 'example.com'
+            expect(sender.favourited?(status)).to be false
+          end
+        end
+      end
+    end
+
+    context 'when ng rule is existing' do
+      let(:content) { '😀' }
+
+      context 'when ng rule is match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'example.com', reaction_type: ['emoji_reaction'])
+        end
+
+        it 'does not create a reblog by sender of status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'when ng rule is not match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'foo.bar', reaction_type: ['emoji_reaction'])
+        end
+
+        it 'creates a reblog by sender of status' do
+          expect(subject.count).to eq 1
+        end
+      end
+    end
+  end
+
+  describe '#perform when rejecting favourite domain block' do
+    subject { described_class.new(json, sender) }
+
+    before do
+      Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_favourite: true)
+      subject.perform
+    end
+
+    it 'does not create a favourite from sender to status' do
+      expect(sender.favourited?(status)).to be false
+    end
+  end
+
+  describe '#perform when normal domain_block' do
+    subject { described_class.new(json, sender) }
+
+    before do
+      Fabricate(:domain_block, domain: 'example.com', severity: :suspend)
+      subject.perform
+    end
+
+    it 'does not create a favourite from sender to status' do
+      expect(sender.favourited?(status)).to be false
+    end
   end
 end
diff --git a/spec/lib/activitypub/activity/reject_spec.rb b/spec/lib/activitypub/activity/reject_spec.rb
index 0a4243cd16..9ebbded42e 100644
--- a/spec/lib/activitypub/activity/reject_spec.rb
+++ b/spec/lib/activitypub/activity/reject_spec.rb
@@ -122,6 +122,30 @@ RSpec.describe ActivityPub::Activity::Reject do
     end
   end
 
+  context 'when sender is from friend server' do
+    subject { described_class.new(json, sender) }
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+    let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', active_state: :pending, active_follow_activity_id: 'https://abc-123/456') }
+
+    before do
+      Fabricate(:follow_request, account: recipient, target_account: sender)
+      subject.perform
+    end
+
+    it 'does not create a follow relationship' do
+      expect(recipient.following?(sender)).to be false
+    end
+
+    it 'removes the follow request' do
+      expect(recipient.requested?(sender)).to be false
+    end
+
+    it 'friend server is not changed' do
+      expect(friend.reload.i_am_pending?).to be true
+    end
+  end
+
   context 'when given a relay' do
     subject { described_class.new(json, sender) }
 
@@ -147,4 +171,40 @@ RSpec.describe ActivityPub::Activity::Reject do
       expect(relay.reload.rejected?).to be true
     end
   end
+
+  context 'when given a friend' do
+    subject { described_class.new(json, sender) }
+
+    let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+    let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', active_state: :pending, active_follow_activity_id: 'https://abc-123/456') }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Reject',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: 'https://abc-123/456',
+      }.with_indifferent_access
+    end
+
+    it 'marks the friend as rejected' do
+      subject.perform
+      expect(friend.reload.i_am_rejected?).to be true
+    end
+
+    it 'when the friend server is pending' do
+      friend.update(passive_state: :pending)
+      subject.perform
+      expect(friend.reload.they_are_idle?).to be true
+      expect(friend.i_am_rejected?).to be true
+    end
+
+    it 'when the friend server is accepted' do
+      friend.update(passive_state: :accepted)
+      subject.perform
+      expect(friend.reload.they_are_idle?).to be true
+      expect(friend.i_am_rejected?).to be true
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb
index 58e71fc4e8..cd12c5bd0c 100644
--- a/spec/lib/activitypub/activity/undo_spec.rb
+++ b/spec/lib/activitypub/activity/undo_spec.rb
@@ -5,7 +5,8 @@ require 'rails_helper'
 RSpec.describe ActivityPub::Activity::Undo do
   subject { described_class.new(json, sender) }
 
-  let(:sender) { Fabricate(:account, domain: 'example.com') }
+  let(:sender_domain) { 'example.com' }
+  let(:sender) { Fabricate(:account, domain: sender_domain) }
 
   let(:json) do
     {
@@ -145,6 +146,13 @@ RSpec.describe ActivityPub::Activity::Undo do
         expect(sender.following?(recipient)).to be false
       end
 
+      it 'deletes follow from sender to recipient when has friend' do
+        friend = Fabricate(:friend_domain, domain: sender.domain, passive_state: :accepted)
+        subject.perform
+        expect(sender.following?(recipient)).to be false
+        expect(friend.reload.they_are_accepted?).to be true
+      end
+
       context 'with only object uri' do
         let(:object_json) { 'bar' }
 
@@ -153,6 +161,36 @@ RSpec.describe ActivityPub::Activity::Undo do
           expect(sender.following?(recipient)).to be false
         end
       end
+
+      context 'when for a friend' do
+        let(:sender) { Fabricate(:account, domain: 'abc.com', url: 'https://abc.com/#actor') }
+        let!(:friend) { Fabricate(:friend_domain, domain: 'abc.com', passive_state: :accepted, passive_follow_activity_id: 'bar') }
+        let(:object_json) do
+          {
+            id: 'bar',
+            type: 'Follow',
+            actor: ActivityPub::TagManager.instance.uri_for(sender),
+            object: 'https://www.w3.org/ns/activitystreams#Public',
+          }
+        end
+
+        it 'deletes follow from this server to friend' do
+          subject.perform
+          expect(FriendDomain.exists?(domain: 'abc.com')).to be false
+        end
+
+        it 'when my server is pending' do
+          friend.update(active_state: :pending)
+          subject.perform
+          expect(FriendDomain.exists?(domain: 'abc.com')).to be false
+        end
+
+        it 'when my server is accepted' do
+          friend.update(active_state: :accepted)
+          subject.perform
+          expect(FriendDomain.exists?(domain: 'abc.com')).to be false
+        end
+      end
     end
 
     context 'with Like' do
@@ -176,5 +214,83 @@ RSpec.describe ActivityPub::Activity::Undo do
         expect(sender.favourited?(status)).to be false
       end
     end
+
+    context 'with EmojiReact' do
+      let(:status) { Fabricate(:status) }
+
+      let(:content) { '😀' }
+      let(:name) { '😀' }
+      let(:tag) { nil }
+      let(:object_json) do
+        {
+          id: 'bar',
+          type: 'Like',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: ActivityPub::TagManager.instance.uri_for(status),
+          content: content,
+          tag: tag,
+        }
+      end
+      let(:custom_emoji) { nil }
+
+      before do
+        Fabricate(:favourite, account: sender, status: status)
+        Fabricate(:emoji_reaction, account: sender, status: status, name: name, custom_emoji: custom_emoji)
+      end
+
+      it 'delete emoji reaction' do
+        subject.perform
+        expect(sender.emoji_reacted?(status)).to be false
+        expect(sender.favourited?(status)).to be true
+      end
+
+      context 'with custom emoji' do
+        let(:content) { ':tinking:' }
+        let(:name) { 'tinking' }
+        let(:tag) do
+          {
+            id: custom_emoji_uri,
+            type: 'Emoji',
+            icon: {
+              url: 'http://example.com/emoji.png',
+            },
+            name: name,
+          }
+        end
+        let(:custom_emoji_domain) { 'example.com' }
+        let(:custom_emoji_uri) { "https://#{custom_emoji_domain}/aaa" }
+        let(:custom_emoji) { Fabricate(:custom_emoji, uri: custom_emoji_uri, domain: custom_emoji_domain, shortcode: name) }
+
+        it 'delete emoji reaction' do
+          subject.perform
+          expect(sender.emoji_reacted?(status)).to be false
+          expect(sender.favourited?(status)).to be true
+        end
+
+        context 'when third server' do
+          let(:sender_domain) { 'foo.bar' }
+
+          it 'delete emoji reaction' do
+            subject.perform
+            expect(sender.emoji_reacted?(status)).to be false
+            expect(sender.favourited?(status)).to be true
+          end
+        end
+
+        context 'when local' do
+          let(:custom_emoji_domain) { 'cb6e6126.ngrok.io' }
+
+          before do
+            custom_emoji.update(domain: nil, uri: nil)
+          end
+
+          it 'delete emoji reaction' do
+            subject.perform
+            expect(sender.emoji_reacted?(status)).to be false
+            expect(sender.favourited?(status)).to be true
+          end
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/activitypub/activity/update_spec.rb b/spec/lib/activitypub/activity/update_spec.rb
index 87e96d2d1b..7f312e044b 100644
--- a/spec/lib/activitypub/activity/update_spec.rb
+++ b/spec/lib/activitypub/activity/update_spec.rb
@@ -55,6 +55,7 @@ RSpec.describe ActivityPub::Activity::Update do
         stub_request(:get, actor_json[:following]).to_return(status: 404)
         stub_request(:get, actor_json[:featured]).to_return(status: 404)
         stub_request(:get, actor_json[:featuredTags]).to_return(status: 404)
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 404)
 
         subject.perform
       end
@@ -115,5 +116,66 @@ RSpec.describe ActivityPub::Activity::Update do
         expect(status.edited_at).to be_nil
       end
     end
+
+    context 'when the status is not existing' do
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Update',
+          actor: sender.uri,
+          signature: 'foo',
+          object: {
+            type: 'Note',
+            id: 'https://example.com/note',
+            content: 'Ohagi is tsubuan',
+          },
+        }.with_indifferent_access
+      end
+
+      before do
+        stub_request(:post, 'https://example.com/inbox').to_return(status: 200)
+        subject.perform
+      end
+
+      it 'does not create a new status', :sidekiq_inline do
+        status = Status.find_by(uri: 'https://example.com/note')
+        expect(status).to be_nil
+      end
+    end
+
+    context 'when the status is limited post and has conversation' do
+      let(:status) { Fabricate(:status, visibility: :limited, account: sender, uri: 'https://example.com/note', text: 'Ohagi is koshian') }
+      let(:conversation) { Fabricate(:conversation, ancestor_status: status) }
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Update',
+          actor: sender.uri,
+          signature: 'foo',
+          object: {
+            type: 'Note',
+            id: status.uri,
+            content: 'Ohagi is tsubuan',
+          },
+        }.with_indifferent_access
+      end
+
+      before do
+        status.update(conversation: conversation, visibility: :limited)
+        status.mentions << Fabricate(:mention, silent: true, account: Fabricate(:account, protocol: :activitypub, domain: 'example.com', inbox_url: 'https://example.com/actor/inbox', shared_inbox_url: 'https://example.com/inbox'))
+        status.save
+        stub_request(:post, 'https://example.com/inbox').to_return(status: 200)
+        subject.perform
+      end
+
+      it 'forwards to parent status holder', :sidekiq_inline do
+        expect(a_request(:post, 'https://example.com/inbox').with(body: hash_including({
+          type: 'Update',
+          signature: 'foo',
+        }))).to have_been_made.once
+      end
+    end
   end
 end
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index 97268eea6d..1af45673c0 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
 
         allow(ActivityPub::FetchRemoteKeyService).to receive(:new).and_return(service_stub)
 
-        allow(service_stub).to receive(:call).with('http://example.com/alice', id: false) do
+        allow(service_stub).to receive(:call).with('http://example.com/alice') do
           sender.update!(public_key: old_key)
           sender
         end
@@ -64,7 +64,7 @@ RSpec.describe ActivityPub::LinkedDataSignature do
 
       it 'fetches key and returns creator' do
         expect(subject.verify_actor!).to eq sender
-        expect(service_stub).to have_received(:call).with('http://example.com/alice', id: false).once
+        expect(service_stub).to have_received(:call).with('http://example.com/alice').once
       end
     end
 
diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index 55e9b4bb51..0d9c23cb5e 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -27,6 +27,11 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.to(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
     end
 
+    it 'returns followers collection for public_unlisted status' do
+      status = Fabricate(:status, visibility: :public_unlisted)
+      expect(subject.to(status)).to eq [account_followers_url(status.account)]
+    end
+
     it 'returns followers collection for unlisted status' do
       status = Fabricate(:status, visibility: :unlisted)
       expect(subject.to(status)).to eq [account_followers_url(status.account)]
@@ -52,20 +57,44 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.to(status)).to include(subject.followers_uri_for(mentioned))
     end
 
-    it "returns URIs of mentions for direct silenced author's status only if they are followers or requesting to be" do
-      bob    = Fabricate(:account, username: 'bob')
-      alice  = Fabricate(:account, username: 'alice')
-      foo    = Fabricate(:account)
-      author = Fabricate(:account, username: 'author', silenced: true)
-      status = Fabricate(:status, visibility: :direct, account: author)
-      bob.follow!(author)
-      FollowRequest.create!(account: foo, target_account: author)
-      status.mentions.create(account: alice)
-      status.mentions.create(account: bob)
-      status.mentions.create(account: foo)
-      expect(subject.to(status)).to include(subject.uri_for(bob))
-      expect(subject.to(status)).to include(subject.uri_for(foo))
-      expect(subject.to(status)).to_not include(subject.uri_for(alice))
+    context 'with followers and requested followers' do
+      let!(:bob) { Fabricate(:account, username: 'bob') }
+      let!(:alice) { Fabricate(:account, username: 'alice') }
+      let!(:foo) { Fabricate(:account) }
+      let!(:author) { Fabricate(:account, username: 'author', silenced: true) }
+      let!(:status) { Fabricate(:status, visibility: :direct, account: author) }
+
+      before do
+        bob.follow!(author)
+        FollowRequest.create!(account: foo, target_account: author)
+        status.mentions.create(account: alice)
+        status.mentions.create(account: bob)
+        status.mentions.create(account: foo)
+      end
+
+      it "returns URIs of mentions for direct silenced author's status only if they are followers or requesting to be" do
+        expect(subject.to(status))
+          .to include(subject.uri_for(bob))
+          .and include(subject.uri_for(foo))
+          .and not_include(subject.uri_for(alice))
+      end
+    end
+  end
+
+  describe '#to_for_friend' do
+    it 'returns followers collection for public_unlisted status' do
+      status = Fabricate(:status, visibility: :public_unlisted)
+      expect(subject.to_for_friend(status)).to eq [account_followers_url(status.account), 'kmyblue:LocalPublic']
+    end
+
+    it 'returns followers collection for unlisted status' do
+      status = Fabricate(:status, visibility: :unlisted)
+      expect(subject.to_for_friend(status)).to eq [account_followers_url(status.account)]
+    end
+
+    it 'returns followers collection for private status' do
+      status = Fabricate(:status, visibility: :private)
+      expect(subject.to_for_friend(status)).to eq [account_followers_url(status.account)]
     end
   end
 
@@ -75,6 +104,11 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.cc(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns public collection for public_unlisted status' do
+      status = Fabricate(:status, visibility: :public_unlisted)
+      expect(subject.cc(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
+    end
+
     it 'returns public collection for unlisted status' do
       status = Fabricate(:status, visibility: :unlisted)
       expect(subject.cc(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
@@ -97,20 +131,27 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.cc(status)).to include(subject.uri_for(mentioned))
     end
 
-    it "returns URIs of mentions for silenced author's non-direct status only if they are followers or requesting to be" do
-      bob    = Fabricate(:account, username: 'bob')
-      alice  = Fabricate(:account, username: 'alice')
-      foo    = Fabricate(:account)
-      author = Fabricate(:account, username: 'author', silenced: true)
-      status = Fabricate(:status, visibility: :public, account: author)
-      bob.follow!(author)
-      FollowRequest.create!(account: foo, target_account: author)
-      status.mentions.create(account: alice)
-      status.mentions.create(account: bob)
-      status.mentions.create(account: foo)
-      expect(subject.cc(status)).to include(subject.uri_for(bob))
-      expect(subject.cc(status)).to include(subject.uri_for(foo))
-      expect(subject.cc(status)).to_not include(subject.uri_for(alice))
+    context 'with followers and requested followers' do
+      let!(:bob) { Fabricate(:account, username: 'bob') }
+      let!(:alice) { Fabricate(:account, username: 'alice') }
+      let!(:foo) { Fabricate(:account) }
+      let!(:author) { Fabricate(:account, username: 'author', silenced: true) }
+      let!(:status) { Fabricate(:status, visibility: :public, account: author) }
+
+      before do
+        bob.follow!(author)
+        FollowRequest.create!(account: foo, target_account: author)
+        status.mentions.create(account: alice)
+        status.mentions.create(account: bob)
+        status.mentions.create(account: foo)
+      end
+
+      it "returns URIs of mentions for silenced author's non-direct status only if they are followers or requesting to be" do
+        expect(subject.cc(status))
+          .to include(subject.uri_for(bob))
+          .and include(subject.uri_for(foo))
+          .and not_include(subject.uri_for(alice))
+      end
     end
 
     it 'returns poster of reblogged post, if reblog' do
@@ -122,6 +163,79 @@ RSpec.describe ActivityPub::TagManager do
     end
   end
 
+  describe '#cc_for_misskey' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      user.settings.update(reject_unlisted_subscription: true, reject_public_unlisted_subscription: true)
+      user.save
+    end
+
+    it 'returns public collection for public status' do
+      status = Fabricate(:status, account: user.account, visibility: :public)
+      expect(subject.cc_for_misskey(status)).to eq [account_followers_url(status.account)]
+    end
+
+    it 'returns empty array for public_unlisted status' do
+      status = Fabricate(:status, account: user.account, visibility: :public_unlisted, searchability: :private)
+      expect(subject.cc_for_misskey(status)).to eq []
+    end
+
+    it 'returns empty array for unlisted status' do
+      status = Fabricate(:status, account: user.account, visibility: :unlisted, searchability: :private)
+      expect(subject.cc_for_misskey(status)).to eq []
+    end
+
+    it 'returns public collection for unlisted status but public searchability' do
+      status = Fabricate(:status, account: user.account, visibility: :unlisted, searchability: :public)
+      expect(subject.cc_for_misskey(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
+    end
+  end
+
+  describe '#searchable_by' do
+    it 'returns public collection for public status' do
+      status = Fabricate(:status, searchability: :public)
+      expect(subject.searchable_by(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
+    end
+
+    it 'returns followers collection for public_unlisted status' do
+      status = Fabricate(:status, searchability: :public_unlisted)
+      expect(subject.searchable_by(status)).to eq [account_followers_url(status.account)]
+    end
+
+    it 'returns followers collection for private status' do
+      status = Fabricate(:status, searchability: :private)
+      expect(subject.searchable_by(status)).to eq [account_followers_url(status.account)]
+    end
+
+    it 'returns empty array for direct status' do
+      status    = Fabricate(:status, searchability: :direct)
+      expect(subject.searchable_by(status)).to eq []
+    end
+
+    it 'returns as:Limited array for limited status' do
+      status    = Fabricate(:status, searchability: :limited)
+      expect(subject.searchable_by(status)).to eq ['as:Limited', 'kmyblue:Limited']
+    end
+  end
+
+  describe '#searchable_by_for_friend' do
+    it 'returns public collection for public status' do
+      status = Fabricate(:status, account: Fabricate(:account, searchability: :public), searchability: :public)
+      expect(subject.searchable_by_for_friend(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
+    end
+
+    it 'returns public collection for public_unlisted status' do
+      status = Fabricate(:status, account: Fabricate(:account, searchability: :public), searchability: :public_unlisted)
+      expect(subject.searchable_by_for_friend(status)).to eq [account_followers_url(status.account), 'kmyblue:LocalPublic']
+    end
+
+    it 'returns followers collection for private status' do
+      status = Fabricate(:status, account: Fabricate(:account, searchability: :public), searchability: :private)
+      expect(subject.searchable_by_for_friend(status)).to eq [account_followers_url(status.account)]
+    end
+  end
+
   describe '#local_uri?' do
     it 'returns false for non-local URI' do
       expect(subject.local_uri?('http://example.com/123')).to be false
diff --git a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
index 106717f97b..2b14e6956c 100644
--- a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
@@ -3,16 +3,32 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::InstanceAccountsDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(domain: domain) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :follow, target_account: alice
+      Fabricate :follow, target_account: bob
+      Fabricate :status, account: alice
+      Fabricate :status, account: bob
+    end
+
+    it 'returns instances with follow counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: alice.username, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
index f9f6430ca0..e4e9fbe2b7 100644
--- a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
@@ -3,16 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::InstanceLanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(domain: domain) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :status, account: alice, language: 'en'
+      Fabricate :status, account: bob, language: 'es'
+    end
+
+    it 'returns locales with status counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
index 1722c4c616..9d80970693 100644
--- a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::LanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,21 @@ describe Admin::Metrics::Dimension::LanguagesDimension do
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:user, locale: 'en', current_sign_in_at: 1.day.ago) }
+    let(:bob) { Fabricate(:user, locale: 'en', current_sign_in_at: 30.days.ago) }
+
+    before do
+      alice.update(current_sign_in_at: 1.day.ago)
+      bob.update(current_sign_in_at: 30.days.ago)
+    end
+
+    it 'returns locales with sign in counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
index 7e2bb9ac0b..5661441d5d 100644
--- a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::ServersDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,24 @@ describe Admin::Metrics::Dimension::ServersDimension do
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:domain) { 'host.example' }
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+
+    before do
+      Fabricate :status, account: alice, created_at: 1.day.ago
+      Fabricate :status, account: alice, created_at: 30.days.ago
+      Fabricate :status, account: bob, created_at: 1.day.ago
+    end
+
+    it 'returns domains with status counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: domain, value: '1'),
+          include(key: Rails.configuration.x.local_domain, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
index ee14917330..5d31121ab3 100644
--- a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,12 @@ describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    it 'reports on the running software' do
+      expect(subject.data.map(&:symbolize_keys))
+        .to include(
+          include(key: 'mastodon', value: Mastodon::Version.to_s),
+          include(key: 'ruby', value: include(RUBY_VERSION))
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
index d6b581a9bb..5fa5aa8af5 100644
--- a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SourcesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,21 @@ describe Admin::Metrics::Dimension::SourcesDimension do
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:app) { Fabricate(:application) }
+    let(:alice) { Fabricate(:user) }
+    let(:bob) { Fabricate(:user) }
+
+    before do
+      alice.update(created_by_application: app)
+    end
+
+    it 'returns OAuth applications with user counts' do
+      expect(subject.data.size)
+        .to eq(1)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: app.name, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
index 65d04cfedd..96ff9c66dc 100644
--- a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::SpaceUsageDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
@@ -11,8 +11,13 @@ describe Admin::Metrics::Dimension::SpaceUsageDimension do
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    it 'reports on used storage space' do
+      expect(subject.data.map(&:symbolize_keys))
+        .to include(
+          include(key: 'media', value: /\d/),
+          include(key: 'postgresql', value: /\d/),
+          include(key: 'redis', value: /\d/)
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
index 721d24fa18..c1dfd0eaf4 100644
--- a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
@@ -3,16 +3,36 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::TagLanguagesDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:account) }
+    let(:bob) { Fabricate(:account) }
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      alice_status_recent = Fabricate :status, account: alice, created_at: 1.day.ago, language: 'en'
+      alice_status_older = Fabricate :status, account: alice, created_at: 30.days.ago, language: 'en'
+      bob_status_recent = Fabricate :status, account: bob, created_at: 1.day.ago, language: 'es'
+
+      alice_status_older.tags << tag
+      alice_status_recent.tags << tag
+      bob_status_recent.tags << tag
+    end
+
+    it 'returns languages with tag usage counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: 'en', value: '1'),
+          include(key: 'es', value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
index 3054716816..025cf1b7ec 100644
--- a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
@@ -3,16 +3,37 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Dimension::TagServersDimension do
-  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+  subject { described_class.new(start_at, end_at, limit, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
-  let(:params) { ActionController::Parameters.new }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { dimension.data }.to_not raise_error
+    let(:alice) { Fabricate(:account, domain: domain) }
+    let(:bob) { Fabricate(:account) }
+    let(:domain) { 'host.example' }
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      alice_status_recent = Fabricate :status, account: alice, created_at: 1.day.ago
+      alice_status_older = Fabricate :status, account: alice, created_at: 30.days.ago
+      bob_status_recent = Fabricate :status, account: bob, created_at: 1.day.ago
+
+      alice_status_older.tags << tag
+      alice_status_recent.tags << tag
+      bob_status_recent.tags << tag
+    end
+
+    it 'returns servers with tag usage counts' do
+      expect(subject.data.size)
+        .to eq(2)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(key: domain, value: '1'),
+          include(key: Rails.configuration.x.local_domain, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension_spec.rb b/spec/lib/admin/metrics/dimension_spec.rb
new file mode 100644
index 0000000000..109250b72b
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension do
+  describe '.retrieve' do
+    subject { described_class.retrieve(reports, start_at, end_at, 5, params) }
+
+    let(:start_at) { 2.days.ago }
+    let(:end_at) { Time.now.utc }
+    let(:params) { ActionController::Parameters.new({ instance_accounts: [123], instance_languages: ['en'] }) }
+    let(:reports) { [:instance_accounts, :instance_languages] }
+
+    it 'returns instances of provided classes' do
+      expect(subject)
+        .to contain_exactly(
+          be_a(Admin::Metrics::Dimension::InstanceAccountsDimension),
+          be_a(Admin::Metrics::Dimension::InstanceLanguagesDimension)
+        )
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
index 55164ed88a..38ee14075b 100644
--- a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
@@ -3,15 +3,38 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::ActiveUsersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with activity tracking records' do
+      before do
+        3.times do
+          travel_to(2.days.ago) { record_login_activity }
+        end
+        2.times do
+          travel_to(1.day.ago) { record_login_activity }
+        end
+        travel_to(0.days.ago) { record_login_activity }
+      end
+
+      it 'returns correct activity tracker counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def record_login_activity
+        ActivityTracker.record('activity:logins', Fabricate(:user).id)
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
index 8e414963f3..0d2ad31c39 100644
--- a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceAccountsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -20,12 +20,13 @@ describe Admin::Metrics::Measure::InstanceAccountsMeasure do
     Fabricate(:account, domain: "foo.#{domain}", created_at: 1.year.ago)
     Fabricate(:account, domain: "foo.#{domain}")
     Fabricate(:account, domain: "bar.#{domain}")
+    Fabricate(:account, domain: 'other-host.example')
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 3
+        expect(subject.total).to eq 3
       end
     end
 
@@ -33,14 +34,21 @@ describe Admin::Metrics::Measure::InstanceAccountsMeasure do
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 6
+        expect(subject.total).to eq 6
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_accounts counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '1')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
index c627e6cede..27bf30d17d 100644
--- a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceFollowersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -22,12 +22,14 @@ describe Admin::Metrics::Measure::InstanceFollowersMeasure do
     Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
     Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
     Fabricate(:account, domain: "bar.#{domain}")
+
+    Fabricate(:account, domain: 'other.example').follow!(local_account)
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -35,14 +37,21 @@ describe Admin::Metrics::Measure::InstanceFollowersMeasure do
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 4
+        expect(subject.total).to eq 4
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_followers counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
index 42f33dfc35..9961ea56c4 100644
--- a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceFollowsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -24,10 +24,10 @@ describe Admin::Metrics::Measure::InstanceFollowsMeasure do
     Fabricate(:account, domain: "bar.#{domain}")
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -35,14 +35,21 @@ describe Admin::Metrics::Measure::InstanceFollowsMeasure do
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 4
+        expect(subject.total).to eq 4
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_followers counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
index c103307f97..3634450930 100644
--- a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -20,11 +20,11 @@ describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
     remote_account_on_subdomain.media_attachments.create!(file: attachment_fixture('attachment.jpg'))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
         expected_total = remote_account.media_attachments.sum(:file_file_size) + remote_account.media_attachments.sum(:thumbnail_file_size)
-        expect(measure.total).to eq expected_total
+        expect(subject.total).to eq expected_total
       end
     end
 
@@ -36,14 +36,25 @@ describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
           account.media_attachments.sum(:file_file_size) + account.media_attachments.sum(:thumbnail_file_size)
         end
 
-        expect(measure.total).to eq expected_total
+        expect(subject.total).to eq expected_total
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct media_attachments counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: expected_domain_only_total.to_s)
+        )
+    end
+
+    def expected_domain_only_total
+      remote_account.media_attachments.sum(:file_file_size) + remote_account.media_attachments.sum(:thumbnail_file_size)
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
index 62fcf84ac1..ca64049d92 100644
--- a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -21,10 +21,10 @@ describe Admin::Metrics::Measure::InstanceReportsMeasure do
     Fabricate(:report, target_account: Fabricate(:account, domain: "bar.#{domain}"))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -32,14 +32,21 @@ describe Admin::Metrics::Measure::InstanceReportsMeasure do
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 5
+        expect(subject.total).to eq 5
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_reports counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
index df4cfe207b..ac28658ea0 100644
--- a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InstanceStatusesMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:domain) { 'example.com' }
 
@@ -21,10 +21,10 @@ describe Admin::Metrics::Measure::InstanceStatusesMeasure do
     Fabricate(:status, account: Fabricate(:account, domain: "bar.#{domain}"))
   end
 
-  describe 'total' do
+  describe '#total' do
     context 'without include_subdomains' do
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 2
+        expect(subject.total).to eq 2
       end
     end
 
@@ -32,14 +32,21 @@ describe Admin::Metrics::Measure::InstanceStatusesMeasure do
       let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
 
       it 'returns the expected number of accounts' do
-        expect(measure.total).to eq 5
+        expect(subject.total).to eq 5
       end
     end
   end
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    it 'returns correct instance_statuses counts' do
+      expect(subject.data.size)
+        .to eq(3)
+      expect(subject.data.map(&:symbolize_keys))
+        .to contain_exactly(
+          include(date: 2.days.ago.midnight.to_time, value: '0'),
+          include(date: 1.day.ago.midnight.to_time, value: '0'),
+          include(date: 0.days.ago.midnight.to_time, value: '2')
+        )
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
index e98c830598..ed333380cf 100644
--- a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
@@ -3,15 +3,38 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::InteractionsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with activity tracking records' do
+      before do
+        3.times do
+          travel_to(2.days.ago) { record_interaction_activity }
+        end
+        2.times do
+          travel_to(1.day.ago) { record_interaction_activity }
+        end
+        travel_to(0.days.ago) { record_interaction_activity }
+      end
+
+      it 'returns correct activity tracker counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def record_interaction_activity
+        ActivityTracker.increment('activity:interactions')
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
index fe82f8219b..085acbcede 100644
--- a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::NewUsersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with user records' do
+      before do
+        3.times { Fabricate :user, created_at: 2.days.ago }
+        2.times { Fabricate :user, created_at: 1.day.ago }
+        Fabricate :user, created_at: 0.days.ago
+      end
+
+      it 'returns correct user counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
index deed64ae88..d5ba78527e 100644
--- a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::OpenedReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with report records' do
+      before do
+        3.times { Fabricate :report, created_at: 2.days.ago }
+        2.times { Fabricate :report, created_at: 1.day.ago }
+        Fabricate :report, created_at: 0.days.ago
+      end
+
+      it 'returns correct report counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
index cb98df2dc2..f7b497590d 100644
--- a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
@@ -3,15 +3,30 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::ResolvedReportsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let(:start_at) { 2.days.ago }
   let(:end_at)   { Time.now.utc }
   let(:params) { ActionController::Parameters.new }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with report records' do
+      before do
+        3.times { Fabricate :report, action_taken_at: 2.days.ago }
+        2.times { Fabricate :report, action_taken_at: 1.day.ago }
+        Fabricate :report, action_taken_at: 0.days.ago
+      end
+
+      it 'returns correct report counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
index 938b67afa3..b33ae7bb71 100644
--- a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagAccountsMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,39 @@ describe Admin::Metrics::Measure::TagAccountsMeasure do
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged accounts' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          travel_to(2.days.ago) { add_tag_history(alice) }
+        end
+
+        2.times do
+          travel_to(1.day.ago) do
+            add_tag_history(alice)
+            add_tag_history(bob)
+          end
+        end
+
+        add_tag_history(bob)
+      end
+
+      it 'returns correct tag_accounts counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '1'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def add_tag_history(account)
+        tag.history.add(account.id)
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
index e09a2b04e5..e1e2ced43a 100644
--- a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagServersMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,38 @@ describe Admin::Metrics::Measure::TagServersMeasure do
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged statuses' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          status_alice = Fabricate(:status, account: alice, created_at: 2.days.ago)
+          status_alice.tags << tag
+        end
+
+        2.times do
+          status_alice = Fabricate(:status, account: alice, created_at: 1.day.ago)
+          status_alice.tags << tag
+
+          status_bob = Fabricate(:status, account: bob, created_at: 1.day.ago)
+          status_bob.tags << tag
+        end
+
+        status_bob = Fabricate(:status, account: bob, created_at: 0.days.ago)
+        status_bob.tags << tag
+      end
+
+      it 'returns correct tag counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '1'),
+            include(date: 1.day.ago.midnight.to_time, value: '2'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
index 869e937445..dd66f00de0 100644
--- a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
+++ b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Admin::Metrics::Measure::TagUsesMeasure do
-  subject(:measure) { described_class.new(start_at, end_at, params) }
+  subject { described_class.new(start_at, end_at, params) }
 
   let!(:tag) { Fabricate(:tag) }
 
@@ -12,8 +12,39 @@ describe Admin::Metrics::Measure::TagUsesMeasure do
   let(:params) { ActionController::Parameters.new(id: tag.id) }
 
   describe '#data' do
-    it 'runs data query without error' do
-      expect { measure.data }.to_not raise_error
+    context 'with tagged accounts' do
+      let(:alice) { Fabricate(:account, domain: 'alice.example') }
+      let(:bob) { Fabricate(:account, domain: 'bob.example') }
+
+      before do
+        3.times do
+          travel_to(2.days.ago) { add_tag_history(alice) }
+        end
+
+        2.times do
+          travel_to(1.day.ago) do
+            add_tag_history(alice)
+            add_tag_history(bob)
+          end
+        end
+
+        add_tag_history(bob)
+      end
+
+      it 'returns correct tag_uses counts' do
+        expect(subject.data.size)
+          .to eq(3)
+        expect(subject.data.map(&:symbolize_keys))
+          .to contain_exactly(
+            include(date: 2.days.ago.midnight.to_time, value: '3'),
+            include(date: 1.day.ago.midnight.to_time, value: '4'),
+            include(date: 0.days.ago.midnight.to_time, value: '1')
+          )
+      end
+
+      def add_tag_history(account)
+        tag.history.add(account.id)
+      end
     end
   end
 end
diff --git a/spec/lib/admin/metrics/measure_spec.rb b/spec/lib/admin/metrics/measure_spec.rb
new file mode 100644
index 0000000000..c9809b0f79
--- /dev/null
+++ b/spec/lib/admin/metrics/measure_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure do
+  describe '.retrieve' do
+    subject { described_class.retrieve(reports, start_at, end_at, params) }
+
+    let(:start_at) { 2.days.ago }
+    let(:end_at) { Time.now.utc }
+    let(:params) { ActionController::Parameters.new({ instance_accounts: [123], instance_followers: [123] }) }
+    let(:reports) { [:instance_accounts, :instance_followers] }
+
+    it 'returns instances of provided classes' do
+      expect(subject)
+        .to contain_exactly(
+          be_a(Admin::Metrics::Measure::InstanceAccountsMeasure),
+          be_a(Admin::Metrics::Measure::InstanceFollowersMeasure)
+        )
+    end
+  end
+end
diff --git a/spec/lib/admin/system_check/elasticsearch_check_spec.rb b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
index a885640ce0..8f210579d0 100644
--- a/spec/lib/admin/system_check/elasticsearch_check_spec.rb
+++ b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
@@ -127,7 +127,7 @@ describe Admin::SystemCheck::ElasticsearchCheck do
   end
 
   def stub_elasticsearch_error
-    client = instance_double(Elasticsearch::Transport::Client)
+    client = instance_double(Elasticsearch::Client)
     allow(client).to receive(:info).and_raise(Elasticsearch::Transport::Transport::Error)
     allow(Chewy).to receive(:client).and_return(client)
   end
diff --git a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
index 9bd9daddf6..42a2922355 100644
--- a/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
+++ b/spec/lib/admin/system_check/sidekiq_process_check_spec.rb
@@ -35,11 +35,11 @@ describe Admin::SystemCheck::SidekiqProcessCheck do
 
   describe 'message' do
     it 'sends values to message instance' do
-      allow(Admin::SystemCheck::Message).to receive(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress')
+      allow(Admin::SystemCheck::Message).to receive(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress, perishable')
 
       check.message
 
-      expect(Admin::SystemCheck::Message).to have_received(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress')
+      expect(Admin::SystemCheck::Message).to have_received(:new).with(:sidekiq_process_check, 'default, push, mailers, pull, scheduler, ingress, perishable')
     end
   end
 end
diff --git a/spec/lib/emoji_formatter_spec.rb b/spec/lib/emoji_formatter_spec.rb
index e5accfbb0c..ede75c77b0 100644
--- a/spec/lib/emoji_formatter_spec.rb
+++ b/spec/lib/emoji_formatter_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe EmojiFormatter do
       let(:text) { preformat_text(':coolcat: Beep boop') }
 
       it 'converts the shortcode to an image tag' do
-        expect(subject).to match(/<img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+        expect(subject).to match(/<img rel="emoji" draggable="false" height="16" class="emojione custom-emoji" style="min-width:16px;" alt=":coolcat:"/)
       end
     end
 
@@ -34,7 +34,7 @@ RSpec.describe EmojiFormatter do
       let(:text) { preformat_text('Beep :coolcat: boop') }
 
       it 'converts the shortcode to an image tag' do
-        expect(subject).to match(/Beep <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+        expect(subject).to match(/Beep <img rel="emoji" draggable="false" height="16" class="emojione custom-emoji" style="min-width:16px;" alt=":coolcat:"/)
       end
     end
 
@@ -50,7 +50,7 @@ RSpec.describe EmojiFormatter do
       let(:text) { preformat_text('Beep boop :coolcat:') }
 
       it 'converts the shortcode to an image tag' do
-        expect(subject).to match(/boop <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
+        expect(subject).to match(/boop <img rel="emoji" draggable="false" height="16" class="emojione custom-emoji" style="min-width:16px;" alt=":coolcat:"/)
       end
     end
   end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 618b6167bd..065c420766 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe FeedManager do
   end
 
   it 'tracks at least as many statuses as reblogs', :skip_stub do
-    expect(FeedManager::REBLOG_FALLOFF).to be <= FeedManager::MAX_ITEMS
+    expect(described_class::REBLOG_FALLOFF).to be <= described_class::MAX_ITEMS
   end
 
   describe '#key' do
@@ -27,6 +27,7 @@ RSpec.describe FeedManager do
     let(:bob)   { Fabricate(:account, username: 'bob', domain: 'example.com') }
     let(:jeff)  { Fabricate(:account, username: 'jeff') }
     let(:list) { Fabricate(:list, account: alice) }
+    let(:antenna) { Fabricate(:antenna, account: alice, insert_feeds: true, list: list) }
 
     context 'with home feed' do
       it 'returns false for followee\'s status' do
@@ -190,6 +191,42 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: jeff)
         expect(described_class.instance.filter?(:home, reblog, alice)).to be false
       end
+
+      it 'returns true for post from followee on exclusive antenna' do
+        list.exclusive = true
+        alice.follow!(bob)
+        antenna.accounts << bob
+        allow(Antenna).to receive(:where).and_return(antenna)
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        expect(described_class.instance.filter?(:home, status, alice)).to be true
+      end
+
+      it 'returns true for reblog from followee on exclusive antenna' do
+        list.exclusive = true
+        alice.follow!(jeff)
+        antenna.accounts << jeff
+        allow(Antenna).to receive(:where).and_return(antenna)
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        reblog = Fabricate(:status, reblog: status, account: jeff)
+        expect(described_class.instance.filter?(:home, reblog, alice)).to be true
+      end
+
+      it 'returns false for post from followee on non-exclusive antenna' do
+        list.exclusive = false
+        alice.follow!(bob)
+        antenna.accounts << bob
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        expect(described_class.instance.filter?(:home, status, alice)).to be false
+      end
+
+      it 'returns false for reblog from followee on non-exclusive antenna' do
+        list.exclusive = false
+        alice.follow!(jeff)
+        antenna.accounts << jeff
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        reblog = Fabricate(:status, reblog: status, account: jeff)
+        expect(described_class.instance.filter?(:home, reblog, alice)).to be false
+      end
     end
 
     context 'with mentions feed' do
@@ -225,12 +262,12 @@ RSpec.describe FeedManager do
     it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do
       account = Fabricate(:account)
       status = Fabricate(:status)
-      members = Array.new(FeedManager::MAX_ITEMS) { |count| [count, count] }
+      members = Array.new(described_class::MAX_ITEMS) { |count| [count, count] }
       redis.zadd("feed:home:#{account.id}", members)
 
       described_class.instance.push_to_home(account, status)
 
-      expect(redis.zcard("feed:home:#{account.id}")).to eq FeedManager::MAX_ITEMS
+      expect(redis.zcard("feed:home:#{account.id}")).to eq described_class::MAX_ITEMS
     end
 
     context 'with reblogs' do
@@ -260,7 +297,7 @@ RSpec.describe FeedManager do
         described_class.instance.push_to_home(account, reblogged)
 
         # Fill the feed with intervening statuses
-        FeedManager::REBLOG_FALLOFF.times do
+        described_class::REBLOG_FALLOFF.times do
           described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
@@ -321,7 +358,7 @@ RSpec.describe FeedManager do
         described_class.instance.push_to_home(account, reblogs.first)
 
         # Fill the feed with intervening statuses
-        FeedManager::REBLOG_FALLOFF.times do
+        described_class::REBLOG_FALLOFF.times do
           described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
@@ -467,7 +504,7 @@ RSpec.describe FeedManager do
       status    = Fabricate(:status, reblog: reblogged)
 
       described_class.instance.push_to_home(receiver, reblogged)
-      FeedManager::REBLOG_FALLOFF.times { described_class.instance.push_to_home(receiver, Fabricate(:status)) }
+      described_class::REBLOG_FALLOFF.times { described_class.instance.push_to_home(receiver, Fabricate(:status)) }
       described_class.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index 8c485cef2a..26d9d4e265 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -46,22 +46,13 @@ RSpec.describe LinkDetailsExtractor do
       </html>
     HTML
 
-    describe '#title' do
-      it 'returns the title from title tag' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from meta tag' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from lang attribute' do
-        expect(subject.language).to eq 'en'
-      end
+    it 'extracts the expected values from html metadata' do
+      expect(subject)
+        .to have_attributes(
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          language: eq('en')
+        )
     end
   end
 
@@ -90,40 +81,16 @@ RSpec.describe LinkDetailsExtractor do
     end
 
     shared_examples 'structured data' do
-      describe '#title' do
-        it 'returns the title from structured data' do
-          expect(subject.title).to eq 'Man bites dog'
-        end
-      end
-
-      describe '#description' do
-        it 'returns the description from structured data' do
-          expect(subject.description).to eq "A dog's tale"
-        end
-      end
-
-      describe '#published_at' do
-        it 'returns the publicaton time from structured data' do
-          expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-        end
-      end
-
-      describe '#author_name' do
-        it 'returns the author name from structured data' do
-          expect(subject.author_name).to eq 'Charlie Brown'
-        end
-      end
-
-      describe '#provider_name' do
-        it 'returns the provider name from structured data' do
-          expect(subject.provider_name).to eq 'Pet News'
-        end
-      end
-
-      describe '#language' do
-        it 'returns the language from structured data' do
-          expect(subject.language).to eq 'en'
-        end
+      it 'extracts the expected values from structured data' do
+        expect(subject)
+          .to have_attributes(
+            title: eq('Man bites dog'),
+            description: eq("A dog's tale"),
+            published_at: eq('2022-01-31T19:53:00+00:00'),
+            author_name: eq('Charlie Brown'),
+            provider_name: eq('Pet News'),
+            language: eq('en')
+          )
       end
     end
 
@@ -245,58 +212,19 @@ RSpec.describe LinkDetailsExtractor do
       </html>
     HTML
 
-    describe '#canonical_url' do
-      it 'returns the URL from Open Graph protocol data' do
-        expect(subject.canonical_url).to eq 'https://example.com/dog.html'
-      end
-    end
-
-    describe '#title' do
-      it 'returns the title from Open Graph protocol data' do
-        expect(subject.title).to eq 'Man bites dog'
-      end
-    end
-
-    describe '#description' do
-      it 'returns the description from Open Graph protocol data' do
-        expect(subject.description).to eq "A dog's tale"
-      end
-    end
-
-    describe '#published_at' do
-      it 'returns the publicaton time from Open Graph protocol data' do
-        expect(subject.published_at).to eq '2022-01-31T19:53:00+00:00'
-      end
-    end
-
-    describe '#author_name' do
-      it 'returns the author name from Open Graph protocol data' do
-        expect(subject.author_name).to eq 'Charlie Brown'
-      end
-    end
-
-    describe '#language' do
-      it 'returns the language from Open Graph protocol data' do
-        expect(subject.language).to eq 'en'
-      end
-    end
-
-    describe '#image' do
-      it 'returns the image from Open Graph protocol data' do
-        expect(subject.image).to eq 'https://example.com/snoopy.jpg'
-      end
-    end
-
-    describe '#image:alt' do
-      it 'returns the image description from Open Graph protocol data' do
-        expect(subject.image_alt).to eq 'A good boy'
-      end
-    end
-
-    describe '#provider_name' do
-      it 'returns the provider name from Open Graph protocol data' do
-        expect(subject.provider_name).to eq 'Pet News'
-      end
+    it 'extracts the expected values from open graph data' do
+      expect(subject)
+        .to have_attributes(
+          canonical_url: eq('https://example.com/dog.html'),
+          title: eq('Man bites dog'),
+          description: eq("A dog's tale"),
+          published_at: eq('2022-01-31T19:53:00+00:00'),
+          author_name: eq('Charlie Brown'),
+          language: eq('en'),
+          image: eq('https://example.com/snoopy.jpg'),
+          image_alt: eq('A good boy'),
+          provider_name: eq('Pet News')
+        )
     end
   end
 end
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 64df29ebb3..137f85c6ca 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -65,8 +65,7 @@ describe Mastodon::CLI::Accounts do
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('Failure/Error: email')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, %r{Failure/Error: email})
           end
         end
       end
@@ -127,8 +126,7 @@ describe Mastodon::CLI::Accounts do
 
           it 'exits with an error message indicating the role name was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
       end
@@ -191,8 +189,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating the user was not found' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -214,8 +211,7 @@ describe Mastodon::CLI::Accounts do
 
           it 'exits with an error message indicating the role was not found' do
             expect { subject }
-              .to output_results('Cannot find user role with that name')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'Cannot find user role with that name')
           end
         end
 
@@ -364,8 +360,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('Failure/Error: email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, %r{Failure/Error: email})
         end
       end
     end
@@ -387,16 +382,14 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that only one should be used' do
         expect { subject }
-          .to output_results('Use username or --email, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use username or --email, not both')
       end
     end
 
     context 'when neither username nor --email are provided' do
       it 'exits with an error message indicating that no username was provided' do
         expect { subject }
-          .to output_results('No username provided')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No username provided')
       end
     end
 
@@ -425,8 +418,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such username')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such username')
         end
       end
     end
@@ -458,8 +450,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message indicating that no user was found' do
           expect { subject }
-            .to output_results('No user with such email')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No user with such email')
         end
       end
     end
@@ -511,8 +502,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message indicating that the number must be positive' do
           expect { subject }
-            .to output_results('Number must be positive')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'Number must be positive')
         end
       end
 
@@ -545,8 +535,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message indicating that no such account was found' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
     end
@@ -560,8 +549,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -596,8 +584,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that no account with the given username was found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -634,8 +621,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No user with such username')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No user with such username')
       end
     end
 
@@ -660,106 +646,69 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#refresh' do
+    let(:action) { :refresh }
+
     context 'with --all option' do
-      let!(:local_account)              { Fabricate(:account, domain: nil) }
-      let!(:remote_account_example_com) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_net)        { Fabricate(:account, domain: 'example.net') }
-      let(:scope)                       { Account.remote }
+      let(:options) { { all: true } }
+      let!(:local_account) { Fabricate(:account, domain: nil) }
+      let(:remote_com_avatar_url) { 'https://example.host/avatar/com' }
+      let(:remote_com_header_url) { 'https://example.host/header/com' }
+      let(:remote_account_example_com) { Fabricate(:account, domain: 'example.com', avatar_remote_url: remote_com_avatar_url, header_remote_url: remote_com_header_url) }
+      let(:remote_net_avatar_url) { 'https://example.host/avatar/net' }
+      let(:remote_net_header_url) { 'https://example.host/header/net' }
+      let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: remote_net_avatar_url, header_remote_url: remote_net_header_url) }
+      let(:scope) { Account.remote }
 
       before do
-        # TODO: we should be using `stub_parallelize_with_progress!` but
-        # this makes the assertions harder to write
-        allow(cli).to receive(:parallelize_with_progress).and_yield(remote_account_example_com)
-                                                         .and_yield(account_example_net)
-                                                         .and_return([2, nil])
-        cli.options = { all: true }
+        stub_parallelize_with_progress!
+
+        stub_request(:get, remote_com_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_com_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_net_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_net_header_url)
+          .to_return request_fixture('avatar.txt')
+
+        remote_account_example_com
+          .update_column(:avatar_file_name, nil)
+        account_example_net
+          .update_column(:avatar_file_name, nil)
       end
 
-      it 'refreshes the avatar for all remote accounts' do
-        allow(remote_account_example_com).to receive(:reset_avatar!)
-        allow(account_example_net).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
+      it 'refreshes the avatar and header for all remote accounts' do
+        expect { subject }
           .to output_results('Refreshed 2 accounts')
+          .and not_change(local_account, :updated_at)
 
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(remote_account_example_com).to have_received(:reset_avatar!).once
-        expect(account_example_net).to have_received(:reset_avatar!).once
-      end
-
-      it 'does not refresh avatar for local accounts' do
-        allow(local_account).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(local_account).to_not have_received(:reset_avatar!)
-      end
-
-      it 'refreshes the header for all remote accounts' do
-        allow(remote_account_example_com).to receive(:reset_header!)
-        allow(account_example_net).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(remote_account_example_com).to have_received(:reset_header!).once
-        expect(account_example_net).to have_received(:reset_header!).once
-      end
-
-      it 'does not refresh the header for local accounts' do
-        allow(local_account).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(local_account).to_not have_received(:reset_header!)
-      end
-
-      it 'displays a successful message' do
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
+        # One request from factory creation, one more from task
+        expect(a_request(:get, remote_com_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_com_header_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_net_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_net_header_url))
+          .to have_been_made.at_least_times(2)
       end
 
       context 'with --dry-run option' do
-        before do
-          cli.options = { all: true, dry_run: true }
-        end
+        let(:options) { { all: true, dry_run: true } }
 
-        it 'does not refresh the avatar for any account' do
-          allow(local_account).to receive(:reset_avatar!)
-          allow(remote_account_example_com).to receive(:reset_avatar!)
-          allow(account_example_net).to receive(:reset_avatar!)
-
-          expect { cli.refresh }
+        it 'does not refresh the avatar or header for any account' do
+          expect { subject }
             .to output_results('Refreshed 2 accounts')
 
-          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-          expect(local_account).to_not have_received(:reset_avatar!)
-          expect(remote_account_example_com).to_not have_received(:reset_avatar!)
-          expect(account_example_net).to_not have_received(:reset_avatar!)
-        end
-
-        it 'does not refresh the header for any account' do
-          allow(local_account).to receive(:reset_header!)
-          allow(remote_account_example_com).to receive(:reset_header!)
-          allow(account_example_net).to receive(:reset_header!)
-
-          expect { cli.refresh }
-            .to output_results('Refreshed 2 accounts')
-
-          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-          expect(local_account).to_not have_received(:reset_header!)
-          expect(remote_account_example_com).to_not have_received(:reset_header!)
-          expect(account_example_net).to_not have_received(:reset_header!)
-        end
-
-        it 'displays a successful message with (DRY RUN)' do
-          expect { cli.refresh }
-            .to output_results('Refreshed 2 accounts (DRY RUN)')
+          # One request from factory creation, none from task due to dry run
+          expect(a_request(:get, remote_com_avatar_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_com_header_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_net_avatar_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_net_header_url))
+            .to have_been_made.once
         end
       end
     end
@@ -782,7 +731,7 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_avatar!)
         allow(account_example_com_b).to receive(:reset_avatar!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_avatar!).once
@@ -792,7 +741,7 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the avatar for unspecified accounts' do
         allow(account_example_net).to receive(:reset_avatar!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_avatar!)
@@ -802,7 +751,7 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_header!)
         allow(account_example_com_b).to receive(:reset_header!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_header!).once
@@ -812,7 +761,7 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the header for unspecified accounts' do
         allow(account_example_net).to receive(:reset_header!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_header!)
@@ -822,7 +771,7 @@ describe Mastodon::CLI::Accounts do
         it 'displays a failure message' do
           allow(account_example_com_a).to receive(:reset_avatar!).and_raise(Mastodon::UnexpectedResponseError)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
         end
       end
@@ -831,22 +780,19 @@ describe Mastodon::CLI::Accounts do
         it 'exits with an error message' do
           allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
 
-          expect { cli.refresh(*arguments) }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+          expect { subject }
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
       context 'with --dry-run option' do
-        before do
-          cli.options = { dry_run: true }
-        end
+        let(:options) { { dry_run: true } }
 
         it 'does not refresh the avatar for any account' do
           allow(account_example_com_a).to receive(:reset_avatar!)
           allow(account_example_com_b).to receive(:reset_avatar!)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_avatar!)
@@ -857,7 +803,7 @@ describe Mastodon::CLI::Accounts do
           allow(account_example_com_a).to receive(:reset_header!)
           allow(account_example_com_b).to receive(:reset_header!)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_header!)
@@ -867,69 +813,71 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'with --domain option' do
-      let!(:account_example_com_a) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_com_b) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_net)   { Fabricate(:account, domain: 'example.net') }
-      let(:domain)                 { 'example.com' }
-      let(:scope)                  { Account.remote.where(domain: domain) }
+      let(:domain) { 'example.com' }
+      let(:options) { { domain: domain } }
+
+      let(:com_a_avatar_url) { 'https://example.host/avatar/a' }
+      let(:com_a_header_url) { 'https://example.host/header/a' }
+      let(:account_example_com_a) { Fabricate(:account, domain: domain, avatar_remote_url: com_a_avatar_url, header_remote_url: com_a_header_url) }
+
+      let(:com_b_avatar_url) { 'https://example.host/avatar/b' }
+      let(:com_b_header_url) { 'https://example.host/header/b' }
+      let(:account_example_com_b) { Fabricate(:account, domain: domain, avatar_remote_url: com_b_avatar_url, header_remote_url: com_b_header_url) }
+
+      let(:net_avatar_url) { 'https://example.host/avatar/net' }
+      let(:net_header_url) { 'https://example.host/header/net' }
+      let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: net_avatar_url, header_remote_url: net_header_url) }
 
       before do
-        allow(cli).to receive(:parallelize_with_progress).and_yield(account_example_com_a)
-                                                         .and_yield(account_example_com_b)
-                                                         .and_return([2, nil])
-        cli.options = { domain: domain }
+        stub_parallelize_with_progress!
+
+        stub_request(:get, com_a_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_a_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_b_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_b_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, net_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, net_header_url)
+          .to_return request_fixture('avatar.txt')
+
+        account_example_com_a
+          .update_column(:avatar_file_name, nil)
+        account_example_com_b
+          .update_column(:avatar_file_name, nil)
+        account_example_net
+          .update_column(:avatar_file_name, nil)
       end
 
-      it 'refreshes the avatar for all accounts on specified domain' do
-        allow(account_example_com_a).to receive(:reset_avatar!)
-        allow(account_example_com_b).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
+      it 'refreshes the avatar and header for all accounts on specified domain' do
+        expect { subject }
           .to output_results('Refreshed 2 accounts')
 
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_com_a).to have_received(:reset_avatar!).once
-        expect(account_example_com_b).to have_received(:reset_avatar!).once
-      end
+        # One request from factory creation, one more from task
+        expect(a_request(:get, com_a_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_a_header_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_b_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_b_header_url))
+          .to have_been_made.at_least_times(2)
 
-      it 'does not refresh the avatar for accounts outside specified domain' do
-        allow(account_example_net).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_net).to_not have_received(:reset_avatar!)
-      end
-
-      it 'refreshes the header for all accounts on specified domain' do
-        allow(account_example_com_a).to receive(:reset_header!)
-        allow(account_example_com_b).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope)
-        expect(account_example_com_a).to have_received(:reset_header!).once
-        expect(account_example_com_b).to have_received(:reset_header!).once
-      end
-
-      it 'does not refresh the header for accounts outside specified domain' do
-        allow(account_example_net).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_net).to_not have_received(:reset_header!)
+        # One request from factory creation, none from task
+        expect(a_request(:get, net_avatar_url))
+          .to have_been_made.once
+        expect(a_request(:get, net_header_url))
+          .to have_been_made.once
       end
     end
 
     context 'when neither a list of accts nor options are provided' do
       it 'exits with an error message' do
-        expect { cli.refresh }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+        expect { subject }
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
   end
@@ -940,8 +888,7 @@ describe Mastodon::CLI::Accounts do
     context 'when neither username nor --all option are given' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No account(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No account(s) given')
       end
     end
 
@@ -976,8 +923,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message when the specified username is not found' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -1016,8 +962,7 @@ describe Mastodon::CLI::Accounts do
     shared_examples 'an account not found' do |acct|
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account (#{acct})")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account (#{acct})")
       end
     end
 
@@ -1067,8 +1012,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that the accounts do not have the same pub key' do
         expect { subject }
-          .to output_results("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "Accounts don't have the same public key, might not be duplicates!\nOverride with --force\n")
       end
 
       context 'with --force option' do
@@ -1236,8 +1180,7 @@ describe Mastodon::CLI::Accounts do
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option is required' do
         expect { subject }
-          .to output_results('Please specify either --follows or --followers, or both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Please specify either --follows or --followers, or both')
       end
     end
 
@@ -1247,8 +1190,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
 
@@ -1384,18 +1326,16 @@ describe Mastodon::CLI::Accounts do
     end
 
     shared_examples 'a successful migration' do
-      it 'calls the MoveService for the last migration' do
-        expect { subject }
-          .to output_results('OK')
-
-        last_migration = source_account.migrations.last
-
-        expect(move_service).to have_received(:call).with(last_migration).once
-      end
-
-      it 'displays a successful message' do
+      it 'displays a success message and calls the MoveService for the last migration' do
         expect { subject }
           .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
+
+        expect(move_service)
+          .to have_received(:call).with(last_migration).once
+      end
+
+      def last_migration
+        source_account.migrations.last
       end
     end
 
@@ -1404,16 +1344,14 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that using both options is not possible' do
         expect { subject }
-          .to output_results('Use --replay or --target, not both')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use --replay or --target, not both')
       end
     end
 
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option must be used' do
         expect { subject }
-          .to output_results('Use either --replay or --target')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Use either --replay or --target')
       end
     end
 
@@ -1423,8 +1361,7 @@ describe Mastodon::CLI::Accounts do
 
       it 'exits with an error message indicating that there is no such account' do
         expect { subject }
-          .to output_results("No such account: #{arguments.first}")
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, "No such account: #{arguments.first}")
       end
     end
 
@@ -1434,8 +1371,7 @@ describe Mastodon::CLI::Accounts do
       context 'when the specified account has no previous migrations' do
         it 'exits with an error message indicating that the given account has no previous migrations' do
           expect { subject }
-            .to output_results('The specified account has not performed any migration')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account has not performed any migration')
         end
       end
 
@@ -1457,8 +1393,7 @@ describe Mastodon::CLI::Accounts do
 
           it 'exits with an error message' do
             expect { subject }
-              .to output_results('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
-              .and raise_error(SystemExit)
+              .to raise_error(Thor::Error, 'The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
           end
         end
 
@@ -1485,8 +1420,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message indicating that there is no such account' do
           expect { subject }
-            .to output_results("The specified target account could not be found: #{options[:target]}")
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, "The specified target account could not be found: #{options[:target]}")
         end
       end
 
@@ -1510,8 +1444,7 @@ describe Mastodon::CLI::Accounts do
       context 'when the migration record is invalid' do
         it 'exits with an error indicating that the validation failed' do
           expect { subject }
-            .to output_results('Error: Validation failed')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Error: Validation failed/)
         end
       end
 
@@ -1522,8 +1455,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'exits with an error message' do
           expect { subject }
-            .to output_results('The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
         end
       end
 
diff --git a/spec/lib/mastodon/cli/cache_spec.rb b/spec/lib/mastodon/cli/cache_spec.rb
index b1515801eb..247a14f9e2 100644
--- a/spec/lib/mastodon/cli/cache_spec.rb
+++ b/spec/lib/mastodon/cli/cache_spec.rb
@@ -64,8 +64,7 @@ describe Mastodon::CLI::Cache do
 
       it 'Exits with an error message' do
         expect { subject }
-          .to output_results('Unknown')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Unknown/)
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/domains_spec.rb b/spec/lib/mastodon/cli/domains_spec.rb
index 24f341c124..448e6fe42b 100644
--- a/spec/lib/mastodon/cli/domains_spec.rb
+++ b/spec/lib/mastodon/cli/domains_spec.rb
@@ -15,6 +15,23 @@ describe Mastodon::CLI::Domains do
   describe '#purge' do
     let(:action) { :purge }
 
+    context 'with invalid limited federation mode argument' do
+      let(:arguments) { ['example.host'] }
+      let(:options) { { limited_federation_mode: true } }
+
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to raise_error(Thor::Error, /DOMAIN parameter not supported/)
+      end
+    end
+
+    context 'without a domains argument' do
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to raise_error(Thor::Error, 'No domain(s) given')
+      end
+    end
+
     context 'with accounts from the domain' do
       let(:domain) { 'host.example' }
       let!(:account) { Fabricate(:account, domain: domain) }
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index 13deb05b6c..55e3da0bb8 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -35,8 +35,7 @@ describe Mastodon::CLI::EmailDomainBlocks do
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
@@ -72,8 +71,7 @@ describe Mastodon::CLI::EmailDomainBlocks do
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('No domain(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No domain(s) given')
       end
     end
 
diff --git a/spec/lib/mastodon/cli/feeds_spec.rb b/spec/lib/mastodon/cli/feeds_spec.rb
index 1997980527..420cb3d587 100644
--- a/spec/lib/mastodon/cli/feeds_spec.rb
+++ b/spec/lib/mastodon/cli/feeds_spec.rb
@@ -42,8 +42,7 @@ describe Mastodon::CLI::Feeds do
 
       it 'displays an error and exits' do
         expect { subject }
-          .to output_results('No such account')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No such account')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index 82be10813e..d44b1b9fe4 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -144,8 +144,7 @@ describe Mastodon::CLI::IpBlocks do
 
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
@@ -235,8 +234,7 @@ describe Mastodon::CLI::IpBlocks do
     context 'when no IP address is provided' do
       it 'exits with an error message' do
         expect { subject }
-          .to output_results('No IP(s) given')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'No IP(s) given')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 081cd2dd47..99d770a81d 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -104,9 +104,9 @@ describe Mastodon::CLI::Main do
           answer_hostname_incorrectly
         end
 
-        it 'exits silently' do
+        it 'exits with mismatch error message' do
           expect { subject }
-            .to raise_error(SystemExit)
+            .to raise_error(Thor::Error, /Domains do not match/)
         end
       end
 
@@ -119,7 +119,7 @@ describe Mastodon::CLI::Main do
         it 'passes first step but stops before instructions' do
           expect { subject }
             .to output_results('operation WILL NOT')
-            .and raise_error(SystemExit)
+            .and raise_error(Thor::Error, /Self-destruct will not begin/)
         end
       end
 
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index ca492bbf69..cde25d39ed 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -22,8 +22,7 @@ describe Mastodon::CLI::Maintenance do
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('is too old')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /is too old/)
       end
     end
 
@@ -36,7 +35,7 @@ describe Mastodon::CLI::Maintenance do
       it 'Exits with error message' do
         expect { subject }
           .to output_results('more recent')
-          .and raise_error(SystemExit)
+          .and raise_error(Thor::Error, /more recent/)
       end
     end
 
@@ -48,8 +47,7 @@ describe Mastodon::CLI::Maintenance do
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('Sidekiq is running')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Sidekiq is running/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 10005107aa..ecc7101b6c 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -20,8 +20,7 @@ describe Mastodon::CLI::Media do
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--prune-profiles and --remove-headers should not be specified simultaneously')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--prune-profiles and --remove-headers should not be specified simultaneously')
       end
     end
 
@@ -30,8 +29,7 @@ describe Mastodon::CLI::Media do
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('--include-follows can only be used with --prune-profiles or --remove-headers')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, '--include-follows can only be used with --prune-profiles or --remove-headers')
       end
     end
 
@@ -98,8 +96,7 @@ describe Mastodon::CLI::Media do
 
       it 'warns about url and exits' do
         expect { subject }
-          .to output_results('Not a media URL')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, 'Not a media URL')
       end
     end
 
@@ -121,8 +118,7 @@ describe Mastodon::CLI::Media do
     context 'without any options' do
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('Specify the source')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Specify the source/)
       end
     end
 
@@ -147,8 +143,7 @@ describe Mastodon::CLI::Media do
 
         it 'warns about usage and exits' do
           expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
+            .to raise_error(Thor::Error, 'No such account')
         end
       end
 
@@ -221,8 +216,7 @@ describe Mastodon::CLI::Media do
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('azure storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /azure storage driver is not supported/)
       end
     end
 
@@ -233,8 +227,7 @@ describe Mastodon::CLI::Media do
 
       it 'warns about usage and exits' do
         expect { subject }
-          .to output_results('fog storage driver is not supported')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /fog storage driver is not supported/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index cb0c80c11d..ed3789c3e7 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -20,8 +20,7 @@ describe Mastodon::CLI::Search do
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this concurrency setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this concurrency setting/)
       end
     end
 
@@ -30,8 +29,18 @@ describe Mastodon::CLI::Search do
 
       it 'Exits with error message' do
         expect { subject }
-          .to output_results('this batch_size setting')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /this batch_size setting/)
+      end
+    end
+
+    context 'when server communication raises an error' do
+      let(:options) { { reset_chewy: true } }
+
+      before { allow(Chewy::Stash::Specification).to receive(:reset!).and_raise(Elasticsearch::Transport::Transport::Errors::InternalServerError) }
+
+      it 'Exits with error message' do
+        expect { subject }
+          .to raise_error(Thor::Error, /issue connecting to the search/)
       end
     end
 
diff --git a/spec/lib/mastodon/cli/statuses_spec.rb b/spec/lib/mastodon/cli/statuses_spec.rb
index 63d494bbb6..161b7c02bb 100644
--- a/spec/lib/mastodon/cli/statuses_spec.rb
+++ b/spec/lib/mastodon/cli/statuses_spec.rb
@@ -20,8 +20,7 @@ describe Mastodon::CLI::Statuses do
 
       it 'exits with error message' do
         expect { subject }
-          .to output_results('Cannot run')
-          .and raise_error(SystemExit)
+          .to raise_error(Thor::Error, /Cannot run/)
       end
     end
 
diff --git a/spec/lib/request_pool_spec.rb b/spec/lib/request_pool_spec.rb
index a31d078327..a82eb5a188 100644
--- a/spec/lib/request_pool_spec.rb
+++ b/spec/lib/request_pool_spec.rb
@@ -33,18 +33,14 @@ describe RequestPool do
 
       subject
 
-      threads = Array.new(5) do
-        Thread.new do
-          subject.with('http://example.com') do |http_client|
-            http_client.get('/').flush
-            # Nudge scheduler to yield and exercise the full pool
-            sleep(0.01)
-          end
+      multi_threaded_execution(5) do
+        subject.with('http://example.com') do |http_client|
+          http_client.get('/').flush
+          # Nudge scheduler to yield and exercise the full pool
+          sleep(0.01)
         end
       end
 
-      threads.map(&:join)
-
       expect(subject.size).to be > 1
     end
 
diff --git a/spec/lib/sanitize/config_spec.rb b/spec/lib/sanitize/config_spec.rb
index 550ad1c52b..2d8dc2f63b 100644
--- a/spec/lib/sanitize/config_spec.rb
+++ b/spec/lib/sanitize/config_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Sanitize::Config do
   describe '::MASTODON_STRICT' do
-    subject { Sanitize::Config::MASTODON_STRICT }
+    subject { described_class::MASTODON_STRICT }
 
     it 'converts h1 to p strong' do
       expect(Sanitize.fragment('<h1>Foo</h1>', subject)).to eq '<p><strong>Foo</strong></p>'
diff --git a/spec/lib/search_query_transformer_spec.rb b/spec/lib/search_query_transformer_spec.rb
index 5817e3d1d2..61aa36e163 100644
--- a/spec/lib/search_query_transformer_spec.rb
+++ b/spec/lib/search_query_transformer_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe SearchQueryTransformer do
-  subject { described_class.new.apply(parser, current_account: account) }
+  subject { described_class.new.apply(parser, current_account: account, searchability: :public) }
 
   let(:account) { Fabricate(:account) }
   let(:parser) { SearchQueryParser.new.parse(query) }
diff --git a/spec/lib/signature_parser_spec.rb b/spec/lib/signature_parser_spec.rb
new file mode 100644
index 0000000000..3f398e8dd0
--- /dev/null
+++ b/spec/lib/signature_parser_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SignatureParser do
+  describe '.parse' do
+    subject { described_class.parse(header) }
+
+    context 'with Signature headers conforming to draft-cavage-http-signatures-12' do
+      let(:header) do
+        # This example signature string deliberately mixes uneven spacing
+        # and quoting styles to ensure everything is covered
+        'keyId = "https://remote.domain/users/bob#main-key,",algorithm=  rsa-sha256 ,  headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'correctly parses the header' do
+        expect(subject).to eq({
+          'keyId' => 'https://remote.domain/users/bob#main-key,',
+          'algorithm' => 'rsa-sha256',
+          'headers' => 'host date digest (request-target)',
+          'signature' => 'gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ==', # rubocop:disable Layout/LineLength
+        })
+      end
+    end
+
+    context 'with a malformed Signature header' do
+      let(:header) { 'hello this is malformed!' }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(described_class::ParsingError)
+      end
+    end
+  end
+end
diff --git a/spec/lib/status_reach_finder_spec.rb b/spec/lib/status_reach_finder_spec.rb
index 7181717dc1..5efe30738d 100644
--- a/spec/lib/status_reach_finder_spec.rb
+++ b/spec/lib/status_reach_finder_spec.rb
@@ -8,9 +8,262 @@ describe StatusReachFinder do
       subject { described_class.new(status) }
 
       let(:parent_status) { nil }
+      let(:quoted_status) { nil }
       let(:visibility) { :public }
+      let(:searchability) { :public }
       let(:alice) { Fabricate(:account, username: 'alice') }
-      let(:status) { Fabricate(:status, account: alice, thread: parent_status, visibility: visibility) }
+      let(:status) { Fabricate(:status, account: alice, thread: parent_status, quote_of_id: quoted_status&.id, visibility: visibility, searchability: searchability) }
+
+      context 'with a simple case' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        context 'with follower' do
+          before do
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'with non-follower' do
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when misskey case with unlisted post' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+        let(:sender_software) { 'mastodon' }
+        let(:visibility) { :unlisted }
+
+        before do
+          Fabricate(:instance_info, domain: 'foo.bar', software: sender_software)
+          bob.follow!(alice)
+        end
+
+        context 'when mastodon' do
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when misskey with private searchability' do
+          let(:sender_software) { 'misskey' }
+          let(:searchability) { :private }
+
+          it 'send status without setting' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+          end
+
+          it 'send status with setting' do
+            alice.user.settings.update(reject_unlisted_subscription: 'true')
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when misskey with public_unlisted searchability' do
+          let(:sender_software) { 'misskey' }
+          let(:searchability) { :public_unlisted }
+
+          it 'send status without setting' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+          end
+
+          it 'send status with setting' do
+            alice.user.settings.update(reject_unlisted_subscription: 'true')
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when misskey with public searchability' do
+          let(:sender_software) { 'misskey' }
+
+          it 'send status with setting' do
+            alice.user.settings.update(reject_unlisted_subscription: 'true')
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when has distributable friend server' do
+          let(:sender_software) { 'misskey' }
+          let(:searchability) { :public }
+
+          before { Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', available: true, active_state: :accepted, pseudo_relay: true) }
+
+          it 'send status without friend server' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when this server has a friend' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+
+        context 'with follower' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :accepted)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'with follower but not local-distributable' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :accepted, delivery_local: false)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'with non-follower and non-relay' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :accepted)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'with pending' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :pending)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'with unidirection from them' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :idle, passive_state: :accepted)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when unavailable' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :accepted, available: false)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable and following' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable reverse' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', active_state: :accepted, pseudo_relay: true)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable but not local distributable' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true, delivery_local: false)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable and following but not local distributable' do
+          before do
+            Fabricate(:friend_domain, domain: 'foo.bar', passive_state: :accepted, pseudo_relay: true, delivery_local: false)
+            bob.follow!(alice)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+
+        context 'when distributable but domain blocked by account' do
+          before do
+            Fabricate(:account_domain_block, account: alice, domain: 'foo.bar')
+            Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true)
+          end
+
+          it 'send status' do
+            expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+            expect(subject.inboxes_for_friend).to_not include 'https://foo.bar/inbox'
+          end
+        end
+      end
+
+      context 'when it contains distributable friend server' do
+        before do
+          Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox', passive_state: :accepted, pseudo_relay: true)
+        end
+
+        it 'includes the inbox of the mentioned account' do
+          expect(subject.inboxes).to_not include 'https://foo.bar/inbox'
+          expect(subject.inboxes_for_misskey).to_not include 'https://foo.bar/inbox'
+          expect(subject.inboxes_for_friend).to include 'https://foo.bar/inbox'
+        end
+      end
 
       context 'when it contains mentions of remote accounts' do
         let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
@@ -100,6 +353,149 @@ describe StatusReachFinder do
           end
         end
       end
+
+      context 'when it is a quote to a remote account' do
+        let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
+        let(:quoted_status) { Fabricate(:status, account: bob) }
+
+        it 'includes the inbox of the quoted-to account' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
+        end
+      end
+    end
+
+    context 'with extended domain block' do
+      subject do
+        described_class.new(status)
+      end
+
+      before do
+        bob.follow!(alice)
+        tom.follow!(alice)
+        Fabricate(:domain_block, domain: 'example.com', severity: 'noop', **properties)
+      end
+
+      let(:properties) { {} }
+      let(:visibility) { :public }
+      let(:searchability) { :public }
+      let(:dissubscribable) { false }
+      let(:sensitive) { false }
+      let(:status) { Fabricate(:status, account: alice, visibility: visibility, searchability: searchability, sensitive: sensitive) }
+      let(:alice) { Fabricate(:account, username: 'alice', master_settings: { subscription_policy: dissubscribable ? 'block' : 'allow' }) }
+      let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, uri: 'https://example.com/', inbox_url: 'https://example.com/inbox') }
+      let(:tom) { Fabricate(:account, username: 'tom', domain: 'tom.com', protocol: :activitypub, uri: 'https://tom.com/', inbox_url: 'https://tom.com/inbox') }
+
+      context 'when reject_send_sensitive' do
+        let(:properties) { { reject_send_sensitive: true } }
+        let(:sensitive) { true }
+
+        it 'does not include the inbox of blocked domain' do
+          expect(subject.inboxes).to_not include 'https://example.com/inbox'
+          expect(subject.inboxes).to include 'https://tom.com/inbox'
+        end
+      end
+    end
+  end
+
+  describe '#inboxes_for_friend and distributables' do
+    subject { described_class.new(status).inboxes_for_friend }
+
+    let(:visibility) { :public }
+    let(:searchability) { :public }
+    let(:alice) { Fabricate(:account, username: 'alice') }
+    let(:status) { Fabricate(:status, account: alice, visibility: visibility, searchability: searchability) }
+
+    context 'when a simple case' do
+      before do
+        Fabricate(:friend_domain, domain: 'abc.com', inbox_url: 'https://abc.com/inbox', active_state: :accepted, passive_state: :accepted, pseudo_relay: true, available: true)
+        Fabricate(:friend_domain, domain: 'def.com', inbox_url: 'https://def.com/inbox', active_state: :accepted, passive_state: :accepted, pseudo_relay: true, available: true)
+        Fabricate(:friend_domain, domain: 'ghi.com', inbox_url: 'https://ghi.com/inbox', active_state: :accepted, passive_state: :accepted, pseudo_relay: true, available: false)
+        Fabricate(:friend_domain, domain: 'jkl.com', inbox_url: 'https://jkl.com/inbox', active_state: :accepted, passive_state: :accepted, pseudo_relay: false, available: true)
+        Fabricate(:friend_domain, domain: 'mno.com', inbox_url: 'https://mno.com/inbox', active_state: :accepted, passive_state: :idle, pseudo_relay: true, available: true)
+        Fabricate(:friend_domain, domain: 'pqr.com', inbox_url: 'https://pqr.com/inbox', active_state: :accepted, passive_state: :accepted, pseudo_relay: true, available: true)
+        Fabricate(:unavailable_domain, domain: 'pqr.com')
+        Fabricate(:friend_domain, domain: 'stu.com', inbox_url: 'https://stu.com/inbox', active_state: :idle, passive_state: :accepted, pseudo_relay: true, available: true)
+        Fabricate(:friend_domain, domain: 'vwx.com', inbox_url: 'https://vwx.com/inbox', active_state: :idle, passive_state: :accepted, pseudo_relay: true, available: true, delivery_local: false)
+      end
+
+      it 'returns friend servers' do
+        expect(subject).to include 'https://abc.com/inbox'
+        expect(subject).to include 'https://def.com/inbox'
+      end
+
+      it 'not contains unavailable friends' do
+        expect(subject).to_not include 'https://ghi.com/inbox'
+      end
+
+      it 'not contains no-relay friends' do
+        expect(subject).to_not include 'https://jkl.com/inbox'
+      end
+
+      it 'contains no-mutual friends' do
+        expect(subject).to include 'https://mno.com/inbox'
+        expect(subject).to include 'https://stu.com/inbox'
+      end
+
+      it 'not contains un local distable' do
+        expect(subject).to_not include 'https://vwx.com/inbox'
+      end
+
+      it 'not contains unavailable domain friends' do
+        expect(subject).to_not include 'https://pqr.com/inbox'
+      end
+
+      context 'when public visibility' do
+        let(:visibility) { :public }
+        let(:searchability) { :direct }
+
+        it 'returns friend servers' do
+          expect(subject).to_not eq []
+        end
+      end
+
+      context 'when public_unlsited visibility' do
+        let(:visibility) { :public_unlisted }
+        let(:searchability) { :direct }
+
+        it 'returns friend servers' do
+          expect(subject).to_not eq []
+        end
+      end
+
+      context 'when unlsited visibility with public searchability' do
+        let(:visibility) { :unlisted }
+        let(:searchability) { :public }
+
+        it 'returns friend servers' do
+          expect(subject).to_not eq []
+        end
+      end
+
+      context 'when unlsited visibility with public_unlisted searchability' do
+        let(:visibility) { :unlisted }
+        let(:searchability) { :public_unlisted }
+
+        it 'returns friend servers' do
+          expect(subject).to_not eq []
+        end
+      end
+
+      context 'when unlsited visibility with private searchability' do
+        let(:visibility) { :unlisted }
+        let(:searchability) { :private }
+
+        it 'returns empty servers' do
+          expect(subject).to eq []
+        end
+      end
+
+      context 'when private visibility' do
+        let(:visibility) { :private }
+
+        it 'returns friend servers' do
+          expect(subject).to eq []
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/vacuum/feeds_vacuum_spec.rb b/spec/lib/vacuum/feeds_vacuum_spec.rb
index ede1e3c360..fa5381c8ae 100644
--- a/spec/lib/vacuum/feeds_vacuum_spec.rb
+++ b/spec/lib/vacuum/feeds_vacuum_spec.rb
@@ -8,12 +8,16 @@ RSpec.describe Vacuum::FeedsVacuum do
   describe '#perform' do
     let!(:active_user) { Fabricate(:user, current_sign_in_at: 2.days.ago) }
     let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) }
+    let!(:list) { Fabricate(:list, account: inactive_user.account) }
+    let!(:antenna) { Fabricate(:antenna, account: inactive_user.account) }
 
     before do
       redis.zadd(feed_key_for(inactive_user), 1, 1)
       redis.zadd(feed_key_for(active_user), 1, 1)
       redis.zadd(feed_key_for(inactive_user, 'reblogs'), 2, 2)
       redis.sadd(feed_key_for(inactive_user, 'reblogs:2'), 3)
+      redis.zadd(list_key_for(list), 1, 1)
+      redis.zadd(antenna_key_for(antenna), 1, 1)
 
       subject.perform
     end
@@ -23,10 +27,20 @@ RSpec.describe Vacuum::FeedsVacuum do
       expect(redis.zcard(feed_key_for(active_user))).to eq 1
       expect(redis.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false
       expect(redis.exists?(feed_key_for(inactive_user, 'reblogs:2'))).to be false
+      expect(redis.zcard(list_key_for(list))).to eq 0
+      expect(redis.zcard(antenna_key_for(antenna))).to eq 0
     end
   end
 
   def feed_key_for(user, subtype = nil)
     FeedManager.instance.key(:home, user.account_id, subtype)
   end
+
+  def list_key_for(list)
+    FeedManager.instance.key(:list, list.id)
+  end
+
+  def antenna_key_for(antenna)
+    FeedManager.instance.key(:antenna, antenna.id)
+  end
 end
diff --git a/spec/lib/vacuum/imports_vacuum_spec.rb b/spec/lib/vacuum/imports_vacuum_spec.rb
index c712b7b9b2..3a273d8276 100644
--- a/spec/lib/vacuum/imports_vacuum_spec.rb
+++ b/spec/lib/vacuum/imports_vacuum_spec.rb
@@ -13,7 +13,26 @@ RSpec.describe Vacuum::ImportsVacuum do
 
   describe '#perform' do
     it 'cleans up the expected imports' do
-      expect { subject.perform }.to change { BulkImport.pluck(:id) }.from([old_unconfirmed, new_unconfirmed, recent_ongoing, recent_finished, old_finished].map(&:id)).to([new_unconfirmed, recent_ongoing, recent_finished].map(&:id))
+      expect { subject.perform }
+        .to change { ordered_bulk_imports.pluck(:id) }
+        .from(original_import_ids)
+        .to(remaining_import_ids)
+    end
+
+    def ordered_bulk_imports
+      BulkImport.order(id: :asc)
+    end
+
+    def original_import_ids
+      [old_unconfirmed, new_unconfirmed, recent_ongoing, recent_finished, old_finished].map(&:id)
+    end
+
+    def vacuumed_import_ids
+      [old_unconfirmed, old_finished].map(&:id)
+    end
+
+    def remaining_import_ids
+      original_import_ids - vacuumed_import_ids
     end
   end
 end
diff --git a/spec/lib/vacuum/list_statuses_vacuum_spec.rb b/spec/lib/vacuum/list_statuses_vacuum_spec.rb
new file mode 100644
index 0000000000..d28b1ad8d9
--- /dev/null
+++ b/spec/lib/vacuum/list_statuses_vacuum_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Vacuum::ListStatusesVacuum do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let!(:local_status_old) { Fabricate(:status, created_at: 2.days.ago) }
+    let!(:local_status_recent) { Fabricate(:status, created_at: 5.hours.ago) }
+    let!(:list_status_old) { Fabricate(:list_status, status: local_status_old, created_at: local_status_old.created_at) }
+    let!(:list_status_recent) { Fabricate(:list_status, status: local_status_recent, created_at: local_status_recent.created_at) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes old list status' do
+      expect { list_status_old.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete recent status' do
+      expect { list_status_recent.reload }.to_not raise_error
+    end
+
+    it 'statuses are remain' do
+      expect { local_status_old }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/vacuum/ng_histories_vacuum_spec.rb b/spec/lib/vacuum/ng_histories_vacuum_spec.rb
new file mode 100644
index 0000000000..31f10f1ffd
--- /dev/null
+++ b/spec/lib/vacuum/ng_histories_vacuum_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Vacuum::NgHistoriesVacuum do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let!(:word_history_old) { Fabricate(:ngword_history, created_at: 30.days.ago) }
+    let!(:word_history_recent) { Fabricate(:ngword_history, created_at: 2.days.ago) }
+    let!(:rule_history_old) { Fabricate(:ng_rule_history, created_at: 30.days.ago) }
+    let!(:rule_history_recent) { Fabricate(:ng_rule_history, created_at: 2.days.ago) }
+
+    before do
+      subject.perform
+    end
+
+    it 'deletes old history' do
+      expect { word_history_old.reload }.to raise_error ActiveRecord::RecordNotFound
+      expect { rule_history_old.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete recent history' do
+      expect { word_history_recent.reload }.to_not raise_error
+      expect { rule_history_recent.reload }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/vacuum/statuses_vacuum_spec.rb b/spec/lib/vacuum/statuses_vacuum_spec.rb
index d5c0139506..5bdf9fecb0 100644
--- a/spec/lib/vacuum/statuses_vacuum_spec.rb
+++ b/spec/lib/vacuum/statuses_vacuum_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Vacuum::StatusesVacuum do
 
   let(:retention_period) { 7.days }
 
+  let(:local_account) { Fabricate(:account) }
   let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
   describe '#perform' do
@@ -35,4 +36,57 @@ RSpec.describe Vacuum::StatusesVacuum do
       expect { local_status_recent.reload }.to_not raise_error
     end
   end
+
+  describe '#perform with reaction' do
+    let!(:remote_status_old) { Fabricate(:status, account: remote_account, created_at: (retention_period + 2.days).ago) }
+    let!(:remote_status_old_faved_byl) { Fabricate(:status, account: remote_account, created_at: (retention_period + 2.days).ago) }
+    let!(:remote_status_old_faved_byr) { Fabricate(:status, account: remote_account, created_at: (retention_period + 2.days).ago) }
+    let!(:remote_status_old_bmed_byl) { Fabricate(:status, account: remote_account, created_at: (retention_period + 2.days).ago) }
+
+    let(:delete_content_cache_without_reaction) { true }
+
+    before do
+      Setting.delete_content_cache_without_reaction = delete_content_cache_without_reaction
+      Fabricate(:favourite, account: local_account, status: remote_status_old_faved_byl)
+      Fabricate(:favourite, account: remote_account, status: remote_status_old_faved_byr, uri: 'https://example.com/fav')
+      Fabricate(:bookmark, account: local_account, status: remote_status_old_bmed_byl)
+      subject.perform
+    end
+
+    it 'deletes remote statuses past the retention period' do
+      expect { remote_status_old.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'deletes remote statuses favourited by remote user' do
+      expect { remote_status_old_faved_byr.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+    it 'does not delete remote statuses favourited by local user' do
+      expect { remote_status_old_faved_byl.reload }.to_not raise_error
+    end
+
+    it 'does not delete remote statuses bookmarked by local user' do
+      expect { remote_status_old_bmed_byl.reload }.to_not raise_error
+    end
+
+    context 'when excepting is disabled' do
+      let(:delete_content_cache_without_reaction) { false }
+
+      it 'deletes remote statuses past the retention period' do
+        expect { remote_status_old.reload }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'deletes remote statuses favourited by remote user' do
+        expect { remote_status_old_faved_byr.reload }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'deletes remote statuses favourited by local user' do
+        expect { remote_status_old_faved_byl.reload }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'deletes remote statuses bookmarked by local user' do
+        expect { remote_status_old_bmed_byl.reload }.to raise_error ActiveRecord::RecordNotFound
+      end
+    end
+  end
 end
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 0e2bdcb71a..442f91aad0 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -46,7 +46,7 @@ describe WebfingerResource do
 
         expect do
           described_class.new(resource).username
-        end.to raise_error(WebfingerResource::InvalidRequest)
+        end.to raise_error(described_class::InvalidRequest)
       end
 
       it 'finds the username in a valid https route' do
@@ -137,7 +137,7 @@ describe WebfingerResource do
 
         expect do
           described_class.new(resource).username
-        end.to raise_error(WebfingerResource::InvalidRequest)
+        end.to raise_error(described_class::InvalidRequest)
       end
     end
   end
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 88ad7aa02b..624628f1c2 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -61,6 +61,26 @@ RSpec.describe AdminMailer do
     end
   end
 
+  describe '.new_pending_friend_server' do
+    let(:recipient) { Fabricate(:account, username: 'Barklums') }
+    let(:friend) { Fabricate(:friend_domain, passive_state: :pending, domain: 'abc.com') }
+    let(:mail) { described_class.with(recipient: recipient).new_pending_friend_server(friend) }
+
+    before do
+      recipient.user.update(locale: :en)
+    end
+
+    it 'renders the headers' do
+      expect(mail.subject).to eq('New friend server up for review on cb6e6126.ngrok.io (abc.com)')
+      expect(mail.to).to eq [recipient.user_email]
+      expect(mail.from).to eq ['notifications@localhost']
+    end
+
+    it 'renders the body' do
+      expect(mail.body.encoded).to match 'The new friend server abc.com is waiting for your review. You can approve or reject this application.'
+    end
+  end
+
   describe '.new_trends' do
     let(:recipient) { Fabricate(:account, username: 'Snurf') }
     let(:link) { Fabricate(:preview_card, trendable: true, language: 'en') }
diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb
index 942d40d568..0b92ff423a 100644
--- a/spec/mailers/previews/admin_mailer_preview.rb
+++ b/spec/mailers/previews/admin_mailer_preview.rb
@@ -18,6 +18,11 @@ class AdminMailerPreview < ActionMailer::Preview
     AdminMailer.with(recipient: Account.first).new_pending_account(User.pending.first)
   end
 
+  # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_pending_friend_server
+  def new_pending_friend_server
+    AdminMailer.with(recipient: Account.first).new_pending_friend_server(User.pending.first)
+  end
+
   # Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_trends
   def new_trends
     AdminMailer.with(recipient: Account.first).new_trends(PreviewCard.joins(:trend).limit(3), Tag.limit(3), Status.joins(:trend).where(reblog_of_id: nil).limit(3))
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 098c9cd901..2722538e1a 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -93,4 +93,9 @@ class UserMailerPreview < ActionMailer::Preview
   def suspicious_sign_in
     UserMailer.suspicious_sign_in(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
   end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/failed_2fa
+  def failed_2fa
+    UserMailer.failed_2fa(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
+  end
 end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 4a43928248..5a8c293740 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -135,6 +135,24 @@ describe UserMailer do
                      'user_mailer.suspicious_sign_in.subject'
   end
 
+  describe '#failed_2fa' do
+    let(:ip) { '192.168.0.1' }
+    let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
+    let(:timestamp) { Time.now.utc }
+    let(:mail) { described_class.failed_2fa(receiver, ip, agent, timestamp) }
+
+    it 'renders failed 2FA notification' do
+      receiver.update!(locale: nil)
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('user_mailer.failed_2fa.explanation')))
+    end
+
+    include_examples 'localized subject',
+                     'user_mailer.failed_2fa.subject'
+  end
+
   describe '#appeal_approved' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
     let(:mail) { described_class.appeal_approved(receiver, appeal) }
@@ -229,6 +247,12 @@ describe UserMailer do
   describe '#welcome' do
     let(:mail) { described_class.welcome(receiver) }
 
+    before do
+      # This is a bit hacky and low-level but this allows stubbing trending tags
+      tag_ids = Fabricate.times(5, :tag).pluck(:id)
+      allow(Trends.tags).to receive(:query).and_return(instance_double(Trends::Query, allowed: Tag.where(id: tag_ids)))
+    end
+
     it 'renders welcome mail' do
       expect(mail)
         .to be_present
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index ab74579624..ba8147b552 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -9,14 +9,10 @@ RSpec.describe Account do
     let(:bob) { Fabricate(:account, username: 'bob') }
 
     describe '#suspend!' do
-      it 'marks the account as suspended' do
-        subject.suspend!
-        expect(subject.suspended?).to be true
-      end
-
-      it 'creates a deletion request' do
-        subject.suspend!
-        expect(AccountDeletionRequest.where(account: subject).exists?).to be true
+      it 'marks the account as suspended and creates a deletion request' do
+        expect { subject.suspend! }
+          .to change(subject, :suspended?).from(false).to(true)
+          .and(change { AccountDeletionRequest.exists?(account: subject) }.from(false).to(true))
       end
 
       context 'when the account is of a local user' do
@@ -254,6 +250,202 @@ RSpec.describe Account do
     end
   end
 
+  describe '#allow_emoji_reaction?' do
+    let(:policy) { :allow }
+    let(:allow_local) { false }
+    let(:reactioned) { Fabricate(:user, settings: { emoji_reaction_policy: policy, slip_local_emoji_reaction: allow_local }).account }
+    let(:followee) { Fabricate(:account) }
+    let(:follower) { Fabricate(:account) }
+    let(:mutual) { Fabricate(:account) }
+    let(:anyone) { Fabricate(:account) }
+
+    before do
+      follower.follow!(reactioned)
+      reactioned.follow!(followee)
+      mutual.follow!(reactioned)
+      reactioned.follow!(mutual)
+    end
+
+    shared_examples 'with policy' do |override_policy, permitted|
+      context "when policy is #{override_policy}" do
+        let(:policy) { override_policy }
+
+        it 'allows anyone' do
+          expect(reactioned.allow_emoji_reaction?(anyone)).to be permitted.include?(:anyone)
+        end
+
+        it 'allows followee' do
+          expect(reactioned.allow_emoji_reaction?(followee)).to be permitted.include?(:following)
+        end
+
+        it 'allows follower' do
+          expect(reactioned.allow_emoji_reaction?(follower)).to be permitted.include?(:followers)
+        end
+
+        it 'allows mutual' do
+          expect(reactioned.allow_emoji_reaction?(mutual)).to be permitted.include?(:mutuals)
+        end
+
+        it 'allows self' do
+          expect(reactioned.allow_emoji_reaction?(reactioned)).to be permitted.include?(:self)
+        end
+      end
+    end
+
+    it_behaves_like 'with policy', :allow, %i(anyone following followers mutuals self)
+    it_behaves_like 'with policy', :outside_only, %i(following followers mutuals self)
+    it_behaves_like 'with policy', :following_only, %i(following mutuals self)
+    it_behaves_like 'with policy', :followers_only, %i(followers mutuals self)
+    it_behaves_like 'with policy', :mutuals_only, %i(mutuals self)
+    it_behaves_like 'with policy', :block, %i()
+
+    shared_examples 'allow local only' do |override_policy|
+      context "when policy is #{override_policy} but allow local only" do
+        let(:policy) { override_policy }
+        let(:allow_local) { true }
+        let(:local) { Fabricate(:user).account }
+        let(:remote) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+
+        before do
+          local.follow!(remote) if override_policy == :following_only
+        end
+
+        it 'does not allow remote' do
+          expect(reactioned.allow_emoji_reaction?(remote)).to be false
+        end
+
+        it 'allows local' do
+          expect(reactioned.allow_emoji_reaction?(local)).to be true
+        end
+      end
+    end
+
+    it_behaves_like 'allow local only', :following_only
+    it_behaves_like 'allow local only', :block
+
+    context 'when reactioned is remote user' do
+      let(:reactioned) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', settings: { emoji_reaction_policy: :following_only }) }
+
+      it 'allows anyone' do
+        expect(reactioned.allow_emoji_reaction?(anyone)).to be false
+      end
+
+      it 'allows followee' do
+        expect(reactioned.allow_emoji_reaction?(followee)).to be true
+      end
+    end
+
+    context 'when reactor is remote user' do
+      let(:anyone) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor/anyone') }
+      let(:policy) { :following_only }
+
+      it 'allows anyone' do
+        expect(reactioned.allow_emoji_reaction?(anyone)).to be false
+      end
+
+      it 'allows followee' do
+        expect(reactioned.allow_emoji_reaction?(followee)).to be true
+      end
+    end
+
+    context 'when both are remote user' do
+      let(:reactioned) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', settings: { emoji_reaction_policy: policy }) }
+      let(:anyone) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor/anyone') }
+      let(:followee) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor/followee') }
+
+      it 'allows anyone' do
+        expect(reactioned.allow_emoji_reaction?(anyone)).to be true
+      end
+
+      context 'with blocking' do
+        let(:policy) { :block }
+
+        it 'allows anyone' do
+          expect(reactioned.allow_emoji_reaction?(anyone)).to be true
+        end
+      end
+    end
+  end
+
+  describe '#emoji_reaction_policy' do
+    subject { account.emoji_reaction_policy }
+
+    let(:domains) { 'example.com' }
+    let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+
+    before do
+      Form::AdminSettings.new(emoji_reaction_disallow_domains: domains).save
+    end
+
+    it 'blocked if target domain' do
+      expect(subject).to eq :block
+    end
+
+    context 'when other domain' do
+      let(:account) { Fabricate(:account, domain: 'allow.example.com', uri: 'https://allow.example.com/actor') }
+
+      it 'allowed if target domain' do
+        expect(subject).to_not eq :block
+      end
+    end
+  end
+
+  describe '#public_settings_for_local' do
+    subject { account.public_settings_for_local }
+
+    let(:account) { Fabricate(:user, settings: { allow_quote: true, hide_statuses_count: true, emoji_reaction_policy: :followers_only }).account }
+
+    shared_examples 'some settings' do |permitted, emoji_reaction_policy|
+      it 'allow_quote is allowed' do
+        expect(subject['allow_quote']).to be permitted.include?(:allow_quote)
+      end
+
+      it 'hide_statuses_count is allowed' do
+        expect(subject['hide_statuses_count']).to be permitted.include?(:hide_statuses_count)
+      end
+
+      it 'hide_following_count is disallowed' do
+        expect(subject['hide_following_count']).to be permitted.include?(:hide_following_count)
+      end
+
+      it 'emoji_reaction is allowed followers' do
+        expect(subject['emoji_reaction_policy']).to eq emoji_reaction_policy
+      end
+    end
+
+    it_behaves_like 'some settings', %i(allow_quote hide_statuses_count), 'followers_only'
+
+    context 'when default true setting is set false' do
+      let(:account) { Fabricate(:user, settings: { allow_quote: false, hide_statuses_count: true, emoji_reaction_policy: :followers_only }).account }
+
+      it_behaves_like 'some settings', %i(hide_statuses_count), 'followers_only'
+    end
+
+    context 'when remote user' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor', settings: { 'allow_quote' => true, 'hide_statuses_count' => true, 'emoji_reaction_policy' => 'followers_only' }) }
+
+      it_behaves_like 'some settings', %i(allow_quote hide_statuses_count), 'followers_only'
+    end
+
+    context 'when remote user by server other_settings is not supported' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+
+      it_behaves_like 'some settings', %i(allow_quote), 'allow'
+    end
+  end
+
+  describe '#approve_remote!' do
+    it 'calls worker' do
+      account = Fabricate(:account, suspended_at: Time.now.utc, suspension_origin: :local, remote_pending: true)
+      allow(ActivateRemoteAccountWorker).to receive(:perform_async)
+
+      account.approve_remote!
+      expect(account.remote_pending).to be false
+      expect(account.suspended?).to be false
+      expect(ActivateRemoteAccountWorker).to have_received(:perform_async).with(account.id)
+    end
+  end
+
   describe '#favourited?' do
     subject { Fabricate(:account) }
 
@@ -545,6 +737,33 @@ RSpec.describe Account do
       end
     end
 
+    context 'when limiting search to follower accounts' do
+      it 'accepts ?, \, : and space as delimiter' do
+        match = Fabricate(
+          :account,
+          display_name: 'A & l & i & c & e',
+          username: 'username',
+          domain: 'example.com'
+        )
+        match.follow!(account)
+
+        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
+        expect(results).to eq [match]
+      end
+
+      it 'does not return non-follower accounts' do
+        Fabricate(
+          :account,
+          display_name: 'A & l & i & c & e',
+          username: 'username',
+          domain: 'example.com'
+        )
+
+        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
+        expect(results).to eq []
+      end
+    end
+
     it 'does not return suspended users' do
       Fabricate(
         :account,
@@ -682,7 +901,7 @@ RSpec.describe Account do
   end
 
   describe 'MENTION_RE' do
-    subject { Account::MENTION_RE }
+    subject { described_class::MENTION_RE }
 
     it 'matches usernames in the middle of a sentence' do
       expect(subject.match('Hello to @alice from me')[1]).to eq 'alice'
@@ -750,13 +969,13 @@ RSpec.describe Account do
       end
 
       it 'is valid if we are creating an instance actor account with a period' do
-        account = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com')
+        account = Fabricate.build(:account, id: described_class::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'example.com')
         expect(account.valid?).to be true
       end
 
       it 'is valid if we are creating a possibly-conflicting instance actor account' do
         _account = Fabricate(:account, username: 'examplecom')
-        instance_account = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com')
+        instance_account = Fabricate.build(:account, id: described_class::INSTANCE_ACTOR_ID, actor_type: 'Application', locked: true, username: 'example.com')
         expect(instance_account.valid?).to be true
       end
 
@@ -839,6 +1058,50 @@ RSpec.describe Account do
   end
 
   describe 'scopes' do
+    describe 'matches_uri_prefix' do
+      let!(:alice) { Fabricate :account, domain: 'host.example', uri: 'https://host.example/user/a' }
+      let!(:bob) { Fabricate :account, domain: 'top-level.example', uri: 'https://top-level.example' }
+
+      it 'returns accounts which start with the value' do
+        results = described_class.matches_uri_prefix('https://host.example')
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(alice)
+          .and not_include(bob)
+      end
+
+      it 'returns accounts which equal the value' do
+        results = described_class.matches_uri_prefix('https://top-level.example')
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(bob)
+          .and not_include(alice)
+      end
+    end
+
+    describe 'auditable' do
+      let!(:alice) { Fabricate :account }
+      let!(:bob) { Fabricate :account }
+
+      before do
+        2.times { Fabricate :action_log, account: alice }
+      end
+
+      it 'returns distinct accounts with action log records' do
+        results = described_class.auditable
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(alice)
+          .and not_include(bob)
+      end
+    end
+
     describe 'alphabetic' do
       it 'sorts by alphabetic order of domain and username' do
         matches = [
@@ -848,7 +1111,7 @@ RSpec.describe Account do
           { username: 'b', domain: 'b' },
         ].map(&method(:Fabricate).curry(2).call(:account))
 
-        expect(described_class.where('id > 0').alphabetic).to eq matches
+        expect(described_class.without_internal.alphabetic).to eq matches
       end
     end
 
@@ -899,7 +1162,7 @@ RSpec.describe Account do
       it 'returns an array of accounts who do not have a domain' do
         local_account = Fabricate(:account, domain: nil)
         _account_with_domain = Fabricate(:account, domain: 'example.com')
-        expect(described_class.where('id > 0').local).to contain_exactly(local_account)
+        expect(described_class.without_internal.local).to contain_exactly(local_account)
       end
     end
 
@@ -910,14 +1173,14 @@ RSpec.describe Account do
           matches[index] = Fabricate(:account, domain: matches[index])
         end
 
-        expect(described_class.where('id > 0').partitioned).to match_array(matches)
+        expect(described_class.without_internal.partitioned).to match_array(matches)
       end
     end
 
     describe 'recent' do
       it 'returns a relation of accounts sorted by recent creation' do
         matches = Array.new(2) { Fabricate(:account) }
-        expect(described_class.where('id > 0').recent).to match_array(matches)
+        expect(described_class.without_internal.recent).to match_array(matches)
       end
     end
 
@@ -995,19 +1258,10 @@ RSpec.describe Account do
     it 'increments the count in multi-threaded an environment when account_stat is not yet initialized' do
       subject
 
-      increment_by   = 15
-      wait_for_start = true
-
-      threads = Array.new(increment_by) do
-        Thread.new do
-          true while wait_for_start
-          described_class.find(subject.id).increment_count!(:followers_count)
-        end
+      multi_threaded_execution(15) do
+        described_class.find(subject.id).increment_count!(:followers_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(subject.reload.followers_count).to eq 15
     end
   end
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index da2a774b2d..a08fd723a4 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -296,16 +296,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
       let!(:old_status)               { Fabricate(:status, created_at: 1.year.ago, account: account) }
       let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
 
-      it 'returns statuses including max_id' do
-        expect(subject).to include(old_status.id)
-      end
-
-      it 'returns statuses including older than max_id' do
-        expect(subject).to include(very_old_status.id)
-      end
-
-      it 'does not return statuses newer than max_id' do
-        expect(subject).to_not include(slightly_less_old_status.id)
+      it 'returns statuses included the max_id and older than the max_id but not newer than max_id' do
+        expect(subject)
+          .to include(old_status.id)
+          .and include(very_old_status.id)
+          .and not_include(slightly_less_old_status.id)
       end
     end
 
@@ -315,16 +310,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
       let!(:old_status)               { Fabricate(:status, created_at: 1.year.ago, account: account) }
       let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
 
-      it 'returns statuses including min_id' do
-        expect(subject).to include(old_status.id)
-      end
-
-      it 'returns statuses including newer than max_id' do
-        expect(subject).to include(slightly_less_old_status.id)
-      end
-
-      it 'does not return statuses older than min_id' do
-        expect(subject).to_not include(very_old_status.id)
+      it 'returns statuses including min_id and newer than min_id, but not older than min_id' do
+        expect(subject)
+          .to include(old_status.id)
+          .and include(slightly_less_old_status.id)
+          .and not_include(very_old_status.id)
       end
     end
 
@@ -339,12 +329,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_status_age = 2.years.seconds
       end
 
-      it 'does not return unrelated old status' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns only oldest status for deletion' do
-        expect(subject.pluck(:id)).to eq [very_old_status.id]
+      it 'does not return unrelated old status and does return oldest status' do
+        expect(subject.pluck(:id))
+          .to not_include(unrelated_status.id)
+          .and eq [very_old_status.id]
       end
     end
 
@@ -358,12 +346,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old direct message for deletion' do
-        expect(subject.pluck(:id)).to_not include(direct_message.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status except does not return the old direct message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(direct_message.id)
+          .and include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -377,12 +363,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = true
       end
 
-      it 'does not return the old self-bookmarked message for deletion' do
-        expect(subject.pluck(:id)).to_not include(self_bookmarked.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old self-bookmarked message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(self_bookmarked.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -396,12 +380,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old self-bookmarked message for deletion' do
-        expect(subject.pluck(:id)).to_not include(self_faved.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old self-faved message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(self_faved.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -415,12 +397,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old message with media for deletion' do
-        expect(subject.pluck(:id)).to_not include(status_with_media.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old message with media for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(status_with_media.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -434,12 +414,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old poll message for deletion' do
-        expect(subject.pluck(:id)).to_not include(status_with_poll.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old poll message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(status_with_poll.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -453,12 +431,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old pinned message for deletion' do
-        expect(subject.pluck(:id)).to_not include(pinned_status.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old pinned message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(pinned_status.id)
+          .and include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -472,16 +448,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the recent or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(unrelated_status.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -495,12 +466,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = true
       end
 
-      it 'does not return unrelated old status' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns only normal statuses for deletion' do
-        expect(subject.pluck(:id)).to contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns normal statuses and does not return unrelated old status' do
+        expect(subject.pluck(:id))
+          .to not_include(unrelated_status.id)
+          .and contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -509,20 +478,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_reblogs = 5
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the toot reblogged 5 times' do
-        expect(subject.pluck(:id)).to_not include(reblogged_secondary.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns old statuses not reblogged as much' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
+      it 'returns old not-reblogged statuses but does not return the recent, 5-times reblogged, or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(reblogged_secondary.id)
+          .and not_include(unrelated_status.id)
+          .and include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
       end
     end
 
@@ -531,20 +492,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_favs = 5
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the toot faved 5 times' do
-        expect(subject.pluck(:id)).to_not include(faved_secondary.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns old statuses not faved as much' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns old not-faved statuses but does not return the recent, 5-times faved, or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(faved_secondary.id)
+          .and not_include(unrelated_status.id)
+          .and include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
   end
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
new file mode 100644
index 0000000000..c2f8d0f86c
--- /dev/null
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
+  describe '#get' do
+    subject { described_class.new }
+
+    let!(:bob) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:alice) { Fabricate(:account, discoverable: true, hide_collections: true) }
+    let!(:eve) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:mallory) { Fabricate(:account, discoverable: false, hide_collections: false) }
+    let!(:eugen) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
+    let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
+
+    context 'with follows and blocks' do
+      before do
+        bob.block!(jerk)
+        FollowRecommendationMute.create!(account: bob, target_account: neil)
+
+        # bob follows eugen, alice and larry
+        [eugen, alice, larry].each { |account| bob.follow!(account) }
+
+        # alice follows eve and mallory
+        [john, mallory].each { |account| alice.follow!(account) }
+
+        # eugen follows eve, john, jerk, larry and neil
+        [eve, mallory, jerk, larry, neil].each { |account| eugen.follow!(account) }
+      end
+
+      it 'returns eligible accounts', :aggregate_failures do
+        results = subject.get(bob)
+
+        # eve is returned through eugen
+        expect(results).to include([eve.id, :friends_of_friends])
+
+        # john is not reachable because alice hides who she follows
+        expect(results).to_not include([john.id, :friends_of_friends])
+
+        # mallory is not discoverable
+        expect(results).to_not include([mallory.id, :friends_of_friends])
+
+        # larry is not included because he's followed already
+        expect(results).to_not include([larry.id, :friends_of_friends])
+
+        # jerk is blocked
+        expect(results).to_not include([jerk.id, :friends_of_friends])
+
+        # the suggestion for neil has already been rejected
+        expect(results).to_not include([neil.id, :friends_of_friends])
+      end
+    end
+
+    context 'with deterministic order' do
+      before do
+        # bob follows eve and mallory
+        [eve, mallory].each { |account| bob.follow!(account) }
+
+        # eve follows eugen, john, and jerk
+        [jerk, eugen, john].each { |account| eve.follow!(account) }
+
+        # mallory follows eugen, john, and neil
+        [neil, eugen, john].each { |account| mallory.follow!(account) }
+
+        john.follow!(eugen)
+        john.follow!(neil)
+      end
+
+      it 'returns eligible accounts in the expected order' do
+        expect(subject.get(bob)).to eq expected_results
+      end
+
+      it 'contains correct underlying source data' do
+        expect(source_query_values)
+          .to contain_exactly(
+            [john.id, 2, 2],  # Followed by 2 friends of bob (eve, mallory), 2 followers total (breaks tie)
+            [eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total
+            [jerk.id, 1, 1],  # Followed by 1 friends of bob (eve), 1 followers total (breaks tie)
+            [neil.id, 1, 2]   # Followed by 1 friends of bob (mallory), 2 followers total
+          )
+      end
+
+      def expected_results
+        [
+          [john.id, :friends_of_friends],
+          [eugen.id, :friends_of_friends],
+          [jerk.id, :friends_of_friends],
+          [neil.id, :friends_of_friends],
+        ]
+      end
+
+      def source_query_values
+        subject.source_query(bob).to_a
+      end
+    end
+  end
+end
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
index d8227e01bc..1666094082 100644
--- a/spec/models/account_suggestions/source_spec.rb
+++ b/spec/models/account_suggestions/source_spec.rb
@@ -11,14 +11,16 @@ RSpec.describe AccountSuggestions::Source do
     end
 
     context 'with follows and follow requests' do
-      let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host') }
-      let!(:account) { Fabricate(:account) }
-      let!(:blocked_account) { Fabricate(:account) }
-      let!(:eligible_account) { Fabricate(:account) }
-      let!(:follow_recommendation_muted_account) { Fabricate(:account) }
-      let!(:follow_requested_account) { Fabricate(:account) }
-      let!(:following_account) { Fabricate(:account) }
-      let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account)) }
+      let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host', discoverable: true) }
+      let!(:account) { Fabricate(:account, discoverable: true) }
+      let!(:blocked_account) { Fabricate(:account, discoverable: true) }
+      let!(:eligible_account) { Fabricate(:account, discoverable: true) }
+      let!(:follow_recommendation_muted_account) { Fabricate(:account, discoverable: true) }
+      let!(:follow_requested_account) { Fabricate(:account, discoverable: true) }
+      let!(:following_account) { Fabricate(:account, discoverable: true) }
+      let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account), discoverable: true) }
+      let!(:silenced_account) { Fabricate(:account, silenced: true, discoverable: true) }
+      let!(:undiscoverable_account) { Fabricate(:account, discoverable: false) }
 
       before do
         Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
@@ -40,6 +42,8 @@ RSpec.describe AccountSuggestions::Source do
           .and not_include(follow_requested_account)
           .and not_include(following_account)
           .and not_include(moved_account)
+          .and not_include(silenced_account)
+          .and not_include(undiscoverable_account)
       end
     end
   end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 9bc9f8061d..a9dcf352dc 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -69,22 +69,22 @@ RSpec.describe Admin::AccountAction do
       end
     end
 
-    it 'creates Admin::ActionLog' do
+    it 'sends notification, log the action, and closes other reports', :aggregate_failures do
+      other_report = Fabricate(:report, target_account: target_account)
+
+      emails = []
       expect do
-        subject
-      end.to change(Admin::ActionLog, :count).by 1
-    end
+        emails = capture_emails { subject }
+      end.to (change(Admin::ActionLog.where(action: type), :count).by 1)
+         .and(change { other_report.reload.action_taken? }.from(false).to(true))
 
-    it 'calls process_email!' do
-      allow(account_action).to receive(:process_email!)
-      subject
-      expect(account_action).to have_received(:process_email!)
-    end
+      expect(emails).to contain_exactly(
+        have_attributes(
+          to: contain_exactly(target_account.user.email)
+        )
+      )
 
-    it 'calls process_reports!' do
-      allow(account_action).to receive(:process_reports!)
-      subject
-      expect(account_action).to have_received(:process_reports!)
+      expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(target_account.id, anything, 'AccountWarning', 'moderation_warning')
     end
   end
 
diff --git a/spec/models/admin/ng_rule_spec.rb b/spec/models/admin/ng_rule_spec.rb
new file mode 100644
index 0000000000..8e04bc1696
--- /dev/null
+++ b/spec/models/admin/ng_rule_spec.rb
@@ -0,0 +1,282 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::NgRule do
+  shared_examples 'matches rule' do |reason|
+    it 'matches and history is added' do
+      expect(subject).to be false
+
+      history = NgRuleHistory.order(id: :desc).find_by(ng_rule: ng_rule)
+      expect(history).to_not be_nil
+      expect(history.account_id).to eq account.id
+      expect(history.reason).to eq reason
+      expect(history.uri).to eq uri
+    end
+  end
+
+  shared_examples 'does not match rule' do
+    it 'does not match and history is not added' do
+      expect(subject).to be true
+
+      history = NgRuleHistory.order(id: :desc).find_by(ng_rule: ng_rule)
+      expect(history).to be_nil
+    end
+  end
+
+  shared_examples 'check all states' do |reason, results|
+    context 'when rule state is optional' do
+      let(:state) { :optional }
+
+      it_behaves_like results[0] ? 'does not match rule' : 'matches rule', reason
+    end
+
+    context 'when rule state is needed' do
+      let(:state) { :needed }
+
+      it_behaves_like results[1] ? 'does not match rule' : 'matches rule', reason
+    end
+
+    context 'when rule state is no_needed' do
+      let(:state) { :no_needed }
+
+      it_behaves_like results[2] ? 'does not match rule' : 'matches rule', reason
+    end
+  end
+
+  let(:uri) { 'https://example.com/operation' }
+
+  describe '#check_account_or_record!' do
+    subject { described_class.new(ng_rule, account).check_account_or_record! }
+
+    context 'when unmatch rule' do
+      let(:ng_rule) { Fabricate(:ng_rule, account_note: 'assur', account_include_local: true) }
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: uri) }
+
+      it_behaves_like 'does not match rule'
+    end
+
+    context 'with domain rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: uri) }
+      let(:ng_rule) { Fabricate(:ng_rule, account_domain: '?example\..*') }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
+    context 'with note rule' do
+      let(:uri) { '' }
+      let(:account) { Fabricate(:account, note: 'ohagi is good') }
+      let(:ng_rule) { Fabricate(:ng_rule, account_note: 'ohagi', account_include_local: true) }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
+    context 'with display name rule' do
+      let(:uri) { '' }
+      let(:account) { Fabricate(:account, display_name: '') }
+      let(:ng_rule) { Fabricate(:ng_rule, account_display_name: "?^$\r\n?[a-z0-9]{10}", account_include_local: true) }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
+    context 'with field name rule' do
+      let(:account) { Fabricate(:account, fields_attributes: { '0' => { name: 'Name', value: 'Value' } }, domain: 'example.com', uri: uri) }
+      let(:ng_rule) { Fabricate(:ng_rule, account_field_name: 'Name') }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
+    context 'with field value rule' do
+      let(:account) { Fabricate(:account, fields_attributes: { '0' => { name: 'Name', value: 'Value' } }, domain: 'example.com', uri: uri) }
+      let(:ng_rule) { Fabricate(:ng_rule, account_field_value: 'Value') }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
+    context 'with avatar rule' do
+      context 'when avatar is not set' do
+        let(:account) { Fabricate(:account, domain: 'example.com', uri: uri) }
+        let(:ng_rule) { Fabricate(:ng_rule, account_avatar_state: state) }
+
+        it_behaves_like 'check all states', 'account', [false, true, false]
+      end
+
+      context 'when avatar is set' do
+        let(:account) { Fabricate(:account, avatar: fixture_file_upload('avatar.gif', 'image/gif'), domain: 'example.com', uri: uri) }
+        let(:ng_rule) { Fabricate(:ng_rule, account_avatar_state: state) }
+
+        it_behaves_like 'check all states', 'account', [false, false, true]
+      end
+    end
+  end
+
+  describe '#check_status_or_record!' do
+    subject do
+      opts = { reaction_type: 'create' }.merge(options)
+      described_class.new(ng_rule, account, **opts).check_status_or_record!
+    end
+
+    context 'when status matches but account does not match' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, text: 'this is a spam' } }
+      let(:ng_rule) { Fabricate(:ng_rule, account_domain: 'ohagi.jp', status_text: 'spam') }
+
+      it_behaves_like 'does not match rule'
+    end
+
+    context 'when account matches but status does not match' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, text: 'this is a spam' } }
+      let(:ng_rule) { Fabricate(:ng_rule, account_domain: 'example.com', status_text: 'span') }
+
+      it_behaves_like 'does not match rule'
+    end
+
+    context 'with text rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, text: 'this is a spam' } }
+      let(:ng_rule) { Fabricate(:ng_rule, status_text: 'spam') }
+
+      it_behaves_like 'matches rule', 'status'
+
+      it 'records as public' do
+        subject
+
+        history = NgRuleHistory.order(id: :desc).find_by(ng_rule: ng_rule)
+        expect(history.hidden).to be false
+      end
+    end
+
+    context 'with visibility rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:ng_rule) { Fabricate(:ng_rule, status_visibility: ['public', 'public_unlisted']) }
+
+      context 'with public visibility' do
+        let(:options) { { uri: uri, visibility: 'public' } }
+
+        it_behaves_like 'matches rule', 'status'
+      end
+
+      context 'with unlisted visibility' do
+        let(:options) { { uri: uri, visibility: 'unlisted' } }
+
+        it_behaves_like 'does not match rule', 'status'
+      end
+    end
+
+    context 'with searchability rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:ng_rule) { Fabricate(:ng_rule, status_searchability: ['public', 'public_unlisted']) }
+
+      context 'with public searchability' do
+        let(:options) { { uri: uri, searchability: 'public' } }
+
+        it_behaves_like 'matches rule', 'status'
+      end
+
+      context 'with private searchability' do
+        let(:options) { { uri: uri, searchability: 'private' } }
+
+        it_behaves_like 'does not match rule', 'status'
+      end
+
+      context 'with unset' do
+        let(:options) { { uri: uri, searchability: nil } }
+
+        it_behaves_like 'does not match rule', 'status'
+      end
+    end
+
+    context 'with reply rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, reply: false } }
+      let(:ng_rule) { Fabricate(:ng_rule, status_reply_state: :no_needed) }
+
+      it_behaves_like 'matches rule', 'status'
+    end
+
+    context 'with media size rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, media_count: 5 } }
+      let(:ng_rule) { Fabricate(:ng_rule, status_media_threshold: 4) }
+
+      it_behaves_like 'matches rule', 'status'
+    end
+
+    context 'with mention size rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, mention_count: 5 } }
+      let(:ng_rule) { Fabricate(:ng_rule, status_mention_threshold: 4, status_allow_follower_mention: false) }
+
+      it_behaves_like 'matches rule', 'status'
+
+      context 'when mention to stranger' do
+        let(:options) { { uri: uri, mention_count: 5, mention_to_following: false } }
+        let(:ng_rule) { Fabricate(:ng_rule, status_mention_threshold: 4, status_allow_follower_mention: true) }
+
+        it_behaves_like 'matches rule', 'status'
+      end
+
+      context 'when mention to follower' do
+        let(:options) { { uri: uri, mention_count: 5, mention_to_following: true } }
+        let(:ng_rule) { Fabricate(:ng_rule, status_mention_threshold: 4, status_allow_follower_mention: true) }
+
+        it_behaves_like 'does not match rule', 'status'
+      end
+    end
+
+    context 'with private privacy' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, text: 'this is a spam', visibility: 'private' } }
+      let(:ng_rule) { Fabricate(:ng_rule, status_text: 'spam', status_visibility: %w(private)) }
+
+      it 'records as hidden' do
+        expect(subject).to be false
+
+        history = NgRuleHistory.order(id: :desc).find_by(ng_rule: ng_rule)
+        expect(history).to_not be_nil
+        expect(history.account_id).to eq account.id
+        expect(history.reason).to eq 'status'
+        expect(history.uri).to be_nil
+        expect(history.hidden).to be true
+        expect(history.text).to be_nil
+      end
+    end
+  end
+
+  describe '#check_reaction_or_record!' do
+    subject do
+      described_class.new(ng_rule, account, **options).check_reaction_or_record!
+    end
+
+    context 'when account matches but reaction does not match' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'favourite' } }
+      let(:ng_rule) { Fabricate(:ng_rule, account_domain: 'example.com', status_text: 'span', reaction_type: ['reblog']) }
+
+      it_behaves_like 'does not match rule'
+    end
+
+    context 'with reaction type rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'favourite' } }
+      let(:ng_rule) { Fabricate(:ng_rule, reaction_type: ['favourite', 'follow']) }
+
+      it_behaves_like 'matches rule', 'reaction'
+
+      context 'when reblog' do
+        let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'reblog' } }
+
+        it_behaves_like 'does not match rule'
+      end
+    end
+
+    context 'with emoji reaction shortcode rule' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:options) { { uri: uri, recipient: Fabricate(:account), reaction_type: 'emoji_reaction', emoji_reaction_name: 'ohagi' } }
+      let(:ng_rule) { Fabricate(:ng_rule, reaction_type: ['emoji_reaction'], emoji_reaction_name: 'ohagi') }
+
+      it_behaves_like 'matches rule', 'reaction'
+    end
+  end
+end
diff --git a/spec/models/admin/ng_word_spec.rb b/spec/models/admin/ng_word_spec.rb
new file mode 100644
index 0000000000..15dac24775
--- /dev/null
+++ b/spec/models/admin/ng_word_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::NgWord do
+  describe '#reject?' do
+    subject { described_class.reject?(text, stranger: stranger, uri: uri, target_type: :status) }
+
+    let(:text) { 'This is a ohagi.' }
+    let(:stranger) { false }
+    let(:uri) { nil }
+
+    context 'when general post' do
+      it 'ng word hits' do
+        Fabricate(:ng_word, keyword: 'ohagi', stranger: false)
+        expect(subject).to be true
+      end
+
+      it 'else ng word does not hit' do
+        Fabricate(:ng_word, keyword: 'angry', stranger: false)
+        expect(subject).to be false
+      end
+
+      it 'stranger word does not hit' do
+        Fabricate(:ng_word, keyword: 'ohagi', stranger: true)
+        expect(subject).to be false
+      end
+    end
+
+    context 'when mention to stranger' do
+      let(:stranger) { true }
+
+      it 'ng word hits' do
+        Fabricate(:ng_word, keyword: 'ohagi', stranger: true)
+        expect(subject).to be true
+      end
+
+      it 'else ng word does not hit' do
+        Fabricate(:ng_word, keyword: 'angry', stranger: true)
+        expect(subject).to be false
+      end
+
+      it 'general word hits' do
+        Fabricate(:ng_word, keyword: 'ohagi', stranger: false)
+        expect(subject).to be true
+      end
+    end
+
+    context 'when remote post' do
+      let(:uri) { 'https://example.com/note' }
+
+      it 'ng word hits' do
+        Fabricate(:ng_word, keyword: 'ohagi', stranger: false)
+        expect(subject).to be true
+        expect(NgwordHistory.find_by(uri: uri)).to_not be_nil
+      end
+
+      it 'else ng word does not hit' do
+        Fabricate(:ng_word, keyword: 'angry', stranger: false)
+        expect(subject).to be false
+        expect(NgwordHistory.find_by(uri: uri)).to be_nil
+      end
+    end
+
+    context 'when using regexp' do
+      it 'regexp hits with enable' do
+        Fabricate(:ng_word, keyword: 'oha[ghi]i', regexp: true, stranger: false)
+        expect(subject).to be true
+      end
+
+      it 'regexp does not hit without enable' do
+        Fabricate(:ng_word, keyword: 'oha[ghi]i', regexp: false, stranger: false)
+        expect(subject).to be false
+      end
+    end
+  end
+end
diff --git a/spec/models/admin/sensitive_word_spec.rb b/spec/models/admin/sensitive_word_spec.rb
new file mode 100644
index 0000000000..b07127dafa
--- /dev/null
+++ b/spec/models/admin/sensitive_word_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::SensitiveWord do
+  describe '#sensitive?' do
+    subject { described_class.sensitive?(text, spoiler_text, local: local) }
+
+    let(:text) { 'This is a ohagi.' }
+    let(:spoiler_text) { '' }
+    let(:local) { true }
+
+    context 'when a local post' do
+      it 'local word hits' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', remote: false)
+        expect(subject).to be true
+      end
+
+      it 'remote word hits' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', remote: true)
+        expect(subject).to be true
+      end
+    end
+
+    context 'when a remote post' do
+      let(:local) { false }
+
+      it 'local word does not hit' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', remote: false)
+        expect(subject).to be false
+      end
+
+      it 'remote word hits' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', remote: true)
+        expect(subject).to be true
+      end
+    end
+
+    context 'when using regexp' do
+      it 'regexp hits with enable' do
+        Fabricate(:sensitive_word, keyword: 'oha[ghi]i', regexp: true)
+        expect(subject).to be true
+      end
+
+      it 'regexp does not hit without enable' do
+        Fabricate(:sensitive_word, keyword: 'oha[ghi]i', regexp: false)
+        expect(subject).to be false
+      end
+    end
+
+    context 'when spoiler text is set' do
+      let(:spoiler_text) { 'amy' }
+
+      it 'sensitive word in content is escaped' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', spoiler: false)
+        expect(subject).to be false
+      end
+
+      it 'sensitive word in content is escaped even if spoiler is true' do
+        Fabricate(:sensitive_word, keyword: 'ohagi', spoiler: true)
+        expect(subject).to be false
+      end
+
+      it 'non-spoiler word does not hit' do
+        Fabricate(:sensitive_word, keyword: 'amy', spoiler: false)
+        expect(subject).to be false
+      end
+
+      it 'spoiler word hits' do
+        Fabricate(:sensitive_word, keyword: 'amy', spoiler: true)
+        expect(subject).to be true
+      end
+    end
+  end
+end
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index 612ba8bb0d..1e7283ca77 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -115,26 +115,35 @@ describe Announcement do
 
   describe '#reactions' do
     context 'with announcement_reactions present' do
+      let(:account_reaction_emoji) { Fabricate :custom_emoji }
+      let(:other_reaction_emoji) { Fabricate :custom_emoji }
       let!(:account) { Fabricate(:account) }
       let!(:announcement) { Fabricate(:announcement) }
-      let!(:announcement_reaction) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago) }
-      let!(:announcement_reaction_account) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account) }
 
       before do
-        Fabricate(:announcement_reaction)
+        Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago, name: other_reaction_emoji.shortcode)
+        Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account, name: account_reaction_emoji.shortcode)
+        Fabricate(:announcement_reaction) # For some other announcement
       end
 
       it 'returns the announcement reactions for the announcement' do
         results = announcement.reactions
 
-        expect(results.first.name).to eq(announcement_reaction.name)
-        expect(results.last.name).to eq(announcement_reaction_account.name)
+        expect(results).to have_attributes(
+          size: eq(2),
+          first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+          last: have_attributes(name: account_reaction_emoji.shortcode, me: false)
+        )
       end
 
-      it 'returns the announcement reactions for the announcement limited to account' do
+      it 'returns the announcement reactions for the announcement with `me` set correctly' do
         results = announcement.reactions(account)
 
-        expect(results.first.name).to eq(announcement_reaction.name)
+        expect(results).to have_attributes(
+          size: eq(2),
+          first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+          last: have_attributes(name: account_reaction_emoji.shortcode, me: true)
+        )
       end
     end
   end
diff --git a/spec/models/concerns/account/counters_spec.rb b/spec/models/concerns/account/counters_spec.rb
index 2e1cd700bc..ccac9e95de 100644
--- a/spec/models/concerns/account/counters_spec.rb
+++ b/spec/models/concerns/account/counters_spec.rb
@@ -6,6 +6,8 @@ describe Account::Counters do
   let!(:account) { Fabricate(:account) }
 
   describe '#increment_count!' do
+    let(:increment_by) { 15 }
+
     it 'increments the count' do
       expect(account.followers_count).to eq 0
       account.increment_count!(:followers_count)
@@ -13,24 +15,17 @@ describe Account::Counters do
     end
 
     it 'increments the count in multi-threaded an environment' do
-      increment_by   = 15
-      wait_for_start = true
-
-      threads = Array.new(increment_by) do
-        Thread.new do
-          true while wait_for_start
-          account.increment_count!(:statuses_count)
-        end
+      multi_threaded_execution(increment_by) do
+        account.increment_count!(:statuses_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(account.statuses_count).to eq increment_by
     end
   end
 
   describe '#decrement_count!' do
+    let(:decrement_by) { 10 }
+
     it 'decrements the count' do
       account.followers_count = 15
       account.save!
@@ -40,23 +35,27 @@ describe Account::Counters do
     end
 
     it 'decrements the count in multi-threaded an environment' do
-      decrement_by   = 10
-      wait_for_start = true
-
       account.statuses_count = 15
       account.save!
 
-      threads = Array.new(decrement_by) do
-        Thread.new do
-          true while wait_for_start
-          account.decrement_count!(:statuses_count)
-        end
+      multi_threaded_execution(decrement_by) do
+        account.decrement_count!(:statuses_count)
       end
 
-      wait_for_start = false
-      threads.each(&:join)
-
       expect(account.statuses_count).to eq 5
     end
+
+    it 'preserves last_status_at when decrementing statuses_count' do
+      account_stat = Fabricate(
+        :account_stat,
+        account: account,
+        last_status_at: 3.days.ago,
+        statuses_count: 10
+      )
+
+      expect { account.decrement_count!(:statuses_count) }
+        .to change(account_stat.reload, :statuses_count).by(-1)
+        .and not_change(account_stat.reload, :last_status_at)
+    end
   end
 end
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index 6fac41e071..f612a2847b 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -9,6 +9,8 @@ describe Account::Interactions do
   let(:target_account)     { Fabricate(:account, username: 'target') }
   let(:target_account_id)  { target_account.id }
   let(:target_account_ids) { [target_account_id] }
+  let(:follower_account)   { Fabricate(:account, username: 'follower') }
+  let(:followee_account)   { Fabricate(:account, username: 'followee') }
 
   describe '.following_map' do
     subject { Account.following_map(target_account_ids, account_id) }
@@ -250,6 +252,24 @@ describe Account::Interactions do
     end
   end
 
+  describe '#block_idna_domain!' do
+    subject do
+      [
+        account.block_domain!(idna_domain),
+        account.block_domain!(punycode_domain),
+      ]
+    end
+
+    let(:idna_domain) { '대한민국.한국' }
+    let(:punycode_domain) { 'xn--3e0bs9hfvinn1a.xn--3e0b707e' }
+
+    it 'creates single AccountDomainBlock' do
+      expect do
+        expect(subject).to all(be_a AccountDomainBlock)
+      end.to change { account.domain_blocks.count }.by 1
+    end
+  end
+
   describe '#unfollow!' do
     subject { account.unfollow!(target_account) }
 
@@ -345,6 +365,28 @@ describe Account::Interactions do
     end
   end
 
+  describe '#unblock_idna_domain!' do
+    subject { account.unblock_domain!(punycode_domain) }
+
+    let(:idna_domain) { '대한민국.한국' }
+    let(:punycode_domain) { 'xn--3e0bs9hfvinn1a.xn--3e0b707e' }
+
+    context 'when blocking the domain' do
+      it 'returns destroyed AccountDomainBlock' do
+        account_domain_block = Fabricate(:account_domain_block, domain: idna_domain)
+        account.domain_blocks << account_domain_block
+        expect(subject).to be_a AccountDomainBlock
+        expect(subject).to be_destroyed
+      end
+    end
+
+    context 'when unblocking idna domain' do
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+  end
+
   describe '#following?' do
     subject { account.following?(target_account) }
 
@@ -379,6 +421,43 @@ describe Account::Interactions do
     end
   end
 
+  describe '#followed_by_domain?' do
+    subject { account.followed_by_domain?('example.com') }
+
+    let(:target_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+
+    context 'when followed by target_account' do
+      it 'returns true' do
+        account.passive_relationships.create(account: target_account)
+        expect(subject).to be true
+      end
+    end
+
+    context 'when not followed by target_account' do
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+
+    context 'with status' do
+      subject { account.followed_by_domain?('example.com', '2022/12/24 10:00:00') }
+
+      context 'when followed by target_account since the time' do
+        it 'returns true' do
+          account.passive_relationships.create(account: target_account, created_at: '2022/12/22 10:00:00')
+          expect(subject).to be true
+        end
+      end
+
+      context 'when followed by target_account after the time' do
+        it 'returns false' do
+          account.passive_relationships.create(account: target_account, created_at: '2022/12/26 10:00:00')
+          expect(subject).to be false
+        end
+      end
+    end
+  end
+
   describe '#blocking?' do
     subject { account.blocking?(target_account) }
 
@@ -709,4 +788,20 @@ describe Account::Interactions do
       expect(account.lists_for_local_distribution.to_a).to contain_exactly(follower_list, self_list)
     end
   end
+
+  describe '#mutuals' do
+    subject { account.mutuals }
+
+    context 'when following target_account' do
+      it 'mutual one' do
+        account.follow!(target_account)
+        target_account.follow!(account)
+        follower_account.follow!(account)
+        account.follow!(followee_account)
+
+        expect(subject.count).to eq 1
+        expect(subject.first.id).to eq target_account.id
+      end
+    end
+  end
 end
diff --git a/spec/models/concerns/status/threading_concern_spec.rb b/spec/models/concerns/status/threading_concern_spec.rb
index 09fb218566..272c455d48 100644
--- a/spec/models/concerns/status/threading_concern_spec.rb
+++ b/spec/models/concerns/status/threading_concern_spec.rb
@@ -129,4 +129,56 @@ describe Status::ThreadingConcern do
       expect(a.descendants(20)).to eq [c, d, e, f]
     end
   end
+
+  describe '#readable_references' do
+    subject { status.readable_references(account).pluck(:id) }
+
+    let(:visibility) { :public }
+    let(:alice) { Fabricate(:account) }
+    let(:referred_account) { Fabricate(:account) }
+    let(:status) { Fabricate(:status, account: account) }
+    let(:referred_status) { Fabricate(:status, account: referred_account, visibility: visibility) }
+    let(:referred_follower) { Fabricate(:account) }
+    let(:follower) { Fabricate(:account) }
+    let(:third_account) { Fabricate(:account) }
+    let(:account) { third_account }
+
+    before do
+      referred_follower.follow!(referred_account)
+      follower.follow!(alice)
+      Fabricate(:status_reference, status: status, target_status: referred_status)
+    end
+
+    it 'with a simple case' do
+      expect(subject).to include referred_status.id
+    end
+
+    context 'when private post' do
+      let(:visibility) { :private }
+
+      context 'with referred post follower' do
+        let(:account) { referred_follower }
+
+        it 'can show' do
+          expect(subject).to include referred_status.id
+        end
+      end
+
+      context 'with original post follower' do
+        let(:account) { follower }
+
+        it 'can show' do
+          expect(subject).to_not include referred_status.id
+        end
+      end
+
+      context 'with other account' do
+        let(:account) { third_account }
+
+        it 'can show' do
+          expect(subject).to_not include referred_status.id
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index a0903e5978..d07d085848 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -49,6 +49,52 @@ RSpec.describe CustomEmoji do
     end
   end
 
+  describe '#copy!' do
+    subject do
+      custom_emoji.copy!
+      described_class.where.not(id: custom_emoji.id).find_by(domain: nil, shortcode: custom_emoji.shortcode)
+    end
+
+    context 'when a simple case' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, license: 'Ohagi', aliases: %w(aaa bbb), domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy ot the emoji' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.license).to eq 'Ohagi'
+        expect(emoji.aliases).to eq %w(aaa bbb)
+      end
+    end
+
+    context 'when local has already same emoji' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, domain: nil) }
+
+      it 'does not make a copy of the emoji' do
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'when aliases is null' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, aliases: nil, domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy of the emoji but aliases property is normalized' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.aliases).to eq []
+      end
+    end
+
+    context 'when aliases contains null' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, aliases: [nil], domain: 'example.com', uri: 'https://example.com/emoji') }
+
+      it 'makes a copy of the emoji but aliases property is normalized' do
+        emoji = subject
+        expect(emoji).to_not be_nil
+        expect(emoji.aliases).to eq []
+      end
+    end
+  end
+
   describe '#object_type' do
     it 'returns :emoji' do
       custom_emoji = Fabricate(:custom_emoji)
diff --git a/spec/models/custom_filter_keyword_spec.rb b/spec/models/custom_filter_keyword_spec.rb
new file mode 100644
index 0000000000..4e3ab060a0
--- /dev/null
+++ b/spec/models/custom_filter_keyword_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomFilterKeyword do
+  describe '#to_regex' do
+    context 'when whole_word is true' do
+      it 'builds a regex with boundaries and the keyword' do
+        keyword = described_class.new(whole_word: true, keyword: 'test')
+
+        expect(keyword.to_regex).to eq(/(?mix:\b#{Regexp.escape(keyword.keyword)}\b)/)
+      end
+
+      it 'builds a regex with starting boundary and the keyword when end with non-word' do
+        keyword = described_class.new(whole_word: true, keyword: 'test#')
+
+        expect(keyword.to_regex).to eq(/(?mix:\btest\#)/)
+      end
+
+      it 'builds a regex with end boundary and the keyword when start with non-word' do
+        keyword = described_class.new(whole_word: true, keyword: '#test')
+
+        expect(keyword.to_regex).to eq(/(?mix:\#test\b)/)
+      end
+    end
+
+    context 'when whole_word is false' do
+      it 'builds a regex with the keyword' do
+        keyword = described_class.new(whole_word: false, keyword: 'test')
+
+        expect(keyword.to_regex).to eq(/test/i)
+      end
+    end
+  end
+end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 9404936337..8ac9dbb896 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -32,4 +32,12 @@ RSpec.describe CustomFilter do
       expect(record).to model_have_error_on_field(:context)
     end
   end
+
+  describe 'Normalizations' do
+    it 'cleans up context values' do
+      record = described_class.new(context: ['home', 'notifications', 'public    ', ''])
+
+      expect(record.context).to eq(%w(home notifications public))
+    end
+  end
 end
diff --git a/spec/models/domain_allow_spec.rb b/spec/models/domain_allow_spec.rb
index 49e16376ea..12504211a1 100644
--- a/spec/models/domain_allow_spec.rb
+++ b/spec/models/domain_allow_spec.rb
@@ -3,16 +3,18 @@
 require 'rails_helper'
 
 describe DomainAllow do
-  describe 'scopes' do
-    describe 'matches_domain' do
-      let(:domain) { Fabricate(:domain_allow, domain: 'example.com') }
-      let(:other_domain) { Fabricate(:domain_allow, domain: 'example.biz') }
+  describe 'Validations' do
+    it 'is invalid without a domain' do
+      domain_allow = Fabricate.build(:domain_allow, domain: nil)
+      domain_allow.valid?
+      expect(domain_allow).to model_have_error_on_field(:domain)
+    end
 
-      it 'returns the correct records' do
-        results = described_class.matches_domain('example.com')
-
-        expect(results).to eq([domain])
-      end
+    it 'is invalid if the same normalized domain already exists' do
+      _domain_allow = Fabricate(:domain_allow, domain: 'にゃん')
+      domain_allow_with_normalized_value = Fabricate.build(:domain_allow, domain: 'xn--r9j5b5b')
+      domain_allow_with_normalized_value.valid?
+      expect(domain_allow_with_normalized_value).to model_have_error_on_field(:domain)
     end
   end
 end
diff --git a/spec/models/form/custom_emoji_batch_spec.rb b/spec/models/form/custom_emoji_batch_spec.rb
index abeada5d50..047d155a1d 100644
--- a/spec/models/form/custom_emoji_batch_spec.rb
+++ b/spec/models/form/custom_emoji_batch_spec.rb
@@ -95,12 +95,12 @@ describe Form::CustomEmojiBatch do
     end
 
     describe 'the copy action' do
-      let(:custom_emoji) { Fabricate(:custom_emoji) }
+      let(:custom_emoji) { Fabricate(:custom_emoji, domain: 'example.com', uri: 'https://example.com/emoji') }
       let(:options) { { action: 'copy', custom_emoji_ids: [custom_emoji.id] } }
 
       it 'makes a copy of the emoji' do
         expect { subject.save }
-          .to change(CustomEmoji, :count).by(1)
+          .to change(CustomEmoji, :count).by(2)
       end
     end
 
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index 872697485e..69b38427ef 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Form::Import do
 
       it 'has errors' do
         subject.validate
-        expect(subject.errors[:data]).to include(I18n.t('imports.errors.over_rows_processing_limit', count: Form::Import::ROWS_PROCESSING_LIMIT))
+        expect(subject.errors[:data]).to include(I18n.t('imports.errors.over_rows_processing_limit', count: described_class::ROWS_PROCESSING_LIMIT))
       end
     end
 
@@ -281,7 +281,7 @@ RSpec.describe Form::Import do
         end
 
         it 'defaults to unconfirmed true' do
-          expect(bulk_import.unconfirmed?).to be true
+          expect(bulk_import.state_unconfirmed?).to be true
         end
       end
     end
@@ -291,7 +291,7 @@ RSpec.describe Form::Import do
     it_behaves_like 'on successful import', 'blocking', 'merge', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
     it_behaves_like 'on successful import', 'blocking', 'overwrite', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
     it_behaves_like 'on successful import', 'muting', 'merge', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'domain_blocking', 'merge', 'domain_blocks.csv', (%w(bad.domain worse.domain reject.media).map { |domain| { 'domain' => domain } })
+    it_behaves_like 'on successful import', 'domain_blocking', 'merge', 'domain_blocks.csv', (%w(bad.domain worse.domain reject.media little.spam).map { |domain| { 'domain' => domain } })
     it_behaves_like 'on successful import', 'bookmarks', 'merge', 'bookmark-imports.txt', (%w(https://example.com/statuses/1312 https://local.com/users/foo/statuses/42 https://unknown-remote.com/users/bar/statuses/1 https://example.com/statuses/direct).map { |uri| { 'uri' => uri } })
 
     it_behaves_like 'on successful import', 'following', 'merge', 'following_accounts.csv', [
diff --git a/spec/models/friend_domain_spec.rb b/spec/models/friend_domain_spec.rb
new file mode 100644
index 0000000000..b92dbe7550
--- /dev/null
+++ b/spec/models/friend_domain_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe FriendDomain do
+  let(:friend) { Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox') }
+
+  before do
+    stub_request(:post, 'https://foo.bar/inbox')
+  end
+
+  describe '#follow!' do
+    it 'call inbox', :sidekiq_inline do
+      friend.update(active_state: :accepted, passive_state: :accepted)
+      friend.follow!
+      expect(friend.active_follow_activity_id).to_not be_nil
+      expect(friend.i_am_pending?).to be true
+      expect(friend.they_are_idle?).to be true
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        id: friend.active_follow_activity_id,
+        type: 'Follow',
+        actor: 'https://cb6e6126.ngrok.io/actor',
+        object: 'https://www.w3.org/ns/activitystreams#Public',
+        inboxUrl: 'https://cb6e6126.ngrok.io/inbox',
+      }))).to have_been_made.once
+    end
+  end
+
+  describe '#unfollow!' do
+    it 'call inbox', :sidekiq_inline do
+      friend.update(active_follow_activity_id: 'ohagi', active_state: :accepted, passive_state: :accepted)
+      friend.unfollow!
+      expect(friend.active_follow_activity_id).to be_nil
+      expect(friend.i_am_idle?).to be true
+      expect(friend.they_are_idle?).to be true
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Undo',
+        object: {
+          id: 'ohagi',
+          type: 'Follow',
+          actor: 'https://cb6e6126.ngrok.io/actor',
+          object: 'https://www.w3.org/ns/activitystreams#Public',
+        },
+      }))).to have_been_made.once
+    end
+  end
+
+  describe '#accept!' do
+    it 'call inbox', :sidekiq_inline do
+      friend.update(passive_follow_activity_id: 'ohagi', active_state: :accepted, passive_state: :pending)
+      friend.accept!
+      expect(friend.they_are_accepted?).to be true
+      expect(friend.i_am_idle?).to be true
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        id: 'ohagi#accepts/friends',
+        type: 'Accept',
+        actor: 'https://cb6e6126.ngrok.io/actor',
+        object: 'ohagi',
+      }))).to have_been_made.once
+    end
+  end
+
+  describe '#reject!' do
+    it 'call inbox', :sidekiq_inline do
+      friend.update(passive_follow_activity_id: 'ohagi', active_state: :accepted, passive_state: :pending)
+      friend.reject!
+      expect(friend.they_are_rejected?).to be true
+      expect(friend.i_am_idle?).to be true
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        id: 'ohagi#rejects/friends',
+        type: 'Reject',
+        actor: 'https://cb6e6126.ngrok.io/actor',
+        object: 'ohagi',
+      }))).to have_been_made.once
+    end
+  end
+
+  describe '#delete!' do
+    it 'call inbox', :sidekiq_inline do
+      friend.update(active_state: :pending)
+      friend.destroy
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Delete',
+        actor: 'https://cb6e6126.ngrok.io/actor',
+        object: 'https://www.w3.org/ns/activitystreams#Public',
+      }))).to have_been_made.once
+    end
+  end
+end
diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb
index bd649d8269..06bb63b1a4 100644
--- a/spec/models/home_feed_spec.rb
+++ b/spec/models/home_feed_spec.rb
@@ -27,7 +27,6 @@ RSpec.describe HomeFeed do
         results = subject.get(3)
 
         expect(results.map(&:id)).to eq [3, 2]
-        expect(results.first.attributes.keys).to eq %w(id updated_at)
       end
     end
 
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 7022454443..d5a2ffbc86 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -3,19 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe Identity do
-  describe '.find_for_oauth' do
+  describe '.find_for_omniauth' do
     let(:auth) { Fabricate(:identity, user: Fabricate(:user)) }
 
     it 'calls .find_or_create_by' do
       allow(described_class).to receive(:find_or_create_by)
 
-      described_class.find_for_oauth(auth)
+      described_class.find_for_omniauth(auth)
 
       expect(described_class).to have_received(:find_or_create_by).with(uid: auth.uid, provider: auth.provider)
     end
 
     it 'returns an instance of Identity' do
-      expect(described_class.find_for_oauth(auth)).to be_instance_of described_class
+      expect(described_class.find_for_omniauth(auth)).to be_instance_of described_class
     end
   end
 end
diff --git a/spec/models/instance_info_spec.rb b/spec/models/instance_info_spec.rb
new file mode 100644
index 0000000000..32208ee8f8
--- /dev/null
+++ b/spec/models/instance_info_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe InstanceInfo do
+  describe '.available_features#emoji_reaction' do
+    subject { described_class.available_features('example.com')[:emoji_reaction] }
+
+    it 'availables if local account' do
+      expect(described_class.available_features(nil)[:emoji_reaction]).to be true
+    end
+
+    it 'availables if features contains emoji_reaction' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon', data: { metadata: { features: ['emoji_reaction'] } })
+      expect(subject).to be true
+    end
+
+    it 'unavailables if features does not contain emoji_reaction' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon', data: { metadata: { features: ['ohagi'] } })
+      expect(subject).to be false
+    end
+
+    it 'unavailables if features is not valid' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon', data: { metadata: { features: 'good_for_ohagi' } })
+      expect(subject).to be false
+    end
+
+    it 'unavailables if features is nil' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon', data: { metadata: { features: nil } })
+      expect(subject).to be false
+    end
+
+    it 'unavailables if mastodon server' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon')
+      expect(subject).to be false
+    end
+
+    it 'availables if misskey server' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'misskey')
+      expect(subject).to be true
+    end
+
+    it 'unavailables if old mastodon server' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'mastodon', data: { metadata: [] })
+      expect(subject).to be false
+    end
+  end
+
+  describe '.available_features#circle' do
+    subject { described_class.available_features('example.com')[:circle] }
+
+    it 'does not available if misskey server' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'misskey')
+      expect(subject).to be false
+    end
+
+    it 'availables if misskey server with features' do
+      Fabricate(:instance_info, domain: 'example.com', software: 'misskey', data: { metadata: { features: ['circle'] } })
+      expect(subject).to be true
+    end
+  end
+end
diff --git a/spec/models/instance_spec.rb b/spec/models/instance_spec.rb
new file mode 100644
index 0000000000..3e811d3325
--- /dev/null
+++ b/spec/models/instance_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Instance do
+  describe 'Scopes' do
+    before { described_class.refresh }
+
+    describe '#searchable' do
+      let(:expected_domain) { 'host.example' }
+      let(:blocked_domain) { 'other.example' }
+
+      before do
+        Fabricate :account, domain: expected_domain
+        Fabricate :account, domain: blocked_domain
+        Fabricate :domain_block, domain: blocked_domain
+      end
+
+      it 'returns records not domain blocked' do
+        results = described_class.searchable.pluck(:domain)
+
+        expect(results)
+          .to include(expected_domain)
+          .and not_include(blocked_domain)
+      end
+    end
+
+    describe '#matches_domain' do
+      let(:host_domain) { 'host.example.com' }
+      let(:host_under_domain) { 'host_under.example.com' }
+      let(:other_domain) { 'other.example' }
+
+      before do
+        Fabricate :account, domain: host_domain
+        Fabricate :account, domain: host_under_domain
+        Fabricate :account, domain: other_domain
+      end
+
+      it 'returns matching records' do
+        expect(described_class.matches_domain('host.exa').pluck(:domain))
+          .to include(host_domain)
+          .and not_include(other_domain)
+
+        expect(described_class.matches_domain('ple.com').pluck(:domain))
+          .to include(host_domain)
+          .and not_include(other_domain)
+
+        expect(described_class.matches_domain('example').pluck(:domain))
+          .to include(host_domain)
+          .and include(other_domain)
+
+        expect(described_class.matches_domain('host_').pluck(:domain)) # Preserve SQL wildcards
+          .to include(host_domain)
+          .and include(host_under_domain)
+          .and not_include(other_domain)
+      end
+    end
+
+    describe '#by_domain_and_subdomains' do
+      let(:exact_match_domain) { 'example.com' }
+      let(:subdomain_domain) { 'foo.example.com' }
+      let(:partial_domain) { 'grexample.com' }
+
+      before do
+        Fabricate(:account, domain: exact_match_domain)
+        Fabricate(:account, domain: subdomain_domain)
+        Fabricate(:account, domain: partial_domain)
+      end
+
+      it 'returns matching instances' do
+        results = described_class.by_domain_and_subdomains('example.com').pluck(:domain)
+
+        expect(results)
+          .to include(exact_match_domain)
+          .and include(subdomain_domain)
+          .and not_include(partial_domain)
+      end
+    end
+
+    describe '#with_domain_follows' do
+      let(:example_domain) { 'example.host' }
+      let(:other_domain) { 'other.host' }
+      let(:none_domain) { 'none.host' }
+
+      before do
+        example_account = Fabricate(:account, domain: example_domain)
+        other_account = Fabricate(:account, domain: other_domain)
+        Fabricate(:account, domain: none_domain)
+
+        Fabricate :follow, account: example_account
+        Fabricate :follow, target_account: other_account
+      end
+
+      it 'returns instances with domain accounts that have follows' do
+        results = described_class.with_domain_follows(['example.host', 'other.host', 'none.host']).pluck(:domain)
+
+        expect(results)
+          .to include(example_domain)
+          .and include(other_domain)
+          .and not_include(none_domain)
+      end
+    end
+  end
+end
diff --git a/spec/models/ip_block_spec.rb b/spec/models/ip_block_spec.rb
index ed58826672..290b99b288 100644
--- a/spec/models/ip_block_spec.rb
+++ b/spec/models/ip_block_spec.rb
@@ -3,7 +3,32 @@
 require 'rails_helper'
 
 describe IpBlock do
-  describe 'to_log_human_identifier' do
+  describe 'validations' do
+    it 'validates ip presence', :aggregate_failures do
+      ip_block = described_class.new(ip: nil, severity: :no_access)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:ip)
+    end
+
+    it 'validates severity presence', :aggregate_failures do
+      ip_block = described_class.new(ip: '127.0.0.1', severity: nil)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:severity)
+    end
+
+    it 'validates ip uniqueness', :aggregate_failures do
+      described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+      ip_block = described_class.new(ip: '127.0.0.1', severity: :no_access)
+
+      expect(ip_block).to_not be_valid
+      expect(ip_block).to model_have_error_on_field(:ip)
+    end
+  end
+
+  describe '#to_log_human_identifier' do
     let(:ip_block) { described_class.new(ip: '192.168.0.1') }
 
     it 'combines the IP and prefix into a string' do
@@ -12,4 +37,30 @@ describe IpBlock do
       expect(result).to eq('192.168.0.1/32')
     end
   end
+
+  describe '.blocked?' do
+    context 'when the IP is blocked' do
+      it 'returns true' do
+        described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+        expect(described_class.blocked?('127.0.0.1')).to be true
+      end
+    end
+
+    context 'when the IP is not blocked' do
+      it 'returns false' do
+        expect(described_class.blocked?('127.0.0.1')).to be false
+      end
+    end
+  end
+
+  describe 'after_commit' do
+    it 'resets the cache' do
+      allow(Rails.cache).to receive(:delete)
+
+      described_class.create!(ip: '127.0.0.1', severity: :no_access)
+
+      expect(Rails.cache).to have_received(:delete).with(described_class::CACHE_KEY)
+    end
+  end
 end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 89916f9f50..1b9a13c38c 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -91,20 +91,15 @@ RSpec.describe MediaAttachment, :paperclip_processing do
     end
 
     it 'saves media attachment with correct file metadata' do
-      expect(media.persisted?).to be true
-      expect(media.file).to_not be_nil
-
-      # completes processing
-      expect(media.processing_complete?).to be true
-
-      # sets type
-      expect(media.type).to eq 'image'
-
-      # sets content type
-      expect(media.file_content_type).to eq content_type
-
-      # sets file extension
-      expect(media.file_file_name).to end_with extension
+      expect(media)
+        .to be_persisted
+        .and be_processing_complete
+        .and have_attributes(
+          file: be_present,
+          type: eq('image'),
+          file_content_type: eq(content_type),
+          file_file_name: end_with(extension)
+        )
 
       # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
       expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
@@ -112,17 +107,23 @@ RSpec.describe MediaAttachment, :paperclip_processing do
 
     it 'saves media attachment with correct size metadata' do
       # strips original file name
-      expect(media.file_file_name).to_not start_with '600x400'
+      expect(media.file_file_name)
+        .to_not start_with '600x400'
 
-      # sets meta for original
-      expect(media.file.meta['original']['width']).to eq 600
-      expect(media.file.meta['original']['height']).to eq 400
-      expect(media.file.meta['original']['aspect']).to eq 1.5
-
-      # sets meta for thumbnail
-      expect(media.file.meta['small']['width']).to eq 588
-      expect(media.file.meta['small']['height']).to eq 392
-      expect(media.file.meta['small']['aspect']).to eq 1.5
+      # sets meta for original and thumbnail
+      expect(media.file.meta.deep_symbolize_keys)
+        .to include(
+          original: include(
+            width: eq(600),
+            height: eq(400),
+            aspect: eq(1.5)
+          ),
+          small: include(
+            width: eq(588),
+            height: eq(392),
+            aspect: eq(1.5)
+          )
+        )
     end
   end
 
diff --git a/spec/models/ng_rule_spec.rb b/spec/models/ng_rule_spec.rb
new file mode 100644
index 0000000000..4947d26170
--- /dev/null
+++ b/spec/models/ng_rule_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe NgRule do
+  describe '#copy!' do
+    let(:original) { Fabricate(:ng_rule, account_domain: 'foo.bar', account_avatar_state: :needed, status_text: 'ohagi', status_mention_threshold: 5, status_allow_follower_mention: false) }
+    let(:copied) { original.copy! }
+
+    it 'saves safely' do
+      expect { copied.save! }.to_not raise_error
+      expect(copied.reload.id).to_not eq original.id
+    end
+
+    it 'saves specified rules' do
+      expect(copied.account_domain).to eq 'foo.bar'
+      expect(copied.account_avatar_state.to_sym).to eq :needed
+      expect(copied.status_text).to eq 'ohagi'
+      expect(copied.status_mention_threshold).to eq 5
+      expect(copied.status_allow_follower_mention).to be false
+    end
+
+    it 'saves default rules' do
+      expect(copied.account_header_state.to_sym).to eq :optional
+      expect(copied.status_spoiler_text).to eq ''
+      expect(copied.status_reference_threshold).to eq(-1)
+    end
+  end
+end
diff --git a/spec/models/notification_policy_spec.rb b/spec/models/notification_policy_spec.rb
new file mode 100644
index 0000000000..cfd8e85eda
--- /dev/null
+++ b/spec/models/notification_policy_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe NotificationPolicy do
+  describe '#summarize!' do
+    subject { Fabricate(:notification_policy) }
+
+    let(:sender) { Fabricate(:account) }
+
+    before do
+      Fabricate.times(2, :notification, account: subject.account, activity: Fabricate(:status, account: sender), filtered: true)
+      Fabricate(:notification_request, account: subject.account, from_account: sender)
+      subject.summarize!
+    end
+
+    it 'sets pending_requests_count' do
+      expect(subject.pending_requests_count).to eq 1
+    end
+
+    it 'sets pending_notifications_count' do
+      expect(subject.pending_notifications_count).to eq 2
+    end
+  end
+end
diff --git a/spec/models/notification_request_spec.rb b/spec/models/notification_request_spec.rb
new file mode 100644
index 0000000000..07bbc3e0a8
--- /dev/null
+++ b/spec/models/notification_request_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe NotificationRequest do
+  describe '#reconsider_existence!' do
+    subject { Fabricate(:notification_request, dismissed: dismissed) }
+
+    let(:dismissed) { false }
+
+    context 'when there are remaining notifications' do
+      before do
+        Fabricate(:notification, account: subject.account, activity: Fabricate(:status, account: subject.from_account), filtered: true)
+        subject.reconsider_existence!
+      end
+
+      it 'leaves request intact' do
+        expect(subject.destroyed?).to be false
+      end
+
+      it 'updates notifications_count' do
+        expect(subject.notifications_count).to eq 1
+      end
+    end
+
+    context 'when there are no notifications' do
+      before do
+        subject.reconsider_existence!
+      end
+
+      context 'when dismissed' do
+        let(:dismissed) { true }
+
+        it 'leaves request intact' do
+          expect(subject.destroyed?).to be false
+        end
+      end
+
+      it 'removes the request' do
+        expect(subject.destroyed?).to be true
+      end
+    end
+  end
+end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 172d1c65b9..3c7d51ae1a 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -138,6 +138,17 @@ RSpec.describe Notification do
         expect(notification.account).to eq(account)
       end
     end
+
+    context 'when activity_type is an AccountWarning' do
+      it 'sets the notification from_account to the recipient of the notification' do
+        account = Fabricate(:account)
+        account_warning = Fabricate(:account_warning, target_account: account)
+
+        notification = Fabricate.build(:notification, activity_type: 'AccountWarning', activity: account_warning, account: account)
+
+        expect(notification.from_account).to eq(account)
+      end
+    end
   end
 
   describe '.preload_cache_collection_target_statuses' do
diff --git a/spec/models/privacy_policy_spec.rb b/spec/models/privacy_policy_spec.rb
index 0d74713755..03bbe7264b 100644
--- a/spec/models/privacy_policy_spec.rb
+++ b/spec/models/privacy_policy_spec.rb
@@ -8,7 +8,7 @@ describe PrivacyPolicy do
       it 'has the privacy text' do
         policy = described_class.current
 
-        expect(policy.text).to eq(PrivacyPolicy::DEFAULT_PRIVACY_POLICY)
+        expect(policy.text).to eq(described_class::DEFAULT_PRIVACY_POLICY)
       end
     end
 
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
index 20fcdb0024..d948b958d6 100644
--- a/spec/models/public_feed_spec.rb
+++ b/spec/models/public_feed_spec.rb
@@ -6,14 +6,39 @@ RSpec.describe PublicFeed do
   let(:account) { Fabricate(:account) }
 
   describe '#get' do
-    subject { described_class.new(nil).get(20).map(&:id) }
+    subject { described_class.new(viewer).get(20).map(&:id) }
 
-    it 'only includes statuses with public visibility' do
-      public_status = Fabricate(:status, visibility: :public)
-      private_status = Fabricate(:status, visibility: :private)
+    let(:viewer) { nil }
 
-      expect(subject).to include(public_status.id)
-      expect(subject).to_not include(private_status.id)
+    context 'with only includes statuses with public visibility' do
+      let!(:public_status)          { Fabricate(:status, visibility: :public) }
+      let!(:login_status)           { Fabricate(:status, visibility: :login) }
+      let!(:unlisted_status)        { Fabricate(:status, visibility: :unlisted) }
+      let!(:private_status)         { Fabricate(:status, visibility: :private) }
+      let!(:direct_status)          { Fabricate(:status, visibility: :direct) }
+      let!(:limited_status)         { Fabricate(:status, visibility: :limited) }
+
+      it 'without user' do
+        expect(subject).to include(public_status.id)
+        expect(subject).to_not include(login_status.id)
+        expect(subject).to_not include(unlisted_status.id)
+        expect(subject).to_not include(private_status.id)
+        expect(subject).to_not include(direct_status.id)
+        expect(subject).to_not include(limited_status.id)
+      end
+
+      context 'with user' do
+        let(:viewer) { account }
+
+        it 'on global timeline' do
+          expect(subject).to include(public_status.id)
+          expect(subject).to include(login_status.id)
+          expect(subject).to_not include(unlisted_status.id)
+          expect(subject).to_not include(private_status.id)
+          expect(subject).to_not include(direct_status.id)
+          expect(subject).to_not include(limited_status.id)
+        end
+      end
     end
 
     it 'does not include replies' do
@@ -50,6 +75,7 @@ RSpec.describe PublicFeed do
       let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
       let!(:local_status)   { Fabricate(:status, account: local_account) }
       let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+      let!(:public_unlisted_status) { Fabricate(:status, account: local_account, visibility: :public_unlisted) }
 
       context 'without a viewer' do
         let(:viewer) { nil }
@@ -61,6 +87,22 @@ RSpec.describe PublicFeed do
         it 'includes local statuses' do
           expect(subject).to include(local_status.id)
         end
+
+        it 'includes public_unlisted statuses' do
+          expect(subject).to include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
 
       context 'with a viewer' do
@@ -73,6 +115,22 @@ RSpec.describe PublicFeed do
         it 'includes local statuses' do
           expect(subject).to include(local_status.id)
         end
+
+        it 'excludes public_unlisted statuses' do
+          expect(subject).to include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
     end
 
@@ -83,6 +141,7 @@ RSpec.describe PublicFeed do
       let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
       let!(:local_status)   { Fabricate(:status, account: local_account) }
       let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+      let!(:public_unlisted_status) { Fabricate(:status, account: local_account, visibility: :public_unlisted) }
 
       context 'without a viewer' do
         let(:viewer) { nil }
@@ -91,6 +150,20 @@ RSpec.describe PublicFeed do
           expect(subject).to include(local_status.id)
           expect(subject).to_not include(remote_status.id)
         end
+
+        it 'includes public_unlisted statuses' do
+          expect(subject).to include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'does not include all statuses' do
+            expect(subject).to eq []
+          end
+        end
       end
 
       context 'with a viewer' do
@@ -106,6 +179,20 @@ RSpec.describe PublicFeed do
           expect(subject).to include(local_status.id)
           expect(subject).to_not include(remote_status.id)
         end
+
+        it 'includes public_unlisted statuses' do
+          expect(subject).to include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'does not include all statuses' do
+            expect(subject).to eq []
+          end
+        end
       end
     end
 
@@ -116,6 +203,7 @@ RSpec.describe PublicFeed do
       let!(:remote_account) { Fabricate(:account, domain: 'test.com') }
       let!(:local_status)   { Fabricate(:status, account: local_account) }
       let!(:remote_status)  { Fabricate(:status, account: remote_account) }
+      let!(:public_unlisted_status) { Fabricate(:status, account: local_account, visibility: :public_unlisted) }
 
       context 'without a viewer' do
         let(:viewer) { nil }
@@ -124,6 +212,22 @@ RSpec.describe PublicFeed do
           expect(subject).to_not include(local_status.id)
           expect(subject).to include(remote_status.id)
         end
+
+        it 'excludes public_unlisted statuses' do
+          expect(subject).to_not include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses with local' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
 
       context 'with a viewer' do
@@ -133,6 +237,22 @@ RSpec.describe PublicFeed do
           expect(subject).to_not include(local_status.id)
           expect(subject).to include(remote_status.id)
         end
+
+        it 'excludes public_unlisted statuses' do
+          expect(subject).to_not include(public_unlisted_status.id)
+        end
+
+        context 'when local timeline is disabled' do
+          before do
+            Form::AdminSettings.new(enable_local_timeline: '0').save
+          end
+
+          it 'includes statuses with local' do
+            expect(subject).to include(remote_status.id)
+            expect(subject).to include(local_status.id)
+            expect(subject).to include(public_unlisted_status.id)
+          end
+        end
       end
     end
 
diff --git a/spec/models/relationship_severance_event_spec.rb b/spec/models/relationship_severance_event_spec.rb
new file mode 100644
index 0000000000..93c0f1a26d
--- /dev/null
+++ b/spec/models/relationship_severance_event_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RelationshipSeveranceEvent do
+  let(:local_account)  { Fabricate(:account) }
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+  let(:event)          { Fabricate(:relationship_severance_event) }
+
+  describe '#import_from_active_follows!' do
+    before do
+      local_account.follow!(remote_account)
+    end
+
+    it 'imports the follow relationships with the expected direction' do
+      event.import_from_active_follows!(local_account.active_relationships)
+
+      relationships = event.severed_relationships.to_a
+      expect(relationships.size).to eq 1
+      expect(relationships[0].account).to eq local_account
+      expect(relationships[0].target_account).to eq remote_account
+    end
+  end
+
+  describe '#import_from_passive_follows!' do
+    before do
+      remote_account.follow!(local_account)
+    end
+
+    it 'imports the follow relationships with the expected direction' do
+      event.import_from_passive_follows!(local_account.passive_relationships)
+
+      relationships = event.severed_relationships.to_a
+      expect(relationships.size).to eq 1
+      expect(relationships[0].account).to eq remote_account
+      expect(relationships[0].target_account).to eq local_account
+    end
+  end
+
+  describe '#affected_local_accounts' do
+    before do
+      event.severed_relationships.create!(local_account: local_account, remote_account: remote_account, direction: :active)
+    end
+
+    it 'correctly lists local accounts' do
+      expect(event.affected_local_accounts.to_a).to contain_exactly(local_account)
+    end
+  end
+end
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index c514c63b39..0168268bcb 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -133,5 +133,18 @@ describe Report do
       report = Fabricate.build(:report, account: remote_account, comment: Faker::Lorem.characters(number: 1001))
       expect(report.valid?).to be true
     end
+
+    it 'is invalid if it references invalid rules' do
+      report = Fabricate.build(:report, category: :violation, rule_ids: [-1])
+      expect(report.valid?).to be false
+      expect(report).to model_have_error_on_field(:rule_ids)
+    end
+
+    it 'is invalid if it references rules but category is not "violation"' do
+      rule = Fabricate(:rule)
+      report = Fabricate.build(:report, category: :spam, rule_ids: rule.id)
+      expect(report.valid?).to be false
+      expect(report).to model_have_error_on_field(:rule_ids)
+    end
   end
 end
diff --git a/spec/models/severed_relationship_spec.rb b/spec/models/severed_relationship_spec.rb
new file mode 100644
index 0000000000..0f922d7983
--- /dev/null
+++ b/spec/models/severed_relationship_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SeveredRelationship do
+  let(:local_account)  { Fabricate(:account) }
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+  let(:event)          { Fabricate(:relationship_severance_event) }
+
+  describe '#account' do
+    context 'when the local account is the follower' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) }
+
+      it 'returns the local account' do
+        expect(severed_relationship.account).to eq local_account
+      end
+    end
+
+    context 'when the local account is being followed' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) }
+
+      it 'returns the remote account' do
+        expect(severed_relationship.account).to eq remote_account
+      end
+    end
+  end
+
+  describe '#target_account' do
+    context 'when the local account is the follower' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :active) }
+
+      it 'returns the remote account' do
+        expect(severed_relationship.target_account).to eq remote_account
+      end
+    end
+
+    context 'when the local account is being followed' do
+      let(:severed_relationship) { Fabricate(:severed_relationship, relationship_severance_event: event, local_account: local_account, remote_account: remote_account, direction: :passive) }
+
+      it 'returns the local account' do
+        expect(severed_relationship.target_account).to eq local_account
+      end
+    end
+  end
+end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 284576ceda..18a62e451c 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -114,6 +114,181 @@ RSpec.describe Status do
     end
   end
 
+  describe '#compute_searchability' do
+    subject { Fabricate(:status, account: account, searchability: status_searchability) }
+
+    let(:account_searchability) { :public }
+    let(:status_searchability) { :public }
+    let(:account_domain) { 'example.com' }
+    let(:silenced_at) { nil }
+    let(:account) { Fabricate(:account, domain: account_domain, searchability: account_searchability, silenced_at: silenced_at) }
+
+    context 'when public-public' do
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+    end
+
+    context 'when public-public but silenced' do
+      let(:silenced_at) { Time.now.utc }
+
+      it 'returns private' do
+        expect(subject.compute_searchability).to eq 'private'
+      end
+    end
+
+    context 'when public-public_unlisted but silenced' do
+      let(:silenced_at) { Time.now.utc }
+      let(:status_searchability) { :public_unlisted }
+
+      it 'returns private' do
+        expect(subject.compute_searchability).to eq 'private'
+      end
+    end
+
+    context 'when public-public_unlisted' do
+      let(:status_searchability) { :public_unlisted }
+
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+
+      it 'returns public_unlisted for local' do
+        expect(subject.compute_searchability_local).to eq 'public_unlisted'
+      end
+    end
+
+    context 'when public-private' do
+      let(:status_searchability) { :private }
+
+      it 'returns private' do
+        expect(subject.compute_searchability).to eq 'private'
+      end
+    end
+
+    context 'when public-direct' do
+      let(:status_searchability) { :direct }
+
+      it 'returns direct' do
+        expect(subject.compute_searchability).to eq 'direct'
+      end
+    end
+
+    context 'when private-public' do
+      let(:account_searchability) { :private }
+
+      it 'returns private' do
+        expect(subject.compute_searchability).to eq 'private'
+      end
+    end
+
+    context 'when direct-public' do
+      let(:account_searchability) { :direct }
+
+      it 'returns direct' do
+        expect(subject.compute_searchability).to eq 'direct'
+      end
+    end
+
+    context 'when limited-public' do
+      let(:account_searchability) { :limited }
+
+      it 'returns limited' do
+        expect(subject.compute_searchability).to eq 'limited'
+      end
+    end
+
+    context 'when private-limited' do
+      let(:account_searchability) { :private }
+      let(:status_searchability) { :limited }
+
+      it 'returns limited' do
+        expect(subject.compute_searchability).to eq 'limited'
+      end
+    end
+
+    context 'when private-public of local account' do
+      let(:account_searchability) { :private }
+      let(:account_domain) { nil }
+      let(:status_searchability) { :public }
+
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+    end
+
+    context 'when direct-public of local account' do
+      let(:account_searchability) { :direct }
+      let(:account_domain) { nil }
+      let(:status_searchability) { :public }
+
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+    end
+
+    context 'when limited-public of local account' do
+      let(:account_searchability) { :limited }
+      let(:account_domain) { nil }
+      let(:status_searchability) { :public }
+
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+    end
+
+    context 'when public-public_unlisted of local account' do
+      let(:account_searchability) { :public }
+      let(:account_domain) { nil }
+      let(:status_searchability) { :public_unlisted }
+
+      it 'returns public' do
+        expect(subject.compute_searchability).to eq 'public'
+      end
+
+      it 'returns public_unlisted for local' do
+        expect(subject.compute_searchability_local).to eq 'public_unlisted'
+      end
+
+      it 'returns private for activitypub' do
+        expect(subject.compute_searchability_activitypub).to eq 'private'
+      end
+    end
+  end
+
+  describe '#quote' do
+    let(:target_status) { Fabricate(:status) }
+    let(:quote) { true }
+
+    before do
+      Fabricate(:status_reference, status: subject, target_status: target_status, quote: quote)
+    end
+
+    context 'when quoting single' do
+      it 'get quote' do
+        expect(subject.quote).to_not be_nil
+        expect(subject.quote.id).to eq target_status.id
+      end
+    end
+
+    context 'when multiple quotes' do
+      it 'get quote' do
+        target2 = Fabricate(:status)
+        Fabricate(:status_reference, status: subject, quote: quote)
+        expect(subject.quote).to_not be_nil
+        expect([target_status.id, target2.id].include?(subject.quote.id)).to be true
+      end
+    end
+
+    context 'when no quote but reference' do
+      let(:quote) { false }
+
+      it 'get quote' do
+        expect(subject.quote).to be_nil
+      end
+    end
+  end
+
   describe '#content' do
     it 'returns the text of the status if it is not a reblog' do
       expect(subject.content).to eql subject.text
@@ -205,6 +380,48 @@ RSpec.describe Status do
     end
   end
 
+  describe '#reported?' do
+    context 'when the status is not reported' do
+      it 'returns false' do
+        expect(subject.reported?).to be false
+      end
+    end
+
+    context 'when the status is part of an open report' do
+      before do
+        Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+      end
+
+      it 'returns true' do
+        expect(subject.reported?).to be true
+      end
+    end
+
+    context 'when the status is part of a closed report with an account warning mentioning the account' do
+      before do
+        report = Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+        report.resolve!(Fabricate(:account))
+        Fabricate(:account_warning, target_account: subject.account, status_ids: [subject.id], report: report)
+      end
+
+      it 'returns true' do
+        expect(subject.reported?).to be true
+      end
+    end
+
+    context 'when the status is part of a closed report with an account warning not mentioning the account' do
+      before do
+        report = Fabricate(:report, target_account: subject.account, status_ids: [subject.id])
+        report.resolve!(Fabricate(:account))
+        Fabricate(:account_warning, target_account: subject.account, report: report)
+      end
+
+      it 'returns false' do
+        expect(subject.reported?).to be false
+      end
+    end
+  end
+
   describe '.mutes_map' do
     subject { described_class.mutes_map([status.conversation.id], account) }
 
@@ -221,6 +438,38 @@ RSpec.describe Status do
     end
   end
 
+  describe '.blocks_map' do
+    subject { described_class.blocks_map([status.account.id], account) }
+
+    let(:status)  { Fabricate(:status) }
+    let(:account) { Fabricate(:account) }
+
+    it 'returns a hash' do
+      expect(subject).to be_a Hash
+    end
+
+    it 'contains true value' do
+      account.block!(status.account)
+      expect(subject[status.account.id]).to be true
+    end
+  end
+
+  describe '.domain_blocks_map' do
+    subject { described_class.domain_blocks_map([status.account.domain], account) }
+
+    let(:status)  { Fabricate(:status, account: Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/status')) }
+    let(:account) { Fabricate(:account) }
+
+    it 'returns a hash' do
+      expect(subject).to be_a Hash
+    end
+
+    it 'contains true value' do
+      account.block_domain!(status.account.domain)
+      expect(subject[status.account.domain]).to be true
+    end
+  end
+
   describe '.favourites_map' do
     subject { described_class.favourites_map([status], account) }
 
@@ -253,6 +502,30 @@ RSpec.describe Status do
     end
   end
 
+  describe '.available_features_map' do
+    subject { described_class.available_features_map(domains) }
+
+    let(:domains) { %w(features_available.com mastodon.com misskey.com) }
+
+    before do
+      Fabricate(:instance_info, domain: 'features_available.com', software: 'mastodon', data: { metadata: { features: ['emoji_reaction'] } })
+      Fabricate(:instance_info, domain: 'mastodon.com', software: 'mastodon')
+      Fabricate(:instance_info, domain: 'misskey.com', software: 'misskey')
+    end
+
+    it 'availables if features contains emoji_reaction' do
+      expect(subject['features_available.com'][:emoji_reaction]).to be true
+    end
+
+    it 'unavailables if mastodon server' do
+      expect(subject['mastodon.com'][:emoji_reaction]).to be false
+    end
+
+    it 'availables if misskey server' do
+      expect(subject['misskey.com'][:emoji_reaction]).to be true
+    end
+  end
+
   describe '.tagged_with' do
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }
     let(:tag_dogs) { Fabricate(:tag, name: 'dogs') }
@@ -380,6 +653,16 @@ RSpec.describe Status do
       expect(described_class.create(account: alice, text: 'First').conversation_id).to_not be_nil
     end
 
+    it 'creates new owned-conversation for stand-alone status' do
+      expect(described_class.create(account: alice, text: 'First').owned_conversation.id).to_not be_nil
+    end
+
+    it 'creates new owned-conversation and linked for stand-alone status' do
+      status = described_class.create(account: alice, text: 'First')
+      expect(status.owned_conversation.ancestor_status_id).to eq status.id
+      expect(status.conversation.ancestor_status_id).to eq status.id
+    end
+
     it 'keeps conversation of parent node' do
       parent = Fabricate(:status, text: 'First')
       expect(described_class.create(account: alice, thread: parent, text: 'Response').conversation_id).to eq parent.conversation_id
diff --git a/spec/models/tag_feed_spec.rb b/spec/models/tag_feed_spec.rb
index 6f5e1eb307..d6e2b7db19 100644
--- a/spec/models/tag_feed_spec.rb
+++ b/spec/models/tag_feed_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe TagFeed, type: :service do
+describe TagFeed do
   describe '#get' do
     let(:account) { Fabricate(:account) }
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }
@@ -59,6 +59,12 @@ describe TagFeed, type: :service do
       expect(results).to_not include status_tagged_with_cats
     end
 
+    it 'can restrict to local but local timeline is disabled' do
+      Form::AdminSettings.new(enable_local_timeline: '0').save
+      results = described_class.new(tag_cats, nil, any: [tag_dogs.name], local: true).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
+
     it 'allows replies to be included' do
       original = Fabricate(:status)
       status = Fabricate(:status, tags: [tag_cats], in_reply_to_id: original.id)
@@ -66,5 +72,65 @@ describe TagFeed, type: :service do
       results = described_class.new(tag_cats, nil).get(20)
       expect(results).to include(status)
     end
+
+    it 'public_unlisted post returns' do
+      status_tagged_with_cats.update(visibility: :public_unlisted)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to include status_tagged_with_cats
+    end
+
+    it 'unlisted post not returns' do
+      status_tagged_with_cats.update(visibility: :unlisted)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
+
+    it 'unlisted post not returns with account' do
+      status_tagged_with_cats.update(visibility: :unlisted)
+      results = described_class.new(tag_cats, account).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
+
+    it 'unlisted/public_searchability post returns' do
+      status_tagged_with_cats.update(visibility: :unlisted, searchability: :public)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to include status_tagged_with_cats
+    end
+
+    it 'unlisted/public_unlisted_searchability post returns' do
+      status_tagged_with_cats.update(visibility: :unlisted, searchability: :public_unlisted)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to include status_tagged_with_cats
+    end
+
+    it 'unlisted/public_searchability post returns with account' do
+      status_tagged_with_cats.update(visibility: :unlisted, searchability: :public)
+      results = described_class.new(tag_cats, account).get(20)
+      expect(results).to include status_tagged_with_cats
+    end
+
+    it 'unlisted/public_unlisted_searchability post returns with account' do
+      status_tagged_with_cats.update(visibility: :unlisted, searchability: :public_unlisted)
+      results = described_class.new(tag_cats, account).get(20)
+      expect(results).to include status_tagged_with_cats
+    end
+
+    it 'private post not returns' do
+      status_tagged_with_cats.update(visibility: :private, searchability: :public)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
+
+    it 'private, public_unlisted post not returns' do
+      status_tagged_with_cats.update(visibility: :private, searchability: :public_unlisted)
+      results = described_class.new(tag_cats, nil).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
+
+    it 'private post not returns with account' do
+      status_tagged_with_cats.update(visibility: :private, searchability: :public)
+      results = described_class.new(tag_cats, account).get(20)
+      expect(results).to_not include status_tagged_with_cats
+    end
   end
 end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 6177b7a25a..7799afe44b 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Tag do
   end
 
   describe 'HASHTAG_RE' do
-    subject { Tag::HASHTAG_RE }
+    subject { described_class::HASHTAG_RE }
 
     it 'does not match URLs with anchors with non-hashtag characters' do
       expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil
@@ -36,6 +36,10 @@ RSpec.describe Tag do
       expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
     end
 
+    it 'does not match URLs with hashtag-like anchors after a non-ascii character' do
+      expect(subject.match('https://example.org/testé#foo')).to be_nil
+    end
+
     it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
       expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
     end
@@ -100,6 +104,38 @@ RSpec.describe Tag do
     end
   end
 
+  describe '.recently_used' do
+    let(:account) { Fabricate(:account) }
+    let(:other_person_status) { Fabricate(:status) }
+    let(:out_of_range) { Fabricate(:status, account: account) }
+    let(:older_in_range) { Fabricate(:status, account: account) }
+    let(:newer_in_range) { Fabricate(:status, account: account) }
+    let(:unused_tag) { Fabricate(:tag) }
+    let(:used_tag_one) { Fabricate(:tag) }
+    let(:used_tag_two) { Fabricate(:tag) }
+    let(:used_tag_on_out_of_range) { Fabricate(:tag) }
+
+    before do
+      stub_const 'Tag::RECENT_STATUS_LIMIT', 2
+
+      other_person_status.tags << used_tag_one
+
+      out_of_range.tags << used_tag_on_out_of_range
+
+      older_in_range.tags << used_tag_one
+      older_in_range.tags << used_tag_two
+
+      newer_in_range.tags << used_tag_one
+    end
+
+    it 'returns tags used by account within last X statuses ordered most used first' do
+      results = described_class.recently_used(account)
+
+      expect(results)
+        .to eq([used_tag_one, used_tag_two])
+    end
+  end
+
   describe '.find_normalized' do
     it 'returns tag for a multibyte case-insensitive name' do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'
@@ -110,6 +146,25 @@ RSpec.describe Tag do
     end
   end
 
+  describe '.not_featured_by' do
+    let!(:account) { Fabricate(:account) }
+    let!(:fun) { Fabricate(:tag, name: 'fun') }
+    let!(:games) { Fabricate(:tag, name: 'games') }
+
+    before do
+      Fabricate :featured_tag, account: account, name: 'games'
+      Fabricate :featured_tag, name: 'fun'
+    end
+
+    it 'returns tags not featured by the account' do
+      results = described_class.not_featured_by(account)
+
+      expect(results)
+        .to include(fun)
+        .and not_include(games)
+    end
+  end
+
   describe '.matches_name' do
     it 'returns tags for multibyte case-insensitive names' do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'
diff --git a/spec/models/trends/statuses_spec.rb b/spec/models/trends/statuses_spec.rb
index 7c30b5b997..999c855867 100644
--- a/spec/models/trends/statuses_spec.rb
+++ b/spec/models/trends/statuses_spec.rb
@@ -57,6 +57,29 @@ RSpec.describe Trends::Statuses do
     end
   end
 
+  describe '#register for remote user' do
+    let(:account) { Fabricate(:account, searchability: :public, discoverable: true, domain: 'example.com', uri: 'https://example.com/actor') }
+    let(:status) { Fabricate(:status, account: account, searchability: :public, language: 'en') }
+    let(:domain_block) { false }
+
+    before do
+      Fabricate(:domain_block, domain: 'example.com', severity: :noop, block_trends: true) if domain_block
+      subject.register(status, at_time)
+    end
+
+    it 'records use' do
+      expect(subject.send(:recently_used_ids, at_time)).to eq [status.id]
+    end
+
+    context 'when domain-blocked' do
+      let(:domain_block) { true }
+
+      it 'does not record use' do
+        expect(subject.send(:recently_used_ids, at_time)).to eq []
+      end
+    end
+  end
+
   describe '#query' do
     it 'returns a composable query scope' do
       expect(subject.query).to be_a Trends::Query
diff --git a/spec/models/trends/tags_spec.rb b/spec/models/trends/tags_spec.rb
index f2818fca87..91ca91f078 100644
--- a/spec/models/trends/tags_spec.rb
+++ b/spec/models/trends/tags_spec.rb
@@ -23,6 +23,33 @@ RSpec.describe Trends::Tags do
     end
   end
 
+  describe '#register' do
+    let(:tag) { Fabricate(:tag, usable: true) }
+    let(:account) { Fabricate(:account) }
+    let(:status) { Fabricate(:status, account: account, tags: [tag], created_at: at_time, updated_at: at_time) }
+
+    it 'records history' do
+      subject.register(status, at_time)
+      expect(tag.history.get(at_time).accounts).to eq 1
+      expect(tag.history.get(at_time).uses).to eq 1
+      expect(subject.send(:recently_used_ids, at_time)).to eq [tag.id]
+    end
+
+    context 'when account is rejected appending trends' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+
+      before do
+        Fabricate(:domain_block, domain: 'example.com', block_trends: true, severity: :noop)
+      end
+
+      it 'does not record history' do
+        subject.register(status, at_time)
+        expect(tag.history.get(at_time).accounts).to eq 0
+        expect(tag.history.get(at_time).uses).to eq 0
+      end
+    end
+  end
+
   describe '#query' do
     it 'returns a composable query scope' do
       expect(subject.query).to be_a Trends::Query
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index d5234ebe8d..365fc75e7b 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe UserRole do
   describe '#can?' do
     context 'with a single flag' do
       it 'returns true if any of them are present' do
-        subject.permissions = UserRole::FLAGS[:manage_reports]
+        subject.permissions = described_class::FLAGS[:manage_reports]
         expect(subject.can?(:manage_reports)).to be true
       end
 
@@ -19,7 +19,7 @@ RSpec.describe UserRole do
 
     context 'with multiple flags' do
       it 'returns true if any of them are present' do
-        subject.permissions = UserRole::FLAGS[:manage_users]
+        subject.permissions = described_class::FLAGS[:manage_users]
         expect(subject.can?(:manage_reports, :manage_users)).to be true
       end
 
@@ -51,7 +51,7 @@ RSpec.describe UserRole do
 
   describe '#permissions_as_keys' do
     before do
-      subject.permissions = UserRole::FLAGS[:invite_users] | UserRole::FLAGS[:view_dashboard] | UserRole::FLAGS[:manage_reports]
+      subject.permissions = described_class::FLAGS[:invite_users] | described_class::FLAGS[:view_dashboard] | described_class::FLAGS[:manage_reports]
     end
 
     it 'returns an array' do
@@ -70,7 +70,7 @@ RSpec.describe UserRole do
       let(:input) { %w(manage_users) }
 
       it 'sets permission flags' do
-        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users]
+        expect(subject.permissions).to eq described_class::FLAGS[:manage_users]
       end
     end
 
@@ -78,7 +78,7 @@ RSpec.describe UserRole do
       let(:input) { %w(manage_users manage_reports) }
 
       it 'sets permission flags' do
-        expect(subject.permissions).to eq UserRole::FLAGS[:manage_users] | UserRole::FLAGS[:manage_reports]
+        expect(subject.permissions).to eq described_class::FLAGS[:manage_users] | described_class::FLAGS[:manage_reports]
       end
     end
 
@@ -86,7 +86,7 @@ RSpec.describe UserRole do
       let(:input) { %w(foo) }
 
       it 'does not set permission flags' do
-        expect(subject.permissions).to eq UserRole::Flags::NONE
+        expect(subject.permissions).to eq described_class::Flags::NONE
       end
     end
   end
@@ -96,7 +96,7 @@ RSpec.describe UserRole do
       subject { described_class.nobody }
 
       it 'returns none' do
-        expect(subject.computed_permissions).to eq UserRole::Flags::NONE
+        expect(subject.computed_permissions).to eq described_class::Flags::NONE
       end
     end
 
@@ -110,11 +110,11 @@ RSpec.describe UserRole do
 
     context 'when role has the administrator flag' do
       before do
-        subject.permissions = UserRole::FLAGS[:administrator]
+        subject.permissions = described_class::FLAGS[:administrator]
       end
 
       it 'returns all permissions' do
-        expect(subject.computed_permissions).to eq UserRole::Flags::ALL
+        expect(subject.computed_permissions).to eq described_class::Flags::ALL
       end
     end
 
@@ -135,11 +135,15 @@ RSpec.describe UserRole do
     end
 
     it 'has default permissions' do
-      expect(subject.permissions).to eq UserRole::FLAGS[:invite_users]
+      expect(subject.permissions).to eq 0
     end
 
     it 'has negative position' do
-      expect(subject.position).to eq(-1)
+      expect(subject.position).to eq(described_class::NOBODY_POSITION)
+    end
+
+    it 'is able to add invite permission' do
+      expect { subject.update!(permissions: UserRole::FLAGS[:invite_users]) }.to_not raise_error
     end
   end
 
@@ -155,21 +159,21 @@ RSpec.describe UserRole do
     end
 
     it 'has no permissions' do
-      expect(subject.permissions).to eq UserRole::Flags::NONE
+      expect(subject.permissions).to eq described_class::Flags::NONE
     end
 
     it 'has negative position' do
-      expect(subject.position).to eq(-1)
+      expect(subject.position).to eq(described_class::NOBODY_POSITION)
     end
   end
 
   describe '#everyone?' do
-    it 'returns true when id is -99' do
-      subject.id = -99
+    it 'returns true when id matches the everyone id' do
+      subject.id = described_class::EVERYONE_ROLE_ID
       expect(subject.everyone?).to be true
     end
 
-    it 'returns false when id is not -99' do
+    it 'returns false when id does not match the everyone id' do
       subject.id = 123
       expect(subject.everyone?).to be false
     end
diff --git a/spec/models/user_settings_spec.rb b/spec/models/user_settings_spec.rb
index 653597c90d..dfc4910d6e 100644
--- a/spec/models/user_settings_spec.rb
+++ b/spec/models/user_settings_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe UserSettings do
 
     context 'when setting was not defined' do
       it 'raises error' do
-        expect { subject[:foo] }.to raise_error UserSettings::KeyError
+        expect { subject[:foo] }.to raise_error described_class::KeyError
       end
     end
   end
@@ -93,7 +93,7 @@ RSpec.describe UserSettings do
   describe '.definition_for' do
     context 'when key is defined' do
       it 'returns a setting' do
-        expect(described_class.definition_for(:always_send_emails)).to be_a UserSettings::Setting
+        expect(described_class.definition_for(:always_send_emails)).to be_a described_class::Setting
       end
     end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7f68671df4..287b73e770 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -9,14 +9,25 @@ RSpec.describe User do
 
   it_behaves_like 'two_factor_backupable'
 
-  describe 'otp_secret' do
+  describe 'legacy_otp_secret' do
     it 'is encrypted with OTP_SECRET environment variable' do
       user = Fabricate(:user,
                        encrypted_otp_secret: "Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n",
                        encrypted_otp_secret_iv: 'rys3THICkr60BoWC',
                        encrypted_otp_secret_salt: '_LMkAGvdg7a+sDIKjI3mR2Q==')
 
-      expect(user.otp_secret).to eq 'anotpsecretthatshouldbeencrypted'
+      expect(user.send(:legacy_otp_secret)).to eq 'anotpsecretthatshouldbeencrypted'
+    end
+  end
+
+  describe 'otp_secret' do
+    it 'encrypts the saved value' do
+      user = Fabricate(:user, otp_secret: '123123123')
+
+      user.reload
+
+      expect(user.otp_secret).to eq '123123123'
+      expect(user.attributes_before_type_cast[:otp_secret]).to_not eq '123123123'
     end
   end
 
@@ -38,6 +49,12 @@ RSpec.describe User do
       user.save(validate: false)
       expect(user.valid?).to be true
     end
+
+    it 'is valid with a localhost e-mail address' do
+      user = Fabricate.build(:user, email: 'admin@localhost')
+      user.valid?
+      expect(user.valid?).to be true
+    end
   end
 
   describe 'Normalizations' do
@@ -101,12 +118,36 @@ RSpec.describe User do
       end
     end
 
-    describe 'inactive' do
-      it 'returns a relation of inactive users' do
-        specified = Fabricate(:user, current_sign_in_at: 15.days.ago)
-        Fabricate(:user, current_sign_in_at: 6.days.ago)
+    describe 'signed_in_recently' do
+      it 'returns a relation of users who have signed in during the recent period' do
+        recent_sign_in_user = Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
+        Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
 
-        expect(described_class.inactive).to contain_exactly(specified)
+        expect(described_class.signed_in_recently)
+          .to contain_exactly(recent_sign_in_user)
+      end
+    end
+
+    describe 'not_signed_in_recently' do
+      it 'returns a relation of users who have not signed in during the recent period' do
+        no_recent_sign_in_user = Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
+        Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
+
+        expect(described_class.not_signed_in_recently)
+          .to contain_exactly(no_recent_sign_in_user)
+      end
+    end
+
+    describe 'account_not_suspended' do
+      it 'returns with linked accounts that are not suspended' do
+        suspended_account = Fabricate(:account, suspended_at: 10.days.ago)
+        non_suspended_account = Fabricate(:account, suspended_at: nil)
+        suspended_user = Fabricate(:user, account: suspended_account)
+        non_suspended_user = Fabricate(:user, account: non_suspended_account)
+
+        expect(described_class.account_not_suspended)
+          .to include(non_suspended_user)
+          .and not_include(suspended_user)
       end
     end
 
@@ -131,6 +172,14 @@ RSpec.describe User do
         expect(described_class.matches_ip('2160:2160::/32')).to contain_exactly(user1)
       end
     end
+
+    def exceed_duration_window_days
+      described_class::ACTIVE_DURATION + 2.days
+    end
+
+    def within_duration_window_days
+      described_class::ACTIVE_DURATION - 2.days
+    end
   end
 
   describe 'blacklist' do
@@ -187,12 +236,9 @@ RSpec.describe User do
     context 'when the user is already confirmed' do
       let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
 
-      it 'sets email to unconfirmed_email' do
+      it 'sets email to unconfirmed_email and does not trigger web hook' do
         expect { subject }.to change { user.reload.email }.to(new_email)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end
@@ -206,12 +252,9 @@ RSpec.describe User do
           user.approve!
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -221,12 +264,9 @@ RSpec.describe User do
           Setting.registrations_mode = 'open'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
-        end
 
-        it 'triggers the account.approved Web Hook' do
-          user.confirm
           expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
         end
       end
@@ -236,13 +276,42 @@ RSpec.describe User do
           Setting.registrations_mode = 'approved'
         end
 
-        it 'sets email to unconfirmed_email' do
+        it 'sets email to unconfirmed_email and does not trigger web hook' do
           expect { subject }.to change { user.reload.email }.to(new_email)
+
+          expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+        end
+      end
+
+      context 'when max user count is set' do
+        let(:users_max) { 3 }
+
+        before do
+          Fabricate(:user)
+          Fabricate(:user)
+          Setting.registrations_limit = users_max
         end
 
-        it 'does not trigger the account.approved Web Hook' do
-          subject
-          expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+        it 'creates user' do
+          expect { subject }.to_not raise_error
+          expect(user.confirmed?).to be true
+        end
+
+        context 'with limit is reached' do
+          let(:users_max) { 2 }
+
+          it 'does not create user' do
+            expect { subject }.to raise_error Mastodon::ValidationError
+            expect(user.confirmed?).to be false
+          end
+
+          it 'but creates user when invited' do
+            invite = Fabricate(:invite, user: Fabricate(:user), max_uses: nil, expires_at: 1.hour.from_now)
+            user.update!(invite: invite)
+
+            expect { subject }.to_not raise_error
+            expect(user.confirmed?).to be true
+          end
         end
       end
     end
@@ -259,12 +328,9 @@ RSpec.describe User do
     context 'when the user is already confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and triggers `account.approved` web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'triggers the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
       end
     end
@@ -272,12 +338,9 @@ RSpec.describe User do
     context 'when the user is not confirmed' do
       let(:user) { Fabricate(:user, confirmed_at: nil, approved: false) }
 
-      it 'sets the approved flag' do
+      it 'sets the approved flag and does not trigger web hook' do
         expect { subject }.to change { user.reload.approved? }.to(true)
-      end
 
-      it 'does not trigger the account.approved Web Hook' do
-        subject
         expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
       end
     end
@@ -438,7 +501,10 @@ RSpec.describe User do
     let!(:access_token) { Fabricate(:access_token, resource_owner_id: user.id) }
     let!(:web_push_subscription) { Fabricate(:web_push_subscription, access_token: access_token) }
 
+    let(:redis_pipeline_stub) { instance_double(Redis::Namespace, publish: nil) }
+
     before do
+      allow(redis).to receive(:pipelined).and_yield(redis_pipeline_stub)
       user.reset_password!
     end
 
@@ -455,43 +521,46 @@ RSpec.describe User do
       expect(Doorkeeper::AccessToken.active_for(user).count).to eq 0
     end
 
+    it 'revokes streaming access for all access tokens' do
+      expect(redis_pipeline_stub).to have_received(:publish).with("timeline:access_token:#{access_token.id}", Oj.dump(event: :kill)).once
+    end
+
     it 'removes push subscriptions' do
       expect(Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count).to eq 0
       expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
-  describe '#confirm!' do
-    subject(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
+  describe '#mark_email_as_confirmed!' do
+    subject { user.mark_email_as_confirmed! }
 
-    before do
-      ActionMailer::Base.deliveries.clear
-      user.confirm!
-    end
-
-    after { ActionMailer::Base.deliveries.clear }
+    let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
 
     context 'when user is new' do
       let(:confirmed_at) { nil }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user and delivers welcome email', :sidekiq_inline do
+        emails = capture_emails { subject }
 
-      it 'delivers mails', :sidekiq_inline do
-        expect(ActionMailer::Base.deliveries.count).to eq 2
+        expect(user.confirmed_at).to be_present
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(user.email),
+            subject: eq(I18n.t('user_mailer.welcome.subject'))
+          )
       end
     end
 
     context 'when user is not new' do
       let(:confirmed_at) { Time.zone.now }
 
-      it 'confirms user' do
-        expect(user.confirmed_at).to be_present
-      end
+      it 'confirms user but does not deliver welcome email' do
+        emails = capture_emails { subject }
 
-      it 'does not deliver mail' do
-        expect(ActionMailer::Base.deliveries.count).to eq 0
+        expect(user.confirmed_at).to be_present
+        expect(emails).to be_empty
       end
     end
   end
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index 36ac8d8027..a6c71e0cb0 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -57,6 +57,34 @@ RSpec.describe StatusPolicy, type: :model do
         expect(subject).to_not permit(viewer, status)
       end
 
+      it 'grants access when limited and account is viewer' do
+        status.visibility = :limited
+
+        expect(subject).to permit(status.account, status)
+      end
+
+      it 'grants access when limited and viewer is mentioned' do
+        status.visibility = :limited
+        status.mentions = [Fabricate(:mention, account: alice)]
+
+        expect(subject).to permit(alice, status)
+      end
+
+      it 'grants access when limited and non-owner viewer is mentioned and mentions are loaded' do
+        status.visibility = :limited
+        status.mentions = [Fabricate(:mention, account: bob)]
+        status.mentions.load
+
+        expect(subject).to permit(bob, status)
+      end
+
+      it 'denies access when limited and viewer is not mentioned' do
+        viewer = Fabricate(:account)
+        status.visibility = :limited
+
+        expect(subject).to_not permit(viewer, status)
+      end
+
       it 'grants access when private and account is viewer' do
         status.visibility = :private
 
@@ -84,6 +112,73 @@ RSpec.describe StatusPolicy, type: :model do
 
         expect(subject).to_not permit(viewer, status)
       end
+
+      context 'with remote account' do
+        let(:viewer) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+        let(:status) { Fabricate(:status, account: alice, spoiler_text: 'ohagi', sensitive: true) }
+
+        it 'grants access when viewer is not domain-blocked' do
+          expect(subject).to permit(viewer, status)
+        end
+
+        it 'denies access when viewer is domain-blocked' do
+          Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_send_sensitive: true)
+
+          expect(subject).to_not permit(viewer, status)
+        end
+      end
+    end
+  end
+
+  context 'with the permission of show_mentioned_users?' do
+    permissions :show_mentioned_users? do
+      it 'grants access when public and account is viewer' do
+        status.visibility = :public
+
+        expect(subject).to permit(status.account, status)
+      end
+
+      it 'grants access when public and account is not viewer' do
+        status.visibility = :public
+
+        expect(subject).to_not permit(bob, status)
+      end
+
+      it 'grants access when limited and no conversation ancestor_status and account is viewer' do
+        status.visibility = :limited
+        status.conversation = Fabricate(:conversation)
+
+        expect(subject).to permit(status.account, status)
+      end
+
+      it 'grants access when limited and my conversation and account is viewer' do
+        status.visibility = :limited
+        status.conversation = Fabricate(:conversation, ancestor_status: status)
+
+        expect(subject).to permit(status.account, status)
+      end
+
+      it 'grants access when limited and another conversation and account is viewer' do
+        status.visibility = :limited
+        status.conversation = Fabricate(:conversation, ancestor_status: Fabricate(:status, account: bob))
+
+        expect(subject).to_not permit(status.account, status)
+      end
+
+      it 'grants access when limited and viewer is mentioned' do
+        status.visibility = :limited
+        status.mentions = [Fabricate(:mention, account: bob)]
+
+        expect(subject).to_not permit(bob, status)
+      end
+
+      it 'grants access when limited and non-owner viewer is mentioned and mentions are loaded' do
+        status.visibility = :limited
+        status.mentions = [Fabricate(:mention, account: bob)]
+        status.mentions.load
+
+        expect(subject).to_not permit(bob, status)
+      end
     end
   end
 
@@ -139,6 +234,48 @@ RSpec.describe StatusPolicy, type: :model do
     end
   end
 
+  context 'with the permission of emoji_reaction?' do
+    permissions :emoji_reaction? do
+      it 'grants access when viewer is not blocked' do
+        follow         = Fabricate(:follow)
+        status.account = follow.target_account
+
+        expect(subject).to permit(follow.account, status)
+      end
+
+      it 'denies when viewer is blocked' do
+        block          = Fabricate(:block)
+        status.account = block.target_account
+
+        expect(subject).to_not permit(block.account, status)
+      end
+    end
+  end
+
+  context 'with the permission of quote?' do
+    permissions :quote? do
+      it 'grants access when viewer is not blocked' do
+        follow         = Fabricate(:follow)
+        status.account = follow.target_account
+
+        expect(subject).to permit(follow.account, status)
+      end
+
+      it 'denies when viewer is blocked' do
+        block          = Fabricate(:block)
+        status.account = block.target_account
+
+        expect(subject).to_not permit(block.account, status)
+      end
+
+      it 'denies when private visibility' do
+        status.visibility = :private
+
+        expect(subject).to_not permit(Fabricate(:account), status)
+      end
+    end
+  end
+
   context 'with the permission of update?' do
     permissions :update? do
       it 'grants access if owner' do
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index fa476a9fc3..7854547d26 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe UserPolicy do
 
       context 'when record.confirmed?' do
         it 'denies' do
-          john.user.confirm!
+          john.user.mark_email_as_confirmed!
           expect(subject).to_not permit(admin, john.user)
         end
       end
diff --git a/spec/presenters/instance_presenter_spec.rb b/spec/presenters/instance_presenter_spec.rb
index 516c7e9896..a5a5d3e188 100644
--- a/spec/presenters/instance_presenter_spec.rb
+++ b/spec/presenters/instance_presenter_spec.rb
@@ -85,7 +85,7 @@ describe InstancePresenter do
       end
 
       it 'defaults to the core mastodon repo URL' do
-        expect(instance_presenter.source_url).to eq('https://github.com/mastodon/mastodon')
+        expect(instance_presenter.source_url).to eq('https://github.com/kmycode/mastodon')
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index aaf587f49b..38aa711089 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -2,14 +2,35 @@
 
 ENV['RAILS_ENV'] ||= 'test'
 
-# This needs to be defined before Rails is initialized
-RUN_SYSTEM_SPECS = ENV.fetch('RUN_SYSTEM_SPECS', false)
+unless ENV['DISABLE_SIMPLECOV'] == 'true'
+  require 'simplecov'
 
-if RUN_SYSTEM_SPECS
-  STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
-  ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
+  SimpleCov.start 'rails' do
+    if ENV['CI']
+      require 'simplecov-lcov'
+      formatter SimpleCov::Formatter::LcovFormatter
+      formatter.config.report_with_single_file = true
+    else
+      formatter SimpleCov::Formatter::HTMLFormatter
+    end
+
+    enable_coverage :branch
+
+    add_filter 'lib/linter'
+
+    add_group 'Libraries', 'lib'
+    add_group 'Policies', 'app/policies'
+    add_group 'Presenters', 'app/presenters'
+    add_group 'Serializers', 'app/serializers'
+    add_group 'Services', 'app/services'
+    add_group 'Validators', 'app/validators'
+  end
 end
 
+# This needs to be defined before Rails is initialized
+STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
+ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
+
 require File.expand_path('../config/environment', __dir__)
 
 abort('The Rails environment is running in production mode!') if Rails.env.production?
@@ -21,14 +42,17 @@ require 'paperclip/matchers'
 require 'capybara/rspec'
 require 'chewy/rspec'
 require 'email_spec/rspec'
+require 'test_prof/recipes/rspec/before_all'
 
 Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
-WebMock.disable_net_connect!(allow: Chewy.settings[:host], allow_localhost: RUN_SYSTEM_SPECS)
+WebMock.disable_net_connect!(
+  allow_localhost: true,
+  allow: Chewy.settings[:host]
+)
 Sidekiq.logger = nil
 
-# System tests config
 DatabaseCleaner.strategy = [:deletion]
 
 Devise::Test::ControllerHelpers.module_eval do
@@ -48,16 +72,14 @@ Devise::Test::ControllerHelpers.module_eval do
 end
 
 RSpec.configure do |config|
-  # This is set before running spec:system, see lib/tasks/tests.rake
-  config.filter_run_excluding type: lambda { |type|
-    case type
-    when :system
-      !RUN_SYSTEM_SPECS
-    end
-  }
+  # By default, skip specs that need full JS browser
+  config.filter_run_excluding :js
 
-  # By default, skip the elastic search integration specs
-  config.filter_run_excluding search: true
+  # By default, skip specs that need elastic search server
+  config.filter_run_excluding :search
+
+  # By default, skip specs that need the streaming server
+  config.filter_run_excluding :streaming
 
   config.fixture_paths = [
     Rails.root.join('spec', 'fixtures'),
@@ -80,12 +102,14 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :helper
   config.include Devise::Test::ControllerHelpers, type: :view
-  config.include Devise::Test::IntegrationHelpers, type: :feature
+  config.include Devise::Test::IntegrationHelpers, type: :system
   config.include Devise::Test::IntegrationHelpers, type: :request
+  config.include ActionMailer::TestHelper
   config.include Paperclip::Shoulda::Matchers
   config.include ActiveSupport::Testing::TimeHelpers
   config.include Chewy::Rspec::Helpers
   config.include Redisable
+  config.include ThreadingHelpers
   config.include SignedRequestHelpers, type: :request
   config.include CommandLineHelpers, type: :cli
 
@@ -95,18 +119,19 @@ RSpec.configure do |config|
     self.use_transactional_tests = true
   end
 
-  config.around(:each, :sidekiq_inline) do |example|
-    Sidekiq::Testing.inline!(&example)
+  config.around do |example|
+    if example.metadata[:sidekiq_inline] == true
+      Sidekiq::Testing.inline!
+    else
+      Sidekiq::Testing.fake!
+    end
+    example.run
   end
 
   config.before :each, type: :cli do
     stub_reset_connection_pools
   end
 
-  config.before :each, type: :feature do
-    Capybara.current_driver = :rack_test
-  end
-
   config.before do |example|
     allow(Resolv::DNS).to receive(:open).and_raise('Real DNS queries are disabled, stub Resolv::DNS as needed') unless example.metadata[:type] == :system
   end
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index e84c46c47f..81e965e6e6 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -9,12 +9,18 @@ describe 'The account show page' do
 
     get '/@alice'
 
+    expect(head_link_icons.size).to eq(4) # One general favicon and three with sizes
+
     expect(head_meta_content('og:title')).to match alice.display_name
     expect(head_meta_content('og:type')).to eq 'profile'
     expect(head_meta_content('og:image')).to match '.+'
     expect(head_meta_content('og:url')).to match 'http://.+'
   end
 
+  def head_link_icons
+    head_section.css('link[rel=icon]')
+  end
+
   def head_meta_content(property)
     head_section.meta("[@property='#{property}']")[:content]
   end
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index b13e79b12b..8ae9c78a0e 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -15,15 +15,11 @@ RSpec.describe 'credentials API' do
 
     it_behaves_like 'forbidden for wrong scope', 'write write:accounts'
 
-    it 'returns http success' do
-      subject
-
-      expect(response).to have_http_status(200)
-    end
-
-    it 'returns the expected content' do
+    it 'returns http success with expected content' do
       subject
 
+      expect(response)
+        .to have_http_status(200)
       expect(body_as_json).to include({
         source: hash_including({
           discoverable: false,
@@ -32,26 +28,71 @@ RSpec.describe 'credentials API' do
         locked: true,
       })
     end
+
+    describe 'allows the read:me scope' do
+      let(:scopes) { 'read:me' }
+
+      it 'returns the response successfully' do
+        subject
+
+        expect(response).to have_http_status(200)
+
+        expect(body_as_json).to include({
+          locked: true,
+        })
+      end
+    end
   end
 
-  describe 'POST /api/v1/accounts/update_credentials' do
+  describe 'PATCH /api/v1/accounts/update_credentials' do
     subject do
       patch '/api/v1/accounts/update_credentials', headers: headers, params: params
     end
 
-    let(:params) { { discoverable: true, locked: false, indexable: true } }
+    before { allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async) }
+
+    let(:params) do
+      {
+        avatar: fixture_file_upload('avatar.gif', 'image/gif'),
+        discoverable: true,
+        display_name: "Alice Isn't Dead",
+        header: fixture_file_upload('attachment.jpg', 'image/jpeg'),
+        indexable: true,
+        locked: false,
+        note: 'Hello!',
+        source: {
+          privacy: 'unlisted',
+          sensitive: true,
+        },
+      }
+    end
 
     it_behaves_like 'forbidden for wrong scope', 'read read:accounts'
 
-    it 'returns http success' do
-      subject
+    describe 'with empty source list' do
+      let(:params) { { display_name: "I'm a cat", source: {} } }
 
-      expect(response).to have_http_status(200)
+      it 'returns http success' do
+        subject
+        expect(response).to have_http_status(200)
+      end
     end
 
-    it 'returns JSON with updated attributes' do
+    describe 'with invalid data' do
+      let(:params) { { note: 'This is too long. ' * 30 } }
+
+      it 'returns http unprocessable entity' do
+        subject
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    it 'returns http success with updated JSON attributes' do
       subject
 
+      expect(response)
+        .to have_http_status(200)
+
       expect(body_as_json).to include({
         source: hash_including({
           discoverable: true,
@@ -59,6 +100,27 @@ RSpec.describe 'credentials API' do
         }),
         locked: false,
       })
+
+      expect(ActivityPub::UpdateDistributionWorker)
+        .to have_received(:perform_async).with(user.account_id)
+    end
+
+    def expect_account_updates
+      expect(user.account.reload)
+        .to have_attributes(
+          display_name: eq("Alice Isn't Dead"),
+          note: 'Hello!',
+          avatar: exist,
+          header: exist
+        )
+    end
+
+    def expect_user_updates
+      expect(user.reload)
+        .to have_attributes(
+          setting_default_privacy: eq('unlisted'),
+          setting_default_sensitive: be(true)
+        )
     end
   end
 end
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/follower_accounts_spec.rb
index 510a47566b..7ff92d6a48 100644
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::FollowerAccountsController do
-  render_views
-
+describe 'API V1 Accounts FollowerAccounts' do
   let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
   let(:bob)     { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowerAccountsController do
   before do
     alice.follow!(account)
     bob.follow!(account)
-    allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/:acount_id/followers' do
     it 'returns accounts following the given account', :aggregate_failures do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
 
     it 'does not return blocked users', :aggregate_failures do
       user.account.block!(bob)
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
       end
 
       it 'hides results' do
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
         expect(body_as_json.size).to eq 0
       end
     end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
 
       it 'returns all accounts, including muted accounts' do
         account.mute!(bob)
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
         expect(body_as_json.size).to eq 2
         expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/following_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/following_accounts_spec.rb
index a7d07a6bec..b343a48654 100644
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/following_accounts_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::FollowingAccountsController do
-  render_views
-
+describe 'API V1 Accounts FollowingAccounts' do
   let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
   let(:bob)     { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowingAccountsController do
   before do
     account.follow!(alice)
     account.follow!(bob)
-    allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/:account_id/following' do
     it 'returns accounts followed by the given account', :aggregate_failures do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
 
     it 'does not return blocked users', :aggregate_failures do
       user.account.block!(bob)
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
       end
 
       it 'hides results' do
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
         expect(body_as_json.size).to eq 0
       end
     end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
 
       it 'returns all accounts, including muted accounts' do
         account.mute!(bob)
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
         expect(body_as_json.size).to eq 2
         expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
diff --git a/spec/requests/api/v1/accounts/statuses_spec.rb b/spec/requests/api/v1/accounts/statuses_spec.rb
new file mode 100644
index 0000000000..371867b215
--- /dev/null
+++ b/spec/requests/api/v1/accounts/statuses_spec.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Accounts Statuses' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes) { 'read:statuses' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/accounts/:account_id/statuses' do
+    it 'returns expected headers', :aggregate_failures do
+      Fabricate(:status, account: user.account)
+      get "/api/v1/accounts/#{user.account.id}/statuses", params: { limit: 1 }, headers: headers
+
+      expect(response).to have_http_status(200)
+      expect(links_from_header.size)
+        .to eq(2)
+    end
+
+    context 'with only media' do
+      it 'returns http success' do
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { only_media: true }, headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with exclude replies' do
+      let!(:status) { Fabricate(:status, account: user.account) }
+      let!(:status_self_reply) { Fabricate(:status, account: user.account, thread: status) }
+
+      before do
+        Fabricate(:status, account: user.account, thread: Fabricate(:status)) # Reply to another user
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { exclude_replies: true }, headers: headers
+      end
+
+      it 'returns posts along with self replies', :aggregate_failures do
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to have_attributes(size: 2)
+          .and contain_exactly(
+            include(id: status.id.to_s),
+            include(id: status_self_reply.id.to_s)
+          )
+      end
+    end
+
+    context 'with only own pinned' do
+      before do
+        Fabricate(:status_pin, account: user.account, status: Fabricate(:status, account: user.account))
+      end
+
+      it 'returns http success and includes a header link' do
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
+
+        expect(response).to have_http_status(200)
+        expect(links_from_header.size)
+          .to eq(1)
+        expect(links_from_header)
+          .to contain_exactly(
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'prev'])
+            )
+          )
+      end
+    end
+
+    context 'with enough pinned statuses to paginate' do
+      before do
+        stub_const 'Api::BaseController::DEFAULT_STATUSES_LIMIT', 1
+        2.times { Fabricate(:status_pin, account: user.account) }
+      end
+
+      it 'returns http success and header pagination links to prev and next' do
+        get "/api/v1/accounts/#{user.account.id}/statuses", params: { pinned: true }, headers: headers
+
+        expect(response).to have_http_status(200)
+        expect(links_from_header.size)
+          .to eq(2)
+        expect(links_from_header)
+          .to contain_exactly(
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'next'])
+            ),
+            have_attributes(
+              href: /pinned=true/,
+              attr_pairs: contain_exactly(['rel', 'prev'])
+            )
+          )
+      end
+    end
+
+    context "with someone else's pinned statuses" do
+      let(:account)        { Fabricate(:account, username: 'bob', domain: 'example.com') }
+      let(:status)         { Fabricate(:status, account: account) }
+      let(:private_status) { Fabricate(:status, account: account, visibility: :private) }
+
+      before do
+        Fabricate(:status_pin, account: account, status: status)
+        Fabricate(:status_pin, account: account, status: private_status)
+      end
+
+      it 'returns http success' do
+        get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+
+      context 'when user does not follow account' do
+        it 'lists the public status only' do
+          get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
+          expect(body_as_json)
+            .to contain_exactly(
+              a_hash_including(id: status.id.to_s)
+            )
+        end
+      end
+
+      context 'when user follows account' do
+        before do
+          user.account.follow!(account)
+        end
+
+        it 'lists both the public and the private statuses' do
+          get "/api/v1/accounts/#{account.id}/statuses", params: { pinned: true }, headers: headers
+
+          expect(body_as_json)
+            .to contain_exactly(
+              a_hash_including(id: status.id.to_s),
+              a_hash_including(id: private_status.id.to_s)
+            )
+        end
+      end
+    end
+  end
+
+  private
+
+  def links_from_header
+    response
+      .headers['Link']
+      .links
+  end
+end
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index e543c41360..9cd6e8abfb 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -8,6 +8,22 @@ describe '/api/v1/accounts' do
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+  describe 'GET /api/v1/accounts?ids[]=:id' do
+    let(:account) { Fabricate(:account) }
+    let(:other_account) { Fabricate(:account) }
+    let(:scopes) { 'read:accounts' }
+
+    it 'returns expected response' do
+      get '/api/v1/accounts', headers: headers, params: { ids: [account.id, other_account.id, 123_123] }
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to contain_exactly(
+        hash_including(id: account.id.to_s),
+        hash_including(id: other_account.id.to_s)
+      )
+    end
+  end
+
   describe 'GET /api/v1/accounts/:id' do
     context 'when logged out' do
       let(:account) { Fabricate(:account) }
@@ -83,6 +99,8 @@ describe '/api/v1/accounts' do
 
   describe 'POST /api/v1/accounts/:id/follow' do
     let(:scopes) { 'write:follows' }
+    let(:my_actor_type) { 'Person' }
+    let(:lock_follow_from_bot) { false }
     let(:other_account) { Fabricate(:account, username: 'bob', locked: locked) }
 
     context 'when posting to an other account' do
@@ -90,6 +108,12 @@ describe '/api/v1/accounts' do
         post "/api/v1/accounts/#{other_account.id}/follow", headers: headers
       end
 
+      before do
+        other_account.user.settings['lock_follow_from_bot'] = lock_follow_from_bot
+        other_account.user.save!
+        user.account.update!(actor_type: my_actor_type)
+      end
+
       context 'with unlocked account' do
         let(:locked) { false }
 
@@ -127,6 +151,35 @@ describe '/api/v1/accounts' do
 
         it_behaves_like 'forbidden for wrong scope', 'read:accounts'
       end
+
+      context 'with unlocked account from bot' do
+        let(:locked) { false }
+        let(:lock_follow_from_bot) { true }
+        let(:my_actor_type) { 'Service' }
+
+        it 'returns http success' do
+          subject
+
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns JSON with following=false and requested=true' do
+          subject
+
+          json = body_as_json
+
+          expect(json[:following]).to be false
+          expect(json[:requested]).to be true
+        end
+
+        it 'creates a follow request relation between user and target user' do
+          subject
+
+          expect(user.account.requested?(other_account)).to be true
+        end
+
+        it_behaves_like 'forbidden for wrong scope', 'read:accounts'
+      end
     end
 
     context 'when modifying follow options' do
diff --git a/spec/requests/api/v1/admin/domain_blocks_spec.rb b/spec/requests/api/v1/admin/domain_blocks_spec.rb
index 1fb6fc8228..bf21e3b886 100644
--- a/spec/requests/api/v1/admin/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/domain_blocks_spec.rb
@@ -49,6 +49,7 @@ RSpec.describe 'Domain Blocks' do
           {
             id: domain_block.id.to_s,
             domain: domain_block.domain,
+            digest: domain_block.domain_digest,
             created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
             severity: domain_block.severity.to_s,
             reject_media: domain_block.reject_media,
@@ -56,6 +57,15 @@ RSpec.describe 'Domain Blocks' do
             private_comment: domain_block.private_comment,
             public_comment: domain_block.public_comment,
             obfuscate: domain_block.obfuscate,
+            block_trends: domain_block.block_trends,
+            reject_favourite: domain_block.reject_favourite,
+            reject_hashtag: domain_block.reject_hashtag,
+            detect_invalid_subscription: domain_block.detect_invalid_subscription,
+            reject_new_follow: domain_block.reject_new_follow,
+            reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
+            reject_send_sensitive: domain_block.reject_send_sensitive,
+            reject_straight_follow: domain_block.reject_straight_follow,
+            reject_friend: domain_block.reject_friend,
           }
         end
       end
@@ -85,6 +95,29 @@ RSpec.describe 'Domain Blocks' do
 
     let!(:domain_block) { Fabricate(:domain_block) }
 
+    let(:expected_response) do
+      {
+        id: domain_block.id.to_s,
+        domain: domain_block.domain,
+        created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
+        severity: domain_block.severity.to_s,
+        reject_media: domain_block.reject_media,
+        reject_reports: domain_block.reject_reports,
+        private_comment: domain_block.private_comment,
+        public_comment: domain_block.public_comment,
+        obfuscate: domain_block.obfuscate,
+        block_trends: domain_block.block_trends,
+        reject_favourite: domain_block.reject_favourite,
+        reject_hashtag: domain_block.reject_hashtag,
+        detect_invalid_subscription: domain_block.detect_invalid_subscription,
+        reject_new_follow: domain_block.reject_new_follow,
+        reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
+        reject_send_sensitive: domain_block.reject_send_sensitive,
+        reject_straight_follow: domain_block.reject_straight_follow,
+        reject_friend: domain_block.reject_friend,
+      }
+    end
+
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
     it_behaves_like 'forbidden for wrong role', ''
     it_behaves_like 'forbidden for wrong role', 'Moderator'
@@ -97,6 +130,7 @@ RSpec.describe 'Domain Blocks' do
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
+          digest: domain_block.domain_digest,
           created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
           severity: domain_block.severity.to_s,
           reject_media: domain_block.reject_media,
@@ -104,6 +138,15 @@ RSpec.describe 'Domain Blocks' do
           private_comment: domain_block.private_comment,
           public_comment: domain_block.public_comment,
           obfuscate: domain_block.obfuscate,
+          block_trends: domain_block.block_trends,
+          reject_favourite: domain_block.reject_favourite,
+          reject_hashtag: domain_block.reject_hashtag,
+          detect_invalid_subscription: domain_block.detect_invalid_subscription,
+          reject_new_follow: domain_block.reject_new_follow,
+          reject_reply_exclude_followers: domain_block.reject_reply_exclude_followers,
+          reject_send_sensitive: domain_block.reject_send_sensitive,
+          reject_straight_follow: domain_block.reject_straight_follow,
+          reject_friend: domain_block.reject_friend,
         }
       )
     end
@@ -128,7 +171,7 @@ RSpec.describe 'Domain Blocks' do
     it_behaves_like 'forbidden for wrong role', ''
     it_behaves_like 'forbidden for wrong role', 'Moderator'
 
-    it 'returns expected domain name and severity', :aggregate_failures do
+    it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
       subject
 
       body = body_as_json
@@ -144,7 +187,44 @@ RSpec.describe 'Domain Blocks' do
       expect(DomainBlock.find_by(domain: 'foo.bar.com')).to be_present
     end
 
-    context 'when a stricter domain block already exists' do
+    context 'when a looser domain block already exists on a higher level domain' do
+      let(:params) { { domain: 'foo.bar.com', severity: :suspend } }
+
+      before do
+        Fabricate(:domain_block, domain: 'bar.com', severity: :silence)
+      end
+
+      it 'creates a domain block with the expected domain name and severity', :aggregate_failures do
+        subject
+
+        body = body_as_json
+
+        expect(response).to have_http_status(200)
+        expect(body).to match a_hash_including(
+          {
+            domain: 'foo.bar.com',
+            severity: 'suspend',
+          }
+        )
+
+        expect(DomainBlock.find_by(domain: 'foo.bar.com')).to be_present
+      end
+    end
+
+    context 'when a domain block already exists on the same domain' do
+      before do
+        Fabricate(:domain_block, domain: 'foo.bar.com', severity: :silence)
+      end
+
+      it 'returns existing domain block in error', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(422)
+        expect(body_as_json[:existing_domain_block][:domain]).to eq('foo.bar.com')
+      end
+    end
+
+    context 'when a stricter domain block already exists on a higher level domain' do
       before do
         Fabricate(:domain_block, domain: 'bar.com', severity: :suspend)
       end
@@ -188,6 +268,7 @@ RSpec.describe 'Domain Blocks' do
         {
           id: domain_block.id.to_s,
           domain: domain_block.domain,
+          digest: domain_block.domain_digest,
           severity: 'suspend',
         }
       )
diff --git a/spec/requests/api/v1/admin/reports_spec.rb b/spec/requests/api/v1/admin/reports_spec.rb
index 5403457db0..4b0b7e1713 100644
--- a/spec/requests/api/v1/admin/reports_spec.rb
+++ b/spec/requests/api/v1/admin/reports_spec.rb
@@ -151,7 +151,9 @@ RSpec.describe 'Reports' do
     let(:params)  { { category: 'spam' } }
 
     it 'updates the report category', :aggregate_failures do
-      expect { subject }.to change { report.reload.category }.from('other').to('spam')
+      expect { subject }
+        .to change { report.reload.category }.from('other').to('spam')
+        .and create_an_action_log
 
       expect(response).to have_http_status(200)
 
@@ -184,7 +186,9 @@ RSpec.describe 'Reports' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'marks report as resolved', :aggregate_failures do
-      expect { subject }.to change { report.reload.unresolved? }.from(true).to(false)
+      expect { subject }
+        .to change { report.reload.unresolved? }.from(true).to(false)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -200,7 +204,9 @@ RSpec.describe 'Reports' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'marks report as unresolved', :aggregate_failures do
-      expect { subject }.to change { report.reload.unresolved? }.from(false).to(true)
+      expect { subject }
+        .to change { report.reload.unresolved? }.from(false).to(true)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -216,7 +222,9 @@ RSpec.describe 'Reports' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'assigns report to the requesting user', :aggregate_failures do
-      expect { subject }.to change { report.reload.assigned_account_id }.from(nil).to(user.account.id)
+      expect { subject }
+        .to change { report.reload.assigned_account_id }.from(nil).to(user.account.id)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
@@ -232,8 +240,16 @@ RSpec.describe 'Reports' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'unassigns report from assignee', :aggregate_failures do
-      expect { subject }.to change { report.reload.assigned_account_id }.from(user.account.id).to(nil)
+      expect { subject }
+        .to change { report.reload.assigned_account_id }.from(user.account.id).to(nil)
+        .and create_an_action_log
       expect(response).to have_http_status(200)
     end
   end
+
+  private
+
+  def create_an_action_log
+    change(Admin::ActionLog, :count).by(1)
+  end
 end
diff --git a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
similarity index 60%
rename from spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
index 76e215440d..384a305d4a 100644
--- a/spec/controllers/api/v1/admin/trends/links/preview_card_providers_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/preview_card_providers_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::Links::PreviewCardProvidersController do
-  render_views
-
+describe 'API V1 Admin Trends Links Preview Card Providers' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:preview_card_provider) { Fabricate(:preview_card_provider) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/links/publishers' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/links/publishers', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/approve' do
     before do
-      post :approve, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@ describe Api::V1::Admin::Trends::Links::PreviewCardProvidersController do
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/links/publishers/:id/reject' do
     before do
-      post :reject, params: { id: preview_card_provider.id }
+      post "/api/v1/admin/trends/links/publishers/#{preview_card_provider.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb b/spec/requests/api/v1/admin/trends/statuses_spec.rb
similarity index 63%
rename from spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/statuses_spec.rb
index 4d80055ac0..04aa0465f2 100644
--- a/spec/controllers/api/v1/admin/trends/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/statuses_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::StatusesController do
-  render_views
-
+describe 'API V1 Admin Trends Statuses' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:account) { Fabricate(:account) }
   let(:status)  { Fabricate(:status) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/statuses' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/statuses', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/statuses/:id/approve' do
     before do
-      post :approve, params: { id: status.id }
+      post "/api/v1/admin/trends/statuses/#{status.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@ describe Api::V1::Admin::Trends::StatusesController do
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/statuses/:id/unapprove' do
     before do
-      post :reject, params: { id: status.id }
+      post "/api/v1/admin/trends/statuses/#{status.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v1/admin/trends/tags_controller_spec.rb b/spec/requests/api/v1/admin/trends/tags_spec.rb
similarity index 64%
rename from spec/controllers/api/v1/admin/trends/tags_controller_spec.rb
rename to spec/requests/api/v1/admin/trends/tags_spec.rb
index 0b8eb8c3b8..b1437dad8d 100644
--- a/spec/controllers/api/v1/admin/trends/tags_controller_spec.rb
+++ b/spec/requests/api/v1/admin/trends/tags_spec.rb
@@ -2,31 +2,26 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::Trends::TagsController do
-  render_views
-
+describe 'API V1 Admin Trends Tags' do
   let(:role)   { UserRole.find_by(name: 'Admin') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:account) { Fabricate(:account) }
   let(:tag)     { Fabricate(:tag) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/admin/trends/tags' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/admin/trends/tags', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'POST #approve' do
+  describe 'POST /api/v1/admin/trends/tags/:id/approve' do
     before do
-      post :approve, params: { id: tag.id }
+      post "/api/v1/admin/trends/tags/#{tag.id}/approve", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
@@ -37,9 +32,9 @@ describe Api::V1::Admin::Trends::TagsController do
     end
   end
 
-  describe 'POST #reject' do
+  describe 'POST /api/v1/admin/trends/tags/:id/reject' do
     before do
-      post :reject, params: { id: tag.id }
+      post "/api/v1/admin/trends/tags/#{tag.id}/reject", headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb b/spec/requests/api/v1/announcements/reactions_spec.rb
similarity index 64%
rename from spec/controllers/api/v1/announcements/reactions_controller_spec.rb
rename to spec/requests/api/v1/announcements/reactions_spec.rb
index c1debc33fe..ffacb2b0af 100644
--- a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb
+++ b/spec/requests/api/v1/announcements/reactions_spec.rb
@@ -2,27 +2,26 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Announcements::ReactionsController do
-  render_views
-
+RSpec.describe 'API V1 Announcements Reactions' do
   let(:user)   { Fabricate(:user) }
   let(:scopes) { 'write:favourites' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   let!(:announcement) { Fabricate(:announcement) }
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v1/announcements/:announcement_id/reactions/:id' do
     context 'without token' do
       it 'returns http unauthorized' do
-        put :update, params: { announcement_id: announcement.id, id: '😂' }
+        put "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}"
+
         expect(response).to have_http_status 401
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        put :update, params: { announcement_id: announcement.id, id: '😂' }
+        put "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}", headers: headers
       end
 
       it 'creates reaction', :aggregate_failures do
@@ -32,22 +31,21 @@ RSpec.describe Api::V1::Announcements::ReactionsController do
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/announcements/:announcement_id/reactions/:id' do
     before do
       announcement.announcement_reactions.create!(account: user.account, name: '😂')
     end
 
     context 'without token' do
       it 'returns http unauthorized' do
-        delete :destroy, params: { announcement_id: announcement.id, id: '😂' }
+        delete "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}"
         expect(response).to have_http_status 401
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        delete :destroy, params: { announcement_id: announcement.id, id: '😂' }
+        delete "/api/v1/announcements/#{announcement.id}/reactions/#{escaped_emoji}", headers: headers
       end
 
       it 'creates reaction', :aggregate_failures do
@@ -56,4 +54,8 @@ RSpec.describe Api::V1::Announcements::ReactionsController do
       end
     end
   end
+
+  def escaped_emoji
+    CGI.escape('😂')
+  end
 end
diff --git a/spec/controllers/api/v1/announcements_controller_spec.rb b/spec/requests/api/v1/announcements_spec.rb
similarity index 59%
rename from spec/controllers/api/v1/announcements_controller_spec.rb
rename to spec/requests/api/v1/announcements_spec.rb
index 95ce8fd9fc..1624b76012 100644
--- a/spec/controllers/api/v1/announcements_controller_spec.rb
+++ b/spec/requests/api/v1/announcements_spec.rb
@@ -2,27 +2,26 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::AnnouncementsController do
-  render_views
-
-  let(:user)   { Fabricate(:user) }
-  let(:scopes) { 'read' }
-  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+RSpec.describe 'API V1 Announcements' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'read' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   let!(:announcement) { Fabricate(:announcement) }
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/announcements' do
     context 'without token' do
       it 'returns http unprocessable entity' do
-        get :index
+        get '/api/v1/announcements'
+
         expect(response).to have_http_status 422
       end
     end
 
     context 'with token' do
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        get :index
+        get '/api/v1/announcements', headers: headers
       end
 
       it 'returns http success' do
@@ -31,10 +30,11 @@ RSpec.describe Api::V1::AnnouncementsController do
     end
   end
 
-  describe 'POST #dismiss' do
+  describe 'POST /api/v1/announcements/:id/dismiss' do
     context 'without token' do
       it 'returns http unauthorized' do
-        post :dismiss, params: { id: announcement.id }
+        post "/api/v1/announcements/#{announcement.id}/dismiss"
+
         expect(response).to have_http_status 401
       end
     end
@@ -43,8 +43,7 @@ RSpec.describe Api::V1::AnnouncementsController do
       let(:scopes) { 'write:accounts' }
 
       before do
-        allow(controller).to receive(:doorkeeper_token) { token }
-        post :dismiss, params: { id: announcement.id }
+        post "/api/v1/announcements/#{announcement.id}/dismiss", headers: headers
       end
 
       it 'dismisses announcement', :aggregate_failures do
diff --git a/spec/requests/api/v1/antennas_spec.rb b/spec/requests/api/v1/antennas_spec.rb
new file mode 100644
index 0000000000..1597bbd81f
--- /dev/null
+++ b/spec/requests/api/v1/antennas_spec.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Antennas' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:lists write:lists' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/antennas' do
+    subject do
+      get '/api/v1/antennas', headers: headers
+    end
+
+    let!(:antennas) do
+      [
+        Fabricate(:antenna, account: user.account, title: 'first antenna'),
+        Fabricate(:antenna, account: user.account, title: 'second antenna', with_media_only: true),
+        Fabricate(:antenna, account: user.account, title: 'third antenna', stl: true),
+        Fabricate(:antenna, account: user.account, title: 'fourth antenna', ignore_reblog: true),
+      ]
+    end
+
+    let(:expected_response) do
+      antennas.map do |antenna|
+        {
+          id: antenna.id.to_s,
+          title: antenna.title,
+          with_media_only: antenna.with_media_only,
+          ignore_reblog: antenna.ignore_reblog,
+          stl: antenna.stl,
+          ltl: antenna.ltl,
+          insert_feeds: antenna.insert_feeds,
+          list: nil,
+          accounts_count: 0,
+          domains_count: 0,
+          tags_count: 0,
+          keywords_count: 0,
+        }
+      end
+    end
+
+    before do
+      Fabricate(:antenna)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:lists'
+
+    it 'returns the expected antennas', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match_array(expected_response)
+    end
+  end
+
+  describe 'GET /api/v1/antennas/:id' do
+    subject do
+      get "/api/v1/antennas/#{antenna.id}", headers: headers
+    end
+
+    let(:antenna) { Fabricate(:antenna, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:lists'
+
+    it 'returns the requested antenna correctly', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to eq({
+        id: antenna.id.to_s,
+        title: antenna.title,
+        with_media_only: antenna.with_media_only,
+        ignore_reblog: antenna.ignore_reblog,
+        stl: antenna.stl,
+        ltl: antenna.ltl,
+        insert_feeds: antenna.insert_feeds,
+        list: nil,
+        accounts_count: 0,
+        domains_count: 0,
+        tags_count: 0,
+        keywords_count: 0,
+      })
+    end
+
+    context 'when the antenna belongs to a different user' do
+      let(:antenna) { Fabricate(:antenna) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the antenna does not exist' do
+      it 'returns http not found' do
+        get '/api/v1/antennas/-1', headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/antennas' do
+    subject do
+      post '/api/v1/antennas', headers: headers, params: params
+    end
+
+    let(:params) { { title: 'my antenna', ltl: 'true' } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'returns the new antenna', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match(a_hash_including(title: 'my antenna', ltl: true))
+      expect(Antenna.where(account: user.account).count).to eq(1)
+    end
+
+    context 'when a title is not given' do
+      let(:params) { { title: '' } }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/antennas/:id' do
+    subject do
+      put "/api/v1/antennas/#{antenna.id}", headers: headers, params: params
+    end
+
+    let(:antenna) { Fabricate(:antenna, account: user.account, title: 'my antenna') }
+    let(:params) { { title: 'antenna', ignore_reblog: 'true', insert_feeds: 'true' } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'returns the updated antenna and updates values', :aggregate_failures do
+      expect { subject }
+        .to change_antenna_title
+        .and change_antenna_ignore_reblog
+        .and change_antenna_insert_feeds
+
+      expect(response).to have_http_status(200)
+      antenna.reload
+
+      expect(body_as_json).to eq({
+        id: antenna.id.to_s,
+        title: antenna.title,
+        with_media_only: antenna.with_media_only,
+        ignore_reblog: antenna.ignore_reblog,
+        stl: antenna.stl,
+        ltl: antenna.ltl,
+        insert_feeds: antenna.insert_feeds,
+        list: nil,
+        accounts_count: 0,
+        domains_count: 0,
+        tags_count: 0,
+        keywords_count: 0,
+      })
+    end
+
+    def change_antenna_title
+      change { antenna.reload.title }.from('my antenna').to('antenna')
+    end
+
+    def change_antenna_ignore_reblog
+      change { antenna.reload.ignore_reblog }.from(false).to(true)
+    end
+
+    def change_antenna_insert_feeds
+      change { antenna.reload.insert_feeds }.from(false).to(true)
+    end
+
+    context 'when the antenna does not exist' do
+      it 'returns http not found' do
+        put '/api/v1/antennas/-1', headers: headers, params: params
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the antenna belongs to another user' do
+      let(:antenna) { Fabricate(:antenna) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/antennas/:id' do
+    subject do
+      delete "/api/v1/antennas/#{antenna.id}", headers: headers
+    end
+
+    let(:antenna) { Fabricate(:antenna, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'deletes the antenna', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(Antenna.where(id: antenna.id)).to_not exist
+    end
+
+    context 'when the antenna does not exist' do
+      it 'returns http not found' do
+        delete '/api/v1/antennas/-1', headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the antenna belongs to another user' do
+      let(:antenna) { Fabricate(:antenna) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/blocks_spec.rb b/spec/requests/api/v1/blocks_spec.rb
index 62543157c3..c6c2d56f36 100644
--- a/spec/requests/api/v1/blocks_spec.rb
+++ b/spec/requests/api/v1/blocks_spec.rb
@@ -38,16 +38,14 @@ RSpec.describe 'Blocks' do
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets correct link header pagination' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_blocks_url(limit: params[:limit], since_id: blocks.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_blocks_url(limit: params[:limit], max_id: blocks[1].id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_blocks_url(limit: params[:limit], since_id: blocks.last.id),
+            next: api_v1_blocks_url(limit: params[:limit], max_id: blocks.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/bookmarks_spec.rb b/spec/requests/api/v1/bookmarks_spec.rb
index 18f4fddc29..dc32820c89 100644
--- a/spec/requests/api/v1/bookmarks_spec.rb
+++ b/spec/requests/api/v1/bookmarks_spec.rb
@@ -42,9 +42,14 @@ RSpec.describe 'Bookmarks' do
       it 'paginates correctly', :aggregate_failures do
         subject
 
-        expect(body_as_json.size).to eq(params[:limit])
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_bookmarks_url(limit: params[:limit], min_id: bookmarks.last.id))
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_bookmarks_url(limit: params[:limit], max_id: bookmarks[1].id))
+        expect(body_as_json.size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_bookmarks_url(limit: params[:limit], min_id: bookmarks.last.id),
+            next: api_v1_bookmarks_url(limit: params[:limit], max_id: bookmarks.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/circles/accounts_spec.rb b/spec/requests/api/v1/circles/accounts_spec.rb
new file mode 100644
index 0000000000..162c4f111c
--- /dev/null
+++ b/spec/requests/api/v1/circles/accounts_spec.rb
@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Accounts' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:lists write:lists' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/circles/:id/accounts' do
+    subject do
+      get "/api/v1/circles/#{circle.id}/accounts", headers: headers, params: params
+    end
+
+    let(:params)   { { limit: 0 } }
+    let(:circle)   { Fabricate(:circle, account: user.account) }
+    let(:accounts) { Fabricate.times(3, :account) }
+
+    let(:expected_response) do
+      accounts.map do |account|
+        a_hash_including(id: account.id.to_s, username: account.username, acct: account.acct)
+      end
+    end
+
+    before do
+      accounts.each { |account| account.follow!(user.account) }
+      circle.accounts << accounts
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:lists'
+
+    it 'returns the accounts in the requested circle', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match_array(expected_response)
+    end
+
+    context 'with limit param' do
+      let(:params) { { limit: 1 } }
+
+      it 'returns only the requested number of accounts' do
+        subject
+
+        expect(body_as_json.size).to eq(params[:limit])
+      end
+    end
+  end
+
+  describe 'POST /api/v1/circles/:id/accounts' do
+    subject do
+      post "/api/v1/circles/#{circle.id}/accounts", headers: headers, params: params
+    end
+
+    let(:circle) { Fabricate(:circle, account: user.account) }
+    let(:bob)    { Fabricate(:account, username: 'bob') }
+    let(:params) { { account_ids: [bob.id] } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    context 'when the added account is followed' do
+      before do
+        bob.follow!(user.account)
+      end
+
+      it 'adds account to the circle', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(circle.accounts).to include(bob)
+      end
+    end
+
+    context 'when the added account is not followed' do
+      it 'does not add the account to the circle', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(404)
+        expect(circle.accounts).to_not include(bob)
+      end
+    end
+
+    context 'when the circle is not owned by the requesting user' do
+      let(:circle) { Fabricate(:circle) }
+
+      before do
+        bob.follow!(user.account)
+      end
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when account is already in the circle' do
+      before do
+        bob.follow!(user.account)
+        circle.accounts << bob
+      end
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/circles/:id/accounts' do
+    subject do
+      delete "/api/v1/circles/#{circle.id}/accounts", headers: headers, params: params
+    end
+
+    context 'when the circle is owned by the requesting user' do
+      let(:circle) { Fabricate(:circle, account: user.account) }
+      let(:bob)    { Fabricate(:account, username: 'bob') }
+      let(:peter)  { Fabricate(:account, username: 'peter') }
+      let(:params) { { account_ids: [bob.id] } }
+
+      before do
+        bob.follow!(user.account)
+        peter.follow!(user.account)
+        circle.accounts << [bob, peter]
+      end
+
+      it 'removes the specified account from the circle', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(circle.accounts).to_not include(bob)
+      end
+
+      it 'does not remove any other account from the circle' do
+        subject
+
+        expect(circle.accounts).to include(peter)
+      end
+
+      context 'when the specified account is not in the circle' do
+        let(:params) { { account_ids: [0] } }
+
+        it 'does not remove any account from the circle', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(circle.accounts).to contain_exactly(bob, peter)
+        end
+      end
+    end
+
+    context 'when the circle is not owned by the requesting user' do
+      let(:circle) { Fabricate(:circle) }
+      let(:params) { {} }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/circles_spec.rb b/spec/requests/api/v1/circles_spec.rb
new file mode 100644
index 0000000000..7dfce7c133
--- /dev/null
+++ b/spec/requests/api/v1/circles_spec.rb
@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Circles' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:lists write:lists' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/circles' do
+    subject do
+      get '/api/v1/circles', headers: headers
+    end
+
+    let!(:circles) do
+      [
+        Fabricate(:circle, account: user.account, title: 'first circle'),
+        Fabricate(:circle, account: user.account, title: 'second circle'),
+        Fabricate(:circle, account: user.account, title: 'third circle'),
+        Fabricate(:circle, account: user.account, title: 'fourth circle'),
+      ]
+    end
+
+    let(:expected_response) do
+      circles.map do |circle|
+        {
+          id: circle.id.to_s,
+          title: circle.title,
+        }
+      end
+    end
+
+    before do
+      Fabricate(:circle)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:lists'
+
+    it 'returns the expected circles', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match_array(expected_response)
+    end
+  end
+
+  describe 'GET /api/v1/circles/:id' do
+    subject do
+      get "/api/v1/circles/#{circle.id}", headers: headers
+    end
+
+    let(:circle) { Fabricate(:circle, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:lists'
+
+    it 'returns the requested circle correctly', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to eq({
+        id: circle.id.to_s,
+        title: circle.title,
+      })
+    end
+
+    context 'when the circle belongs to a different user' do
+      let(:circle) { Fabricate(:circle) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the circle does not exist' do
+      it 'returns http not found' do
+        get '/api/v1/circles/-1', headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/circles' do
+    subject do
+      post '/api/v1/circles', headers: headers, params: params
+    end
+
+    let(:params) { { title: 'my circle' } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'returns the new circle', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match(a_hash_including(title: 'my circle'))
+      expect(Circle.where(account: user.account).count).to eq(1)
+    end
+
+    context 'when a title is not given' do
+      let(:params) { { title: '' } }
+
+      it 'returns http unprocessable entity' do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/circles/:id' do
+    subject do
+      put "/api/v1/circles/#{circle.id}", headers: headers, params: params
+    end
+
+    let(:circle)   { Fabricate(:circle, account: user.account, title: 'my circle') }
+    let(:params) { { title: 'circle' } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'returns the updated circle', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      circle.reload
+
+      expect(body_as_json).to eq({
+        id: circle.id.to_s,
+        title: circle.title,
+      })
+    end
+
+    it 'updates the circle title' do
+      expect { subject }.to change { circle.reload.title }.from('my circle').to('circle')
+    end
+
+    context 'when the circle does not exist' do
+      it 'returns http not found' do
+        put '/api/v1/circles/-1', headers: headers, params: params
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the circle belongs to another user' do
+      let(:circle) { Fabricate(:circle) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/circles/:id' do
+    subject do
+      delete "/api/v1/circles/#{circle.id}", headers: headers
+    end
+
+    let(:circle) { Fabricate(:circle, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:lists'
+
+    it 'deletes the circle', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(Circle.where(id: circle.id)).to_not exist
+    end
+
+    context 'when the circle does not exist' do
+      it 'returns http not found' do
+        delete '/api/v1/circles/-1', headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when the circle belongs to another user' do
+      let(:circle) { Fabricate(:circle) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/conversations_spec.rb b/spec/requests/api/v1/conversations_spec.rb
new file mode 100644
index 0000000000..caa0f5c52c
--- /dev/null
+++ b/spec/requests/api/v1/conversations_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'API V1 Conversations' do
+  let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:scopes) { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  let(:other) { Fabricate(:user) }
+
+  describe 'GET /api/v1/conversations', :sidekiq_inline do
+    before do
+      user.account.follow!(other.account)
+      PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
+      PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
+    end
+
+    it 'returns pagination headers', :aggregate_failures do
+      get '/api/v1/conversations', params: { limit: 1 }, headers: headers
+
+      expect(response).to have_http_status(200)
+      expect(response.headers['Link'].links.size).to eq(2)
+    end
+
+    it 'returns conversations', :aggregate_failures do
+      get '/api/v1/conversations', headers: headers
+
+      expect(body_as_json.size).to eq 2
+      expect(body_as_json[0][:accounts].size).to eq 1
+    end
+
+    context 'with since_id' do
+      context 'when requesting old posts' do
+        it 'returns conversations' do
+          get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }, headers: headers
+
+          expect(body_as_json.size).to eq 2
+        end
+      end
+
+      context 'when requesting posts in the future' do
+        it 'returns no conversation' do
+          get '/api/v1/conversations', params: { since_id: Mastodon::Snowflake.id_at(1.hour.from_now, with_random: false) }, headers: headers
+
+          expect(body_as_json.size).to eq 0
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/favourites_spec.rb b/spec/requests/api/v1/favourites_spec.rb
index 2d8a42e716..b988ac99db 100644
--- a/spec/requests/api/v1/favourites_spec.rb
+++ b/spec/requests/api/v1/favourites_spec.rb
@@ -45,16 +45,14 @@ RSpec.describe 'Favourites' do
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets the correct pagination headers' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_favourites_url(limit: params[:limit], min_id: favourites.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_favourites_url(limit: params[:limit], max_id: favourites[1].id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_favourites_url(limit: params[:limit], min_id: favourites.last.id),
+            next: api_v1_favourites_url(limit: params[:limit], max_id: favourites.second.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
index f7b453b740..00451540ca 100644
--- a/spec/requests/api/v1/featured_tags/suggestions_spec.rb
+++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
@@ -7,13 +7,35 @@ describe 'Featured Tags Suggestions API' do
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:scopes)  { 'read:accounts' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
-  let(:account) { Fabricate(:account) }
+  let(:account) { Fabricate(:account, user: user) }
 
   describe 'GET /api/v1/featured_tags/suggestions' do
-    it 'returns http success' do
-      get '/api/v1/featured_tags/suggestions', params: { account_id: account.id, limit: 2 }, headers: headers
+    let!(:unused_featured_tag) { Fabricate(:tag, name: 'unused_featured_tag') }
+    let!(:used_tag) { Fabricate(:tag, name: 'used_tag') }
+    let!(:used_featured_tag) { Fabricate(:tag, name: 'used_featured_tag') }
 
-      expect(response).to have_http_status(200)
+    before do
+      _unused_tag = Fabricate(:tag, name: 'unused_tag')
+
+      # Make relevant tags used by account
+      status = Fabricate(:status, account: account)
+      status.tags << used_tag
+      status.tags << used_featured_tag
+
+      # Feature the relevant tags
+      Fabricate :featured_tag, account: account, name: unused_featured_tag.name
+      Fabricate :featured_tag, account: account, name: used_featured_tag.name
+    end
+
+    it 'returns http success and recently used but not featured tags' do
+      get '/api/v1/featured_tags/suggestions', params: { limit: 2 }, headers: headers
+
+      expect(response)
+        .to have_http_status(200)
+      expect(body_as_json)
+        .to contain_exactly(
+          include(name: used_tag.name)
+        )
     end
   end
 end
diff --git a/spec/controllers/api/v1/filters_controller_spec.rb b/spec/requests/api/v1/filters_spec.rb
similarity index 75%
rename from spec/controllers/api/v1/filters_controller_spec.rb
rename to spec/requests/api/v1/filters_spec.rb
index b0f64ccf41..deb6e74217 100644
--- a/spec/controllers/api/v1/filters_controller_spec.rb
+++ b/spec/requests/api/v1/filters_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::FiltersController do
-  render_views
+RSpec.describe 'API V1 Filters' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/filters' do
     let(:scopes) { 'read:filters' }
     let!(:filter) { Fabricate(:custom_filter, account: user.account) }
     let!(:custom_filter_keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index
+      get '/api/v1/filters', headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -27,13 +22,13 @@ RSpec.describe Api::V1::FiltersController do
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/filters' do
     let(:scopes) { 'write:filters' }
     let(:irreversible) { true }
     let(:whole_word)   { false }
 
     before do
-      post :create, params: { phrase: 'magic', context: %w(home), irreversible: irreversible, whole_word: whole_word }
+      post '/api/v1/filters', params: { phrase: 'magic', context: %w(home), irreversible: irreversible, whole_word: whole_word }, headers: headers
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -64,24 +59,25 @@ RSpec.describe Api::V1::FiltersController do
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v1/filters/:id' do
     let(:scopes)  { 'read:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :show, params: { id: keyword.id }
+      get "/api/v1/filters/#{keyword.id}", headers: headers
+
       expect(response).to have_http_status(200)
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v1/filters/:id' do
     let(:scopes)  { 'write:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      put :update, params: { id: keyword.id, phrase: 'updated' }
+      put "/api/v1/filters/#{keyword.id}", headers: headers, params: { phrase: 'updated' }
     end
 
     it 'updates the filter', :aggregate_failures do
@@ -90,13 +86,13 @@ RSpec.describe Api::V1::FiltersController do
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/filters/:id' do
     let(:scopes)  { 'write:filters' }
     let(:filter)  { Fabricate(:custom_filter, account: user.account) }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: keyword.id }
+      delete "/api/v1/filters/#{keyword.id}", headers: headers
     end
 
     it 'removes the filter', :aggregate_failures do
diff --git a/spec/requests/api/v1/followed_tags_spec.rb b/spec/requests/api/v1/followed_tags_spec.rb
index 52ed1ba4bb..3d2d82d5db 100644
--- a/spec/requests/api/v1/followed_tags_spec.rb
+++ b/spec/requests/api/v1/followed_tags_spec.rb
@@ -49,16 +49,14 @@ RSpec.describe 'Followed tags' do
         expect(body_as_json.size).to eq(params[:limit])
       end
 
-      it 'sets the correct pagination header for the prev path' do
+      it 'sets the correct pagination headers' do
         subject
 
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], since_id: tag_follows.last.id))
-      end
-
-      it 'sets the correct pagination header for the next path' do
-        subject
-
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows.last.id))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_followed_tags_url(limit: params[:limit], since_id: tag_follows.last.id),
+            next: api_v1_followed_tags_url(limit: params[:limit], max_id: tag_follows.last.id)
+          )
       end
     end
   end
diff --git a/spec/requests/api/v1/instances/domain_blocks_spec.rb b/spec/requests/api/v1/instances/domain_blocks_spec.rb
index 397ecff084..e9206a0b86 100644
--- a/spec/requests/api/v1/instances/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/instances/domain_blocks_spec.rb
@@ -3,6 +3,11 @@
 require 'rails_helper'
 
 RSpec.describe 'Domain Blocks' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read' }
+  let(:headers) { { Authorization: "Bearer #{token.token}" } }
+
   describe 'GET /api/v1/instance/domain_blocks' do
     before do
       Fabricate(:domain_block)
@@ -22,6 +27,16 @@ RSpec.describe 'Domain Blocks' do
           .and(be_an(Array))
           .and(have_attributes(size: 1))
       end
+
+      context 'with hidden domain block' do
+        before { Fabricate(:domain_block, domain: 'hello.com', hidden: true) }
+
+        it 'returns http success and dont include hidden record' do
+          get api_v1_instance_domain_blocks_path
+
+          expect(body_as_json.pluck(:domain)).to_not include('hello.com')
+        end
+      end
     end
 
     context 'with domain blocks set to users' do
@@ -35,6 +50,32 @@ RSpec.describe 'Domain Blocks' do
       end
     end
 
+    context 'with domain blocks set to users with access token' do
+      before { Setting.show_domain_blocks = 'users' }
+
+      it 'returns http not found' do
+        get api_v1_instance_domain_blocks_path, headers: headers
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(body_as_json)
+          .to be_present
+          .and(be_an(Array))
+          .and(have_attributes(size: 1))
+      end
+
+      context 'with hidden domain block' do
+        before { Fabricate(:domain_block, domain: 'hello.com', hidden: true) }
+
+        it 'returns http success and dont include hidden record' do
+          get api_v1_instance_domain_blocks_path, headers: headers
+
+          expect(body_as_json.pluck(:domain)).to_not include('hello.com')
+        end
+      end
+    end
+
     context 'with domain blocks set to disabled' do
       before { Setting.show_domain_blocks = 'disabled' }
 
diff --git a/spec/requests/api/v1/lists_spec.rb b/spec/requests/api/v1/lists_spec.rb
index 4635e936f5..694afcfb66 100644
--- a/spec/requests/api/v1/lists_spec.rb
+++ b/spec/requests/api/v1/lists_spec.rb
@@ -19,6 +19,7 @@ RSpec.describe 'Lists' do
         Fabricate(:list, account: user.account, title: 'second list', replies_policy: :list),
         Fabricate(:list, account: user.account, title: 'third list', replies_policy: :none),
         Fabricate(:list, account: user.account, title: 'fourth list', exclusive: true),
+        Fabricate(:list, account: user.account, title: 'fifth list', notify: true),
       ]
     end
 
@@ -29,6 +30,8 @@ RSpec.describe 'Lists' do
           title: list.title,
           replies_policy: list.replies_policy,
           exclusive: list.exclusive,
+          antennas: list.antennas,
+          notify: list.notify,
         }
       end
     end
@@ -65,6 +68,8 @@ RSpec.describe 'Lists' do
         title: list.title,
         replies_policy: list.replies_policy,
         exclusive: list.exclusive,
+        antennas: list.antennas,
+        notify: list.notify,
       })
     end
 
@@ -149,6 +154,8 @@ RSpec.describe 'Lists' do
         title: list.title,
         replies_policy: list.replies_policy,
         exclusive: list.exclusive,
+        antennas: list.antennas,
+        notify: list.notify,
       })
     end
 
diff --git a/spec/controllers/api/v1/markers_controller_spec.rb b/spec/requests/api/v1/markers_spec.rb
similarity index 50%
rename from spec/controllers/api/v1/markers_controller_spec.rb
rename to spec/requests/api/v1/markers_spec.rb
index e954bbd1b6..b04adf2594 100644
--- a/spec/controllers/api/v1/markers_controller_spec.rb
+++ b/spec/requests/api/v1/markers_spec.rb
@@ -2,20 +2,18 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::MarkersController do
-  render_views
+RSpec.describe 'API Markers' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses write:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let!(:user)  { Fabricate(:user) }
-  let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses write:statuses') }
-
-  before { allow(controller).to receive(:doorkeeper_token) { token } }
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/markers' do
     before do
       Fabricate(:marker, timeline: 'home', last_read_id: 123, user: user)
       Fabricate(:marker, timeline: 'notifications', last_read_id: 456, user: user)
 
-      get :index, params: { timeline: %w(home notifications) }
+      get '/api/v1/markers', headers: headers, params: { timeline: %w(home notifications) }
     end
 
     it 'returns markers', :aggregate_failures do
@@ -29,10 +27,10 @@ RSpec.describe Api::V1::MarkersController do
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/markers' do
     context 'when no marker exists' do
       before do
-        post :create, params: { home: { last_read_id: '69420' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
       end
 
       it 'creates a marker', :aggregate_failures do
@@ -44,8 +42,8 @@ RSpec.describe Api::V1::MarkersController do
 
     context 'when a marker exists' do
       before do
-        post :create, params: { home: { last_read_id: '69420' } }
-        post :create, params: { home: { last_read_id: '70120' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '70120' } }
       end
 
       it 'updates a marker', :aggregate_failures do
@@ -54,5 +52,19 @@ RSpec.describe Api::V1::MarkersController do
         expect(user.markers.first.last_read_id).to eq 70_120
       end
     end
+
+    context 'when database object becomes stale' do
+      before do
+        allow(Marker).to receive(:transaction).and_raise(ActiveRecord::StaleObjectError)
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
+      end
+
+      it 'returns error json' do
+        expect(response)
+          .to have_http_status(409)
+        expect(body_as_json)
+          .to include(error: /Conflict during update/)
+      end
+    end
   end
 end
diff --git a/spec/requests/api/v1/media_spec.rb b/spec/requests/api/v1/media_spec.rb
index 2c29328087..26c76b9c5b 100644
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@@ -76,20 +76,14 @@ RSpec.describe 'Media' do
     let(:params) { {} }
 
     shared_examples 'a successful media upload' do |media_type|
-      it 'uploads the file successfully', :aggregate_failures do
+      it 'uploads the file successfully and returns correct media content', :aggregate_failures do
         subject
 
         expect(response).to have_http_status(200)
         expect(MediaAttachment.first).to be_present
         expect(MediaAttachment.first).to have_attached_file(:file)
-      end
 
-      it 'returns the correct media content' do
-        subject
-
-        body = body_as_json
-
-        expect(body).to match(
+        expect(body_as_json).to match(
           a_hash_including(id: MediaAttachment.first.id.to_s, description: params[:description], type: media_type)
         )
       end
diff --git a/spec/requests/api/v1/mutes_spec.rb b/spec/requests/api/v1/mutes_spec.rb
index b2782a0c22..019bf16584 100644
--- a/spec/requests/api/v1/mutes_spec.rb
+++ b/spec/requests/api/v1/mutes_spec.rb
@@ -44,10 +44,11 @@ RSpec.describe 'Mutes' do
       it 'sets the correct pagination headers', :aggregate_failures do
         subject
 
-        headers = response.headers['Link']
-
-        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_mutes_url(limit: params[:limit], since_id: mutes.last.id.to_s))
-        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_mutes_url(limit: params[:limit], max_id: mutes.last.id.to_s))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_mutes_url(limit: params[:limit], since_id: mutes.last.id),
+            next: api_v1_mutes_url(limit: params[:limit], max_id: mutes.last.id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/notifications/policies_spec.rb b/spec/requests/api/v1/notifications/policies_spec.rb
new file mode 100644
index 0000000000..d02d2ed0d7
--- /dev/null
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Policies' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/notifications/policy', :sidekiq_inline do
+    subject do
+      get '/api/v1/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      Fabricate(:notification_request, account: user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns json with expected attributes', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to include(
+          filter_not_following: false,
+          filter_not_followers: false,
+          filter_new_accounts: false,
+          filter_private_mentions: true,
+          summary: a_hash_including(
+            pending_requests_count: 1,
+            pending_notifications_count: 0
+          )
+        )
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/notifications/policy' do
+    subject do
+      put '/api/v1/notifications/policy', headers: headers, params: params
+    end
+
+    let(:params) { { filter_not_following: true } }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'changes notification policy and returns an updated json object', :aggregate_failures do
+      expect { subject }
+        .to change { NotificationPolicy.find_or_initialize_by(account: user.account).filter_not_following }.from(false).to(true)
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to include(
+        filter_not_following: true,
+        filter_not_followers: false,
+        filter_new_accounts: false,
+        filter_private_mentions: true,
+        summary: a_hash_including(
+          pending_requests_count: 0,
+          pending_notifications_count: 0
+        )
+      )
+    end
+  end
+end
diff --git a/spec/requests/api/v1/notifications/requests_spec.rb b/spec/requests/api/v1/notifications/requests_spec.rb
new file mode 100644
index 0000000000..772402a6b5
--- /dev/null
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Requests' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/notifications/requests', :sidekiq_inline do
+    subject do
+      get '/api/v1/notifications/requests', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      Fabricate(:notification_request, account: user.account)
+      Fabricate(:notification_request, account: user.account, dismissed: true)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns http success', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with dismissed' do
+      let(:params) { { dismissed: '1' } }
+
+      it 'returns http success', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/notifications/requests/:id/accept' do
+    subject do
+      post "/api/v1/notifications/requests/#{notification_request.id}/accept", headers: headers
+    end
+
+    let(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+
+    it 'creates notification permission' do
+      subject
+
+      expect(NotificationPermission.find_by(account: notification_request.account, from_account: notification_request.from_account)).to_not be_nil
+    end
+
+    context 'when notification request belongs to someone else' do
+      let(:notification_request) { Fabricate(:notification_request) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/notifications/requests/:id/dismiss' do
+    subject do
+      post "/api/v1/notifications/requests/#{notification_request.id}/dismiss", headers: headers
+    end
+
+    let(:notification_request) { Fabricate(:notification_request, account: user.account) }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'returns http success and dismisses the notification request', :aggregate_failures do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect(notification_request.reload.dismissed?).to be true
+    end
+
+    context 'when notification request belongs to someone else' do
+      let(:notification_request) { Fabricate(:notification_request) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 222ff67fc8..55d3cdac94 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -98,9 +98,14 @@ RSpec.describe 'Notifications' do
 
         notifications = user.account.notifications
 
-        expect(body_as_json.size).to eq(params[:limit])
-        expect(response.headers['Link'].find_link(%w(rel prev)).href).to eq(api_v1_notifications_url(limit: params[:limit], min_id: notifications.last.id.to_s))
-        expect(response.headers['Link'].find_link(%w(rel next)).href).to eq(api_v1_notifications_url(limit: params[:limit], max_id: notifications[2].id.to_s))
+        expect(body_as_json.size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_notifications_url(limit: params[:limit], min_id: notifications.last.id),
+            next: api_v1_notifications_url(limit: params[:limit], max_id: notifications[2].id)
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/peers/search_spec.rb b/spec/requests/api/v1/peers/search_spec.rb
new file mode 100644
index 0000000000..dcdea387a5
--- /dev/null
+++ b/spec/requests/api/v1/peers/search_spec.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API Peers Search' do
+  describe 'GET /api/v1/peers/search' do
+    context 'when peers api is disabled' do
+      before do
+        Setting.peers_api_enabled = false
+      end
+
+      it 'returns http not found response' do
+        get '/api/v1/peers/search'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'with no search param' do
+      it 'returns http success and empty response' do
+        get '/api/v1/peers/search'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to be_blank
+      end
+    end
+
+    context 'with invalid search param' do
+      it 'returns http success and empty response' do
+        get '/api/v1/peers/search', params: { q: 'ftp://Invalid-Host!!.valüe' }
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to be_blank
+      end
+    end
+
+    context 'with search param' do
+      let!(:account) { Fabricate(:account, domain: 'host.example') }
+
+      before { Instance.refresh }
+
+      it 'returns http success and json with known domains' do
+        get '/api/v1/peers/search', params: { q: 'host.example' }
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json.size)
+          .to eq(1)
+        expect(body_as_json.first)
+          .to eq(account.domain)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/polls/votes_controller_spec.rb b/spec/requests/api/v1/polls/votes_spec.rb
similarity index 61%
rename from spec/controllers/api/v1/polls/votes_controller_spec.rb
rename to spec/requests/api/v1/polls/votes_spec.rb
index 5de225a487..e2b22708be 100644
--- a/spec/controllers/api/v1/polls/votes_controller_spec.rb
+++ b/spec/requests/api/v1/polls/votes_spec.rb
@@ -2,30 +2,32 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Polls::VotesController do
-  render_views
-
+RSpec.describe 'API V1 Polls Votes' do
   let(:user)   { Fabricate(:user) }
   let(:scopes) { 'write:statuses' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before { allow(controller).to receive(:doorkeeper_token) { token } }
-
-  describe 'POST #create' do
+  describe 'POST /api/v1/polls/:poll_id/votes' do
     let(:poll) { Fabricate(:poll) }
 
     before do
-      post :create, params: { poll_id: poll.id, choices: %w(1) }
+      post "/api/v1/polls/#{poll.id}/votes", params: { choices: %w(1) }, headers: headers
     end
 
     it 'creates a vote', :aggregate_failures do
       expect(response).to have_http_status(200)
-      vote = poll.votes.where(account: user.account).first
 
       expect(vote).to_not be_nil
       expect(vote.choice).to eq 1
 
       expect(poll.reload.cached_tallies).to eq [0, 1]
     end
+
+    private
+
+    def vote
+      poll.votes.where(account: user.account).first
+    end
   end
 end
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
new file mode 100644
index 0000000000..700250ee2a
--- /dev/null
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Push Subscriptions' do
+  let(:user) { Fabricate(:user) }
+  let(:create_payload) do
+    {
+      subscription: {
+        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
+        keys: {
+          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
+          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+        },
+      },
+    }.with_indifferent_access
+  end
+  let(:alerts_payload) do
+    {
+      data: {
+        policy: 'all',
+
+        alerts: {
+          follow: true,
+          follow_request: true,
+          favourite: false,
+          reblog: true,
+          mention: false,
+          poll: true,
+          status: false,
+        },
+      },
+    }.with_indifferent_access
+  end
+  let(:scopes) { 'push' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'POST /api/v1/push/subscription' do
+    subject { post '/api/v1/push/subscription', params: create_payload, headers: headers }
+
+    it 'saves push subscriptions and returns expected JSON' do
+      subject
+
+      expect(endpoint_push_subscription)
+        .to have_attributes(
+          endpoint: eq(create_payload[:subscription][:endpoint]),
+          key_p256dh: eq(create_payload[:subscription][:keys][:p256dh]),
+          key_auth: eq(create_payload[:subscription][:keys][:auth]),
+          user_id: eq(user.id),
+          access_token_id: eq(token.id)
+        )
+
+      expect(body_as_json.with_indifferent_access)
+        .to include(
+          { endpoint: create_payload[:subscription][:endpoint], alerts: {}, policy: 'all' }
+        )
+    end
+
+    it 'replaces old subscription on repeat calls' do
+      2.times { subject }
+
+      expect(endpoint_push_subscriptions.count)
+        .to eq(1)
+    end
+  end
+
+  describe 'PUT /api/v1/push/subscription' do
+    subject { put '/api/v1/push/subscription', params: alerts_payload, headers: headers }
+
+    before { create_subscription_with_token }
+
+    it 'changes data policy and alert settings and returns expected JSON' do
+      expect { subject }
+        .to change { endpoint_push_subscription.reload.data }
+        .from(nil)
+        .to(include('policy' => alerts_payload[:data][:policy]))
+
+      %w(follow follow_request favourite reblog mention poll status).each do |type|
+        expect(endpoint_push_subscription.data['alerts']).to include(
+          type.to_s => eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+        )
+      end
+
+      expect(body_as_json.with_indifferent_access)
+        .to include(
+          endpoint: create_payload[:subscription][:endpoint],
+          alerts: alerts_payload[:data][:alerts],
+          policy: alerts_payload[:data][:policy]
+        )
+    end
+  end
+
+  describe 'DELETE /api/v1/push/subscription' do
+    subject { delete '/api/v1/push/subscription', headers: headers }
+
+    before { create_subscription_with_token }
+
+    it 'removes the subscription' do
+      expect { subject }
+        .to change { endpoint_push_subscription }.to(nil)
+    end
+  end
+
+  private
+
+  def endpoint_push_subscriptions
+    Web::PushSubscription.where(
+      endpoint: create_payload[:subscription][:endpoint]
+    )
+  end
+
+  def endpoint_push_subscription
+    endpoint_push_subscriptions.first
+  end
+
+  def create_subscription_with_token
+    Fabricate(
+      :web_push_subscription,
+      endpoint: create_payload[:subscription][:endpoint],
+      access_token_id: token.id
+    )
+  end
+end
diff --git a/spec/requests/api/v1/reports_spec.rb b/spec/requests/api/v1/reports_spec.rb
index ba3d2b3060..94baf8cb98 100644
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Reports' do
 
     it 'creates a report', :aggregate_failures do
       perform_enqueued_jobs do
-        subject
+        emails = capture_emails { subject }
 
         expect(response).to have_http_status(200)
         expect(body_as_json).to match(
@@ -49,7 +49,13 @@ RSpec.describe 'Reports' do
         expect(target_account.targeted_reports).to_not be_empty
         expect(target_account.targeted_reports.first.comment).to eq 'reasons'
 
-        expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(I18n.t('admin_mailer.new_report.subject', instance: Rails.configuration.x.local_domain, id: target_account.targeted_reports.first.id))
+          )
       end
     end
 
diff --git a/spec/requests/api/v1/statuses/emoji_reactions_spec.rb b/spec/requests/api/v1/statuses/emoji_reactions_spec.rb
new file mode 100644
index 0000000000..e85404379d
--- /dev/null
+++ b/spec/requests/api/v1/statuses/emoji_reactions_spec.rb
@@ -0,0 +1,271 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'EmojiReactions' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'write:favourites' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'POST /api/v1/statuses/:status_id/emoji_reactions' do
+    subject do
+      post "/api/v1/statuses/#{status.id}/emoji_reactions", headers: headers, params: { emoji: emoji }
+    end
+
+    let(:status) { Fabricate(:status) }
+    let(:emoji) { '😀' }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:favourites'
+
+    context 'with public status' do
+      it 'reacts the status successfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status, emoji)).to be true
+      end
+
+      it 'returns json with updated attributes' do
+        subject
+
+        expect(body_as_json).to match(
+          a_hash_including(id: status.id.to_s, emoji_reactions_count: 1)
+        )
+      end
+    end
+
+    context 'with private status of not-followed account' do
+      let(:status) { Fabricate(:status, visibility: :private) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'with private status of followed account' do
+      let(:status) { Fabricate(:status, visibility: :private) }
+
+      before do
+        user.account.follow!(status.account)
+      end
+
+      it 'reacts the status successfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be true
+      end
+    end
+
+    context 'when local custom emoji' do
+      before { Fabricate(:custom_emoji, shortcode: 'ohagi') }
+
+      let(:emoji) { 'ohagi' }
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status, 'ohagi')).to be true
+      end
+    end
+
+    context 'when remote custom emoji' do
+      let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji') }
+      let(:emoji) { 'ohagi@foo.bar' }
+
+      before { Fabricate(:emoji_reaction, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status, 'ohagi', 'foo.bar')).to be true
+      end
+    end
+
+    context 'when not existing custom emoji' do
+      let(:emoji) { 'ohagi' }
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(422)
+      end
+    end
+
+    context 'without an authorization header' do
+      let(:headers) { {} }
+
+      it 'returns http unauthorized' do
+        subject
+
+        expect(response).to have_http_status(401)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/statuses/:status_id/emoji_unreaction' do
+    subject do
+      post "/api/v1/statuses/#{status.id}/emoji_unreaction", headers: headers, params: { emoji: emoji }
+    end
+
+    let(:status) { Fabricate(:status) }
+    let(:emoji) { '😀' }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:favourites'
+
+    context 'with public status' do
+      before do
+        EmojiReactService.new.call(user.account, status, emoji)
+      end
+
+      it 'unreacts the status successfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be false
+      end
+
+      it 'returns json with updated attributes' do
+        subject
+
+        expect(body_as_json).to match(
+          a_hash_including(id: status.id.to_s, emoji_reactions_count: 0)
+        )
+      end
+    end
+
+    context 'when the requesting user was blocked by the status author' do
+      before do
+        EmojiReactService.new.call(user.account, status, emoji)
+        status.account.block!(user.account)
+      end
+
+      it 'unreacts the status successfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be false
+      end
+
+      it 'returns json with updated attributes' do
+        subject
+
+        expect(body_as_json).to match(
+          a_hash_including(id: status.id.to_s, emoji_reactions_count: 0)
+        )
+      end
+    end
+
+    context 'when status is not reacted' do
+      it 'returns http success' do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'with private status that was not reacted' do
+      let(:status) { Fabricate(:status, visibility: :private) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'with private status that was not reacted without emoji parameter' do
+      let(:status) { Fabricate(:status, visibility: :private) }
+      let(:emoji) { nil }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+
+    context 'when local custom emoji' do
+      before do
+        Fabricate(:custom_emoji, shortcode: 'ohagi')
+        EmojiReactService.new.call(user.account, status, emoji)
+      end
+
+      let(:emoji) { 'ohagi' }
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be false
+      end
+    end
+
+    context 'when remote custom emoji' do
+      let(:emoji) { 'ohagi@foo.bar' }
+
+      before do
+        custom_emoji = Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji')
+        Fabricate(:emoji_reaction, name: 'ohagi', status: status, custom_emoji: custom_emoji)
+        EmojiReactService.new.call(user.account, status, emoji)
+      end
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be false
+      end
+    end
+
+    context 'when remote custom emoji but not specified domain' do
+      let(:emoji) { 'ohagi' }
+
+      before do
+        custom_emoji = Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji')
+        Fabricate(:emoji_reaction, name: 'ohagi', status: status, custom_emoji: custom_emoji)
+        EmojiReactService.new.call(user.account, status, 'ohagi@foo.bar')
+      end
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be true
+      end
+    end
+
+    context 'without specified domain and reacted same name multiple domains' do
+      let(:emoji) { 'ohagi' }
+
+      before do
+        Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji')
+        Fabricate(:custom_emoji, shortcode: 'ohagi')
+        EmojiReactService.new.call(user.account, status, 'ohagi')
+        EmojiReactService.new.call(user.account, status, 'ohagi@foo.bar')
+      end
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(user.account.emoji_reacted?(status)).to be false
+      end
+    end
+
+    context 'when not existing custom emoji' do
+      let(:emoji) { 'ohagi' }
+
+      it 'reacts the status succeessfully', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
similarity index 52%
rename from spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
index 01816743e5..44296f4c37 100644
--- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
@@ -2,21 +2,21 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Favourited by Accounts' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:accounts' }
+  # let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:alice) { Fabricate(:account) }
   let(:bob)   { Fabricate(:account) }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
+    subject do
+      get "/api/v1/statuses/#{status.id}/favourited_by", headers: headers, params: { limit: 2 }
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/statuses/:status_id/favourited_by' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
@@ -24,30 +24,38 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         Favourite.create!(account: bob, status: status)
       end
 
-      it 'returns http success' do
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(response).to have_http_status(200)
-        expect(response.headers['Link'].links.size).to eq(2)
-      end
+      it 'returns http success and accounts who favourited the status' do
+        subject
 
-      it 'returns accounts who favorited the status' do
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(response)
+          .to have_http_status(200)
+        expect(response.headers['Link'].links.size)
+          .to eq(2)
+
+        expect(body_as_json.size)
+          .to eq(2)
+        expect(body_as_json)
+          .to contain_exactly(
+            include(id: alice.id.to_s),
+            include(id: bob.id.to_s)
+          )
       end
 
       it 'does not return blocked users' do
         user.account.block!(bob)
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 1
-        expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+        subject
+
+        expect(body_as_json.size)
+          .to eq 1
+        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
 
   context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
+    subject do
+      get "/api/v1/statuses/#{status.id}/favourited_by", params: { limit: 2 }
     end
 
     context 'with a private status' do
@@ -59,7 +67,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         end
 
         it 'returns http unauthorized' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(404)
         end
       end
@@ -74,7 +83,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         end
 
         it 'returns http success' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(200)
         end
       end
diff --git a/spec/controllers/api/v1/statuses/histories_controller_spec.rb b/spec/requests/api/v1/statuses/histories_spec.rb
similarity index 53%
rename from spec/controllers/api/v1/statuses/histories_controller_spec.rb
rename to spec/requests/api/v1/statuses/histories_spec.rb
index 99384c8ed5..b3761ca688 100644
--- a/spec/controllers/api/v1/statuses/histories_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/histories_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::HistoriesController do
-  render_views
-
+describe 'API V1 Statuses Histories' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #show' do
+    describe 'GET /api/v1/statuses/:status_id/history' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        get :show, params: { status_id: status.id }
+        get "/api/v1/statuses/#{status.id}/history", headers: headers
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb b/spec/requests/api/v1/statuses/mutes_spec.rb
similarity index 66%
rename from spec/controllers/api/v1/statuses/mutes_controller_spec.rb
rename to spec/requests/api/v1/statuses/mutes_spec.rb
index 03274fe1cd..72fd7d9d11 100644
--- a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/mutes_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::MutesController do
-  render_views
-
+describe 'API V1 Statuses Mutes' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:mutes', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:mutes' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/mute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/mute", headers: headers
       end
 
       it 'creates a conversation mute', :aggregate_failures do
@@ -27,12 +22,12 @@ describe Api::V1::Statuses::MutesController do
       end
     end
 
-    describe 'POST #destroy' do
+    describe 'POST /api/v1/statuses/:status_id/unmute' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
         user.account.mute_conversation!(status.conversation)
-        post :destroy, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/unmute", headers: headers
       end
 
       it 'destroys the conversation mute', :aggregate_failures do
diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
similarity index 57%
rename from spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
index 0d15cca75c..6f99ce9464 100644
--- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
@@ -2,21 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Reblogged by Accounts' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:accounts' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:alice) { Fabricate(:account) }
   let(:bob)   { Fabricate(:account) }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
+    subject do
+      get "/api/v1/statuses/#{status.id}/reblogged_by", headers: headers, params: { limit: 2 }
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/statuses/:status_id/reblogged_by' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
@@ -25,27 +24,37 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
       end
 
       it 'returns accounts who reblogged the status', :aggregate_failures do
-        get :index, params: { status_id: status.id, limit: 2 }
+        subject
 
-        expect(response).to have_http_status(200)
-        expect(response.headers['Link'].links.size).to eq(2)
+        expect(response)
+          .to have_http_status(200)
+        expect(response.headers['Link'].links.size)
+          .to eq(2)
 
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(body_as_json.size)
+          .to eq(2)
+        expect(body_as_json)
+          .to contain_exactly(
+            include(id: alice.id.to_s),
+            include(id: bob.id.to_s)
+          )
       end
 
       it 'does not return blocked users' do
         user.account.block!(bob)
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 1
-        expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+        subject
+
+        expect(body_as_json.size)
+          .to eq 1
+        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
 
   context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
+    subject do
+      get "/api/v1/statuses/#{status.id}/reblogged_by", params: { limit: 2 }
     end
 
     context 'with a private status' do
@@ -57,7 +66,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
         end
 
         it 'returns http unauthorized' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(404)
         end
       end
@@ -72,7 +82,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
         end
 
         it 'returns http success' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(200)
         end
       end
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/requests/api/v1/statuses/reblogs_spec.rb
similarity index 81%
rename from spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogs_spec.rb
index 014a03c1a2..cf0a1f861d 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@@ -2,23 +2,18 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::ReblogsController do
-  render_views
-
+describe 'API V1 Statuses Reblogs' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'write:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/reblog' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/reblog", headers: headers
       end
 
       context 'with public status' do
@@ -46,13 +41,13 @@ describe Api::V1::Statuses::ReblogsController do
       end
     end
 
-    describe 'POST #destroy', :sidekiq_inline do
+    describe 'POST /api/v1/statuses/:status_id/unreblog', :sidekiq_inline do
       context 'with public status' do
         let(:status) { Fabricate(:status, account: user.account) }
 
         before do
           ReblogService.new.call(user.account, status)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -76,7 +71,7 @@ describe Api::V1::Statuses::ReblogsController do
         before do
           ReblogService.new.call(user.account, status)
           status.account.block!(user.account)
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'destroys the reblog', :aggregate_failures do
@@ -98,7 +93,7 @@ describe Api::V1::Statuses::ReblogsController do
         let(:status) { Fabricate(:status, visibility: :private) }
 
         before do
-          post :destroy, params: { status_id: status.id }
+          post "/api/v1/statuses/#{status.id}/unreblog", headers: headers
         end
 
         it 'returns http not found' do
diff --git a/spec/controllers/api/v1/statuses/translations_controller_spec.rb b/spec/requests/api/v1/statuses/translations_spec.rb
similarity index 65%
rename from spec/controllers/api/v1/statuses/translations_controller_spec.rb
rename to spec/requests/api/v1/statuses/translations_spec.rb
index 6257494ae1..5b0a994561 100644
--- a/spec/controllers/api/v1/statuses/translations_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/translations_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-describe Api::V1::Statuses::TranslationsController do
-  render_views
-
+describe 'API V1 Statuses Translations' do
   let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:statuses' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'POST #create' do
+    describe 'POST /api/v1/statuses/:status_id/translate' do
       let(:status) { Fabricate(:status, account: user.account, text: 'Hola', language: 'es') }
 
       before do
@@ -22,7 +17,7 @@ describe Api::V1::Statuses::TranslationsController do
         service = instance_double(TranslationService::DeepL, translate: [translation])
         allow(TranslationService).to receive_messages(configured?: true, configured: service)
         Rails.cache.write('translation_service/languages', { 'es' => ['en'] })
-        post :create, params: { status_id: status.id }
+        post "/api/v1/statuses/#{status.id}/translate", headers: headers
       end
 
       it 'returns http success' do
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 201674fccd..1bf0ecaab9 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -9,6 +9,22 @@ describe '/api/v1/statuses' do
     let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: client_app, scopes: scopes) }
     let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
+    describe 'GET /api/v1/statuses?ids[]=:id' do
+      let(:status) { Fabricate(:status) }
+      let(:other_status) { Fabricate(:status) }
+      let(:scopes) { 'read:statuses' }
+
+      it 'returns expected response' do
+        get '/api/v1/statuses', headers: headers, params: { ids: [status.id, other_status.id, 123_123] }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to contain_exactly(
+          hash_including(id: status.id.to_s),
+          hash_including(id: other_status.id.to_s)
+        )
+      end
+    end
+
     describe 'GET /api/v1/statuses/:id' do
       subject do
         get "/api/v1/statuses/#{status.id}", headers: headers
@@ -96,9 +112,48 @@ describe '/api/v1/statuses' do
     describe 'GET /api/v1/statuses/:id/context' do
       let(:scopes) { 'read:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
+      let!(:thread) { Fabricate(:status, account: user.account, thread: status) }
+
+      it 'returns http success' do
+        get "/api/v1/statuses/#{status.id}/context", params: { id: status.id }
+        expect(response).to have_http_status(200)
+      end
+
+      context 'when has also reference' do
+        before do
+          Fabricate(:status_reference, status: thread, target_status: status)
+        end
+
+        it 'returns unique ancestors' do
+          get "/api/v1/statuses/#{thread.id}/context"
+          status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+
+          expect(status_ids).to eq [status.id]
+        end
+
+        it 'returns unique references' do
+          get "/api/v1/statuses/#{thread.id}/context", params: { with_reference: true }
+          ancestor_status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+          reference_status_ids = body_as_json[:references].map { |ref| ref[:id].to_i }
+
+          expect(ancestor_status_ids).to eq [status.id]
+          expect(reference_status_ids).to eq []
+        end
+      end
+    end
+
+    context 'with reference' do
+      let(:status) { Fabricate(:status, account: user.account) }
+      let(:scopes) { 'read:statuses' }
+      let(:referred) { Fabricate(:status) }
+      let(:referred_private) { Fabricate(:status, visibility: :private) }
+      let(:referred_private_following) { Fabricate(:status, visibility: :private) }
 
       before do
-        Fabricate(:status, account: user.account, thread: status)
+        user.account.follow!(referred_private_following.account)
+        Fabricate(:status_reference, status: status, target_status: referred)
+        Fabricate(:status_reference, status: status, target_status: referred_private)
+        Fabricate(:status_reference, status: status, target_status: referred_private_following)
       end
 
       it 'returns http success' do
@@ -106,6 +161,56 @@ describe '/api/v1/statuses' do
 
         expect(response).to have_http_status(200)
       end
+
+      it 'returns empty references' do
+        get "/api/v1/statuses/#{status.id}/context", headers: headers
+        status_ids = body_as_json[:references].map { |ref| ref[:id].to_i }
+
+        expect(status_ids).to eq []
+      end
+
+      it 'contains referred status' do
+        get "/api/v1/statuses/#{status.id}/context", headers: headers
+        status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+
+        expect(status_ids).to include referred.id
+        expect(status_ids).to include referred_private_following.id
+      end
+
+      it 'does not contain private status' do
+        get "/api/v1/statuses/#{status.id}/context", headers: headers
+        status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+
+        expect(status_ids).to_not include referred_private.id
+      end
+
+      it 'does not contain private status when not autienticated' do
+        get "/api/v1/statuses/#{status.id}/context"
+        status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+
+        expect(status_ids).to_not include referred_private.id
+      end
+
+      context 'when with_reference is enabled' do
+        it 'returns http success' do
+          get "/api/v1/statuses/#{status.id}/context", params: { with_reference: true }, headers: headers
+          expect(response).to have_http_status(200)
+        end
+
+        it 'returns empty ancestors' do
+          get "/api/v1/statuses/#{status.id}/context", params: { with_reference: true }, headers: headers
+          status_ids = body_as_json[:ancestors].map { |ref| ref[:id].to_i }
+
+          expect(status_ids).to eq []
+        end
+
+        it 'contains referred status' do
+          get "/api/v1/statuses/#{status.id}/context", params: { with_reference: true }, headers: headers
+          status_ids = body_as_json[:references].map { |ref| ref[:id].to_i }
+
+          expect(status_ids).to include referred.id
+        end
+      end
     end
 
     describe 'POST /api/v1/statuses' do
@@ -167,6 +272,16 @@ describe '/api/v1/statuses' do
           expect(response.headers['X-RateLimit-Remaining']).to eq '0'
         end
       end
+
+      context 'with missing thread' do
+        let(:params) { { status: 'Hello world', in_reply_to_id: 0 } }
+
+        it 'returns http not found' do
+          subject
+
+          expect(response).to have_http_status(404)
+        end
+      end
     end
 
     describe 'DELETE /api/v1/statuses/:id' do
diff --git a/spec/controllers/api/v1/streaming_controller_spec.rb b/spec/requests/api/v1/streaming_spec.rb
similarity index 51%
rename from spec/controllers/api/v1/streaming_controller_spec.rb
rename to spec/requests/api/v1/streaming_spec.rb
index 099f68a74e..6b550dfa60 100644
--- a/spec/controllers/api/v1/streaming_controller_spec.rb
+++ b/spec/requests/api/v1/streaming_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Api::V1::StreamingController do
+describe 'API V1 Streaming' do
   around do |example|
     before = Rails.configuration.x.streaming_api_base_url
     Rails.configuration.x.streaming_api_base_url = "wss://#{Rails.configuration.x.web_domain}"
@@ -10,14 +10,13 @@ describe Api::V1::StreamingController do
     Rails.configuration.x.streaming_api_base_url = before
   end
 
-  before do
-    request.headers.merge! Host: Rails.configuration.x.web_domain
-  end
+  let(:headers) { { 'Host' => Rails.configuration.x.web_domain } }
 
   context 'with streaming api on same host' do
-    describe 'GET #index' do
+    describe 'GET /api/v1/streaming' do
       it 'raises ActiveRecord::RecordNotFound' do
-        get :index
+        get '/api/v1/streaming', headers: headers
+
         expect(response).to have_http_status(404)
       end
     end
@@ -28,20 +27,33 @@ describe Api::V1::StreamingController do
       Rails.configuration.x.streaming_api_base_url = "wss://streaming-#{Rails.configuration.x.web_domain}"
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/streaming' do
       it 'redirects to streaming host' do
-        get :index, params: { access_token: 'deadbeef', stream: 'public' }
-        expect(response).to have_http_status(301)
-        request_uri = URI.parse(request.url)
-        redirect_to_uri = URI.parse(response.location)
-        [:scheme, :path, :query, :fragment].each do |part|
-          expect(redirect_to_uri.send(part)).to eq(request_uri.send(part)), "redirect target #{part}"
-        end
-        expect(redirect_to_uri.host).to eq(streaming_host), 'redirect target host'
+        get '/api/v1/streaming', headers: headers, params: { access_token: 'deadbeef', stream: 'public' }
+
+        expect(response)
+          .to have_http_status(301)
+
+        expect(redirect_to_uri)
+          .to have_attributes(
+            fragment: request_uri.fragment,
+            host: eq(streaming_host),
+            path: request_uri.path,
+            query: request_uri.query,
+            scheme: request_uri.scheme
+          )
       end
 
       private
 
+      def request_uri
+        URI.parse(request.url)
+      end
+
+      def redirect_to_uri
+        URI.parse(response.location)
+      end
+
       def streaming_host
         URI.parse(Rails.configuration.x.streaming_api_base_url).host
       end
diff --git a/spec/requests/api/v1/timelines/antenna_spec.rb b/spec/requests/api/v1/timelines/antenna_spec.rb
new file mode 100644
index 0000000000..7b35cf2fa9
--- /dev/null
+++ b/spec/requests/api/v1/timelines/antenna_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Timelines Antenna' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:antenna) { Fabricate(:antenna, account: user.account) }
+
+  context 'with a user context' do
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
+
+    describe 'GET /api/v1/timelines/antenna/:id' do
+      before do
+        subscribe = Fabricate(:antenna_account)
+        antenna.antenna_accounts << subscribe
+        PostStatusService.new.call(subscribe.account, text: 'New status for user home timeline.')
+      end
+
+      it 'returns http success' do
+        get "/api/v1/timelines/antenna/#{antenna.id}", headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  context 'with the wrong user context' do
+    let(:other_user) { Fabricate(:user) }
+    let(:token)      { Fabricate(:accessible_access_token, resource_owner_id: other_user.id, scopes: 'read') }
+
+    describe 'GET #show' do
+      it 'returns http not found' do
+        get "/api/v1/timelines/antenna/#{antenna.id}", headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  context 'without a user context' do
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: 'read') }
+
+    describe 'GET #show' do
+      it 'returns http unprocessable entity' do
+        get "/api/v1/timelines/antenna/#{antenna.id}", headers: headers
+
+        expect(response).to have_http_status(422)
+        expect(response.headers['Link']).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index e57e9643bf..2bebe8cf45 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -55,10 +55,11 @@ describe 'Home', :sidekiq_inline do
         it 'sets the correct pagination headers', :aggregate_failures do
           subject
 
-          headers = response.headers['Link']
-
-          expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_home_url(limit: 1, min_id: ana.statuses.first.id.to_s))
-          expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_home_url(limit: 1, max_id: ana.statuses.first.id.to_s))
+          expect(response)
+            .to include_pagination_headers(
+              prev: api_v1_timelines_home_url(limit: params[:limit], min_id: ana.statuses.first.id),
+              next: api_v1_timelines_home_url(limit: params[:limit], max_id: ana.statuses.first.id)
+            )
         end
       end
     end
diff --git a/spec/requests/api/v1/timelines/list_spec.rb b/spec/requests/api/v1/timelines/list_spec.rb
new file mode 100644
index 0000000000..98d2456745
--- /dev/null
+++ b/spec/requests/api/v1/timelines/list_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API V1 Timelines List' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:list) { Fabricate(:list, account: user.account) }
+
+  context 'with a user context' do
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
+
+    describe 'GET /api/v1/timelines/list/:id' do
+      before do
+        follow = Fabricate(:follow, account: user.account)
+        list.accounts << follow.target_account
+        PostStatusService.new.call(follow.target_account, text: 'New status for user home timeline.')
+      end
+
+      it 'returns http success' do
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  context 'with the wrong user context' do
+    let(:other_user) { Fabricate(:user) }
+    let(:token)      { Fabricate(:accessible_access_token, resource_owner_id: other_user.id, scopes: 'read') }
+
+    describe 'GET #show' do
+      it 'returns http not found' do
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  context 'without a user context' do
+    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: nil, scopes: 'read') }
+
+    describe 'GET #show' do
+      it 'returns http unprocessable entity' do
+        get "/api/v1/timelines/list/#{list.id}", headers: headers
+
+        expect(response).to have_http_status(422)
+        expect(response.headers['Link']).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index c436262407..285aaaed1a 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -7,9 +7,12 @@ describe 'Public' do
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:ltl_enabled) { true }
 
   shared_examples 'a successful request to the public timeline' do
     it 'returns the expected statuses successfully', :aggregate_failures do
+      Form::AdminSettings.new(enable_local_timeline: '0').save unless ltl_enabled
+
       subject
 
       expect(response).to have_http_status(200)
@@ -22,13 +25,15 @@ describe 'Public' do
       get '/api/v1/timelines/public', headers: headers, params: params
     end
 
-    let!(:private_status) { Fabricate(:status, visibility: :private) } # rubocop:disable RSpec/LetSetup
-    let!(:local_status)   { Fabricate(:status, account: Fabricate.build(:account, domain: nil)) }
-    let!(:remote_status)  { Fabricate(:status, account: Fabricate.build(:account, domain: 'example.com')) }
-    let!(:media_status)   { Fabricate(:status, media_attachments: [Fabricate.build(:media_attachment)]) }
-
+    let!(:local_status)   { Fabricate(:status, text: 'ohagi', account: Fabricate.build(:account, domain: nil)) }
+    let!(:remote_status)  { Fabricate(:status, text: 'ohagi', account: Fabricate.build(:account, domain: 'example.com')) }
+    let!(:media_status)   { Fabricate(:status, text: 'ohagi', media_attachments: [Fabricate.build(:media_attachment)]) }
     let(:params) { {} }
 
+    before do
+      Fabricate(:status, visibility: :private)
+    end
+
     context 'when the instance allows public preview' do
       let(:expected_statuses) { [local_status, remote_status, media_status] }
 
@@ -47,6 +52,13 @@ describe 'Public' do
         let(:expected_statuses) { [local_status, media_status] }
 
         it_behaves_like 'a successful request to the public timeline'
+
+        context 'when local timeline is disabled' do
+          let(:expected_statuses) { [] }
+          let(:ltl_enabled) { false }
+
+          it_behaves_like 'a successful request to the public timeline'
+        end
       end
 
       context 'with remote param' do
@@ -54,6 +66,13 @@ describe 'Public' do
         let(:expected_statuses) { [remote_status] }
 
         it_behaves_like 'a successful request to the public timeline'
+
+        context 'when local timeline is disabled' do
+          let(:ltl_enabled) { false }
+          let(:expected_statuses) { [local_status, remote_status, media_status] }
+
+          it_behaves_like 'a successful request to the public timeline'
+        end
       end
 
       context 'with local and remote params' do
@@ -61,6 +80,12 @@ describe 'Public' do
         let(:expected_statuses) { [local_status, remote_status, media_status] }
 
         it_behaves_like 'a successful request to the public timeline'
+
+        context 'when local timeline is disabled' do
+          let(:ltl_enabled) { false }
+
+          it_behaves_like 'a successful request to the public timeline'
+        end
       end
 
       context 'with only_media param' do
@@ -83,10 +108,11 @@ describe 'Public' do
         it 'sets the correct pagination headers', :aggregate_failures do
           subject
 
-          headers = response.headers['Link']
-
-          expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_public_url(limit: 1, min_id: media_status.id.to_s))
-          expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_public_url(limit: 1, max_id: media_status.id.to_s))
+          expect(response)
+            .to include_pagination_headers(
+              prev: api_v1_timelines_public_url(limit: params[:limit], min_id: media_status.id),
+              next: api_v1_timelines_public_url(limit: params[:limit], max_id: media_status.id)
+            )
         end
       end
     end
@@ -112,5 +138,61 @@ describe 'Public' do
         end
       end
     end
+
+    context 'when user is setting filters' do
+      subject do
+        get '/api/v1/timelines/public', headers: headers, params: params
+        body_as_json.filter { |status| status[:filtered].empty? || status[:filtered][0][:filter][:id] != filter.id.to_s }.map { |status| status[:id].to_i }
+      end
+
+      before do
+        Fabricate(:custom_filter_keyword, custom_filter: filter, keyword: 'ohagi')
+        Fabricate(:follow, account: account, target_account: remote_account)
+      end
+
+      let(:exclude_follows) { false }
+      let(:exclude_localusers) { false }
+      let(:include_quotes) { false }
+      let(:account) { user.account }
+      let(:remote_account) { remote_status.account }
+      let!(:filter) { Fabricate(:custom_filter, account: account, exclude_follows: exclude_follows, exclude_localusers: exclude_localusers, with_quote: include_quotes) }
+      let!(:quote_status) { Fabricate(:status, quote: Fabricate(:status, text: 'ohagi')) }
+
+      it 'load statuses', :aggregate_failures do
+        ids = subject
+        expect(ids).to_not include(local_status.id)
+        expect(ids).to_not include(remote_status.id)
+      end
+
+      context 'when exclude_followers' do
+        let(:exclude_follows) { true }
+
+        it 'load statuses', :aggregate_failures do
+          ids = subject
+          expect(ids).to_not include(local_status.id)
+          expect(ids).to include(remote_status.id)
+        end
+      end
+
+      context 'when exclude_localusers' do
+        let(:exclude_localusers) { true }
+
+        it 'load statuses', :aggregate_failures do
+          ids = subject
+          expect(ids).to include(local_status.id)
+          expect(ids).to_not include(remote_status.id)
+        end
+      end
+
+      context 'when include_quotes' do
+        let(:with_quote) { true }
+
+        it 'load statuses', :aggregate_failures do
+          ids = subject
+          expect(ids).to_not include(local_status.id)
+          expect(ids).to include(quote_status.id)
+        end
+      end
+    end
   end
 end
diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index a118af13e2..8611341702 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -71,10 +71,11 @@ RSpec.describe 'Tag' do
       it 'sets the correct pagination headers', :aggregate_failures do
         subject
 
-        headers = response.headers['Link']
-
-        expect(headers.find_link(%w(rel prev)).href).to eq(api_v1_timelines_tag_url(limit: 1, min_id: love_status.id.to_s))
-        expect(headers.find_link(%w(rel next)).href).to eq(api_v1_timelines_tag_url(limit: 1, max_id: love_status.id.to_s))
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v1_timelines_tag_url(limit: params[:limit], min_id: love_status.id),
+            next: api_v1_timelines_tag_url(limit: params[:limit], max_id: love_status.id)
+          )
       end
     end
 
diff --git a/spec/controllers/api/v1/trends/links_controller_spec.rb b/spec/requests/api/v1/trends/links_spec.rb
similarity index 84%
rename from spec/controllers/api/v1/trends/links_controller_spec.rb
rename to spec/requests/api/v1/trends/links_spec.rb
index bcaf066f16..012d035907 100644
--- a/spec/controllers/api/v1/trends/links_controller_spec.rb
+++ b/spec/requests/api/v1/trends/links_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::LinksController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Links' do
+  describe 'GET /api/v1/trends/links' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@ RSpec.describe Api::V1::Trends::LinksController do
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::LinksController::DEFAULT_LINKS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/links'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/statuses_controller_spec.rb b/spec/requests/api/v1/trends/statuses_spec.rb
similarity index 83%
rename from spec/controllers/api/v1/trends/statuses_controller_spec.rb
rename to spec/requests/api/v1/trends/statuses_spec.rb
index 25ab5f228a..3b906e8f82 100644
--- a/spec/controllers/api/v1/trends/statuses_controller_spec.rb
+++ b/spec/requests/api/v1/trends/statuses_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::StatusesController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Statuses' do
+  describe 'GET /api/v1/trends/statuses' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
       end
@@ -22,7 +20,7 @@ RSpec.describe Api::V1::Trends::StatusesController do
       it 'returns http success' do
         prepare_trends
         stub_const('Api::BaseController::DEFAULT_STATUSES_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/statuses'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/requests/api/v1/trends/tags_spec.rb
similarity index 85%
rename from spec/controllers/api/v1/trends/tags_controller_spec.rb
rename to spec/requests/api/v1/trends/tags_spec.rb
index c889f1c5b9..598f4e7752 100644
--- a/spec/controllers/api/v1/trends/tags_controller_spec.rb
+++ b/spec/requests/api/v1/trends/tags_spec.rb
@@ -2,15 +2,13 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Trends::TagsController do
-  render_views
-
-  describe 'GET #index' do
+RSpec.describe 'API V1 Trends Tags' do
+  describe 'GET /api/v1/trends/tags' do
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
       it 'returns http success' do
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to_not include('Link')
@@ -23,7 +21,7 @@ RSpec.describe Api::V1::Trends::TagsController do
       it 'returns http success' do
         prepare_trends
         stub_const('Api::V1::Trends::TagsController::DEFAULT_TAGS_LIMIT', 2)
-        get :index
+        get '/api/v1/trends/tags'
 
         expect(response).to have_http_status(200)
         expect(response.headers).to include('Link')
diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/requests/api/v2/admin/accounts_spec.rb
similarity index 94%
rename from spec/controllers/api/v2/admin/accounts_controller_spec.rb
rename to spec/requests/api/v2/admin/accounts_spec.rb
index 349f4d2528..fb04850bb7 100644
--- a/spec/controllers/api/v2/admin/accounts_controller_spec.rb
+++ b/spec/requests/api/v2/admin/accounts_spec.rb
@@ -2,19 +2,14 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Admin::AccountsController do
-  render_views
-
+RSpec.describe 'API V2 Admin Accounts' do
   let(:role)   { UserRole.find_by(name: 'Moderator') }
   let(:user)   { Fabricate(:user, role: role) }
   let(:scopes) { 'admin:read admin:write' }
   let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
   describe 'GET #index' do
     let!(:remote_account)       { Fabricate(:account, domain: 'example.org') }
     let!(:other_remote_account) { Fabricate(:account, domain: 'foo.bar') }
@@ -28,7 +23,8 @@ RSpec.describe Api::V2::Admin::AccountsController do
 
     before do
       pending_account.user.update(approved: false)
-      get :index, params: params
+
+      get '/api/v2/admin/accounts', params: params, headers: headers
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
diff --git a/spec/controllers/api/v2/filters/keywords_controller_spec.rb b/spec/requests/api/v2/filters/keywords_spec.rb
similarity index 79%
rename from spec/controllers/api/v2/filters/keywords_controller_spec.rb
rename to spec/requests/api/v2/filters/keywords_spec.rb
index 9f25237bcf..55fb2afd95 100644
--- a/spec/controllers/api/v2/filters/keywords_controller_spec.rb
+++ b/spec/requests/api/v2/filters/keywords_spec.rb
@@ -2,25 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Filters::KeywordsController do
-  render_views
-
+RSpec.describe 'API V2 Filters Keywords' do
   let(:user)         { Fabricate(:user) }
   let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:filter)       { Fabricate(:custom_filter, account: user.account) }
   let(:other_user)   { Fabricate(:user) }
   let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v2/filters/:filter_id/keywords' do
     let(:scopes) { 'read:filters' }
     let!(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index, params: { filter_id: filter.id }
+      get "/api/v2/filters/#{filter.id}/keywords", headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -30,18 +25,18 @@ RSpec.describe Api::V2::Filters::KeywordsController do
 
     context "when trying to access another's user filters" do
       it 'returns http not found' do
-        get :index, params: { filter_id: other_filter.id }
+        get "/api/v2/filters/#{other_filter.id}/keywords", headers: headers
         expect(response).to have_http_status(404)
       end
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v2/filters/:filter_id/keywords' do
     let(:scopes)    { 'write:filters' }
     let(:filter_id) { filter.id }
 
     before do
-      post :create, params: { filter_id: filter_id, keyword: 'magic', whole_word: false }
+      post "/api/v2/filters/#{filter_id}/keywords", headers: headers, params: { keyword: 'magic', whole_word: false }
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -65,12 +60,12 @@ RSpec.describe Api::V2::Filters::KeywordsController do
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'read:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, keyword: 'foo', whole_word: false, custom_filter: filter) }
 
     before do
-      get :show, params: { id: keyword.id }
+      get "/api/v2/filters/keywords/#{keyword.id}", headers: headers
     end
 
     it 'responds with the keyword', :aggregate_failures do
@@ -90,12 +85,12 @@ RSpec.describe Api::V2::Filters::KeywordsController do
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'write:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      get :update, params: { id: keyword.id, keyword: 'updated' }
+      put "/api/v2/filters/keywords/#{keyword.id}", headers: headers, params: { keyword: 'updated' }
     end
 
     it 'updates the keyword', :aggregate_failures do
@@ -113,12 +108,12 @@ RSpec.describe Api::V2::Filters::KeywordsController do
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v2/filters/keywords/:id' do
     let(:scopes)  { 'write:filters' }
     let(:keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: keyword.id }
+      delete "/api/v2/filters/keywords/#{keyword.id}", headers: headers
     end
 
     it 'destroys the keyword', :aggregate_failures do
diff --git a/spec/controllers/api/v2/filters/statuses_controller_spec.rb b/spec/requests/api/v2/filters/statuses_spec.rb
similarity index 81%
rename from spec/controllers/api/v2/filters/statuses_controller_spec.rb
rename to spec/requests/api/v2/filters/statuses_spec.rb
index d9df803971..26d2fb00e1 100644
--- a/spec/controllers/api/v2/filters/statuses_controller_spec.rb
+++ b/spec/requests/api/v2/filters/statuses_spec.rb
@@ -2,25 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::Filters::StatusesController do
-  render_views
-
+RSpec.describe 'API V2 Filters Statuses' do
   let(:user)         { Fabricate(:user) }
   let(:token)        { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:filter)       { Fabricate(:custom_filter, account: user.account) }
   let(:other_user)   { Fabricate(:user) }
   let(:other_filter) { Fabricate(:custom_filter, account: other_user.account) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v2/filters/:filter_id/statuses' do
     let(:scopes) { 'read:filters' }
     let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     it 'returns http success' do
-      get :index, params: { filter_id: filter.id }
+      get "/api/v2/filters/#{filter.id}/statuses", headers: headers
       expect(response).to have_http_status(200)
       expect(body_as_json)
         .to contain_exactly(
@@ -30,7 +25,7 @@ RSpec.describe Api::V2::Filters::StatusesController do
 
     context "when trying to access another's user filters" do
       it 'returns http not found' do
-        get :index, params: { filter_id: other_filter.id }
+        get "/api/v2/filters/#{other_filter.id}/statuses", headers: headers
         expect(response).to have_http_status(404)
       end
     end
@@ -42,7 +37,7 @@ RSpec.describe Api::V2::Filters::StatusesController do
     let!(:status)   { Fabricate(:status) }
 
     before do
-      post :create, params: { filter_id: filter_id, status_id: status.id }
+      post "/api/v2/filters/#{filter_id}/statuses", headers: headers, params: { status_id: status.id }
     end
 
     it 'creates a filter', :aggregate_failures do
@@ -65,12 +60,12 @@ RSpec.describe Api::V2::Filters::StatusesController do
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v2/filters/statuses/:id' do
     let(:scopes) { 'read:filters' }
     let!(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     before do
-      get :show, params: { id: status_filter.id }
+      get "/api/v2/filters/statuses/#{status_filter.id}", headers: headers
     end
 
     it 'responds with the filter', :aggregate_failures do
@@ -89,12 +84,12 @@ RSpec.describe Api::V2::Filters::StatusesController do
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v2/filters/statuses/:id' do
     let(:scopes) { 'write:filters' }
     let(:status_filter) { Fabricate(:custom_filter_status, custom_filter: filter) }
 
     before do
-      delete :destroy, params: { id: status_filter.id }
+      delete "/api/v2/filters/statuses/#{status_filter.id}", headers: headers
     end
 
     it 'destroys the filter', :aggregate_failures do
diff --git a/spec/requests/api/v2/filters_spec.rb b/spec/requests/api/v2/filters_spec.rb
index fd0483abbe..1e0f417dd5 100644
--- a/spec/requests/api/v2/filters_spec.rb
+++ b/spec/requests/api/v2/filters_spec.rb
@@ -47,7 +47,16 @@ RSpec.describe 'Filters' do
     it_behaves_like 'unauthorized for invalid token'
 
     context 'with valid params' do
-      let(:params) { { title: 'magic', context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } }
+      let(:params) do
+        {
+          title: 'magic',
+          context: %w(home),
+          filter_action: 'hide',
+          exclude_follows: true,
+          exclude_localusers: true,
+          keywords_attributes: [keyword: 'magic', whole_word: true],
+        }
+      end
 
       it 'returns http success' do
         subject
@@ -64,6 +73,8 @@ RSpec.describe 'Filters' do
         expect(json[:filter_action]).to eq 'hide'
         expect(json[:context]).to eq ['home']
         expect(json[:keywords].map { |keyword| keyword.slice(:keyword, :whole_word) }).to eq [{ keyword: 'magic', whole_word: true }]
+        expect(json[:exclude_follows]).to be true
+        expect(json[:exclude_localusers]).to be true
       end
 
       it 'creates a filter', :aggregate_failures do
@@ -74,13 +85,15 @@ RSpec.describe 'Filters' do
         expect(filter).to be_present
         expect(filter.keywords.pluck(:keyword)).to eq ['magic']
         expect(filter.context).to eq %w(home)
+        expect(filter.exclude_follows).to be true
+        expect(filter.exclude_localusers).to be true
         expect(filter.irreversible?).to be true
         expect(filter.expires_at).to be_nil
       end
     end
 
     context 'when the required title param is missing' do
-      let(:params) { { context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } }
+      let(:params) { { context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'], exclude_follows: false, exclude_localusers: false } }
 
       it 'returns http unprocessable entity' do
         subject
@@ -90,7 +103,7 @@ RSpec.describe 'Filters' do
     end
 
     context 'when the required context param is missing' do
-      let(:params) { { title: 'magic', filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } }
+      let(:params) { { title: 'magic', filter_action: 'hide', keywords_attributes: [keyword: 'magic'], exclude_follows: false, exclude_localusers: false } }
 
       it 'returns http unprocessable entity' do
         subject
@@ -99,8 +112,18 @@ RSpec.describe 'Filters' do
       end
     end
 
+    context 'when the required kmyblue original params are missing' do
+      let(:params) { { title: 'magic', context: %w(home), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } }
+
+      it 'returns http success' do
+        subject
+
+        expect(response).to have_http_status(200)
+      end
+    end
+
     context 'when the given context value is invalid' do
-      let(:params) { { title: 'magic', context: %w(shaolin), filter_action: 'hide', keywords_attributes: [keyword: 'magic'] } }
+      let(:params) { { title: 'magic', context: %w(shaolin), filter_action: 'hide', keywords_attributes: [keyword: 'magic'], exclude_follows: false, exclude_localusers: false } }
 
       it 'returns http unprocessable entity' do
         subject
@@ -152,7 +175,7 @@ RSpec.describe 'Filters' do
 
     context 'when updating filter parameters' do
       context 'with valid params' do
-        let(:params) { { title: 'updated', context: %w(home public) } }
+        let(:params) { { title: 'updated', context: %w(home public), exclude_follows: true, exclude_localusers: true } }
 
         it 'updates the filter successfully', :aggregate_failures do
           subject
@@ -162,6 +185,8 @@ RSpec.describe 'Filters' do
           expect(response).to have_http_status(200)
           expect(filter.title).to eq 'updated'
           expect(filter.reload.context).to eq %w(home public)
+          expect(filter.exclude_follows).to be true
+          expect(filter.exclude_localusers).to be true
         end
       end
 
diff --git a/spec/requests/api/v2/instance_spec.rb b/spec/requests/api/v2/instance_spec.rb
index 74574afbcf..c5c6a26f49 100644
--- a/spec/requests/api/v2/instance_spec.rb
+++ b/spec/requests/api/v2/instance_spec.rb
@@ -18,6 +18,7 @@ describe 'Instances' do
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_configuration_limits
       end
     end
 
@@ -31,7 +32,26 @@ describe 'Instances' do
         expect(body_as_json)
           .to be_present
           .and include(title: 'Mastodon')
+          .and include_configuration_limits
       end
     end
+
+    def include_configuration_limits
+      include(
+        configuration: include(
+          accounts: include(
+            max_featured_tags: FeaturedTag::LIMIT,
+            max_pinned_statuses: StatusPinValidator::PIN_LIMIT
+          ),
+          statuses: include(
+            max_characters: StatusLengthValidator::MAX_CHARS,
+            max_media_attachments: 4 # TODO, move to constant somewhere
+          ),
+          polls: include(
+            max_options: PollValidator::MAX_OPTIONS
+          )
+        )
+      )
+    end
   end
 end
diff --git a/spec/requests/api/v2/suggestions_spec.rb b/spec/requests/api/v2/suggestions_spec.rb
index 5f1c97b8ae..a7d6a0864f 100644
--- a/spec/requests/api/v2/suggestions_spec.rb
+++ b/spec/requests/api/v2/suggestions_spec.rb
@@ -9,10 +9,28 @@ describe 'Suggestions API' do
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   describe 'GET /api/v2/suggestions' do
-    it 'returns http success' do
+    let(:bob) { Fabricate(:account) }
+    let(:jeff) { Fabricate(:account) }
+    let(:params) { {} }
+
+    before do
+      Setting.bootstrap_timeline_accounts = [bob, jeff].map(&:acct).join(',')
+    end
+
+    it 'returns the expected suggestions' do
       get '/api/v2/suggestions', headers: headers
 
       expect(response).to have_http_status(200)
+
+      expect(body_as_json).to match_array(
+        [bob, jeff].map do |account|
+          hash_including({
+            source: 'staff',
+            sources: ['featured'],
+            account: hash_including({ id: account.id.to_s }),
+          })
+        end
+      )
     end
   end
 end
diff --git a/spec/requests/api/web/embeds_spec.rb b/spec/requests/api/web/embeds_spec.rb
index 6314f43aaf..0e6195204b 100644
--- a/spec/requests/api/web/embeds_spec.rb
+++ b/spec/requests/api/web/embeds_spec.rb
@@ -137,6 +137,18 @@ RSpec.describe '/api/web/embed' do
         end
       end
 
+      context 'when sanitizing the fragment fails' do
+        let(:call_result) { { html: 'ok' } }
+
+        before { allow(Sanitize).to receive(:fragment).and_raise(ArgumentError) }
+
+        it 'returns http not found' do
+          subject
+
+          expect(response).to have_http_status(404)
+        end
+      end
+
       context 'when failing to fetch OEmbed' do
         let(:call_result) { nil }
 
diff --git a/spec/requests/cache_spec.rb b/spec/requests/cache_spec.rb
index dbba228740..91e5b022e3 100644
--- a/spec/requests/cache_spec.rb
+++ b/spec/requests/cache_spec.rb
@@ -39,7 +39,7 @@ module TestEndpoints
     /api/v1/accounts/lookup?acct=alice
     /api/v1/statuses/110224538612341312
     /api/v1/statuses/110224538612341312/context
-    /api/v1/polls/12345
+    /api/v1/polls/123456789
     /api/v1/trends/statuses
     /api/v1/directory
   ).freeze
@@ -166,14 +166,18 @@ describe 'Caching behavior' do
     ActionController::Base.allow_forgery_protection = old
   end
 
-  let(:alice) { Fabricate(:account, username: 'alice') }
-  let(:user)  { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
+  let(:alice) { Account.find_by(username: 'alice') }
+  let(:user) { User.find_by(email: 'user@host.example') }
+  let(:token) { Doorkeeper::AccessToken.find_by(resource_owner_id: user.id) }
 
-  before do
-    status = Fabricate(:status, account: alice, id: '110224538612341312')
-    Fabricate(:status, account: alice, id: '110224538643211312', visibility: :private)
+  before_all do
+    alice = Fabricate(:account, username: 'alice')
+    user = Fabricate(:user, email: 'user@host.example', role: UserRole.find_by(name: 'Moderator'))
+    status = Fabricate(:status, account: alice, id: 110_224_538_612_341_312)
+    Fabricate(:status, account: alice, id: 110_224_538_643_211_312, visibility: :private)
     Fabricate(:invite, code: 'abcdef')
-    Fabricate(:poll, status: status, account: alice, id: '12345')
+    Fabricate(:poll, status: status, account: alice, id: 123_456_789)
+    Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
 
     user.account.follow!(alice)
   end
@@ -184,7 +188,7 @@ describe 'Caching behavior' do
         get '/users/alice'
 
         expect(response).to redirect_to('/@alice')
-        expect(response.headers['Vary']&.split(',')&.map { |x| x.strip.downcase }).to include('accept')
+        expect(response_vary_headers).to include('accept')
       end
     end
 
@@ -321,8 +325,6 @@ describe 'Caching behavior' do
   end
 
   context 'with an auth token' do
-    let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
-
     TestEndpoints::ALWAYS_CACHED.each do |endpoint|
       describe endpoint do
         before do
@@ -585,8 +587,6 @@ describe 'Caching behavior' do
     end
 
     context 'with an auth token' do
-      let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
-
       TestEndpoints::ALWAYS_CACHED.each do |endpoint|
         describe endpoint do
           before do
diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index d4cc40bce5..ba6fe47741 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -3,25 +3,38 @@
 require 'rails_helper'
 
 describe 'Content-Security-Policy' do
-  it 'sets the expected CSP headers' do
-    allow(SecureRandom).to receive(:base64).with(16).and_return('ZbA+JmE7+bK8F5qvADZHuQ==')
+  before { allow(SecureRandom).to receive(:base64).with(16).and_return('ZbA+JmE7+bK8F5qvADZHuQ==') }
 
+  it 'sets the expected CSP headers' do
     get '/'
-    expect(response.headers['Content-Security-Policy'].split(';').map(&:strip)).to contain_exactly(
-      "base-uri 'none'",
-      "default-src 'none'",
-      "frame-ancestors 'none'",
-      "font-src 'self' https://cb6e6126.ngrok.io",
-      "img-src 'self' data: blob: https://cb6e6126.ngrok.io",
-      "style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='",
-      "media-src 'self' data: https://cb6e6126.ngrok.io",
-      "frame-src 'self' https:",
-      "manifest-src 'self' https://cb6e6126.ngrok.io",
-      "form-action 'self'",
-      "child-src 'self' blob: https://cb6e6126.ngrok.io",
-      "worker-src 'self' blob: https://cb6e6126.ngrok.io",
-      "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000",
-      "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'"
-    )
+
+    expect(response_csp_headers)
+      .to match_array(expected_csp_headers)
+  end
+
+  def response_csp_headers
+    response
+      .headers['Content-Security-Policy']
+      .split(';')
+      .map(&:strip)
+  end
+
+  def expected_csp_headers
+    <<~CSP.split("\n").map(&:strip)
+      base-uri 'none'
+      child-src 'self' blob: https://cb6e6126.ngrok.io
+      connect-src 'self' data: blob: https://cb6e6126.ngrok.io #{Rails.configuration.x.streaming_api_base_url}
+      default-src 'none'
+      font-src 'self' https://cb6e6126.ngrok.io
+      form-action 'self'
+      frame-ancestors 'none'
+      frame-src 'self' https:
+      img-src 'self' data: blob: https://cb6e6126.ngrok.io
+      manifest-src 'self' https://cb6e6126.ngrok.io
+      media-src 'self' data: https://cb6e6126.ngrok.io
+      script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'
+      style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='
+      worker-src 'self' blob: https://cb6e6126.ngrok.io
+    CSP
   end
 end
diff --git a/spec/requests/disabled_oauth_endpoints_spec.rb b/spec/requests/disabled_oauth_endpoints_spec.rb
new file mode 100644
index 0000000000..7c2c09f380
--- /dev/null
+++ b/spec/requests/disabled_oauth_endpoints_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Disabled OAuth routes' do
+  # These routes are disabled via the doorkeeper configuration for
+  # `admin_authenticator`, as these routes should only be accessible by server
+  # administrators. For now, these routes are not properly designed and
+  # integrated into Mastodon, so we're disabling them completely
+  describe 'GET /oauth/applications' do
+    it 'returns 403 forbidden' do
+      get oauth_applications_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'POST /oauth/applications' do
+    it 'returns 403 forbidden' do
+      post oauth_applications_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/new' do
+    it 'returns 403 forbidden' do
+      get new_oauth_application_path
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      get oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'PATCH /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      patch oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'PUT /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      put oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'DELETE /oauth/applications/:id' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      delete oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+
+  describe 'GET /oauth/applications/:id/edit' do
+    let(:application) { Fabricate(:application, scopes: 'read') }
+
+    it 'returns 403 forbidden' do
+      get edit_oauth_application_path(application)
+
+      expect(response).to have_http_status(403)
+    end
+  end
+end
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index 0d37c41140..095535e485 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -39,16 +39,35 @@ describe 'OmniAuth callbacks' do
           Fabricate(:user, email: 'user@host.example')
         end
 
-        it 'matches the existing user, creates an identity, and redirects to root path' do
-          expect { subject }
-            .to not_change(User, :count)
-            .and change(Identity, :count)
-            .by(1)
-            .and change(LoginActivity, :count)
-            .by(1)
+        context 'when ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH is set to true' do
+          around do |example|
+            ClimateControl.modify ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH: 'true' do
+              example.run
+            end
+          end
 
-          expect(Identity.find_by(user: User.last).uid).to eq('123')
-          expect(response).to redirect_to(root_path)
+          it 'matches the existing user, creates an identity, and redirects to root path' do
+            expect { subject }
+              .to not_change(User, :count)
+              .and change(Identity, :count)
+              .by(1)
+              .and change(LoginActivity, :count)
+              .by(1)
+
+            expect(Identity.find_by(user: User.last).uid).to eq('123')
+            expect(response).to redirect_to(root_path)
+          end
+        end
+
+        context 'when ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH is not set to true' do
+          it 'does not match the existing user or create an identity, and redirects to login page' do
+            expect { subject }
+              .to not_change(User, :count)
+              .and not_change(Identity, :count)
+              .and not_change(LoginActivity, :count)
+
+            expect(response).to redirect_to(new_user_session_url)
+          end
         end
       end
 
@@ -96,7 +115,7 @@ describe 'OmniAuth callbacks' do
 
     context 'when a user cannot be built' do
       before do
-        allow(User).to receive(:find_for_oauth).and_return(User.new)
+        allow(User).to receive(:find_for_omniauth).and_return(User.new)
       end
 
       it 'redirects to the new user signup page' do
diff --git a/spec/requests/well_known/oauth_metadata_spec.rb b/spec/requests/well_known/oauth_metadata_spec.rb
new file mode 100644
index 0000000000..deef189ac9
--- /dev/null
+++ b/spec/requests/well_known/oauth_metadata_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'The /.well-known/oauth-authorization-server request' do
+  let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http }
+
+  before do
+    host! ENV.fetch('LOCAL_DOMAIN')
+  end
+
+  it 'returns http success with valid JSON response' do
+    get '/.well-known/oauth-authorization-server'
+
+    expect(response)
+      .to have_http_status(200)
+      .and have_attributes(
+        media_type: 'application/json'
+      )
+
+    grant_types_supported = Doorkeeper.configuration.grant_flows.dup
+    grant_types_supported << 'refresh_token' if Doorkeeper.configuration.refresh_token_enabled?
+
+    expect(body_as_json).to include(
+      issuer: root_url(protocol: protocol),
+      service_documentation: 'https://docs.joinmastodon.org/',
+      authorization_endpoint: oauth_authorization_url(protocol: protocol),
+      token_endpoint: oauth_token_url(protocol: protocol),
+      revocation_endpoint: oauth_revoke_url(protocol: protocol),
+      scopes_supported: Doorkeeper.configuration.scopes.map(&:to_s),
+      response_types_supported: Doorkeeper.configuration.authorization_response_types,
+      grant_types_supported: grant_types_supported,
+      # non-standard extension:
+      app_registration_endpoint: api_v1_apps_url(protocol: protocol)
+    )
+  end
+end
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 779f1bba59..0aafdf5624 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -17,22 +17,18 @@ describe 'The /.well-known/webfinger endpoint' do
   end
 
   shared_examples 'a successful response' do
-    it 'returns http success' do
+    it 'returns http success with correct media type and headers and body json' do
       expect(response).to have_http_status(200)
-    end
 
-    it 'sets only a Vary Origin header' do
       expect(response.headers['Vary']).to eq('Origin')
-    end
 
-    it 'returns application/jrd+json' do
       expect(response.media_type).to eq 'application/jrd+json'
-    end
 
-    it 'returns links for the account' do
-      json = body_as_json
-      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
-      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+      expect(body_as_json)
+        .to include(
+          subject: eq('acct:alice@cb6e6126.ngrok.io'),
+          aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
+        )
     end
   end
 
diff --git a/spec/search/models/concerns/account/statuses_search_spec.rb b/spec/search/models/concerns/account/statuses_search_spec.rb
index 915bc094cb..a1b0bf405c 100644
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@@ -21,7 +21,7 @@ describe Account::StatusesSearch, :sidekiq_inline do
         account.indexable = true
         account.save!
 
-        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.where(visibility: :public).count)
+        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.public_visibility.count)
         expect(StatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.count)
       end
     end
@@ -32,7 +32,7 @@ describe Account::StatusesSearch, :sidekiq_inline do
 
     context 'when picking an indexable account' do
       it 'has statuses in the PublicStatusesIndex' do
-        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.where(visibility: :public).count)
+        expect(PublicStatusesIndex.filter(term: { account_id: account.id }).count).to eq(account.statuses.public_visibility.count)
       end
 
       it 'has statuses in the StatusesIndex' do
diff --git a/spec/search/services/statuses_search_service_spec.rb b/spec/search/services/statuses_search_service_spec.rb
new file mode 100644
index 0000000000..2d14d94292
--- /dev/null
+++ b/spec/search/services/statuses_search_service_spec.rb
@@ -0,0 +1,303 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe StatusesSearchService do
+  describe 'a local user posts with searchability' do
+    subject do
+      described_class.new.call('ohagi', account, limit: 10, searchability: searchability).map(&:id)
+    end
+
+    let(:alice) { Fabricate(:user).account }
+    let(:following) { Fabricate(:user).account }
+    let(:reacted) { Fabricate(:user).account }
+    let(:other) { Fabricate(:user).account }
+    let(:account) { nil }
+    let(:searchability) { :public }
+    let!(:status) { Fabricate(:status, text: 'Hello, ohagi', account: alice, searchability: searchability) }
+
+    before do
+      alice.update!(indexable: true)
+      following.follow!(alice)
+      Fabricate(:favourite, account: reacted, status: status)
+      PublicStatusesIndex.import!
+      StatusesIndex.import!
+    end
+
+    context 'when public searchability' do
+      let(:searchability) { :public }
+      let(:account) { other }
+
+      context 'with other account' do
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with follower' do
+        let(:account) { following }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with reacted user' do
+        let(:account) { reacted }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with self' do
+        let(:account) { alice }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+
+    context 'when public_unlisted searchability' do
+      let(:searchability) { :public_unlisted }
+      let(:account) { other }
+
+      context 'with other account' do
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with follower' do
+        let(:account) { following }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with reacted user' do
+        let(:account) { reacted }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with self' do
+        let(:account) { alice }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+
+    context 'when private searchability' do
+      let(:searchability) { :private }
+      let(:account) { other }
+
+      context 'with other account' do
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with follower' do
+        let(:account) { following }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with reacted user' do
+        let(:account) { reacted }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with self' do
+        let(:account) { alice }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+
+    context 'when direct searchability' do
+      let(:searchability) { :direct }
+      let(:account) { other }
+
+      context 'with other account' do
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with follower' do
+        let(:account) { following }
+
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with reacted user' do
+        let(:account) { reacted }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+
+      context 'with self' do
+        let(:account) { alice }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+
+    context 'when limited searchability' do
+      let(:searchability) { :limited }
+      let(:account) { other }
+
+      context 'with other account' do
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with follower' do
+        let(:account) { following }
+
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with reacted user' do
+        let(:account) { reacted }
+
+        it 'search status' do
+          expect(subject.count).to eq 0
+        end
+      end
+
+      context 'with self' do
+        let(:account) { alice }
+
+        it 'search status' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+  end
+
+  describe 'a local user posts with search keyword' do
+    subject do
+      described_class.new.call(search_keyword, account, limit: 10).map(&:id)
+    end
+
+    let(:search_keyword) { 'ohagi' }
+    let(:status_text) { 'I ate an apple.' }
+
+    let(:alice) { Fabricate(:user).account }
+    let(:account) { alice }
+    let!(:status) { Fabricate(:status, text: status_text, account: alice, searchability: :public) }
+
+    before do
+      alice.update!(username: 'alice')
+      StatusesIndex.import!
+    end
+
+    shared_examples 'hit status' do |name, keyword|
+      context name do
+        let(:search_keyword) { keyword }
+
+        it 'a status hits' do
+          expect(subject.count).to eq 1
+          expect(subject).to include status.id
+        end
+      end
+    end
+
+    shared_examples 'does not hit status' do |name, keyword|
+      context name do
+        let(:search_keyword) { keyword }
+
+        it 'no statuses hit' do
+          expect(subject.count).to eq 0
+        end
+      end
+    end
+
+    it_behaves_like 'hit status', 'when search with word', 'apple'
+    it_behaves_like 'hit status', 'when search with multiple words', 'apple ate'
+    it_behaves_like 'does not hit status', 'when search with multiple words but does not hit half', 'apple kill'
+    # it_behaves_like 'hit status', 'when search with letter in word', 'p' # available only Japanese sudachi
+    # it_behaves_like 'does not hit status', 'when double quote search with letter in word', '"p"' # available only Japanese sudachi
+    it_behaves_like 'hit status', 'when search with fixed word', '"apple"'
+    # it_behaves_like 'hit status', 'when double quote search with multiple letter in word', 'p e'  # available only Japanese sudachi
+    it_behaves_like 'does not hit status', 'when double quote search with multiple letter in word but does not contain half', 'q p'
+    it_behaves_like 'hit status', 'when specify user name', 'apple from:alice'
+    it_behaves_like 'does not hit status', 'when specify not existing user name', 'apple from:ohagi'
+
+    context 'when in:following is specified' do
+      let(:following) { Fabricate(:user).account }
+      let(:other) { Fabricate(:user).account }
+
+      before do
+        following.follow!(alice)
+      end
+
+      context 'with myself' do
+        let(:account) { alice }
+
+        it_behaves_like 'does not hit status', 'when search with following', 'in:following apple'
+      end
+
+      context 'with following' do
+        let(:account) { following }
+
+        it_behaves_like 'hit status', 'when search with following', 'in:following apple'
+      end
+
+      context 'without following' do
+        let(:account) { other }
+
+        it_behaves_like 'does not hit status', 'when search with following', 'in:following apple'
+      end
+    end
+
+    context 'when reverse_search_quote is enabled' do
+      before do
+        alice.user.update!(settings: { reverse_search_quote: true })
+      end
+
+      it_behaves_like 'does not hit status', 'when search with letter in word', 'p'
+      # it_behaves_like 'hit status', 'when double quote search with letter in word', '"p"' # available only Japanese sudachi
+      it_behaves_like 'hit status', 'when search with word', 'apple'
+    end
+  end
+end
diff --git a/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb b/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb
new file mode 100644
index 0000000000..5666f4ed49
--- /dev/null
+++ b/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ActivityPub::NoteForMisskeySerializer do
+  subject { JSON.parse(serialization.to_json) }
+
+  let(:serialization) { ActiveModelSerializers::SerializableResource.new(parent, serializer: described_class, adapter: ActivityPub::Adapter) }
+  let!(:account) { Fabricate(:account) }
+  let!(:other) { Fabricate(:account) }
+  let!(:parent) { Fabricate(:status, account: account, visibility: :unlisted, searchability: :private) }
+  let!(:reply_by_account_first) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
+  let!(:reply_by_account_next) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
+  let!(:reply_by_other_first) { Fabricate(:status, account: other, thread: parent, visibility: :public) }
+  let!(:reply_by_account_third) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
+  let!(:reply_by_account_visibility_direct) { Fabricate(:status, account: account, thread: parent, visibility: :direct) }
+
+  before do
+    account.user.settings.update(reject_unlisted_subscription: 'true')
+  end
+
+  it 'has a Note type' do
+    expect(subject['type']).to eql('Note')
+  end
+
+  it 'has a replies collection' do
+    expect(subject['replies']['type']).to eql('Collection')
+  end
+
+  it 'has a replies collection with a first Page' do
+    expect(subject['replies']['first']['type']).to eql('CollectionPage')
+  end
+
+  it 'includes public self-replies in its replies collection' do
+    expect(subject['replies']['first']['items']).to include(reply_by_account_first.uri, reply_by_account_next.uri, reply_by_account_third.uri)
+  end
+
+  it 'does not include replies from others in its replies collection' do
+    expect(subject['replies']['first']['items']).to_not include(reply_by_other_first.uri)
+  end
+
+  it 'does not include replies with direct visibility in its replies collection' do
+    expect(subject['replies']['first']['items']).to_not include(reply_by_account_visibility_direct.uri)
+  end
+
+  it 'has private visibility' do
+    expect(subject['to']).to_not include('https://www.w3.org/ns/activitystreams#Public')
+    expect(subject['to'].any? { |to| to.end_with?("#{account.username}/followers") }).to be true
+    expect(subject['cc']).to_not include('https://www.w3.org/ns/activitystreams#Public')
+  end
+end
diff --git a/spec/serializers/activitypub/note_serializer_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
index 338d66b308..71e4d33305 100644
--- a/spec/serializers/activitypub/note_serializer_spec.rb
+++ b/spec/serializers/activitypub/note_serializer_spec.rb
@@ -5,14 +5,26 @@ require 'rails_helper'
 describe ActivityPub::NoteSerializer do
   subject { serialized_record_json(parent, described_class, adapter: ActivityPub::Adapter) }
 
+  let(:visibility) { :public }
+  let(:searchability) { :public }
   let!(:account) { Fabricate(:account) }
   let!(:other) { Fabricate(:account) }
-  let!(:parent) { Fabricate(:status, account: account, visibility: :public, language: 'zh-TW') }
+  let!(:parent) { Fabricate(:status, account: account, visibility: visibility, searchability: searchability, language: 'zh-TW') }
   let!(:reply_by_account_first) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
   let!(:reply_by_account_next) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
   let!(:reply_by_other_first) { Fabricate(:status, account: other, thread: parent, visibility: :public) }
   let!(:reply_by_account_third) { Fabricate(:status, account: account, thread: parent, visibility: :public) }
   let!(:reply_by_account_visibility_direct) { Fabricate(:status, account: account, thread: parent, visibility: :direct) }
+  let!(:referred) { nil }
+  let!(:quote) { nil }
+
+  before do
+    parent.references << referred if referred.present?
+    if quote.present?
+      parent.references << quote
+      parent.quote = quote
+    end
+  end
 
   it 'has the expected shape' do
     expect(subject).to include({
@@ -44,4 +56,60 @@ describe ActivityPub::NoteSerializer do
   it 'does not include replies with direct visibility in its replies collection' do
     expect(subject['replies']['first']['items']).to_not include(reply_by_account_visibility_direct.uri)
   end
+
+  it 'send as public visibility' do
+    expect(subject['to']).to include 'https://www.w3.org/ns/activitystreams#Public'
+  end
+
+  context 'when public_unlisted visibility' do
+    let(:visibility) { :public_unlisted }
+
+    it 'send as unlisted visibility' do
+      expect(subject['to']).to_not include 'https://www.w3.org/ns/activitystreams#Public'
+    end
+  end
+
+  it 'send as public searchability' do
+    expect(subject['searchableBy']).to include 'https://www.w3.org/ns/activitystreams#Public'
+  end
+
+  context 'when public_unlisted searchability' do
+    let(:searchability) { :public_unlisted }
+
+    it 'send as private searchability' do
+      expect(subject['searchableBy']).to_not include 'https://www.w3.org/ns/activitystreams#Public'
+    end
+  end
+
+  context 'when has a reference' do
+    let(:referred) { Fabricate(:status) }
+
+    it 'has a references collection' do
+      expect(subject['references']['type']).to eql('Collection')
+    end
+
+    it 'has a references collection with a first Page' do
+      expect(subject['references']['first']['type']).to eql('CollectionPage')
+    end
+
+    it 'has as reference' do
+      expect(subject['quoteUri']).to be_nil
+      expect(subject['references']['first']['items']).to include referred.uri
+    end
+  end
+
+  context 'when has a quote' do
+    let(:quote) { Fabricate(:status) }
+
+    it 'has a quote as transitional type' do
+      expect(subject['quoteUri']).to eq ActivityPub::TagManager.instance.uri_for(quote)
+    end
+
+    it 'has a quote as feb-e232 object link' do
+      tag = subject['tag'].detect { |t| t['type'] == 'Link' }
+      expect(tag).to_not be_nil
+      expect(tag['mediaType']).to eq 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
+      expect(tag['href']).to eq ActivityPub::TagManager.instance.uri_for(quote)
+    end
+  end
 end
diff --git a/spec/serializers/node_info/serializer_spec.rb b/spec/serializers/node_info/serializer_spec.rb
new file mode 100644
index 0000000000..2c7074368c
--- /dev/null
+++ b/spec/serializers/node_info/serializer_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe NodeInfo::Serializer do
+  let(:serialization) do
+    JSON.parse(
+      ActiveModelSerializers::SerializableResource.new(
+        record, adapter: NodeInfo::Adapter, serializer: described_class, root: 'nodeinfo'
+      ).to_json
+    )
+  end
+  let(:record) { {} }
+
+  describe 'nodeinfo version' do
+    it 'returns 2.0' do
+      expect(serialization['version']).to eq '2.0'
+    end
+  end
+
+  describe 'mastodon version' do
+    it 'contains kmyblue' do
+      expect(serialization['software']['version'].include?('kmyblue')).to be true
+    end
+  end
+
+  describe 'metadata' do
+    it 'returns features' do
+      expect(serialization['metadata']['features']).to include 'emoji_reaction'
+    end
+
+    it 'returns nodeinfo own features' do
+      expect(serialization['metadata']['features']).to include 'quote'
+      expect(serialization['metadata']['features']).to_not include 'kmyblue_markdown'
+    end
+  end
+end
diff --git a/spec/serializers/rest/custom_emoji_serializer_spec.rb b/spec/serializers/rest/custom_emoji_serializer_spec.rb
new file mode 100644
index 0000000000..d1806fd0c0
--- /dev/null
+++ b/spec/serializers/rest/custom_emoji_serializer_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe REST::CustomEmojiSerializer do
+  let(:serialization) { serialized_record_json(record, described_class) }
+  let(:record) do
+    Fabricate(:custom_emoji, shortcode: 'ohagi', aliases: aliases)
+  end
+  let(:aliases) { [] }
+
+  context 'when empty aliases' do
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when null aliases' do
+    let(:aliases) { nil }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when aliases contains null' do
+    let(:aliases) { [nil] }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq []
+    end
+  end
+
+  context 'when aliases contains normal text' do
+    let(:aliases) { ['neko'] }
+
+    it 'returns normalized aliases' do
+      expect(serialization['aliases']).to eq ['neko']
+    end
+  end
+end
diff --git a/spec/serializers/rest/instance_serializer_spec.rb b/spec/serializers/rest/instance_serializer_spec.rb
index d8f2536d20..c45c366204 100644
--- a/spec/serializers/rest/instance_serializer_spec.rb
+++ b/spec/serializers/rest/instance_serializer_spec.rb
@@ -10,11 +10,32 @@ describe REST::InstanceSerializer do
     it 'returns recent usage data' do
       expect(serialization['usage']).to eq({ 'users' => { 'active_month' => 0 } })
     end
+  end
 
+  describe 'configuration' do
     it 'returns the VAPID public key' do
       expect(serialization['configuration']['vapid']).to eq({
         'public_key' => Rails.configuration.x.vapid_public_key,
       })
     end
+
+    it 'returns the max pinned statuses limit' do
+      expect(serialization.deep_symbolize_keys)
+        .to include(
+          configuration: include(
+            accounts: include(max_pinned_statuses: StatusPinValidator::PIN_LIMIT)
+          )
+        )
+    end
+  end
+
+  describe 'fedibird_capabilities' do
+    it 'returns fedibird_capabilities' do
+      expect(serialization['fedibird_capabilities']).to include 'emoji_reaction'
+    end
+
+    it 'returns api own fedibird_capabilities' do
+      expect(serialization['fedibird_capabilities']).to include 'kmyblue_markdown'
+    end
   end
 end
diff --git a/spec/serializers/rest/suggestion_serializer_spec.rb b/spec/serializers/rest/suggestion_serializer_spec.rb
index 60420d8023..b5efba082d 100644
--- a/spec/serializers/rest/suggestion_serializer_spec.rb
+++ b/spec/serializers/rest/suggestion_serializer_spec.rb
@@ -7,7 +7,7 @@ describe REST::SuggestionSerializer do
   let(:record) do
     AccountSuggestions::Suggestion.new(
       account: account,
-      source: 'SuggestionSource'
+      sources: ['SuggestionSource']
     )
   end
   let(:account) { Fabricate(:account) }
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 4f89cd220c..5ec0885903 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountSearchService, type: :service do
+describe AccountSearchService do
   describe '#call' do
     context 'with a query to ignore' do
       it 'returns empty array for missing query' do
diff --git a/spec/services/account_statuses_cleanup_service_spec.rb b/spec/services/account_statuses_cleanup_service_spec.rb
index 0ac113f105..403c4632d7 100644
--- a/spec/services/account_statuses_cleanup_service_spec.rb
+++ b/spec/services/account_statuses_cleanup_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AccountStatusesCleanupService, type: :service do
+describe AccountStatusesCleanupService do
   let(:account)           { Fabricate(:account, username: 'alice', domain: nil) }
   let(:account_policy)    { Fabricate(:account_statuses_cleanup_policy, account: account) }
   let!(:unrelated_status) { Fabricate(:status, created_at: 3.years.ago) }
diff --git a/spec/services/activate_follow_requests_service_spec.rb b/spec/services/activate_follow_requests_service_spec.rb
new file mode 100644
index 0000000000..35acea157f
--- /dev/null
+++ b/spec/services/activate_follow_requests_service_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivateFollowRequestsService, type: :service do
+  subject { described_class.new.call(sender) }
+
+  let(:sender) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+  let(:alice) { Fabricate(:account) }
+  let!(:follow_request) { Fabricate(:pending_follow_request, account: sender, target_account: alice) }
+
+  before do
+    allow(LocalNotificationWorker).to receive(:perform_async).and_return(nil)
+  end
+
+  context 'when has a silent follow request' do
+    before do
+      subject
+    end
+
+    it 'follows immediately' do
+      follow = Follow.find_by(account: sender, target_account: alice)
+      expect(follow).to_not be_nil
+      expect(LocalNotificationWorker).to have_received(:perform_async).with(alice.id, follow.id, 'Follow', 'follow')
+
+      new_follow_request = FollowRequest.find_by(account: sender, target_account: alice)
+      expect(new_follow_request).to be_nil
+    end
+
+    it 'pending request is removed' do
+      expect { follow_request.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+
+  context 'when target_account is locked' do
+    before do
+      alice.update!(locked: true)
+      subject
+    end
+
+    it 'enable a follow request' do
+      new_follow_request = FollowRequest.find_by(account: sender, target_account: alice)
+
+      expect(sender.following?(alice)).to be false
+
+      expect(new_follow_request).to_not be_nil
+      expect(new_follow_request.uri).to eq follow_request.uri
+      expect(LocalNotificationWorker).to have_received(:perform_async).with(alice.id, new_follow_request.id, 'FollowRequest', 'follow_request')
+    end
+
+    it 'pending request is removed' do
+      expect { follow_request.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+end
diff --git a/spec/services/activate_remote_statuses_service_spec.rb b/spec/services/activate_remote_statuses_service_spec.rb
new file mode 100644
index 0000000000..73b23159ed
--- /dev/null
+++ b/spec/services/activate_remote_statuses_service_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivateRemoteStatusesService, type: :service do
+  subject { described_class.new.call(sender) }
+
+  let(:sender) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+  let(:alice) { Fabricate(:account) }
+  let!(:pending_status) { Fabricate(:pending_status, account: sender, fetch_account: alice, uri: 'https://example.com/note') }
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: pending_status.uri,
+      attributedTo: sender.uri,
+      type: 'Note',
+      content: 'Lorem ipsum',
+      to: 'https://www.w3.org/ns/activitystreams#Public',
+      tag: [
+        {
+          type: 'Mention',
+          href: ActivityPub::TagManager.instance.uri_for(alice),
+        },
+      ],
+    }
+  end
+  let(:json) { Oj.dump(payload) }
+
+  before do
+    stub_request(:get, 'https://example.com/note').to_return(status: 200, body: json, headers: { 'Content-Type': 'application/activity+json' })
+  end
+
+  context 'when has a pending status' do
+    before do
+      subject
+    end
+
+    it 'original status is fetched', :sidekiq_inline do
+      status = sender.statuses.first
+
+      expect(status).to_not be_nil
+      expect(status.text).to eq 'Lorem ipsum'
+    end
+
+    it 'pending request is removed' do
+      expect { pending_status.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+
+  context 'when target_account is suspended' do
+    before do
+      alice.suspend!
+      subject
+    end
+
+    it 'original status is not fetched', :sidekiq_inline do
+      status = sender.statuses.first
+
+      expect(status).to be_nil
+    end
+
+    it 'pending request is removed' do
+      expect { pending_status.reload }.to raise_error ActiveRecord::RecordNotFound
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index a98108cea3..7ea87922ac 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
+RSpec.describe ActivityPub::FetchFeaturedCollectionService do
   subject { described_class.new }
 
   let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/account', featured_collection_url: 'https://example.com/account/pinned') }
@@ -31,7 +31,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
     }
   end
 
-  let(:status_json_pinned_unknown_unreachable) do
+  let(:status_json_pinned_unknown_reachable) do
     {
       '@context': 'https://www.w3.org/ns/activitystreams',
       type: 'Note',
@@ -72,11 +72,11 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
 
   shared_examples 'sets pinned posts' do
     before do
-      stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known))
-      stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined))
+      stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known), headers: { 'Content-Type': 'application/activity+json' })
+      stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined), headers: { 'Content-Type': 'application/activity+json' })
       stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
-      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_unreachable))
-      stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
+      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
+      stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null), headers: { 'Content-Type': 'application/activity+json' })
 
       subject.call(actor, note: true, hashtag: false)
     end
@@ -94,7 +94,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
   describe '#call' do
     context 'when the endpoint is a Collection' do
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
@@ -111,10 +111,25 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
+
+      context 'when there is a single item, with the array compacted away' do
+        let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+        before do
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
+          subject.call(actor, note: true, hashtag: false)
+        end
+
+        it 'sets expected posts as pinned posts' do
+          expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+            'https://example.com/account/pinned/unknown-reachable'
+          )
+        end
+      end
     end
 
     context 'when the endpoint is a paginated Collection' do
@@ -132,10 +147,25 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
       end
 
       before do
-        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, actor.featured_collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets pinned posts'
+
+      context 'when there is a single item, with the array compacted away' do
+        let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+        before do
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable), headers: { 'Content-Type': 'application/activity+json' })
+          subject.call(actor, note: true, hashtag: false)
+        end
+
+        it 'sets expected posts as pinned posts' do
+          expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+            'https://example.com/account/pinned/unknown-reachable'
+          )
+        end
+      end
     end
   end
 end
diff --git a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
index 071e4d92d5..59367b1e32 100644
--- a/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_tags_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service do
+RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService do
   subject { described_class.new }
 
   let(:collection_url) { 'https://example.com/account/tags' }
@@ -38,7 +38,7 @@ RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service d
   describe '#call' do
     context 'when the endpoint is a Collection' do
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
@@ -46,7 +46,7 @@ RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service d
 
     context 'when the account already has featured tags' do
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
 
         actor.featured_tags.create!(name: 'FoO')
         actor.featured_tags.create!(name: 'baz')
@@ -67,7 +67,7 @@ RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service d
       end
 
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
@@ -88,7 +88,7 @@ RSpec.describe ActivityPub::FetchFeaturedTagsCollectionService, type: :service d
       end
 
       before do
-        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_url).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'sets featured tags'
diff --git a/spec/services/activitypub/fetch_references_service_spec.rb b/spec/services/activitypub/fetch_references_service_spec.rb
new file mode 100644
index 0000000000..a53076306e
--- /dev/null
+++ b/spec/services/activitypub/fetch_references_service_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FetchReferencesService, type: :service do
+  subject { described_class.new.call(status.account, payload) }
+
+  let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
+  let(:status)         { Fabricate(:status, account: actor) }
+  let(:collection_uri) { 'http://example.com/references/1' }
+
+  let(:items) do
+    [
+      'http://example.com/self-references-1',
+      'http://example.com/self-references-2',
+      'http://example.com/self-references-3',
+      'http://other.com/other-references-1',
+      'http://other.com/other-references-2',
+      'http://other.com/other-references-3',
+      'http://example.com/self-references-4',
+      'http://example.com/self-references-5',
+      'http://example.com/self-references-6',
+      'http://example.com/self-references-7',
+      'http://example.com/self-references-8',
+    ]
+  end
+
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      type: 'Collection',
+      id: collection_uri,
+      items: items,
+    }.with_indifferent_access
+  end
+
+  describe '#call' do
+    context 'when the payload is a Collection with inlined replies' do
+      context 'when there is a single reference, with the array compacted away' do
+        let(:items) { 'http://example.com/self-references-1' }
+
+        it 'a item is returned' do
+          expect(subject).to eq ['http://example.com/self-references-1']
+        end
+      end
+
+      context 'when passing the collection itself' do
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+
+      context 'when passing the URL to the collection' do
+        subject { described_class.new.call(status, collection_uri) }
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+    end
+
+    context 'when the payload is an OrderedCollection with inlined references' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'OrderedCollection',
+          id: collection_uri,
+          orderedItems: items,
+        }.with_indifferent_access
+      end
+
+      context 'when passing the collection itself' do
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+
+      context 'when passing the URL to the collection' do
+        subject { described_class.new.call(status, collection_uri) }
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+    end
+
+    context 'when the payload is a paginated Collection with inlined references' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          type: 'Collection',
+          id: collection_uri,
+          first: {
+            type: 'CollectionPage',
+            partOf: collection_uri,
+            items: items,
+          },
+        }.with_indifferent_access
+      end
+
+      context 'when passing the collection itself' do
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+
+      context 'when passing the URL to the collection' do
+        subject { described_class.new.call(status, collection_uri) }
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'first 8 items are returned' do
+          expect(subject).to eq items.take(8)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index ac7484d96d..60ee879e4e 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteAccountService do
   subject { described_class.new }
 
   let!(:actor) do
@@ -18,23 +18,17 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
   end
 
   describe '#call' do
-    let(:account) { subject.call('https://example.com/alice', id: true) }
+    let(:account) { subject.call('https://example.com/alice') }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account with expected details' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -44,22 +38,16 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       before do
         actor[:inbox] = nil
 
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'returns nil' do
+      it 'fetches resource and looks up webfinger and returns nil' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
     end
 
@@ -67,21 +55,17 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets attributes' do
         account
+
         expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -93,27 +77,19 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirection and sets attributes' do
         account
+
         expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -125,22 +101,16 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'does not create account' do
+      it 'fetches resource and looks up webfinger and does not create account' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
     end
 
@@ -148,28 +118,18 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
-        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
-
-      it 'does not create account' do
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
     end
 
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index 93d31b69d5..ce0a8534f1 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteActorService do
   subject { described_class.new }
 
   let!(:actor) do
@@ -18,23 +18,17 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
   end
 
   describe '#call' do
-    let(:account) { subject.call('https://example.com/alice', id: true) }
+    let(:account) { subject.call('https://example.com/alice') }
 
     shared_examples 'sets profile data' do
-      it 'returns an account' do
-        expect(account).to be_an Account
-      end
-
-      it 'sets display name' do
-        expect(account.display_name).to eq 'Alice'
-      end
-
-      it 'sets note' do
-        expect(account.note).to eq 'Foo bar'
-      end
-
-      it 'sets URL' do
-        expect(account.url).to eq 'https://example.com/alice'
+      it 'returns an account and sets attributes' do
+        expect(account)
+          .to be_an(Account)
+          .and have_attributes(
+            display_name: eq('Alice'),
+            note: eq('Foo bar'),
+            url: eq('https://example.com/alice')
+          )
       end
     end
 
@@ -44,22 +38,16 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
       before do
         actor[:inbox] = nil
 
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'returns nil' do
+      it 'fetches resource and looks up webfinger and returns nil' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
     end
 
@@ -67,21 +55,17 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and sets values' do
         account
+
         expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
 
-      it 'sets username and domain from webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'example.com'
       end
@@ -93,27 +77,19 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
+      it 'fetches resource and looks up webfinger and follows redirect and sets values' do
         account
+
         expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
         expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
         expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
 
-      it 'sets username and domain from final webfinger' do
         expect(account.username).to eq 'alice'
         expect(account.domain).to eq 'iscool.af'
       end
@@ -125,22 +101,16 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'does not create account' do
+      it 'fetches resource and looks up webfinger and does not create account' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
       end
     end
 
@@ -148,28 +118,18 @@ RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
       let!(:webfinger) { { subject: 'acct:alice@iscool.af', links: [{ rel: 'self', href: 'https://example.com/bob' }] } }
 
       before do
-        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+        stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
         stub_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://iscool.af/.well-known/nodeinfo').to_return(body: '{}')
       end
 
-      it 'fetches resource' do
-        account
-        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
-      end
-
-      it 'looks up webfinger' do
-        account
-        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
-      end
-
-      it 'looks up "redirected" webfinger' do
-        account
-        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
-      end
-
-      it 'does not create account' do
+      it 'fetches resource and looks up webfinger and follows redirect and does not create account' do
         expect(account).to be_nil
+
+        expect(a_request(:get, 'https://example.com/alice')).to have_been_made.once
+        expect(a_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com')).to have_been_made.once
+        expect(a_request(:get, 'https://iscool.af/.well-known/webfinger?resource=acct:alice@iscool.af')).to have_been_made.once
       end
     end
 
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index e210d20ec7..ae12ee43d6 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteKeyService do
   subject { described_class.new }
 
   let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
@@ -50,16 +50,17 @@ RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
   end
 
   before do
-    stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor))
+    stub_request(:get, 'https://example.com/alice').to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
     stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+    stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
   end
 
   describe '#call' do
-    let(:account) { subject.call(public_key_id, id: false) }
+    let(:account) { subject.call(public_key_id) }
 
     context 'when the key is a sub-object from the actor' do
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(actor))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(actor), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the expected account' do
@@ -71,7 +72,7 @@ RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
       let(:public_key_id) { 'https://example.com/alice-public-key.json' }
 
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the expected account' do
@@ -84,7 +85,7 @@ RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
       let(:actor_public_key) { 'https://example.com/alice-public-key.json' }
 
       before do
-        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })))
+        stub_request(:get, public_key_id).to_return(body: Oj.dump(key_json.merge({ '@context': ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1'] })), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it 'returns the nil' do
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 0fb32d20b1..a86f141fe0 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
+RSpec.describe ActivityPub::FetchRemoteStatusService do
   include ActionView::Helpers::TextHelper
 
   subject { described_class.new }
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index d7716dd4ef..e7d8d3528a 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::FetchRepliesService, type: :service do
+RSpec.describe ActivityPub::FetchRepliesService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
@@ -34,6 +34,18 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
   describe '#call' do
     context 'when the payload is a Collection with inlined replies' do
+      context 'when there is a single reply, with the array compacted away' do
+        let(:items) { 'http://example.com/self-reply-1' }
+
+        it 'queues the expected worker' do
+          allow(FetchReplyWorker).to receive(:push_bulk)
+
+          subject.call(status, payload)
+
+          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1'])
+        end
+      end
+
       context 'when passing the collection itself' do
         it 'spawns workers for up to 5 replies on the same server' do
           allow(FetchReplyWorker).to receive(:push_bulk)
@@ -46,7 +58,7 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
@@ -81,7 +93,7 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
@@ -120,7 +132,7 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
       context 'when passing the URL to the collection' do
         before do
-          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
         end
 
         it 'spawns workers for up to 5 replies on the same server' do
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 9abe03181e..f801227f57 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -2,10 +2,330 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::ProcessAccountService, type: :service do
+RSpec.describe ActivityPub::ProcessAccountService do
   subject { described_class.new }
 
-  context 'with property values' do
+  before do
+    stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 404)
+  end
+
+  describe 'about blocking new remote account' do
+    subject { described_class.new.call('alice', 'example.com', payload) }
+
+    let(:hold_remote_new_accounts) { true }
+    let(:permit_domain) { nil }
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        actor_type: 'Person',
+        summary: 'new bio',
+      }.with_indifferent_access
+    end
+
+    before do
+      Setting.hold_remote_new_accounts = hold_remote_new_accounts
+      Fabricate(:specified_domain, domain: permit_domain, table: 0) if permit_domain
+    end
+
+    it 'creates pending account in a simple case' do
+      expect(subject).to_not be_nil
+      expect(subject.uri).to eq 'https://foo.test'
+      expect(subject.suspended?).to be true
+      expect(subject.remote_pending).to be true
+    end
+
+    context 'when is blocked' do
+      let(:permit_domain) { 'foo.bar' }
+
+      it 'creates pending account' do
+        expect(subject).to_not be_nil
+        expect(subject.suspended?).to be true
+        expect(subject.remote_pending).to be true
+      end
+
+      context 'when the domain is not on list but hold_remote_new_accounts is disabled' do
+        let(:hold_remote_new_accounts) { false }
+
+        it 'creates normal account' do
+          expect(subject).to_not be_nil
+          expect(subject.suspended?).to be false
+          expect(subject.remote_pending).to be false
+        end
+      end
+
+      context 'with has existing account' do
+        before do
+          Fabricate(:account, uri: 'https://foo.test', domain: 'example.com', username: 'alice', note: 'old bio')
+        end
+
+        it 'updated account' do
+          expect(subject).to_not be_nil
+          expect(subject.suspended?).to be false
+          expect(subject.remote_pending).to be false
+          expect(subject.note).to eq 'new bio'
+        end
+      end
+
+      context 'with has existing suspended pending account' do
+        before do
+          Fabricate(:account, uri: 'https://foo.test', domain: 'example.com', username: 'alice', note: 'old bio', suspended_at: 1.day.ago, remote_pending: true, suspension_origin: :local)
+        end
+
+        it 'updated account' do
+          expect(subject).to_not be_nil
+          expect(subject.suspended?).to be true
+          expect(subject.remote_pending).to be true
+          expect(subject.suspension_origin_local?).to be true
+          expect(subject.note).to eq 'new bio'
+        end
+      end
+
+      context 'with has existing suspended account' do
+        before do
+          Fabricate(:account, uri: 'https://foo.test', domain: 'example.com', username: 'alice', note: 'old bio', suspended_at: 1.day.ago, suspension_origin: :local)
+        end
+
+        it 'does not update account' do
+          expect(subject).to_not be_nil
+          expect(subject.suspended?).to be true
+          expect(subject.remote_pending).to be false
+          expect(subject.suspension_origin_local?).to be true
+          expect(subject.note).to eq 'old bio'
+        end
+      end
+    end
+
+    context 'when is in whitelist' do
+      let(:permit_domain) { 'example.com' }
+
+      it 'does not create account' do
+        expect(subject).to_not be_nil
+        expect(subject.uri).to eq 'https://foo.test'
+        expect(subject.suspended?).to be false
+        expect(subject.remote_pending).to be false
+      end
+    end
+  end
+
+  context 'with searchability' do
+    subject { described_class.new.call('alice', 'example.com', payload) }
+
+    let(:software) { 'mastodon' }
+    let(:searchable_by) { 'https://www.w3.org/ns/activitystreams#Public' }
+    let(:sender_bio) { '' }
+    let(:indexable) { nil }
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        followers: 'https://example.com/followers',
+        searchableBy: searchable_by,
+        indexable: indexable,
+        summary: sender_bio,
+        actor_type: 'Person',
+      }.with_indifferent_access
+    end
+
+    before do
+      Fabricate(:instance_info, domain: 'example.com', software: software)
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
+      stub_request(:get, 'https://example.com/followers').to_return(body: '[]')
+    end
+
+    context 'when public' do
+      it 'searchability is public' do
+        expect(subject.searchability).to eq 'public'
+      end
+    end
+
+    context 'when private' do
+      let(:searchable_by) { 'https://example.com/followers' }
+
+      it 'searchability is private' do
+        expect(subject.searchability).to eq 'private'
+      end
+    end
+
+    context 'when direct' do
+      let(:searchable_by) { '' }
+
+      it 'searchability is direct' do
+        expect(subject.searchability).to eq 'direct'
+      end
+    end
+
+    context 'when limited' do
+      let(:searchable_by) { 'kmyblue:Limited' }
+
+      it 'searchability is limited' do
+        expect(subject.searchability).to eq 'limited'
+      end
+    end
+
+    context 'when limited old spec' do
+      let(:searchable_by) { 'as:Limited' }
+
+      it 'searchability is limited' do
+        expect(subject.searchability).to eq 'limited'
+      end
+    end
+
+    context 'when default value' do
+      let(:searchable_by) { nil }
+
+      it 'searchability is direct' do
+        expect(subject.searchability).to eq 'direct'
+      end
+    end
+
+    context 'when misskey user' do
+      let(:software) { 'misskey' }
+      let(:searchable_by) { nil }
+
+      it 'searchability is public' do
+        expect(subject.searchability).to eq 'public'
+      end
+
+      context 'with true indexable' do
+        let(:indexable) { true }
+
+        it 'searchability is public' do
+          expect(subject.searchability).to eq 'public'
+        end
+      end
+
+      context 'with false indexable' do
+        let(:indexable) { false }
+
+        it 'searchability is limited' do
+          expect(subject.searchability).to eq 'limited'
+        end
+      end
+
+      context 'with no-indexable key' do
+        let(:payload) do
+          {
+            id: 'https://foo.test',
+            type: 'Actor',
+            inbox: 'https://foo.test/inbox',
+            followers: 'https://example.com/followers',
+            searchableBy: searchable_by,
+            summary: sender_bio,
+          }.with_indifferent_access
+        end
+
+        it 'searchability is public' do
+          expect(subject.searchability).to eq 'public'
+        end
+      end
+    end
+
+    context 'with bio' do
+      let(:searchable_by) { nil }
+
+      context 'with public' do
+        let(:sender_bio) { '#searchable_by_all_users' }
+
+        it 'searchability is public' do
+          expect(subject.searchability).to eq 'public'
+        end
+      end
+
+      context 'with private' do
+        let(:sender_bio) { '#searchable_by_followers_only' }
+
+        it 'searchability is private' do
+          expect(subject.searchability).to eq 'private'
+        end
+      end
+
+      context 'with direct' do
+        let(:sender_bio) { '#searchable_by_reacted_users_only' }
+
+        it 'searchability is direct' do
+          expect(subject.searchability).to eq 'direct'
+        end
+      end
+
+      context 'with limited' do
+        let(:sender_bio) { '#searchable_by_nobody' }
+
+        it 'searchability is limited' do
+          expect(subject.searchability).to eq 'limited'
+        end
+      end
+    end
+  end
+
+  context 'with subscription policy' do
+    subject { described_class.new.call('alice', 'example.com', payload) }
+
+    let(:subscribable_by) { 'https://www.w3.org/ns/activitystreams#Public' }
+    let(:sender_bio) { '' }
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        followers: 'https://example.com/followers',
+        subscribableBy: subscribable_by,
+        summary: sender_bio,
+        actor_type: 'Person',
+      }.with_indifferent_access
+    end
+
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
+      stub_request(:get, 'https://example.com/followers').to_return(body: '[]')
+    end
+
+    context 'when public' do
+      it 'subscription policy is allow' do
+        expect(subject.subscription_policy.to_s).to eq 'allow'
+      end
+    end
+
+    context 'when private' do
+      let(:subscribable_by) { 'https://example.com/followers' }
+
+      it 'subscription policy is followers_only' do
+        expect(subject.subscription_policy.to_s).to eq 'followers_only'
+      end
+    end
+
+    context 'when empty' do
+      let(:subscribable_by) { '' }
+
+      it 'subscription policy is block' do
+        expect(subject.subscription_policy.to_s).to eq 'block'
+      end
+    end
+
+    context 'when default value' do
+      let(:subscribable_by) { nil }
+
+      it 'subscription policy is allow' do
+        expect(subject.subscription_policy.to_s).to eq 'allow'
+      end
+    end
+
+    context 'with bio' do
+      let(:subscribable_by) { nil }
+
+      context 'with no-subscribe' do
+        let(:sender_bio) { '[subscribable:no]' }
+
+        it 'subscription policy is block' do
+          expect(subject.subscription_policy.to_s).to eq 'block'
+        end
+      end
+    end
+  end
+
+  context 'with property values, an avatar, and a profile header' do
     let(:payload) do
       {
         id: 'https://foo.test',
@@ -16,19 +336,113 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
           { type: 'PropertyValue', name: 'Occupation', value: 'Unit test' },
           { type: 'PropertyValue', name: 'non-string', value: %w(foo bar) },
         ],
+        image: {
+          type: 'Image',
+          mediaType: 'image/png',
+          url: 'https://foo.test/image.png',
+        },
+        icon: {
+          type: 'Image',
+          url: [
+            {
+              mediaType: 'image/png',
+              href: 'https://foo.test/icon.png',
+            },
+          ],
+        },
       }.with_indifferent_access
     end
 
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
+      stub_request(:get, 'https://foo.test/image.png').to_return(request_fixture('avatar.txt'))
+      stub_request(:get, 'https://foo.test/icon.png').to_return(request_fixture('avatar.txt'))
+    end
+
+    it 'parses property values, avatar and profile header as expected' do
+      account = subject.call('alice', 'example.com', payload)
+
+      expect(account.fields)
+        .to be_an(Array)
+        .and have_attributes(size: 2)
+      expect(account.fields.first)
+        .to be_an(Account::Field)
+        .and have_attributes(
+          name: eq('Pronouns'),
+          value: eq('They/them')
+        )
+      expect(account.fields.last)
+        .to be_an(Account::Field)
+        .and have_attributes(
+          name: eq('Occupation'),
+          value: eq('Unit test')
+        )
+      expect(account).to have_attributes(
+        avatar_remote_url: 'https://foo.test/icon.png',
+        header_remote_url: 'https://foo.test/image.png'
+      )
+    end
+  end
+
+  context 'with other settings' do
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        otherSetting: [
+          { type: 'PropertyValue', name: 'Pronouns', value: 'They/them' },
+          { type: 'PropertyValue', name: 'Occupation', value: 'Unit test' },
+        ],
+      }.with_indifferent_access
+    end
+
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(body: '{}')
+    end
+
     it 'parses out of attachment' do
       account = subject.call('alice', 'example.com', payload)
-      expect(account.fields).to be_a Array
-      expect(account.fields.size).to eq 2
-      expect(account.fields[0]).to be_a Account::Field
-      expect(account.fields[0].name).to eq 'Pronouns'
-      expect(account.fields[0].value).to eq 'They/them'
-      expect(account.fields[1]).to be_a Account::Field
-      expect(account.fields[1].name).to eq 'Occupation'
-      expect(account.fields[1].value).to eq 'Unit test'
+      expect(account.settings).to be_a Hash
+      expect(account.settings.size).to eq 2
+      expect(account.settings['Pronouns']).to eq 'They/them'
+      expect(account.settings['Occupation']).to eq 'Unit test'
+    end
+  end
+
+  context 'when account is using note contains ng words' do
+    subject { described_class.new.call(account.username, account.domain, payload) }
+
+    let!(:account) { Fabricate(:account, username: 'alice', domain: 'example.com') }
+
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        name: 'Ohagi',
+      }.with_indifferent_access
+    end
+
+    it 'creates account when ng word is not set' do
+      Fabricate(:ng_word, keyword: 'Amazon', stranger: false)
+      subject
+      expect(account.reload.display_name).to eq 'Ohagi'
+
+      history = NgwordHistory.find_by(uri: payload[:id])
+      expect(history).to be_nil
+    end
+
+    it 'does not create account when ng word is set' do
+      Fabricate(:ng_word, keyword: 'Ohagi', stranger: false)
+      subject
+      expect(account.reload.display_name).to_not eq 'Ohagi'
+
+      history = NgwordHistory.find_by(uri: payload[:id])
+      expect(history).to_not be_nil
+      expect(history.account_name_blocked?).to be true
+      expect(history.within_ng_words?).to be true
+      expect(history.keyword).to eq 'Ohagi'
     end
   end
 
@@ -127,6 +541,9 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
 
     before do
       stub_const 'ActivityPub::ProcessAccountService::SUBDOMAINS_RATELIMIT', 5
+      8.times do |i|
+        stub_request(:get, "https://test#{i}.testdomain.com/.well-known/nodeinfo").to_return(body: '{}')
+      end
     end
 
     it 'creates accounts without exceeding rate limit' do
@@ -190,6 +607,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
         stub_request(:get, "https://foo.test/users/#{i}/featured").to_return(status: 200, body: featured_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, "https://foo.test/users/#{i}/status").to_return(status: 200, body: status_json.to_json, headers: { 'Content-Type': 'application/activity+json' })
         stub_request(:get, "https://foo.test/.well-known/webfinger?resource=acct:user#{i}@foo.test").to_return(body: webfinger.to_json, headers: { 'Content-Type': 'application/jrd+json' })
+        stub_request(:get, 'https://foo.test/.well-known/nodeinfo').to_return(body: '{}')
       end
     end
 
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index f4a2b8fec6..74df0f9106 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
+RSpec.describe ActivityPub::ProcessCollectionService do
   subject { described_class.new }
 
   let(:actor) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account') }
@@ -265,7 +265,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
             anything
           )
 
-          expect(Status.where(uri: 'https://example.com/users/bob/fake-status').exists?).to be false
+          expect(Status.exists?(uri: 'https://example.com/users/bob/fake-status')).to be false
         end
       end
     end
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 53cbaf4cc1..969e0d3db3 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -6,25 +6,31 @@ def poll_option_json(name, votes)
   { type: 'Note', name: name, replies: { type: 'Collection', totalItems: votes } }
 end
 
-RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
+RSpec.describe ActivityPub::ProcessStatusUpdateService do
   subject { described_class.new }
 
-  let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com')) }
+  let(:thread) { nil }
+  let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com'), thread: thread) }
+  let(:json_tags) do
+    [
+      { type: 'Hashtag', name: 'hoge' },
+      { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+    ]
+  end
+  let(:content) { 'Hello universe' }
   let(:payload) do
     {
       '@context': 'https://www.w3.org/ns/activitystreams',
       id: 'foo',
       type: 'Note',
       summary: 'Show more',
-      content: 'Hello universe',
+      content: content,
       updated: '2021-09-08T22:39:25Z',
-      tag: [
-        { type: 'Hashtag', name: 'hoge' },
-        { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
-      ],
+      tag: json_tags,
     }
   end
-  let(:json) { Oj.load(Oj.dump(payload)) }
+  let(:payload_override) { {} }
+  let(:json) { Oj.load(Oj.dump(payload.merge(payload_override))) }
 
   let(:alice) { Fabricate(:account) }
   let(:bob) { Fabricate(:account) }
@@ -218,7 +224,8 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
       end
 
       it 'does not update the text, spoiler_text or edited_at' do
-        expect { subject.call(status, json, json) }.to_not(change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] })
+        expect { subject.call(status, json, json) }
+          .to_not(change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
       end
     end
 
@@ -305,6 +312,44 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
       end
     end
 
+    context 'when reject tags by domain-block' do
+      let(:tags) { [Fabricate(:tag, name: 'hoge'), Fabricate(:tag, name: 'ohagi')] }
+
+      before do
+        Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_hashtag: true)
+        subject.call(status, json, json)
+      end
+
+      it 'updates tags' do
+        expect(status.tags.reload.map(&:name)).to eq []
+      end
+    end
+
+    context 'when reject mentions to stranger by domain-block' do
+      let(:json_tags) do
+        [
+          { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+        ]
+      end
+
+      before do
+        Fabricate(:domain_block, domain: 'example.com', reject_reply_exclude_followers: true, severity: :noop)
+      end
+
+      it 'updates mentions' do
+        subject.call(status, json, json)
+
+        expect(status.mentions.reload.map(&:account_id)).to eq []
+      end
+
+      it 'updates mentions when follower' do
+        alice.follow!(status.account)
+        subject.call(status, json, json)
+
+        expect(status.mentions.reload.map(&:account_id)).to eq [alice.id]
+      end
+    end
+
     context 'when originally without mentions' do
       before do
         subject.call(status, json, json)
@@ -462,5 +507,280 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
       subject.call(status, json, json)
       expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
     end
+
+    describe 'ng word is set' do
+      let(:json_tags) { [] }
+
+      context 'when hit ng words' do
+        let(:content) { 'ng word test' }
+
+        it 'update status' do
+          Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+        end
+      end
+
+      context 'when not hit ng words' do
+        let(:content) { 'ng word aiueo' }
+
+        it 'update status' do
+          Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+        end
+      end
+
+      context 'when hit ng words for mention to local stranger' do
+        let(:json_tags) do
+          [
+            { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+          ]
+        end
+        let(:content) { 'ng word test' }
+
+        it 'update status' do
+          Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+          expect(status.mentioned_accounts.pluck(:id)).to_not include alice.id
+        end
+
+        it 'update status when following' do
+          Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+          Fabricate(:ng_word, keyword: 'test')
+          alice.follow!(status.account)
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+          expect(status.mentioned_accounts.pluck(:id)).to include alice.id
+        end
+      end
+
+      context 'when hit ng words for mention but local posts are not checked' do
+        let(:json_tags) do
+          [
+            { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+          ]
+        end
+        let(:content) { 'ng word test' }
+
+        it 'update status' do
+          Form::AdminSettings.new(stranger_mention_from_local_ng: '0').save
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+          expect(status.mentioned_accounts.pluck(:id)).to_not include alice.id
+        end
+      end
+
+      context 'when hit ng words for mention to follower' do
+        let(:json_tags) do
+          [
+            { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+          ]
+        end
+        let(:content) { 'ng word test' }
+
+        before do
+          alice.follow!(status.account)
+        end
+
+        it 'update status' do
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+          expect(status.mentioned_accounts.pluck(:id)).to include alice.id
+        end
+      end
+
+      context 'when hit ng words for reply' do
+        let(:json_tags) do
+          [
+            { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+          ]
+        end
+        let(:content) { 'ng word test' }
+        let(:thread) { Fabricate(:status, account: alice) }
+
+        it 'update status' do
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+          expect(status.mentioned_accounts.pluck(:id)).to_not include alice.id
+        end
+      end
+
+      context 'when hit ng words for reply to follower' do
+        let(:json_tags) do
+          [
+            { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
+          ]
+        end
+        let(:content) { 'ng word test' }
+        let(:thread) { Fabricate(:status, account: alice) }
+
+        before do
+          alice.follow!(status.account)
+        end
+
+        it 'update status' do
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+          expect(status.mentioned_accounts.pluck(:id)).to include alice.id
+        end
+      end
+
+      context 'when hit ng words for reference' do
+        let!(:target_status) { Fabricate(:status, account: alice) }
+        let(:payload_override) do
+          {
+            references: {
+              id: 'target_status',
+              type: 'Collection',
+              first: {
+                type: 'CollectionPage',
+                next: nil,
+                partOf: 'target_status',
+                items: [
+                  ActivityPub::TagManager.instance.uri_for(target_status),
+                ],
+              },
+            },
+          }
+        end
+        let(:content) { 'ng word test' }
+
+        it 'update status' do
+          Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+          Fabricate(:ng_word, keyword: 'test')
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+          expect(status.references.pluck(:id)).to_not include target_status.id
+        end
+
+        context 'when alice follows sender' do
+          before do
+            alice.follow!(status.account)
+          end
+
+          it 'update status' do
+            Fabricate(:ng_word, keyword: 'test')
+
+            subject.call(status, json, json)
+            expect(status.reload.text).to eq content
+            expect(status.references.pluck(:id)).to include target_status.id
+          end
+        end
+      end
+
+      context 'when using hashtag under limit' do
+        let(:json_tags) do
+          [
+            { type: 'Hashtag', name: 'a' },
+            { type: 'Hashtag', name: 'b' },
+          ]
+        end
+        let(:content) { 'ohagi is good' }
+
+        it 'update status' do
+          Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+        end
+      end
+
+      context 'when using hashtag over limit' do
+        let(:json_tags) do
+          [
+            { type: 'Hashtag', name: 'a' },
+            { type: 'Hashtag', name: 'b' },
+            { type: 'Hashtag', name: 'c' },
+          ]
+        end
+        let(:content) { 'ohagi is good' }
+
+        it 'update status' do
+          Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to_not eq content
+        end
+      end
+    end
+
+    describe 'ng rule is set' do
+      context 'when ng rule is match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'example.com', status_text: 'universe')
+          subject.call(status, json, json)
+        end
+
+        it 'does not update text' do
+          expect(status.reload.text).to eq 'Hello world'
+          expect(status.edits.reload.map(&:text)).to eq []
+        end
+      end
+
+      context 'when ng rule is not match' do
+        before do
+          Fabricate(:ng_rule, account_domain: 'foo.bar', status_text: 'universe')
+          subject.call(status, json, json)
+        end
+
+        it 'updates text' do
+          expect(status.reload.text).to eq 'Hello universe'
+          expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
+        end
+      end
+    end
+
+    describe 'sensitive word is set' do
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: content,
+          updated: '2021-09-08T22:39:25Z',
+          tag: json_tags,
+        }
+      end
+
+      context 'when hit sensitive words' do
+        let(:content) { 'ng word aiueo' }
+
+        it 'update status' do
+          Fabricate(:sensitive_word, keyword: 'test', remote: true, spoiler: false)
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+          expect(status.spoiler_text).to eq ''
+        end
+      end
+
+      context 'when not hit sensitive words' do
+        let(:content) { 'ng word test' }
+
+        it 'update status' do
+          Fabricate(:sensitive_word, keyword: 'test', remote: true, spoiler: false)
+
+          subject.call(status, json, json)
+          expect(status.reload.text).to eq content
+          expect(status.spoiler_text).to_not eq ''
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index c9a513e24b..648f9a3321 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
+RSpec.describe ActivityPub::SynchronizeFollowersService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account', inbox_url: 'http://example.com/inbox') }
@@ -60,7 +60,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
   describe '#call' do
     context 'when the endpoint is a Collection of actor URIs' do
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
@@ -77,7 +77,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
       end
 
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
@@ -98,7 +98,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService, type: :service do
       end
 
       before do
-        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload))
+        stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
       end
 
       it_behaves_like 'synchronizes followers'
diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb
index 05af125997..248648a809 100644
--- a/spec/services/after_block_domain_from_account_service_spec.rb
+++ b/spec/services/after_block_domain_from_account_service_spec.rb
@@ -2,25 +2,33 @@
 
 require 'rails_helper'
 
-RSpec.describe AfterBlockDomainFromAccountService, type: :service do
+RSpec.describe AfterBlockDomainFromAccountService do
   subject { described_class.new }
 
-  let!(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/inbox', protocol: :activitypub) }
-  let!(:alice) { Fabricate(:account, username: 'alice') }
+  let(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/wolf/inbox', protocol: :activitypub) }
+  let(:dog)  { Fabricate(:account, username: 'dog', domain: 'evil.org', inbox_url: 'https://evil.org/dog/inbox', protocol: :activitypub) }
+  let(:alice) { Fabricate(:account, username: 'alice') }
 
   before do
-    allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
+    NotificationPermission.create!(account: alice, from_account: wolf)
+
+    wolf.follow!(alice)
+    alice.follow!(dog)
   end
 
-  it 'purge followers from blocked domain' do
-    wolf.follow!(alice)
-    subject.call(alice, 'evil.org')
-    expect(wolf.following?(alice)).to be false
-  end
+  it 'purge followers from blocked domain, remove notification permissions, sends `Reject->Follow`, and records severed relationships', :aggregate_failures do
+    expect { subject.call(alice, 'evil.org') }
+      .to change { wolf.following?(alice) }.from(true).to(false)
+      .and change { NotificationPermission.exists?(account: alice, from_account: wolf) }.from(true).to(false)
 
-  it 'sends Reject->Follow to followers from blocked domain' do
-    wolf.follow!(alice)
-    subject.call(alice, 'evil.org')
-    expect(ActivityPub::DeliveryWorker).to have_received(:perform_async).once
+    expect(ActivityPub::DeliveryWorker.jobs.pluck('args')).to contain_exactly(
+      [a_string_including('"type":"Reject"'), alice.id, wolf.inbox_url],
+      [a_string_including('"type":"Undo"'), alice.id, dog.inbox_url]
+    )
+
+    severed_relationships = alice.severed_relationships.to_a
+    expect(severed_relationships.count).to eq 2
+    expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event
+    expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([wolf, alice], [alice, dog])
   end
 end
diff --git a/spec/services/after_block_service_spec.rb b/spec/services/after_block_service_spec.rb
index d81bba1d8d..b95ca5a89a 100644
--- a/spec/services/after_block_service_spec.rb
+++ b/spec/services/after_block_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AfterBlockService, type: :service do
+RSpec.describe AfterBlockService do
   subject { described_class.new.call(account, target_account) }
 
   let(:account)              { Fabricate(:account) }
@@ -48,4 +48,23 @@ RSpec.describe AfterBlockService, type: :service do
       }.from([status.id.to_s, other_account_status.id.to_s, other_account_reblog.id.to_s]).to([other_account_status.id.to_s])
     end
   end
+
+  describe 'antennas' do
+    let(:antenna)              { Fabricate(:antenna, account: account, list_id: 0) }
+    let(:antenna_timeline_key) { FeedManager.instance.key(:antenna, antenna.id) }
+
+    before do
+      redis.del(antenna_timeline_key)
+    end
+
+    it "clears account's statuses" do
+      FeedManager.instance.push_to_antenna(antenna, status)
+      FeedManager.instance.push_to_antenna(antenna, other_account_status)
+      FeedManager.instance.push_to_antenna(antenna, other_account_reblog)
+
+      expect { subject }.to change {
+        redis.zrange(antenna_timeline_key, 0, -1)
+      }.from([status.id.to_s, other_account_status.id.to_s, other_account_reblog.id.to_s]).to([other_account_status.id.to_s])
+    end
+  end
 end
diff --git a/spec/services/after_unallow_domain_service_spec.rb b/spec/services/after_unallow_domain_service_spec.rb
new file mode 100644
index 0000000000..717c42b931
--- /dev/null
+++ b/spec/services/after_unallow_domain_service_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AfterUnallowDomainService do
+  describe '#call' do
+    context 'with accounts for a domain' do
+      let!(:account) { Fabricate(:account, domain: 'host.example') }
+      let!(:test_account) { Fabricate(:account, domain: 'test.example') }
+      let(:service_double) { instance_double(DeleteAccountService, call: true) }
+
+      before { allow(DeleteAccountService).to receive(:new).and_return(service_double) }
+
+      it 'calls the delete service for accounts from the relevant domain' do
+        subject.call 'test.example'
+
+        expect(service_double)
+          .to_not have_received(:call).with(account, reserve_username: false)
+        expect(service_double)
+          .to have_received(:call).with(test_account, reserve_username: false)
+      end
+    end
+  end
+end
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index 86e64dab21..ec7b7516f9 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AppSignUpService, type: :service do
+RSpec.describe AppSignUpService do
   subject { described_class.new }
 
   let(:app) { Fabricate(:application, scopes: 'read write') }
@@ -48,6 +48,39 @@ RSpec.describe AppSignUpService, type: :service do
       end
     end
 
+    context 'when the email address requires approval through MX records' do
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'smtp.email.com')
+        allow(User).to receive(:skip_mx_check?).and_return(false)
+
+        resolver = instance_double(Resolv::DNS, :timeouts= => nil)
+
+        allow(resolver).to receive(:getresources)
+          .with('email.com', Resolv::DNS::Resource::IN::MX)
+          .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'smtp.email.com')])
+        allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
+        allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      end
+
+      it 'creates an unapproved user', :aggregate_failures do
+        access_token = subject.call(app, remote_ip, params)
+        expect(access_token).to_not be_nil
+        expect(access_token.scopes.to_s).to eq 'read write'
+
+        user = User.find_by(id: access_token.resource_owner_id)
+        expect(user).to_not be_nil
+        expect(user.confirmed?).to be false
+        expect(user.approved?).to be false
+
+        expect(user.account).to_not be_nil
+        expect(user.invite_request).to be_nil
+      end
+    end
+
     context 'when registrations are closed' do
       before do
         Setting.registrations_mode = 'none'
diff --git a/spec/services/appeal_service_spec.rb b/spec/services/appeal_service_spec.rb
new file mode 100644
index 0000000000..10c0f148dc
--- /dev/null
+++ b/spec/services/appeal_service_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AppealService do
+  describe '#call' do
+    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
+
+    context 'with an existing strike' do
+      let(:strike) { Fabricate(:account_warning) }
+      let(:text) { 'Appeal text' }
+
+      it 'creates an appeal and notifies staff' do
+        emails = capture_emails { subject.call(strike, text) }
+
+        expect(Appeal.last)
+          .to have_attributes(
+            strike: strike,
+            text: text,
+            account: strike.target_account
+          )
+
+        expect(emails.size)
+          .to eq(1)
+
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(admin.email),
+            subject: eq(
+              I18n.t(
+                'admin_mailer.new_appeal.subject',
+                username: strike.target_account.acct,
+                instance: Rails.configuration.x.local_domain
+              )
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/services/approve_appeal_service_spec.rb b/spec/services/approve_appeal_service_spec.rb
new file mode 100644
index 0000000000..5707c5d7f4
--- /dev/null
+++ b/spec/services/approve_appeal_service_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ApproveAppealService do
+  describe '#call' do
+    context 'with an existing appeal' do
+      let(:appeal) { Fabricate(:appeal) }
+      let(:account) { Fabricate(:account) }
+
+      it 'processes the appeal approval' do
+        expect { subject.call(appeal, account) }
+          .to mark_overruled
+          .and record_approver
+      end
+
+      def mark_overruled
+        change(appeal.strike, :overruled_at)
+          .from(nil)
+          .to(be > 1.minute.ago)
+      end
+
+      def record_approver
+        change(appeal, :approved_by_account)
+          .from(nil)
+          .to(account)
+      end
+    end
+  end
+end
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 602250ee96..be2a864185 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe AuthorizeFollowService, type: :service do
+RSpec.describe AuthorizeFollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/backup_service_spec.rb b/spec/services/backup_service_spec.rb
index 806ba18323..e269b3f117 100644
--- a/spec/services/backup_service_spec.rb
+++ b/spec/services/backup_service_spec.rb
@@ -2,13 +2,15 @@
 
 require 'rails_helper'
 
-RSpec.describe BackupService, type: :service do
+RSpec.describe BackupService do
   subject(:service_call) { described_class.new.call(backup) }
 
   let!(:user)           { Fabricate(:user) }
   let!(:attachment)     { Fabricate(:media_attachment, account: user.account) }
   let!(:status)         { Fabricate(:status, account: user.account, text: 'Hello', visibility: :public, media_attachments: [attachment]) }
   let!(:private_status) { Fabricate(:status, account: user.account, text: 'secret', visibility: :private) }
+  let!(:limited_status) { Fabricate(:status, account: user.account, text: 'sec mutual', visibility: :limited, limited_scope: :mutual) }
+  let!(:reblog_status)  { Fabricate(:status, account: user.account, reblog_of_id: Fabricate(:status).id) }
   let!(:favourite)      { Fabricate(:favourite, account: user.account) }
   let!(:bookmark)       { Fabricate(:bookmark, account: user.account) }
   let!(:backup)         { Fabricate(:backup, user: user) }
@@ -60,10 +62,12 @@ RSpec.describe BackupService, type: :service do
     aggregate_failures do
       expect(json['@context']).to_not be_nil
       expect(json['type']).to eq 'OrderedCollection'
-      expect(json['totalItems']).to eq 2
+      expect(json['totalItems']).to eq 4
       expect(json['orderedItems'][0]['@context']).to be_nil
       expect(json['orderedItems'][0]).to include_create_item(status)
       expect(json['orderedItems'][1]).to include_create_item(private_status)
+      expect(json['orderedItems'][2]).to include_create_item(limited_status)
+      expect(json['orderedItems'][3]).to include_announce_item(reblog_status)
     end
   end
 
@@ -98,4 +102,11 @@ RSpec.describe BackupService, type: :service do
       }),
     })
   end
+
+  def include_announce_item(status)
+    include({
+      'type' => 'Announce',
+      'object' => ActivityPub::TagManager.instance.uri_for(status.reblog),
+    })
+  end
 end
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 1c59d5ed06..e501b9ba84 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BatchedRemoveStatusService, :sidekiq_inline, type: :service do
+RSpec.describe BatchedRemoveStatusService, :sidekiq_inline do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 7ad00fff68..379c8b0911 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -2,73 +2,88 @@
 
 require 'rails_helper'
 
-RSpec.describe BlockDomainService, type: :service do
+RSpec.describe BlockDomainService do
   subject { described_class.new }
 
+  let(:local_account) { Fabricate(:account) }
+  let(:bystander) { Fabricate(:account, domain: 'evil.org') }
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
   let!(:bad_status_plain) { Fabricate(:status, account: bad_account, text: 'You suck') }
   let!(:bad_status_with_attachment) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
   let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status_with_attachment, file: attachment_fixture('attachment.jpg')) }
   let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
 
+  before do
+    Fabricate(:friend_domain, domain: 'evil.org', inbox_url: 'https://evil.org/inbox', active_state: :accepted, passive_state: :accepted)
+  end
+
   describe 'for a suspension' do
     before do
+      stub_request(:post, 'https://evil.org/inbox').with(body: hash_including({
+        type: 'Delete',
+      }))
+      local_account.follow!(bad_account)
+      bystander.follow!(local_account)
+    end
+
+    it 'creates a domain block, suspends remote accounts with appropriate suspension date, records severed relationships and sends notification', :aggregate_failures do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
-    end
 
-    it 'creates a domain block' do
       expect(DomainBlock.blocked?('evil.org')).to be true
-    end
 
-    it 'removes remote accounts from that domain' do
+      # Suspends account with appropriate suspension date
       expect(bad_account.reload.suspended?).to be true
-    end
-
-    it 'records suspension date appropriately' do
       expect(bad_account.reload.suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'keeps already-banned accounts banned' do
+      # Keep already-suspended account without updating the suspension date
       expect(already_banned_account.reload.suspended?).to be true
-    end
-
-    it 'does not overwrite suspension date of already-banned accounts' do
       expect(already_banned_account.reload.suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'removes the remote accounts\'s statuses and media attachments' do
+      # Removes content
       expect { bad_status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
       expect { bad_status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
       expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+
+      # Records severed relationships
+      severed_relationships = local_account.severed_relationships.to_a
+      expect(severed_relationships.count).to eq 2
+      expect(severed_relationships[0].relationship_severance_event).to eq severed_relationships[1].relationship_severance_event
+      expect(severed_relationships.map { |rel| [rel.account, rel.target_account] }).to contain_exactly([bystander, local_account], [local_account, bad_account])
+
+      # Sends severed relationships notification
+      expect(LocalNotificationWorker).to have_enqueued_sidekiq_job(local_account.id, anything, 'AccountRelationshipSeveranceEvent', 'severed_relationships')
+
+      # Removes remote friend from that domain
+      expect(FriendDomain.find_by(domain: 'evil.org')).to be_nil
+    end
+  end
+
+  describe 'for rejecting friend only' do
+    before do
+      stub_request(:post, 'https://evil.org/inbox')
+      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :noop, reject_friend: true))
+    end
+
+    it 'removes remote friend from that domain' do
+      expect(FriendDomain.find_by(domain: 'evil.org')).to be_nil
     end
   end
 
   describe 'for a silence with reject media' do
-    before do
+    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :sidekiq_inline do
       subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
-    end
 
-    it 'does not create a domain block' do
       expect(DomainBlock.blocked?('evil.org')).to be false
-    end
 
-    it 'silences remote accounts from that domain' do
+      # Silences account with appropriate silecing date
       expect(bad_account.reload.silenced?).to be true
-    end
-
-    it 'records suspension date appropriately' do
       expect(bad_account.reload.silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'keeps already-banned accounts banned' do
+      # Keeps already-silenced accounts without updating the silecing date
       expect(already_banned_account.reload.silenced?).to be true
-    end
-
-    it 'does not overwrite suspension date of already-banned accounts' do
       expect(already_banned_account.reload.silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
-    end
 
-    it 'leaves the domains status and attachments, but clears media', :sidekiq_inline do
+      # Leaves posts but clears media
       expect { bad_status_plain.reload }.to_not raise_error
       expect { bad_status_with_attachment.reload }.to_not raise_error
       expect { bad_attachment.reload }.to_not raise_error
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 9e4ff8e598..d096aa1ea3 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BlockService, type: :service do
+RSpec.describe BlockService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
@@ -11,11 +11,13 @@ RSpec.describe BlockService, type: :service do
     let(:bob) { Fabricate(:account, username: 'bob') }
 
     before do
-      subject.call(sender, bob)
+      NotificationPermission.create!(account: sender, from_account: bob)
     end
 
-    it 'creates a blocking relation' do
-      expect(sender.blocking?(bob)).to be true
+    it 'creates a blocking relation and removes notification permissions' do
+      expect { subject.call(sender, bob) }
+        .to change { sender.blocking?(bob) }.from(false).to(true)
+        .and change { NotificationPermission.exists?(account: sender, from_account: bob) }.from(true).to(false)
     end
   end
 
diff --git a/spec/services/bootstrap_timeline_service_spec.rb b/spec/services/bootstrap_timeline_service_spec.rb
index 721a0337fd..c99813bceb 100644
--- a/spec/services/bootstrap_timeline_service_spec.rb
+++ b/spec/services/bootstrap_timeline_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BootstrapTimelineService, type: :service do
+RSpec.describe BootstrapTimelineService do
   subject { described_class.new }
 
   context 'when the new user has registered from an invite' do
diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index a77acc0732..b9af795a5d 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -95,23 +95,27 @@ RSpec.describe BulkImportRowService do
     context 'when importing a list row' do
       let(:import_type) { 'lists' }
       let(:target_account) { Fabricate(:account) }
+      let(:list_name) { 'my list' }
       let(:data) do
-        { 'acct' => target_account.acct, 'list_name' => 'my list' }
+        { 'acct' => target_account.acct, 'list_name' => list_name }
       end
 
       shared_examples 'common behavior' do
+        shared_examples 'row import success and list addition' do
+          it 'returns true and adds the target account to the list' do
+            result = nil
+            expect { result = subject.call(import_row) }
+              .to change { result }.from(nil).to(true)
+              .and add_target_account_to_list
+          end
+        end
+
         context 'when the target account is already followed' do
           before do
             account.follow!(target_account)
           end
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the user already requested to follow the target account' do
@@ -119,35 +123,32 @@ RSpec.describe BulkImportRowService do
             account.request_follow!(target_account)
           end
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the target account is neither followed nor requested' do
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
-
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
-          end
+          include_examples 'row import success and list addition'
         end
 
         context 'when the target account is the user themself' do
           let(:target_account) { account }
 
-          it 'returns true' do
-            expect(subject.call(import_row)).to be true
-          end
+          include_examples 'row import success and list addition'
+        end
 
-          it 'adds the target account to the list' do
-            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
-          end
+        def add_target_account_to_list
+          change { target_account_on_list? }
+            .from(false)
+            .to(true)
+        end
+
+        def target_account_on_list?
+          ListAccount
+            .joins(:list)
+            .exists?(
+              account_id: target_account.id,
+              list: { title: list_name }
+            )
         end
       end
 
@@ -157,7 +158,7 @@ RSpec.describe BulkImportRowService do
 
       context 'when the list exists' do
         before do
-          Fabricate(:list, account: account, title: 'my list')
+          Fabricate(:list, account: account, title: list_name)
         end
 
         include_examples 'common behavior'
@@ -165,7 +166,7 @@ RSpec.describe BulkImportRowService do
         it 'does not create a new list' do
           account.follow!(target_account)
 
-          expect { subject.call(import_row) }.to_not(change { List.where(title: 'my list').count })
+          expect { subject.call(import_row) }.to_not(change { List.where(title: list_name).count })
         end
       end
     end
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index c3a7160580..e8bec96c85 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -291,7 +291,7 @@ RSpec.describe BulkImportService do
 
       it 'marks the import as finished' do
         subject.call(import)
-        expect(import.reload.finished?).to be true
+        expect(import.reload.state_finished?).to be true
       end
     end
 
@@ -319,7 +319,7 @@ RSpec.describe BulkImportService do
 
       it 'marks the import as finished' do
         subject.call(import)
-        expect(import.reload.finished?).to be true
+        expect(import.reload.state_finished?).to be true
       end
     end
 
diff --git a/spec/services/clear_domain_media_service_spec.rb b/spec/services/clear_domain_media_service_spec.rb
index 9766e62de8..f1e5097a99 100644
--- a/spec/services/clear_domain_media_service_spec.rb
+++ b/spec/services/clear_domain_media_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ClearDomainMediaService, type: :service do
+RSpec.describe ClearDomainMediaService do
   subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
diff --git a/spec/services/create_featured_tag_service_spec.rb b/spec/services/create_featured_tag_service_spec.rb
new file mode 100644
index 0000000000..f057bc8538
--- /dev/null
+++ b/spec/services/create_featured_tag_service_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CreateFeaturedTagService do
+  describe '#call' do
+    let(:tag) { 'test' }
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, domain: nil) }
+
+      it 'creates a new featured tag and distributes' do
+        expect { subject.call(account, tag) }
+          .to change(FeaturedTag, :count).by(1)
+        expect(ActivityPub::AccountRawDistributionWorker)
+          .to have_enqueued_sidekiq_job(anything, account.id)
+      end
+    end
+
+    context 'with a remote account' do
+      let(:account) { Fabricate(:account, domain: 'host.example') }
+
+      it 'creates a new featured tag and does not distributes' do
+        expect { subject.call(account, tag) }
+          .to change(FeaturedTag, :count).by(1)
+        expect(ActivityPub::AccountRawDistributionWorker)
+          .to_not have_enqueued_sidekiq_job(any_args)
+      end
+    end
+  end
+end
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index 1965b7daab..e9226f3e04 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -2,16 +2,23 @@
 
 require 'rails_helper'
 
-RSpec.describe DeleteAccountService, type: :service do
+RSpec.describe DeleteAccountService do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
+    before do
+      account.follow!(list_target_account)
+      circle_target_account.follow!(account)
+    end
+
     let!(:status) { Fabricate(:status, account: account) }
     let!(:mention) { Fabricate(:mention, account: local_follower) }
     let!(:status_with_mention) { Fabricate(:status, account: account, mentions: [mention]) }
     let!(:media_attachment) { Fabricate(:media_attachment, account: account) }
     let!(:notification) { Fabricate(:notification, account: account) }
     let!(:favourite) { Fabricate(:favourite, account: account, status: Fabricate(:status, account: local_follower)) }
+    let!(:emoji_reaction) { Fabricate(:emoji_reaction, account: account, status: Fabricate(:status, account: local_follower)) }
+    let!(:bookmark) { Fabricate(:bookmark, account: account) }
     let!(:poll) { Fabricate(:poll, account: account) }
     let!(:poll_vote) { Fabricate(:poll_vote, account: local_follower, poll: poll) }
 
@@ -23,10 +30,28 @@ RSpec.describe DeleteAccountService, type: :service do
     let!(:status_notification) { Fabricate(:notification, account: local_follower, activity: status, type: :status) }
     let!(:poll_notification) { Fabricate(:notification, account: local_follower, activity: poll, type: :poll) }
     let!(:favourite_notification) { Fabricate(:notification, account: local_follower, activity: favourite, type: :favourite) }
+    let!(:emoji_reaction_notification) { Fabricate(:notification, account: local_follower, activity: emoji_reaction, type: :emoji_reaction) }
     let!(:follow_notification) { Fabricate(:notification, account: local_follower, activity: active_relationship, type: :follow) }
 
+    let!(:list) { Fabricate(:list, account: account) }
+    let!(:list_account) { Fabricate(:list_account, list: list, account: list_target_account) }
+    let!(:list_target_account) { Fabricate(:account) }
+    let!(:antenna) { Fabricate(:antenna, account: account) }
+    let!(:antenna_account) { Fabricate(:antenna_account, antenna: antenna, account: list_target_account) }
+    let!(:circle) { Fabricate(:circle, account: account) }
+    let!(:circle_account) { Fabricate(:circle_account, circle: circle, account: circle_target_account) }
+    let!(:circle_target_account) { Fabricate(:account) }
+    let!(:circle_status) { Fabricate(:circle_status, circle: circle, status: Fabricate(:status, account: account, visibility: :limited)) }
+    let!(:bookmark_category) { Fabricate(:bookmark_category, account: account) }
+    let!(:bookmark_category_status) { Fabricate(:bookmark_category_status, bookmark_category: bookmark_category, status: bookmark.status) }
+
     let!(:account_note) { Fabricate(:account_note, account: account) }
 
+    let!(:ng_rule_history) { Fabricate(:ng_rule_history, account: account) }
+    let!(:pending_follow_request) { Fabricate(:pending_follow_request, account: account) }
+    let!(:pending_status) { Fabricate(:pending_status, account: account, uri: 'https://example.com/note1') }
+    let!(:fetchable_pending_status) { Fabricate(:pending_status, fetch_account: account, uri: 'https://example.com/note2') }
+
     it 'deletes associated owned and target records and target notifications' do
       subject
 
@@ -35,6 +60,31 @@ RSpec.describe DeleteAccountService, type: :service do
       expect_deletion_of_associated_target_notifications
     end
 
+    it 'deletes associated owned record groups' do # rubocop:disable RSpec/MultipleExpectations
+      expect { subject }.to change {
+        [
+          account.owned_lists,
+          account.antennas,
+          account.circles,
+          account.bookmark_categories,
+        ].map(&:count)
+      }.from([1, 1, 1, 1]).to([0, 0, 0, 0])
+      expect { list_target_account.reload }.to_not raise_error
+      expect { bookmark_category_status.status.reload }.to_not raise_error
+      expect { antenna_account.account.reload }.to_not raise_error
+      expect { circle_account.account.reload }.to_not raise_error
+      expect { ng_rule_history.reload }.to_not raise_error
+      expect { list.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { list_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { antenna_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { circle_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { circle_status.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { bookmark_category_status.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { pending_follow_request.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { pending_status.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { fetchable_pending_status.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
     def expect_deletion_of_associated_owned_records
       expect { status.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { status_with_mention.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -42,6 +92,8 @@ RSpec.describe DeleteAccountService, type: :service do
       expect { media_attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { favourite.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { emoji_reaction.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { bookmark.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { active_relationship.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { passive_relationship.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { poll.reload }.to raise_error(ActiveRecord::RecordNotFound)
@@ -53,12 +105,17 @@ RSpec.describe DeleteAccountService, type: :service do
       expect { endorsement.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
+    def account_pins_for_account
+      AccountPin.where(target_account: account)
+    end
+
     def expect_deletion_of_associated_target_notifications
       expect { favourite_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { follow_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { mention_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { poll_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
       expect { status_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { emoji_reaction_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
diff --git a/spec/services/delivery_antenna_service_spec.rb b/spec/services/delivery_antenna_service_spec.rb
new file mode 100644
index 0000000000..83546ccbfe
--- /dev/null
+++ b/spec/services/delivery_antenna_service_spec.rb
@@ -0,0 +1,413 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DeliveryAntennaService, type: :service do
+  subject { described_class.new }
+
+  let(:ltl_enabled) { true }
+
+  let(:last_active_at) { Time.now.utc }
+  let(:last_active_at_tom) { Time.now.utc }
+  let(:visibility) { :public }
+  let(:searchability) { :public }
+  let(:domain) { nil }
+  let(:spoiler_text) { '' }
+  let(:tags) { Tag.find_or_create_by_names(['hoge']) }
+  let(:software) { nil }
+  let(:status) do
+    url = domain.present? ? 'https://example.com/status' : nil
+    status = Fabricate(:status, account: alice, spoiler_text: spoiler_text, visibility: visibility, searchability: searchability, text: 'Hello my body #hoge', url: url)
+    status.tags << tags.first if tags.present?
+    status
+  end
+
+  let!(:alice) { Fabricate(:account, domain: domain, uri: domain ? "https://#{domain}.com/alice" : '') }
+  let!(:bob)   { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let!(:tom)   { Fabricate(:user, current_sign_in_at: last_active_at_tom).account }
+  let!(:ohagi) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+
+  let!(:antenna)       { nil }
+  let!(:empty_antenna) { nil }
+
+  let(:mode) { :home }
+
+  before do
+    Fabricate(:instance_info, domain: domain, software: software) if domain.present? && software.present?
+
+    bob.follow!(alice)
+    alice.block!(ohagi)
+
+    Form::AdminSettings.new(enable_local_timeline: '0').save unless ltl_enabled
+
+    allow(redis).to receive(:publish)
+
+    subject.call(status, false, mode: mode)
+  end
+
+  def home_feed_of(account)
+    HomeFeed.new(account).get(10).map(&:id)
+  end
+
+  def list_feed_of(list)
+    ListFeed.new(list).get(10).map(&:id)
+  end
+
+  def antenna_feed_of(antenna)
+    AntennaFeed.new(antenna).get(10).map(&:id)
+  end
+
+  def antenna_with_account(owner, target_account, **options)
+    antenna = Fabricate(:antenna, account: owner, any_accounts: false, **options)
+    Fabricate(:antenna_account, antenna: antenna, account: target_account)
+    antenna
+  end
+
+  def antenna_with_domain(owner, target_domain, **options)
+    antenna = Fabricate(:antenna, account: owner, any_domains: false, **options)
+    Fabricate(:antenna_domain, antenna: antenna, name: target_domain)
+    antenna
+  end
+
+  def antenna_with_tag(owner, target_tag, **options)
+    antenna = Fabricate(:antenna, account: owner, any_tags: false, **options)
+    tag = Tag.find_or_create_by_names([target_tag])[0]
+    Fabricate(:antenna_tag, antenna: antenna, tag: tag)
+    antenna
+  end
+
+  def antenna_with_keyword(owner, target_keyword, **options)
+    Fabricate(:antenna, account: owner, any_keywords: false, keywords: [target_keyword], **options)
+  end
+
+  def list(owner)
+    Fabricate(:list, account: owner)
+  end
+
+  context 'with account' do
+    let!(:antenna)       { antenna_with_account(bob, alice) }
+    let!(:empty_antenna) { antenna_with_account(tom, bob) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'when blocked' do
+    let!(:empty_antenna) { antenna_with_account(ohagi, alice) }
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'when non-used' do
+    let(:last_active_at_tom) { Time.now.utc.ago(1.year) }
+    let!(:empty_antenna) { antenna_with_account(tom, alice) }
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with domain' do
+    let(:domain)        { 'fast.example.com' }
+    let!(:antenna)       { antenna_with_domain(bob, 'fast.example.com') }
+    let!(:empty_antenna) { antenna_with_domain(tom, 'ohagi.example.com') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with local domain' do
+    let(:domain)         { nil }
+    let!(:antenna)       { antenna_with_domain(bob, 'cb6e6126.ngrok.io') }
+    let!(:empty_antenna) { antenna_with_domain(tom, 'ohagi.example.com') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+
+    context 'when local timeline is disabled' do
+      let(:ltl_enabled) { false }
+
+      it 'not detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to_not include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+  end
+
+  context 'with tag' do
+    let!(:antenna)       { antenna_with_tag(bob, 'hoge') }
+    let!(:empty_antenna) { antenna_with_tag(tom, 'hog') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with keyword' do
+    let!(:antenna)       { antenna_with_keyword(bob, 'body') }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with keyword and spoiler_text' do
+    let(:spoiler_text)   { 'some self' }
+    let!(:antenna)       { antenna_with_keyword(bob, 'some') }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with keyword and spoiler_text but pick from text' do
+    let(:spoiler_text)   { 'some self' }
+    let!(:antenna)       { antenna_with_keyword(bob, 'body') }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with domain and excluding account' do
+    let(:domain) { 'fast.example.com' }
+    let!(:antenna)       { antenna_with_domain(bob, 'fast.example.com', exclude_accounts: [tom.id]) }
+    let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_accounts: [alice.id]) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with domain and excluding keyword' do
+    let(:domain) { 'fast.example.com' }
+    let!(:antenna)       { antenna_with_domain(bob, 'fast.example.com', exclude_keywords: ['aaa']) }
+    let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_keywords: ['body']) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with domain and excluding tag' do
+    let(:domain) { 'fast.example.com' }
+    let!(:antenna)       { antenna_with_domain(bob, 'fast.example.com') }
+    let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_tags: [Tag.find_or_create_by_names(['hoge']).first.id]) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'with keyword and excluding domain' do
+    let(:domain)        { 'fast.example.com' }
+    let!(:antenna)       { antenna_with_keyword(bob, 'body', exclude_domains: ['ohagi.example.com']) }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'body', exclude_domains: ['fast.example.com']) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+
+    it 'not detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(empty_antenna)).to_not include status.id
+    end
+  end
+
+  context 'when multiple antennas with keyword' do
+    let!(:antenna)       { antenna_with_keyword(bob, 'body') }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'body') }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+      expect(antenna_feed_of(empty_antenna)).to include status.id
+    end
+  end
+
+  context 'when multiple antennas from same owner with keyword' do
+    let!(:antenna)       { antenna_with_keyword(tom, 'body') }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'body') }
+
+    [1, 2, 3, 4, 5].each do |_|
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to include status.id
+      end
+    end
+  end
+
+  context 'when multiple antennas insert home with keyword' do
+    let!(:antenna)       { antenna_with_keyword(bob, 'body', insert_feeds: true) }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'body', insert_feeds: true) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+      expect(home_feed_of(bob)).to include status.id
+      expect(antenna_feed_of(empty_antenna)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+  end
+
+  context 'when multiple antennas insert list with keyword' do
+    let!(:antenna)       { antenna_with_keyword(bob, 'body', insert_feeds: true, list: list(bob)) }
+    let!(:empty_antenna) { antenna_with_keyword(tom, 'body', insert_feeds: true, list: list(tom)) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+      expect(list_feed_of(antenna.list)).to include status.id
+      expect(antenna_feed_of(empty_antenna)).to include status.id
+      expect(list_feed_of(empty_antenna.list)).to include status.id
+    end
+  end
+
+  context 'with keyword and unlisted visibility by not following' do
+    let!(:antenna)       { antenna_with_keyword(tom, 'body') }
+    let!(:empty_antenna) { antenna_with_account(tom, alice) }
+    let(:visibility)     { :unlisted }
+
+    context 'when public searchability' do
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+      end
+
+      it 'not detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'when public_unlisted searchability' do
+      let(:searchability) { :public_unlisted }
+
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+      end
+
+      it 'not detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'when private searchability' do
+      let(:searchability) { :private }
+
+      it 'not detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to_not include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+  end
+
+  context 'with keyword and unlisted visibility by following' do
+    let!(:antenna)       { antenna_with_keyword(bob, 'body') }
+    let!(:empty_antenna) { antenna_with_account(bob, alice) }
+    let(:visibility)     { :unlisted }
+
+    context 'when public searchability' do
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to include status.id
+      end
+    end
+
+    context 'when public_unlisted searchability' do
+      let(:searchability) { :public_unlisted }
+
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to include status.id
+      end
+    end
+
+    context 'when private searchability' do
+      let(:searchability) { :private }
+
+      it 'detecting antenna', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to include status.id
+      end
+    end
+  end
+
+  context 'when stl mode keyword is not working' do
+    let(:mode)           { :stl }
+    let!(:antenna)       { antenna_with_keyword(bob, 'anime', stl: true) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+  end
+
+  context 'when ltl mode keyword is not working' do
+    let(:mode)           { :ltl }
+    let!(:antenna)       { antenna_with_keyword(bob, 'anime', ltl: true) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+  end
+
+  context 'when stl mode exclude_keyword is not working' do
+    let(:mode)           { :stl }
+    let!(:antenna)       { antenna_with_keyword(bob, 'anime', exclude_keywords: ['body'], stl: true) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+  end
+
+  context 'when ltl mode exclude_keyword is not working' do
+    let(:mode)           { :ltl }
+    let!(:antenna)       { antenna_with_keyword(bob, 'anime', exclude_keywords: ['body'], ltl: true) }
+
+    it 'detecting antenna', :sidekiq_inline do
+      expect(antenna_feed_of(antenna)).to include status.id
+    end
+  end
+end
diff --git a/spec/services/emoji_react_service_spec.rb b/spec/services/emoji_react_service_spec.rb
new file mode 100644
index 0000000000..cf0f6f5957
--- /dev/null
+++ b/spec/services/emoji_react_service_spec.rb
@@ -0,0 +1,298 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe EmojiReactService, type: :service do
+  subject do
+    described_class.new.call(sender, status, name)
+    EmojiReaction.where(status: status, account: sender)
+  end
+
+  let(:name) { '😀' }
+  let(:sender) { Fabricate(:user).account }
+  let(:author) { Fabricate(:user).account }
+  let(:status) { Fabricate(:status, account: author) }
+
+  it 'with a simple case' do
+    expect(subject.count).to eq 1
+    expect(subject.first.name).to eq '😀'
+    expect(subject.first.custom_emoji_id).to be_nil
+  end
+
+  context 'when multiple reactions by same account' do
+    let(:name) { '😂' }
+
+    before { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 2
+      expect(subject.pluck(:name)).to contain_exactly('😀', '😂')
+    end
+  end
+
+  context 'when already reacted by other account' do
+    let(:name) { '😂' }
+
+    before { Fabricate(:emoji_reaction, status: status, name: '😀') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.pluck(:name)).to contain_exactly('😂')
+      expect(EmojiReaction.where(status: status).count).to eq 2
+    end
+  end
+
+  context 'when already reacted same emoji by other account', :tag do
+    before { Fabricate(:emoji_reaction, status: status, name: '😀') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq '😀'
+      expect(EmojiReaction.where(status: status).count).to eq 2
+    end
+  end
+
+  context 'when user is silenced' do
+    before do
+      sender.silence!
+    end
+
+    it 'emoji reaction is not allowed' do
+      expect { subject }.to raise_error Mastodon::ValidationError
+    end
+  end
+
+  context 'when user is silenced but following target' do
+    before do
+      author.follow!(sender)
+      sender.silence!
+    end
+
+    it 'emoji reaction is allowed' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq '😀'
+      expect(subject.first.custom_emoji_id).to be_nil
+    end
+  end
+
+  context 'when over limit' do
+    let(:name) { '🚗' }
+
+    before do
+      Fabricate(:emoji_reaction, status: status, account: sender, name: '😀')
+      Fabricate(:emoji_reaction, status: status, account: sender, name: '😎')
+      Fabricate(:emoji_reaction, status: status, account: sender, name: '🐟')
+    end
+
+    it 'react with emoji' do
+      expect { subject.count }.to raise_error Mastodon::ValidationError
+
+      reactions = EmojiReaction.where(status: status, account: sender).pluck(:name)
+      expect(reactions.size).to eq 3
+      expect(reactions).to contain_exactly('😀', '😎', '🐟')
+    end
+  end
+
+  context 'with custom emoji of local' do
+    let(:name) { 'ohagi' }
+    let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq 'ohagi'
+      expect(subject.first.custom_emoji.id).to eq custom_emoji.id
+    end
+  end
+
+  context 'with custom emoji but not existing' do
+    let(:name) { 'ohagi' }
+
+    it 'react with emoji' do
+      expect { subject.count }.to raise_error ActiveRecord::RecordInvalid
+      expect(EmojiReaction.exists?(status: status, account: sender, name: 'ohagi')).to be false
+    end
+  end
+
+  context 'with ng rule' do
+    let(:name) { 'ohagi' }
+
+    context 'when rule hits' do
+      before do
+        Fabricate(:custom_emoji, shortcode: 'ohagi')
+        Fabricate(:ng_rule, reaction_type: ['emoji_reaction'])
+      end
+
+      it 'react with emoji' do
+        expect { subject }.to raise_error Mastodon::ValidationError
+      end
+    end
+
+    context 'when rule does not hit' do
+      before do
+        Fabricate(:custom_emoji, shortcode: 'ohagi')
+        Fabricate(:ng_rule, reaction_type: ['emoji_reaction'], emoji_reaction_name: 'aaa')
+      end
+
+      it 'react with emoji' do
+        expect { subject }.to_not raise_error
+        expect(subject.count).to eq 1
+      end
+    end
+  end
+
+  context 'with custom emoji of remote' do
+    let(:name) { 'ohagi@foo.bar' }
+    let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji/ohagi') }
+
+    before { Fabricate(:emoji_reaction, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq 'ohagi'
+      expect(subject.first.custom_emoji.id).to eq custom_emoji.id
+    end
+  end
+
+  context 'with custom emoji of remote without existing one' do
+    let(:name) { 'ohagi@foo.bar' }
+
+    before { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji/ohagi') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'with custom emoji of remote but local has same name emoji' do
+    let(:name) { 'ohagi@foo.bar' }
+    let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji/ohagi') }
+
+    before do
+      Fabricate(:custom_emoji, shortcode: 'ohagi', domain: nil)
+      Fabricate(:emoji_reaction, status: status, name: 'ohagi', custom_emoji: custom_emoji)
+    end
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq 'ohagi'
+      expect(subject.first.custom_emoji.id).to eq custom_emoji.id
+      expect(subject.first.custom_emoji.domain).to eq 'foo.bar'
+    end
+  end
+
+  context 'with name duplication of unicode emoji on same account' do
+    before { Fabricate(:emoji_reaction, status: status, name: '😀') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 1
+      expect(subject.first.name).to eq '😀'
+    end
+  end
+
+  context 'with name duplication of local cuetom emoji on same account' do
+    let(:name) { 'ohagi' }
+    let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi') }
+
+    before { Fabricate(:emoji_reaction, account: sender, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+
+    it 'react with emoji' do
+      expect { subject.count }.to raise_error Mastodon::ValidationError
+    end
+  end
+
+  context 'with name duplication of remote cuetom emoji on same account' do
+    let(:name) { 'ohagi@foo.bar' }
+    let!(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji/ohagi') }
+
+    before { Fabricate(:emoji_reaction, account: sender, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+
+    it 'react with emoji' do
+      expect { subject.count }.to raise_error Mastodon::ValidationError
+    end
+  end
+
+  context 'when remote status' do
+    let(:author) { Fabricate(:account, domain: 'author.foo.bar', uri: 'https://author.foo.bar/actor', inbox_url: 'https://author.foo.bar/inbox', protocol: 'activitypub') }
+
+    before do
+      stub_request(:post, 'https://author.foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 1
+      expect(a_request(:post, 'https://author.foo.bar/inbox').with(body: hash_including({
+        type: 'Like',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+
+    context 'when has followers' do
+      let!(:bob) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', inbox_url: 'https://foo.bar/inbox', protocol: 'activitypub') }
+
+      before do
+        bob.follow!(sender)
+        stub_request(:post, 'https://foo.bar/inbox')
+      end
+
+      it 'react with emoji', :sidekiq_inline do
+        expect(subject.count).to eq 1
+        expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+          type: 'Like',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          content: '😀',
+        }))).to have_been_made.once
+      end
+    end
+  end
+
+  context 'when sender has remote followers' do
+    let!(:bob) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', inbox_url: 'https://foo.bar/inbox', protocol: 'activitypub') }
+
+    before do
+      bob.follow!(sender)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 1
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Like',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+
+  context 'when has relay server' do
+    before do
+      Fabricate(:relay, inbox_url: 'https://foo.bar/inbox', state: :accepted)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 1
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Like',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+
+  context 'when has friend server' do
+    before do
+      Fabricate(:friend_domain, inbox_url: 'https://foo.bar/inbox', active_state: :accepted, pseudo_relay: true)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 1
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Like',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 77237dffbd..39f318aac1 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -2,20 +2,37 @@
 
 require 'rails_helper'
 
-RSpec.describe FanOutOnWriteService, type: :service do
+RSpec.describe FanOutOnWriteService do
   subject { described_class.new }
 
-  let(:last_active_at) { Time.now.utc }
-  let(:status) { Fabricate(:status, account: alice, visibility: visibility, text: 'Hello @bob @eve #hoge') }
+  let(:ltl_enabled) { true }
 
-  let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let(:last_active_at) { Time.now.utc }
+  let(:visibility) { 'public' }
+  let(:searchability) { 'public' }
+  let(:subscription_policy) { :allow }
+  let(:status) { Fabricate(:status, account: alice, visibility: visibility, searchability: searchability, text: 'Hello @bob @eve #hoge') }
+
+  let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { master_settings: { subscription_policy: subscription_policy } }).account }
   let!(:bob)   { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'bob' }).account }
   let!(:tom)   { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let!(:ohagi) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let!(:tagf)  { Fabricate(:user, current_sign_in_at: last_active_at).account }
   let!(:eve)   { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'eve' }).account }
 
+  let!(:list)          { nil }
+  let!(:empty_list)    { nil }
+  let!(:antenna)       { nil }
+  let!(:empty_antenna) { nil }
+
+  let(:custom_before) { false }
+
   before do
     bob.follow!(alice)
     tom.follow!(alice)
+    ohagi.follow!(bob)
+
+    Form::AdminSettings.new(enable_local_timeline: '0').save unless ltl_enabled
 
     ProcessMentionsService.new.call(status)
     ProcessHashtagsService.new.call(status)
@@ -24,94 +41,228 @@ RSpec.describe FanOutOnWriteService, type: :service do
 
     allow(redis).to receive(:publish)
 
-    subject.call(status)
+    tag = status.tags.first
+    Fabricate(:tag_follow, account: tagf, tag: tag) if tag.present?
+
+    subject.call(status) unless custom_before
   end
 
   def home_feed_of(account)
     HomeFeed.new(account).get(10).map(&:id)
   end
 
+  def list_feed_of(list)
+    ListFeed.new(list).get(10).map(&:id)
+  end
+
+  def antenna_feed_of(antenna)
+    AntennaFeed.new(antenna).get(10).map(&:id)
+  end
+
+  def list_with_account(owner, target_account)
+    list = Fabricate(:list, account: owner)
+    Fabricate(:list_account, list: list, account: target_account)
+    list
+  end
+
+  def antenna_with_account(owner, target_account)
+    antenna = Fabricate(:antenna, account: owner, any_accounts: false)
+    Fabricate(:antenna_account, antenna: antenna, account: target_account)
+    antenna
+  end
+
+  def antenna_with_tag(owner, target_tag, **options)
+    antenna = Fabricate(:antenna, account: owner, any_tags: false, **options)
+    tag = Tag.find_or_create_by_names([target_tag])[0]
+    Fabricate(:antenna_tag, antenna: antenna, tag: tag)
+    antenna
+  end
+
+  def antenna_with_options(owner, **options)
+    Fabricate(:antenna, account: owner, **options)
+  end
+
   context 'when status is public' do
     let(:visibility) { 'public' }
 
-    it 'is added to the home feed of its author' do
+    it 'is added to the home feed of its author', :sidekiq_inline do
       expect(home_feed_of(alice)).to include status.id
     end
 
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
     it 'is added to the home feed of a follower', :sidekiq_inline do
       expect(home_feed_of(bob)).to include status.id
       expect(home_feed_of(tom)).to include status.id
     end
 
-    it 'is broadcast to the hashtag stream' do
+    it 'is added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to include status.id
+    end
+
+    it 'is broadcast to the hashtag stream', :sidekiq_inline do
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
     end
 
-    it 'is broadcast to the public stream' do
+    it 'is broadcast to the public stream', :sidekiq_inline do
       expect(redis).to have_received(:publish).with('timeline:public', anything)
       expect(redis).to have_received(:publish).with('timeline:public:local', anything)
       expect(redis).to have_received(:publish).with('timeline:public:media', anything)
     end
-  end
 
-  context 'when status is limited' do
-    let(:visibility) { 'limited' }
+    context 'when local timeline is disabled', :sidekiq_inline do
+      let(:ltl_enabled) { false }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
+      it 'is broadcast to the hashtag stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+      end
+
+      it 'is broadcast to the public stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:public', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:public:local', anything)
+      end
     end
 
-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
-      expect(home_feed_of(bob)).to include status.id
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { Fabricate(:list, account: tom) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
     end
 
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(tom, bob) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
+
+        it 'is not added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+        end
+      end
+
+      context 'when subscription is allowed followers only' do
+        let(:subscription_policy) { :followers_only }
+        let!(:antenna) { antenna_with_account(ohagi, alice) }
+
+        it 'is not added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+        end
+
+        context 'with following' do
+          let!(:antenna) { antenna_with_account(bob, alice) }
+
+          it 'is added to the antenna feed', :sidekiq_inline do
+            expect(antenna_feed_of(antenna)).to include status.id
+          end
+        end
+      end
+
+      context 'when dtl post' do
+        let!(:antenna) { antenna_with_tag(bob, 'hoge') }
+
+        around do |example|
+          ClimateControl.modify DTL_ENABLED: 'true', DTL_TAG: 'hoge' do
+            example.run
+          end
+        end
+
+        context 'with listening tag' do
+          it 'is added to the antenna feed', :sidekiq_inline do
+            expect(antenna_feed_of(antenna)).to include status.id
+          end
+        end
+
+        context 'with listening tag but sender is limiting subscription' do
+          let(:subscription_policy) { :block }
+
+          it 'does not add to the antenna feed', :sidekiq_inline do
+            expect(antenna_feed_of(antenna)).to_not include status.id
+          end
+        end
+
+        context 'with listening tag but sender is limiting subscription but permit dtl only' do
+          let(:subscription_policy) { :block }
+          let(:custom_before) { true }
+
+          before do
+            alice.user.settings['dtl_force_subscribable'] = true
+            alice.user.save!
+            subject.call(status)
+          end
+
+          it 'is added to the antenna feed', :sidekiq_inline do
+            expect(antenna_feed_of(antenna)).to include status.id
+          end
+        end
+      end
     end
 
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
-    end
-  end
+    context 'with STL antenna' do
+      let!(:antenna) { antenna_with_options(bob, stl: true) }
+      let!(:empty_antenna) { antenna_with_options(tom) }
 
-  context 'when status is private' do
-    let(:visibility) { 'private' }
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
+
+        it 'is added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to include status.id
+        end
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower' do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
     end
 
-    it 'is added to the home feed of a follower', :sidekiq_inline do
-      expect(home_feed_of(bob)).to include status.id
-      expect(home_feed_of(tom)).to include status.id
-    end
+    context 'with LTL antenna' do
+      let!(:antenna) { antenna_with_options(bob, ltl: true) }
+      let!(:empty_antenna) { antenna_with_options(tom) }
 
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
-    end
-  end
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
 
-  context 'when status is direct' do
-    let(:visibility) { 'direct' }
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
+        it 'is added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to include status.id
+        end
+      end
 
-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
-      expect(home_feed_of(bob)).to include status.id
-    end
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
 
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
-    end
-
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
     end
 
     context 'when handling status updates' do
@@ -131,4 +282,542 @@ RSpec.describe FanOutOnWriteService, type: :service do
       end
     end
   end
+
+  context 'when status is limited' do
+    let(:visibility) { 'limited' }
+
+    it 'is added to the home feed of its author', :sidekiq_inline do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
+    it 'is not added to the home feed of the other follower', :sidekiq_inline do
+      expect(home_feed_of(tom)).to_not include status.id
+    end
+
+    it 'is not added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to_not include status.id
+    end
+
+    it 'is not broadcast publicly', :sidekiq_inline do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
+
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { list_with_account(tom, alice) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
+    end
+
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(tom, alice) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'with STL antenna' do
+      let!(:antenna) { antenna_with_options(bob, stl: true) }
+      let!(:empty_antenna) { antenna_with_options(tom, stl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'with LTL antenna' do
+      let!(:empty_antenna) { antenna_with_options(bob, ltl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+  end
+
+  context 'when status is private' do
+    let(:visibility) { 'private' }
+
+    it 'is added to the home feed of its author', :sidekiq_inline do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of a follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+
+    it 'is not added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to_not include status.id
+    end
+
+    it 'is not broadcast publicly', :sidekiq_inline do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
+
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { list_with_account(ohagi, bob) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
+    end
+
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(ohagi, alice) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'with STL antenna' do
+      let!(:antenna) { antenna_with_options(bob, stl: true) }
+      let!(:empty_antenna) { antenna_with_options(ohagi, stl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+
+    context 'with LTL antenna' do
+      let!(:empty_antenna) { antenna_with_options(bob, ltl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+  end
+
+  context 'when status is public_unlisted' do
+    let(:visibility) { 'public_unlisted' }
+
+    it 'is added to the home feed of its author', :sidekiq_inline do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of a follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+
+    it 'is added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to include status.id
+    end
+
+    it 'is broadcast publicly', :sidekiq_inline do
+      expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to have_received(:publish).with('timeline:public:local', anything)
+      expect(redis).to have_received(:publish).with('timeline:public', anything)
+    end
+
+    context 'when local timeline is disabled' do
+      let(:ltl_enabled) { false }
+
+      it 'is broadcast to the hashtag stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+      end
+
+      it 'is broadcast to the public stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:public', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:public:local', anything)
+      end
+    end
+
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { list_with_account(ohagi, bob) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
+    end
+
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(tom, bob) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
+
+        it 'is not added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+        end
+      end
+    end
+
+    context 'with STL antenna' do
+      let!(:antenna) { antenna_with_options(bob, stl: true) }
+      let!(:empty_antenna) { antenna_with_options(tom) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
+
+        it 'is added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to include status.id
+        end
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+
+    context 'with LTL antenna' do
+      let!(:antenna) { antenna_with_options(bob, ltl: true) }
+      let!(:empty_antenna) { antenna_with_options(tom) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when subscription is blocked' do
+        let(:subscription_policy) { :block }
+
+        it 'is added to the antenna feed', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to include status.id
+        end
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+  end
+
+  context 'when status is unlisted' do
+    let(:visibility) { 'unlisted' }
+
+    it 'is added to the home feed of its author', :sidekiq_inline do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of a follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+      expect(home_feed_of(tom)).to include status.id
+    end
+
+    it 'is added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to include status.id
+    end
+
+    it 'is not broadcast publicly', :sidekiq_inline do
+      expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
+
+    context 'with searchability public_unlisted' do
+      let(:searchability) { 'public_unlisted' }
+
+      it 'is broadcast to the hashtag stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+      end
+
+      it 'is added to the tag follower', :sidekiq_inline do
+        expect(home_feed_of(tagf)).to include status.id
+      end
+    end
+
+    context 'with searchability private' do
+      let(:searchability) { 'private' }
+
+      it 'is not broadcast to the hashtag stream', :sidekiq_inline do
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+      end
+
+      it 'is not added to the tag follower', :sidekiq_inline do
+        expect(home_feed_of(tagf)).to_not include status.id
+      end
+    end
+
+    context 'when local timeline is disabled' do
+      let(:ltl_enabled) { false }
+
+      it 'is broadcast to the hashtag stream', :sidekiq_inline do
+        expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge:local', anything)
+      end
+    end
+
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { list_with_account(ohagi, bob) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
+    end
+
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(ohagi, alice) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+
+    context 'with STL antenna' do
+      let!(:antenna) { antenna_with_options(bob, stl: true) }
+      let!(:empty_antenna) { antenna_with_options(ohagi, stl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(antenna)).to_not include status.id
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+
+    context 'with LTL antenna' do
+      let!(:empty_antenna) { antenna_with_options(bob, ltl: true) }
+
+      it 'is added to the antenna feed of antenna follower', :sidekiq_inline do
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+
+      context 'when local timeline is disabled' do
+        let(:ltl_enabled) { false }
+
+        it 'is not added to the antenna feed of antenna follower', :sidekiq_inline do
+          expect(antenna_feed_of(empty_antenna)).to_not include status.id
+        end
+      end
+    end
+
+    context 'with non-public searchability' do
+      let(:searchability) { 'direct' }
+
+      it 'hashtag-timeline is not detected', :sidekiq_inline do
+        expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+        expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      end
+    end
+  end
+
+  context 'when status is direct' do
+    let(:visibility) { 'direct' }
+
+    it 'is added to the home feed of its author', :sidekiq_inline do
+      expect(home_feed_of(alice)).to include status.id
+    end
+
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+      expect(home_feed_of(bob)).to include status.id
+    end
+
+    it 'is not added to the home feed of the other follower', :sidekiq_inline do
+      expect(home_feed_of(tom)).to_not include status.id
+    end
+
+    it 'is not added to the tag follower', :sidekiq_inline do
+      expect(home_feed_of(tagf)).to_not include status.id
+    end
+
+    it 'is not broadcast publicly', :sidekiq_inline do
+      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
+      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+    end
+
+    context 'with list' do
+      let!(:list) { list_with_account(bob, alice) }
+      let!(:empty_list) { list_with_account(ohagi, bob) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(list_feed_of(list)).to_not include status.id
+        expect(list_feed_of(empty_list)).to_not include status.id
+      end
+    end
+
+    context 'with antenna' do
+      let!(:antenna) { antenna_with_account(bob, alice) }
+      let!(:empty_antenna) { antenna_with_account(ohagi, alice) }
+
+      it 'is added to the list feed of list follower', :sidekiq_inline do
+        expect(antenna_feed_of(antenna)).to_not include status.id
+        expect(antenna_feed_of(empty_antenna)).to_not include status.id
+      end
+    end
+  end
+
+  context 'when status has a conversation' do
+    let(:conversation) { Fabricate(:conversation) }
+    let(:status) { Fabricate(:status, account: alice, visibility: visibility, thread: parent_status, conversation: conversation) }
+    let(:parent_status) { Fabricate(:status, account: bob, visibility: visibility, conversation: conversation) }
+    let(:zilu) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+    let(:custom_before) { true }
+
+    before do
+      zilu.follow!(alice)
+      zilu.follow!(bob)
+      Fabricate(:status, account: tom, visibility: visibility, conversation: conversation)
+      Fabricate(:status, account: ohagi, visibility: visibility, conversation: conversation)
+      status.mentions << Fabricate(:mention, account: bob, silent: true)
+      status.mentions << Fabricate(:mention, account: ohagi, silent: true)
+      status.mentions << Fabricate(:mention, account: zilu, silent: true)
+      status.mentions << Fabricate(:mention, account: tom, silent: false)
+      status.save
+      subject.call(status)
+    end
+
+    context 'when public visibility' do
+      it 'does not create notification', :sidekiq_inline do
+        notification = Notification.find_by(account: bob, type: 'mention')
+
+        expect(notification).to be_nil
+      end
+
+      it 'creates notification for active mention', :sidekiq_inline do
+        notification = Notification.find_by(account: tom, type: 'mention')
+
+        expect(notification).to_not be_nil
+        expect(notification.mention.status_id).to eq status.id
+      end
+
+      it 'inserts home feed for reply', :sidekiq_inline do
+        expect(home_feed_of(bob)).to include status.id
+      end
+
+      it 'inserts home feed for non-replied but mentioned and following replied account', :sidekiq_inline do
+        expect(home_feed_of(zilu)).to include status.id
+      end
+
+      it 'does not insert home feed for non-replied, non-following replied account but mentioned', :sidekiq_inline do
+        expect(home_feed_of(tom)).to_not include status.id
+      end
+    end
+
+    context 'when limited visibility' do
+      let(:visibility) { :limited }
+
+      it 'creates notification', :sidekiq_inline do
+        notification = Notification.find_by(account: bob, type: 'mention')
+
+        expect(notification).to_not be_nil
+        expect(notification.mention.status_id).to eq status.id
+      end
+
+      it 'creates notification for other conversation account', :sidekiq_inline do
+        notification = Notification.find_by(account: ohagi, type: 'mention')
+
+        expect(notification).to_not be_nil
+        expect(notification.mention.status_id).to eq status.id
+      end
+
+      it 'inserts home feed for reply', :sidekiq_inline do
+        expect(home_feed_of(bob)).to include status.id
+      end
+
+      it 'inserts home feed for non-replied but mentioned and following replied account', :sidekiq_inline do
+        expect(home_feed_of(zilu)).to include status.id
+      end
+
+      it 'does not insert home feed for non-replied, non-following replied account but mentioned', :sidekiq_inline do
+        expect(home_feed_of(tom)).to_not include status.id
+      end
+    end
+  end
+
+  context 'when updated status is already boosted or quoted' do
+    let(:custom_before) { true }
+
+    before do
+      ReblogService.new.call(bob, status)
+      PostStatusService.new.call(tom, text: "Hello QT #{ActivityPub::TagManager.instance.uri_for(status)}")
+
+      subject.call(status, update: true)
+    end
+
+    it 'notified to boosted account', :sidekiq_inline do
+      notification = Notification.find_by(account: bob, type: 'update')
+
+      expect(notification).to_not be_nil
+      expect(notification.activity_id).to eq status.id
+    end
+
+    it 'notified to quoted account', :sidekiq_inline do
+      notification = Notification.find_by(account: tom, type: 'update')
+
+      expect(notification).to_not be_nil
+      expect(notification.activity_id).to eq status.id
+    end
+
+    it 'notified not to non-boosted account', :sidekiq_inline do
+      notification = Notification.find_by(account: ohagi, type: 'update')
+
+      expect(notification).to be_nil
+    end
+  end
 end
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index 3143e7b669..b09c1f2693 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FavouriteService, type: :service do
+RSpec.describe FavouriteService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
@@ -37,4 +37,31 @@ RSpec.describe FavouriteService, type: :service do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
+
+  context 'with ng rule' do
+    let(:status) { Fabricate(:status) }
+    let(:sender) { Fabricate(:account) }
+
+    context 'when rule matches' do
+      before do
+        Fabricate(:ng_rule, reaction_type: ['favourite'])
+      end
+
+      it 'does not favourite' do
+        expect { subject.call(sender, status) }.to raise_error Mastodon::ValidationError
+        expect(sender.favourited?(status)).to be false
+      end
+    end
+
+    context 'when rule does not match' do
+      before do
+        Fabricate(:ng_rule, account_display_name: 'else', reaction_type: ['favourite'])
+      end
+
+      it 'favourites' do
+        expect { subject.call(sender, status) }.to_not raise_error
+        expect(sender.favourited?(status)).to be true
+      end
+    end
+  end
 end
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index d8ca310b28..5f41e2b48b 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -2,14 +2,16 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchLinkCardService, type: :service do
+RSpec.describe FetchLinkCardService do
   subject { described_class.new }
 
   let(:html) { '<!doctype html><title>Hello world</title>' }
   let(:oembed_cache) { nil }
+  let(:custom_before) { false }
 
   before do
     stub_request(:get, 'http://example.com/html').to_return(headers: { 'Content-Type' => 'text/html' }, body: html)
+    stub_request(:get, 'http://example.com/html_sub').to_return(headers: { 'Content-Type' => 'text/html' }, body: html)
     stub_request(:get, 'http://example.com/not-found').to_return(status: 404, headers: { 'Content-Type' => 'text/html' }, body: html)
     stub_request(:get, 'http://example.com/text').to_return(status: 404, headers: { 'Content-Type' => 'text/plain' }, body: 'Hello')
     stub_request(:get, 'http://example.com/redirect').to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
@@ -29,7 +31,7 @@ RSpec.describe FetchLinkCardService, type: :service do
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
-    subject.call(status)
+    subject.call(status) unless custom_before
   end
 
   context 'with a local status' do
@@ -234,11 +236,74 @@ RSpec.describe FetchLinkCardService, type: :service do
         end
       end
     end
+
+    context 'with URI of reference and normal page' do
+      let(:status) { Fabricate(:status, text: 'RT http://example.com/text http://example.com/html') }
+      let(:custom_before) { true }
+
+      before { Fabricate(:status, uri: 'http://example.com/text') }
+
+      it 'creates preview card' do
+        subject.call(status)
+        expect(status.preview_card).to_not be_nil
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Hello world'
+      end
+    end
+
+    context 'with URI of reference' do
+      let(:status) { Fabricate(:status, text: 'RT http://example.com/text') }
+      let(:custom_before) { true }
+
+      before { Fabricate(:status, uri: 'http://example.com/text') }
+
+      it 'does not create preview card' do
+        subject.call(status)
+        expect(status.preview_card).to be_nil
+      end
+    end
+
+    context 'with URL of reference' do
+      let(:status) { Fabricate(:status, text: 'RT http://example.com/text') }
+      let(:custom_before) { true }
+
+      before { Fabricate(:status, uri: 'http://example.com/text/activity', url: 'http://example.com/text') }
+
+      it 'does not create preview card' do
+        subject.call(status)
+        expect(status.preview_card).to be_nil
+      end
+    end
+
+    context 'with reference normal URL' do
+      let(:status) { Fabricate(:status, text: 'RT http://example.com/html') }
+
+      it 'creates preview card' do
+        expect(status.preview_card).to_not be_nil
+        expect(status.preview_card.url).to eq 'http://example.com/html'
+        expect(status.preview_card.title).to eq 'Hello world'
+      end
+    end
+
+    context 'when URL domain is blocked by admin' do
+      let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+      let(:custom_before) { true }
+
+      before do
+        Setting.stop_link_preview_domains = ['example.com']
+      end
+
+      it 'creates preview card' do
+        subject.call(status)
+        expect(status.preview_card).to be_nil
+      end
+    end
   end
 
   context 'with a remote status' do
+    let(:account) { Fabricate(:account, domain: 'example.com') }
     let(:status) do
-      Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: <<-TEXT)
+      Fabricate(:status, account: account, text: <<-TEXT)
       Habt ihr ein paar gute Links zu <a>foo</a>
       #<span class="tag"><a href="https://quitter.se/tag/wannacry" target="_blank" rel="tag noopener noreferrer" title="https://quitter.se/tag/wannacry">Wannacry</a></span> herumfliegen?
       Ich will mal unter <br> <a href="http://example.com/not-found" target="_blank" rel="noopener noreferrer" title="http://example.com/not-found">http://example.com/not-found</a> was sammeln. !
@@ -254,4 +319,39 @@ RSpec.describe FetchLinkCardService, type: :service do
       expect(a_request(:get, 'https://quitter.se/tag/wannacry')).to_not have_been_made
     end
   end
+
+  context 'with a remote status of reference' do
+    let(:status) do
+      Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: <<-TEXT)
+      RT <a href="http://example.com/html" target="_blank" rel="noopener noreferrer" title="http://example.com/html">Hello</a>&nbsp;
+      TEXT
+    end
+    let(:custom_before) { true }
+
+    before { Fabricate(:status, uri: 'http://example.com/html') }
+
+    it 'creates preview card' do
+      subject.call(status)
+      expect(status.preview_card).to be_nil
+    end
+  end
+
+  context 'with a remote status of reference and normal link' do
+    let(:status) do
+      Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: <<-TEXT)
+      RT <a href="http://example.com/html" target="_blank" rel="noopener noreferrer" title="http://example.com/html">Hello</a>&nbsp;
+      <a href="http://example.com/html_sub" target="_blank" rel="noopener noreferrer" title="http://example.com/html_sub">Hello</a>&nbsp;
+      TEXT
+    end
+    let(:custom_before) { true }
+
+    before { Fabricate(:status, uri: 'http://example.com/html') }
+
+    it 'creates preview card' do
+      subject.call(status)
+      expect(status.preview_card).to_not be_nil
+      expect(status.preview_card.url).to eq 'http://example.com/html_sub'
+      expect(status.preview_card.title).to eq 'Hello world'
+    end
+  end
 end
diff --git a/spec/services/fetch_oembed_service_spec.rb b/spec/services/fetch_oembed_service_spec.rb
index 777cbae3fb..c9f84048b6 100644
--- a/spec/services/fetch_oembed_service_spec.rb
+++ b/spec/services/fetch_oembed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FetchOEmbedService, type: :service do
+describe FetchOEmbedService do
   subject { described_class.new }
 
   before do
diff --git a/spec/services/fetch_remote_status_service_spec.rb b/spec/services/fetch_remote_status_service_spec.rb
index 798740c9b3..a9c61e7b4e 100644
--- a/spec/services/fetch_remote_status_service_spec.rb
+++ b/spec/services/fetch_remote_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchRemoteStatusService, type: :service do
+RSpec.describe FetchRemoteStatusService do
   let(:account) { Fabricate(:account, domain: 'example.org', uri: 'https://example.org/foo') }
   let(:prefetched_body) { nil }
 
diff --git a/spec/services/fetch_resource_service_spec.rb b/spec/services/fetch_resource_service_spec.rb
index 0f1068471f..ee4810571b 100644
--- a/spec/services/fetch_resource_service_spec.rb
+++ b/spec/services/fetch_resource_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FetchResourceService, type: :service do
+RSpec.describe FetchResourceService do
   describe '#call' do
     subject { described_class.new.call(url) }
 
@@ -57,7 +57,7 @@ RSpec.describe FetchResourceService, type: :service do
 
       let(:json) do
         {
-          id: 1,
+          id: 'http://example.com/foo',
           '@context': ActivityPub::TagManager::CONTEXT,
           type: 'Note',
         }.to_json
@@ -83,27 +83,27 @@ RSpec.describe FetchResourceService, type: :service do
         let(:content_type) { 'application/activity+json; charset=utf-8' }
         let(:body) { json }
 
-        it { is_expected.to eq [1, { prefetched_body: body, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: body }] }
       end
 
       context 'when content type is ld+json with profile' do
         let(:content_type) { 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }
         let(:body) { json }
 
-        it { is_expected.to eq [1, { prefetched_body: body, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: body }] }
       end
 
       context 'when link header is present' do
         let(:headers) { { 'Link' => '<http://example.com/foo>; rel="alternate"; type="application/activity+json"' } }
 
-        it { is_expected.to eq [1, { prefetched_body: json, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: json }] }
       end
 
       context 'when content type is text/html' do
         let(:content_type) { 'text/html' }
         let(:body) { '<html><head><link rel="alternate" href="http://example.com/foo" type="application/activity+json"/></head></html>' }
 
-        it { is_expected.to eq [1, { prefetched_body: json, id: true }] }
+        it { is_expected.to eq ['http://example.com/foo', { prefetched_body: json }] }
       end
     end
   end
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index cf4de34c89..69986a1b66 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe FollowService, type: :service do
+RSpec.describe FollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
@@ -154,4 +154,30 @@ RSpec.describe FollowService, type: :service do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
+
+  context 'with ng rule' do
+    let(:bob) { Fabricate(:account) }
+
+    context 'when rule matches' do
+      before do
+        Fabricate(:ng_rule, reaction_type: ['follow'])
+      end
+
+      it 'does not favourite' do
+        expect { subject.call(sender, bob) }.to raise_error Mastodon::ValidationError
+        expect(sender.following?(bob)).to be false
+      end
+    end
+
+    context 'when rule does not match' do
+      before do
+        Fabricate(:ng_rule, account_display_name: 'else', reaction_type: ['follow'])
+      end
+
+      it 'favourites' do
+        expect { subject.call(sender, bob) }.to_not raise_error
+        expect(sender.following?(bob)).to be true
+      end
+    end
+  end
 end
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 7d005c8a11..90877d9997 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ImportService, :sidekiq_inline, type: :service do
+RSpec.describe ImportService, :sidekiq_inline do
   include RoutingHelper
 
   let!(:account) { Fabricate(:account, locked: false) }
diff --git a/spec/services/move_service_spec.rb b/spec/services/move_service_spec.rb
new file mode 100644
index 0000000000..e63818f67e
--- /dev/null
+++ b/spec/services/move_service_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe MoveService do
+  subject { described_class.new.call(migration) }
+
+  context 'with a valid migration record' do
+    let(:migration) { Fabricate(:account_migration, account: source_account, target_account: target_account) }
+    let(:source_account) { Fabricate(:account) }
+    let(:target_account) { Fabricate(:account, also_known_as: [source_account_uri]) }
+
+    it 'migrates the account to a new account' do
+      expect { subject }
+        .to change_source_moved_value
+        .and process_local_updates
+        .and distribute_updates
+        .and distribute_move
+    end
+  end
+
+  def source_account_uri
+    ActivityPub::TagManager
+      .instance
+      .uri_for(source_account)
+  end
+
+  def change_source_moved_value
+    change(source_account.reload, :moved_to_account)
+      .from(nil)
+      .to(target_account)
+  end
+
+  def process_local_updates
+    enqueue_sidekiq_job(MoveWorker)
+      .with(source_account.id, target_account.id)
+  end
+
+  def distribute_updates
+    enqueue_sidekiq_job(ActivityPub::UpdateDistributionWorker)
+      .with(source_account.id)
+  end
+
+  def distribute_move
+    enqueue_sidekiq_job(ActivityPub::MoveDistributionWorker)
+      .with(migration.id)
+  end
+end
diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb
index a2ca2ffe13..681afc0b16 100644
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MuteService, type: :service do
+RSpec.describe MuteService do
   subject { described_class.new.call(account, target_account) }
 
   let(:account) { Fabricate(:account) }
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 38a33c522d..514f634d7f 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe NotifyService, type: :service do
+RSpec.describe NotifyService do
   subject { described_class.new.call(recipient, type, activity) }
 
   let(:user) { Fabricate(:user) }
@@ -41,7 +41,8 @@ RSpec.describe NotifyService, type: :service do
 
   it 'does not notify when sender is silenced and not followed' do
     sender.silence!
-    expect { subject }.to_not change(Notification, :count)
+    subject
+    expect(Notification.find_by(activity: activity).filtered?).to be true
   end
 
   it 'does not notify when recipient is suspended' do
@@ -49,66 +50,6 @@ RSpec.describe NotifyService, type: :service do
     expect { subject }.to_not change(Notification, :count)
   end
 
-  context 'with direct messages' do
-    let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
-    let(:type)     { :mention }
-
-    before do
-      user.settings.update('interactions.must_be_following_dm': enabled)
-      user.save
-    end
-
-    context 'when recipient is supposed to be following sender' do
-      let(:enabled) { true }
-
-      it 'does not notify' do
-        expect { subject }.to_not change(Notification, :count)
-      end
-
-      context 'when the message chain is initiated by recipient, but is not direct message' do
-        let(:reply_to) { Fabricate(:status, account: recipient) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does not notify' do
-          expect { subject }.to_not change(Notification, :count)
-        end
-      end
-
-      context 'when the message chain is initiated by recipient, but without a mention to the sender, even if the sender sends multiple messages in a row' do
-        let(:reply_to) { Fabricate(:status, account: recipient) }
-        let(:dummy_reply) { Fabricate(:status, account: sender, visibility: :direct, thread: reply_to) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does not notify' do
-          expect { subject }.to_not change(Notification, :count)
-        end
-      end
-
-      context 'when the message chain is initiated by the recipient with a mention to the sender' do
-        let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
-        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
-
-        before { Fabricate(:mention, account: sender, status: reply_to) }
-
-        it 'does notify' do
-          expect { subject }.to change(Notification, :count)
-        end
-      end
-    end
-
-    context 'when recipient is NOT supposed to be following sender' do
-      let(:enabled) { false }
-
-      it 'does notify' do
-        expect { subject }.to change(Notification, :count)
-      end
-    end
-  end
-
   describe 'reblogs' do
     let(:status)   { Fabricate(:status, account: Fabricate(:account)) }
     let(:activity) { Fabricate(:status, account: sender, reblog: status) }
@@ -157,8 +98,6 @@ RSpec.describe NotifyService, type: :service do
 
   describe 'email' do
     before do
-      ActionMailer::Base.deliveries.clear
-
       user.settings.update('notification_emails.follow': enabled)
       user.save
     end
@@ -167,7 +106,15 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { true }
 
       it 'sends email', :sidekiq_inline do
-        expect { subject }.to change(ActionMailer::Base.deliveries, :count).by(1)
+        emails = capture_emails { subject }
+
+        expect(emails.size)
+          .to eq(1)
+        expect(emails.first)
+          .to have_attributes(
+            to: contain_exactly(user.email),
+            subject: eq(I18n.t('notification_mailer.follow.subject', name: sender.acct))
+          )
       end
     end
 
@@ -175,7 +122,194 @@ RSpec.describe NotifyService, type: :service do
       let(:enabled) { false }
 
       it "doesn't send email" do
-        expect { subject }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+        emails = capture_emails { subject }
+
+        expect(emails).to be_empty
+      end
+    end
+  end
+
+  describe NotifyService::FilterCondition do
+    subject { described_class.new(notification) }
+
+    let(:activity) { Fabricate(:mention, status: Fabricate(:status)) }
+    let(:notification) { Fabricate(:notification, type: :mention, activity: activity, from_account: activity.status.account, account: activity.account) }
+
+    describe '#filter?' do
+      context 'when sender is silenced' do
+        before do
+          notification.from_account.silence!
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when recipient follows sender' do
+          before do
+            notification.account.follow!(notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering not-followed senders' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_not_following: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender is followed by recipient' do
+          before do
+            notification.account.follow!(notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering not-followers' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_not_followers: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender follows recipient' do
+          before do
+            notification.from_account.follow!(notification.account)
+          end
+
+          it 'returns true' do
+            expect(subject.filter?).to be true
+          end
+        end
+
+        context 'when sender follows recipient for longer than 3 days' do
+          before do
+            follow = notification.from_account.follow!(notification.account)
+            follow.update(created_at: 4.days.ago)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is filtering new accounts' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_new_accounts: true)
+        end
+
+        it 'returns true' do
+          expect(subject.filter?).to be true
+        end
+
+        context 'when sender has permission' do
+          before do
+            Fabricate(:notification_permission, account: notification.account, from_account: notification.from_account)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when sender is older than 30 days' do
+          before do
+            notification.from_account.update(created_at: 31.days.ago)
+          end
+
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+      end
+
+      context 'when recipient is not filtering anyone' do
+        before do
+          Fabricate(:notification_policy, account: notification.account)
+        end
+
+        it 'returns false' do
+          expect(subject.filter?).to be false
+        end
+      end
+
+      context 'when recipient is filtering unsolicited private mentions' do
+        before do
+          Fabricate(:notification_policy, account: notification.account, filter_private_mentions: true)
+        end
+
+        context 'when notification is not a private mention' do
+          it 'returns false' do
+            expect(subject.filter?).to be false
+          end
+        end
+
+        context 'when notification is a private mention' do
+          before do
+            notification.target_status.update(visibility: :direct)
+          end
+
+          it 'returns true' do
+            expect(subject.filter?).to be true
+          end
+
+          context 'when the message chain is initiated by recipient, but sender is not mentioned' do
+            before do
+              original_status = Fabricate(:status, account: notification.account, visibility: :direct)
+              notification.target_status.update(thread: original_status)
+            end
+
+            it 'returns true' do
+              expect(subject.filter?).to be true
+            end
+          end
+
+          context 'when the message chain is initiated by recipient, and sender is mentioned' do
+            before do
+              original_status = Fabricate(:status, account: notification.account, visibility: :direct)
+              notification.target_status.update(thread: original_status)
+              Fabricate(:mention, status: original_status, account: notification.from_account)
+            end
+
+            it 'returns false' do
+              expect(subject.filter?).to be false
+            end
+          end
+        end
       end
     end
   end
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 1e5c420a63..a1358fbc54 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PostStatusService, type: :service do
+RSpec.describe PostStatusService do
   subject { described_class.new }
 
   it 'creates a new status' do
@@ -32,27 +32,34 @@ RSpec.describe PostStatusService, type: :service do
     let!(:future)          { Time.now.utc + 2.hours }
     let!(:previous_status) { Fabricate(:status, account: account) }
 
-    it 'schedules a status' do
-      status = subject.call(account, text: 'Hi future!', scheduled_at: future)
-      expect(status).to be_a ScheduledStatus
-      expect(status.scheduled_at).to eq future
-      expect(status.params['text']).to eq 'Hi future!'
-    end
-
-    it 'does not immediately create a status' do
+    it 'schedules a status for future creation and does not create one immediately' do
       media = Fabricate(:media_attachment, account: account)
       status = subject.call(account, text: 'Hi future!', media_ids: [media.id], scheduled_at: future)
 
-      expect(status).to be_a ScheduledStatus
-      expect(status.scheduled_at).to eq future
-      expect(status.params['text']).to eq 'Hi future!'
-      expect(status.params['media_ids']).to eq [media.id]
+      expect(status)
+        .to be_a(ScheduledStatus)
+        .and have_attributes(
+          scheduled_at: eq(future),
+          params: include(
+            'text' => eq('Hi future!'),
+            'media_ids' => contain_exactly(media.id)
+          )
+        )
       expect(media.reload.status).to be_nil
       expect(Status.where(text: 'Hi future!')).to_not exist
     end
 
-    it 'does not change statuses count' do
-      expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.to_not(change { [account.statuses_count, previous_status.replies_count] })
+    it 'does not change statuses_count of account or replies_count of thread previous status' do
+      expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }
+        .to not_change { account.statuses_count }
+        .and(not_change { previous_status.replies_count })
+    end
+
+    it 'returns existing status when used twice with idempotency key' do
+      account = Fabricate(:account)
+      status1 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
+      status2 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
+      expect(status2.id).to eq status1.id
     end
   end
 
@@ -113,6 +120,55 @@ RSpec.describe PostStatusService, type: :service do
     expect(status.visibility).to eq 'unlisted'
   end
 
+  it 'creates a status with the given searchability' do
+    status = create_status_with_options(searchability: :public, visibility: :public)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'public'
+  end
+
+  it 'creates a status with limited searchability for silenced users' do
+    status = subject.call(Fabricate(:account, silenced: true), text: 'test', searchability: :public, visibility: :public)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'private'
+  end
+
+  it 'creates a status with limited searchability for silenced users with public_unlisted searchability' do
+    status = subject.call(Fabricate(:account, silenced: true), text: 'test', searchability: :public_unlisted, visibility: :public)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'private'
+  end
+
+  it 'creates a status with the given searchability=public / visibility=unlisted' do
+    status = create_status_with_options(searchability: :public, visibility: :unlisted)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'public'
+  end
+
+  it 'creates a status with the given searchability=public_unlisted / visibility=unlisted' do
+    status = create_status_with_options(searchability: :public_unlisted, visibility: :unlisted)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'public_unlisted'
+  end
+
+  it 'creates a status with the given searchability=public / visibility=private' do
+    status = create_status_with_options(searchability: :public, visibility: :private)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'private'
+  end
+
+  it 'creates a status with the given searchability=public_unlisted / visibility=private' do
+    status = create_status_with_options(searchability: :public_unlisted, visibility: :private)
+
+    expect(status).to be_persisted
+    expect(status.searchability).to eq 'private'
+  end
+
   it 'creates a status for the given application' do
     application = Fabricate(:application)
 
@@ -140,7 +196,303 @@ RSpec.describe PostStatusService, type: :service do
     status = subject.call(account, text: 'test status update')
 
     expect(ProcessMentionsService).to have_received(:new)
-    expect(mention_service).to have_received(:call).with(status, save_records: false)
+    expect(mention_service).to have_received(:call).with(status, limited_type: '', circle: nil, save_records: false)
+  end
+
+  it 'self-banned visibility is set' do
+    user = Fabricate(:user)
+    user.settings.update(disabled_visibilities: ['public_unlisted'])
+
+    expect { subject.call(user.account, text: 'text', visibility: 'public_unlisted') }.to raise_error ActiveRecord::RecordInvalid
+  end
+
+  it 'self-banned visibility is not set' do
+    user = Fabricate(:user)
+    user.settings.update(disabled_visibilities: ['public_unlisted'])
+
+    expect { subject.call(user.account, text: 'text', visibility: 'unlisted') }.to_not raise_error
+  end
+
+  context 'with mutual visibility' do
+    let(:sender) { Fabricate(:user).account }
+    let(:io_account) { Fabricate(:account, domain: 'misskey.io', uri: 'https://misskey.io/actor') }
+    let(:local_account) { Fabricate(:account) }
+    let(:remote_account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+    let(:follower) { Fabricate(:account) }
+    let(:followee) { Fabricate(:account) }
+
+    before do
+      Fabricate(:instance_info, domain: 'misskey.io', software: 'misskey')
+      io_account.follow!(sender)
+      local_account.follow!(sender)
+      remote_account.follow!(sender)
+      follower.follow!(sender)
+      sender.follow!(io_account)
+      sender.follow!(local_account)
+      sender.follow!(remote_account)
+      sender.follow!(followee)
+    end
+
+    it 'visibility is set' do
+      status = subject.call(sender, text: 'text', visibility: 'mutual')
+
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'mutual'
+    end
+
+    it 'sent to mutuals' do
+      status = subject.call(sender, text: 'text', visibility: 'mutual')
+
+      expect(status.mentioned_accounts.count).to eq 3
+      expect(status.mentioned_accounts.pluck(:id)).to contain_exactly(io_account.id, local_account.id, remote_account.id)
+    end
+
+    it 'sent to mutuals without misskey.io users' do
+      sender.user.update!(settings: { reject_send_limited_to_suspects: true })
+
+      status = subject.call(sender, text: 'text', visibility: 'mutual')
+
+      expect(status.mentioned_accounts.count).to eq 2
+      expect(status.mentioned_accounts.pluck(:id)).to contain_exactly(local_account.id, remote_account.id)
+    end
+  end
+
+  it 'limited visibility and direct searchability' do
+    account = Fabricate(:account)
+    text = 'This is an English text.'
+
+    status = subject.call(account, text: text, visibility: 'mutual', searchability: 'public')
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'personal'
+    expect(status.searchability).to eq 'direct'
+  end
+
+  it 'personal visibility with mutual' do
+    account = Fabricate(:account)
+    text = 'This is an English text.'
+
+    status = subject.call(account, text: text, visibility: 'mutual')
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'personal'
+    expect(status.mentioned_accounts.count).to eq 0
+  end
+
+  it 'circle visibility' do
+    account = Fabricate(:account)
+    circle_account = Fabricate(:account)
+    other_account = Fabricate(:account)
+    circle = Fabricate(:circle, account: account)
+    text = 'This is an English text.'
+
+    circle_account.follow!(account)
+    other_account.follow!(account)
+    circle.accounts << circle_account
+    status = subject.call(account, text: text, visibility: 'circle', circle_id: circle.id)
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'circle'
+    expect(status.mentioned_accounts.count).to eq 1
+    expect(status.mentioned_accounts.first.id).to eq circle_account.id
+  end
+
+  it 'circle post with limited visibility' do
+    account = Fabricate(:account)
+    circle_account = Fabricate(:account)
+    circle = Fabricate(:circle, account: account)
+    text = 'This is an English text.'
+
+    circle_account.follow!(account)
+    circle.accounts << circle_account
+    status = subject.call(account, text: text, visibility: 'limited', circle_id: circle.id)
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'circle'
+  end
+
+  it 'limited visibility without circle' do
+    account = Fabricate(:account)
+    text = 'This is an English text.'
+
+    expect { subject.call(account, text: text, visibility: 'limited') }.to raise_exception ActiveRecord::RecordInvalid
+  end
+
+  it 'personal visibility with circle' do
+    account = Fabricate(:account)
+    circle = Fabricate(:circle, account: account)
+    text = 'This is an English text.'
+
+    status = subject.call(account, text: text, visibility: 'circle', circle_id: circle.id)
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'personal'
+    expect(status.mentioned_accounts.count).to eq 0
+  end
+
+  it 'using empty circle but with mention' do
+    account = Fabricate(:account)
+    Fabricate(:account, username: 'bob', domain: nil)
+    circle = Fabricate(:circle, account: account)
+    text = 'This is an English text. @bob'
+
+    status = subject.call(account, text: text, visibility: 'circle', circle_id: circle.id)
+
+    expect(status.visibility).to eq 'limited'
+    expect(status.limited_scope).to eq 'circle'
+    expect(status.mentioned_accounts.count).to eq 1
+  end
+
+  describe 'create a new response status to limited post' do
+    it 'when reply visibility' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      status = subject.call(account, text: text, thread: in_reply_to_status, visibility: 'reply')
+
+      expect(status).to be_persisted
+      expect(status.thread).to eq in_reply_to_status
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'reply'
+    end
+
+    it 'when limited visibility' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      status = subject.call(account, text: text, thread: in_reply_to_status, visibility: 'limited')
+
+      expect(status).to be_persisted
+      expect(status.thread).to eq in_reply_to_status
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'reply'
+    end
+
+    it 'when circle visibility' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      circle = Fabricate(:circle, account: account)
+      circle_account = Fabricate(:account)
+      circle_account.follow!(account)
+      circle.accounts << circle_account
+      circle.save!
+
+      status = subject.call(account, text: text, thread: in_reply_to_status, visibility: 'circle', circle_id: circle.id)
+
+      expect(status).to be_persisted
+      expect(status.thread).to eq in_reply_to_status
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'circle'
+      expect(status.mentioned_accounts.pluck(:id)).to eq [circle_account.id]
+    end
+
+    it 'when public visibility' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      status = subject.call(account, text: text, thread: in_reply_to_status, visibility: :public)
+
+      expect(status).to be_persisted
+      expect(status.thread).to eq in_reply_to_status
+      expect(status.visibility).to eq 'public'
+    end
+
+    it 'when direct visibility' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      status = subject.call(account, text: text, thread: in_reply_to_status, visibility: :direct)
+
+      expect(status).to be_persisted
+      expect(status.thread).to eq in_reply_to_status
+      expect(status.visibility).to eq 'direct'
+    end
+
+    it 'duplicate replies' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      in_reply_to_status.mentions.create!(account: Fabricate(:account))
+
+      status = subject.call(Fabricate(:user).account, text: 'Ohagi is good', thread: in_reply_to_status, visibility: 'reply')
+
+      thread_account_ids = [in_reply_to_status.account, in_reply_to_status.mentions.first.account].map(&:id)
+
+      expect(status).to be_persisted
+      expect(status.conversation_id).to eq in_reply_to_status.conversation_id
+      expect(status.conversation.ancestor_status_id).to eq in_reply_to_status.id
+      expect(status.mentions.pluck(:account_id)).to match_array thread_account_ids
+    end
+
+    it 'duplicate reply-to-reply' do
+      ancestor_account = Fabricate(:account, username: 'ancestor', domain: nil)
+      reply_account = Fabricate(:account)
+
+      first_status = Fabricate(:status, account: ancestor_account, visibility: :limited)
+      in_reply_to_status = subject.call(reply_account, text: 'Ohagi is good, @ancestor', thread: first_status, visibility: 'reply')
+      status = subject.call(ancestor_account, text: 'Ohagi is good', thread: in_reply_to_status, visibility: 'reply')
+
+      thread_account_ids = [ancestor_account, reply_account].map(&:id)
+
+      expect(status).to be_persisted
+      expect(status.conversation_id).to eq in_reply_to_status.conversation_id
+      expect(status.conversation_id).to eq first_status.conversation_id
+      expect(status.conversation.ancestor_status_id).to eq first_status.id
+      expect(status.mentions.pluck(:account_id)).to match_array thread_account_ids
+    end
+
+    it 'duplicate reply-to-third_reply' do
+      first_status = Fabricate(:status, visibility: :limited)
+      first_status.mentions.create!(account: Fabricate(:account))
+
+      mentioned_account = Fabricate(:account, username: 'ohagi', domain: nil)
+      mentioned_account2 = Fabricate(:account, username: 'bob', domain: nil)
+      in_reply_to_status = subject.call(Fabricate(:user).account, text: 'Ohagi is good, @ohagi', thread: first_status, visibility: 'reply')
+      status = subject.call(Fabricate(:user).account, text: 'Ohagi is good, @bob', thread: in_reply_to_status, visibility: 'reply')
+
+      thread_account_ids = [first_status.account, first_status.mentions.first.account, mentioned_account, mentioned_account2, in_reply_to_status.account].map(&:id)
+
+      expect(status).to be_persisted
+      expect(status.conversation_id).to eq in_reply_to_status.conversation_id
+      expect(status.conversation_id).to eq first_status.conversation_id
+      expect(status.conversation.ancestor_status_id).to eq first_status.id
+      expect(status.mentions.pluck(:account_id)).to match_array thread_account_ids
+    end
+
+    it 'do not duplicate replies when limited post' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      in_reply_to_status.mentions.create!(account: Fabricate(:account))
+
+      status = subject.call(Fabricate(:user).account, text: 'Ohagi is good', thread: in_reply_to_status, visibility: 'mutual')
+
+      [in_reply_to_status.account, in_reply_to_status.mentions.first.account].map(&:id)
+
+      expect(status).to be_persisted
+      expect(status.limited_scope).to eq 'personal'
+
+      mentions = status.mentions.pluck(:account_id)
+      expect(mentions).to_not include in_reply_to_status.account_id
+      expect(mentions).to_not include in_reply_to_status.mentions.first.account_id
+    end
+
+    it 'do not duplicate replies when not limited post' do
+      in_reply_to_status = Fabricate(:status, visibility: :limited)
+      in_reply_to_status.mentions.create!(account: Fabricate(:account))
+
+      status = subject.call(Fabricate(:user).account, text: 'Ohagi is good', thread: in_reply_to_status, visibility: 'public')
+
+      [in_reply_to_status.account, in_reply_to_status.mentions.first.account].map(&:id)
+
+      expect(status).to be_persisted
+
+      mentions = status.mentions.pluck(:account_id)
+      expect(mentions).to_not include in_reply_to_status.account_id
+      expect(mentions).to_not include in_reply_to_status.mentions.first.account_id
+    end
   end
 
   it 'safeguards mentions' do
@@ -150,7 +502,7 @@ RSpec.describe PostStatusService, type: :service do
 
     expect do
       subject.call(account, text: '@alice hm, @bob is really annoying lately', allowed_mentions: [mentioned_account.id])
-    end.to raise_error(an_instance_of(PostStatusService::UnexpectedMentionsError).and(having_attributes(accounts: [unexpected_mentioned_account])))
+    end.to raise_error(an_instance_of(described_class::UnexpectedMentionsError).and(having_attributes(accounts: [unexpected_mentioned_account])))
   end
 
   it 'processes duplicate mentions correctly' do
@@ -186,6 +538,19 @@ RSpec.describe PostStatusService, type: :service do
     expect(ActivityPub::DistributionWorker).to have_received(:perform_async).with(status.id)
   end
 
+  it 'gets distributed when personal post' do
+    allow(DistributionWorker).to receive(:perform_async)
+    allow(ActivityPub::DistributionWorker).to receive(:perform_async)
+
+    account = Fabricate(:account)
+
+    empty_circle = Fabricate(:circle, account: account)
+    status = subject.call(account, text: 'test status update', visibility: 'circle', circle_id: empty_circle.id)
+
+    expect(DistributionWorker).to have_received(:perform_async).with(status.id)
+    expect(ActivityPub::DistributionWorker).to_not have_received(:perform_async).with(status.id)
+  end
+
   it 'crawls links' do
     allow(LinkCrawlWorker).to receive(:perform_async)
     account = Fabricate(:account)
@@ -228,13 +593,7 @@ RSpec.describe PostStatusService, type: :service do
       subject.call(
         account,
         text: 'test status update',
-        media_ids: [
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-          Fabricate(:media_attachment, account: account),
-        ].map(&:id)
+        media_ids: Array.new(5) { Fabricate(:media_attachment, account: account) }.map(&:id)
       )
     end.to raise_error(
       Mastodon::ValidationError,
@@ -271,6 +630,270 @@ RSpec.describe PostStatusService, type: :service do
     expect(status2.id).to eq status1.id
   end
 
+  describe 'ng word is set' do
+    it 'hit ng words' do
+      account = Fabricate(:account)
+      text = 'ng word test'
+      Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+      expect { subject.call(account, text: text) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'not hit ng words' do
+      account = Fabricate(:account)
+      text = 'ng word aiueo'
+      Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'hit ng words for mention' do
+      account = Fabricate(:account)
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      expect { subject.call(account, text: text) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'hit ng words for mention but local posts are not checked' do
+      account = Fabricate(:account)
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '0').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'hit ng words for mention to follower' do
+      account = Fabricate(:account)
+      mentioned = Fabricate(:account, username: 'ohagi', domain: nil)
+      mentioned.follow!(account)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'does not hit ng words for mention to self' do
+      account = Fabricate(:account, username: 'cool', domain: nil)
+      text = 'ng word test @cool'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'hit ng words for reply' do
+      account = Fabricate(:account)
+      text = 'ng word test'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      expect { subject.call(account, text: text, thread: Fabricate(:status)) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'hit ng words for reply to follower' do
+      account = Fabricate(:account)
+      mentioned = Fabricate(:account, username: 'ohagi', domain: nil)
+      mentioned.follow!(account)
+      text = 'ng word test'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'with a reference' do
+      target_status = Fabricate(:status)
+      account = Fabricate(:account)
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = "ref BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+      expect(status.references.pluck(:id)).to include target_status.id
+    end
+
+    it 'hit ng words for reference' do
+      target_status = Fabricate(:status)
+      account = Fabricate(:account)
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      expect { subject.call(account, text: text) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'hit ng words for reference to follower' do
+      target_status = Fabricate(:status)
+      account = Fabricate(:account)
+      target_status.account.follow!(account)
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'does not hit ng words for reference to self' do
+      target_status = Fabricate(:status)
+      account = target_status.account
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test', stranger: true)
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'using hashtag under limit' do
+      account = Fabricate(:account)
+      text = '#a #b'
+      Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.tags.count).to eq 2
+      expect(status.text).to eq text
+    end
+
+    it 'using hashtag over limit' do
+      account = Fabricate(:account)
+      text = '#a #b #c'
+      Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+      expect { subject.call(account, text: text) }.to raise_error Mastodon::ValidationError
+    end
+
+    it 'using mentions under limit' do
+      a = Fabricate(:account, username: 'a')
+      b = Fabricate(:account, username: 'b')
+      account = Fabricate(:account)
+      a.follow!(account)
+      b.follow!(account)
+      text = '@a @b'
+      Form::AdminSettings.new(post_mentions_max: 2).save
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'using mentions over limit' do
+      a = Fabricate(:account, username: 'a')
+      b = Fabricate(:account, username: 'b')
+      account = Fabricate(:account)
+      a.follow!(account)
+      b.follow!(account)
+      text = '@a @b'
+      Form::AdminSettings.new(post_mentions_max: 1).save
+
+      expect { subject.call(account, text: text) }.to raise_error Mastodon::ValidationError
+    end
+
+    it 'using mentions for stranger under limit' do
+      Fabricate(:account, username: 'a')
+      Fabricate(:account, username: 'b')
+      account = Fabricate(:account)
+      text = '@a @b'
+      Form::AdminSettings.new(post_stranger_mentions_max: 2).save
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'using mentions for stranger over limit' do
+      Fabricate(:account, username: 'a')
+      Fabricate(:account, username: 'b')
+      account = Fabricate(:account)
+      text = '@a @b'
+      Form::AdminSettings.new(post_stranger_mentions_max: 1).save
+
+      expect { subject.call(account, text: text) }.to raise_error Mastodon::ValidationError
+    end
+
+    it 'using mentions for stranger over limit but normal setting is under limit' do
+      a = Fabricate(:account, username: 'a')
+      b = Fabricate(:account, username: 'b')
+      account = Fabricate(:account)
+      a.follow!(account)
+      b.follow!(account)
+      text = '@a @b'
+      Form::AdminSettings.new(post_mentions_max: 2, post_stranger_mentions_max: 1).save
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'using mentions for stranger over limit but normal setting is under limit when following one only' do
+      a = Fabricate(:account, username: 'a')
+      b = Fabricate(:account, username: 'b')
+      Fabricate(:account, username: 'c')
+      account = Fabricate(:account)
+      a.follow!(account)
+      b.follow!(account)
+      text = '@a @b @c'
+      Form::AdminSettings.new(post_mentions_max: 3, post_stranger_mentions_max: 2).save
+
+      expect { subject.call(account, text: text) }.to raise_error Mastodon::ValidationError
+    end
+  end
+
+  describe 'ng rule is set' do
+    it 'creates a new status when no rule matches' do
+      Fabricate(:ng_rule, account_username: 'ohagi', status_allow_follower_mention: false)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      status = subject.call(account, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'does not create a new status when a rule matches' do
+      Fabricate(:ng_rule, status_text: 'test', status_allow_follower_mention: false)
+      account = Fabricate(:account)
+      text = 'test status update'
+
+      expect { subject.call(account, text: text) }.to raise_error Mastodon::ValidationError
+    end
+  end
+
   def create_status_with_options(**options)
     subject.call(Fabricate(:account), options.merge(text: 'test'))
   end
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 663babae8a..9b2c6c280f 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe PrecomputeFeedService, type: :service do
+RSpec.describe PrecomputeFeedService do
   subject { described_class.new }
 
   describe 'call' do
diff --git a/spec/services/process_hashtags_service_spec.rb b/spec/services/process_hashtags_service_spec.rb
new file mode 100644
index 0000000000..a0d5ef3464
--- /dev/null
+++ b/spec/services/process_hashtags_service_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ProcessHashtagsService do
+  describe '#call' do
+    let(:status) { Fabricate(:status, visibility: :public, text: 'With tags #one #two') }
+
+    it 'applies the tags from the status text' do
+      expect { subject.call(status) }
+        .to change(Tag, :count).by(2)
+      expect(status.reload.tags.map(&:name))
+        .to contain_exactly('one', 'two')
+    end
+  end
+end
diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb
index 0db73c41fa..7a318faa1e 100644
--- a/spec/services/process_mentions_service_spec.rb
+++ b/spec/services/process_mentions_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ProcessMentionsService, type: :service do
+RSpec.describe ProcessMentionsService do
   subject { described_class.new }
 
   let(:account) { Fabricate(:account, username: 'alice') }
@@ -103,4 +103,27 @@ RSpec.describe ProcessMentionsService, type: :service do
       end
     end
   end
+
+  context 'with circle post' do
+    let(:status) { Fabricate(:status, account: account) }
+    let(:circle) { Fabricate(:circle, account: account) }
+    let(:follower) { Fabricate(:account) }
+    let(:other) { Fabricate(:account) }
+
+    before do
+      follower.follow!(account)
+      other.follow!(account)
+      circle.accounts << follower
+      described_class.new.call(status, limited_type: :circle, circle: circle)
+    end
+
+    it 'remains circle post on history' do
+      expect(CircleStatus.exists?(circle_id: circle.id, status_id: status.id)).to be true
+    end
+
+    it 'post is delivered to circle members' do
+      expect(status.mentioned_accounts.count).to eq 1
+      expect(status.mentioned_accounts.first.id).to eq follower.id
+    end
+  end
 end
diff --git a/spec/services/process_references_service_spec.rb b/spec/services/process_references_service_spec.rb
new file mode 100644
index 0000000000..d54d5e6bd9
--- /dev/null
+++ b/spec/services/process_references_service_spec.rb
@@ -0,0 +1,464 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ProcessReferencesService, type: :service do
+  let(:text) { 'Hello' }
+  let(:account) { Fabricate(:user).account }
+  let(:visibility) { :public }
+  let(:target_status_visibility) { :public }
+  let(:status) { Fabricate(:status, account: account, text: text, visibility: visibility) }
+  let(:target_status) { Fabricate(:status, account: Fabricate(:user).account, visibility: target_status_visibility) }
+  let(:target_status_uri) { ActivityPub::TagManager.instance.uri_for(target_status) }
+  let(:quote_urls) { nil }
+  let(:allow_quote) { true }
+
+  def notify?(target_status_id = nil)
+    target_status_id ||= target_status.id
+    StatusReference.exists?(id: Notification.where(type: 'status_reference').select(:activity_id), target_status_id: target_status_id)
+  end
+
+  describe 'posting new status' do
+    subject do
+      target_status.account.user.settings['allow_quote'] = false unless allow_quote
+      target_status.account.user&.save
+
+      described_class.new.call(status, reference_parameters, urls: urls, fetch_remote: fetch_remote, quote_urls: quote_urls)
+      status.reference_objects.pluck(:target_status_id, :attribute_type)
+    end
+
+    let(:reference_parameters) { [] }
+    let(:urls) { [] }
+    let(:fetch_remote) { true }
+
+    context 'when a simple case' do
+      let(:text) { "Hello RT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'RT'
+        expect(notify?).to be true
+      end
+
+      it 'not quote', :sidekiq_inline do
+        expect(status.quote).to be_nil
+      end
+    end
+
+    context 'when multiple references' do
+      let(:target_status2) { Fabricate(:status) }
+      let(:target_status2_uri) { ActivityPub::TagManager.instance.uri_for(target_status2) }
+      let(:text) { "Hello RT #{target_status_uri}\nBT #{target_status2_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 2
+        expect(subject).to include [target_status.id, 'RT']
+        expect(subject).to include [target_status2.id, 'BT']
+        expect(notify?).to be true
+        expect(notify?(target_status2.id)).to be true
+      end
+    end
+
+    context 'when private post' do
+      let(:text) { "Hello RT #{target_status_uri}" }
+      let(:visibility) { :private }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'RT'
+        expect(notify?).to be false
+      end
+    end
+
+    context 'when cannot show private post' do
+      let(:text) { "Hello RT #{target_status_uri}" }
+      let(:target_status_visibility) { :private }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 0
+        expect(notify?).to be false
+      end
+    end
+
+    context 'with quote' do
+      let(:text) { "Hello QT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'QT'
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?).to be true
+      end
+    end
+
+    context 'with quote as parameter only' do
+      let(:text) { 'Hello' }
+      let(:quote_urls) { [ActivityPub::TagManager.instance.uri_for(target_status)] }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'QT'
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?).to be true
+      end
+    end
+
+    context 'with quote as parameter and embed' do
+      let(:text) { "Hello QT #{target_status_uri}" }
+      let(:quote_urls) { [ActivityPub::TagManager.instance.uri_for(target_status)] }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'QT'
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?).to be true
+      end
+    end
+
+    context 'with quote as parameter but embed is not quote' do
+      let(:text) { "Hello RE #{target_status_uri}" }
+      let(:quote_urls) { [ActivityPub::TagManager.instance.uri_for(target_status)] }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'QT'
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?).to be true
+      end
+    end
+
+    context 'when quote is rejected' do
+      let(:text) { "Hello QT #{target_status_uri}" }
+      let(:allow_quote) { false }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject.pluck(0)).to include target_status.id
+        expect(subject.pluck(1)).to include 'BT'
+        expect(status.quote).to be_nil
+        expect(notify?).to be true
+      end
+    end
+
+    context 'with quote and reference' do
+      let(:target_status2) { Fabricate(:status) }
+      let(:target_status2_uri) { ActivityPub::TagManager.instance.uri_for(target_status2) }
+      let(:text) { "Hello QT #{target_status_uri}\nBT #{target_status2_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 2
+        expect(subject).to include [target_status.id, 'QT']
+        expect(subject).to include [target_status2.id, 'BT']
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?).to be true
+        expect(notify?(target_status2.id)).to be true
+      end
+    end
+
+    context 'when url only' do
+      let(:text) { "Hello #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 0
+        expect(notify?).to be false
+      end
+    end
+
+    context 'with fetch is blocked by admin' do
+      let(:text) { 'Hello RT https://web.example.com/note' }
+
+      before do
+        Setting.stop_fetch_activity_domains = ['web.example.com']
+        stub_request(:get, 'https://web.example.com/note').to_return(status: 404)
+      end
+
+      context 'when the post is known' do
+        let(:target_status) { Fabricate(:status, uri: 'https://example.com/note', url: 'https://web.example.com/note') }
+
+        it 'post status', :sidekiq_inline do
+          expect(subject.size).to eq 1
+          expect(subject.pluck(0)).to include target_status.id
+          expect(subject.pluck(1)).to include 'RT'
+          expect(notify?).to be true
+        end
+      end
+
+      context 'when the post is unknown' do
+        it 'post status', :sidekiq_inline do
+          expect(subject.size).to eq 0
+          expect(a_request(:get, 'https://web.example.com/note')).to_not have_been_made
+        end
+      end
+    end
+
+    context 'when unfetched remote post' do
+      let(:account) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+      let(:object_json) do
+        {
+          id: 'https://example.com/test_post',
+          to: ActivityPub::TagManager::COLLECTIONS[:public],
+          '@context': ActivityPub::TagManager::CONTEXT,
+          type: 'Note',
+          actor: account.uri,
+          attributedTo: account.uri,
+          content: 'Lorem ipsum',
+          published: '2022-01-22T15:00:00Z',
+          updated: '2022-01-22T16:00:00Z',
+        }
+      end
+      let(:text) { 'BT:https://example.com/test_post' }
+
+      before do
+        stub_request(:get, 'https://example.com/test_post').to_return(status: 200, body: Oj.dump(object_json), headers: { 'Content-Type' => 'application/activity+json' })
+        stub_request(:get, 'https://example.com/not_found').to_return(status: 404)
+      end
+
+      it 'reference it', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject[0][1]).to eq 'BT'
+
+        status = Status.find_by(id: subject[0][0])
+        expect(status).to_not be_nil
+        expect(status.url).to eq 'https://example.com/test_post'
+      end
+
+      context 'with fetch_remote later' do
+        let(:fetch_remote) { false }
+
+        it 'reference it', :sidekiq_inline do
+          ids = subject.pluck(0)
+          expect(ids.size).to eq 1
+
+          status = Status.find_by(id: ids[0])
+          expect(status).to_not be_nil
+          expect(status.url).to eq 'https://example.com/test_post'
+        end
+      end
+
+      context 'with fetch_remote later with has existing reference' do
+        let(:fetch_remote) { false }
+        let(:text) { "RT #{ActivityPub::TagManager.instance.uri_for(target_status)} BT https://example.com/test_post" }
+
+        it 'reference it', :sidekiq_inline do
+          expect(subject.size).to eq 2
+          expect(subject).to include [target_status.id, 'RT']
+          expect(subject.pluck(1)).to include 'BT'
+
+          status = Status.find_by(id: subject.pluck(0), uri: 'https://example.com/test_post')
+          expect(status).to_not be_nil
+        end
+      end
+
+      context 'with not exists reference' do
+        let(:text) { 'BT https://example.com/not_found' }
+
+        it 'reference it', :sidekiq_inline do
+          expect(subject.size).to eq 0
+        end
+      end
+    end
+
+    context 'when already fetched remote post' do
+      let(:account) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+      let!(:remote_status) { Fabricate(:status, account: account, uri: 'https://example.com/test_post', url: 'https://example.com/test_post', text: 'Lorem ipsum') }
+      let(:object_json) do
+        {
+          id: 'https://example.com/test_post',
+          to: ActivityPub::TagManager::COLLECTIONS[:public],
+          '@context': ActivityPub::TagManager::CONTEXT,
+          type: 'Note',
+          actor: account.uri,
+          attributedTo: account.uri,
+          content: 'Lorem ipsum',
+        }
+      end
+      let(:text) { 'BT:https://example.com/test_post' }
+
+      shared_examples 'reference once' do |uri, url|
+        it 'reference it', :sidekiq_inline do
+          expect(subject.size).to eq 1
+          expect(subject[0][1]).to eq 'BT'
+
+          status = Status.find_by(id: subject[0][0])
+          expect(status).to_not be_nil
+          expect(status.id).to eq remote_status.id
+          expect(status.uri).to eq uri
+          expect(status.url).to eq url
+        end
+      end
+
+      before do
+        stub_request(:get, 'https://example.com/test_post').to_return(status: 200, body: Oj.dump(object_json), headers: { 'Content-Type' => 'application/activity+json' })
+      end
+
+      it_behaves_like 'reference once', 'https://example.com/test_post', 'https://example.com/test_post'
+
+      context 'when uri and url is difference and url is not accessable' do
+        let(:remote_status) { Fabricate(:status, account: account, uri: 'https://example.com/test_post', url: 'https://example.com/test_post_ohagi', text: 'Lorem ipsum') }
+        let(:text) { 'BT:https://example.com/test_post_ohagi' }
+        let(:object_json) do
+          {
+            id: 'https://example.com/test_post',
+            url: 'https://example.com/test_post_ohagi',
+            to: ActivityPub::TagManager::COLLECTIONS[:public],
+            '@context': ActivityPub::TagManager::CONTEXT,
+            type: 'Note',
+            actor: account.uri,
+            attributedTo: account.uri,
+            content: 'Lorem ipsum',
+          }
+        end
+
+        before do
+          stub_request(:get, 'https://example.com/test_post_ohagi').to_return(status: 404)
+        end
+
+        it_behaves_like 'reference once', 'https://example.com/test_post', 'https://example.com/test_post_ohagi'
+
+        it 'do not request to uri', :sidekiq_inline do
+          subject
+          expect(a_request(:get, 'https://example.com/test_post_ohagi')).to_not have_been_made
+        end
+
+        context 'when url and uri is specified at the same time' do
+          let(:text) { 'BT:https://example.com/test_post_ohagi BT:https://example.com/test_post' }
+
+          it_behaves_like 'reference once', 'https://example.com/test_post', 'https://example.com/test_post_ohagi'
+        end
+      end
+    end
+  end
+
+  describe 'editing new status' do
+    subject do
+      status.update!(text: new_text)
+      described_class.new.call(status, reference_parameters, urls: urls, fetch_remote: fetch_remote)
+      status.references.pluck(:id)
+    end
+
+    let(:target_status2) { Fabricate(:status, account: Fabricate(:user).account) }
+    let(:target_status2_uri) { ActivityPub::TagManager.instance.uri_for(target_status2) }
+
+    let(:new_text) { 'Hello' }
+    let(:reference_parameters) { [] }
+    let(:urls) { [] }
+    let(:fetch_remote) { true }
+
+    before do
+      described_class.new.call(status, reference_parameters, urls: urls, fetch_remote: fetch_remote)
+    end
+
+    context 'when add reference to empty' do
+      let(:new_text) { "BT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status.id
+        expect(notify?).to be true
+      end
+    end
+
+    context 'when add reference to have anyone' do
+      let(:text) { "BT #{target_status_uri}" }
+      let(:new_text) { "BT #{target_status_uri}\nBT #{target_status2_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 2
+        expect(subject).to include target_status.id
+        expect(subject).to include target_status2.id
+        expect(notify?(target_status2.id)).to be true
+      end
+    end
+
+    context 'when add reference but has same' do
+      let(:text) { "BT #{target_status_uri}" }
+      let(:new_text) { "BT #{target_status_uri}\nBT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status.id
+      end
+    end
+
+    context 'when remove reference' do
+      let(:text) { "BT #{target_status_uri}" }
+      let(:new_text) { 'Hello' }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 0
+        expect(notify?).to be false
+      end
+    end
+
+    context 'when remove quote' do
+      let(:text) { "QT #{target_status_uri}" }
+      let(:new_text) { 'Hello' }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 0
+        expect(status.quote).to be_nil
+        expect(notify?).to be false
+      end
+    end
+
+    context 'when change reference' do
+      let(:text) { "BT #{target_status_uri}" }
+      let(:new_text) { "BT #{target_status2_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status2.id
+        expect(notify?(target_status2.id)).to be true
+      end
+    end
+
+    context 'when change quote' do
+      let(:text) { "QT #{target_status_uri}" }
+      let(:new_text) { "QT #{target_status2_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status2.id
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status2.id
+        expect(notify?(target_status2.id)).to be true
+      end
+    end
+
+    context 'when change quote to reference' do
+      let(:text) { "QT #{target_status_uri}" }
+      let(:new_text) { "RT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status.id
+        expect(status.quote).to be_nil
+        expect(notify?(target_status.id)).to be true
+      end
+    end
+
+    context 'when change reference to quote' do
+      let(:text) { "RT #{target_status_uri}" }
+      let(:new_text) { "QT #{target_status_uri}" }
+
+      it 'post status', :sidekiq_inline do
+        expect(subject.size).to eq 1
+        expect(subject).to include target_status.id
+        expect(status.quote).to_not be_nil
+        expect(status.quote.id).to eq target_status.id
+        expect(notify?(target_status.id)).to be true
+      end
+    end
+  end
+end
diff --git a/spec/services/purge_domain_service_spec.rb b/spec/services/purge_domain_service_spec.rb
index e96618310b..a5c49160db 100644
--- a/spec/services/purge_domain_service_spec.rb
+++ b/spec/services/purge_domain_service_spec.rb
@@ -2,28 +2,28 @@
 
 require 'rails_helper'
 
-RSpec.describe PurgeDomainService, type: :service do
+RSpec.describe PurgeDomainService do
   subject { described_class.new }
 
-  let!(:old_account) { Fabricate(:account, domain: 'obsolete.org') }
-  let!(:old_status_plain) { Fabricate(:status, account: old_account) }
-  let!(:old_status_with_attachment) { Fabricate(:status, account: old_account) }
-  let!(:old_attachment) { Fabricate(:media_attachment, account: old_account, status: old_status_with_attachment, file: attachment_fixture('attachment.jpg')) }
+  let(:domain) { 'obsolete.org' }
+  let!(:account) { Fabricate(:account, domain: domain) }
+  let!(:status_plain) { Fabricate(:status, account: account) }
+  let!(:status_with_attachment) { Fabricate(:status, account: account) }
+  let!(:attachment) { Fabricate(:media_attachment, account: account, status: status_with_attachment, file: attachment_fixture('attachment.jpg')) }
 
   describe 'for a suspension' do
-    before do
-      subject.call('obsolete.org')
+    it 'refreshes instance view and removes associated records' do
+      expect { subject.call(domain) }
+        .to change { domain_instance_exists }.from(true).to(false)
+
+      expect { account.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
     end
 
-    it 'removes the remote accounts\'s statuses and media attachments' do
-      expect { old_account.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
-    end
-
-    it 'refreshes instances view' do
-      expect(Instance.where(domain: 'obsolete.org').exists?).to be false
+    def domain_instance_exists
+      Instance.exists?(domain: domain)
     end
   end
 end
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index 357b315af0..8f9d3cdfc9 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ReblogService, type: :service do
+RSpec.describe ReblogService do
   let(:alice)  { Fabricate(:account, username: 'alice') }
 
   context 'when creates a reblog with appropriate visibility' do
@@ -16,6 +16,10 @@ RSpec.describe ReblogService, type: :service do
       subject.call(alice, status, visibility: reblog_visibility)
     end
 
+    it 'a simple case reblogs publicly' do
+      expect(status.reblogs.first.visibility).to eq 'public'
+    end
+
     describe 'boosting privately' do
       let(:reblog_visibility) { :private }
 
@@ -34,6 +38,65 @@ RSpec.describe ReblogService, type: :service do
     end
   end
 
+  context 'when public visibility is disabled' do
+    subject { described_class.new }
+
+    let(:status) { Fabricate(:status, account: alice, visibility: :public) }
+
+    before do
+      Setting.enable_public_visibility = false
+      subject.call(alice, status, visibility: :public)
+    end
+
+    it 'reblogs as public unlisted' do
+      expect(status.reblogs.first.visibility).to eq 'public_unlisted'
+    end
+  end
+
+  context 'when public unlisted visibility is disabled' do
+    subject { described_class.new }
+
+    let(:status) { Fabricate(:status, account: alice, visibility: :public) }
+
+    before do
+      Setting.enable_public_unlisted_visibility = false
+      subject.call(alice, status, visibility: :public_unlisted)
+    end
+
+    it 'reblogs as public unlisted' do
+      expect(status.reblogs.first.visibility).to eq 'unlisted'
+    end
+  end
+
+  context 'with ng rule' do
+    subject { described_class.new }
+
+    let(:status) { Fabricate(:status, account: alice, visibility: :public) }
+    let(:account) { Fabricate(:account) }
+
+    context 'when rule matches' do
+      before do
+        Fabricate(:ng_rule, reaction_type: ['reblog'])
+      end
+
+      it 'does not reblog' do
+        expect { subject.call(account, status) }.to raise_error Mastodon::ValidationError
+        expect(account.reblogged?(status)).to be false
+      end
+    end
+
+    context 'when rule does not match' do
+      before do
+        Fabricate(:ng_rule, account_display_name: 'else', reaction_type: ['reblog'])
+      end
+
+      it 'reblogs' do
+        expect { subject.call(account, status) }.to_not raise_error
+        expect(account.reblogged?(status)).to be true
+      end
+    end
+  end
+
   context 'when the reblogged status is discarded in the meantime' do
     let(:status) { Fabricate(:status, account: alice, visibility: :public, text: 'discard-status-text') }
 
@@ -46,7 +109,7 @@ RSpec.describe ReblogService, type: :service do
           Status
             .where(id: reblog_of_id)
             .where(text: 'discard-status-text')
-            .update_all(deleted_at: Time.now.utc) # rubocop:disable Rails/SkipsModelValidations
+            .update_all(deleted_at: Time.now.utc)
         end
       end
     end
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index 48316a6c4d..98aaf70478 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RejectFollowService, type: :service do
+RSpec.describe RejectFollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/remove_domains_from_followers_service_spec.rb b/spec/services/remove_domains_from_followers_service_spec.rb
new file mode 100644
index 0000000000..9e9d6cef2d
--- /dev/null
+++ b/spec/services/remove_domains_from_followers_service_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RemoveDomainsFromFollowersService do
+  describe '#call' do
+    context 'with account followers' do
+      let(:account) { Fabricate(:account, domain: nil) }
+      let(:good_domain_account) { Fabricate(:account, domain: 'good.example', protocol: :activitypub) }
+      let(:bad_domain_account) { Fabricate(:account, domain: 'bad.example', protocol: :activitypub) }
+
+      before do
+        Fabricate :follow, target_account: account, account: good_domain_account
+        Fabricate :follow, target_account: account, account: bad_domain_account
+      end
+
+      it 'removes followers from supplied domains and sends a notification' do
+        subject.call(account, ['bad.example'])
+
+        expect(account.followers)
+          .to include(good_domain_account)
+          .and not_include(bad_domain_account)
+        expect(ActivityPub::DeliveryWorker)
+          .to have_enqueued_sidekiq_job(anything, account.id, bad_domain_account.inbox_url)
+      end
+    end
+  end
+end
diff --git a/spec/services/remove_featured_tag_service_spec.rb b/spec/services/remove_featured_tag_service_spec.rb
new file mode 100644
index 0000000000..2f0694bc65
--- /dev/null
+++ b/spec/services/remove_featured_tag_service_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RemoveFeaturedTagService do
+  describe '#call' do
+    context 'with a featured tag' do
+      let(:featured_tag) { Fabricate(:featured_tag) }
+
+      context 'when called by a local account' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'destroys the featured tag and sends a distribution' do
+          subject.call(account, featured_tag)
+
+          expect { featured_tag.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::AccountRawDistributionWorker)
+            .to have_enqueued_sidekiq_job(anything, account.id)
+        end
+      end
+
+      context 'when called by a non local account' do
+        let(:account) { Fabricate(:account, domain: 'host.example') }
+
+        it 'destroys the featured tag and does not send a distribution' do
+          subject.call(account, featured_tag)
+
+          expect { featured_tag.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::AccountRawDistributionWorker)
+            .to_not have_enqueued_sidekiq_job(any_args)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index 21da38a97b..d6420f7674 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveFromFollowersService, type: :service do
+RSpec.describe RemoveFromFollowersService do
   subject { described_class.new }
 
   let(:bob) { Fabricate(:account, username: 'bob') }
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 109acfb09a..dd92584eb0 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -2,18 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
+RSpec.describe RemoveStatusService, :sidekiq_inline do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
   let!(:jeff)   { Fabricate(:account) }
-  let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
-  let!(:bill)   { Fabricate(:account, username: 'bill', protocol: :activitypub, domain: 'example2.com', inbox_url: 'http://example2.com/inbox') }
+  let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', shared_inbox_url: 'http://example.com/inbox', inbox_url: 'http://example.com/hank/inbox') }
+  let!(:bill)   { Fabricate(:account, username: 'bill', protocol: :activitypub, domain: 'example2.com', shared_inbox_url: 'http://example2.com/inbox', inbox_url: 'http://example2.com/bill/inbox') }
 
   before do
     stub_request(:post, hank.inbox_url).to_return(status: 200)
+    stub_request(:post, hank.shared_inbox_url).to_return(status: 200)
     stub_request(:post, bill.inbox_url).to_return(status: 200)
+    stub_request(:post, bill.shared_inbox_url).to_return(status: 200)
 
     jeff.follow!(alice)
     hank.follow!(alice)
@@ -48,7 +50,7 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
 
     it 'sends Delete activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
+      expect(a_request(:post, hank.shared_inbox_url).with(
                body: hash_including({
                  'type' => 'Delete',
                  'object' => {
@@ -62,7 +64,7 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
 
     it 'sends Delete activity to rebloggers' do
       subject.call(status)
-      expect(a_request(:post, bill.inbox_url).with(
+      expect(a_request(:post, bill.shared_inbox_url).with(
                body: hash_including({
                  'type' => 'Delete',
                  'object' => {
@@ -81,13 +83,76 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
     end
   end
 
+  context 'when removed status is null-searchability' do
+    let(:status) { PostStatusService.new.call(alice, visibility: 'unlisted', text: 'Public post') }
+
+    before do
+      status.update!(searchability: nil)
+    end
+
+    it 'does not throw error' do
+      expect { subject.call(status) }.to_not raise_error
+    end
+  end
+
+  context 'when removed status is limited' do
+    let(:status) { PostStatusService.new.call(alice, visibility: 'mutual', text: 'limited post') }
+
+    before do
+      status.mentions << Fabricate(:mention, account: hank, silent: true)
+    end
+
+    it 'sends Delete activity to followers' do
+      subject.call(status)
+      expect(a_request(:post, hank.shared_inbox_url).with(
+               body: hash_including({
+                 'type' => 'Delete',
+                 'object' => {
+                   'type' => 'Tombstone',
+                   'id' => ActivityPub::TagManager.instance.uri_for(status),
+                   'atomUri' => OStatus::TagManager.instance.uri_for(status),
+                 },
+               })
+             )).to have_been_made.once
+    end
+  end
+
+  context 'when removed status is limited and remote conversation' do
+    let(:status) { PostStatusService.new.call(alice, visibility: 'mutual', text: 'limited post') }
+
+    before do
+      status.conversation.update(uri: 'http://example2.com/conversation', inbox_url: 'http://example2.com/bill/inbox')
+      status.mentions << Fabricate(:mention, account: hank, silent: true)
+    end
+
+    it 'sends Delete activity to conversation' do
+      subject.call(status)
+      expect(a_request(:post, bill.inbox_url).with(
+               body: hash_including({
+                 'type' => 'Delete',
+                 'object' => {
+                   'type' => 'Tombstone',
+                   'id' => ActivityPub::TagManager.instance.uri_for(status),
+                   'atomUri' => OStatus::TagManager.instance.uri_for(status),
+                 },
+               })
+             )).to have_been_made.once
+    end
+
+    it 'do not send Delete activity to followers', :sidekiq_inline do
+      subject.call(status)
+      expect(a_request(:post, hank.inbox_url)).to_not have_been_made
+      expect(a_request(:post, hank.shared_inbox_url)).to_not have_been_made
+    end
+  end
+
   context 'when removed status is a private self-reblog' do
     let!(:original_status) { Fabricate(:status, account: alice, text: 'Hello ThisIsASecret', visibility: :private) }
     let!(:status) { ReblogService.new.call(alice, original_status) }
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
+      expect(a_request(:post, hank.shared_inbox_url).with(
                body: hash_including({
                  'type' => 'Undo',
                  'object' => hash_including({
@@ -105,7 +170,7 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, hank.inbox_url).with(
+      expect(a_request(:post, hank.shared_inbox_url).with(
                body: hash_including({
                  'type' => 'Undo',
                  'object' => hash_including({
@@ -123,7 +188,7 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, bill.inbox_url).with(
+      expect(a_request(:post, bill.shared_inbox_url).with(
                body: hash_including({
                  'type' => 'Undo',
                  'object' => hash_including({
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 39e14a6a1c..d77d8904db 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ReportService, type: :service do
+RSpec.describe ReportService do
   subject { described_class.new }
 
   let(:source_account) { Fabricate(:account) }
@@ -53,7 +53,7 @@ RSpec.describe ReportService, type: :service do
         end
 
         context 'when forward_to_domains includes only the replied-to domain' do
-          it 'sends ActivityPub payload only to the author of the replied-to post' do
+          it 'sends ActivityPub payload only to the author of the replied-to post', :sidekiq_inline do
             subject.call(source_account, remote_account, status_ids: [reported_status.id], forward: forward, forward_to_domains: [remote_thread_account.domain])
             expect(a_request(:post, 'http://foo.com/inbox')).to have_been_made
             expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
@@ -61,7 +61,7 @@ RSpec.describe ReportService, type: :service do
         end
 
         context 'when forward_to_domains does not include the replied-to domain' do
-          it 'does not send ActivityPub payload to the author of the replied-to post' do
+          it 'does not send ActivityPub payload to the author of the replied-to post', :sidekiq_inline do
             subject.call(source_account, remote_account, status_ids: [reported_status.id], forward: forward)
             expect(a_request(:post, 'http://foo.com/inbox')).to_not have_been_made
           end
@@ -89,7 +89,7 @@ RSpec.describe ReportService, type: :service do
     end
 
     context 'when forward is false' do
-      it 'does not send anything' do
+      it 'does not send anything', :sidekiq_inline do
         subject.call(source_account, remote_account, forward: forward)
         expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
       end
@@ -158,13 +158,14 @@ RSpec.describe ReportService, type: :service do
 
     before do
       Fabricate(:report, target_account: target_account)
-      ActionMailer::Base.deliveries.clear
       source_account.user.settings['notification_emails.report'] = true
       source_account.user.save
     end
 
     it 'does not send an e-mail' do
-      expect { subject.call }.to_not change(ActionMailer::Base.deliveries, :count).from(0)
+      emails = capture_emails { subject.call }
+
+      expect(emails).to be_empty
     end
   end
 end
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 1c4c3b4016..9e05eb09af 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -2,17 +2,19 @@
 
 require 'rails_helper'
 
-RSpec.describe ResolveAccountService, type: :service do
+RSpec.describe ResolveAccountService do
   subject { described_class.new }
 
   before do
     stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(status: 404)
     stub_request(:get, 'https://quitter.no/avatar/7477-300-20160211190340.png').to_return(request_fixture('avatar.txt'))
     stub_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com').to_return(request_fixture('activitypub-webfinger.txt'))
+    stub_request(:get, 'https://ap.example.com/.well-known/nodeinfo').to_return(body: '{}')
     stub_request(:get, 'https://ap.example.com/users/foo').to_return(request_fixture('activitypub-actor.txt'))
     stub_request(:get, 'https://ap.example.com/users/foo.atom').to_return(request_fixture('activitypub-feed.txt'))
     stub_request(:get, %r{https://ap\.example\.com/users/foo/\w+}).to_return(status: 404)
     stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:hoge@example.com').to_return(status: 410)
+    stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 410)
   end
 
   context 'when using skip_webfinger' do
@@ -135,8 +137,10 @@ RSpec.describe ResolveAccountService, type: :service do
     before do
       webfinger = { subject: 'acct:foo@evil.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
       stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+      stub_request(:get, 'https://redirected.example.com/.well-known/nodeinfo').to_return(body: '{}')
       webfinger2 = { subject: 'acct:foo@ap.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo', type: 'application/activity+json' }] }
       stub_request(:get, 'https://evil.example.com/.well-known/webfinger?resource=acct:foo@evil.example.com').to_return(body: Oj.dump(webfinger2), headers: { 'Content-Type': 'application/jrd+json' })
+      stub_request(:get, 'https://evil.example.com/.well-known/nodeinfo').to_return(body: '{}')
     end
 
     it 'does not return a new remote account' do
@@ -219,27 +223,19 @@ RSpec.describe ResolveAccountService, type: :service do
   end
 
   it 'processes one remote account at a time using locks' do
-    wait_for_start = true
     fail_occurred  = false
     return_values  = Concurrent::Array.new
 
-    threads = Array.new(5) do
-      Thread.new do
-        true while wait_for_start
-
-        begin
-          return_values << described_class.new.call('foo@ap.example.com')
-        rescue ActiveRecord::RecordNotUnique
-          fail_occurred = true
-        ensure
-          RedisConfiguration.pool.checkin if Thread.current[:redis]
-        end
+    multi_threaded_execution(5) do
+      begin
+        return_values << described_class.new.call('foo@ap.example.com')
+      rescue ActiveRecord::RecordNotUnique
+        fail_occurred = true
+      ensure
+        RedisConfiguration.pool.checkin if Thread.current[:redis]
       end
     end
 
-    wait_for_start = false
-    threads.each(&:join)
-
     expect(fail_occurred).to be false
     expect(return_values).to_not include(nil)
   end
diff --git a/spec/services/resolve_url_service_spec.rb b/spec/services/resolve_url_service_spec.rb
index bcfb9dbfb0..3d59a55f10 100644
--- a/spec/services/resolve_url_service_spec.rb
+++ b/spec/services/resolve_url_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ResolveURLService, type: :service do
+describe ResolveURLService do
   subject { described_class.new }
 
   describe '#call' do
@@ -139,6 +139,7 @@ describe ResolveURLService, type: :service do
         stub_request(:get, url).to_return(status: 302, headers: { 'Location' => status_url })
         body = ActiveModelSerializers::SerializableResource.new(status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter).to_json
         stub_request(:get, status_url).to_return(body: body, headers: { 'Content-Type' => 'application/activity+json' })
+        stub_request(:get, uri).to_return(body: body, headers: { 'Content-Type' => 'application/activity+json' })
       end
 
       it 'returns status by url' do
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 39adf43876..394ee7c3a6 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SearchService, type: :service do
+describe SearchService do
   subject { described_class.new }
 
   describe '#call' do
diff --git a/spec/services/software_update_check_service_spec.rb b/spec/services/software_update_check_service_spec.rb
index c8821348ac..c864e3120d 100644
--- a/spec/services/software_update_check_service_spec.rb
+++ b/spec/services/software_update_check_service_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-RSpec.describe SoftwareUpdateCheckService, type: :service do
+RSpec.describe SoftwareUpdateCheckService do
   subject { described_class.new }
 
   shared_examples 'when the feature is enabled' do
-    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.to_s.split('+')[0]}" }
+    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{Mastodon::Version.dev? ? '-dev' : ''}" }
 
     let(:devops_role)     { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) }
     let(:owner_user)      { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }
@@ -139,7 +139,7 @@ RSpec.describe SoftwareUpdateCheckService, type: :service do
   end
 
   context 'when using the default update checking API' do
-    let(:update_check_url) { 'https://api.joinmastodon.org/update-check' }
+    let(:update_check_url) { 'https://kmy.blue/update-check' }
 
     it_behaves_like 'when the feature is enabled'
   end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index 4a5f8a0b6b..7c72a4776b 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe SuspendAccountService, :sidekiq_inline, type: :service do
+RSpec.describe SuspendAccountService, :sidekiq_inline do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
@@ -59,7 +59,7 @@ RSpec.describe SuspendAccountService, :sidekiq_inline, type: :service do
         remote_follower.follow!(account)
       end
 
-      it 'sends an update actor to followers and reporters' do
+      it 'sends an Update actor activity to followers and reporters' do
         subject
         expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
         expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
@@ -85,8 +85,9 @@ RSpec.describe SuspendAccountService, :sidekiq_inline, type: :service do
         account.follow!(local_followee)
       end
 
-      it 'sends a reject follow' do
+      it 'sends a Reject Follow activity', :aggregate_failures do
         subject
+
         expect(a_request(:post, account.inbox_url).with { |req| match_reject_follow_request(req, account, local_followee) }).to have_been_made.once
       end
     end
diff --git a/spec/services/tag_search_service_spec.rb b/spec/services/tag_search_service_spec.rb
new file mode 100644
index 0000000000..de42e54071
--- /dev/null
+++ b/spec/services/tag_search_service_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TagSearchService do
+  describe '#call' do
+    let!(:one) { Fabricate(:tag, name: 'one') }
+
+    before { Fabricate(:tag, name: 'two') }
+
+    it 'runs a search for tags' do
+      results = subject.call('#one', limit: 5)
+
+      expect(results)
+        .to have_attributes(
+          size: 1,
+          first: eq(one)
+        )
+    end
+  end
+end
diff --git a/spec/services/translate_status_service_spec.rb b/spec/services/translate_status_service_spec.rb
index 5f6418f5d6..0779fbbe6c 100644
--- a/spec/services/translate_status_service_spec.rb
+++ b/spec/services/translate_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe TranslateStatusService, type: :service do
+RSpec.describe TranslateStatusService do
   subject(:service) { described_class.new }
 
   let(:status) { Fabricate(:status, text: text, spoiler_text: spoiler_text, language: 'en', preloadable_poll: poll, media_attachments: media_attachments) }
diff --git a/spec/services/un_emoji_react_service_spec.rb b/spec/services/un_emoji_react_service_spec.rb
new file mode 100644
index 0000000000..d435d02366
--- /dev/null
+++ b/spec/services/un_emoji_react_service_spec.rb
@@ -0,0 +1,175 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnEmojiReactService, type: :service do
+  subject do
+    described_class.new.call(sender, status, emoji_reaction)
+    EmojiReaction.where(status: status, account: sender)
+  end
+
+  let!(:emoji_reaction) { nil }
+  let(:sender) { Fabricate(:user).account }
+  let(:author) { Fabricate(:user).account }
+  let(:status) { Fabricate(:status, account: author) }
+
+  context 'when a simple case' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    it 'unreact with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'when no emoji reactions' do
+    it 'unreact with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'with custom emoji of local' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+    let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'with custom emoji of remote' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: 'ohagi', custom_emoji: custom_emoji) }
+    let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: 'ohagi', domain: 'foo.bar', uri: 'https://foo.bar/emoji/ohagi') }
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'when other account already set' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before { Fabricate(:emoji_reaction, status: status, name: '😀') }
+
+    it 'unreact with emoji' do
+      expect(subject.count).to eq 0
+      expect(EmojiReaction.where(status: status).count).to eq 1
+    end
+  end
+
+  context 'when this account already set multiple emojis' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before do
+      Fabricate(:emoji_reaction, account: sender, status: status, name: '😂')
+      Fabricate(:emoji_reaction, account: sender, status: status, name: '🚗')
+    end
+
+    it 'unreact with emoji' do
+      expect(subject.count).to eq 2
+      expect(subject.pluck(:name)).to contain_exactly('😂', '🚗')
+    end
+  end
+
+  context 'with remove all emojis' do
+    before do
+      Fabricate(:emoji_reaction, account: sender, status: status, name: '😀')
+      Fabricate(:emoji_reaction, account: sender, status: status, name: '😂')
+      Fabricate(:emoji_reaction, account: sender, status: status, name: '🚗')
+    end
+
+    it 'react with emoji' do
+      expect(subject.count).to eq 0
+    end
+  end
+
+  context 'when remote status' do
+    let(:author) { Fabricate(:account, domain: 'author.foo.bar', uri: 'https://author.foo.bar/actor', inbox_url: 'https://author.foo.bar/inbox', protocol: 'activitypub') }
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before do
+      stub_request(:post, 'https://author.foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 0
+      expect(a_request(:post, 'https://author.foo.bar/inbox').with(body: hash_including({
+        type: 'Undo',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+
+    context 'when has followers' do
+      let!(:bob) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', inbox_url: 'https://foo.bar/inbox', protocol: 'activitypub') }
+
+      before do
+        bob.follow!(sender)
+        stub_request(:post, 'https://foo.bar/inbox')
+      end
+
+      it 'react with emoji', :sidekiq_inline do
+        expect(subject.count).to eq 0
+        expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+          type: 'Undo',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          content: '😀',
+        }))).to have_been_made.once
+      end
+    end
+  end
+
+  context 'when sender has remote followers' do
+    let!(:bob) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar/actor', inbox_url: 'https://foo.bar/inbox', protocol: 'activitypub') }
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before do
+      bob.follow!(sender)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 0
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Undo',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+
+  context 'when has relay server' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before do
+      Fabricate(:relay, inbox_url: 'https://foo.bar/inbox', state: :accepted)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 0
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Undo',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+
+  context 'when has friend server' do
+    let(:emoji_reaction) { Fabricate(:emoji_reaction, account: sender, status: status, name: '😀') }
+
+    before do
+      Fabricate(:friend_domain, inbox_url: 'https://foo.bar/inbox', active_state: :accepted, pseudo_relay: true)
+      stub_request(:post, 'https://foo.bar/inbox')
+    end
+
+    it 'react with emoji', :sidekiq_inline do
+      expect(subject.count).to eq 0
+      expect(a_request(:post, 'https://foo.bar/inbox').with(body: hash_including({
+        type: 'Undo',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        content: '😀',
+      }))).to have_been_made.once
+    end
+  end
+end
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index 6ac6bc4016..caec3d596f 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -2,15 +2,16 @@
 
 require 'rails_helper'
 
-RSpec.describe UnallowDomainService, type: :service do
+RSpec.describe UnallowDomainService do
   subject { described_class.new }
 
-  let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
+  let(:bad_domain) { 'evil.org' }
+  let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: bad_domain) }
   let!(:bad_status_harassment) { Fabricate(:status, account: bad_account, text: 'You suck') }
   let!(:bad_status_mean) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
   let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status_mean, file: attachment_fixture('attachment.jpg')) }
-  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
-  let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
+  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: bad_domain, suspended: true, silenced: true) }
+  let!(:domain_allow) { Fabricate(:domain_allow, domain: bad_domain) }
 
   context 'with limited federation mode', :sidekiq_inline do
     before do
@@ -18,23 +19,15 @@ RSpec.describe UnallowDomainService, type: :service do
     end
 
     describe '#call' do
-      before do
-        subject.call(domain_allow)
-      end
+      it 'makes the domain not allowed and removes accounts from that domain' do
+        expect { subject.call(domain_allow) }
+          .to change { bad_domain_allowed }.from(true).to(false)
+          .and change { bad_domain_account_exists }.from(true).to(false)
 
-      it 'removes the allowed domain' do
-        expect(DomainAllow.allowed?('evil.org')).to be false
-      end
-
-      it 'removes remote accounts from that domain' do
         expect { already_banned_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        expect(Account.where(domain: 'evil.org').exists?).to be false
-      end
-
-      it 'removes the remote accounts\'s statuses and media attachments' do
-        expect { bad_status_harassment.reload }.to raise_exception ActiveRecord::RecordNotFound
-        expect { bad_status_mean.reload }.to raise_exception ActiveRecord::RecordNotFound
-        expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+        expect { bad_status_harassment.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { bad_status_mean.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { bad_attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
@@ -45,23 +38,23 @@ RSpec.describe UnallowDomainService, type: :service do
     end
 
     describe '#call' do
-      before do
-        subject.call(domain_allow)
-      end
+      it 'makes the domain not allowed but preserves accounts from the domain' do
+        expect { subject.call(domain_allow) }
+          .to change { bad_domain_allowed }.from(true).to(false)
+          .and not_change { bad_domain_account_exists }.from(true)
 
-      it 'removes the allowed domain' do
-        expect(DomainAllow.allowed?('evil.org')).to be false
-      end
-
-      it 'does not remove accounts from that domain' do
-        expect(Account.where(domain: 'evil.org').exists?).to be true
-      end
-
-      it 'removes the remote accounts\'s statuses and media attachments' do
         expect { bad_status_harassment.reload }.to_not raise_error
         expect { bad_status_mean.reload }.to_not raise_error
         expect { bad_attachment.reload }.to_not raise_error
       end
     end
   end
+
+  def bad_domain_allowed
+    DomainAllow.allowed?(bad_domain)
+  end
+
+  def bad_domain_account_exists
+    Account.exists?(domain: bad_domain)
+  end
 end
diff --git a/spec/services/unblock_domain_service_spec.rb b/spec/services/unblock_domain_service_spec.rb
index 3d6d82ff68..289ddfc218 100644
--- a/spec/services/unblock_domain_service_spec.rb
+++ b/spec/services/unblock_domain_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe UnblockDomainService, type: :service do
+describe UnblockDomainService do
   subject { described_class.new }
 
   describe 'call' do
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index 9813c5e7fa..4c9fcb9aee 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnblockService, type: :service do
+RSpec.describe UnblockService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/unfavourite_service_spec.rb b/spec/services/unfavourite_service_spec.rb
new file mode 100644
index 0000000000..a714cc0675
--- /dev/null
+++ b/spec/services/unfavourite_service_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnfavouriteService do
+  describe '#call' do
+    context 'with a favourited status' do
+      let(:status) { Fabricate(:status, account: account) }
+      let!(:favourite) { Fabricate(:favourite, status: status) }
+
+      context 'when the status account is local' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'destroys the favourite' do
+          subject.call(favourite.account, status)
+
+          expect { favourite.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
+
+      context 'when the status account is a remote activitypub account' do
+        let(:account) { Fabricate(:account, domain: 'host.example', protocol: :activitypub) }
+
+        it 'destroys the favourite and sends a notification' do
+          subject.call(favourite.account, status)
+
+          expect { favourite.reload }
+            .to raise_error(ActiveRecord::RecordNotFound)
+          expect(ActivityPub::DeliveryWorker)
+            .to have_enqueued_sidekiq_job(anything, favourite.account.id, status.account.inbox_url)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index 18a25a676d..bba17a8d27 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnfollowService, type: :service do
+RSpec.describe UnfollowService do
   subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/unmute_service_spec.rb b/spec/services/unmute_service_spec.rb
new file mode 100644
index 0000000000..92c7a70d65
--- /dev/null
+++ b/spec/services/unmute_service_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnmuteService do
+  describe '#call' do
+    let!(:account) { Fabricate(:account) }
+    let!(:target_account) { Fabricate(:account) }
+
+    context 'when account is muting target account' do
+      before { Fabricate :mute, account: account, target_account: target_account }
+
+      context 'when account follows target_account' do
+        before { Fabricate :follow, account: account, target_account: target_account }
+
+        it 'removes the account mute and sets up a merge' do
+          expect { subject.call(account, target_account) }
+            .to remove_account_mute
+          expect(MergeWorker).to have_enqueued_sidekiq_job(target_account.id, account.id)
+        end
+      end
+
+      context 'when account does not follow target_account' do
+        it 'removes the account mute and does not create a merge' do
+          expect { subject.call(account, target_account) }
+            .to remove_account_mute
+          expect(MergeWorker).to_not have_enqueued_sidekiq_job(any_args)
+        end
+      end
+
+      def remove_account_mute
+        change { account.reload.muting?(target_account) }
+          .from(true)
+          .to(false)
+      end
+    end
+
+    context 'when account is not muting target account' do
+      it 'does nothing and returns' do
+        expect { subject.call(account, target_account) }
+          .to_not(change { account.reload.muting?(target_account) })
+        expect(MergeWorker).to_not have_enqueued_sidekiq_job(any_args)
+      end
+    end
+  end
+end
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index c848767cd1..79a4441d3e 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UnsuspendAccountService, type: :service do
+RSpec.describe UnsuspendAccountService do
   shared_context 'with common context' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 9f4e36862d..f07b1a7c02 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UpdateAccountService, type: :service do
+RSpec.describe UpdateAccountService do
   subject { described_class.new }
 
   describe 'switching form locked to unlocked accounts', :sidekiq_inline do
@@ -10,14 +10,17 @@ RSpec.describe UpdateAccountService, type: :service do
     let(:alice)   { Fabricate(:account) }
     let(:bob)     { Fabricate(:account) }
     let(:eve)     { Fabricate(:account) }
+    let(:ohagi)   { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
 
     before do
       bob.touch(:silenced_at)
       account.mute!(eve)
+      Fabricate(:domain_block, domain: 'example.com', reject_straight_follow: true)
 
       FollowService.new.call(alice, account)
       FollowService.new.call(bob, account)
       FollowService.new.call(eve, account)
+      FollowService.new.call(ohagi, account)
 
       subject.call(account, { locked: false })
     end
@@ -36,5 +39,10 @@ RSpec.describe UpdateAccountService, type: :service do
       expect(eve.following?(account)).to be true
       expect(eve.requested?(account)).to be false
     end
+
+    it 'does not auto-accept pending follow requests from blocking straight follow domains' do
+      expect(ohagi.following?(account)).to be false
+      expect(ohagi.requested?(account)).to be true
+    end
   end
 end
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index 55651c305d..dbd5a0fd7f 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe UpdateStatusService, type: :service do
+RSpec.describe UpdateStatusService do
   subject { described_class.new }
 
   context 'when nothing changes' do
@@ -40,7 +40,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:text)).to eq %w(Foo Bar)
+      expect(status.edits.ordered.pluck(:text)).to eq %w(Foo Bar)
     end
   end
 
@@ -58,7 +58,56 @@ RSpec.describe UpdateStatusService, type: :service do
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']]
+      expect(status.edits.ordered.pluck(:text, :spoiler_text)).to eq [['Foo', ''], ['Foo', 'Bar']]
+    end
+  end
+
+  context 'when content warning changes and has remote user', :sidekiq_inline do
+    let(:remote_follower) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor', protocol: :activitypub, inbox_url: 'https://example.com/inbox') }
+    let(:status) { Fabricate(:status, text: 'Foo', spoiler_text: '', account: Fabricate(:user).account) }
+
+    before do
+      remote_follower.follow!(status.account)
+      stub_request(:post, 'https://example.com/inbox').to_return(status: 200)
+    end
+
+    def match_update_request(req, type)
+      json = JSON.parse(req.body)
+      actor_id = ActivityPub::TagManager.instance.uri_for(status.account)
+      status_id = ActivityPub::TagManager.instance.uri_for(status)
+      json['type'] == type && json['actor'] == actor_id && json['object']['id'] == status_id
+    end
+
+    it 'edit activity is sent' do
+      subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
+
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Update') }).to have_been_made.once
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Delete') }).to_not have_been_made
+    end
+
+    it 'edit activity is sent for target user' do
+      Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_send_sensitive: true)
+      subject.call(status, status.account_id, text: 'Ohagi')
+
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Update') }).to have_been_made.once
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Delete') }).to_not have_been_made
+    end
+
+    it 'delete activity is sent when follower is target user' do
+      Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_send_sensitive: true)
+      subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
+
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Delete') }).to have_been_made.once
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Update') }).to_not have_been_made
+    end
+
+    it 'delete activity is sent and update activity is not sent when follower is target user' do
+      Fabricate(:domain_block, domain: 'example.com', severity: :noop, reject_send_sensitive: true)
+      subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
+      subject.call(status, status.account_id, text: 'Ohagi', spoiler_text: 'Bar')
+
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Delete') }).to have_been_made.once
+      expect(a_request(:post, 'https://example.com/inbox').with { |req| match_update_request(req, 'Update') }).to_not have_been_made
     end
   end
 
@@ -85,7 +134,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]]
+      expect(status.edits.ordered.pluck(:ordered_media_attachment_ids)).to eq [[detached_media_attachment.id], [attached_media_attachment.id]]
     end
   end
 
@@ -107,7 +156,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
 
     it 'saves edit history' do
-      expect(status.edits.map { |edit| edit.ordered_media_attachments.map(&:description) }).to eq [['Old description'], ['New description']]
+      expect(status.edits.ordered.map { |edit| edit.ordered_media_attachments.map(&:description) }).to eq [['Old description'], ['New description']]
     end
   end
 
@@ -136,7 +185,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
 
     it 'saves edit history' do
-      expect(status.edits.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)]
+      expect(status.edits.ordered.pluck(:poll_options)).to eq [%w(Foo Bar), %w(Bar Baz Foo)]
     end
 
     it 'requeues expiration notification' do
@@ -164,6 +213,39 @@ RSpec.describe UpdateStatusService, type: :service do
     end
   end
 
+  context 'when personal_limited mentions in text change' do
+    let!(:account) { Fabricate(:account) }
+    let!(:bob) { Fabricate(:account, username: 'bob') }
+    let!(:status) { PostStatusService.new.call(account, text: 'Hello', visibility: 'circle', circle_id: Fabricate(:circle, account: account).id) }
+
+    before do
+      subject.call(status, status.account_id, text: 'Hello @bob')
+    end
+
+    it 'changes mentions' do
+      expect(status.active_mentions.pluck(:account_id)).to eq [bob.id]
+    end
+
+    it 'changes visibilities' do
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'circle'
+    end
+  end
+
+  context 'when personal_limited in text change' do
+    let!(:account) { Fabricate(:account) }
+    let!(:status) { PostStatusService.new.call(account, text: 'Hello', visibility: 'circle', circle_id: Fabricate(:circle, account: account).id) }
+
+    before do
+      subject.call(status, status.account_id, text: 'AAA')
+    end
+
+    it 'not changing visibilities' do
+      expect(status.visibility).to eq 'limited'
+      expect(status.limited_scope).to eq 'personal'
+    end
+  end
+
   context 'when hashtags in text change' do
     let!(:account) { Fabricate(:account) }
     let!(:status) { PostStatusService.new.call(account, text: 'Hello #foo') }
@@ -183,4 +265,182 @@ RSpec.describe UpdateStatusService, type: :service do
     subject.call(status, status.account_id, text: 'Bar')
     expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
   end
+
+  describe 'ng word is set' do
+    let(:account) { Fabricate(:account) }
+    let(:status) { PostStatusService.new.call(account, text: 'ohagi') }
+
+    it 'hit ng words' do
+      text = 'ng word test'
+      Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+      expect { subject.call(status, status.account_id, text: text) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'bypass ng words' do
+      text = 'ng word test'
+      Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+      expect { subject.call(status, status.account_id, text: text, bypass_validation: true) }.to_not raise_error
+    end
+
+    it 'not hit ng words' do
+      text = 'ng word aiueo'
+      Fabricate(:ng_word, keyword: 'test', stranger: false)
+
+      status2 = subject.call(status, status.account_id, text: text)
+
+      expect(status2).to be_persisted
+      expect(status2.text).to eq text
+    end
+
+    it 'hit ng words for mention' do
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      expect { subject.call(status, status.account_id, text: text) }.to raise_error(Mastodon::ValidationError)
+      expect(status.reload.text).to_not eq text
+      expect(status.mentioned_accounts.pluck(:username)).to_not include 'ohagi'
+    end
+
+    it 'hit ng words for mention but local posts are not checked' do
+      Fabricate(:account, username: 'ohagi', domain: nil)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '0').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status2 = subject.call(status, status.account_id, text: text)
+
+      expect(status2).to be_persisted
+      expect(status2.text).to eq text
+    end
+
+    it 'hit ng words for mention to follower' do
+      mentioned = Fabricate(:account, username: 'ohagi', domain: nil)
+      mentioned.follow!(account)
+      text = 'ng word test @ohagi'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status2 = subject.call(status, status.account_id, text: text)
+
+      expect(status2).to be_persisted
+      expect(status2.text).to eq text
+    end
+
+    it 'hit ng words for reply' do
+      text = 'ng word test'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status = PostStatusService.new.call(account, text: 'hello', thread: Fabricate(:status))
+
+      expect { subject.call(status, status.account_id, text: text) }.to raise_error(Mastodon::ValidationError)
+      expect(status.reload.text).to_not eq text
+    end
+
+    it 'hit ng words for reply to follower' do
+      mentioned = Fabricate(:account, username: 'ohagi', domain: nil)
+      mentioned.follow!(account)
+      text = 'ng word test'
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status = PostStatusService.new.call(account, text: 'hello', thread: Fabricate(:status, account: mentioned))
+
+      status = subject.call(status, status.account_id, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'add reference' do
+      target_status = Fabricate(:status)
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+
+      status = PostStatusService.new.call(account, text: 'hello')
+
+      status = subject.call(status, status.account_id, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+      expect(status.references.pluck(:id)).to include target_status.id
+    end
+
+    it 'hit ng words for reference' do
+      target_status = Fabricate(:status)
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status = PostStatusService.new.call(account, text: 'hello')
+
+      expect { subject.call(status, status.account_id, text: text) }.to raise_error(Mastodon::ValidationError)
+    end
+
+    it 'hit ng words for reference to follower' do
+      target_status = Fabricate(:status)
+      target_status.account.follow!(status.account)
+      text = "ng word test BT: #{ActivityPub::TagManager.instance.uri_for(target_status)}"
+      Form::AdminSettings.new(stranger_mention_from_local_ng: '1').save
+      Fabricate(:ng_word, keyword: 'test')
+
+      status = PostStatusService.new.call(account, text: 'hello')
+
+      status = subject.call(status, status.account_id, text: text)
+
+      expect(status).to be_persisted
+      expect(status.text).to eq text
+    end
+
+    it 'using hashtag under limit' do
+      text = '#a #b'
+      Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+      subject.call(status, status.account_id, text: text)
+
+      expect(status.reload.tags.count).to eq 2
+      expect(status.text).to eq text
+    end
+
+    it 'using hashtag over limit' do
+      text = '#a #b #c'
+      Form::AdminSettings.new(post_hash_tags_max: 2).save
+
+      expect { subject.call(status, status.account_id, text: text) }.to raise_error Mastodon::ValidationError
+
+      expect(status.reload.tags.count).to eq 0
+      expect(status.text).to_not eq text
+    end
+  end
+
+  describe 'ng rule is set' do
+    let(:status) { Fabricate(:status, text: 'Foo') }
+
+    context 'when rule hits' do
+      before do
+        Fabricate(:ng_rule, status_text: 'Bar', status_allow_follower_mention: false)
+      end
+
+      it 'does not update text' do
+        expect { subject.call(status, status.account_id, text: 'Bar') }.to raise_error Mastodon::ValidationError
+        expect(status.reload.text).to_not eq 'Bar'
+        expect(status.edits.pluck(:text)).to eq %w()
+      end
+    end
+
+    context 'when rule does not hit' do
+      before do
+        Fabricate(:ng_rule, status_text: 'aar', status_allow_follower_mention: false)
+      end
+
+      it 'does not update text' do
+        expect { subject.call(status, status.account_id, text: 'Bar') }.to_not raise_error
+        expect(status.reload.text).to eq 'Bar'
+        expect(status.edits.pluck(:text)).to eq %w(Foo Bar)
+      end
+    end
+  end
 end
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
index 415788cb58..0ce8c9a904 100644
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe VerifyLinkService, type: :service do
+RSpec.describe VerifyLinkService do
   subject { described_class.new }
 
   context 'when given a local account' do
@@ -77,27 +77,28 @@ RSpec.describe VerifyLinkService, type: :service do
 
     context 'when a document is truncated but the link back is valid' do
       let(:html) do
-        "
+        <<-HTML
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}\"
-        "
+            <a rel="me" href="#{ActivityPub::TagManager.instance.url_for(account)}">
+        HTML
       end
 
-      it 'marks the field as not verified' do
-        expect(field.verified?).to be false
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
       end
     end
 
-    context 'when a link back might be truncated' do
+    context 'when a link tag might be truncated' do
       let(:html) do
-        "
+        <<-HTML_TRUNCATED
           <!doctype html>
           <body>
-            <a rel=\"me\" href=\"#{ActivityPub::TagManager.instance.url_for(account)}"
+            <a rel="me" href="#{ActivityPub::TagManager.instance.url_for(account)}"
+        HTML_TRUNCATED
       end
 
-      it 'does not mark the field as verified' do
+      it 'marks the field as not verified' do
         expect(field.verified?).to be false
       end
     end
@@ -165,7 +166,11 @@ RSpec.describe VerifyLinkService, type: :service do
       #
       # apparently github allows the user to enter website URLs with a single
       # slash and makes no attempts to correct that.
-      let(:html) { '<a href="http:/unrelated.example">Hello</a>' }
+      let(:html) do
+        <<-HTML
+          <a href="http:/unrelated.example">Hello</a>
+        HTML
+      end
 
       it 'does not crash' do
         # We could probably put more effort into perhaps auto-correcting the
diff --git a/spec/services/vote_service_spec.rb b/spec/services/vote_service_spec.rb
new file mode 100644
index 0000000000..88207b001c
--- /dev/null
+++ b/spec/services/vote_service_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe VoteService do
+  describe '#call' do
+    subject { described_class.new.call(voter, poll, [0]) }
+
+    context 'with a poll and poll options' do
+      let(:poll) { Fabricate(:poll, account: account, options: %w(Fun UnFun)) }
+      let(:fun_vote) { Fabricate(:poll_vote, poll: poll) }
+      let(:not_fun_vote) { Fabricate(:poll_vote, poll: poll) }
+      let(:voter) { Fabricate(:account, domain: nil) }
+
+      context 'when the poll was created by a local account' do
+        let(:account) { Fabricate(:account, domain: nil) }
+
+        it 'stores the votes and distributes the poll' do
+          expect { subject }
+            .to change(PollVote, :count).by(1)
+
+          expect(ActivityPub::DistributePollUpdateWorker)
+            .to have_enqueued_sidekiq_job(poll.status.id)
+        end
+      end
+
+      context 'when the poll was created by a remote account' do
+        let(:account) { Fabricate(:account, domain: 'host.example') }
+
+        it 'stores the votes and processes delivery' do
+          expect { subject }
+            .to change(PollVote, :count).by(1)
+
+          expect(ActivityPub::DeliveryWorker)
+            .to have_enqueued_sidekiq_job(anything, voter.id, poll.account.inbox_url)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/webhook_service_spec.rb b/spec/services/webhook_service_spec.rb
new file mode 100644
index 0000000000..22a60db9f5
--- /dev/null
+++ b/spec/services/webhook_service_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe WebhookService do
+  describe '#call' do
+    context 'with a relevant event webhook' do
+      let!(:report) { Fabricate(:report) }
+      let!(:webhook) { Fabricate(:webhook, events: ['report.created']) }
+
+      it 'finds and delivers webhook payloads' do
+        expect { subject.call('report.created', report) }
+          .to enqueue_sidekiq_job(Webhooks::DeliveryWorker)
+          .with(
+            webhook.id,
+            anything
+          )
+      end
+    end
+
+    context 'without any relevant event webhooks' do
+      let!(:report) { Fabricate(:report) }
+
+      it 'does not deliver webhook payloads' do
+        expect { subject.call('report.created', report) }
+          .to_not enqueue_sidekiq_job(Webhooks::DeliveryWorker)
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index dc60976d05..1f9cc40f12 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-unless ENV['DISABLE_SIMPLECOV'] == 'true'
-  require 'simplecov' # Configuration details loaded from .simplecov
-end
-
 RSpec.configure do |config|
   config.example_status_persistence_file_path = 'tmp/rspec/examples.txt'
   config.expect_with :rspec do |expectations|
@@ -23,6 +19,12 @@ RSpec.configure do |config|
   config.before :suite do
     Rails.application.load_seed
     Chewy.strategy(:bypass)
+
+    # NOTE: we switched registrations mode to closed by default, but the specs
+    # very heavily rely on having it enabled by default, as it relies on users
+    # being approved by default except in select cases where explicitly testing
+    # other registration modes
+    Setting.registrations_mode = 'open'
   end
 
   config.after :suite do
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index d4f27e209e..be1378ffac 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -26,6 +26,10 @@ Capybara.javascript_driver = :headless_chrome
 
 RSpec.configure do |config|
   config.before(:each, type: :system) do
+    driven_by :rack_test
+  end
+
+  config.before(:each, :js, type: :system) do
     driven_by Capybara.javascript_driver
   end
 end
diff --git a/spec/support/examples/cache.rb b/spec/support/examples/cache.rb
index 43cfbade82..60e522f426 100644
--- a/spec/support/examples/cache.rb
+++ b/spec/support/examples/cache.rb
@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
 shared_examples 'cacheable response' do |expects_vary: false|
-  it 'does not set cookies' do
+  it 'sets correct cache and vary headers and does not set cookies or session', :aggregate_failures do
     expect(response.cookies).to be_empty
     expect(response.headers['Set-Cookies']).to be_nil
-  end
 
-  it 'does not set sessions' do
     expect(session).to be_empty
-  end
 
-  if expects_vary
-    it 'returns Vary header' do
-      expect(response.headers['Vary']).to include(expects_vary)
-    end
-  end
+    expect(response.headers['Vary']).to include(expects_vary) if expects_vary
 
-  it 'returns public Cache-Control header' do
     expect(response.headers['Cache-Control']).to include('public')
   end
 end
diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
index bdce1cc76d..28a43b3b8a 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/javascript_errors.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.after(:each, type: :system) do
+  config.after(:each, :js, type: :system) do
     errors = page.driver.browser.logs.get(:browser)
     if errors.present?
       aggregate_failures 'javascript errrors' do
@@ -9,8 +9,8 @@ RSpec.configure do |config|
           expect(error.level).to_not eq('SEVERE'), error.message
           next unless error.level == 'WARNING'
 
-          $stderr.warn 'WARN: javascript warning'
-          $stderr.warn error.message
+          warn 'WARN: javascript warning'
+          warn error.message
         end
       end
     end
diff --git a/spec/support/matchers/api_pagination.rb b/spec/support/matchers/api_pagination.rb
new file mode 100644
index 0000000000..81e27e44b8
--- /dev/null
+++ b/spec/support/matchers/api_pagination.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :include_pagination_headers do |links|
+  match do |response|
+    links.map do |key, value|
+      response.headers['Link'].find_link(['rel', key.to_s]).href == value
+    end.all?
+  end
+
+  failure_message do |header|
+    "expected that #{header} would have the same values as #{links}."
+  end
+end
diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 2b345ddef1..c2743326c3 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -7,10 +7,11 @@ module ProfileStories
     @bob = Fabricate(
       :user,
       email: email, password: password, confirmed_at: confirmed_at,
-      account: Fabricate(:account, username: 'bob')
+      account: Fabricate(:account, username: 'bob'),
+      locale: 'en'
     )
 
-    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 201812160442020 }) if finished_onboarding # rubocop:disable Style/NumericLiterals
+    Web::Setting.where(user: bob).first_or_initialize(user: bob).update!(data: { introductionVersion: 2018_12_16_044202 }) if finished_onboarding
   end
 
   def as_a_logged_in_user
@@ -21,6 +22,12 @@ module ProfileStories
     click_on I18n.t('auth.login')
   end
 
+  def as_a_logged_in_admin
+    # This is a bit awkward, but this avoids code duplication.
+    as_a_logged_in_user
+    bob.update!(role: UserRole.find_by!(name: 'Admin'))
+  end
+
   def with_alice_as_local_user
     @alice_bio = '@alice and @bob are fictional characters commonly used as' \
                  'placeholder names in #cryptology, as well as #science and' \
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 39657586f2..3facf16b8e 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -95,13 +95,23 @@ RSpec.configure do |config|
     end
   end
 
-  config.around :each, type: :system do |example|
+  config.around :each, :streaming, type: :system do |example|
     # Streaming server needs DB access but `use_transactional_tests` rolls back
     # every transaction. Disable this feature for streaming tests, and use
     # DatabaseCleaner to clean the database tables between each test.
     self.use_transactional_tests = false
 
     DatabaseCleaner.cleaning do
+      # NOTE: we switched registrations mode to closed by default, but the specs
+      # very heavily rely on having it enabled by default, as it relies on users
+      # being approved by default except in select cases where explicitly testing
+      # other registration modes
+      # Also needs to be set per-example here because of the database cleaner.
+      Setting.registrations_mode = 'open'
+
+      # Load seeds so we have the default roles otherwise cleared by `DatabaseCleaner`
+      Rails.application.load_seed
+
       example.run
     end
 
@@ -115,6 +125,6 @@ RSpec.configure do |config|
   end
 
   def streaming_examples_present?
-    RUN_SYSTEM_SPECS
+    RSpec.world.filtered_examples.values.flatten.any? { |example| example.metadata[:streaming] == true }
   end
 end
diff --git a/spec/support/threading_helpers.rb b/spec/support/threading_helpers.rb
new file mode 100644
index 0000000000..edf45822ca
--- /dev/null
+++ b/spec/support/threading_helpers.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ThreadingHelpers
+  def multi_threaded_execution(thread_count)
+    wait_for_start = true
+
+    threads = Array.new(thread_count) do
+      Thread.new do
+        true while wait_for_start
+        yield
+      end
+    end
+
+    wait_for_start = false
+    threads.each(&:join)
+  end
+end
diff --git a/spec/features/admin/accounts_spec.rb b/spec/system/admin/accounts_spec.rb
similarity index 100%
rename from spec/features/admin/accounts_spec.rb
rename to spec/system/admin/accounts_spec.rb
diff --git a/spec/features/admin/custom_emojis_spec.rb b/spec/system/admin/custom_emojis_spec.rb
similarity index 100%
rename from spec/features/admin/custom_emojis_spec.rb
rename to spec/system/admin/custom_emojis_spec.rb
diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/system/admin/domain_blocks_spec.rb
similarity index 79%
rename from spec/features/admin/domain_blocks_spec.rb
rename to spec/system/admin/domain_blocks_spec.rb
index 6a1405cdf6..99aa7cf1a7 100644
--- a/spec/features/admin/domain_blocks_spec.rb
+++ b/spec/system/admin/domain_blocks_spec.rb
@@ -12,9 +12,7 @@ describe 'blocking domains through the moderation interface' do
     it 'adds a new domain block' do
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.silence'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'silence')
 
       expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -25,9 +23,7 @@ describe 'blocking domains through the moderation interface' do
     it 'presents a confirmation screen before suspending the domain' do
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
@@ -47,9 +43,7 @@ describe 'blocking domains through the moderation interface' do
 
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
@@ -69,9 +63,7 @@ describe 'blocking domains through the moderation interface' do
 
       visit new_admin_domain_block_path
 
-      fill_in 'domain_block_domain', with: 'subdomain.example.com'
-      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_on I18n.t('admin.domain_blocks.new.create')
+      submit_domain_block('subdomain.example.com', 'suspend')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'subdomain.example.com'))
@@ -84,8 +76,11 @@ describe 'blocking domains through the moderation interface' do
       expect(DomainBlockWorker).to have_received(:perform_async)
 
       # And leaves the previous block alone
-      expect(domain_block.reload.severity).to eq 'silence'
-      expect(domain_block.reload.domain).to eq 'example.com'
+      expect(domain_block.reload)
+        .to have_attributes(
+          severity: eq('silence'),
+          domain: eq('example.com')
+        )
     end
   end
 
@@ -109,4 +104,12 @@ describe 'blocking domains through the moderation interface' do
       expect(domain_block.reload.severity).to eq 'suspend'
     end
   end
+
+  private
+
+  def submit_domain_block(domain, severity)
+    fill_in 'domain_block_domain', with: domain
+    select I18n.t("admin.domain_blocks.new.severity.#{severity}"), from: 'domain_block_severity'
+    click_on I18n.t('admin.domain_blocks.new.create')
+  end
 end
diff --git a/spec/features/admin/email_domain_blocks_spec.rb b/spec/system/admin/email_domain_blocks_spec.rb
similarity index 100%
rename from spec/features/admin/email_domain_blocks_spec.rb
rename to spec/system/admin/email_domain_blocks_spec.rb
diff --git a/spec/features/admin/ip_blocks_spec.rb b/spec/system/admin/ip_blocks_spec.rb
similarity index 100%
rename from spec/features/admin/ip_blocks_spec.rb
rename to spec/system/admin/ip_blocks_spec.rb
diff --git a/spec/features/admin/software_updates_spec.rb b/spec/system/admin/software_updates_spec.rb
similarity index 100%
rename from spec/features/admin/software_updates_spec.rb
rename to spec/system/admin/software_updates_spec.rb
diff --git a/spec/features/admin/statuses_spec.rb b/spec/system/admin/statuses_spec.rb
similarity index 100%
rename from spec/features/admin/statuses_spec.rb
rename to spec/system/admin/statuses_spec.rb
diff --git a/spec/features/admin/trends/links/preview_card_providers_spec.rb b/spec/system/admin/trends/links/preview_card_providers_spec.rb
similarity index 100%
rename from spec/features/admin/trends/links/preview_card_providers_spec.rb
rename to spec/system/admin/trends/links/preview_card_providers_spec.rb
diff --git a/spec/features/admin/trends/links_spec.rb b/spec/system/admin/trends/links_spec.rb
similarity index 100%
rename from spec/features/admin/trends/links_spec.rb
rename to spec/system/admin/trends/links_spec.rb
diff --git a/spec/features/admin/trends/statuses_spec.rb b/spec/system/admin/trends/statuses_spec.rb
similarity index 100%
rename from spec/features/admin/trends/statuses_spec.rb
rename to spec/system/admin/trends/statuses_spec.rb
diff --git a/spec/features/admin/trends/tags_spec.rb b/spec/system/admin/trends/tags_spec.rb
similarity index 100%
rename from spec/features/admin/trends/tags_spec.rb
rename to spec/system/admin/trends/tags_spec.rb
diff --git a/spec/features/captcha_spec.rb b/spec/system/captcha_spec.rb
similarity index 76%
rename from spec/features/captcha_spec.rb
rename to spec/system/captcha_spec.rb
index 15c37eb463..06c823adf2 100644
--- a/spec/features/captcha_spec.rb
+++ b/spec/system/captcha_spec.rb
@@ -19,12 +19,10 @@ describe 'email confirmation flow when captcha is enabled' do
       # It presents the user with a captcha form
       expect(page).to have_title(I18n.t('auth.captcha_confirmation.title'))
 
-      # It does not confirm the user just yet
-      expect(user.reload.confirmed?).to be false
-
       # It redirects to app and confirms user
-      click_on I18n.t('challenge.confirm')
-      expect(user.reload.confirmed?).to be true
+      expect { click_on I18n.t('challenge.confirm') }
+        .to change { user.reload.confirmed? }.from(false).to(true)
+
       expect(page).to have_current_path(/\A#{client_app.confirmation_redirect_uri}/, url: true)
 
       # Browsers will generally reload the original page upon redirection
@@ -32,8 +30,9 @@ describe 'email confirmation flow when captcha is enabled' do
       visit "/auth/confirmation?confirmation_token=#{user.confirmation_token}&redirect_to_app=true"
 
       # It presents a page with a link to the app callback
-      expect(page).to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
-      expect(page).to have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
+      expect(page)
+        .to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
+        .and have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
     end
   end
 
diff --git a/spec/features/log_in_spec.rb b/spec/system/log_in_spec.rb
similarity index 100%
rename from spec/features/log_in_spec.rb
rename to spec/system/log_in_spec.rb
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index a3b816b4d5..6d1cffb2f2 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'NewStatuses', :sidekiq_inline do
+describe 'NewStatuses', :js, :sidekiq_inline, :streaming do
   include ProfileStories
 
   subject { page }
@@ -15,6 +15,7 @@ describe 'NewStatuses', :sidekiq_inline do
   before do
     as_a_logged_in_user
     visit root_path
+    page.driver.browser.manage.window.resize_to(1600, 1050)
   end
 
   it 'can be posted' do
@@ -24,7 +25,7 @@ describe 'NewStatuses', :sidekiq_inline do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
@@ -37,7 +38,7 @@ describe 'NewStatuses', :sidekiq_inline do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
diff --git a/spec/features/oauth_spec.rb b/spec/system/oauth_spec.rb
similarity index 81%
rename from spec/features/oauth_spec.rb
rename to spec/system/oauth_spec.rb
index 967956cc8e..1c9aca3114 100644
--- a/spec/features/oauth_spec.rb
+++ b/spec/system/oauth_spec.rb
@@ -2,14 +2,15 @@
 
 require 'rails_helper'
 
-describe 'Using OAuth from an external app' do
-  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/', scopes: 'read') }
+describe 'Using OAuth from an external app', :js, :streaming do
+  let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
 
   context 'when the user is already logged in' do
     let!(:user) { Fabricate(:user) }
 
     before do
-      sign_in user, scope: :user
+      visit new_user_session_path
+      fill_in_auth_details(user.email, user.password)
     end
 
     it 'when accepting the authorization request' do
@@ -49,7 +50,7 @@ describe 'Using OAuth from an external app' do
     let(:user)     { Fabricate(:user, email: email, password: password) }
 
     before do
-      user.confirm!
+      user.mark_email_as_confirmed!
       user.approve!
     end
 
@@ -61,15 +62,11 @@ describe 'Using OAuth from an external app' do
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Failing to log-in presents the form again
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: 'wrong password'
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, 'wrong password')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, password)
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon authorizing, it redirects to the apps' callback URL
@@ -88,15 +85,11 @@ describe 'Using OAuth from an external app' do
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Failing to log-in presents the form again
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: 'wrong password'
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, 'wrong password')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_on I18n.t('auth.login')
+      fill_in_auth_details(email, password)
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon denying, it redirects to the apps' callback URL
@@ -118,25 +111,19 @@ describe 'Using OAuth from an external app' do
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Failing to log-in presents the form again
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: 'wrong password'
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, 'wrong password')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: password
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, password)
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
-        fill_in 'user_otp_attempt', with: 'wrong'
-        click_on I18n.t('auth.login')
+        fill_in_otp_details('wrong')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
-        fill_in 'user_otp_attempt', with: user.current_otp
-        click_on I18n.t('auth.login')
+        fill_in_otp_details(user.current_otp)
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon authorizing, it redirects to the apps' callback URL
@@ -155,25 +142,19 @@ describe 'Using OAuth from an external app' do
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Failing to log-in presents the form again
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: 'wrong password'
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, 'wrong password')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
-        fill_in 'user_email', with: email
-        fill_in 'user_password', with: password
-        click_on I18n.t('auth.login')
+        fill_in_auth_details(email, password)
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
-        fill_in 'user_otp_attempt', with: 'wrong'
-        click_on I18n.t('auth.login')
+        fill_in_otp_details('wrong')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
-        fill_in 'user_otp_attempt', with: user.current_otp
-        click_on I18n.t('auth.login')
+        fill_in_otp_details(user.current_otp)
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon denying, it redirects to the apps' callback URL
@@ -184,7 +165,19 @@ describe 'Using OAuth from an external app' do
         expect(Doorkeeper::AccessGrant.exists?(application: client_app, resource_owner_id: user.id)).to be false
       end
     end
-
     # TODO: external auth
   end
+
+  private
+
+  def fill_in_auth_details(email, password)
+    fill_in 'user_email', with: email
+    fill_in 'user_password', with: password
+    click_on I18n.t('auth.login')
+  end
+
+  def fill_in_otp_details(value)
+    fill_in 'user_otp_attempt', with: value
+    click_on I18n.t('auth.login')
+  end
 end
diff --git a/spec/system/ocr_spec.rb b/spec/system/ocr_spec.rb
new file mode 100644
index 0000000000..4f4941adca
--- /dev/null
+++ b/spec/system/ocr_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'OCR', :js, :paperclip_processing, :sidekiq_inline, :streaming do
+  include ProfileStories
+
+  let(:email)               { 'test@example.com' }
+  let(:password)            { 'password' }
+  let(:confirmed_at)        { Time.zone.now }
+  let(:finished_onboarding) { true }
+
+  before do
+    as_a_logged_in_user
+    visit root_path
+  end
+
+  it 'can recognize text in a media attachment' do
+    expect(page).to have_css('div.app-holder')
+
+    within('.compose-form') do
+      attach_file('file-upload-input', file_fixture('text.png'), make_visible: true)
+
+      within('.compose-form__upload') do
+        click_on('Edit')
+      end
+    end
+
+    click_on('Detect text from picture')
+
+    expect(page).to have_css('#upload-modal__description', text: /Hello Mastodon\s*/, wait: 10)
+  end
+end
diff --git a/spec/features/profile_spec.rb b/spec/system/profile_spec.rb
similarity index 100%
rename from spec/features/profile_spec.rb
rename to spec/system/profile_spec.rb
diff --git a/spec/system/redirections_spec.rb b/spec/system/redirections_spec.rb
new file mode 100644
index 0000000000..f73ab58470
--- /dev/null
+++ b/spec/system/redirections_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'redirection confirmations' do
+  let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/foo', url: 'https://example.com/@foo') }
+  let(:status)  { Fabricate(:status, account: account, uri: 'https://example.com/users/foo/statuses/1', url: 'https://example.com/@foo/1') }
+
+  context 'when a logged out user visits a local page for a remote account' do
+    it 'shows a confirmation page' do
+      visit "/@#{account.pretty_acct}"
+
+      # It explains about the redirect
+      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+      # It features an appropriate link
+      expect(page).to have_link(account.url, href: account.url)
+    end
+  end
+
+  context 'when a logged out user visits a local page for a remote status' do
+    it 'shows a confirmation page' do
+      visit "/@#{account.pretty_acct}/#{status.id}"
+
+      # It explains about the redirect
+      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+      # It features an appropriate link
+      expect(page).to have_link(status.url, href: status.url)
+    end
+  end
+end
diff --git a/spec/system/report_interface_spec.rb b/spec/system/report_interface_spec.rb
new file mode 100644
index 0000000000..f82604aae8
--- /dev/null
+++ b/spec/system/report_interface_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'report interface', :js, :paperclip_processing, :streaming do
+  include ProfileStories
+
+  let(:email)               { 'admin@example.com' }
+  let(:password)            { 'password' }
+  let(:confirmed_at)        { Time.zone.now }
+  let(:finished_onboarding) { true }
+
+  let(:reported_account) { Fabricate(:account) }
+  let(:reported_status) { Fabricate(:status, account: reported_account) }
+  let(:media_attachment) { Fabricate(:media_attachment, account: reported_account, status: reported_status, file: attachment_fixture('attachment.jpg')) }
+  let!(:report) { Fabricate(:report, target_account: reported_account, status_ids: [media_attachment.status.id]) }
+
+  before do
+    as_a_logged_in_admin
+    visit admin_report_path(report)
+  end
+
+  it 'displays the report interface, including the javascript bits' do
+    # The report category selector React component is properly rendered
+    expect(page).to have_css('.report-reason-selector')
+
+    # The media React component is properly rendered
+    page.scroll_to(page.find('.batch-table__row'))
+    expect(page).to have_css('.spoiler-button__overlay__label')
+  end
+end
diff --git a/spec/system/severed_relationships_spec.rb b/spec/system/severed_relationships_spec.rb
new file mode 100644
index 0000000000..b933398a08
--- /dev/null
+++ b/spec/system/severed_relationships_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Severed relationships page' do
+  include ProfileStories
+
+  describe 'GET severed_relationships#index' do
+    before do
+      as_a_logged_in_user
+
+      event = Fabricate(:relationship_severance_event)
+      Fabricate.times(3, :severed_relationship, local_account: bob.account, relationship_severance_event: event)
+      Fabricate(:account_relationship_severance_event, account: bob.account, relationship_severance_event: event)
+    end
+
+    it 'returns http success' do
+      visit severed_relationships_path
+
+      expect(page).to have_title(I18n.t('settings.severed_relationships'))
+      expect(page).to have_link(href: following_severed_relationship_path(AccountRelationshipSeveranceEvent.first, format: :csv))
+    end
+  end
+end
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index fd02d1120c..5fdbeacefa 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'ShareEntrypoint' do
+describe 'ShareEntrypoint', :js, :streaming do
   include ProfileStories
 
   subject { page }
@@ -19,13 +19,13 @@ describe 'ShareEntrypoint' do
 
   it 'can be used to post a new status' do
     expect(subject).to have_css('div#mastodon-compose')
-    expect(subject).to have_css('.compose-form__publish-button-wrapper > button')
+    expect(subject).to have_css('.compose-form__submit')
 
     status_text = 'This is a new status!'
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.notification-bar-message', text: 'Post published.')
diff --git a/spec/system/unlogged_spec.rb b/spec/system/unlogged_spec.rb
index c3ebf51d7f..417ccdaeb6 100644
--- a/spec/system/unlogged_spec.rb
+++ b/spec/system/unlogged_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'UnloggedBrowsing' do
+describe 'UnloggedBrowsing', :js, :streaming do
   subject { page }
 
   before do
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index 6292f0737e..86760df2e7 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe BlacklistedEmailValidator do
   describe '#validate' do
-    subject { described_class.new.validate(user); errors }
+    subject { described_class.new.validate(user) }
 
     let(:user)   { instance_double(User, email: 'info@mail.com', sign_up_ip: '1.2.3.4', errors: errors) }
     let(:errors) { instance_double(ActiveModel::Errors, add: nil) }
@@ -18,7 +18,8 @@ RSpec.describe BlacklistedEmailValidator do
       let(:blocked_email) { true }
 
       it 'adds error' do
-        described_class.new.validate(user)
+        subject
+
         expect(errors).to have_received(:add).with(:email, :blocked).once
       end
     end
@@ -27,7 +28,8 @@ RSpec.describe BlacklistedEmailValidator do
       let(:blocked_email) { false }
 
       it 'does not add errors' do
-        described_class.new.validate(user)
+        subject
+
         expect(errors).to_not have_received(:add)
       end
 
@@ -39,7 +41,8 @@ RSpec.describe BlacklistedEmailValidator do
         end
 
         it 'adds error' do
-          described_class.new.validate(user)
+          subject
+
           expect(errors).to have_received(:add).with(:email, :taken).once
         end
       end
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index 21b1ad0a11..bc26be8729 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -5,6 +5,7 @@ require 'rails_helper'
 describe EmailMxValidator do
   describe '#validate' do
     let(:user) { instance_double(User, email: 'foo@example.com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil)) }
+    let(:resolv_dns_double) { instance_double(Resolv::DNS) }
 
     context 'with an e-mail domain that is explicitly allowed' do
       around do |block|
@@ -15,13 +16,7 @@ describe EmailMxValidator do
       end
 
       it 'does not add errors if there are no DNS records' do
-        resolver = instance_double(Resolv::DNS)
-
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-        allow(resolver).to receive(:timeouts=).and_return(nil)
-        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+        configure_resolver('example.com')
 
         subject.validate(user)
         expect(user.errors).to_not have_received(:add)
@@ -29,13 +24,7 @@ describe EmailMxValidator do
     end
 
     it 'adds no error if there are DNS records for the e-mail domain' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com', a: resolv_double_a('192.0.2.42'))
 
       subject.validate(user)
       expect(user.errors).to_not have_received(:add)
@@ -58,13 +47,7 @@ describe EmailMxValidator do
     end
 
     it 'adds an error if the email domain name contains empty labels' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::A).and_return([Resolv::DNS::Resource::IN::A.new('192.0.2.42')])
-      allow(resolver).to receive(:getresources).with('example..com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example..com', a: resolv_double_a('192.0.2.42'))
 
       user = instance_double(User, email: 'foo@example..com', sign_up_ip: '1.2.3.4', errors: instance_double(ActiveModel::Errors, add: nil))
       subject.validate(user)
@@ -72,30 +55,15 @@ describe EmailMxValidator do
     end
 
     it 'adds an error if there are no DNS records for the e-mail domain' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::MX).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com')
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
     end
 
     it 'adds an error if a MX record does not lead to an IP' do
-      resolver = instance_double(Resolv::DNS)
-
-      allow(resolver).to receive(:getresources)
-        .with('example.com', Resolv::DNS::Resource::IN::MX)
-        .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver('example.com', mx: resolv_double_mx('mail.example.com'))
+      configure_resolver('mail.example.com')
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
@@ -103,20 +71,48 @@ describe EmailMxValidator do
 
     it 'adds an error if the MX record is blacklisted' do
       EmailDomainBlock.create!(domain: 'mail.example.com')
-      resolver = instance_double(Resolv::DNS)
 
-      allow(resolver).to receive(:getresources)
-        .with('example.com', Resolv::DNS::Resource::IN::MX)
-        .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
-      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
-      allow(resolver).to receive(:timeouts=).and_return(nil)
-      allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      configure_resolver(
+        'example.com',
+        mx: resolv_double_mx('mail.example.com')
+      )
+      configure_resolver(
+        'mail.example.com',
+        a: instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5'),
+        aaaa: instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')
+      )
 
       subject.validate(user)
       expect(user.errors).to have_received(:add)
     end
   end
+
+  def configure_resolver(domain, options = {})
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::MX)
+      .and_return(Array(options[:mx]))
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::A)
+      .and_return(Array(options[:a]))
+    allow(resolv_dns_double)
+      .to receive(:getresources)
+      .with(domain, Resolv::DNS::Resource::IN::AAAA)
+      .and_return(Array(options[:aaaa]))
+    allow(resolv_dns_double)
+      .to receive(:timeouts=)
+      .and_return(nil)
+    allow(Resolv::DNS)
+      .to receive(:open)
+      .and_yield(resolv_dns_double)
+  end
+
+  def resolv_double_mx(domain)
+    instance_double(Resolv::DNS::Resource::MX, exchange: domain)
+  end
+
+  def resolv_double_a(domain)
+    Resolv::DNS::Resource::IN::A.new(domain)
+  end
 end
diff --git a/spec/validators/follow_limit_validator_spec.rb b/spec/validators/follow_limit_validator_spec.rb
index 51b0683d27..e069b0ed3a 100644
--- a/spec/validators/follow_limit_validator_spec.rb
+++ b/spec/validators/follow_limit_validator_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe FollowLimitValidator do
 
             follow.valid?
 
-            expect(follow.errors[:base]).to include(I18n.t('users.follow_limit_reached', limit: FollowLimitValidator::LIMIT))
+            expect(follow.errors[:base]).to include(I18n.t('users.follow_limit_reached', limit: described_class::LIMIT))
           end
         end
 
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index 06625917bd..ead69dfe21 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -4,6 +4,8 @@ require 'rails_helper'
 
 describe StatusLengthValidator do
   describe '#validate' do
+    before { stub_const("#{described_class}::MAX_CHARS", 500) } # Example values below are relative to this baseline
+
     it 'does not add errors onto remote statuses' do
       status = instance_double(Status, local?: false)
       allow(status).to receive(:errors)
@@ -22,27 +24,27 @@ describe StatusLengthValidator do
       expect(status).to_not have_received(:errors)
     end
 
-    it 'adds an error when content warning is over 500 characters' do
-      status = instance_double(Status, spoiler_text: 'a' * 520, text: '', errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when content warning is over character limit' do
+      status = status_double(spoiler_text: 'a' * 520)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
-    it 'adds an error when text is over 500 characters' do
-      status = instance_double(Status, spoiler_text: '', text: 'a' * 520, errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when text is over character limit' do
+      status = status_double(text: 'a' * 520)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
-    it 'adds an error when text and content warning are over 500 characters total' do
-      status = instance_double(Status, spoiler_text: 'a' * 250, text: 'b' * 251, errors: activemodel_errors, local?: true, reblog?: false)
+    it 'adds an error when text and content warning are over character limit total' do
+      status = status_double(spoiler_text: 'a' * 250, text: 'b' * 251)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
     it 'counts URLs as 23 characters flat' do
       text   = ('a' * 476) + " http://#{'b' * 30}.com/example"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
@@ -50,7 +52,7 @@ describe StatusLengthValidator do
 
     it 'does not count non-autolinkable URLs as 23 characters flat' do
       text   = ('a' * 476) + "http://#{'b' * 30}.com/example"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to have_received(:add)
@@ -58,14 +60,14 @@ describe StatusLengthValidator do
 
     it 'does not count overly long URLs as 23 characters flat' do
       text = "http://example.com/valid?#{'#foo?' * 1000}"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
       subject.validate(status)
       expect(status.errors).to have_received(:add)
     end
 
     it 'counts only the front part of remote usernames' do
       text   = ('a' * 475) + " @alice@#{'b' * 30}.com"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to_not have_received(:add)
@@ -73,7 +75,7 @@ describe StatusLengthValidator do
 
     it 'does count both parts of remote usernames for overly long domains' do
       text   = "@alice@#{'b' * 500}.com"
-      status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
+      status = status_double(text: text)
 
       subject.validate(status)
       expect(status.errors).to have_received(:add)
@@ -82,6 +84,17 @@ describe StatusLengthValidator do
 
   private
 
+  def status_double(spoiler_text: '', text: '')
+    instance_double(
+      Status,
+      spoiler_text: spoiler_text,
+      text: text,
+      errors: activemodel_errors,
+      local?: true,
+      reblog?: false
+    )
+  end
+
   def activemodel_errors
     instance_double(ActiveModel::Errors, add: nil)
   end
diff --git a/spec/views/statuses/show.html.haml_spec.rb b/spec/views/statuses/show.html.haml_spec.rb
index 233965883a..1c408db6c5 100644
--- a/spec/views/statuses/show.html.haml_spec.rb
+++ b/spec/views/statuses/show.html.haml_spec.rb
@@ -3,46 +3,41 @@
 require 'rails_helper'
 
 describe 'statuses/show.html.haml', :without_verify_partial_doubles do
+  let(:alice) { Fabricate(:account, username: 'alice', display_name: 'Alice') }
+  let(:status) { Fabricate(:status, account: alice, text: 'Hello World') }
+
   before do
-    allow(view).to receive_messages(api_oembed_url: '', show_landing_strip?: true, site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
+    allow(view).to receive_messages(api_oembed_url: '', site_title: 'example site', site_hostname: 'example.com', full_asset_url: '//asset.host/image.svg', current_account: nil, single_user_mode?: false)
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
     assign(:instance_presenter, InstancePresenter.new)
+
+    Fabricate(:media_attachment, account: alice, status: status, type: :video)
+
+    assign(:status, status)
+    assign(:account, alice)
+    assign(:descendant_threads, [])
   end
 
   it 'has valid opengraph tags' do
-    alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    status = Fabricate(:status, account: alice, text: 'Hello World')
-    Fabricate(:media_attachment, account: alice, status: status, type: :video)
-
-    assign(:status, status)
-    assign(:account, alice)
-    assign(:descendant_threads, [])
-
     render
 
-    header_tags = view.content_for(:header_tags)
-
-    expect(header_tags).to match(/<meta content=".+" property="og:title">/)
-    expect(header_tags).to match(/<meta content="article" property="og:type">/)
-    expect(header_tags).to match(/<meta content=".+" property="og:image">/)
-    expect(header_tags).to match(%r{<meta content="http://.+" property="og:url">})
+    expect(header_tags)
+      .to match(/<meta content=".+" property="og:title">/)
+      .and match(/<meta content="article" property="og:type">/)
+      .and match(/<meta content=".+" property="og:image">/)
+      .and match(%r{<meta content="http://.+" property="og:url">})
   end
 
   it 'has twitter player tag' do
-    alice  = Fabricate(:account, username: 'alice', display_name: 'Alice')
-    status = Fabricate(:status, account: alice, text: 'Hello World')
-    Fabricate(:media_attachment, account: alice, status: status, type: :video)
-
-    assign(:status, status)
-    assign(:account, alice)
-    assign(:descendant_threads, [])
-
     render
 
-    header_tags = view.content_for(:header_tags)
+    expect(header_tags)
+      .to match(%r{<meta content="http://.+/media/.+/player" property="twitter:player">})
+      .and match(/<meta content="player" property="twitter:card">/)
+  end
 
-    expect(header_tags).to match(%r{<meta content="http://.+/media/.+/player" property="twitter:player">})
-    expect(header_tags).to match(/<meta content="player" property="twitter:card">/)
+  def header_tags
+    view.content_for(:header_tags)
   end
 end
diff --git a/spec/workers/activitypub/distribution_worker_spec.rb b/spec/workers/activitypub/distribution_worker_spec.rb
index 2706967fca..523cab85bf 100644
--- a/spec/workers/activitypub/distribution_worker_spec.rb
+++ b/spec/workers/activitypub/distribution_worker_spec.rb
@@ -6,7 +6,7 @@ describe ActivityPub::DistributionWorker do
   subject { described_class.new }
 
   let(:status)   { Fabricate(:status) }
-  let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com', domain: 'example.com') }
+  let(:follower) { Fabricate(:account, protocol: :activitypub, shared_inbox_url: 'http://example.com', inbox_url: 'http://example.com/follower/inbox', domain: 'example.com') }
 
   describe '#perform' do
     before do
@@ -25,6 +25,18 @@ describe ActivityPub::DistributionWorker do
       end
     end
 
+    context 'with unlisted status' do
+      before do
+        status.update(visibility: :unlisted)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
+      end
+    end
+
     context 'with private status' do
       before do
         status.update(visibility: :private)
@@ -37,6 +49,52 @@ describe ActivityPub::DistributionWorker do
       end
     end
 
+    context 'with limited status' do
+      before do
+        status.update(visibility: :limited)
+        status.capability_tokens.create!
+        status.mentions.create!(account: follower, silent: true)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com/follower/inbox', anything]]) do
+          subject.perform(status.id)
+        end
+      end
+    end
+
+    context 'with limited response status' do
+      before do
+        allow(ActivityPub::DeliveryWorker).to receive(:perform_async).with(kind_of(String), status.account.id, 'http://example.com/conversation/inbox', anything)
+        status.update(visibility: :limited, thread: Fabricate(:status))
+        status.conversation.update(uri: 'https://example.com/conversation', inbox_url: 'http://example.com/conversation/inbox')
+        status.capability_tokens.create!
+        status.mentions.create!(account: follower, silent: true)
+        stub_request(:post, 'http://example.com/conversation/inbox')
+      end
+
+      it 'delivers to followers' do
+        subject.perform(status.id)
+        expect(ActivityPub::DeliveryWorker).to have_received(:perform_async)
+      end
+    end
+
+    context 'with limited status for no-follower but non-mentioned follower' do
+      let(:no_follower) { Fabricate(:account, domain: 'example.com', inbox_url: 'http://example.com/no_follower/inbox', shared_inbox_url: 'http://example.com') }
+
+      before do
+        status.update(visibility: :limited)
+        status.capability_tokens.create!
+        status.mentions.create!(account: no_follower, silent: true)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com/no_follower/inbox', anything]]) do
+          subject.perform(status.id)
+        end
+      end
+    end
+
     context 'with direct status' do
       let(:mentioned_account) { Fabricate(:account, protocol: :activitypub, inbox_url: 'https://foo.bar/inbox', domain: 'foo.bar') }
 
diff --git a/spec/workers/activitypub/fetch_instance_info_worker_spec.rb b/spec/workers/activitypub/fetch_instance_info_worker_spec.rb
new file mode 100644
index 0000000000..9dc9594041
--- /dev/null
+++ b/spec/workers/activitypub/fetch_instance_info_worker_spec.rb
@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ActivityPub::FetchInstanceInfoWorker do
+  subject { described_class.new }
+
+  let(:wellknown_nodeinfo) do
+    {
+      links: [
+        {
+          rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0',
+          href: 'https://example.com/nodeinfo/2.0',
+        },
+      ],
+    }
+  end
+
+  let(:nodeinfo) do
+    {
+      version: '2.0',
+      software: {
+        name: 'mastodon',
+        version: '4.2.0-beta1',
+      },
+      protocols: ['activitypub'],
+    }
+  end
+
+  let(:wellknown_nodeinfo_json) { Oj.dump(wellknown_nodeinfo) }
+  let(:nodeinfo_json) { Oj.dump(nodeinfo) }
+
+  context 'when success' do
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 200, body: wellknown_nodeinfo_json)
+      stub_request(:get, 'https://example.com/nodeinfo/2.0').to_return(status: 200, body: nodeinfo_json)
+      Fabricate(:account, domain: 'example.com')
+      Instance.refresh
+    end
+
+    it 'performs a mastodon instance' do
+      subject.perform('example.com')
+
+      info = InstanceInfo.find_by(domain: 'example.com')
+      expect(info).to_not be_nil
+      expect(info.software).to eq 'mastodon'
+      expect(info.version).to eq '4.2.0-beta1'
+    end
+  end
+
+  context 'when update' do
+    let(:new_nodeinfo) do
+      {
+        version: '2.0',
+        software: {
+          name: 'mastodon',
+          version: '4.2.0-beta3',
+        },
+        protocols: ['activitypub'],
+      }
+    end
+    let(:new_nodeinfo_json) { Oj.dump(new_nodeinfo) }
+
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 200, body: wellknown_nodeinfo_json)
+      Fabricate(:account, domain: 'example.com')
+      Instance.refresh
+    end
+
+    it 'does not update immediately' do
+      stub_request(:get, 'https://example.com/nodeinfo/2.0').to_return(status: 200, body: nodeinfo_json)
+      subject.perform('example.com')
+      stub_request(:get, 'https://example.com/nodeinfo/2.0').to_return(status: 200, body: new_nodeinfo_json)
+      subject.perform('example.com')
+
+      info = InstanceInfo.find_by(domain: 'example.com')
+      expect(info).to_not be_nil
+      expect(info.software).to eq 'mastodon'
+      expect(info.version).to eq '4.2.0-beta1'
+    end
+
+    it 'performs a mastodon instance' do
+      stub_request(:get, 'https://example.com/nodeinfo/2.0').to_return(status: 200, body: nodeinfo_json)
+      subject.perform('example.com')
+      Rails.cache.delete('fetch_instance_info:example.com')
+      stub_request(:get, 'https://example.com/nodeinfo/2.0').to_return(status: 200, body: new_nodeinfo_json)
+      subject.perform('example.com')
+
+      info = InstanceInfo.find_by(domain: 'example.com')
+      expect(info).to_not be_nil
+      expect(info.software).to eq 'mastodon'
+      expect(info.version).to eq '4.2.0-beta3'
+    end
+  end
+
+  context 'when failed' do
+    before do
+      stub_request(:get, 'https://example.com/.well-known/nodeinfo').to_return(status: 404)
+      Fabricate(:account, domain: 'example.com')
+      Instance.refresh
+    end
+
+    it 'performs a mastodon instance' do
+      expect(subject.perform('example.com')).to be true
+
+      info = InstanceInfo.find_by(domain: 'example.com')
+      expect(info).to be_nil
+    end
+
+    it 'does not fetch again immediately' do
+      expect(subject.perform('example.com')).to be true
+      expect(subject.perform('example.com')).to be true
+
+      expect(a_request(:get, 'https://example.com/.well-known/nodeinfo')).to have_been_made.once
+    end
+  end
+end
diff --git a/spec/workers/activitypub/fetch_remote_status_worker_spec.rb b/spec/workers/activitypub/fetch_remote_status_worker_spec.rb
new file mode 100644
index 0000000000..6336c21558
--- /dev/null
+++ b/spec/workers/activitypub/fetch_remote_status_worker_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ActivityPub::FetchRemoteStatusWorker do
+  subject { described_class.new }
+
+  let(:sender) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
+  let(:payload) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: 'https://example.com/note',
+      attributedTo: sender.uri,
+      type: 'Note',
+      content: 'Lorem ipsum',
+      to: 'https://www.w3.org/ns/activitystreams#Public',
+      tag: [
+        {
+          type: 'Mention',
+          href: ActivityPub::TagManager.instance.uri_for(Fabricate(:account)),
+        },
+      ],
+    }
+  end
+  let(:json) { Oj.dump(payload) }
+
+  before do
+    stub_request(:get, 'https://example.com/note').to_return(status: 200, body: json, headers: { 'Content-Type': 'application/activity+json' })
+  end
+
+  describe '#perform' do
+    it 'original status is fetched' do
+      subject.perform('https://example.com/note', sender.id, Fabricate(:account).id)
+
+      status = sender.statuses.first
+
+      expect(status).to_not be_nil
+      expect(status.text).to eq 'Lorem ipsum'
+    end
+  end
+end
diff --git a/spec/workers/activitypub/fetch_replies_worker_spec.rb b/spec/workers/activitypub/fetch_replies_worker_spec.rb
index ff4d049a26..2d080e286e 100644
--- a/spec/workers/activitypub/fetch_replies_worker_spec.rb
+++ b/spec/workers/activitypub/fetch_replies_worker_spec.rb
@@ -21,7 +21,7 @@ describe ActivityPub::FetchRepliesWorker do
 
   describe 'perform' do
     it 'performs a request if the collection URI is from the same host' do
-      stub_request(:get, 'https://example.com/statuses_replies/1').to_return(status: 200, body: json)
+      stub_request(:get, 'https://example.com/statuses_replies/1').to_return(status: 200, body: json, headers: { 'Content-Type': 'application/activity+json' })
       subject.perform(status.id, 'https://example.com/statuses_replies/1')
       expect(a_request(:get, 'https://example.com/statuses_replies/1')).to have_been_made.once
     end
diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
index a4fd246e53..8f2cefcc32 100644
--- a/spec/workers/activitypub/status_update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
@@ -6,7 +6,7 @@ describe ActivityPub::StatusUpdateDistributionWorker do
   subject { described_class.new }
 
   let(:status)   { Fabricate(:status, text: 'foo') }
-  let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com', domain: 'example.com') }
+  let(:follower) { Fabricate(:account, protocol: :activitypub, shared_inbox_url: 'http://example.com', inbox_url: 'http://example.com/follower/inbox', domain: 'example.com') }
 
   describe '#perform' do
     before do
@@ -31,6 +31,18 @@ describe ActivityPub::StatusUpdateDistributionWorker do
       end
     end
 
+    context 'with unlisted status' do
+      before do
+        status.update(visibility: :unlisted)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
+      end
+    end
+
     context 'with private status' do
       before do
         status.update(visibility: :private)
@@ -42,5 +54,35 @@ describe ActivityPub::StatusUpdateDistributionWorker do
         end
       end
     end
+
+    context 'with limited status' do
+      before do
+        status.update(visibility: :limited)
+        status.capability_tokens.create!
+        status.mentions.create!(account: follower, silent: true)
+      end
+
+      it 'delivers to followers' do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
+      end
+    end
+
+    context 'with limited response status' do
+      before do
+        allow(ActivityPub::DeliveryWorker).to receive(:perform_async).with(kind_of(String), status.account.id, 'http://example.com/conversation/inbox', anything)
+        status.update(visibility: :limited, thread: Fabricate(:status))
+        status.conversation.update(uri: 'https://example.com/conversation', inbox_url: 'http://example.com/conversation/inbox')
+        status.capability_tokens.create!
+        status.mentions.create!(account: follower, silent: true)
+        stub_request(:post, 'http://example.com/conversation/inbox')
+      end
+
+      it 'delivers to followers' do
+        subject.perform(status.id)
+        expect(ActivityPub::DeliveryWorker).to have_received(:perform_async)
+      end
+    end
   end
 end
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
index 987cbc7d60..74928c7ca6 100644
--- a/spec/workers/backup_worker_spec.rb
+++ b/spec/workers/backup_worker_spec.rb
@@ -15,12 +15,17 @@ describe BackupWorker do
     let!(:other_backup) { Fabricate(:backup, user: backup.user) }
 
     it 'sends the backup to the service and removes other backups', :sidekiq_inline do
-      expect do
-        worker.perform(backup.id)
-      end.to change(UserMailer.deliveries, :size).by(1)
+      emails = capture_emails { worker.perform(backup.id) }
 
       expect(service).to have_received(:call).with(backup)
       expect { other_backup.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(emails.size)
+        .to eq(1)
+      expect(emails.first)
+        .to have_attributes(
+          to: contain_exactly(backup.user.email),
+          subject: I18n.t('user_mailer.backup_ready.subject')
+        )
     end
 
     context 'when sidekiq retries are exhausted' do
diff --git a/spec/workers/feed_insert_worker_spec.rb b/spec/workers/feed_insert_worker_spec.rb
index e9484879ff..80115c08d0 100644
--- a/spec/workers/feed_insert_worker_spec.rb
+++ b/spec/workers/feed_insert_worker_spec.rb
@@ -5,6 +5,10 @@ require 'rails_helper'
 describe FeedInsertWorker do
   subject { described_class.new }
 
+  def notify?(account, type, activity_id)
+    Notification.exists?(account: account, type: type, activity_id: activity_id)
+  end
+
   describe 'perform' do
     let(:follower) { Fabricate(:account) }
     let(:status) { Fabricate(:status) }
@@ -67,5 +71,43 @@ describe FeedInsertWorker do
         expect(instance).to have_received(:push_to_list).with(list, status, update: nil)
       end
     end
+
+    context 'with notification' do
+      it 'skips notification when unset', :sidekiq_inline do
+        subject.perform(status.id, follower.id)
+        expect(notify?(follower, 'status', status.id)).to be false
+      end
+
+      it 'pushes notification when read status is set', :sidekiq_inline do
+        Fabricate(:follow, account: follower, target_account: status.account, notify: true)
+
+        subject.perform(status.id, follower.id)
+        expect(notify?(follower, 'status', status.id)).to be true
+      end
+
+      it 'skips notification when the account is registered list but not notify', :sidekiq_inline do
+        follower.follow!(status.account)
+        list = Fabricate(:list, account: follower)
+        Fabricate(:list_account, list: list, account: status.account)
+
+        subject.perform(status.id, list.id, 'list')
+
+        list_status = ListStatus.find_by(list: list, status: status)
+
+        expect(list_status).to be_nil
+      end
+
+      it 'pushes notification when the account is registered list', :sidekiq_inline do
+        follower.follow!(status.account)
+        list = Fabricate(:list, account: follower, notify: true)
+        Fabricate(:list_account, list: list, account: status.account)
+
+        subject.perform(status.id, list.id, 'list')
+        list_status = ListStatus.find_by(list: list, status: status)
+
+        expect(list_status).to_not be_nil
+        expect(notify?(follower, 'list_status', list_status.id)).to be true
+      end
+    end
   end
 end
diff --git a/spec/workers/process_references_worker_spec.rb b/spec/workers/process_references_worker_spec.rb
new file mode 100644
index 0000000000..10a2bc68f9
--- /dev/null
+++ b/spec/workers/process_references_worker_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ProcessReferencesWorker do
+  let(:worker) { described_class.new }
+
+  describe 'perform' do
+    it 'runs without error for simple call' do
+      expect { worker.perform(1000, [], []) }.to_not raise_error
+    end
+
+    it 'runs without error with no_fetch_urls' do
+      expect { worker.perform(1000, [], [], no_fetch_urls: []) }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/workers/redownload_avatar_worker_spec.rb b/spec/workers/redownload_avatar_worker_spec.rb
index 4ab368e12f..6ef320bc4f 100644
--- a/spec/workers/redownload_avatar_worker_spec.rb
+++ b/spec/workers/redownload_avatar_worker_spec.rb
@@ -41,7 +41,7 @@ describe RedownloadAvatarWorker do
     it 'reprocesses a remote avatar' do
       stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
       account = Fabricate(:account, avatar_remote_url: 'https://example.host/file')
-      account.update_column(:avatar_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+      account.update_column(:avatar_file_name, nil)
 
       result = worker.perform(account.id)
 
diff --git a/spec/workers/redownload_header_worker_spec.rb b/spec/workers/redownload_header_worker_spec.rb
index 3b6f497bb8..746c1a63ff 100644
--- a/spec/workers/redownload_header_worker_spec.rb
+++ b/spec/workers/redownload_header_worker_spec.rb
@@ -41,7 +41,7 @@ describe RedownloadHeaderWorker do
     it 'reprocesses a remote header' do
       stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
       account = Fabricate(:account, header_remote_url: 'https://example.host/file')
-      account.update_column(:header_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+      account.update_column(:header_file_name, nil)
 
       result = worker.perform(account.id)
 
diff --git a/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
new file mode 100644
index 0000000000..c0c50b128d
--- /dev/null
+++ b/spec/workers/scheduler/auto_close_registrations_scheduler_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Scheduler::AutoCloseRegistrationsScheduler do
+  subject { described_class.new }
+
+  describe '#perform' do
+    let(:moderator_activity_date) { Time.now.utc }
+
+    before do
+      Fabricate(:user, role: UserRole.find_by(name: 'Owner'), current_sign_in_at: 10.years.ago)
+      Fabricate(:user, role: UserRole.find_by(name: 'Moderator'), current_sign_in_at: moderator_activity_date)
+    end
+
+    context 'when registrations are open' do
+      before do
+        Setting.registrations_mode = 'open'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'changes registrations mode from open to approved' do
+          expect { subject.perform }.to change(Setting, :registrations_mode).from('open').to('approved')
+        end
+      end
+    end
+
+    context 'when registrations are closed' do
+      before do
+        Setting.registrations_mode = 'none'
+      end
+
+      context 'when a moderator has logged in recently' do
+        let(:moderator_activity_date) { Time.now.utc }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+
+      context 'when a moderator has not recently signed in' do
+        let(:moderator_activity_date) { 1.year.ago }
+
+        it 'does not change registrations mode' do
+          expect { subject.perform }.to_not change(Setting, :registrations_mode)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index 8fda246ba8..c3940901d4 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -14,7 +14,7 @@ describe Scheduler::UserCleanupScheduler do
     before do
       # Need to update the already-existing users because their initialization overrides confirmation_sent_at
       new_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: Time.now.utc)
-      old_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: 1.week.ago)
+      old_unconfirmed_user.update!(confirmed_at: nil, confirmation_sent_at: 10.days.ago)
       confirmed_user.update!(confirmed_at: 1.day.ago)
     end
 
diff --git a/streaming/.eslintrc.cjs b/streaming/.eslintrc.cjs
new file mode 100644
index 0000000000..e25cff7df0
--- /dev/null
+++ b/streaming/.eslintrc.cjs
@@ -0,0 +1,43 @@
+/* eslint-disable import/no-commonjs */
+
+// @ts-check
+
+// @ts-ignore - This needs to be a CJS file (eslint does not yet support ESM configs), and TS is complaining we use require
+const { defineConfig } = require('eslint-define-config');
+
+module.exports = defineConfig({
+  extends: ['../.eslintrc.js'],
+  env: {
+    browser: false,
+  },
+  parserOptions: {
+    project: true,
+    tsconfigRootDir: __dirname,
+    ecmaFeatures: {
+      jsx: false,
+    },
+    ecmaVersion: 2021,
+  },
+  rules: {
+    // In the streaming server we need to delete some variables to ensure
+    // garbage collection takes place on the values referenced by those objects;
+    // The alternative is to declare the variable as nullable, but then we need
+    // to assert it's in existence before every use, which becomes much harder
+    // to maintain.
+    'no-delete-var': 'off',
+
+    // This overrides the base configuration for this rule to pick up
+    // dependencies for the streaming server from the correct package.json file.
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        devDependencies: ['streaming/.eslintrc.cjs'],
+        optionalDependencies: false,
+        peerDependencies: false,
+        includeTypes: true,
+        packageDir: __dirname,
+      },
+    ],
+    'import/extensions': ['error', 'always'],
+  },
+});
diff --git a/streaming/.eslintrc.js b/streaming/.eslintrc.js
deleted file mode 100644
index 5e2d233c68..0000000000
--- a/streaming/.eslintrc.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// @ts-check
-const { defineConfig } = require('eslint-define-config');
-
-module.exports = defineConfig({
-  extends: ['../.eslintrc.js'],
-  env: {
-    browser: false,
-  },
-  parserOptions: {
-    project: true,
-    tsconfigRootDir: __dirname,
-    ecmaFeatures: {
-      jsx: false,
-    },
-    ecmaVersion: 2021,
-  },
-  rules: {
-    'import/no-commonjs': 'off',
-    'import/no-extraneous-dependencies': [
-      'error',
-      {
-        devDependencies: [
-          'streaming/.eslintrc.js',
-        ],
-        optionalDependencies: false,
-        peerDependencies: false,
-        includeTypes: true,
-        packageDir: __dirname,
-      },
-    ],
-  },
-});
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 241009fe89..7f373e9cd5 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
diff --git a/streaming/errors.js b/streaming/errors.js
new file mode 100644
index 0000000000..6c44d2cb8f
--- /dev/null
+++ b/streaming/errors.js
@@ -0,0 +1,46 @@
+// @ts-check
+
+/**
+ * Typed as a string because otherwise it's a const string, which means we can't
+ * override it in let statements.
+ * @type {string}
+ */
+export const UNEXPECTED_ERROR_MESSAGE = 'An unexpected error occurred';
+
+/**
+ * Extracts the status and message properties from the error object, if
+ * available for public use. The `unknown` is for catch statements
+ * @param {Error | AuthenticationError | RequestError | unknown} err
+ */
+export function extractStatusAndMessage(err) {
+  let statusCode = 500;
+  let errorMessage = UNEXPECTED_ERROR_MESSAGE;
+  if (err instanceof AuthenticationError || err instanceof RequestError) {
+    statusCode = err.status;
+    errorMessage = err.message;
+  }
+
+  return { statusCode, errorMessage };
+}
+
+export class RequestError extends Error {
+  /**
+   * @param {string} message
+   */
+  constructor(message) {
+    super(message);
+    this.name = "RequestError";
+    this.status = 400;
+  }
+}
+
+export class AuthenticationError extends Error {
+  /**
+   * @param {string} message
+   */
+  constructor(message) {
+    super(message);
+    this.name = "AuthenticationError";
+    this.status = 401;
+  }
+}
diff --git a/streaming/index.js b/streaming/index.js
index 42d0afc7c5..fff190c2de 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1,42 +1,67 @@
 // @ts-check
 
-const fs = require('fs');
-const http = require('http');
-const path = require('path');
-const url = require('url');
+import fs from 'node:fs';
+import http from 'node:http';
+import path from 'node:path';
+import url from 'node:url';
 
-const cors = require('cors');
-const dotenv = require('dotenv');
-const express = require('express');
-const Redis = require('ioredis');
-const { JSDOM } = require('jsdom');
-const log = require('npmlog');
-const pg = require('pg');
-const dbUrlToConfig = require('pg-connection-string').parse;
-const uuid = require('uuid');
-const WebSocket = require('ws');
+import cors from 'cors';
+import dotenv from 'dotenv';
+import express from 'express';
+import { Redis } from 'ioredis';
+import { JSDOM } from 'jsdom';
+import pg from 'pg';
+import pgConnectionString from 'pg-connection-string';
+import WebSocket from 'ws';
 
-const { setupMetrics } = require('./metrics');
-const { isTruthy } = require("./utils");
+import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js';
+import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js';
+import { setupMetrics } from './metrics.js';
+import { isTruthy, normalizeHashtag, firstParam } from './utils.js';
 
 const environment = process.env.NODE_ENV || 'development';
 
 // Correctly detect and load .env or .env.production file based on environment:
 const dotenvFile = environment === 'production' ? '.env.production' : '.env';
+const dotenvFilePath = path.resolve(
+  url.fileURLToPath(
+    new URL(path.join('..', dotenvFile), import.meta.url)
+  )
+);
 
 dotenv.config({
-  path: path.resolve(__dirname, path.join('..', dotenvFile))
+  path: dotenvFilePath
 });
 
-log.level = process.env.LOG_LEVEL || 'verbose';
+initializeLogLevel(process.env, environment);
 
 /**
- * @param {Object.<string, any>} config
+ * Declares the result type for accountFromToken / accountFromRequest.
+ *
+ * Note: This is here because jsdoc doesn't like importing types that
+ * are nested in functions
+ * @typedef ResolvedAccount
+ * @property {string} accessTokenId
+ * @property {string[]} scopes
+ * @property {string} accountId
+ * @property {string[]} chosenLanguages
+ * @property {string} deviceId
  */
-const createRedisClient = async (config) => {
-  const { redisParams, redisUrl } = config;
-  const client = new Redis(redisUrl, redisParams);
-  client.on('error', (err) => log.error('Redis Client Error!', err));
+
+/**
+ * @param {RedisConfiguration} config
+ * @returns {Promise<Redis>}
+ */
+const createRedisClient = async ({ redisParams, redisUrl }) => {
+  let client;
+
+  if (typeof redisUrl === 'string') {
+    client = new Redis(redisUrl, redisParams);
+  } else {
+    client = new Redis(redisParams);
+  }
+
+  client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
 
   return client;
 };
@@ -61,50 +86,113 @@ const parseJSON = (json, req) => {
      */
     if (req) {
       if (req.accountId) {
-        log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+        req.log.error({ err }, `Error parsing message from user ${req.accountId}`);
       } else {
-        log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+        req.log.error({ err }, `Error parsing message from ${req.remoteAddress}`);
       }
     } else {
-      log.warn(`Error parsing message from redis: ${err}`);
+      logger.error({ err }, `Error parsing message from redis`);
     }
     return null;
   }
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} the configuration for the PostgreSQL connection
+ * Takes an environment variable that should be an integer, attempts to parse
+ * it falling back to a default if not set, and handles errors parsing.
+ * @param {string|undefined} value
+ * @param {number} defaultValue
+ * @param {string} variableName
+ * @returns {number}
+ */
+const parseIntFromEnv = (value, defaultValue, variableName) => {
+  if (typeof value === 'string' && value.length > 0) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+      throw new Error(`Invalid ${variableName} environment variable: ${value}`);
+    }
+    return parsedValue;
+  } else {
+    return defaultValue;
+  }
+};
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {pg.PoolConfig} the configuration for the PostgreSQL connection
  */
 const pgConfigFromEnv = (env) => {
+  /** @type {Record<string, pg.PoolConfig>} */
   const pgConfigs = {
     development: {
-      user:     env.DB_USER || pg.defaults.user,
+      user: env.DB_USER || pg.defaults.user,
       password: env.DB_PASS || pg.defaults.password,
       database: env.DB_NAME || 'mastodon_development',
-      host:     env.DB_HOST || pg.defaults.host,
-      port:     env.DB_PORT || pg.defaults.port,
+      host: env.DB_HOST || pg.defaults.host,
+      port: parseIntFromEnv(env.DB_PORT, pg.defaults.port ?? 5432, 'DB_PORT')
     },
 
     production: {
-      user:     env.DB_USER || 'mastodon',
+      user: env.DB_USER || 'mastodon',
       password: env.DB_PASS || '',
       database: env.DB_NAME || 'mastodon_production',
-      host:     env.DB_HOST || 'localhost',
-      port:     env.DB_PORT || 5432,
+      host: env.DB_HOST || 'localhost',
+      port: parseIntFromEnv(env.DB_PORT, 5432, 'DB_PORT')
     },
   };
 
-  let baseConfig;
+  /**
+   * @type {pg.PoolConfig}
+   */
+  let baseConfig = {};
 
   if (env.DATABASE_URL) {
-    baseConfig = dbUrlToConfig(env.DATABASE_URL);
+    const parsedUrl = pgConnectionString.parse(env.DATABASE_URL);
+
+    // The result of dbUrlToConfig from pg-connection-string is not type
+    // compatible with pg.PoolConfig, since parts of the connection URL may be
+    // `null` when pg.PoolConfig expects `undefined`, as such we have to
+    // manually create the baseConfig object from the properties of the
+    // parsedUrl.
+    //
+    // For more information see:
+    // https://github.com/brianc/node-postgres/issues/2280
+    //
+    // FIXME: clean up once brianc/node-postgres#3128 lands
+    if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password;
+    if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host;
+    if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user;
+    if (typeof parsedUrl.port === 'string') {
+      const parsedPort = parseInt(parsedUrl.port, 10);
+      if (isNaN(parsedPort)) {
+        throw new Error('Invalid port specified in DATABASE_URL environment variable');
+      }
+      baseConfig.port = parsedPort;
+    }
+    if (typeof parsedUrl.database === 'string') baseConfig.database = parsedUrl.database;
+    if (typeof parsedUrl.options === 'string') baseConfig.options = parsedUrl.options;
+
+    // The pg-connection-string type definition isn't correct, as parsedUrl.ssl
+    // can absolutely be an Object, this is to work around these incorrect
+    // types, including the casting of parsedUrl.ssl to Record<string, any>
+    if (typeof parsedUrl.ssl === 'boolean') {
+      baseConfig.ssl = parsedUrl.ssl;
+    } else if (typeof parsedUrl.ssl === 'object' && !Array.isArray(parsedUrl.ssl) && parsedUrl.ssl !== null) {
+      /** @type {Record<string, any>} */
+      const sslOptions = parsedUrl.ssl;
+      baseConfig.ssl = {};
+
+      baseConfig.ssl.cert = sslOptions.cert;
+      baseConfig.ssl.key = sslOptions.key;
+      baseConfig.ssl.ca = sslOptions.ca;
+      baseConfig.ssl.rejectUnauthorized = sslOptions.rejectUnauthorized;
+    }
 
     // Support overriding the database password in the connection URL
     if (!baseConfig.password && env.DB_PASS) {
       baseConfig.password = env.DB_PASS;
     }
-  } else {
+  } else if (Object.hasOwn(pgConfigs, environment)) {
     baseConfig = pgConfigs[environment];
 
     if (env.DB_SSLMODE) {
@@ -121,29 +209,46 @@ const pgConfigFromEnv = (env) => {
         break;
       }
     }
+  } else {
+    throw new Error('Unable to resolve postgresql database configuration.');
   }
 
   return {
     ...baseConfig,
-    max: env.DB_POOL || 10,
+    max: parseIntFromEnv(env.DB_POOL, 10, 'DB_POOL'),
     connectionTimeoutMillis: 15000,
+    // Deliberately set application_name to an empty string to prevent excessive
+    // CPU usage with PG Bouncer. See:
+    // - https://github.com/mastodon/mastodon/pull/23958
+    // - https://github.com/pgbouncer/pgbouncer/issues/349
     application_name: '',
   };
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} configuration for the Redis connection
+ * @typedef RedisConfiguration
+ * @property {import('ioredis').RedisOptions} redisParams
+ * @property {string} redisPrefix
+ * @property {string|undefined} redisUrl
+ */
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {RedisConfiguration} configuration for the Redis connection
  */
 const redisConfigFromEnv = (env) => {
   // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
   // which means we can't use it. But this is something that should be looked into.
   const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
 
+  let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
+  let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
+
+  /** @type {import('ioredis').RedisOptions} */
   const redisParams = {
     host: env.REDIS_HOST || '127.0.0.1',
-    port: env.REDIS_PORT || 6379,
-    db: env.REDIS_DB || 0,
+    port: redisPort,
+    db: redisDatabase,
     password: env.REDIS_PASSWORD || undefined,
   };
 
@@ -155,7 +260,7 @@ const redisConfigFromEnv = (env) => {
   return {
     redisParams,
     redisPrefix,
-    redisUrl: env.REDIS_URL,
+    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
   };
 };
 
@@ -182,14 +287,93 @@ const CHANNEL_NAMES = [
 ];
 
 const startServer = async () => {
+  const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
+  const server = http.createServer();
+  const wss = new WebSocket.Server({ noServer: true });
+
+  // Set the X-Request-Id header on WebSockets:
+  wss.on("headers", function onHeaders(headers, req) {
+    headers.push(`X-Request-Id: ${req.id}`);
+  });
+
   const app = express();
 
   app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');
 
-  const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
-  const server = http.createServer(app);
+  app.use(httpLogger);
   app.use(cors());
 
+  // Handle eventsource & other http requests:
+  server.on('request', app);
+
+  // Handle upgrade requests:
+  server.on('upgrade', async function handleUpgrade(request, socket, head) {
+    // Setup the HTTP logger, since websocket upgrades don't get the usual http
+    // logger. This decorates the `request` object.
+    attachWebsocketHttpLogger(request);
+
+    request.log.info("HTTP Upgrade Requested");
+
+    /** @param {Error} err */
+    const onSocketError = (err) => {
+      request.log.error({ error: err }, err.message);
+    };
+
+    socket.on('error', onSocketError);
+
+    /** @type {ResolvedAccount} */
+    let resolvedAccount;
+
+    try {
+      resolvedAccount = await accountFromRequest(request);
+    } catch (err) {
+      // Unfortunately for using the on('upgrade') setup, we need to manually
+      // write a HTTP Response to the Socket to close the connection upgrade
+      // attempt, so the following code is to handle all of that.
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
+
+      /** @type {Record<string, string | number | import('pino-http').ReqId>} */
+      const headers = {
+        'Connection': 'close',
+        'Content-Type': 'text/plain',
+        'Content-Length': 0,
+        'X-Request-Id': request.id,
+        'X-Error-Message': errorMessage
+      };
+
+      // Ensure the socket is closed once we've finished writing to it:
+      socket.once('finish', () => {
+        socket.destroy();
+      });
+
+      // Write the HTTP response manually:
+      socket.end(`HTTP/1.1 ${statusCode} ${http.STATUS_CODES[statusCode]}\r\n${Object.keys(headers).map((key) => `${key}: ${headers[key]}`).join('\r\n')}\r\n\r\n`);
+
+      // Finally, log the error:
+      request.log.error({
+        err,
+        res: {
+          statusCode,
+          headers
+        }
+      }, errorMessage);
+
+      return;
+    }
+
+    // Remove the error handler, wss.handleUpgrade has its own:
+    socket.removeListener('error', onSocketError);
+
+    wss.handleUpgrade(request, socket, head, function done(ws) {
+      request.log.info("Authenticated request & upgraded to WebSocket connection");
+
+      const wsLogger = createWebsocketLogger(request, resolvedAccount);
+
+      // Start the connection:
+      wss.emit('connection', ws, request, wsLogger);
+    });
+  });
+
   /**
    * @type {Object.<string, Array.<function(Object<string, any>): void>>}
    */
@@ -213,9 +397,9 @@ const startServer = async () => {
   // When checking metrics in the browser, the favicon is requested this
   // prevents the request from falling through to the API Router, which would
   // error for this endpoint:
-  app.get('/favicon.ico', (req, res) => res.status(404).end());
+  app.get('/favicon.ico', (_req, res) => res.status(404).end());
 
-  app.get('/api/v1/streaming/health', (req, res) => {
+  app.get('/api/v1/streaming/health', (_req, res) => {
     res.writeHead(200, { 'Content-Type': 'text/plain' });
     res.end('OK');
   });
@@ -225,7 +409,7 @@ const startServer = async () => {
       res.set('Content-Type', metrics.register.contentType);
       res.end(await metrics.register.metrics());
     } catch (ex) {
-      log.error(ex);
+      req.log.error(ex);
       res.status(500).end();
     }
   });
@@ -259,7 +443,7 @@ const startServer = async () => {
 
     const callbacks = subs[channel];
 
-    log.silly(`New message on channel ${redisPrefix}${channel}`);
+    logger.debug(`New message on channel ${redisPrefix}${channel}`);
 
     if (!callbacks) {
       return;
@@ -283,17 +467,16 @@ const startServer = async () => {
    * @param {SubscriptionListener} callback
    */
   const subscribe = (channel, callback) => {
-    log.silly(`Adding listener for ${channel}`);
+    logger.debug(`Adding listener for ${channel}`);
 
     subs[channel] = subs[channel] || [];
 
     if (subs[channel].length === 0) {
-      log.verbose(`Subscribe ${channel}`);
+      logger.debug(`Subscribe ${channel}`);
       redisSubscribeClient.subscribe(channel, (err, count) => {
         if (err) {
-          log.error(`Error subscribing to ${channel}`);
-        }
-        else {
+          logger.error(`Error subscribing to ${channel}`);
+        } else if (typeof count === 'number') {
           redisSubscriptions.set(count);
         }
       });
@@ -307,7 +490,7 @@ const startServer = async () => {
    * @param {SubscriptionListener} callback
    */
   const unsubscribe = (channel, callback) => {
-    log.silly(`Removing listener for ${channel}`);
+    logger.debug(`Removing listener for ${channel}`);
 
     if (!subs[channel]) {
       return;
@@ -316,12 +499,11 @@ const startServer = async () => {
     subs[channel] = subs[channel].filter(item => item !== callback);
 
     if (subs[channel].length === 0) {
-      log.verbose(`Unsubscribe ${channel}`);
+      logger.debug(`Unsubscribe ${channel}`);
       redisSubscribeClient.unsubscribe(channel, (err, count) => {
         if (err) {
-          log.error(`Error unsubscribing to ${channel}`);
-        }
-        else {
+          logger.error(`Error unsubscribing to ${channel}`);
+        } else if (typeof count === 'number') {
           redisSubscriptions.set(count);
         }
       });
@@ -330,30 +512,7 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} req
-   * @param {any} res
-   * @param {function(Error=): void} next
-   */
-  const setRequestId = (req, res, next) => {
-    req.requestId = uuid.v4();
-    res.header('X-Request-Id', req.requestId);
-
-    next();
-  };
-
-  /**
-   * @param {any} req
-   * @param {any} res
-   * @param {function(Error=): void} next
-   */
-  const setRemoteAddress = (req, res, next) => {
-    req.remoteAddress = req.connection.remoteAddress;
-
-    next();
-  };
-
-  /**
-   * @param {any} req
+   * @param {http.IncomingMessage & ResolvedAccount} req
    * @param {string[]} necessaryScopes
    * @returns {boolean}
    */
@@ -363,7 +522,7 @@ const startServer = async () => {
   /**
    * @param {string} token
    * @param {any} req
-   * @returns {Promise.<void>}
+   * @returns {Promise<ResolvedAccount>}
    */
   const accountFromToken = (token, req) => new Promise((resolve, reject) => {
     pgPool.connect((err, client, done) => {
@@ -372,6 +531,7 @@ const startServer = async () => {
         return;
       }
 
+      // @ts-ignore
       client.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
         done();
 
@@ -381,10 +541,7 @@ const startServer = async () => {
         }
 
         if (result.rows.length === 0) {
-          err = new Error('Invalid access token');
-          err.status = 401;
-
-          reject(err);
+          reject(new AuthenticationError('Invalid access token'));
           return;
         }
 
@@ -394,14 +551,20 @@ const startServer = async () => {
         req.chosenLanguages = result.rows[0].chosen_languages;
         req.deviceId = result.rows[0].device_id;
 
-        resolve();
+        resolve({
+          accessTokenId: result.rows[0].id,
+          scopes: result.rows[0].scopes.split(' '),
+          accountId: result.rows[0].account_id,
+          chosenLanguages: result.rows[0].chosen_languages,
+          deviceId: result.rows[0].device_id
+        });
       });
     });
   });
 
   /**
    * @param {any} req
-   * @returns {Promise.<void>}
+   * @returns {Promise<ResolvedAccount>}
    */
   const accountFromRequest = (req) => new Promise((resolve, reject) => {
     const authorization = req.headers.authorization;
@@ -409,10 +572,7 @@ const startServer = async () => {
     const accessToken   = location.query.access_token || req.headers['sec-websocket-protocol'];
 
     if (!authorization && !accessToken) {
-      const err = new Error('Missing access token');
-      err.status = 401;
-
-      reject(err);
+      reject(new AuthenticationError('Missing access token'));
       return;
     }
 
@@ -448,21 +608,24 @@ const startServer = async () => {
       return 'direct';
     case '/api/v1/streaming/list':
       return 'list';
+    case '/api/v1/streaming/antenna':
+      return 'antenna';
     default:
       return undefined;
     }
   };
 
   /**
-   * @param {any} req
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} logger
    * @param {string|undefined} channelName
    * @returns {Promise.<void>}
    */
-  const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
-    log.silly(req.requestId, `Checking OAuth scopes for ${channelName}`);
+  const checkScopes = (req, logger, channelName) => new Promise((resolve, reject) => {
+    logger.debug(`Checking OAuth scopes for ${channelName}`);
 
     // When accessing public channels, no scopes are needed
-    if (PUBLIC_CHANNELS.includes(channelName)) {
+    if (channelName && PUBLIC_CHANNELS.includes(channelName)) {
       resolve();
       return;
     }
@@ -488,31 +651,9 @@ const startServer = async () => {
       return;
     }
 
-    const err = new Error('Access token does not cover required scopes');
-    err.status = 401;
-
-    reject(err);
+    reject(new AuthenticationError('Access token does not have the required scopes'));
   });
 
-  /**
-   * @param {any} info
-   * @param {function(boolean, number, string): void} callback
-   */
-  const wsVerifyClient = (info, callback) => {
-    // When verifying the websockets connection, we no longer pre-emptively
-    // check OAuth scopes and drop the connection if they're missing. We only
-    // drop the connection if access without token is not allowed by environment
-    // variables. OAuth scope checks are moved to the point of subscription
-    // to a specific stream.
-
-    accountFromRequest(info.req).then(() => {
-      callback(true, undefined, undefined);
-    }).catch(err => {
-      log.error(info.req.requestId, err.toString());
-      callback(false, 401, 'Unauthorized');
-    });
-  };
-
   /**
    * @typedef SystemMessageHandlers
    * @property {function(): void} onKill
@@ -521,38 +662,40 @@ const startServer = async () => {
   /**
    * @param {any} req
    * @param {SystemMessageHandlers} eventHandlers
-   * @returns {function(object): void}
+   * @returns {SubscriptionListener}
    */
   const createSystemMessageListener = (req, eventHandlers) => {
     return message => {
+      if (!message?.event) {
+        return;
+      }
+
       const { event } = message;
 
-      log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
+      req.log.debug(`System message for ${req.accountId}: ${event}`);
 
       if (event === 'kill') {
-        log.verbose(req.requestId, `Closing connection for ${req.accountId} due to expired access token`);
+        req.log.debug(`Closing connection for ${req.accountId} due to expired access token`);
         eventHandlers.onKill();
       } else if (event === 'filters_changed') {
-        log.verbose(req.requestId, `Invalidating filters cache for ${req.accountId}`);
+        req.log.debug(`Invalidating filters cache for ${req.accountId}`);
         req.cachedFilters = null;
       }
     };
   };
 
   /**
-   * @param {any} req
-   * @param {any} res
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {http.OutgoingMessage} res
    */
   const subscribeHttpToSystemChannel = (req, res) => {
     const accessTokenChannelId = `timeline:access_token:${req.accessTokenId}`;
     const systemChannelId = `timeline:system:${req.accountId}`;
 
     const listener = createSystemMessageListener(req, {
-
       onKill() {
         res.end();
       },
-
     });
 
     res.on('close', () => {
@@ -584,14 +727,11 @@ const startServer = async () => {
     // If no channelName can be found for the request, then we should terminate
     // the connection, as there's nothing to stream back
     if (!channelName) {
-      const err = new Error('Unknown channel requested');
-      err.status = 400;
-
-      next(err);
+      next(new RequestError('Unknown channel requested'));
       return;
     }
 
-    accountFromRequest(req).then(() => checkScopes(req, channelName)).then(() => {
+    accountFromRequest(req).then(() => checkScopes(req, req.log, channelName)).then(() => {
       subscribeHttpToSystemChannel(req, res);
     }).then(() => {
       next();
@@ -607,22 +747,25 @@ const startServer = async () => {
    * @param {function(Error=): void} next
    */
   const errorMiddleware = (err, req, res, next) => {
-    log.error(req.requestId, err.toString());
+    req.log.error({ err }, err.toString());
 
     if (res.headersSent) {
       next(err);
       return;
     }
 
-    res.writeHead(err.status || 500, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: err.status ? err.toString() : 'An unexpected error occurred' }));
+    const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
+
+    res.writeHead(statusCode, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: errorMessage }));
   };
 
   /**
-   * @param {array} arr
+   * @param {any[]} arr
    * @param {number=} shift
    * @returns {string}
    */
+  // @ts-ignore
   const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
 
   /**
@@ -639,6 +782,7 @@ const startServer = async () => {
         return;
       }
 
+      // @ts-ignore
       client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [listId], (err, result) => {
         done();
 
@@ -653,36 +797,80 @@ const startServer = async () => {
   });
 
   /**
-   * @param {string[]} ids
+   * @param {string} antennaId
    * @param {any} req
+   * @returns {Promise.<void>}
+   */
+  const authorizeAntennaAccess = (antennaId, req) => new Promise((resolve, reject) => {
+    const { accountId } = req;
+
+    pgPool.connect((err, client, done) => {
+      if (err) {
+        reject();
+        return;
+      }
+
+      // @ts-ignore
+      client.query('SELECT id, account_id FROM antennas WHERE id = $1 LIMIT 1', [antennaId], (err, result) => {
+        done();
+
+        if (err || result.rows.length === 0 || result.rows[0].account_id !== accountId) {
+          reject();
+          return;
+        }
+
+        resolve();
+      });
+    });
+  });
+
+  /**
+   * @param {string[]} channelIds
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} log
    * @param {function(string, string): void} output
    * @param {undefined | function(string[], SubscriptionListener): void} attachCloseHandler
    * @param {'websocket' | 'eventsource'} destinationType
    * @param {boolean=} needsFiltering
    * @returns {SubscriptionListener}
    */
-  const streamFrom = (ids, req, output, attachCloseHandler, destinationType, needsFiltering = false) => {
-    const accountId = req.accountId || req.remoteAddress;
-
-    log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
+  const streamFrom = (channelIds, req, log, output, attachCloseHandler, destinationType, needsFiltering = false) => {
+    log.info({ channelIds }, `Starting stream`);
 
+    /**
+     * @param {string} event
+     * @param {object|string} payload
+     */
     const transmit = (event, payload) => {
       // TODO: Replace "string"-based delete payloads with object payloads:
       const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
 
       messagesSent.labels({ type: destinationType }).inc(1);
 
-      log.silly(req.requestId, `Transmitting for ${accountId}: ${event} ${encodedPayload}`);
+      log.debug({ event, payload }, `Transmitting ${event} to ${req.accountId}`);
+
       output(event, encodedPayload);
     };
 
     // The listener used to process each message off the redis subscription,
     // message here is an object with an `event` and `payload` property. Some
     // events also include a queued_at value, but this is being removed shortly.
+
     /** @type {SubscriptionListener} */
     const listener = message => {
+      if (!message?.event || !message?.payload) {
+        return;
+      }
+
       const { event, payload } = message;
 
+      // reference_texts property is not working if ProcessReferencesWorker is
+      // used on PostStatusService and so on. (Asynchronous processing)
+      const reference_texts = payload?.reference_texts || [];
+      if (payload && typeof payload.reference_texts !== 'undefined') {
+        delete payload.reference_texts;
+      }
+
       // Streaming only needs to apply filtering to some channels and only to
       // some events. This is because majority of the filtering happens on the
       // Ruby on Rails side when producing the event for streaming.
@@ -703,7 +891,7 @@ const startServer = async () => {
 
       // Filter based on language:
       if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) {
-        log.silly(req.requestId, `Message ${payload.id} filtered by language (${payload.language})`);
+        log.debug(`Message ${payload.id} filtered by language (${payload.language})`);
         return;
       }
 
@@ -714,6 +902,7 @@ const startServer = async () => {
       }
 
       // Filter based on domain blocks, blocks, mutes, or custom filters:
+      // @ts-ignore
       const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id));
       const accountDomain = payload.account.acct.split('@')[1];
 
@@ -725,6 +914,7 @@ const startServer = async () => {
         }
 
         const queries = [
+          // @ts-ignore
           client.query(`SELECT 1
                         FROM blocks
                         WHERE (account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 2)}))
@@ -737,11 +927,20 @@ const startServer = async () => {
         ];
 
         if (accountDomain) {
+          // @ts-ignore
           queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
         }
 
+        // @ts-ignore
         if (!payload.filtered && !req.cachedFilters) {
-          queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId]));
+          // @ts-ignore
+          queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, filter.with_quote AS with_quote, keyword.keyword AS keyword, keyword.whole_word AS whole_word, filter.exclude_follows AS exclude_follows, filter.exclude_localusers AS exclude_localusers FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId]));
+        }
+        if (!payload.filtered) {
+          // @ts-ignore
+          queries.push(client.query(`SELECT 1
+                                     FROM follows
+                                     WHERE (account_id = $1 AND target_account_id = $2)`, [req.accountId, payload.account.id]));
         }
 
         Promise.all(queries).then(values => {
@@ -756,16 +955,20 @@ const startServer = async () => {
           // If the payload already contains the `filtered` property, it means
           // that filtering has been applied on the ruby on rails side, as
           // such, we don't need to construct or apply the filters in streaming:
-          if (Object.prototype.hasOwnProperty.call(payload, "filtered")) {
+          if (Object.hasOwn(payload, "filtered")) {
             transmit(event, payload);
             return;
           }
 
+          const following = values[values.length - 1].rows.length > 0;
+
           // Handling for constructing the custom filters and caching them on the request
           // TODO: Move this logic out of the message handling lifecycle
+          // @ts-ignore
           if (!req.cachedFilters) {
             const filterRows = values[accountDomain ? 2 : 1].rows;
 
+            // @ts-ignore
             req.cachedFilters = filterRows.reduce((cache, filter) => {
               if (cache[filter.id]) {
                 cache[filter.id].keywords.push([filter.keyword, filter.whole_word]);
@@ -782,8 +985,12 @@ const startServer = async () => {
                     // custom_filters.action database column, it is an integer
                     // representing a value in an enum defined by Ruby on Rails:
                     //
-                    // enum { warn: 0, hide: 1 }
-                    filter_action: ['warn', 'hide'][filter.filter_action],
+                    // enum { warn: 0, hide: 1, half_warn: 2 }
+                    filter_action: filter.filter_action === 2 ? 'warn' : ['warn', 'hide', 'half_warn'][filter.filter_action],
+                    filter_action_ex: ['warn', 'hide', 'half_warn'][filter.filter_action],
+                    with_quote: filter.with_quote,
+                    excludeFollows: filter.exclude_follows,
+                    excludeLocalusers: filter.exclude_localusers,
                   },
                 };
               }
@@ -795,7 +1002,9 @@ const startServer = async () => {
             // needs to be done in a separate loop as the database returns one
             // filterRow per keyword, so we need all the keywords before
             // constructing the regular expression
+            // @ts-ignore
             Object.keys(req.cachedFilters).forEach((key) => {
+              // @ts-ignore
               req.cachedFilters[key].regexp = new RegExp(req.cachedFilters[key].keywords.map(([keyword, whole_word]) => {
                 let expr = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
@@ -816,19 +1025,30 @@ const startServer = async () => {
 
           // Apply cachedFilters against the payload, constructing a
           // `filter_results` array of FilterResult entities
+          // @ts-ignore
           if (req.cachedFilters) {
             const status = payload;
             // TODO: Calculate searchableContent in Ruby on Rails:
-            const searchableContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+            // @ts-ignore
+            const searchableContent = ([status.spoiler_text || '', status.content, ...(reference_texts || [])].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
             const searchableTextContent = JSDOM.fragment(searchableContent).textContent;
 
             const now = new Date();
+            // @ts-ignore
             const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => {
               // Check the filter hasn't expired before applying:
               if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) {
                 return results;
               }
 
+              if (cachedFilter.filter && cachedFilter.filter.excludeFollows && following) {
+                return results;
+              }
+
+              if (cachedFilter.filter && cachedFilter.filter.excludeLocalusers && !accountDomain) {
+                return results;
+              }
+
               // Just in-case JSDOM fails to find textContent in searchableContent
               if (!searchableTextContent) {
                 return results;
@@ -870,12 +1090,12 @@ const startServer = async () => {
       });
     };
 
-    ids.forEach(id => {
+    channelIds.forEach(id => {
       subscribe(`${redisPrefix}${id}`, listener);
     });
 
     if (typeof attachCloseHandler === 'function') {
-      attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+      attachCloseHandler(channelIds.map(id => `${redisPrefix}${id}`), listener);
     }
 
     return listener;
@@ -887,8 +1107,6 @@ const startServer = async () => {
    * @returns {function(string, string): void}
    */
   const streamToHttp = (req, res) => {
-    const accountId = req.accountId || req.remoteAddress;
-
     const channelName = channelNameFromPath(req);
 
     connectedClients.labels({ type: 'eventsource' }).inc();
@@ -907,7 +1125,8 @@ const startServer = async () => {
     const heartbeat = setInterval(() => res.write(':thump\n'), 15000);
 
     req.on('close', () => {
-      log.verbose(req.requestId, `Ending stream for ${accountId}`);
+      req.log.info({ accountId: req.accountId }, `Ending stream`);
+
       // We decrement these counters here instead of in streamHttpEnd as in that
       // method we don't have knowledge of the channel names
       connectedClients.labels({ type: 'eventsource' }).dec();
@@ -944,26 +1163,28 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} req
-   * @param {any} ws
+   * @param {http.IncomingMessage} req
+   * @param {WebSocket} ws
    * @param {string[]} streamName
    * @returns {function(string, string): void}
    */
   const streamToWs = (req, ws, streamName) => (event, payload) => {
     if (ws.readyState !== ws.OPEN) {
-      log.error(req.requestId, 'Tried writing to closed socket');
+      req.log.error('Tried writing to closed socket');
       return;
     }
 
-    ws.send(JSON.stringify({ stream: streamName, event, payload }), (err) => {
+    const message = JSON.stringify({ stream: streamName, event, payload });
+
+    ws.send(message, (/** @type {Error|undefined} */ err) => {
       if (err) {
-        log.error(req.requestId, `Failed to send to websocket: ${err}`);
+        req.log.error({err}, `Failed to send to websocket`);
       }
     });
   };
 
   /**
-   * @param {any} res
+   * @param {http.ServerResponse} res
    */
   const httpNotFound = res => {
     res.writeHead(404, { 'Content-Type': 'application/json' });
@@ -974,30 +1195,41 @@ const startServer = async () => {
 
   app.use(api);
 
-  api.use(setRequestId);
-  api.use(setRemoteAddress);
-
   api.use(authenticationMiddleware);
   api.use(errorMiddleware);
 
   api.get('/api/v1/streaming/*', (req, res) => {
-    channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
+    const channelName = channelNameFromPath(req);
+
+    // FIXME: In theory we'd never actually reach here due to
+    // authenticationMiddleware catching this case, however, we need to refactor
+    // how those middlewares work, so I'm adding the extra check in here.
+    if (!channelName) {
+      httpNotFound(res);
+      return;
+    }
+
+    channelNameToIds(req, channelName, req.query).then(({ channelIds, options }) => {
       const onSend = streamToHttp(req, res);
       const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
 
-      streamFrom(channelIds, req, onSend, onEnd, 'eventsource', options.needsFiltering);
+      // @ts-ignore
+      streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering);
     }).catch(err => {
-      log.verbose(req.requestId, 'Subscription error:', err.toString());
-      httpNotFound(res);
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
+
+      res.log.info({ err }, 'Eventsource subscription error');
+
+      res.writeHead(statusCode, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: errorMessage }));
     });
   });
 
-  const wss = new WebSocket.Server({ server, verifyClient: wsVerifyClient });
-
   /**
    * @typedef StreamParams
    * @property {string} [tag]
    * @property {string} [list]
+   * @property {string} [antenna]
    * @property {string} [only_media]
    */
 
@@ -1019,34 +1251,6 @@ const startServer = async () => {
     return arr;
   };
 
-  /**
-   * See app/lib/ascii_folder.rb for the canon definitions
-   * of these constants
-   */
-  const NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
-  const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
-
-  /**
-   * @param {string} str
-   * @returns {string}
-   */
-  const foldToASCII = str => {
-    const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
-
-    return str.replace(regex, match => {
-      const index = NON_ASCII_CHARS.indexOf(match);
-      return EQUIVALENT_ASCII_CHARS[index];
-    });
-  };
-
-  /**
-   * @param {string} str
-   * @returns {string}
-   */
-  const normalizeHashtag = str => {
-    return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
-  };
-
   /**
    * @param {any} req
    * @param {string} name
@@ -1119,8 +1323,8 @@ const startServer = async () => {
 
       break;
     case 'hashtag':
-      if (!params.tag || params.tag.length === 0) {
-        reject('No tag for stream provided');
+      if (!params.tag) {
+        reject(new RequestError('Missing tag name parameter'));
       } else {
         resolve({
           channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}`],
@@ -1130,8 +1334,8 @@ const startServer = async () => {
 
       break;
     case 'hashtag:local':
-      if (!params.tag || params.tag.length === 0) {
-        reject('No tag for stream provided');
+      if (!params.tag) {
+        reject(new RequestError('Missing tag name parameter'));
       } else {
         resolve({
           channelIds: [`timeline:hashtag:${normalizeHashtag(params.tag)}:local`],
@@ -1141,18 +1345,35 @@ const startServer = async () => {
 
       break;
     case 'list':
+      if (!params.list) {
+        reject(new RequestError('Missing list name parameter'));
+        return;
+      }
+
       authorizeListAccess(params.list, req).then(() => {
         resolve({
           channelIds: [`timeline:list:${params.list}`],
           options: { needsFiltering: false },
         });
       }).catch(() => {
-        reject('Not authorized to stream this list');
+        reject(new AuthenticationError('Not authorized to stream this list'));
+      });
+
+      break;
+    case 'antenna':
+      // @ts-ignore
+      authorizeAntennaAccess(params.antenna, req).then(() => {
+        resolve({
+          channelIds: [`timeline:antenna:${params.antenna}`],
+          options: { needsFiltering: false },
+        });
+      }).catch(() => {
+        reject('Not authorized to stream this antenna');
       });
 
       break;
     default:
-      reject('Unknown stream type');
+      reject(new RequestError('Unknown stream type'));
     }
   });
 
@@ -1162,9 +1383,11 @@ const startServer = async () => {
    * @returns {string[]}
    */
   const streamNameFromChannelName = (channelName, params) => {
-    if (channelName === 'list') {
+    if (channelName === 'list' && params.list) {
       return [channelName, params.list];
-    } else if (['hashtag', 'hashtag:local'].includes(channelName)) {
+    } else if (channelName === 'antenna' && params.antenna) {
+      return [channelName, params.antenna];
+    } else if (['hashtag', 'hashtag:local'].includes(channelName) && params.tag) {
       return [channelName, params.tag];
     } else {
       return [channelName];
@@ -1173,8 +1396,9 @@ const startServer = async () => {
 
   /**
    * @typedef WebSocketSession
-   * @property {any} socket
-   * @property {any} request
+   * @property {WebSocket & { isAlive: boolean}} websocket
+   * @property {http.IncomingMessage & ResolvedAccount} request
+   * @property {import('pino').Logger} logger
    * @property {Object.<string, { channelName: string, listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
    */
 
@@ -1184,8 +1408,8 @@ const startServer = async () => {
    * @param {StreamParams} params
    * @returns {void}
    */
-  const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) => {
-    checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
+  const subscribeWebsocketToChannel = ({ websocket, request, logger, subscriptions }, channelName, params) => {
+    checkScopes(request, logger, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
       channelIds,
       options,
     }) => {
@@ -1193,9 +1417,9 @@ const startServer = async () => {
         return;
       }
 
-      const onSend = streamToWs(request, socket, streamNameFromChannelName(channelName, params));
+      const onSend = streamToWs(request, websocket, streamNameFromChannelName(channelName, params));
       const stopHeartbeat = subscriptionHeartbeat(channelIds);
-      const listener = streamFrom(channelIds, request, onSend, undefined, 'websocket', options.needsFiltering);
+      const listener = streamFrom(channelIds, request, logger, onSend, undefined, 'websocket', options.needsFiltering);
 
       connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
 
@@ -1205,14 +1429,26 @@ const startServer = async () => {
         stopHeartbeat,
       };
     }).catch(err => {
-      log.verbose(request.requestId, 'Subscription error:', err.toString());
-      socket.send(JSON.stringify({ error: err.toString() }));
+      const {statusCode, errorMessage } = extractErrorStatusAndMessage(err);
+
+      logger.error({ err }, 'Websocket subscription error');
+
+      // If we have a socket that is alive and open still, send the error back to the client:
+      if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+        websocket.send(JSON.stringify({
+          error: errorMessage,
+          status: statusCode
+        }));
+      }
     });
   };
 
-
-  const removeSubscription = (subscriptions, channelIds, request) => {
-    log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+  /**
+   * @param {WebSocketSession} session
+   * @param {string[]} channelIds
+   */
+  const removeSubscription = ({ request, logger, subscriptions }, channelIds) => {
+    logger.info({ channelIds, accountId: request.accountId }, `Ending stream`);
 
     const subscription = subscriptions[channelIds.join(';')];
 
@@ -1236,16 +1472,18 @@ const startServer = async () => {
    * @param {StreamParams} params
    * @returns {void}
    */
-  const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) => {
+  const unsubscribeWebsocketFromChannel = (session, channelName, params) => {
+    const { websocket, request, logger } = session;
+
     channelNameToIds(request, channelName, params).then(({ channelIds }) => {
-      removeSubscription(subscriptions, channelIds, request);
+      removeSubscription(session, channelIds);
     }).catch(err => {
-      log.verbose(request.requestId, 'Unsubscribe error:', err);
+      logger.error({err}, 'Websocket unsubscribe error');
 
       // If we have a socket that is alive and open still, send the error back to the client:
-      // FIXME: In other parts of the code ws === socket
-      if (socket.isAlive && socket.readyState === socket.OPEN) {
-        socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
+      if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+        // TODO: Use a better error response here
+        websocket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
       }
     });
   };
@@ -1253,16 +1491,14 @@ const startServer = async () => {
   /**
    * @param {WebSocketSession} session
    */
-  const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
+  const subscribeWebsocketToSystemChannel = ({ websocket, request, subscriptions }) => {
     const accessTokenChannelId = `timeline:access_token:${request.accessTokenId}`;
     const systemChannelId = `timeline:system:${request.accountId}`;
 
     const listener = createSystemMessageListener(request, {
-
       onKill() {
-        socket.close();
+        websocket.close();
       },
-
     });
 
     subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
@@ -1286,27 +1522,16 @@ const startServer = async () => {
   };
 
   /**
-   * @param {string|string[]} arrayOrString
-   * @returns {string}
+   * @param {WebSocket & { isAlive: boolean }} ws
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} log
    */
-  const firstParam = arrayOrString => {
-    if (Array.isArray(arrayOrString)) {
-      return arrayOrString[0];
-    } else {
-      return arrayOrString;
-    }
-  };
-
-  wss.on('connection', (ws, req) => {
+  function onConnection(ws, req, log) {
     // Note: url.parse could throw, which would terminate the connection, so we
     // increment the connected clients metric straight away when we establish
     // the connection, without waiting:
     connectedClients.labels({ type: 'websocket' }).inc();
 
-    // Setup request properties:
-    req.requestId = uuid.v4();
-    req.remoteAddress = ws._socket.remoteAddress;
-
     // Setup connection keep-alive state:
     ws.isAlive = true;
     ws.on('pong', () => {
@@ -1317,8 +1542,9 @@ const startServer = async () => {
      * @type {WebSocketSession}
      */
     const session = {
-      socket: ws,
+      websocket: ws,
       request: req,
+      logger: log,
       subscriptions: {},
     };
 
@@ -1326,27 +1552,32 @@ const startServer = async () => {
       const subscriptions = Object.keys(session.subscriptions);
 
       subscriptions.forEach(channelIds => {
-        removeSubscription(session.subscriptions, channelIds.split(';'), req);
+        removeSubscription(session, channelIds.split(';'));
       });
 
       // Decrement the metrics for connected clients:
       connectedClients.labels({ type: 'websocket' }).dec();
 
-      // ensure garbage collection:
-      session.socket = null;
-      session.request = null;
-      session.subscriptions = {};
+      // We need to unassign the session object as to ensure it correctly gets
+      // garbage collected, without doing this we could accidentally hold on to
+      // references to the websocket, the request, and the logger, causing
+      // memory leaks.
+
+      // This is commented out because `delete` only operated on object properties
+      // It needs to be replaced by `session = undefined`, but it requires every calls to
+      // `session` to check for it, thus a significant refactor
+      // delete session;
     });
 
     // Note: immediately after the `error` event is emitted, the `close` event
     // is emitted. As such, all we need to do is log the error here.
-    ws.on('error', (err) => {
-      log.error('websocket', err.toString());
+    ws.on('error', (/** @type {Error} */ err) => {
+      log.error(err);
     });
 
     ws.on('message', (data, isBinary) => {
       if (isBinary) {
-        log.warn('websocket', 'Received binary data, closing connection');
+        log.warn('Received binary data, closing connection');
         ws.close(1003, 'The mastodon streaming server does not support binary messages');
         return;
       }
@@ -1375,22 +1606,26 @@ const startServer = async () => {
     if (location && location.query.stream) {
       subscribeWebsocketToChannel(session, firstParam(location.query.stream), location.query);
     }
-  });
+  }
+
+  wss.on('connection', onConnection);
 
   setInterval(() => {
     wss.clients.forEach(ws => {
+      // @ts-ignore
       if (ws.isAlive === false) {
         ws.terminate();
         return;
       }
 
+      // @ts-ignore
       ws.isAlive = false;
       ws.ping('', false);
     });
   }, 30000);
 
   attachServerWithConfig(server, address => {
-    log.warn(`Streaming API now listening on ${address}`);
+    logger.info(`Streaming API now listening on ${address}`);
   });
 
   const onExit = () => {
@@ -1398,8 +1633,10 @@ const startServer = async () => {
     process.exit(0);
   };
 
+  /** @param {Error} err */
   const onError = (err) => {
-    log.error(err);
+    logger.error(err);
+
     server.close();
     process.exit(0);
   };
@@ -1423,7 +1660,7 @@ const attachServerWithConfig = (server, onSuccess) => {
       }
     });
   } else {
-    server.listen(+process.env.PORT || 4000, process.env.BIND || '127.0.0.1', () => {
+    server.listen(+(process.env.PORT || 4000), process.env.BIND || '127.0.0.1', () => {
       if (onSuccess) {
         onSuccess(`${server.address().address}:${server.address().port}`);
       }
diff --git a/streaming/logging.js b/streaming/logging.js
new file mode 100644
index 0000000000..e1c552c22e
--- /dev/null
+++ b/streaming/logging.js
@@ -0,0 +1,114 @@
+import { pino } from 'pino';
+import { pinoHttp, stdSerializers as pinoHttpSerializers } from 'pino-http';
+import * as uuid from 'uuid';
+
+/**
+ * Generates the Request ID for logging and setting on responses
+ * @param {http.IncomingMessage} req
+ * @param {http.ServerResponse} [res]
+ * @returns {import("pino-http").ReqId}
+ */
+function generateRequestId(req, res) {
+  if (req.id) {
+    return req.id;
+  }
+
+  req.id = uuid.v4();
+
+  // Allow for usage with WebSockets:
+  if (res) {
+    res.setHeader('X-Request-Id', req.id);
+  }
+
+  return req.id;
+}
+
+/**
+ * Request log sanitizer to prevent logging access tokens in URLs
+ * @param {http.IncomingMessage} req
+ */
+function sanitizeRequestLog(req) {
+  const log = pinoHttpSerializers.req(req);
+  if (typeof log.url === 'string' && log.url.includes('access_token')) {
+    // Doorkeeper uses SecureRandom.urlsafe_base64 per RFC 6749 / RFC 6750
+    log.url = log.url.replace(/(access_token)=([a-zA-Z0-9\-_]+)/gi, '$1=[Redacted]');
+  }
+  return log;
+}
+
+export const logger = pino({
+  name: "streaming",
+  // Reformat the log level to a string:
+  formatters: {
+    level: (label) => {
+      return {
+        level: label
+      };
+    },
+  },
+  redact: {
+    paths: [
+      'req.headers["sec-websocket-key"]',
+      // Note: we currently pass the AccessToken via the websocket subprotocol
+      // field, an anti-pattern, but this ensures it doesn't end up in logs.
+      'req.headers["sec-websocket-protocol"]',
+      'req.headers.authorization',
+      'req.headers.cookie',
+      'req.query.access_token'
+    ]
+  }
+});
+
+export const httpLogger = pinoHttp({
+  logger,
+  genReqId: generateRequestId,
+  serializers: {
+    req: sanitizeRequestLog
+  }
+});
+
+/**
+ * Attaches a logger to the request object received by http upgrade handlers
+ * @param {http.IncomingMessage} request
+ */
+export function attachWebsocketHttpLogger(request) {
+  generateRequestId(request);
+
+  request.log = logger.child({
+    req: sanitizeRequestLog(request),
+  });
+}
+
+/**
+ * Creates a logger instance for the Websocket connection to use.
+ * @param {http.IncomingMessage} request
+ * @param {import('./index.js').ResolvedAccount} resolvedAccount
+ */
+export function createWebsocketLogger(request, resolvedAccount) {
+  // ensure the request.id is always present.
+  generateRequestId(request);
+
+  return logger.child({
+    req: {
+      id: request.id
+    },
+    account: {
+      id: resolvedAccount.accountId ?? null
+    }
+  });
+}
+
+/**
+ * Initializes the log level based on the environment
+ * @param {Object<string, any>} env
+ * @param {string} environment
+ */
+export function initializeLogLevel(env, environment) {
+  if (env.LOG_LEVEL && Object.keys(logger.levels.values).includes(env.LOG_LEVEL)) {
+    logger.level = env.LOG_LEVEL;
+  } else if (environment === 'development') {
+    logger.level = 'debug';
+  } else {
+    logger.level = 'info';
+  }
+}
diff --git a/streaming/metrics.js b/streaming/metrics.js
index d05b4c9b16..a029d778fc 100644
--- a/streaming/metrics.js
+++ b/streaming/metrics.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-const metrics = require('prom-client');
+import metrics from 'prom-client';
 
 /**
  * @typedef StreamingMetrics
@@ -18,7 +18,7 @@ const metrics = require('prom-client');
  * @param {import('pg').Pool} pgPool
  * @returns {StreamingMetrics}
  */
-function setupMetrics(channels, pgPool) {
+export function setupMetrics(channels, pgPool) {
   // Collect metrics from Node.js
   metrics.collectDefaultMetrics();
 
@@ -101,5 +101,3 @@ function setupMetrics(channels, pgPool) {
     messagesSent,
   };
 }
-
-exports.setupMetrics = setupMetrics;
diff --git a/streaming/package.json b/streaming/package.json
index 149055ca1b..cf1fe4ba69 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,12 +1,13 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.2.2",
   "engines": {
     "node": ">=18"
   },
   "description": "Mastodon's Streaming Server",
   "private": true,
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/mastodon/mastodon.git"
@@ -20,10 +21,11 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
-    "jsdom": "^23.0.0",
-    "npmlog": "^7.0.1",
+    "jsdom": "^24.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
+    "pino": "^9.0.0",
+    "pino-http": "^10.0.0",
     "prom-client": "^15.0.0",
     "uuid": "^9.0.0",
     "ws": "^8.12.1"
@@ -31,11 +33,11 @@
   "devDependencies": {
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
-    "@types/npmlog": "^7.0.0",
     "@types/pg": "^8.6.6",
     "@types/uuid": "^9.0.0",
     "@types/ws": "^8.5.9",
     "eslint-define-config": "^2.0.0",
+    "pino-pretty": "^11.0.0",
     "typescript": "^5.0.4"
   },
   "optionalDependencies": {
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index f7bb711b9b..37e9a7fee0 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -2,11 +2,11 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "target": "esnext",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "noUnusedParameters": false,
     "tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
     "paths": {}
   },
-  "include": ["./*.js", "./.eslintrc.js"]
+  "include": ["./*.js", "./.eslintrc.cjs"]
 }
diff --git a/streaming/utils.js b/streaming/utils.js
index ad8dd4889f..4610bf660d 100644
--- a/streaming/utils.js
+++ b/streaming/utils.js
@@ -16,7 +16,46 @@ const FALSE_VALUES = [
  * @param {any} value
  * @returns {boolean}
  */
-const isTruthy = value =>
-  value && !FALSE_VALUES.includes(value);
+export function isTruthy(value) {
+  return value && !FALSE_VALUES.includes(value);
+}
 
-exports.isTruthy = isTruthy;
+/**
+ * See app/lib/ascii_folder.rb for the canon definitions
+ * of these constants
+ */
+const NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
+const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+export function foldToASCII(str) {
+  const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
+
+  return str.replace(regex, function(match) {
+    const index = NON_ASCII_CHARS.indexOf(match);
+    return EQUIVALENT_ASCII_CHARS[index];
+  });
+}
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+export function normalizeHashtag(str) {
+  return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
+}
+
+/**
+ * @param {string|string[]} arrayOrString
+ * @returns {string}
+ */
+export function firstParam(arrayOrString) {
+  if (Array.isArray(arrayOrString)) {
+    return arrayOrString[0];
+  } else {
+    return arrayOrString;
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index d1a77e5493..7010dda1fc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,12 +14,13 @@
     "tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
     "paths": {
       "mastodon": ["app/javascript/mastodon"],
-      "mastodon/*": ["app/javascript/mastodon/*"]
+      "mastodon/*": ["app/javascript/mastodon/*"],
+      "@/*": ["app/javascript/*"]
     }
   },
   "include": [
     "app/javascript/mastodon",
-    "app/javascript/packs",
+    "app/javascript/entrypoints",
     "app/javascript/types"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 3a7563b31b..193ee8cf05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,14 +8,14 @@ __metadata:
 "@aashutoshrathi/word-wrap@npm:^1.2.3":
   version: 1.2.6
   resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: 53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f
+  checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f
   languageName: node
   linkType: hard
 
 "@adobe/css-tools@npm:^4.3.2":
   version: 4.3.2
   resolution: "@adobe/css-tools@npm:4.3.2"
-  checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
+  checksum: 10c0/296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
   languageName: node
   linkType: hard
 
@@ -25,7 +25,7 @@ __metadata:
   dependencies:
     "@jridgewell/gen-mapping": "npm:^0.3.0"
     "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
+  checksum: 10c0/92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
   languageName: node
   linkType: hard
 
@@ -38,70 +38,59 @@ __metadata:
     leven: "npm:^3.1.0"
   peerDependencies:
     ajv: ">=8"
-  checksum: f89a1e16ecbc2ada91c56d4391c8345471e385f0b9c38d62c3bccac40ec94482cdfa496d4c2fe0af411e9851a9931c0d5042a8040f52213f603ba6b6fd7f949b
+  checksum: 10c0/f89a1e16ecbc2ada91c56d4391c8345471e385f0b9c38d62c3bccac40ec94482cdfa496d4c2fe0af411e9851a9931c0d5042a8040f52213f603ba6b6fd7f949b
   languageName: node
   linkType: hard
 
-"@asamuzakjp/dom-selector@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@asamuzakjp/dom-selector@npm:2.0.1"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
-    bidi-js: "npm:^1.0.3"
-    css-tree: "npm:^2.3.1"
-    is-potential-custom-element-name: "npm:^1.0.1"
-  checksum: 232895f16f2f9dfc637764df2529084d16e1c122057766a79b16e1d40808e09fffae28c0f0cc8376f8a1564a85dba9d4b2f140a9a0b65f4f95c960192b797037
+    "@babel/highlight": "npm:^7.24.2"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/code-frame@npm:7.23.5"
-  dependencies:
-    "@babel/highlight": "npm:^7.23.4"
-    chalk: "npm:^2.4.2"
-  checksum: a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/compat-data@npm:7.24.4"
+  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/compat-data@npm:7.23.5"
-  checksum: 081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.7
-  resolution: "@babel/core@npm:7.23.7"
+"@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.24.4":
+  version: 7.24.5
+  resolution: "@babel/core@npm:7.24.5"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.6"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.7"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/helper-module-transforms": "npm:^7.24.5"
+    "@babel/helpers": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 38c9934973d384ed83369712978453eac91dc3f22167404dbdb272b64f602e74728a6f37012c53ee57e521b8ae2da60097f050497d9b6a212d28b59cdfb2cd1d
+  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.23.6, @babel/generator@npm:^7.7.2":
-  version: 7.23.6
-  resolution: "@babel/generator@npm:7.23.6"
+"@babel/generator@npm:^7.24.5, @babel/generator@npm:^7.7.2":
+  version: 7.24.5
+  resolution: "@babel/generator@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.23.6"
-    "@jridgewell/gen-mapping": "npm:^0.3.2"
-    "@jridgewell/trace-mapping": "npm:^0.3.17"
+    "@babel/types": "npm:^7.24.5"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda
+  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
   languageName: node
   linkType: hard
 
@@ -110,7 +99,7 @@ __metadata:
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
+  checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
   languageName: node
   linkType: hard
 
@@ -119,7 +108,7 @@ __metadata:
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
   dependencies:
     "@babel/types": "npm:^7.22.15"
-  checksum: 2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
+  checksum: 10c0/2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
   languageName: node
   linkType: hard
 
@@ -129,11 +118,11 @@ __metadata:
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/types": "npm:^7.22.10"
-  checksum: 8e2ad2e17dd779ddccec29f6b1de61df1f199694673bdbbae0474878211139f2e574810726110e4d46c1e9a0221af1f2d38bd0398dd20490eb03a24f790602be
+  checksum: 10c0/8e2ad2e17dd779ddccec29f6b1de61df1f199694673bdbbae0474878211139f2e574810726110e4d46c1e9a0221af1f2d38bd0398dd20490eb03a24f790602be
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
   version: 7.23.6
   resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
@@ -142,26 +131,26 @@ __metadata:
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
+  checksum: 10c0/ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
+"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.5"
-    "@babel/helper-function-name": "npm:^7.22.5"
-    "@babel/helper-member-expression-to-functions": "npm:^7.22.15"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.5"
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.9"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 2ae5759fe8845fda99b34f2ba6cd0794fc860213d14c93a87aa9180960252bce621157a79c373b7fbb423b25a55fb0e20eae0d5f8e4ad5ef22dc70e7c2af3805
+  checksum: 10c0/afc72e8075a249663f8024ef1760de4c0b9252bdde16419ac955fa7e15b8d4096ca1e01f796df4fa8cfdb056708886f60b631ad492242a8e47307974fc305920
   languageName: node
   linkType: hard
 
@@ -174,13 +163,13 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
+  checksum: 10c0/8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
+"@babel/helper-define-polyfill-provider@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -189,14 +178,14 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 60126f5f719b9e2114df62e3bf3ac0797b71d8dc733db60192eb169b004fde72ee309fa5848c5fdfe98b8e8863c46f55e16da5aa8a4e420b4d2670cd0c5dd708
+  checksum: 10c0/210e1c8ac118f7c5a0ef5b42c4267c3db2f59b1ebc666a275d442b86896de4a66ef93539d702870f172f9749cd44c89f53056a5b17e619c3142b12ed4e4e6aae
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
+"@babel/helper-environment-visitor@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
+  checksum: 10c0/e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
   languageName: node
   linkType: hard
 
@@ -206,7 +195,7 @@ __metadata:
   dependencies:
     "@babel/template": "npm:^7.22.15"
     "@babel/types": "npm:^7.23.0"
-  checksum: d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
+  checksum: 10c0/d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
   languageName: node
   linkType: hard
 
@@ -215,40 +204,40 @@ __metadata:
   resolution: "@babel/helper-hoist-variables@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
+  checksum: 10c0/60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.22.15":
-  version: 7.23.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
+"@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.23.0"
-  checksum: b810daddf093ffd0802f1429052349ed9ea08ef7d0c56da34ffbcdecbdafac86f95bdea2fe30e0e0e629febc7dd41b56cb5eacc10d1a44336d37b755dac31fa4
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/a3c0276a1ede8648a0e6fd86ad846cd57421d05eddfa29446b8b5a013db650462022b9ec1e65ea32c747d0542d729c80866830697f94fb12d603e87c51f080a5
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-module-imports@npm:7.22.15"
+"@babel/helper-module-imports@npm:^7.0.0-beta.49, @babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/helper-module-imports@npm:7.24.3"
   dependencies:
-    "@babel/types": "npm:^7.22.15"
-  checksum: 4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+"@babel/helper-module-transforms@npm:^7.23.3, @babel/helper-module-transforms@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-module-transforms@npm:7.24.5"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-simple-access": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-simple-access": "npm:^7.24.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 211e1399d0c4993671e8e5c2b25383f08bee40004ace5404ed4065f0e9258cc85d99c1b82fd456c030ce5cfd4d8f310355b54ef35de9924eabfc3dff1331d946
+  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
   languageName: node
   linkType: hard
 
@@ -257,14 +246,14 @@ __metadata:
   resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: 31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
+  checksum: 10c0/31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.5
+  resolution: "@babel/helper-plugin-utils@npm:7.24.5"
+  checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377
   languageName: node
   linkType: hard
 
@@ -277,29 +266,29 @@ __metadata:
     "@babel/helper-wrap-function": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
+  checksum: 10c0/aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.9":
-  version: 7.22.20
-  resolution: "@babel/helper-replace-supers@npm:7.22.20"
+"@babel/helper-replace-supers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-replace-supers@npm:7.24.1"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-member-expression-to-functions": "npm:^7.22.15"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
     "@babel/helper-optimise-call-expression": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 6b0858811ad46873817c90c805015d63300e003c5a85c147a17d9845fa2558a02047c3cc1f07767af59014b2dd0fa75b503e5bc36e917f360e9b67bb6f1e79f4
+  checksum: 10c0/d39a3df7892b7c3c0e307fb229646168a9bd35e26a72080c2530729322600e8cff5f738f44a14860a2358faffa741b6a6a0d6749f113387b03ddbfa0ec10e1a0
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-simple-access@npm:7.22.5"
+"@babel/helper-simple-access@npm:^7.22.5, @babel/helper-simple-access@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-simple-access@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: f0cf81a30ba3d09a625fd50e5a9069e575c5b6719234e04ee74247057f8104beca89ed03e9217b6e9b0493434cedc18c5ecca4cea6244990836f1f893e140369
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
   languageName: node
   linkType: hard
 
@@ -308,37 +297,37 @@ __metadata:
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
   dependencies:
     "@babel/types": "npm:^7.22.5"
-  checksum: ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
+  checksum: 10c0/ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.22.6":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+"@babel/helper-split-export-declaration@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: f348d5637ad70b6b54b026d6544bd9040f78d24e7ec245a0fc42293968181f6ae9879c22d89744730d246ce8ec53588f716f102addd4df8bbc79b73ea10004ac
+"@babel/helper-string-parser@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-string-parser@npm:7.24.1"
+  checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: dcad63db345fb110e032de46c3688384b0008a42a4845180ce7cd62b1a9c0507a1bed727c4d1060ed1a03ae57b4d918570259f81724aaac1a5b776056f37504e
+"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
+  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
+"@babel/helper-validator-option@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
+  checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
   languageName: node
   linkType: hard
 
@@ -349,74 +338,87 @@ __metadata:
     "@babel/helper-function-name": "npm:^7.22.5"
     "@babel/template": "npm:^7.22.15"
     "@babel/types": "npm:^7.22.19"
-  checksum: 97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
+  checksum: 10c0/97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/helpers@npm:7.23.7"
+"@babel/helpers@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helpers@npm:7.24.5"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.7"
-    "@babel/types": "npm:^7.23.6"
-  checksum: f74a61ad28a1bc1fdd9133ad571c07787b66d6db017c707b87c203b0cd06879cea8b33e9c6a8585765a4949efa5df3cc9e19b710fe867f11be38ee29fd4a0488
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
+"@babel/highlight@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/highlight@npm:7.24.2"
   dependencies:
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
-  checksum: fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/parser@npm:7.23.6"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/parser@npm:7.24.5"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
+  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 356a4e9fc52d7ca761ce6857fc58e2295c2785d22565760e6a5680be86c6e5883ab86e0ba25ef572882c01713d3a31ae6cfa3e3222cdb95e6026671dab1fa415
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.23.3"
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: a8785f099d55ca71ed89815e0f3a636a80c16031f80934cfec17c928d096ee0798964733320c8b145ef36ba429c5e19d5107b06231e0ab6777cfb0f01adfdc23
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 355746e21ad7f43e4f4daef54cfe2ef461ecd19446b2afedd53c39df1bf9aa2eeeeaabee2279b1321de89a97c9360e4f76e9ba950fee50ff1676c25f6929d625
+  checksum: 10c0/b471972dcc4a3ba32821329a57725e2b563421e975d7ffec7fcabd70af0fced6a50bcc9ed2a8cbd4a9ac7c09cfbf43c7116e82f3b9064b33a22309500b632108
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/d4e592e6fc4878654243d2e7b51ea86471b868a8cb09de29e73b65d2b64159990c6c198fd7c9c2af2e38b1cddf70206243792853c47384a84f829dada152f605
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.13.0
+  checksum: 10c0/351c36e45795a7890d610ab9041a52f4078a59429f6e74c281984aa44149a10d43e82b3a8172c703c0d5679471e165d1c02b6d2e45a677958ee301b89403f202
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/d7dd5a59a54635a3152895dcaa68f3370bb09d1f9906c1e72232ff759159e6be48de4a598a993c986997280a2dc29922a48aaa98020f16439f3f57ad72788354
   languageName: node
   linkType: hard
 
@@ -425,7 +427,7 @@ __metadata:
   resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63
+  checksum: 10c0/e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63
   languageName: node
   linkType: hard
 
@@ -436,7 +438,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
+  checksum: 10c0/d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
   languageName: node
   linkType: hard
 
@@ -447,7 +449,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
+  checksum: 10c0/686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
   languageName: node
   linkType: hard
 
@@ -458,7 +460,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.12.13"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
+  checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
   languageName: node
   linkType: hard
 
@@ -469,7 +471,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
+  checksum: 10c0/4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
   languageName: node
   linkType: hard
 
@@ -480,7 +482,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
+  checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
   languageName: node
   linkType: hard
 
@@ -491,29 +493,29 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
+  checksum: 10c0/5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7db8b59f75667bada2293353bb66b9d5651a673b22c72f47da9f5c46e719142481601b745f9822212fd7522f92e26e8576af37116f85dae1b5e5967f80d0faab
+  checksum: 10c0/72f0340d73e037f0702c61670054e0af66ece7282c5c2f4ba8de059390fee502de282defdf15959cd9f71aa18dc5c5e4e7a0fde317799a0600c6c4e0a656d82b
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 99b40d33d79205a8e04bb5dea56fd72906ffc317513b20ca7319e7683e18fce8ea2eea5e9171056f92b979dc0ab1e31b2cb5171177a5ba61e05b54fe7850a606
+  checksum: 10c0/309634e3335777aee902552b2cf244c4a8050213cc878b3fb9d70ad8cbbff325dc46ac5e5791836ff477ea373b27832238205f6ceaff81f7ea7c4c7e8fbb13bb
   languageName: node
   linkType: hard
 
@@ -524,7 +526,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
+  checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
   languageName: node
   linkType: hard
 
@@ -535,18 +537,18 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
+  checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
+"@babel/plugin-syntax-jsx@npm:7, @babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.24.1, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 563bb7599b868773f1c7c1d441ecc9bc53aeb7832775da36752c926fc402a1fa5421505b39e724f71eb217c13e4b93117e081cac39723b0e11dac4c897f33c3e
+  checksum: 10c0/6cec76fbfe6ca81c9345c2904d8d9a8a0df222f9269f0962ed6eb2eb8f3f10c2f15e993d1ef09dbaf97726bf1792b5851cf5bd9a769f966a19448df6be95d19a
   languageName: node
   linkType: hard
 
@@ -557,7 +559,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
+  checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
   languageName: node
   linkType: hard
 
@@ -568,7 +570,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
+  checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
   languageName: node
   linkType: hard
 
@@ -579,7 +581,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
+  checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
   languageName: node
   linkType: hard
 
@@ -590,7 +592,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
+  checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
   languageName: node
   linkType: hard
 
@@ -601,7 +603,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
+  checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
   languageName: node
   linkType: hard
 
@@ -612,7 +614,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
+  checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
   languageName: node
   linkType: hard
 
@@ -623,7 +625,7 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
+  checksum: 10c0/69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
   languageName: node
   linkType: hard
 
@@ -634,18 +636,18 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
+  checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.23.3, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.23.3
-  resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
+"@babel/plugin-syntax-typescript@npm:^7.24.1, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-typescript@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4d6e9cdb9d0bfb9bd9b220fc951d937fce2ca69135ec121153572cebe81d86abc9a489208d6b69ee5f10cadcaeffa10d0425340a5029e40e14a6025021b90948
+  checksum: 10c0/7a81e277dcfe3138847e8e5944e02a42ff3c2e864aea6f33fd9b70d1556d12b0e70f0d56cc1985d353c91bcbf8fe163e6cc17418da21129b7f7f1d8b9ac00c93
   languageName: node
   linkType: hard
 
@@ -657,314 +659,314 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50
+  checksum: 10c0/9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b128315c058f5728d29b0b78723659b11de88247ea4d0388f0b935cddf60a80c40b9067acf45cbbe055bd796928faef152a09d9e4a0695465aca4394d9f109ca
+  checksum: 10c0/f44bfacf087dc21b422bab99f4e9344ee7b695b05c947dacae66de05c723ab9d91800be7edc1fa016185e8c819f3aca2b4a5f66d8a4d1e47d9bad80b8fa55b8e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 63d314edc9fbeaf2700745ca0e19bf9840e87f2d7d1f6c5638e06d2aec3e7418d0d7493ed09087e2fe369cc15e9d96c113fb2cd367cb5e3ff922e3712c27b7d4
+  checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-module-imports": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: da3ffd413eef02a8e2cfee3e0bb0d5fc0fcb795c187bc14a5a8e8874cdbdc43bbf00089c587412d7752d97efc5967c3c18ff5398e3017b9a14a06126f017e7e9
+  checksum: 10c0/3731ba8e83cbea1ab22905031f25b3aeb0b97c6467360a2cc685352f16e7c786417d8883bc747f5a0beff32266bdb12a05b6292e7b8b75967087200a7bc012c4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 82c12a11277528184a979163de7189ceb00129f60dd930b0d5313454310bf71205f302fb2bf0430247161c8a22aaa9fb9eec1459f9f7468206422c191978fd59
+  checksum: 10c0/6fbaa85f5204f34845dfc0bebf62fdd3ac5a286241c85651e59d426001e7a1785ac501f154e093e0b8ee49e1f51e3f8b06575a5ae8d4a9406d43e4816bf18c37
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
+"@babel/plugin-transform-block-scoping@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276
+  checksum: 10c0/85997fc8179b7d26e8af30865aeb91789f3bc1f0cd5643ed25f25891ff9c071460ec1220599b19070b424a3b902422f682e9b02e515872540173eae2e25f760c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-class-properties@npm:7.23.3"
+"@babel/plugin-transform-class-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bca30d576f539eef216494b56d610f1a64aa9375de4134bc021d9660f1fa735b1d7cc413029f22abc0b7cb737e3a57935c8ae9d8bd1730921ccb1deebce51bfd
+  checksum: 10c0/00dff042ac9df4ae67b5ef98b1137cc72e0a24e6d911dc200540a8cb1f00b4cff367a922aeb22da17da662079f0abcd46ee1c5f4cdf37ceebf6ff1639bb9af27
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
+"@babel/plugin-transform-class-static-block@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0
+  checksum: 10c0/19dfeaf4a2ac03695034f7211a8b5ad89103b224608ac3e91791055107c5fe4d7ebe5d9fbb31b4a91265694af78762260642eb270f4b239c175984ee4b253f80
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.23.8":
-  version: 7.23.8
-  resolution: "@babel/plugin-transform-classes@npm:7.23.8"
+"@babel/plugin-transform-classes@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-classes@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.20"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043
+  checksum: 10c0/4affcbb7cb01fa4764c7a4b534c30fd24a4b68e680a2d6e242dd7ca8726490f0f1426c44797deff84a38a162e0629718900c68d28daffe2b12adf5b4194156a7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3"
+"@babel/plugin-transform-computed-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/template": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3ca8a006f8e652b58c21ecb84df1d01a73f0a96b1d216fd09a890b235dd90cb966b152b603b88f7e850ae238644b1636ce5c30b7c029c0934b43383932372e4a
+  checksum: 10c0/8292c508b656b7722e2c2ca0f6f31339852e3ed2b9b80f6e068a4010e961b431ca109ecd467fc906283f4b1574c1e7b1cb68d35a4dea12079d386c15ff7e0eac
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
+"@babel/plugin-transform-destructuring@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 717e9a62c1b0c93c507f87b4eaf839ec08d3c3147f14d74ae240d8749488d9762a8b3950132be620a069bde70f4b3e4ee9867b226c973fcc40f3cdec975cde71
+  checksum: 10c0/6a37953a95f04b335bf3e2118fb93f50dd9593c658d1b2f8918a380a2ee30f1b420139eccf7ec3873c86a8208527895fcf6b7e21c0e734a6ad6e5d5042eace4d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6c89286d1277c2a63802a453c797c87c1203f89e4c25115f7b6620f5fce15d8c8d37af613222f6aa497aa98773577a6ec8752e79e13d59bc5429270677ea010b
+  checksum: 10c0/758def705ec5a87ef910280dc2df5d2fda59dc5d4771c1725c7aed0988ae5b79e29aeb48109120301a3e1c6c03dfac84700469de06f38ca92c96834e09eadf5d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7e2640e4e6adccd5e7b0615b6e9239d7c98363e21c52086ea13759dfa11cf7159b255fc5331c2de435639ea8eb6acefae115ae0d797a3d19d12587652f8052a5
+  checksum: 10c0/41072f57f83a6c2b15f3ee0b6779cdca105ff3d98061efe92ac02d6c7b90fdb6e7e293b8a4d5b9c690d9ae5d3ae73e6bde4596dc4d8c66526a0e5e1abc73c88c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67
+  checksum: 10c0/7e2834780e9b5251ef341854043a89c91473b83c335358620ca721554877e64e416aeb3288a35f03e825c4958e07d5d00ead08c4490fadc276a21fe151d812f1
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5c33ee6a1bdc52fcdf0807f445b27e3fbdce33008531885e65a699762327565fffbcfde8395be7f21bcb22d582e425eddae45650c986462bb84ba68f43687516
+  checksum: 10c0/f0fc4c5a9add25fd6bf23dabe6752e9b7c0a2b2554933dddfd16601245a2ba332b647951079c782bf3b94c6330e3638b9b4e0227f469a7c1c707446ba0eba6c7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7
+  checksum: 10c0/510bb23b2423d5fbffef69b356e4050929c21a7627e8194b1506dd935c7d9cbbd696c9ae9d7c3bcd7e6e7b69561b0b290c2d72d446327b40fc20ce40bbca6712
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/plugin-transform-for-of@npm:7.23.6"
+"@babel/plugin-transform-for-of@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec
+  checksum: 10c0/e4bc92b1f334246e62d4bde079938df940794db564742034f6597f2e38bd426e11ae8c5670448e15dd6e45c462f2a9ab3fa87259bddf7c08553ffd9457fc2b2c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-function-name@npm:7.23.3"
+"@babel/plugin-transform-function-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 89cb9747802118048115cf92a8f310752f02030549b26f008904990cbdc86c3d4a68e07ca3b5c46de8a46ed4df2cb576ac222c74c56de67253d2a3ddc2956083
+  checksum: 10c0/65c1735ec3b5e43db9b5aebf3c16171c04b3050c92396b9e22dda0d2aaf51f43fdcf147f70a40678fd9a4ee2272a5acec4826e9c21bcf968762f4c184897ad75
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
+"@babel/plugin-transform-json-strings@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54
+  checksum: 10c0/13d9b6a3c31ab4be853b3d49d8d1171f9bd8198562fd75da8f31e7de31398e1cfa6eb1d073bed93c9746e4f9c47a53b20f8f4c255ece3f88c90852ad3181dc2d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-literals@npm:7.23.3"
+"@babel/plugin-transform-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8292106b106201464c2bfdd5c014fe6a9ca1c0256eb0a8031deb20081e21906fe68b156186f77d993c23eeab6d8d6f5f66e8895eec7ed97ce6de5dbcafbcd7f4
+  checksum: 10c0/a27cc7d565ee57b5a2bf136fa889c5c2f5988545ae7b3b2c83a7afe5dd37dfac80dca88b1c633c65851ce6af7d2095c04c01228657ce0198f918e64b5ccd01fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff
+  checksum: 10c0/98a2e0843ddfe51443c1bfcf08ba40ad8856fd4f8e397b392a5390a54f257c8c1b9a99d8ffc0fc7e8c55cce45e2cd9c2795a4450303f48f501bcbd662de44554
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 687f24f3ec60b627fef6e87b9e2770df77f76727b9d5f54fa4c84a495bb24eb4a20f1a6240fa22d339d45aac5eaeb1b39882e941bfd00cf498f9c53478d1ec88
+  checksum: 10c0/2af731d02aa4c757ef80c46df42264128cbe45bfd15e1812d1a595265b690a44ad036041c406a73411733540e1c4256d8174705ae6b8cfaf757fc175613993fd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3"
+"@babel/plugin-transform-modules-amd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9f7ec036f7cfc588833a4dd117a44813b64aa4c1fd5bfb6c78f60198c1d290938213090c93a46f97a68a2490fad909e21a82b2472e95da74d108c125df21c8d5
+  checksum: 10c0/71fd04e5e7026e6e52701214b1e9f7508ba371b757e5075fbb938a79235ed66a54ce65f89bb92b59159e9f03f01b392e6c4de6d255b948bec975a90cfd6809ef
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-simple-access": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d
+  checksum: 10c0/efb3ea2047604a7eb44a9289311ebb29842fe6510ff8b66a77a60440448c65e1312a60dc48191ed98246bdbd163b5b6f3348a0669bcc0e3809e69c7c776b20fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
   dependencies:
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d55280a276510222c8896bf4e581acb84824aa5b14c824f7102242ad6bc5104aaffe5ab22fe4d27518f4ae2811bd59c36d0c0bfa695157f9cfce33f0517a069
+  checksum: 10c0/38145f8abe8a4ce2b41adabe5d65eb7bd54a139dc58e2885fec975eb5cf247bd938c1dd9f09145c46dbe57d25dd0ef7f00a020e5eb0cbe8195b2065d51e2d93d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3"
+"@babel/plugin-transform-modules-umd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
   dependencies:
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f0d2f890a15b4367d0d8f160bed7062bdb145c728c24e9bfbc1211c7925aae5df72a88df3832c92dd2011927edfed4da1b1249e4c78402e893509316c0c2caa6
+  checksum: 10c0/14c90c58562b54e17fe4a8ded3f627f9a993648f8378ef00cb2f6c34532032b83290d2ad54c7fff4f0c2cd49091bda780f8cc28926ec4b77a6c2141105a2e699
   languageName: node
   linkType: hard
 
@@ -976,142 +978,141 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
+  checksum: 10c0/b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
+"@babel/plugin-transform-new-target@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f489b9e1f17b42b2ba6312d58351e757cb23a8409f64f2bb6af4c09d015359588a5d68943b20756f141d0931a94431c782f3ed1225228a930a04b07be0c31b04
+  checksum: 10c0/c4cabe628163855f175a8799eb73d692b6f1dc347aae5022af0c253f80c92edb962e48ddccc98b691eff3d5d8e53c9a8f10894c33ba4cebc2e2f8f8fe554fb7a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.3, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b
+  checksum: 10c0/c8532951506fb031287280cebeef10aa714f8a7cea2b62a13c805f0e0af945ba77a7c87e4bbbe4c37fe973e0e5d5e649cfac7f0374f57efc54cdf9656362a392
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12
+  checksum: 10c0/15e2b83292e586fb4f5b4b4021d4821a806ca6de2b77d5ad6c4e07aa7afa23704e31b4d683dac041afc69ac51b2461b96e8c98e46311cc1faba54c73f235044f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.5"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.3"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.23.3"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262
+  checksum: 10c0/91d7303af9b5744b8f569c1b8e45c9c9322ded05e7ee94e71b9ff2327f0d2c7b5aa87e040697a6baacc2dcb5c5e5e00913087c36f24c006bdaa4f958fd5bfd2d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-object-super@npm:7.23.3"
+"@babel/plugin-transform-object-super@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a6856fd8c0afbe5b3318c344d4d201d009f4051e2f6ff6237ff2660593e93c5997a58772b13d639077c3e29ced3440247b29c496cd77b13af1e7559a70009775
+  checksum: 10c0/d30e6b9e59a707efd7ed524fc0a8deeea046011a6990250f2e9280516683138e2d13d9c52daf41d78407bdab0378aef7478326f2a15305b773d851cb6e106157
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e
+  checksum: 10c0/68408b9ef772d9aa5dccf166c86dc4d2505990ce93e03dcfc65c73fb95c2511248e009ba9ccf5b96405fb85de1c16ad8291016b1cc5689ee4becb1e3050e0ae7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.1, @babel/plugin-transform-optional-chaining@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb
+  checksum: 10c0/f4e9446ec69f58f40b7843ce7603cfc50332976e6e794d4ddbe6b24670cd50ebc7766c4e3cbaecf0fbb744e98cbfbb54146f4e966314b1d58511b8bbf3d2722b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
+"@babel/plugin-transform-parameters@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a8d4cbe0f6ba68d158f5b4215c63004fc37a1fdc539036eb388a9792017c8496ea970a1932ccb929308f61e53dc56676ed01d8df6f42bc0a85c7fd5ba82482b7
+  checksum: 10c0/e08b8c46a24b1b21dde7783cb0aeb56ffe9ef6d6f1795649ce76273657158d3bfa5370c6594200ed7d371983b599c8e194b76108dffed9ab5746fe630ef2e8f5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-private-methods@npm:7.23.3"
+"@babel/plugin-transform-private-methods@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 745a655edcd111b7f91882b921671ca0613079760d8c9befe336b8a9bc4ce6bb49c0c08941831c950afb1b225b4b2d3eaac8842e732db095b04db38efd8c34f4
+  checksum: 10c0/d8e18587d2a8b71a795da5e8841b0e64f1525a99ad73ea8b9caa331bc271d69646e2e1e749fd634321f3df9d126070208ddac22a27ccf070566b2efb74fecd99
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.5"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5
+  checksum: 10c0/de7182bfde298e56c08a5d7ee1156f83c9af8c856bbe2248438848846a4ce544e050666bd0482e16a6006195e8be4923abd14650bef51fa0edd7f82014c2efcd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
+"@babel/plugin-transform-property-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b2549f23f90cf276c2e3058c2225c3711c2ad1c417e336d3391199445a9776dd791b83be47b2b9a7ae374b40652d74b822387e31fa5267a37bf49c122e1a9747
+  checksum: 10c0/3bf3e01f7bb8215a8b6d0081b6f86fea23e3a4543b619e059a264ede028bc58cdfb0acb2c43271271915a74917effa547bc280ac636a9901fa9f2fb45623f87e
   languageName: node
   linkType: hard
 
@@ -1122,30 +1123,30 @@ __metadata:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3a54802058ed3eef9c98efcc9ec4888763dce552f117db9a62fc2cdca30d9de0218cf7722a748d4b715a8bd833b9725d7ee018d01a18209b44434d15f719b173
+  checksum: 10c0/3a54802058ed3eef9c98efcc9ec4888763dce552f117db9a62fc2cdca30d9de0218cf7722a748d4b715a8bd833b9725d7ee018d01a18209b44434d15f719b173
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
+"@babel/plugin-transform-react-display-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3aed142af7bd1aed1df2bdad91ed33ba1cdd5c3c67ce6eafba821ff72f129162a197ffb55f1eb1775af276abd5545934489a8257fef6c6665ddf253a4f39a939
+  checksum: 10c0/adf1a3cb0df8134533a558a9072a67e34127fd489dfe431c3348a86dd41f3e74861d5d5134bbb68f61a9cdb3f7e79b2acea1346be94ce4d3328a64e5a9e09be1
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-react-inline-elements@npm:^7.21.0":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-inline-elements@npm:7.24.1"
   dependencies:
     "@babel/helper-builder-react-jsx": "npm:^7.22.10"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 138f7769b30f65d339588155affe677c68fde3cdaa060a2dc73152cc8c941c246d4b2ae73c8f1d9ddf1055e587fcb7379c155d49daec086ed50557f2117c1d50
+  checksum: 10c0/83fc6afaebbe82a5b14936f00b6d1ffce1a3d908ac749d5daa43f724d32c98b50807ffc3ce2492c1aa49870189507b751993a4a079b9c3226c9b8aab783d08b6
   languageName: node
   linkType: hard
 
@@ -1156,212 +1157,213 @@ __metadata:
     "@babel/plugin-transform-react-jsx": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
+  checksum: 10c0/4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15"
+"@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/plugin-syntax-jsx": "npm:^7.22.5"
-    "@babel/types": "npm:^7.22.15"
+    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: db37491e3eea5530521e177380312f308f01f806866fa0ce08d48fc5a8c9eaf9a954f778fa1ff477248afb72e916eb66ab3d35254bb6a8979f8b8e74a0fd8873
+  checksum: 10c0/8851b3adc515cd91bdb06ff3a23a0f81f0069cfef79dfb3fa744da4b7a82e3555ccb6324c4fa71ecf22508db13b9ff6a0ed96675f95fc87903b9fc6afb699580
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 76287adeab656fb7f39243e5ab6a8c60069cf69fffeebd1566457d56cb2f966366a23bd755d3e369f4d0437459e3b76243df370caa7d7d2287a8560b66c53ca2
+  checksum: 10c0/9eb3056fcaadd63d404fd5652b2a3f693bc4758ba753fee5b5c580c7a64346eeeb94e5a4f77a99c76f3cf06d1f1ad6c227647cd0b1219efe3d00cafa5a6e7b2a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
+"@babel/plugin-transform-regenerator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3b0e989ae5db78894ee300b24e07fbcec490c39ab48629c519377581cf94e90308f4ddc10a8914edc9f403e2d3ac7a7ae0ae09003629d852da03e2ba846299c6
+  checksum: 10c0/0a333585d7c0b38d31cc549d0f3cf7c396d1d50b6588a307dc58325505ddd4f5446188bc536c4779431b396251801b3f32d6d8e87db8274bc84e8c41950737f7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
+"@babel/plugin-transform-reserved-words@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4e6d61f6c9757592661cfbd2c39c4f61551557b98cb5f0995ef10f5540f67e18dde8a42b09716d58943b6e4b7ef5c9bcf19902839e7328a4d49149e0fecdbfcd
+  checksum: 10c0/936d6e73cafb2cbb495f6817c6f8463288dbc9ab3c44684b931ebc1ece24f0d55dfabc1a75ba1de5b48843d0fef448dcfdbecb8485e4014f8f41d0d1440c536f
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.7
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.7"
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.3"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0d5038462a5762c3a88d820785f685ce1b659075527a3ad538647fd9ce486052777d5aea3d62e626639d60441a04dd0ded2ed32c86b92cf8afbdbd3d54460c13
+  checksum: 10c0/ee01967bf405d84bd95ca4089166a18fb23fe9851a6da53dcf712a7f8ba003319996f21f320d568ec76126e18adfaee978206ccda86eef7652d47cc9a052e75e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c423c66fec0b6503f50561741754c84366ef9e9818442c8881fbaa90cc363fd137084b9431cdc00ed2f1fd8c8a1a5982c4a7e1f2af3769db4caf2ac7ea55d4f0
+  checksum: 10c0/8273347621183aada3cf1f3019d8d5f29467ba13a75b72cb405bc7f23b7e05fd85f4edb1e4d9f0103153dddb61826a42dc24d466480d707f8932c1923a4c25fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-spread@npm:7.23.3"
+"@babel/plugin-transform-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a348e4ae47e4ceeceb760506ec7bf835ccc18a2cf70ec74ebfbe41bc172fa2412b05b7d1b86836f8aee375e41a04ff20486074778d0e2d19d668b33dc52e9dbb
+  checksum: 10c0/50a0302e344546d57e5c9f4dea575f88e084352eeac4e9a3e238c41739eef2df1daf4a7ebbb3ccb7acd3447f6a5ce9938405f98bf5f5583deceb8257f5a673c9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cd15c407906b41e4b924ea151e455c11274dba050771ee7154ad88a1a274140ac5e84efc8d08c4379f2f0cec8a09e4a0a3b2a3a954ba6a67d9fb35df1c714c56
+  checksum: 10c0/786fe2ae11ef9046b9fa95677935abe495031eebf1274ad03f2054a20adea7b9dbd00336ac0b143f7924bc562e5e09793f6e8613607674b97e067d4838ccc4a0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
+"@babel/plugin-transform-template-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9b5f43788b9ffcb8f2b445a16b1aa40fcf23cb0446a4649445f098ec6b4cb751f243a535da623d59fefe48f4c40552f5621187a61811779076bab26863e3373d
+  checksum: 10c0/f73bcda5488eb81c6e7a876498d9e6b72be32fca5a4d9db9053491a2d1300cd27b889b463fd2558f3cd5826a85ed00f61d81b234aa55cb5a0abf1b6fa1bd5026
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 50e81d84c6059878be2a0e41e0d790cab10882cfb8fa85e8c2665ccb0b3cd7233f49197f17427bc7c1b36c80e07076640ecf1b641888d78b9cb91bc16478d84a
+  checksum: 10c0/5f0b5e33a86b84d89673829ffa2b5f175e102d3d0f45917cda121bc2b3650e1e5bb7a653f8cc1059c5b3a7b2e91e1aafd6623028b96ae752715cc5c2171c96e5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-typescript@npm:7.23.3"
+"@babel/plugin-transform-typescript@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-typescript@npm:7.24.1"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/plugin-syntax-typescript": "npm:^7.23.3"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-typescript": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a3c738efcf491ceb1eee646f57c44990ee0c80465527b88fcfa0b7602688c4ff8c165a4c5b62caf05d968b095212018fd30a02879c12d37c657081f57b31fb26
+  checksum: 10c0/9abce423ed2d3cb9398b09e3ed9efea661e92bd32e919f5c7942ac4bad4c5fd23a1d575bb7444d8c92261b68fb626552e0d9eea960372b6b6f54c2c9699a2649
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f1ed54742dc982666f471df5d087cfda9c6dbf7842bec2d0f7893ed359b142a38c0210358f297ab5c7a3e11ec0dfb0e523de2e2edf48b62f257aaadd5f068866
+  checksum: 10c0/67a72a1ed99639de6a93aead35b1993cb3f0eb178a8991fcef48732c38c9f0279c85bbe1e2e2477b85afea873e738ff0955a35057635ce67bc149038e2d8a28e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: dca5702d43fac70351623a12e4dfa454fd028a67498888522b644fd1a02534fabd440106897e886ebcc6ce6a39c58094ca29953b6f51bc67372aa8845a5ae49f
+  checksum: 10c0/d9d9752df7d51bf9357c0bf3762fe16b8c841fca9ecf4409a16f15ccc34be06e8e71abfaee1251b7d451227e70e6b873b36f86b090efdb20f6f7de5fdb6c7a05
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: df824dcca2f6e731f61d69103e87d5dd974d8a04e46e28684a4ba935ae633d876bded09b8db890fd72d0caf7b9638e2672b753671783613cc78d472951e2df8c
+  checksum: 10c0/6046ab38e5d14ed97dbb921bd79ac1d7ad9d3286da44a48930e980b16896db2df21e093563ec3c916a630dc346639bf47c5924a33902a06fe3bbb5cdc7ef5f2f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
   dependencies:
     "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 30fe1d29af8395a867d40a63a250ca89072033d9bc7d4587eeebeaf4ad7f776aab83064321bfdb1d09d7e29a1d392852361f4f60a353f0f4d1a3b435dcbf256b
+  checksum: 10c0/b6c1f6b90afeeddf97e5713f72575787fcb7179be7b4c961869bfbc66915f66540dc49da93e4369da15596bd44b896d1eb8a50f5e1fd907abd7a1a625901006b
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.8
-  resolution: "@babel/preset-env@npm:7.23.8"
+  version: 7.24.5
+  resolution: "@babel/preset-env@npm:7.24.5"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/compat-data": "npm:^7.24.4"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
     "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.23.3"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.23.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1373,63 +1375,63 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.7"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.23.3"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
-    "@babel/plugin-transform-class-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-class-static-block": "npm:^7.23.4"
-    "@babel/plugin-transform-classes": "npm:^7.23.8"
-    "@babel/plugin-transform-computed-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-destructuring": "npm:^7.23.3"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.23.3"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.23.4"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.23.3"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.23.4"
-    "@babel/plugin-transform-for-of": "npm:^7.23.6"
-    "@babel/plugin-transform-function-name": "npm:^7.23.3"
-    "@babel/plugin-transform-json-strings": "npm:^7.23.4"
-    "@babel/plugin-transform-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.23.4"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-amd": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-umd": "npm:^7.23.3"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.5"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
+    "@babel/plugin-transform-classes": "npm:^7.24.5"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.5"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
+    "@babel/plugin-transform-for-of": "npm:^7.24.1"
+    "@babel/plugin-transform-function-name": "npm:^7.24.1"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
+    "@babel/plugin-transform-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
-    "@babel/plugin-transform-new-target": "npm:^7.23.3"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.23.4"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.23.4"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.23.4"
-    "@babel/plugin-transform-object-super": "npm:^7.23.3"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.23.4"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.23.4"
-    "@babel/plugin-transform-parameters": "npm:^7.23.3"
-    "@babel/plugin-transform-private-methods": "npm:^7.23.3"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.23.4"
-    "@babel/plugin-transform-property-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-regenerator": "npm:^7.23.3"
-    "@babel/plugin-transform-reserved-words": "npm:^7.23.3"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.23.3"
-    "@babel/plugin-transform-spread": "npm:^7.23.3"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-template-literals": "npm:^7.23.3"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.23.3"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3"
+    "@babel/plugin-transform-new-target": "npm:^7.24.1"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.5"
+    "@babel/plugin-transform-object-super": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.5"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.5"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.5"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e602ad954645f1a509644e3d2c72b3c63bdc2273c377e7a83b78f076eca215887ea3624ffc36aaad03deb9ac8acd89e247fd4562b96e0f2b679485e20d8ff25f
+  checksum: 10c0/2cc0edae09205d6409a75d02e53aaa1c590e89adbb7b389019c7b75e4c47b6b63eeb1a816df5c42b672ce410747e7ddc23b6747e8e41a6c95d6fa00c665509e2
   languageName: node
   linkType: hard
 
@@ -1442,45 +1444,45 @@ __metadata:
     esutils: "npm:^2.0.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
-  checksum: 9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6
+  checksum: 10c0/9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6
   languageName: node
   linkType: hard
 
 "@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.22.3":
-  version: 7.23.3
-  resolution: "@babel/preset-react@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/preset-react@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    "@babel/plugin-transform-react-display-name": "npm:^7.23.3"
-    "@babel/plugin-transform-react-jsx": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.1"
+    "@babel/plugin-transform-react-jsx": "npm:^7.23.4"
     "@babel/plugin-transform-react-jsx-development": "npm:^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations": "npm:^7.23.3"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cecb2493e09fd4ffa5effcef1d06e968386b1bfe077a99834f7e8ef249208274fca62fe5a6b3986ef1c1c3900b2eb409adb528ae1b73dba31397b16f9262e83c
+  checksum: 10c0/a842abc5a024ed68a0ce4c1244607d40165cb6f8cf1817ebda282e470f20302d81c6a61cb41c1a31aa6c4e99ce93df4dd9e998a8ded1417c25d7480f0e14103a
   languageName: node
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.21.5":
-  version: 7.23.3
-  resolution: "@babel/preset-typescript@npm:7.23.3"
+  version: 7.24.1
+  resolution: "@babel/preset-typescript@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3"
-    "@babel/plugin-transform-typescript": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-typescript": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7
+  checksum: 10c0/0033dc6fbc898ed0d8017c83a2dd5e095c82909e2f83e48cf9f305e3e9287148758c179ad90f27912cf98ca68bfec3643c57c70c0ca34d3a6c50dc8243aef406
   languageName: node
   linkType: hard
 
 "@babel/regjsgen@npm:^0.8.0":
   version: 0.8.0
   resolution: "@babel/regjsgen@npm:0.8.0"
-  checksum: 4f3ddd8c7c96d447e05c8304c1d5ba3a83fcabd8a716bc1091c2f31595cdd43a3a055fff7cb5d3042b8cb7d402d78820fcb4e05d896c605a7d8bcf30f2424c4a
+  checksum: 10c0/4f3ddd8c7c96d447e05c8304c1d5ba3a83fcabd8a716bc1091c2f31595cdd43a3a055fff7cb5d3042b8cb7d402d78820fcb4e05d896c605a7d8bcf30f2424c4a
   languageName: node
   linkType: hard
 
@@ -1489,105 +1491,527 @@ __metadata:
   resolution: "@babel/runtime@npm:7.0.0"
   dependencies:
     regenerator-runtime: "npm:^0.12.0"
-  checksum: fbbdf86380a1cfa6ce32a743549f4e4c8b8eb06a18be5054441cc0f66e75a747ae43b042d8989f4657027e1be3b9a82069865ccc5080838f004abd1161093742
+  checksum: 10c0/fbbdf86380a1cfa6ce32a743549f4e4c8b8eb06a18be5054441cc0f66e75a747ae43b042d8989f4657027e1be3b9a82069865ccc5080838f004abd1161093742
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.8
-  resolution: "@babel/runtime@npm:7.23.8"
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.7, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.24.5
+  resolution: "@babel/runtime@npm:7.24.5"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8
+  checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
-  dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/parser": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.15"
-  checksum: 9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454
-  languageName: node
-  linkType: hard
-
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.7":
-  version: 7.23.7
-  resolution: "@babel/traverse@npm:7.23.7"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/traverse@npm:7.24.5"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.6"
-    "@babel/types": "npm:^7.23.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: e32fceb4249beec2bde83968ddffe17444221c1ee5cd18c543a2feaf94e3ca83f2a4dfbc2dcca87cf226e0105973e0fe3717063a21e982a9de9945615ab3f3f5
+  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.6
-  resolution: "@babel/types@npm:7.23.6"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.5
+  resolution: "@babel/types@npm:7.24.5"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.23.4"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-string-parser": "npm:^7.24.1"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
+  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
   languageName: node
   linkType: hard
 
 "@bcoe/v8-coverage@npm:^0.2.3":
   version: 0.2.3
   resolution: "@bcoe/v8-coverage@npm:0.2.3"
-  checksum: 6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
+  checksum: 10c0/6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.4.0":
-  version: 2.5.0
-  resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
+"@csstools/cascade-layer-name-parser@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.11"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.2.3
-  checksum: 31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/52ac8369877c8072ff5c111f656bd87e9a2a4b9e44e48fe005c26faeb6cffd83bfe2f463f4f385a2ae5cfe1f82bbf95d26ddaabca18b66c6b657c4fe1520fb43
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.2":
-  version: 2.2.3
-  resolution: "@csstools/css-tokenizer@npm:2.2.3"
-  checksum: 557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
+"@csstools/color-helpers@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@csstools/color-helpers@npm:4.2.0"
+  checksum: 10c0/3f1feac43c2ef35f38b3b06fe74e0acc130283d7efb6874f6624e45e178c1a7b3c7e39816c7421cddbffc2666430906aa6f0d3dd7c7209db1369c0afd4a29b1b
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.6":
-  version: 2.1.7
-  resolution: "@csstools/media-query-list-parser@npm:2.1.7"
+"@csstools/css-calc@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "@csstools/css-calc@npm:1.2.2"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.5.0
-    "@csstools/css-tokenizer": ^2.2.3
-  checksum: 433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/6032b482764a11c1b882d7502928950ab11760044fa7a2c23ecee802002902f6ea8fca045ee2919302af5a5c399e7baa9f68dff001ac6246ac7fef48fb3f6df7
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.1":
+"@csstools/css-color-parser@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/css-color-parser@npm:2.0.2"
+  dependencies:
+    "@csstools/color-helpers": "npm:^4.2.0"
+    "@csstools/css-calc": "npm:^1.2.2"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/c5ae4ad78745e425dce56da9f1ab053fb4f7963399735df3303305b32123bed0b2237689c2e7e99da2c62387e3226c12ea85e70e275c4027c7507e4ac929bffa
+  languageName: node
+  linkType: hard
+
+"@csstools/css-parser-algorithms@npm:^2.6.1, @csstools/css-parser-algorithms@npm:^2.6.3":
+  version: 2.6.3
+  resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
+  peerDependencies:
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/6648fda75a1c08096320fb5c04fd13656a0168de13584d2795547fecfb26c2c7d8b3b1fb79ba7aa758714851e98bfbec20d89e28697f999f41f91133eafe4207
+  languageName: node
+  linkType: hard
+
+"@csstools/css-tokenizer@npm:^2.2.4, @csstools/css-tokenizer@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "@csstools/css-tokenizer@npm:2.3.1"
+  checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
+  languageName: node
+  linkType: hard
+
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.9":
+  version: 2.1.11
+  resolution: "@csstools/media-query-list-parser@npm:2.1.11"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.6.3
+    "@csstools/css-tokenizer": ^2.3.1
+  checksum: 10c0/9bcd99f7d28ae3cdaba73fbbfef571b0393dd4e841f522cc796fe5161744f17e327ba1713dad3c481626fade1357c55890e3d365177abed50e857b69130a9be5
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-cascade-layers@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-color-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-color-function@npm:3.0.16"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/41756a4601a3f1086290dab6ca92b54e201bd94637b54b439c66a04fd628a14e2a0bd1452ad294d2981e2f4bb306758fa5f44639b1c4332320435050749aa487
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-color-mix-function@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.16"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/70cd5b291dd615e20e4475517bf0027c90c433241397a66866f89acedb12cb91f45552a162bdd1000636ec56f7d6a099b65e44fe100fd03228fc65f17cfae285
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-exponential-functions@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.7"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2079c81c3437686ef432d88502fa3a13bf8a27b7af105b4c6c2eb8e779f14adc8967a5a3ed03271ab919eeaf999fc4489fe4b37d32a8f61ab3212439517bddcc
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-font-format-keywords@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-font-format-keywords@npm:3.0.2"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/1b9bf031ce1a00fef1fae0b1ad614eddc6bb4c036ecad47e065c99063ba3d2f6ab8e47f9db02a6fbe8b75b0e02a075a7a80480d4296918970ba9e8d36f07a523
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-gamut-mapping@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.9"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/412ae1410f3fce240401576441637c2c4e71d1a54153ac9b7a991b3de7519c253d03e10db78b09872eb10b0776d7f960b442779efabc11332b5be6672163c836
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.17":
+  version: 4.0.17
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.17"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/465ac42856ca1a57aa2b9ea41ede31d9e2bcf2fe84345dbc182ae41f463069a0cfd41041b834b5133108c702cd85ecb8636b51b0b88fff8a221628639b59f386
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-hwb-function@npm:^3.0.15":
+  version: 3.0.15
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.15"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/fdfaeefbab1008ab1e4a98a2b45cc3db002b2724c404fa0600954b411a68b1fa4028286250bf9898eed10fa80c44e4d6b4e55f1aca073c3dfce8198a0aaedf3f
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-ic-unit@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.6"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a4b962327d433419fdcfdcf620ce6a5cf09aa3c93029ad08b035df1e2bc35caae31de49f1d14218de0656fced35c0d2e07e5ff7b8099c29dbfb40395fc283234
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-initial@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-initial@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5d21c7c611d90a4b6758ba5be5e38d8d9eea9499c62797c4f5e01fbc9ccc2c68daf1c201850efe70ffa4ff9e979e7dea80b854b8793768550879562881aa6f9f
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-light-dark-function@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.5"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/4fbeda98372d0da25d3ed87da09903c9a0a5d0b8c13cc9de82a98acce4a8f8367e5ba33bfc25c2534d10f2b1db9d5b4278df4ebab755e27ef2b03a95e0ebe264
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-float-and-clear@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/92d9184bf8a159753a5872463dcfde580abd9b935e2a59f7ebe601cd14d9871f2f9f4dc18d8bbe251e7d8a3e446e302d9d99bf408d9cabbd9a6323825f5e833d
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-overflow@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-logical-overflow@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a8f5b1fdaf4ce7b1665407dac2f2e0c0ea11195e6873cfc714d9cd206489170fd91fc172b337330baf60191206f60579e235264f0dc7fee750ccd27ffe02c163
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9485502bd9235276525351818d6cc11544ac1b270bb4f527f3fac32fe98ac66269366c34cdb8f61920b10ff9aac5824935004a5927490a5febca77eb41226604
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-resize@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-logical-resize@npm:2.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/18f7e19ea465a15b334d8231b9ed98b630c74a6c2a6c52884437b852065f7b55bb1282cdbbdc1136aade479e996605b01799ab0ab771e2c47fd78d966ed33162
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-logical-viewport-units@npm:^2.0.9":
+  version: 2.0.9
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.9"
+  dependencies:
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/25b01e36b08c571806d09046be63582dbebf97a4612df59be405fa8a92e6eebcd4e768ad7fbe53b0b8739d6ab04d56957964fb04d6a3ea129fc5f72e6d0adf95
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-media-minmax@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.6"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2cbfb3728a232c655d82f63d5ac7da36876d14e5fee5d62a0738efed40c58f20ef11f600395ade24d5063d750e8e093251dd93cc361f782b5a6c0e0f80288f51
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.9":
+  version: 2.0.9
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.9"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/d431d2900a7177c938d9dc2d5bdf3c1930758adc214cc72f94b34e6bbd02fd917c200dc81482db515519c97d4f1e766ba3200f3ec9b55081887f2f8111f68e20
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-nested-calc@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-nested-calc@npm:3.0.2"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/3e24cf641170f9090f0dce088f6dae09ed9a0f38af1bdaa369ecc791a94cce54d7a02a0634f661a97fae24e04f1601c21d753593de018c80ad4236d36144b975
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-normalize-display-values@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-normalize-display-values@npm:3.0.2"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/a20e2f4c213a5ec6e004c2ba76b543d3288a39aae21b3198b06a57df0d2c7916111d2cd70dcb0e8c6ca1cf1b01751e88fd2fe9abbc070e1efab1a4e54dcdbbbe
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-oklab-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.16"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9c67ee5f51116df16ab6baffa1b3c6c7aa93d53b836f421125ae8824075bd3cfaa1a93594466de0ac935c89c4fc8171e80974e1a15bafa23ea864e4cf1f1c1f2
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-progressive-custom-properties@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.2.0"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/829880844fbbeef1c67e0b380057e574659b4caed38c8414c17d7eb4a0cc727afa1cd74a889bc7ca79c819ecae757810356706901cf6bb677a36ca123915cbb7
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-relative-color-syntax@npm:^2.0.16":
+  version: 2.0.16
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.16"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/cdc965706212dcbc03394f55c79a0ad043d1e0174059c4d0d90e4267fe8e6fd9eef7cfed4f5bbc1f8e89c225c1c042ae792e115bba198eb2daae763d65f44679
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-scope-pseudo-class@npm:^3.0.1":
   version: 3.0.1
-  resolution: "@csstools/selector-specificity@npm:3.0.1"
+  resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/489c5469951277b810754ba02e9f6c42196e03f2203b908181a81747bf1dcaa7b194c8c0f5c7dcb6b7276d08f2573a71bd7df4f2251c034ef1b92968c7070285
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-stepped-value-functions@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.8"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2be66aa769808245137be8ff14308aa17c3a0d75433f6fd6789114966a78c365dbf173d087e7ff5bc80118c75be2ff740baab83ed39fc0671980f6217779956b
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.6"
+  dependencies:
+    "@csstools/color-helpers": "npm:^4.2.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5abdc4fad1c3f15e9d47c7af3995dec9cdf4e6f87c5857eb2e149764779b8389f4f4b21d11e6f2509c57c554a0dc5c11f68f212acd04bbc47defa15911ac3eb9
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-trigonometric-functions@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.8"
+  dependencies:
+    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/aeed8d1026f4a5cb7afafbadd739af84291d5bfcbcdef2f79b77174f003d0cd0c7f9deb3fe0b9377efab37ce9bb17a2499efd4af8211f5ff9eb01b878b0b62b3
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-unset-value@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-unset-value@npm:3.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5032c3125eada0a3a77d0867644cf994e28b789aaa40e990e7eebcdf5a9ed9f36b30e0904827044cea39849c9a9a19c90e82d3ca655550d82a7530872b3b6ff8
+  languageName: node
+  linkType: hard
+
+"@csstools/selector-resolve-nested@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@csstools/selector-resolve-nested@npm:1.1.0"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f
+  checksum: 10c0/3a53b14e048d48b8900c1cf30442ab5eec1a1087c74ce41459c4dcd42ad7d363c9327890ba7aed25288d09c206d9565178bae126b25cdc3e1170a1d55e763c77
+  languageName: node
+  linkType: hard
+
+"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@csstools/selector-specificity@npm:3.1.1"
+  peerDependencies:
+    postcss-selector-parser: ^6.0.13
+  checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d
+  languageName: node
+  linkType: hard
+
+"@csstools/utilities@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/utilities@npm:1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/2ac10895e0a1f9e1fc9c092197c8595a09f632552791af91219f38c55bb39083fb44b74a6a7de9112492cf24a2fe66d20c955a2b4aff041d5c017d87bbebc0f2
   languageName: node
   linkType: hard
 
 "@discoveryjs/json-ext@npm:0.5.7":
   version: 0.5.7
   resolution: "@discoveryjs/json-ext@npm:0.5.7"
-  checksum: e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
+  checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
+  languageName: node
+  linkType: hard
+
+"@dual-bundle/import-meta-resolve@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0"
+  checksum: 10c0/868b8314fc753b7767887108535afe3288de941d92bc8453164dbcb1abe886b171e338f6f7d02ff556256dee69c90e4ac6360e0c6a856a5ad7190274ab52de2e
   languageName: node
   linkType: hard
 
@@ -1606,7 +2030,7 @@ __metadata:
     find-root: "npm:^1.1.0"
     source-map: "npm:^0.5.7"
     stylis: "npm:4.2.0"
-  checksum: 89cbb6ec0e52c8ee9c2a4b9889ccd4fc3a75d28091d835bfac6d7c4565d3338621e23af0a85f3bcd133e1cae795c692e1dadada015784d4b0554aa5bb111df43
+  checksum: 10c0/89cbb6ec0e52c8ee9c2a4b9889ccd4fc3a75d28091d835bfac6d7c4565d3338621e23af0a85f3bcd133e1cae795c692e1dadada015784d4b0554aa5bb111df43
   languageName: node
   linkType: hard
 
@@ -1619,21 +2043,21 @@ __metadata:
     "@emotion/utils": "npm:^1.2.1"
     "@emotion/weak-memoize": "npm:^0.3.1"
     stylis: "npm:4.2.0"
-  checksum: a23ab5ab2fd08e904698106d58ad3536fed51cc1aa0ef228e95bb640eaf11f560dbd91a395477b0d84e1e3c20150263764b4558517cf6576a89d2d6cc5253688
+  checksum: 10c0/a23ab5ab2fd08e904698106d58ad3536fed51cc1aa0ef228e95bb640eaf11f560dbd91a395477b0d84e1e3c20150263764b4558517cf6576a89d2d6cc5253688
   languageName: node
   linkType: hard
 
 "@emotion/hash@npm:^0.9.1":
   version: 0.9.1
   resolution: "@emotion/hash@npm:0.9.1"
-  checksum: cdafe5da63fc1137f3db6e232fdcde9188b2b47ee66c56c29137199642a4086f42382d866911cfb4833cae2cc00271ab45cad3946b024f67b527bb7fac7f4c9d
+  checksum: 10c0/cdafe5da63fc1137f3db6e232fdcde9188b2b47ee66c56c29137199642a4086f42382d866911cfb4833cae2cc00271ab45cad3946b024f67b527bb7fac7f4c9d
   languageName: node
   linkType: hard
 
 "@emotion/memoize@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/memoize@npm:0.8.1"
-  checksum: dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
+  checksum: 10c0/dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
   languageName: node
   linkType: hard
 
@@ -1654,7 +2078,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1aea4d735b537fbfbeda828bbf929488a7e1b5b7d131f14aeede8737e92bb3b611e15fec353e97f85aed7a65a1c86a695a04ba6e9be905231beef6bd624cb705
+  checksum: 10c0/1aea4d735b537fbfbeda828bbf929488a7e1b5b7d131f14aeede8737e92bb3b611e15fec353e97f85aed7a65a1c86a695a04ba6e9be905231beef6bd624cb705
   languageName: node
   linkType: hard
 
@@ -1667,21 +2091,21 @@ __metadata:
     "@emotion/unitless": "npm:^0.8.1"
     "@emotion/utils": "npm:^1.2.1"
     csstype: "npm:^3.0.2"
-  checksum: d243e0e5abce8d2183d25a32ec89bf650ee741ebadb29e6405abde05d4e2ed446ba5b3f725a29833ad709d0d08f0a5c8d0532fdcd43f4b23d931d8b6d4f218c1
+  checksum: 10c0/d243e0e5abce8d2183d25a32ec89bf650ee741ebadb29e6405abde05d4e2ed446ba5b3f725a29833ad709d0d08f0a5c8d0532fdcd43f4b23d931d8b6d4f218c1
   languageName: node
   linkType: hard
 
 "@emotion/sheet@npm:^1.2.2":
   version: 1.2.2
   resolution: "@emotion/sheet@npm:1.2.2"
-  checksum: 69827a1bfa43d7b188f1d8cea42163143a36312543fdade5257c459a2b3efd7ce386aac84ba152bc2517a4f7e54384c04800b26adb382bb284ac7e4ad40e584b
+  checksum: 10c0/69827a1bfa43d7b188f1d8cea42163143a36312543fdade5257c459a2b3efd7ce386aac84ba152bc2517a4f7e54384c04800b26adb382bb284ac7e4ad40e584b
   languageName: node
   linkType: hard
 
 "@emotion/unitless@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/unitless@npm:0.8.1"
-  checksum: a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548
+  checksum: 10c0/a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548
   languageName: node
   linkType: hard
 
@@ -1690,32 +2114,35 @@ __metadata:
   resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: a15b2167940e3a908160687b73fc4fcd81e59ab45136b6967f02c7c419d9a149acd22a416b325c389642d4f1c3d33cf4196cad6b618128b55b7c74f6807a240b
+  checksum: 10c0/a15b2167940e3a908160687b73fc4fcd81e59ab45136b6967f02c7c419d9a149acd22a416b325c389642d4f1c3d33cf4196cad6b618128b55b7c74f6807a240b
   languageName: node
   linkType: hard
 
 "@emotion/utils@npm:^1.2.1":
   version: 1.2.1
   resolution: "@emotion/utils@npm:1.2.1"
-  checksum: db43ca803361740c14dfb1cca1464d10d27f4c8b40d3e8864e6932ccf375d1450778ff4e4eadee03fb97f2aeb18de9fae98294905596a12ff7d4cd1910414d8d
+  checksum: 10c0/db43ca803361740c14dfb1cca1464d10d27f4c8b40d3e8864e6932ccf375d1450778ff4e4eadee03fb97f2aeb18de9fae98294905596a12ff7d4cd1910414d8d
   languageName: node
   linkType: hard
 
 "@emotion/weak-memoize@npm:^0.3.1":
   version: 0.3.1
   resolution: "@emotion/weak-memoize@npm:0.3.1"
-  checksum: ed514b3cb94bbacece4ac2450d98898066c0a0698bdeda256e312405ca53634cb83c75889b25cd8bbbe185c80f4c05a1f0a0091e1875460ba6be61d0334f0b8a
+  checksum: 10c0/ed514b3cb94bbacece4ac2450d98898066c0a0698bdeda256e312405ca53634cb83c75889b25cd8bbbe185c80f4c05a1f0a0091e1875460ba6be61d0334f0b8a
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.41.0":
-  version: 0.41.0
-  resolution: "@es-joy/jsdoccomment@npm:0.41.0"
+"@es-joy/jsdoccomment@npm:~0.43.0":
+  version: 0.43.0
+  resolution: "@es-joy/jsdoccomment@npm:0.43.0"
   dependencies:
+    "@types/eslint": "npm:^8.56.5"
+    "@types/estree": "npm:^1.0.5"
+    "@typescript-eslint/types": "npm:^7.2.0"
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.5.0"
     jsdoc-type-pratt-parser: "npm:~4.0.0"
-  checksum: 1fa27531eba32e4699664da53a0865aeeda1f7e83ac156fe53b7a6b09d2f3816baa94a34845ff019c10289b09572bda5519ec917e3e241088975477fa880f72d
+  checksum: 10c0/862294ed89772a231f309edd68405ece00f6aaf43103210f28410da894a6b697bc1f281c59e813dd37d5b7294f633ee7b874e07a0aa3d72f49504089fc9cb2c4
   languageName: node
   linkType: hard
 
@@ -1726,14 +2153,14 @@ __metadata:
     eslint-visitor-keys: "npm:^3.3.0"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
+  checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
-  checksum: c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
+  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
   languageName: node
   linkType: hard
 
@@ -1750,14 +2177,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
+  checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
   languageName: node
   linkType: hard
 
@@ -1766,7 +2193,7 @@ __metadata:
   resolution: "@floating-ui/core@npm:1.5.0"
   dependencies:
     "@floating-ui/utils": "npm:^0.1.3"
-  checksum: bca811cefd09c3f56c4cf58c3e94826c1ce4a0b40124e9030ddca2ef1cc68b4ddc5ba5b4d7cc94c9555aea6876d2428a77a2ae261fe5b39c79df247a9518b053
+  checksum: 10c0/bca811cefd09c3f56c4cf58c3e94826c1ce4a0b40124e9030ddca2ef1cc68b4ddc5ba5b4d7cc94c9555aea6876d2428a77a2ae261fe5b39c79df247a9518b053
   languageName: node
   linkType: hard
 
@@ -1776,38 +2203,59 @@ __metadata:
   dependencies:
     "@floating-ui/core": "npm:^1.4.2"
     "@floating-ui/utils": "npm:^0.1.3"
-  checksum: e5f30b911f939e40003851077bba441f269ae689bdc43c674bee43aa98fc6b7a5f59be432d27b7be599b1e4ab7b15c752875ea777a89cff01d157e593b78b25b
+  checksum: 10c0/e5f30b911f939e40003851077bba441f269ae689bdc43c674bee43aa98fc6b7a5f59be432d27b7be599b1e4ab7b15c752875ea777a89cff01d157e593b78b25b
   languageName: node
   linkType: hard
 
 "@floating-ui/utils@npm:^0.1.3":
   version: 0.1.6
   resolution: "@floating-ui/utils@npm:0.1.6"
-  checksum: 0a089db0e0526b89e83cb0a773a903517db5c9067cd473febfd8fa91a3a2ccbc3a835234796c1bb528def21dbb67be50e28d9c473cb58a6d90679d7e549b9c0c
+  checksum: 10c0/0a089db0e0526b89e83cb0a773a903517db5c9067cd473febfd8fa91a3a2ccbc3a835234796c1bb528def21dbb67be50e28d9c473cb58a6d90679d7e549b9c0c
   languageName: node
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.4
-  resolution: "@formatjs/cli@npm:6.2.4"
+  version: 6.2.10
+  resolution: "@formatjs/cli@npm:6.2.10"
   peerDependencies:
-    vue: ^3.3.4
+    "@glimmer/env": ^0.1.7
+    "@glimmer/reference": ^0.91.1
+    "@glimmer/syntax": ^0.91.1
+    "@glimmer/validator": ^0.91.1
+    "@vue/compiler-core": ^3.4.0
+    content-tag: ^2.0.1
+    ember-template-recast: ^6.1.4
+    vue: ^3.4.0
   peerDependenciesMeta:
+    "@glimmer/env":
+      optional: true
+    "@glimmer/reference":
+      optional: true
+    "@glimmer/syntax":
+      optional: true
+    "@glimmer/validator":
+      optional: true
+    "@vue/compiler-core":
+      optional: true
+    content-tag:
+      optional: true
+    ember-template-recast:
+      optional: true
     vue:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 3f6bbbc633a3a6ebd4e6fcfc3a9f889bc044043452cbc8f81abcaee97aaef991a778ae785d3b9d21ecc5f55b147eb0009b44520bb895fe244b4c14a36d9b05bd
+  checksum: 10c0/34b1b0b3be25d945111c1f57913f50da7308ecd05501a27eaca210a774eb50c616b5706ba796d37ffa223ac4c5cddd5f36fe0ca8d31ad8c8ade79cdd497ccfb9
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.18.0":
-  version: 1.18.0
-  resolution: "@formatjs/ecma402-abstract@npm:1.18.0"
+"@formatjs/ecma402-abstract@npm:1.18.2":
+  version: 1.18.2
+  resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
   dependencies:
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: bbdad0aee8e48baad6bfe6b2c27caf3befe35e658b922ee2f84417a819f0bdc7e849a8c0c782db8b53f5666bf19669d2b10a1104257c08796d198c87766bfc92
+  checksum: 10c0/87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
   languageName: node
   linkType: hard
 
@@ -1816,98 +2264,98 @@ __metadata:
   resolution: "@formatjs/fast-memoize@npm:2.2.0"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: ae88c5a93b96235aba4bd9b947d0310d2ec013687a99133413361b24122b5cdea8c9bf2e04a4a2a8b61f1f4ee5419ef6416ca4796554226b5050e05a9ce6ef49
+  checksum: 10c0/ae88c5a93b96235aba4bd9b947d0310d2ec013687a99133413361b24122b5cdea8c9bf2e04a4a2a8b61f1f4ee5419ef6416ca4796554226b5050e05a9ce6ef49
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.7.3":
-  version: 2.7.3
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.3"
+"@formatjs/icu-messageformat-parser@npm:2.7.6":
+  version: 2.7.6
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.6"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/icu-skeleton-parser": "npm:1.7.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/icu-skeleton-parser": "npm:1.8.0"
     tslib: "npm:^2.4.0"
-  checksum: 2a51038813e5cff7e2df767e1227373d228e907adb7268fc3744b3d82c4fa69d4aa9f6020a62de2c468cf724600e9372ac07ae43a4480ed066fe34e224e80e4a
+  checksum: 10c0/9fc72c2075333a969601e2be4260638940b1abefd1a5fc15b93b0b10d2319c9df5778aa51fc2a173ce66ca5e8a47b4b64caca85a32d0eb6095e16e8d65cb4b00
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.7.0":
-  version: 1.7.0
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
+"@formatjs/icu-skeleton-parser@npm:1.8.0":
+  version: 1.8.0
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.0"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     tslib: "npm:^2.4.0"
-  checksum: 2e4db815247ddb10f7990bbb501c85b854ee951ee45143673eb91b4392b11d0a8312327adb8b624c6a2fdafab12083904630d6d22475503d025f1612da4dcaee
+  checksum: 10c0/10956732d70cc67049d216410b5dc3ef048935d1ea2ae76f5755bb9d0243af37ddeabd5d140ddbf5f6c7047068c3d02a05f93c68a89cedfaf7488d5062885ea4
   languageName: node
   linkType: hard
 
-"@formatjs/intl-displaynames@npm:6.6.4":
-  version: 6.6.4
-  resolution: "@formatjs/intl-displaynames@npm:6.6.4"
+"@formatjs/intl-displaynames@npm:6.6.6":
+  version: 6.6.6
+  resolution: "@formatjs/intl-displaynames@npm:6.6.6"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 009e443dd0d10776b8573d0181407d4c0d6c7a2ff537a5ea1e36413d1b08db9c21dfef272eabab8efabd01a58b64f663a30e4d584fd761df3fd68a5d23fe444b
+  checksum: 10c0/4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
   languageName: node
   linkType: hard
 
-"@formatjs/intl-listformat@npm:7.5.3":
-  version: 7.5.3
-  resolution: "@formatjs/intl-listformat@npm:7.5.3"
+"@formatjs/intl-listformat@npm:7.5.5":
+  version: 7.5.5
+  resolution: "@formatjs/intl-listformat@npm:7.5.5"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: de741ce84b16fed57016afbfe446ebd57cd23a046859a9353f5d455f8bc9114493bf83b9e18429268c7ce8f77bc54516a9b8190baf09fbb25c9b06cfc80101d4
+  checksum: 10c0/bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.5.2":
-  version: 0.5.2
-  resolution: "@formatjs/intl-localematcher@npm:0.5.2"
+"@formatjs/intl-localematcher@npm:0.5.4":
+  version: 0.5.4
+  resolution: "@formatjs/intl-localematcher@npm:0.5.4"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 4b3ae75470e3e53ffa39b2d46e65a2a4c9c4becbc0aac989b0694370e10c6687643660a045512d676509bc29b257fe5726fbb028de12f889be02c2d20b6527e6
+  checksum: 10c0/c9ff5d34ca8b6fe59f8f303a3cc31a92d343e095a6987e273e5cc23f0fe99feb557a392a05da95931c7d24106acb6988e588d00ddd05b0934005aafd7fdbafe6
   languageName: node
   linkType: hard
 
 "@formatjs/intl-pluralrules@npm:^5.2.2":
-  version: 5.2.10
-  resolution: "@formatjs/intl-pluralrules@npm:5.2.10"
+  version: 5.2.12
+  resolution: "@formatjs/intl-pluralrules@npm:5.2.12"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: 1050416613e80bff2c58546c80c8d52ed97847d13c90535a53d058e44969369b50e1cfdb464e9e9ef4802c934c84ea0e656c3f4e3b4d5ac7496b722c759da4cf
+  checksum: 10c0/0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.9.9":
-  version: 2.9.9
-  resolution: "@formatjs/intl@npm:2.9.9"
+"@formatjs/intl@npm:2.10.2":
+  version: 2.10.2
+  resolution: "@formatjs/intl@npm:2.10.2"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/intl-displaynames": "npm:6.6.4"
-    "@formatjs/intl-listformat": "npm:7.5.3"
-    intl-messageformat: "npm:10.5.8"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/intl-displaynames": "npm:6.6.6"
+    "@formatjs/intl-listformat": "npm:7.5.5"
+    intl-messageformat: "npm:10.5.12"
     tslib: "npm:^2.4.0"
   peerDependencies:
-    typescript: 5
+    typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: b26904da605ab309535dfbbfbd403a3bb33d51d3c969c548b88fa04755be3aff60b1bddd1c453514a84048c7432271cef507ac66de32dcfa66b3f842a1ddb977
+  checksum: 10c0/20df407e141055e8c7b2605c06e952b643be7ea01d992862e13fc623ca2db034069744eae2be16655bf7888b3add1bfc2653fd0a08bcfdb67fb9b72a306f7718
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:3.13.9":
-  version: 3.13.9
-  resolution: "@formatjs/ts-transformer@npm:3.13.9"
+"@formatjs/ts-transformer@npm:3.13.12":
+  version: 3.13.12
+  resolution: "@formatjs/ts-transformer@npm:3.13.12"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     "@types/json-stable-stringify": "npm:^1.0.32"
     "@types/node": "npm:14 || 16 || 17"
     chalk: "npm:^4.0.0"
@@ -1919,21 +2367,21 @@ __metadata:
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 4e313b967e45aae79246174c3181d31cc7cd297380d3a880a98fc0be16d76b783868712151e840ea16d22e2fbec0388b1005f688b6d4cb74ee4411b43f6d33f4
+  checksum: 10c0/68f72ee6379b87b7ef6340e118a5370cb2fa18cbbae08f5f3d10893803a52f0533e644002e0b5e9ffeded5b2f0aa9daad6adf8b487b10f5d2b61f9fb3fed0dbd
   languageName: node
   linkType: hard
 
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
-  checksum: f232411203d649fef1363bb6c83cd250adab8da2f01b568b919dee9751512b63b650d7dcd593da4a60c23f19d005124c159eba78f437a21eb8a1ebf73f63cc19
+  checksum: 10c0/f232411203d649fef1363bb6c83cd250adab8da2f01b568b919dee9751512b63b650d7dcd593da4a60c23f19d005124c159eba78f437a21eb8a1ebf73f63cc19
   languageName: node
   linkType: hard
 
 "@gar/promisify@npm:^1.0.1":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
+  checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
   languageName: node
   linkType: hard
 
@@ -1942,39 +2390,57 @@ __metadata:
   resolution: "@github/webauthn-json@npm:2.1.1"
   bin:
     webauthn-json: dist/bin/main.js
-  checksum: 4423ddd1e5b74d91ded02ea551923a73c45b1ee2ee4294943aaddfc12e1929405ea1e8b4380456db829fcdc3a4d8a89bf8ee29c6a35be3889dc00236b1c96968
+  checksum: 10c0/4423ddd1e5b74d91ded02ea551923a73c45b1ee2ee4294943aaddfc12e1929405ea1e8b4380456db829fcdc3a4d8a89bf8ee29c6a35be3889dc00236b1c96968
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+"@hello-pangea/dnd@npm:^16.3.0":
+  version: 16.6.0
+  resolution: "@hello-pangea/dnd@npm:16.6.0"
   dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.1"
-    debug: "npm:^4.1.1"
+    "@babel/runtime": "npm:^7.24.1"
+    css-box-model: "npm:^1.2.1"
+    memoize-one: "npm:^6.0.0"
+    raf-schd: "npm:^4.0.3"
+    react-redux: "npm:^8.1.3"
+    redux: "npm:^4.2.1"
+    use-memo-one: "npm:^1.1.3"
+  peerDependencies:
+    react: ^16.8.5 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
+  checksum: 10c0/ef43ba21f063f6497f399b457452d45be456b1f28405b148d9683d2ca65e5f77e2685a0b7e9998aaca4f8676b1642ba2c277fc78643ea59fd6b9f71a56ffc5e0
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
+  dependencies:
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
     minimatch: "npm:^3.0.5"
-  checksum: d76ca802d853366094d0e98ff0d0994117fc8eff96649cd357b15e469e428228f597cd2e929d54ab089051684949955f16ee905bb19f7b2f0446fb377157be7a
+  checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
   languageName: node
   linkType: hard
 
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
+  checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 9dba24e59fdb4041829d92b693aacb778add3b6f612aaa9c0774f3b650c11a378cc64f042a59da85c11dae33df456580a3c36837b953541aed6ff94294f97fac
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@humanwhocodes/object-schema@npm:2.0.2"
+  checksum: 10c0/6fd83dc320231d71c4541d0244051df61f301817e9f9da9fd4cb7e44ec8aacbde5958c1665b0c419401ab935114fdf532a6ad5d4e7294b1af2f347dd91a6983f
   languageName: node
   linkType: hard
 
 "@ioredis/commands@npm:^1.1.1":
   version: 1.2.0
   resolution: "@ioredis/commands@npm:1.2.0"
-  checksum: a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36
+  checksum: 10c0/a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36
   languageName: node
   linkType: hard
 
@@ -1988,7 +2454,7 @@ __metadata:
     strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
     wrap-ansi: "npm:^8.1.0"
     wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
-  checksum: b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
+  checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
   languageName: node
   linkType: hard
 
@@ -2001,14 +2467,14 @@ __metadata:
     get-package-type: "npm:^0.1.0"
     js-yaml: "npm:^3.13.1"
     resolve-from: "npm:^5.0.0"
-  checksum: dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
+  checksum: 10c0/dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
   languageName: node
   linkType: hard
 
 "@istanbuljs/schema@npm:^0.1.2":
   version: 0.1.3
   resolution: "@istanbuljs/schema@npm:0.1.3"
-  checksum: 61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
+  checksum: 10c0/61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
   languageName: node
   linkType: hard
 
@@ -2022,7 +2488,7 @@ __metadata:
     jest-message-util: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
     slash: "npm:^3.0.0"
-  checksum: 7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
+  checksum: 10c0/7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
   languageName: node
   linkType: hard
 
@@ -2063,7 +2529,7 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
+  checksum: 10c0/934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
   languageName: node
   linkType: hard
 
@@ -2075,7 +2541,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/node": "npm:*"
     jest-mock: "npm:^29.7.0"
-  checksum: c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
+  checksum: 10c0/c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
   languageName: node
   linkType: hard
 
@@ -2084,7 +2550,7 @@ __metadata:
   resolution: "@jest/expect-utils@npm:29.7.0"
   dependencies:
     jest-get-type: "npm:^29.6.3"
-  checksum: 60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
+  checksum: 10c0/60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
   languageName: node
   linkType: hard
 
@@ -2094,7 +2560,7 @@ __metadata:
   dependencies:
     expect: "npm:^29.7.0"
     jest-snapshot: "npm:^29.7.0"
-  checksum: b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
+  checksum: 10c0/b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
   languageName: node
   linkType: hard
 
@@ -2108,7 +2574,7 @@ __metadata:
     jest-message-util: "npm:^29.7.0"
     jest-mock: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
+  checksum: 10c0/cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
   languageName: node
   linkType: hard
 
@@ -2120,7 +2586,7 @@ __metadata:
     "@jest/expect": "npm:^29.7.0"
     "@jest/types": "npm:^29.6.3"
     jest-mock: "npm:^29.7.0"
-  checksum: a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
+  checksum: 10c0/a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
   languageName: node
   linkType: hard
 
@@ -2157,7 +2623,7 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
+  checksum: 10c0/a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
   languageName: node
   linkType: hard
 
@@ -2166,7 +2632,7 @@ __metadata:
   resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
     "@sinclair/typebox": "npm:^0.27.8"
-  checksum: b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
+  checksum: 10c0/b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
   languageName: node
   linkType: hard
 
@@ -2177,7 +2643,7 @@ __metadata:
     "@jridgewell/trace-mapping": "npm:^0.3.18"
     callsites: "npm:^3.0.0"
     graceful-fs: "npm:^4.2.9"
-  checksum: a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
+  checksum: 10c0/a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
   languageName: node
   linkType: hard
 
@@ -2189,7 +2655,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/istanbul-lib-coverage": "npm:^2.0.0"
     collect-v8-coverage: "npm:^1.0.0"
-  checksum: 7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
+  checksum: 10c0/7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
   languageName: node
   linkType: hard
 
@@ -2201,7 +2667,7 @@ __metadata:
     graceful-fs: "npm:^4.2.9"
     jest-haste-map: "npm:^29.7.0"
     slash: "npm:^3.0.0"
-  checksum: 593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
+  checksum: 10c0/593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
   languageName: node
   linkType: hard
 
@@ -2224,7 +2690,7 @@ __metadata:
     pirates: "npm:^4.0.4"
     slash: "npm:^3.0.0"
     write-file-atomic: "npm:^4.0.2"
-  checksum: 7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
+  checksum: 10c0/7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
   languageName: node
   linkType: hard
 
@@ -2238,32 +2704,32 @@ __metadata:
     "@types/node": "npm:*"
     "@types/yargs": "npm:^17.0.8"
     chalk: "npm:^4.0.0"
-  checksum: ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
+  checksum: 10c0/ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.0.1"
+    "@jridgewell/set-array": "npm:^1.2.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
   languageName: node
   linkType: hard
 
 "@jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.1
   resolution: "@jridgewell/resolve-uri@npm:3.1.1"
-  checksum: 0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf
+  checksum: 10c0/0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
   languageName: node
   linkType: hard
 
@@ -2273,24 +2739,24 @@ __metadata:
   dependencies:
     "@jridgewell/gen-mapping": "npm:^0.3.0"
     "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68
+  checksum: 10c0/b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68
   languageName: node
   linkType: hard
 
 "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
+  checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.20
-  resolution: "@jridgewell/trace-mapping@npm:0.3.20"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31
+  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
   languageName: node
   linkType: hard
 
@@ -2305,16 +2771,17 @@ __metadata:
     "@babel/preset-env": "npm:^7.22.4"
     "@babel/preset-react": "npm:^7.22.3"
     "@babel/preset-typescript": "npm:^7.21.5"
-    "@babel/runtime": "npm:^7.22.3"
+    "@babel/runtime": "npm:^7.23.7"
     "@formatjs/cli": "npm:^6.1.1"
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@rails/ujs": "npm:^7.1.1"
+    "@hello-pangea/dnd": "npm:^16.3.0"
+    "@rails/ujs": "npm:7.1.3-2"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
-    "@testing-library/react": "npm:^14.0.0"
+    "@testing-library/react": "npm:^15.0.0"
     "@types/babel__core": "npm:^7.20.1"
     "@types/emoji-mart": "npm:^3.0.9"
     "@types/escape-html": "npm:^1.0.2"
@@ -2333,23 +2800,20 @@ __metadata:
     "@types/react-helmet": "npm:^6.1.6"
     "@types/react-immutable-proptypes": "npm:^2.1.0"
     "@types/react-motion": "npm:^0.0.40"
-    "@types/react-overlays": "npm:^3.1.0"
     "@types/react-router": "npm:^5.1.20"
     "@types/react-router-dom": "npm:^5.3.3"
-    "@types/react-select": "npm:^5.0.1"
     "@types/react-sparklines": "npm:^1.7.2"
     "@types/react-swipeable-views": "npm:^0.13.1"
     "@types/react-test-renderer": "npm:^18.0.0"
-    "@types/react-textarea-autosize": "npm:^8.0.0"
     "@types/react-toggle": "npm:^4.0.3"
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
-    "@types/yargs": "npm:^17.0.24"
-    "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
-    "@typescript-eslint/parser": "npm:^6.17.0"
+    "@types/webpack-env": "npm:^1.18.4"
+    "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
+    "@typescript-eslint/parser": "npm:^7.0.0"
     arrow-key-navigation: "npm:^1.2.0"
-    async-mutex: "npm:^0.4.0"
+    async-mutex: "npm:^0.5.0"
     autoprefixer: "npm:^10.4.14"
     axios: "npm:^1.4.0"
     babel-jest: "npm:^29.5.0"
@@ -2367,19 +2831,17 @@ __metadata:
     core-js: "npm:^3.30.2"
     cross-env: "npm:^7.0.3"
     css-loader: "npm:^5.2.7"
-    cssnano: "npm:^6.0.1"
+    cssnano: "npm:^7.0.0"
     detect-passive-events: "npm:^2.0.3"
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     escape-html: "npm:^1.0.3"
     eslint: "npm:^8.41.0"
-    eslint-config-prettier: "npm:^9.0.0"
     eslint-define-config: "npm:^2.0.0"
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
     eslint-plugin-jsdoc: "npm:^48.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
-    eslint-plugin-prettier: "npm:^5.0.0"
     eslint-plugin-promise: "npm:~6.1.1"
     eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
@@ -2390,7 +2852,7 @@ __metadata:
     history: "npm:^4.10.1"
     hoist-non-react-statics: "npm:^3.3.2"
     http-link-header: "npm:^1.1.1"
-    husky: "npm:^8.0.3"
+    husky: "npm:^9.0.11"
     immutable: "npm:^4.3.0"
     imports-loader: "npm:^1.2.0"
     intl-messageformat: "npm:^10.3.5"
@@ -2402,10 +2864,10 @@ __metadata:
     mark-loader: "npm:^0.1.6"
     marky: "npm:^1.2.5"
     mini-css-extract-plugin: "npm:^1.6.2"
-    mkdirp: "npm:^3.0.1"
     path-complete-extname: "npm:^1.0.0"
     postcss: "npm:^8.4.24"
     postcss-loader: "npm:^4.3.0"
+    postcss-preset-env: "npm:^9.5.2"
     prettier: "npm:^3.0.0"
     prop-types: "npm:^15.8.1"
     punycode: "npm:^2.3.0"
@@ -2433,7 +2895,6 @@ __metadata:
     redux-immutable: "npm:^4.0.0"
     regenerator-runtime: "npm:^0.14.0"
     requestidlecallback: "npm:^0.3.0"
-    rimraf: "npm:^5.0.1"
     sass: "npm:^1.62.1"
     sass-loader: "npm:^10.2.0"
     stacktrace-js: "npm:^2.0.2"
@@ -2459,7 +2920,6 @@ __metadata:
     workbox-strategies: "npm:^7.0.0"
     workbox-webpack-plugin: "npm:^7.0.0"
     workbox-window: "npm:^7.0.0"
-    yargs: "npm:^17.7.2"
   peerDependenciesMeta:
     react:
       optional: true
@@ -2476,7 +2936,6 @@ __metadata:
   dependencies:
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
-    "@types/npmlog": "npm:^7.0.0"
     "@types/pg": "npm:^8.6.6"
     "@types/uuid": "npm:^9.0.0"
     "@types/ws": "npm:^8.5.9"
@@ -2486,10 +2945,12 @@ __metadata:
     eslint-define-config: "npm:^2.0.0"
     express: "npm:^4.18.2"
     ioredis: "npm:^5.3.2"
-    jsdom: "npm:^23.0.0"
-    npmlog: "npm:^7.0.1"
+    jsdom: "npm:^24.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
+    pino: "npm:^9.0.0"
+    pino-http: "npm:^10.0.0"
+    pino-pretty: "npm:^11.0.0"
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
     utf-8-validate: "npm:^6.0.3"
@@ -2509,14 +2970,14 @@ __metadata:
   dependencies:
     "@nodelib/fs.stat": "npm:2.0.5"
     run-parallel: "npm:^1.1.9"
-  checksum: 732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
+  checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
   languageName: node
   linkType: hard
 
 "@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
   version: 2.0.5
   resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
+  checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
   languageName: node
   linkType: hard
 
@@ -2526,7 +2987,7 @@ __metadata:
   dependencies:
     "@nodelib/fs.scandir": "npm:2.1.5"
     fastq: "npm:^1.6.0"
-  checksum: db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
+  checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
   languageName: node
   linkType: hard
 
@@ -2539,7 +3000,7 @@ __metadata:
     https-proxy-agent: "npm:^7.0.1"
     lru-cache: "npm:^10.0.1"
     socks-proxy-agent: "npm:^8.0.1"
-  checksum: 7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
+  checksum: 10c0/7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
   languageName: node
   linkType: hard
 
@@ -2549,7 +3010,7 @@ __metadata:
   dependencies:
     "@gar/promisify": "npm:^1.0.1"
     semver: "npm:^7.3.5"
-  checksum: 4143c317a7542af9054018b71601e3c3392e6704e884561229695f099a71336cbd580df9a9ffb965d0024bf0ed593189ab58900fd1714baef1c9ee59c738c3e2
+  checksum: 10c0/4143c317a7542af9054018b71601e3c3392e6704e884561229695f099a71336cbd580df9a9ffb965d0024bf0ed593189ab58900fd1714baef1c9ee59c738c3e2
   languageName: node
   linkType: hard
 
@@ -2558,7 +3019,7 @@ __metadata:
   resolution: "@npmcli/fs@npm:3.1.0"
   dependencies:
     semver: "npm:^7.3.5"
-  checksum: 162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
   languageName: node
   linkType: hard
 
@@ -2568,67 +3029,53 @@ __metadata:
   dependencies:
     mkdirp: "npm:^1.0.4"
     rimraf: "npm:^3.0.2"
-  checksum: 02e946f3dafcc6743132fe2e0e2b585a96ca7265653a38df5a3e53fcf26c7c7a57fc0f861d7c689a23fdb6d6836c7eea5050c8086abf3c994feb2208d1514ff0
+  checksum: 10c0/02e946f3dafcc6743132fe2e0e2b585a96ca7265653a38df5a3e53fcf26c7c7a57fc0f861d7c689a23fdb6d6836c7eea5050c8086abf3c994feb2208d1514ff0
   languageName: node
   linkType: hard
 
 "@opentelemetry/api@npm:^1.4.0":
   version: 1.6.0
   resolution: "@opentelemetry/api@npm:1.6.0"
-  checksum: f419853358fdd7d9bad51dfeea5a676d7894e7983633448d1022b867e979bc28083181e000e477ee53efda97895dd6a357e15392ac39ac8dfdc42dd194e0f17e
+  checksum: 10c0/f419853358fdd7d9bad51dfeea5a676d7894e7983633448d1022b867e979bc28083181e000e477ee53efda97895dd6a357e15392ac39ac8dfdc42dd194e0f17e
   languageName: node
   linkType: hard
 
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
-  checksum: 5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
-  languageName: node
-  linkType: hard
-
-"@pkgr/utils@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "@pkgr/utils@npm:2.4.2"
-  dependencies:
-    cross-spawn: "npm:^7.0.3"
-    fast-glob: "npm:^3.3.0"
-    is-glob: "npm:^4.0.3"
-    open: "npm:^9.1.0"
-    picocolors: "npm:^1.0.0"
-    tslib: "npm:^2.6.0"
-  checksum: 7c3e68f6405a1d4c51f418d8d580e71d7bade2683d5db07e8413d8e57f7e389047eda44a2341f77a1b3085895fca7676a9d45e8812a58312524f8c4c65d501be
+  checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
   languageName: node
   linkType: hard
 
 "@polka/url@npm:^1.0.0-next.20":
   version: 1.0.0-next.21
   resolution: "@polka/url@npm:1.0.0-next.21"
-  checksum: 53c1f28683a075aac41f8ce2a54eb952b6bc67a03494b2dca1cb63d833a6da898cea6a92df8e1e6b680db985fb7f9c16e11c20afa6584bcdda68a16fb4c18737
+  checksum: 10c0/53c1f28683a075aac41f8ce2a54eb952b6bc67a03494b2dca1cb63d833a6da898cea6a92df8e1e6b680db985fb7f9c16e11c20afa6584bcdda68a16fb4c18737
   languageName: node
   linkType: hard
 
 "@popperjs/core@npm:^2.11.6":
   version: 2.11.8
   resolution: "@popperjs/core@npm:2.11.8"
-  checksum: 4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
+  checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:^7.1.1":
-  version: 7.1.2
-  resolution: "@rails/ujs@npm:7.1.2"
-  checksum: 072962733c371fa0fff5e88a0aecd8e91c892f9dc2d31723b7586b45c723206d6b82ac71b0d7db26ea0a5ce60e0832430b061e4669b8f2aa813c3ea975aac98a
+"@rails/ujs@npm:7.1.3-2":
+  version: 7.1.3-2
+  resolution: "@rails/ujs@npm:7.1.3-2"
+  checksum: 10c0/8bd5b3a409c62f53790ed7e914f1f48235f461a472da7b4ce1d9ad57356fcdeaa7891c946298f7f620ff0ff7c6d5b995bf44057929c4fce796867a8cf4f27c99
   languageName: node
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@reduxjs/toolkit@npm:2.0.1"
+  version: 2.2.5
+  resolution: "@reduxjs/toolkit@npm:2.2.5"
   dependencies:
     immer: "npm:^10.0.3"
-    redux: "npm:^5.0.0"
+    redux: "npm:^5.0.1"
     redux-thunk: "npm:^3.1.0"
-    reselect: "npm:^5.0.1"
+    reselect: "npm:^5.1.0"
   peerDependencies:
     react: ^16.9.0 || ^17.0.0 || ^18
     react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
@@ -2637,7 +3084,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 161b9b8e11d9688890ab97b604a4c10c0d41b1369425a5fa821586932db4cd5a391d15799732b3612e6120a6336458ff577ff254219315c05ecd68da5d15fd79
+  checksum: 10c0/be0593bf26852482fb8716b9248531466c6e8782a3114b823ae680fce90267d8c5512a3231cfecc30b17eff81a4604112772b49ad7ca6a3366ddd4f2a838e53c
   languageName: node
   linkType: hard
 
@@ -2648,7 +3095,7 @@ __metadata:
     dequal: "npm:^2.0.2"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 2f34918bc3174a399b9d7f0f43abec505a494da33f787e612581a35b71fdc3ca5064772e991ac4a6991db31ce3e1fde0e1facbe24e80489a44e1a09f79d7a619
+  checksum: 10c0/2f34918bc3174a399b9d7f0f43abec505a494da33f787e612581a35b71fdc3ca5064772e991ac4a6991db31ce3e1fde0e1facbe24e80489a44e1a09f79d7a619
   languageName: node
   linkType: hard
 
@@ -2665,23 +3112,26 @@ __metadata:
   peerDependenciesMeta:
     "@types/babel__core":
       optional: true
-  checksum: 2766134dd5567c0d4fd6909d1f511ce9bf3bd9d727e1bc5ffdd6097a3606faca324107ae8e0961839ee4dbb45e5e579ae601efe472fc0a271259aea79920cafa
+  checksum: 10c0/2766134dd5567c0d4fd6909d1f511ce9bf3bd9d727e1bc5ffdd6097a3606faca324107ae8e0961839ee4dbb45e5e579ae601efe472fc0a271259aea79920cafa
   languageName: node
   linkType: hard
 
-"@rollup/plugin-node-resolve@npm:^11.2.1":
-  version: 11.2.1
-  resolution: "@rollup/plugin-node-resolve@npm:11.2.1"
+"@rollup/plugin-node-resolve@npm:^15.2.3":
+  version: 15.2.3
+  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
   dependencies:
-    "@rollup/pluginutils": "npm:^3.1.0"
-    "@types/resolve": "npm:1.17.1"
-    builtin-modules: "npm:^3.1.0"
+    "@rollup/pluginutils": "npm:^5.0.1"
+    "@types/resolve": "npm:1.20.2"
     deepmerge: "npm:^4.2.2"
+    is-builtin-module: "npm:^3.2.1"
     is-module: "npm:^1.0.0"
-    resolve: "npm:^1.19.0"
+    resolve: "npm:^1.22.1"
   peerDependencies:
-    rollup: ^1.20.0||^2.0.0
-  checksum: a8226b01352ee1f7133b1b59b3906267e11c99020a55e3b7a313e03889f790d1cd94e7f7769d3963261e897c3265082533ba595976f8e3f08cf70aa88bf1ddd7
+    rollup: ^2.78.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/598c15615086f26e28c4b3dbf966682af7fb0e5bc277cc4e57f559668a3be675a63ab261eb34729ce9569c3a51342c48863e50b5efe02e0fc1571828f0113f9d
   languageName: node
   linkType: hard
 
@@ -2693,7 +3143,23 @@ __metadata:
     magic-string: "npm:^0.25.7"
   peerDependencies:
     rollup: ^1.20.0 || ^2.0.0
-  checksum: ea3d27291c791661638b91809d0247dde1ee71be0b16fa7060078c2700db3669eada2c3978ea979b917b29ebe06f3fddc8797feae554da966264a22142b5771a
+  checksum: 10c0/ea3d27291c791661638b91809d0247dde1ee71be0b16fa7060078c2700db3669eada2c3978ea979b917b29ebe06f3fddc8797feae554da966264a22142b5771a
+  languageName: node
+  linkType: hard
+
+"@rollup/plugin-terser@npm:^0.4.3":
+  version: 0.4.4
+  resolution: "@rollup/plugin-terser@npm:0.4.4"
+  dependencies:
+    serialize-javascript: "npm:^6.0.1"
+    smob: "npm:^1.0.0"
+    terser: "npm:^5.17.4"
+  peerDependencies:
+    rollup: ^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/b9cb6c8f02ac1c1344019e9fb854321b74f880efebc41b6bdd84f18331fce0f4a2aadcdb481042245cd3f409b429ac363af71f9efec4a2024731d67d32af36ee
   languageName: node
   linkType: hard
 
@@ -2706,14 +3172,30 @@ __metadata:
     picomatch: "npm:^2.2.2"
   peerDependencies:
     rollup: ^1.20.0||^2.0.0
-  checksum: 7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c
+  checksum: 10c0/7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c
+  languageName: node
+  linkType: hard
+
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    estree-walker: "npm:^2.0.2"
+    picomatch: "npm:^2.3.1"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 10c0/c7bed15711f942d6fdd3470fef4105b73991f99a478605e13d41888963330a6f9e32be37e6ddb13f012bc7673ff5e54f06f59fd47109436c1c513986a8a7612d
   languageName: node
   linkType: hard
 
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
+  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
   languageName: node
   linkType: hard
 
@@ -2722,7 +3204,7 @@ __metadata:
   resolution: "@sinonjs/commons@npm:3.0.0"
   dependencies:
     type-detect: "npm:4.0.8"
-  checksum: 1df9cd257942f4e4960dfb9fd339d9e97b6a3da135f3d5b8646562918e863809cb8e00268535f4f4723535d2097881c8fc03d545c414d8555183376cfc54ee84
+  checksum: 10c0/1df9cd257942f4e4960dfb9fd339d9e97b6a3da135f3d5b8646562918e863809cb8e00268535f4f4723535d2097881c8fc03d545c414d8555183376cfc54ee84
   languageName: node
   linkType: hard
 
@@ -2731,7 +3213,7 @@ __metadata:
   resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
     "@sinonjs/commons": "npm:^3.0.0"
-  checksum: 2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
+  checksum: 10c0/2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
   languageName: node
   linkType: hard
 
@@ -2743,63 +3225,63 @@ __metadata:
     json5: "npm:^2.2.0"
     magic-string: "npm:^0.25.0"
     string.prototype.matchall: "npm:^4.0.6"
-  checksum: 4f36a7488cdae2907053a48231430e8e9aa8f1903a96131bf8325786afba3224011f9120164cae75043558bd051881050b071958388fe477927d340b1cc1a066
+  checksum: 10c0/4f36a7488cdae2907053a48231430e8e9aa8f1903a96131bf8325786afba3224011f9120164cae75043558bd051881050b071958388fe477927d340b1cc1a066
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-add-jsx-attribute@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:5.4.0"
-  checksum: f7f7681f0353a265c85a9fa0a6682c2c39c2eba35d6c855bbf25ea9739b339bf1fdd826b61fb3875642bf607c77bf41e6a66a97a4f07fb6e84bd521a363749e5
+  checksum: 10c0/f7f7681f0353a265c85a9fa0a6682c2c39c2eba35d6c855bbf25ea9739b339bf1fdd826b61fb3875642bf607c77bf41e6a66a97a4f07fb6e84bd521a363749e5
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-remove-jsx-attribute@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:5.4.0"
-  checksum: 0562c4c1597aecab0248fbd250e45e630de373307468568b7508c78d315a93f29920dffad2f5f54aad8e2aad9da440e16867e54961f3e6402d9855e5fc836948
+  checksum: 10c0/0562c4c1597aecab0248fbd250e45e630de373307468568b7508c78d315a93f29920dffad2f5f54aad8e2aad9da440e16867e54961f3e6402d9855e5fc836948
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-remove-jsx-empty-expression@npm:^5.0.1":
   version: 5.0.1
   resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:5.0.1"
-  checksum: 80e2d736528ee553f54916acb9a9a0414e4a06730df420fb2a14788446125728abcb5125bfca6b15ce6fd99771397160f02ec95828871777c1a7803fcf258a44
+  checksum: 10c0/80e2d736528ee553f54916acb9a9a0414e4a06730df420fb2a14788446125728abcb5125bfca6b15ce6fd99771397160f02ec95828871777c1a7803fcf258a44
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@npm:^5.0.1":
   version: 5.0.1
   resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:5.0.1"
-  checksum: fb9e267ba961a0daf1f37f2954552617e09ad1d8e97f033aefc28d2a7d7824831318a5324e8e873341b53c9bb10a0c266665c7871251fd0dd2a8294fe1546fac
+  checksum: 10c0/fb9e267ba961a0daf1f37f2954552617e09ad1d8e97f033aefc28d2a7d7824831318a5324e8e873341b53c9bb10a0c266665c7871251fd0dd2a8294fe1546fac
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-svg-dynamic-title@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:5.4.0"
-  checksum: e6d1a1ef2f4b91473152bf5153a6857585857e7f0e7897df2d18e14d567811814a5590c9d10d80cf3f2964a5b7bd93d3e4cbd15c8d006c5dd83d4e6839646636
+  checksum: 10c0/e6d1a1ef2f4b91473152bf5153a6857585857e7f0e7897df2d18e14d567811814a5590c9d10d80cf3f2964a5b7bd93d3e4cbd15c8d006c5dd83d4e6839646636
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-svg-em-dimensions@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:5.4.0"
-  checksum: 1dc247f376ed110d1407b96c1c919c0bfa2907cd02b2eaa98d40209f21f1ff3602a46f0eb0528e514826a843dc411c06ed251cf8c691efbc961f0cbe0aaf860d
+  checksum: 10c0/1dc247f376ed110d1407b96c1c919c0bfa2907cd02b2eaa98d40209f21f1ff3602a46f0eb0528e514826a843dc411c06ed251cf8c691efbc961f0cbe0aaf860d
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-transform-react-native-svg@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:5.4.0"
-  checksum: 3ad2f074d0e5857d07758492d0c98d1d862f2def9fab48939c69c5a3c4387065d01b0e8ac62c53a402a9ce09ed3de099bdf41cd2a597e7d58ddf47fb3a3b2c3e
+  checksum: 10c0/3ad2f074d0e5857d07758492d0c98d1d862f2def9fab48939c69c5a3c4387065d01b0e8ac62c53a402a9ce09ed3de099bdf41cd2a597e7d58ddf47fb3a3b2c3e
   languageName: node
   linkType: hard
 
 "@svgr/babel-plugin-transform-svg-component@npm:^5.5.0":
   version: 5.5.0
   resolution: "@svgr/babel-plugin-transform-svg-component@npm:5.5.0"
-  checksum: 73bfb09933d4a85a0ee8ec364684a0915a9ce05e668d024c073369cc36d78dcde41ddcdb493dde6440f5ee5649ed75b95ac8add226eaee32b20dc54894ac2974
+  checksum: 10c0/73bfb09933d4a85a0ee8ec364684a0915a9ce05e668d024c073369cc36d78dcde41ddcdb493dde6440f5ee5649ed75b95ac8add226eaee32b20dc54894ac2974
   languageName: node
   linkType: hard
 
@@ -2815,7 +3297,7 @@ __metadata:
     "@svgr/babel-plugin-svg-em-dimensions": "npm:^5.4.0"
     "@svgr/babel-plugin-transform-react-native-svg": "npm:^5.4.0"
     "@svgr/babel-plugin-transform-svg-component": "npm:^5.5.0"
-  checksum: a737592044ee3aea22506fa7178464fc0e1e6e6f3005cbc8db12d6963f18b8a097c97a2d4ede93dd1d3309074f84f47272924614cd74d2c7900c649f0356e349
+  checksum: 10c0/a737592044ee3aea22506fa7178464fc0e1e6e6f3005cbc8db12d6963f18b8a097c97a2d4ede93dd1d3309074f84f47272924614cd74d2c7900c649f0356e349
   languageName: node
   linkType: hard
 
@@ -2826,7 +3308,7 @@ __metadata:
     "@svgr/plugin-jsx": "npm:^5.5.0"
     camelcase: "npm:^6.2.0"
     cosmiconfig: "npm:^7.0.0"
-  checksum: a8f8ac7f829ea92a6d0305c746afb33feba3b1c7000e6f22d83b8bad13fdcd5aacc3ebde60330368830eebf23ff3090ddd3ef959d41a90d694f4b7914aea6686
+  checksum: 10c0/a8f8ac7f829ea92a6d0305c746afb33feba3b1c7000e6f22d83b8bad13fdcd5aacc3ebde60330368830eebf23ff3090ddd3ef959d41a90d694f4b7914aea6686
   languageName: node
   linkType: hard
 
@@ -2835,7 +3317,7 @@ __metadata:
   resolution: "@svgr/hast-util-to-babel-ast@npm:5.5.0"
   dependencies:
     "@babel/types": "npm:^7.12.6"
-  checksum: 1758afd99594b094ec3d0966ba0e81e5ca8acea075801b8a93c5e97269b046eca1fd8dac7c7efbc3b5775e2496adb6880530fd1d6ccaaf8792afd567773a4f64
+  checksum: 10c0/1758afd99594b094ec3d0966ba0e81e5ca8acea075801b8a93c5e97269b046eca1fd8dac7c7efbc3b5775e2496adb6880530fd1d6ccaaf8792afd567773a4f64
   languageName: node
   linkType: hard
 
@@ -2847,7 +3329,7 @@ __metadata:
     "@svgr/babel-preset": "npm:^5.5.0"
     "@svgr/hast-util-to-babel-ast": "npm:^5.5.0"
     svg-parser: "npm:^2.0.2"
-  checksum: 96f84139dae94cdda7e24896ab23e9d41e699fc8ecbbd11e280604eb7a67dfec55f126ec12ea3c622b8df6b0fccce5eb261d96f6ca8c59366d3963f13e411ec6
+  checksum: 10c0/96f84139dae94cdda7e24896ab23e9d41e699fc8ecbbd11e280604eb7a67dfec55f126ec12ea3c622b8df6b0fccce5eb261d96f6ca8c59366d3963f13e411ec6
   languageName: node
   linkType: hard
 
@@ -2858,7 +3340,7 @@ __metadata:
     cosmiconfig: "npm:^7.0.0"
     deepmerge: "npm:^4.2.2"
     svgo: "npm:^1.2.2"
-  checksum: 7494f7417ac339422f4eb2219489badaa51cdd79de2b5b3ff772c602036c5a38faf92fdefaab47414175f7c83406c4db195c35e619aae88d0573d7b199ec4503
+  checksum: 10c0/7494f7417ac339422f4eb2219489badaa51cdd79de2b5b3ff772c602036c5a38faf92fdefaab47414175f7c83406c4db195c35e619aae88d0573d7b199ec4503
   languageName: node
   linkType: hard
 
@@ -2874,88 +3356,95 @@ __metadata:
     "@svgr/plugin-jsx": "npm:^5.5.0"
     "@svgr/plugin-svgo": "npm:^5.5.0"
     loader-utils: "npm:^2.0.0"
-  checksum: 0313712a1892f387d8c425652239dd635269241b18e7e6f9aad6a339cbe887ebec813d146df23407229384ac5e9d6527f3571aa2fc9dcb30e32006c9eb918663
+  checksum: 10c0/0313712a1892f387d8c425652239dd635269241b18e7e6f9aad6a339cbe887ebec813d146df23407229384ac5e9d6527f3571aa2fc9dcb30e32006c9eb918663
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^9.0.0":
-  version: 9.3.1
-  resolution: "@testing-library/dom@npm:9.3.1"
+"@testing-library/dom@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@testing-library/dom@npm:10.0.0"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
     "@types/aria-query": "npm:^5.0.1"
-    aria-query: "npm:5.1.3"
+    aria-query: "npm:5.3.0"
     chalk: "npm:^4.1.0"
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
     pretty-format: "npm:^27.0.2"
-  checksum: 25d1deddba014c107fd9703181fbb7063ed376d3ad42d7918ee752e7e677edfb5abaf672b22afc5257ffe760c9c7e5cc981656297c328bc61578d23c6b65b4dc
+  checksum: 10c0/2d12d2a6018a6f1d15e91834180bc068932c699ff1fcbfb80aa21aba519a4f5329c861dfa852e06ee5615bcb92ef2a0f0e755e32684ea3dada63bc34248382ab
   languageName: node
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.1.6
-  resolution: "@testing-library/jest-dom@npm:6.1.6"
+  version: 6.4.5
+  resolution: "@testing-library/jest-dom@npm:6.4.5"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
     css.escape: "npm:^1.5.1"
-    dom-accessibility-api: "npm:^0.5.6"
-    lodash: "npm:^4.17.15"
+    dom-accessibility-api: "npm:^0.6.3"
+    lodash: "npm:^4.17.21"
     redent: "npm:^3.0.0"
   peerDependencies:
     "@jest/globals": ">= 28"
+    "@types/bun": "*"
     "@types/jest": ">= 28"
     jest: ">= 28"
     vitest: ">= 0.32"
   peerDependenciesMeta:
     "@jest/globals":
       optional: true
+    "@types/bun":
+      optional: true
     "@types/jest":
       optional: true
     jest:
       optional: true
     vitest:
       optional: true
-  checksum: f98f79f3e470517469c86947d0ff1bb83ac2e59fd2a29728ab306eca5fba63c948084ec06b7b531642e6002d1f0211d918c298c628f0d386c0ef63ba881c47ba
+  checksum: 10c0/4cfdd44e2abab2b9d399c47cbfe686729bb65160d7df0f9e2329aaaea7702f6e852a9eefb29b468f00c1e5a5274b684f8cac76959d33299dfa909ba007ea191d
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:^14.0.0":
-  version: 14.1.2
-  resolution: "@testing-library/react@npm:14.1.2"
+"@testing-library/react@npm:^15.0.0":
+  version: 15.0.7
+  resolution: "@testing-library/react@npm:15.0.7"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
-    "@testing-library/dom": "npm:^9.0.0"
+    "@testing-library/dom": "npm:^10.0.0"
     "@types/react-dom": "npm:^18.0.0"
   peerDependencies:
+    "@types/react": ^18.0.0
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10c0/ac8ee8968e81949ecb35f7ee34741c2c043f73dd7fee2247d56f6de6a30de4742af94f25264356863974e54387485b46c9448ecf3f6ca41cf4339011c369f2d4
   languageName: node
   linkType: hard
 
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
-  checksum: 073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
+  checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
   languageName: node
   linkType: hard
 
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
-  checksum: 44907308549ce775a41c38a815f747009ac45929a45d642b836aa6b0a536e4978d30b8d7d680bbd116e9dd73b7dbe2ef0d1369dcfc2d09e83ba381e485ecbe12
+  checksum: 10c0/44907308549ce775a41c38a815f747009ac45929a45d642b836aa6b0a536e4978d30b8d7d680bbd116e9dd73b7dbe2ef0d1369dcfc2d09e83ba381e485ecbe12
   languageName: node
   linkType: hard
 
 "@types/aria-query@npm:^5.0.1":
   version: 5.0.1
   resolution: "@types/aria-query@npm:5.0.1"
-  checksum: bc9e40ce37bd3a1654948778c7829bd55aea1bc5f2cd06fcf6cd650b07bb388995799e9aab6e2d93a6cf55dcba3b85c155f7ba93adefcc7c2e152fc6057061b5
+  checksum: 10c0/bc9e40ce37bd3a1654948778c7829bd55aea1bc5f2cd06fcf6cd650b07bb388995799e9aab6e2d93a6cf55dcba3b85c155f7ba93adefcc7c2e152fc6057061b5
   languageName: node
   linkType: hard
 
@@ -2968,7 +3457,7 @@ __metadata:
     "@types/babel__generator": "npm:*"
     "@types/babel__template": "npm:*"
     "@types/babel__traverse": "npm:*"
-  checksum: bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
+  checksum: 10c0/bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
   languageName: node
   linkType: hard
 
@@ -2977,7 +3466,7 @@ __metadata:
   resolution: "@types/babel__generator@npm:7.6.6"
   dependencies:
     "@babel/types": "npm:^7.0.0"
-  checksum: 214d8b170e0eb04282d0e9dfda2c27116f64751729479786c2bf1b7ec22a5e9e5bbeb70585f047b0fd580d7d8948dc2108223c5a16e998d9674de0582d4e23d7
+  checksum: 10c0/214d8b170e0eb04282d0e9dfda2c27116f64751729479786c2bf1b7ec22a5e9e5bbeb70585f047b0fd580d7d8948dc2108223c5a16e998d9674de0582d4e23d7
   languageName: node
   linkType: hard
 
@@ -2986,7 +3475,7 @@ __metadata:
   resolution: "@types/babel__helper-plugin-utils@npm:7.10.2"
   dependencies:
     "@types/babel__core": "npm:*"
-  checksum: 1c544e33b30ccfc02254b9fe090c52880c8bb05e5406f525bfdce71ce34e93677276f788b93e9fa5e1a16f6317b97e59a07d8a92bf4726d8f4639a0045ebb590
+  checksum: 10c0/1c544e33b30ccfc02254b9fe090c52880c8bb05e5406f525bfdce71ce34e93677276f788b93e9fa5e1a16f6317b97e59a07d8a92bf4726d8f4639a0045ebb590
   languageName: node
   linkType: hard
 
@@ -2996,7 +3485,7 @@ __metadata:
   dependencies:
     "@babel/parser": "npm:^7.1.0"
     "@babel/types": "npm:^7.0.0"
-  checksum: f989bd918e1ebfcc6e68c72a3818b7518049673c4e7ba31b11c10d5d3064261c534f3d2f3097f82f80d5fc58f56f3633c21ddf0332552a926a488c105d042c45
+  checksum: 10c0/f989bd918e1ebfcc6e68c72a3818b7518049673c4e7ba31b11c10d5d3064261c534f3d2f3097f82f80d5fc58f56f3633c21ddf0332552a926a488c105d042c45
   languageName: node
   linkType: hard
 
@@ -3005,7 +3494,7 @@ __metadata:
   resolution: "@types/babel__traverse@npm:7.20.3"
   dependencies:
     "@babel/types": "npm:^7.20.7"
-  checksum: 295ed9b837e62e17ee43be0df45d90fff5208986bd43af593c9020d152d3b2c55328e038c2f8585926b63cc22f887f28bf3f4c805aa881e2dd0bdd5ead92ece0
+  checksum: 10c0/295ed9b837e62e17ee43be0df45d90fff5208986bd43af593c9020d152d3b2c55328e038c2f8585926b63cc22f887f28bf3f4c805aa881e2dd0bdd5ead92ece0
   languageName: node
   linkType: hard
 
@@ -3015,7 +3504,7 @@ __metadata:
   dependencies:
     "@types/connect": "npm:*"
     "@types/node": "npm:*"
-  checksum: aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
+  checksum: 10c0/aebeb200f25e8818d8cf39cd0209026750d77c9b85381cdd8deeb50913e4d18a1ebe4b74ca9b0b4d21952511eeaba5e9fbbf739b52731a2061e206ec60d568df
   languageName: node
   linkType: hard
 
@@ -3024,7 +3513,7 @@ __metadata:
   resolution: "@types/connect@npm:3.4.38"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
+  checksum: 10c0/2e1cdba2c410f25649e77856505cd60223250fa12dff7a503e492208dbfdd25f62859918f28aba95315251fd1f5e1ffbfca1e25e73037189ab85dd3f8d0a148c
   languageName: node
   linkType: hard
 
@@ -3033,7 +3522,7 @@ __metadata:
   resolution: "@types/cors@npm:2.8.17"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
+  checksum: 10c0/457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
   languageName: node
   linkType: hard
 
@@ -3042,38 +3531,38 @@ __metadata:
   resolution: "@types/emoji-mart@npm:3.0.14"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 23ded65fce9b3355fbe903d3971cb67cc827a5d587464bb7e3f349615527ef4a9197b3bb59fa84c4391d1b901e7f200f686a7fc83f649ae2a51a0fb948cbadfb
+  checksum: 10c0/23ded65fce9b3355fbe903d3971cb67cc827a5d587464bb7e3f349615527ef4a9197b3bb59fa84c4391d1b901e7f200f686a7fc83f649ae2a51a0fb948cbadfb
   languageName: node
   linkType: hard
 
 "@types/escape-html@npm:^1.0.2":
   version: 1.0.4
   resolution: "@types/escape-html@npm:1.0.4"
-  checksum: 5cdae9d38e97b1ad61180528ef7ca66bf6be96e875cc560c3e064d6ca75ccf2adaf2fa3b7bdd4f7494013e4357a2fb0bb62f2e59ca53097d5c45c7519d0ce9c3
+  checksum: 10c0/5cdae9d38e97b1ad61180528ef7ca66bf6be96e875cc560c3e064d6ca75ccf2adaf2fa3b7bdd4f7494013e4357a2fb0bb62f2e59ca53097d5c45c7519d0ce9c3
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:7 || 8":
-  version: 8.44.6
-  resolution: "@types/eslint@npm:8.44.6"
+"@types/eslint@npm:7 || 8, @types/eslint@npm:^8.56.5":
+  version: 8.56.10
+  resolution: "@types/eslint@npm:8.56.10"
   dependencies:
     "@types/estree": "npm:*"
     "@types/json-schema": "npm:*"
-  checksum: fc449107eb186bdc5d30149bbcb4e673af8530afdeacca3b89f14deefcbfc67463157d6a81b42cd9df92ddeafda5351853d13310ff7ac6ab0d9769ac7cc0cc3a
+  checksum: 10c0/674349d6c342c3864d70f4d5a9965f96fb253801532752c8c500ad6a1c2e8b219e01ccff5dc8791dcb58b5483012c495708bb9f3ff929f5c9322b3da126c15d3
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*":
-  version: 1.0.3
-  resolution: "@types/estree@npm:1.0.3"
-  checksum: 5171f467fdd77852e28d7eec575222bc6c900e117a44e916a5ff65807ae8e1ed15f57d21e8954d6bd532e37c49a8ecfee730fcb152b7b44234d38681978b2caa
+"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
   languageName: node
   linkType: hard
 
 "@types/estree@npm:0.0.39":
   version: 0.0.39
   resolution: "@types/estree@npm:0.0.39"
-  checksum: f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92
+  checksum: 10c0/f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92
   languageName: node
   linkType: hard
 
@@ -3085,7 +3574,7 @@ __metadata:
     "@types/qs": "npm:*"
     "@types/range-parser": "npm:*"
     "@types/send": "npm:*"
-  checksum: dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
+  checksum: 10c0/dc166cbf4475c00a81fbcab120bf7477c527184be11ae149df7f26d9c1082114c68f8d387a2926fe80291b06477c8bbd9231ff4f5775de328e887695aefce269
   languageName: node
   linkType: hard
 
@@ -3097,7 +3586,7 @@ __metadata:
     "@types/express-serve-static-core": "npm:^4.17.33"
     "@types/qs": "npm:*"
     "@types/serve-static": "npm:*"
-  checksum: 12e562c4571da50c7d239e117e688dc434db1bac8be55613294762f84fd77fbd0658ccd553c7d3ab02408f385bc93980992369dd30e2ecd2c68c358e6af8fabf
+  checksum: 10c0/12e562c4571da50c7d239e117e688dc434db1bac8be55613294762f84fd77fbd0658ccd553c7d3ab02408f385bc93980992369dd30e2ecd2c68c358e6af8fabf
   languageName: node
   linkType: hard
 
@@ -3107,7 +3596,7 @@ __metadata:
   dependencies:
     "@types/minimatch": "npm:*"
     "@types/node": "npm:*"
-  checksum: a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
+  checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
   languageName: node
   linkType: hard
 
@@ -3116,14 +3605,14 @@ __metadata:
   resolution: "@types/graceful-fs@npm:4.1.6"
   dependencies:
     "@types/node": "npm:*"
-  checksum: b1d32c5ae7bd52cf60e29df20407904c4312a39612e7ec2ee23c1e3731c1cfe31d97c6941bf6cb52f5f929d50d86d92dd506436b63fafa833181d439b628885e
+  checksum: 10c0/b1d32c5ae7bd52cf60e29df20407904c4312a39612e7ec2ee23c1e3731c1cfe31d97c6941bf6cb52f5f929d50d86d92dd506436b63fafa833181d439b628885e
   languageName: node
   linkType: hard
 
 "@types/history@npm:^4.7.11":
   version: 4.7.11
   resolution: "@types/history@npm:4.7.11"
-  checksum: 3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
+  checksum: 10c0/3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
   languageName: node
   linkType: hard
 
@@ -3133,14 +3622,14 @@ __metadata:
   dependencies:
     "@types/react": "npm:*"
     hoist-non-react-statics: "npm:^3.3.0"
-  checksum: 2a3b64bf3d9817d7830afa60ee314493c475fb09570a64e7737084cd482d2177ebdddf888ce837350bac51741278b077683facc9541f052d4bbe8487b4e3e618
+  checksum: 10c0/2a3b64bf3d9817d7830afa60ee314493c475fb09570a64e7737084cd482d2177ebdddf888ce837350bac51741278b077683facc9541f052d4bbe8487b4e3e618
   languageName: node
   linkType: hard
 
 "@types/http-errors@npm:*":
   version: 2.0.4
   resolution: "@types/http-errors@npm:2.0.4"
-  checksum: 494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
+  checksum: 10c0/494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
   languageName: node
   linkType: hard
 
@@ -3149,21 +3638,21 @@ __metadata:
   resolution: "@types/http-link-header@npm:1.0.5"
   dependencies:
     "@types/node": "npm:*"
-  checksum: adeb13381b38c3625478149820772924c154b4a7250dca62c346810a8378f8968fc7f3a9a4f55ec61de5d06083637540f862c8a920f6a710310c9645d19a077d
+  checksum: 10c0/adeb13381b38c3625478149820772924c154b4a7250dca62c346810a8378f8968fc7f3a9a4f55ec61de5d06083637540f862c8a920f6a710310c9645d19a077d
   languageName: node
   linkType: hard
 
 "@types/intl@npm:^1.2.0":
   version: 1.2.2
   resolution: "@types/intl@npm:1.2.2"
-  checksum: f465c320139c01dfc9ae1382406259fd23f6a455aad31517f61b7fd79bdde493e854d6666c2198ae644d8cf6e147e78831ea810f83a787f65b765bc56834f259
+  checksum: 10c0/f465c320139c01dfc9ae1382406259fd23f6a455aad31517f61b7fd79bdde493e854d6666c2198ae644d8cf6e147e78831ea810f83a787f65b765bc56834f259
   languageName: node
   linkType: hard
 
 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
   version: 2.0.5
   resolution: "@types/istanbul-lib-coverage@npm:2.0.5"
-  checksum: e15cfc01a7ac60062f771314c959011bae7de7ceaef8e294f13427a11f21741cbfac98ad8cd9ecbf0e3d72ab7ddc327bacb3fab32c6b26ab19dbbbc1a69a9d3b
+  checksum: 10c0/e15cfc01a7ac60062f771314c959011bae7de7ceaef8e294f13427a11f21741cbfac98ad8cd9ecbf0e3d72ab7ddc327bacb3fab32c6b26ab19dbbbc1a69a9d3b
   languageName: node
   linkType: hard
 
@@ -3172,7 +3661,7 @@ __metadata:
   resolution: "@types/istanbul-lib-report@npm:3.0.2"
   dependencies:
     "@types/istanbul-lib-coverage": "npm:*"
-  checksum: c168e425c95c167d83c7cbd65ff6b620cc53c5ef199a58428758586bbc28faf5c51291667e4455777b47ada12381e53fce7b92e32f431f85d8ac8025074d1908
+  checksum: 10c0/c168e425c95c167d83c7cbd65ff6b620cc53c5ef199a58428758586bbc28faf5c51291667e4455777b47ada12381e53fce7b92e32f431f85d8ac8025074d1908
   languageName: node
   linkType: hard
 
@@ -3181,24 +3670,24 @@ __metadata:
   resolution: "@types/istanbul-reports@npm:3.0.3"
   dependencies:
     "@types/istanbul-lib-report": "npm:*"
-  checksum: dcd8291370d9192aa980bf849309a7ca27e1d030ccc5e7edeef47d6612c2d57d611855543b9ffeb982d162a5ab2a44d8b40baa4dc93c1d7aa6fbcaeb16e69e78
+  checksum: 10c0/dcd8291370d9192aa980bf849309a7ca27e1d030ccc5e7edeef47d6612c2d57d611855543b9ffeb982d162a5ab2a44d8b40baa4dc93c1d7aa6fbcaeb16e69e78
   languageName: node
   linkType: hard
 
 "@types/jest@npm:^29.5.2":
-  version: 29.5.11
-  resolution: "@types/jest@npm:29.5.11"
+  version: 29.5.12
+  resolution: "@types/jest@npm:29.5.12"
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: 524a3394845214581278bf4d75055927261fbeac7e1a89cd621bd0636da37d265fe0a85eac58b5778758faad1cbd7c7c361dfc190c78ebde03a91cce33463261
+  checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
   languageName: node
   linkType: hard
 
 "@types/js-yaml@npm:^4.0.5":
   version: 4.0.9
   resolution: "@types/js-yaml@npm:4.0.9"
-  checksum: 24de857aa8d61526bbfbbaa383aa538283ad17363fcd5bb5148e2c7f604547db36646440e739d78241ed008702a8920665d1add5618687b6743858fae00da211
+  checksum: 10c0/24de857aa8d61526bbfbbaa383aa538283ad17363fcd5bb5148e2c7f604547db36646440e739d78241ed008702a8920665d1add5618687b6743858fae00da211
   languageName: node
   linkType: hard
 
@@ -3209,56 +3698,56 @@ __metadata:
     "@types/node": "npm:*"
     "@types/tough-cookie": "npm:*"
     parse5: "npm:^7.0.0"
-  checksum: 3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
+  checksum: 10c0/3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
-  version: 7.0.14
-  resolution: "@types/json-schema@npm:7.0.14"
-  checksum: da68689ccd44cb93ca4c9a4af3b25c6091ecf45fb370d1ed0d0ac5b780e235bf0b9bdc1f7e28f19e6713b22567c3db11fefcbcc6d48ac6b356d035a8f9f4ea30
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
   languageName: node
   linkType: hard
 
 "@types/json-stable-stringify@npm:^1.0.32":
   version: 1.0.35
   resolution: "@types/json-stable-stringify@npm:1.0.35"
-  checksum: 67b50a86478f932c932ba21515b80700a8844d55e0656b3abe2c32c41c1c405c70fcd10b30ff8f38d1869871af2deae63ffdea54ce72cc2ee92e94a9d1cf2b6f
+  checksum: 10c0/67b50a86478f932c932ba21515b80700a8844d55e0656b3abe2c32c41c1c405c70fcd10b30ff8f38d1869871af2deae63ffdea54ce72cc2ee92e94a9d1cf2b6f
   languageName: node
   linkType: hard
 
 "@types/json5@npm:^0.0.29":
   version: 0.0.29
   resolution: "@types/json5@npm:0.0.29"
-  checksum: 6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac
+  checksum: 10c0/6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac
   languageName: node
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.14.202
-  resolution: "@types/lodash@npm:4.14.202"
-  checksum: 6064d43c8f454170841bd67c8266cc9069d9e570a72ca63f06bceb484cb4a3ee60c9c1f305c1b9e3a87826049fd41124b8ef265c4dd08b00f6766609c7fe9973
+  version: 4.17.1
+  resolution: "@types/lodash@npm:4.17.1"
+  checksum: 10c0/af2ad8a3c8d7deb170a7ec6e18afc5ae8980576e5f7fe798d8a95a1df7222c15bdf967a25a35879f575a3b64743de00145710ee461a0051e055e94e4fe253f45
   languageName: node
   linkType: hard
 
 "@types/mime@npm:*":
   version: 3.0.4
   resolution: "@types/mime@npm:3.0.4"
-  checksum: db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
+  checksum: 10c0/db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
   languageName: node
   linkType: hard
 
 "@types/mime@npm:^1":
   version: 1.3.5
   resolution: "@types/mime@npm:1.3.5"
-  checksum: c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
+  checksum: 10c0/c2ee31cd9b993804df33a694d5aa3fa536511a49f2e06eeab0b484fef59b4483777dbb9e42a4198a0809ffbf698081fdbca1e5c2218b82b91603dfab10a10fbc
   languageName: node
   linkType: hard
 
 "@types/minimatch@npm:*":
   version: 5.1.2
   resolution: "@types/minimatch@npm:5.1.2"
-  checksum: 83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
+  checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
   languageName: node
   linkType: hard
 
@@ -3267,106 +3756,97 @@ __metadata:
   resolution: "@types/node@npm:20.8.10"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: caaa3ae9294f1bfdacb029a916c64af63cbcea613a52f53ea86f93c91779859af177b2b68113ef835194519f5e76cadda08559929b68297f1a8a568c207f9f66
+  checksum: 10c0/caaa3ae9294f1bfdacb029a916c64af63cbcea613a52f53ea86f93c91779859af177b2b68113ef835194519f5e76cadda08559929b68297f1a8a568c207f9f66
   languageName: node
   linkType: hard
 
 "@types/node@npm:14 || 16 || 17":
   version: 17.0.45
   resolution: "@types/node@npm:17.0.45"
-  checksum: 0db377133d709b33a47892581a21a41cd7958f22723a3cc6c71d55ac018121382de42fbfc7970d5ae3e7819dbe5f40e1c6a5174aedf7e7964e9cb8fa72b580b0
-  languageName: node
-  linkType: hard
-
-"@types/npmlog@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@types/npmlog@npm:7.0.0"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: e94cb1d7dc6b1251d58d0a3cbf0c5b9e9b7c7649774cf816b9277fc10e1a09e65f2854357c4972d04d477f8beca3c8accb5e8546d594776e59e35ddfee79aff2
+  checksum: 10c0/0db377133d709b33a47892581a21a41cd7958f22723a3cc6c71d55ac018121382de42fbfc7970d5ae3e7819dbe5f40e1c6a5174aedf7e7964e9cb8fa72b580b0
   languageName: node
   linkType: hard
 
 "@types/object-assign@npm:^4.0.30":
   version: 4.0.33
   resolution: "@types/object-assign@npm:4.0.33"
-  checksum: 7fbc399aa1140beff35a152e206bfb336dd880721f4a13cc1ea01d964ab376fa4ca2c19059145cbd777c9d3eaf724008faec8cf3becff97353c69560196af086
+  checksum: 10c0/7fbc399aa1140beff35a152e206bfb336dd880721f4a13cc1ea01d964ab376fa4ca2c19059145cbd777c9d3eaf724008faec8cf3becff97353c69560196af086
   languageName: node
   linkType: hard
 
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.1
   resolution: "@types/parse-json@npm:4.0.1"
-  checksum: 6851183c2ffe4aff607f034f6b5325ebc81ff90409132e2d59fe6cae030d7064593e521d75cda017d9f6b696a7e19d26d1703f366b3e7cbfec8c825331c79c31
+  checksum: 10c0/6851183c2ffe4aff607f034f6b5325ebc81ff90409132e2d59fe6cae030d7064593e521d75cda017d9f6b696a7e19d26d1703f366b3e7cbfec8c825331c79c31
   languageName: node
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.10.9
-  resolution: "@types/pg@npm:8.10.9"
+  version: 8.11.6
+  resolution: "@types/pg@npm:8.11.6"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 6b3bec7230d09da6459636a66dfd6fb538378e466ffff0a0bcd07d67aa4ddce49c73afc7442f53adec92a49dbf9e71d8d847e0075750d7545331735dfd92d22c
+  checksum: 10c0/e68e057d9500b25cd776f4fcc547b4880c4f3b0c7b6e03c8a0e5e262b6189dd7a00f4edc8937ffc55a9f6a136a78d7e4a9b6bbe6a46122a95c134f7be66f6842
   languageName: node
   linkType: hard
 
 "@types/picomatch@npm:^2.3.0":
   version: 2.3.2
   resolution: "@types/picomatch@npm:2.3.2"
-  checksum: 91445cfc0d07fe2a44c16ee284ab2e2a279da3f6df9c62ad61e7bc50343e47bef541369aff6110c4e51bd8fe501fc9c564deefbb4c03e392254889de6b46f237
+  checksum: 10c0/91445cfc0d07fe2a44c16ee284ab2e2a279da3f6df9c62ad61e7bc50343e47bef541369aff6110c4e51bd8fe501fc9c564deefbb4c03e392254889de6b46f237
   languageName: node
   linkType: hard
 
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
-  version: 15.7.11
-  resolution: "@types/prop-types@npm:15.7.11"
-  checksum: e53423cf9d510515ef8b47ff42f4f1b65a7b7b37c8704e2dbfcb9a60defe0c0e1f3cb1acfdeb466bad44ca938d7c79bffdd51b48ffb659df2432169d0b27a132
+  version: 15.7.12
+  resolution: "@types/prop-types@npm:15.7.12"
+  checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
   languageName: node
   linkType: hard
 
 "@types/punycode@npm:^2.1.0":
-  version: 2.1.3
-  resolution: "@types/punycode@npm:2.1.3"
-  checksum: c4babd33d0ed010017bc2d44a15b322b1e2997b9bb335020c26a58ac855e176d337536fa0ca84aa1b0c6d7008799566d4d5430a083d123ac6bbcc59c451b9cfc
+  version: 2.1.4
+  resolution: "@types/punycode@npm:2.1.4"
+  checksum: 10c0/0472cc871783a22859ad83fe7cb62d23226ff78694b9807d2a3ec37571d46b05409ca9282c8ccedfb59e58e4a4561b27463623ce95bcfd6bd9c11ac1ef3cd0d1
   languageName: node
   linkType: hard
 
 "@types/q@npm:^1.5.1":
   version: 1.5.7
   resolution: "@types/q@npm:1.5.7"
-  checksum: 70ede8b114077e5f4cdec377c43f8b72306363b2248669c669b4484bdb9c4aaee051ccfcc49d21633486d9747d6b4f443c9ea51e4d0596a1993f86643d0b5530
+  checksum: 10c0/70ede8b114077e5f4cdec377c43f8b72306363b2248669c669b4484bdb9c4aaee051ccfcc49d21633486d9747d6b4f443c9ea51e4d0596a1993f86643d0b5530
   languageName: node
   linkType: hard
 
 "@types/qs@npm:*":
   version: 6.9.10
   resolution: "@types/qs@npm:6.9.10"
-  checksum: 6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
+  checksum: 10c0/6be12e5f062d1b41eb037d59bf9cb65bc9410cedd5e6da832dfd7c8e2b3f4c91e81c9b90b51811140770e5052c6c4e8361181bd9437ddcd4515dc128b7c00353
   languageName: node
   linkType: hard
 
 "@types/rails__ujs@npm:^6.0.4":
   version: 6.0.4
   resolution: "@types/rails__ujs@npm:6.0.4"
-  checksum: 7477cb03a0e1339b9cd5c8ac4a197a153e2ff48742b2f527c5a39dcdf80f01493011e368483290d3717662c63066fada3ab203a335804cbb3573cf575f37007e
+  checksum: 10c0/7477cb03a0e1339b9cd5c8ac4a197a153e2ff48742b2f527c5a39dcdf80f01493011e368483290d3717662c63066fada3ab203a335804cbb3573cf575f37007e
   languageName: node
   linkType: hard
 
 "@types/range-parser@npm:*":
   version: 1.2.7
   resolution: "@types/range-parser@npm:1.2.7"
-  checksum: 361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
+  checksum: 10c0/361bb3e964ec5133fa40644a0b942279ed5df1949f21321d77de79f48b728d39253e5ce0408c9c17e4e0fd95ca7899da36841686393b9f7a1e209916e9381a3c
   languageName: node
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.18
-  resolution: "@types/react-dom@npm:18.2.18"
+  version: 18.3.0
+  resolution: "@types/react-dom@npm:18.3.0"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220
+  checksum: 10c0/6c90d2ed72c5a0e440d2c75d99287e4b5df3e7b011838cdc03ae5cd518ab52164d86990e73246b9d812eaf02ec351d74e3b4f5bd325bf341e13bf980392fd53b
   languageName: node
   linkType: hard
 
@@ -3375,7 +3855,7 @@ __metadata:
   resolution: "@types/react-helmet@npm:6.1.11"
   dependencies:
     "@types/react": "npm:*"
-  checksum: f7b3bb2151d992a108ae46fed876fb9c8119108397d9a01d150c5642782997542c8b3c52e742b56e8689b7dbfa62ca9cfc76aa7e05dec4e60c652f7ef53fa783
+  checksum: 10c0/f7b3bb2151d992a108ae46fed876fb9c8119108397d9a01d150c5642782997542c8b3c52e742b56e8689b7dbfa62ca9cfc76aa7e05dec4e60c652f7ef53fa783
   languageName: node
   linkType: hard
 
@@ -3385,7 +3865,7 @@ __metadata:
   dependencies:
     "@types/prop-types": "npm:*"
     immutable: "npm:^3.8.2"
-  checksum: 4dab74a43a2dde9bea6299a999dd600ae82f00082fe2b8865b11e5154e658f72fbb117132fa3753dd9a280dd8032a2574d8e7c94de5e268afdadd50d720086da
+  checksum: 10c0/4dab74a43a2dde9bea6299a999dd600ae82f00082fe2b8865b11e5154e658f72fbb117132fa3753dd9a280dd8032a2574d8e7c94de5e268afdadd50d720086da
   languageName: node
   linkType: hard
 
@@ -3394,16 +3874,7 @@ __metadata:
   resolution: "@types/react-motion@npm:0.0.40"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 8a560051be917833fdbe051185b53aeafbe8657968ac8e073ac874b9a55c6f16e3793748b13cfb9bd6d9a3d27aba116d6f8f296ec1950f4175dc94d17c5e8470
-  languageName: node
-  linkType: hard
-
-"@types/react-overlays@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@types/react-overlays@npm:3.1.0"
-  dependencies:
-    react-overlays: "npm:*"
-  checksum: 99a4de7c56a286cf72dbf135ad6f9da7c095483987ab548ba7e63d1d885fd54939e78e8bd3dd3cf275a6f4c3d6bdcd00c6923c92cc6c3a4c9bacf5a55550f18b
+  checksum: 10c0/8a560051be917833fdbe051185b53aeafbe8657968ac8e073ac874b9a55c6f16e3793748b13cfb9bd6d9a3d27aba116d6f8f296ec1950f4175dc94d17c5e8470
   languageName: node
   linkType: hard
 
@@ -3414,7 +3885,7 @@ __metadata:
     "@types/history": "npm:^4.7.11"
     "@types/react": "npm:*"
     "@types/react-router": "npm:*"
-  checksum: a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91
+  checksum: 10c0/a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91
   languageName: node
   linkType: hard
 
@@ -3424,16 +3895,7 @@ __metadata:
   dependencies:
     "@types/history": "npm:^4.7.11"
     "@types/react": "npm:*"
-  checksum: 1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
-  languageName: node
-  linkType: hard
-
-"@types/react-select@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/react-select@npm:5.0.1"
-  dependencies:
-    react-select: "npm:*"
-  checksum: 6ea7f3beaebb38e537e5b742a0d8b49f212bdf1dade9f9ce5e3c91e24aad95284aeda0efc8a235e05a7102748f475c4476fb6830030b5574fdf19c3f1d908027
+  checksum: 10c0/1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
   languageName: node
   linkType: hard
 
@@ -3442,7 +3904,7 @@ __metadata:
   resolution: "@types/react-sparklines@npm:1.7.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: acb0937ebc06019921ec5254fb125356f206038f5e2f244663eb849c692b6f6413f75ce3ee84be91d8c659ae43c8f743dd5c4397cdea65749cd601a495491242
+  checksum: 10c0/acb0937ebc06019921ec5254fb125356f206038f5e2f244663eb849c692b6f6413f75ce3ee84be91d8c659ae43c8f743dd5c4397cdea65749cd601a495491242
   languageName: node
   linkType: hard
 
@@ -3451,25 +3913,16 @@ __metadata:
   resolution: "@types/react-swipeable-views@npm:0.13.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: d1dcc78d862f37d30a43d79d915fdb388e05dce0b2ac07462ca4f1b00e0eef37cb41d75997f5685dec79bcce1ffee0dfbc744f20d5266dd3090658def5b4e193
+  checksum: 10c0/d1dcc78d862f37d30a43d79d915fdb388e05dce0b2ac07462ca4f1b00e0eef37cb41d75997f5685dec79bcce1ffee0dfbc744f20d5266dd3090658def5b4e193
   languageName: node
   linkType: hard
 
 "@types/react-test-renderer@npm:^18.0.0":
-  version: 18.0.7
-  resolution: "@types/react-test-renderer@npm:18.0.7"
+  version: 18.3.0
+  resolution: "@types/react-test-renderer@npm:18.3.0"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 45cbe963354acee2ab090979d856763c84f59ef7b63477d1fef5d0fd52760b69aa67bbd205fbd3bd36264620fce72c8e407735a9f2009c40ca50da59b0058c34
-  languageName: node
-  linkType: hard
-
-"@types/react-textarea-autosize@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "@types/react-textarea-autosize@npm:8.0.0"
-  dependencies:
-    react-textarea-autosize: "npm:*"
-  checksum: 8d6a40e53aa3452ddda53a2b9eb8668ffdfdabc8133d731a3ea2205309376f66fb7537832170def243520fefec70e02b7f05043cf4fdeac520b5883fbb66dc12
+  checksum: 10c0/3c9748be52e8e659e7adf91dea6939486463264e6f633bf21c4cb116de18af7bef0595568a1e588160420b2f65289473075dda1cb417c2875df8cf7a09f5d913
   languageName: node
   linkType: hard
 
@@ -3478,7 +3931,7 @@ __metadata:
   resolution: "@types/react-toggle@npm:4.0.5"
   dependencies:
     "@types/react": "npm:*"
-  checksum: f557b85c96715b145bcc3beb2903f88ee3a6045ef85da0f80561c7cc2ecdc531e2d4ae121ed8ec3a1761264de25b8410653744093f37abf042201587add7ffa6
+  checksum: 10c0/f557b85c96715b145bcc3beb2903f88ee3a6045ef85da0f80561c7cc2ecdc531e2d4ae121ed8ec3a1761264de25b8410653744093f37abf042201587add7ffa6
   languageName: node
   linkType: hard
 
@@ -3487,18 +3940,17 @@ __metadata:
   resolution: "@types/react-transition-group@npm:4.4.8"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 6ef75e4ad25db1ad3547521aa11afd4ad887bb53cfc68bd83d6f2fd0483540cff5d78d68b663a0674698d7ac1a739d2d9dc91b82d82219d6c92e43e54f9cd69a
+  checksum: 10c0/6ef75e4ad25db1ad3547521aa11afd4ad887bb53cfc68bd83d6f2fd0483540cff5d78d68b663a0674698d7ac1a739d2d9dc91b82d82219d6c92e43e54f9cd69a
   languageName: node
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.47
-  resolution: "@types/react@npm:18.2.47"
+  version: 18.3.2
+  resolution: "@types/react@npm:18.3.2"
   dependencies:
     "@types/prop-types": "npm:*"
-    "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: e98ea1827fe60636d0f7ce206397159a29fc30613fae43e349e32c10ad3c0b7e0ed2ded2f3239e07bd5a3cba8736b6114ba196acccc39905ca4a06f56a8d2841
+  checksum: 10c0/9fb2f1fcf7e889ee4ea7c3c5978df595c66e770e5fd3a245dbdd2589b9b911524c11dab25a6275d8af4e336e4cb5fa850d447884b84c335a187a338c89df99ba
   languageName: node
   linkType: hard
 
@@ -3508,37 +3960,28 @@ __metadata:
   dependencies:
     immutable: "npm:^4.0.0-rc.1"
     redux: "npm:^4.0.0"
-  checksum: 19972c307f2bbd31a201b28844224ce06e34917823cf2ded3c303cffcced273a2107c4186cc37af9db4f948204fc48c461e609b9f3d2719963049dedae3ebf82
+  checksum: 10c0/19972c307f2bbd31a201b28844224ce06e34917823cf2ded3c303cffcced273a2107c4186cc37af9db4f948204fc48c461e609b9f3d2719963049dedae3ebf82
   languageName: node
   linkType: hard
 
 "@types/requestidlecallback@npm:^0.3.5":
   version: 0.3.7
   resolution: "@types/requestidlecallback@npm:0.3.7"
-  checksum: aa5d1d981d7ddc98b9212c75c89d2ddb2e521077d6c0c5e285d944a8c6ae8baeec30d4d201aec31716d668d3435f884e80e768e28d929a5b87a55097bc21a5e1
+  checksum: 10c0/aa5d1d981d7ddc98b9212c75c89d2ddb2e521077d6c0c5e285d944a8c6ae8baeec30d4d201aec31716d668d3435f884e80e768e28d929a5b87a55097bc21a5e1
   languageName: node
   linkType: hard
 
-"@types/resolve@npm:1.17.1":
-  version: 1.17.1
-  resolution: "@types/resolve@npm:1.17.1"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 6eeb9c27d99bf4b393bf168d43208f63e78cefca5644662a0bdb2bdbf8352386f4f3aca66add138fc41bce5f66fd48a0de430a1473f11b612fbed0375ae78031
+"@types/resolve@npm:1.20.2":
+  version: 1.20.2
+  resolution: "@types/resolve@npm:1.20.2"
+  checksum: 10c0/c5b7e1770feb5ccfb6802f6ad82a7b0d50874c99331e0c9b259e415e55a38d7a86ad0901c57665d93f75938be2a6a0bc9aa06c9749192cadb2e4512800bbc6e6
   languageName: node
   linkType: hard
 
-"@types/scheduler@npm:*":
-  version: 0.16.5
-  resolution: "@types/scheduler@npm:0.16.5"
-  checksum: 625b63cd5dcaf6fb88fe03aa7c797f28cb121f03584126d4811b2d03f39bc3e238ce52cf7685ad8adfe8445d679934e6be47347723a6771ca2058c01f0c33760
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.5.0":
-  version: 7.5.4
-  resolution: "@types/semver@npm:7.5.4"
-  checksum: dee66a71d9f089c118be74b5937d4fef42864d68d9472a3f4f5399b9e3ad74d56a8e155020c846667b9ecf9de78fdb9ea55a53fff5067af28e06779b282b6c40
+"@types/semver@npm:^7.5.0, @types/semver@npm:^7.5.8":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
   languageName: node
   linkType: hard
 
@@ -3548,7 +3991,7 @@ __metadata:
   dependencies:
     "@types/mime": "npm:^1"
     "@types/node": "npm:*"
-  checksum: 7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
+  checksum: 10c0/7f17fa696cb83be0a104b04b424fdedc7eaba1c9a34b06027239aba513b398a0e2b7279778af521f516a397ced417c96960e5f50fcfce40c4bc4509fb1a5883c
   languageName: node
   linkType: hard
 
@@ -3559,42 +4002,42 @@ __metadata:
     "@types/http-errors": "npm:*"
     "@types/mime": "npm:*"
     "@types/node": "npm:*"
-  checksum: 811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
+  checksum: 10c0/811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
   languageName: node
   linkType: hard
 
 "@types/source-list-map@npm:*":
   version: 0.1.4
   resolution: "@types/source-list-map@npm:0.1.4"
-  checksum: d08a191a1fa0549ef2bd0aafdff3973681de323315a011fef907ffdeb0cab534a6aa508b37333278e2a63f290afad6ee3e4e950594fb75b516e5b9b65af338bf
+  checksum: 10c0/d08a191a1fa0549ef2bd0aafdff3973681de323315a011fef907ffdeb0cab534a6aa508b37333278e2a63f290afad6ee3e4e950594fb75b516e5b9b65af338bf
   languageName: node
   linkType: hard
 
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.2
   resolution: "@types/stack-utils@npm:2.0.2"
-  checksum: c2bf0de59ee0a1e2b2031e8a6225f412976377868c42a66537e284a020e9eb4068ed9b9da69d14c1727ab56e605532e877777c7d1bbfd3e9a42ae17bcef7d213
+  checksum: 10c0/c2bf0de59ee0a1e2b2031e8a6225f412976377868c42a66537e284a020e9eb4068ed9b9da69d14c1727ab56e605532e877777c7d1bbfd3e9a42ae17bcef7d213
   languageName: node
   linkType: hard
 
 "@types/tapable@npm:^1":
   version: 1.0.10
   resolution: "@types/tapable@npm:1.0.10"
-  checksum: 414e0e94085f6a280d34eb44f8e2434a4029b8c4eb4903e01dcc58dae7f61fff403ace58dcd54ca543b318a4edb390cd4c3f7ff4504c97ef740fd681497f7b43
+  checksum: 10c0/414e0e94085f6a280d34eb44f8e2434a4029b8c4eb4903e01dcc58dae7f61fff403ace58dcd54ca543b318a4edb390cd4c3f7ff4504c97ef740fd681497f7b43
   languageName: node
   linkType: hard
 
 "@types/tough-cookie@npm:*":
   version: 4.0.2
   resolution: "@types/tough-cookie@npm:4.0.2"
-  checksum: 38d01fc79a9a87166253b8c548bb401599424c57a818bea1b47a68be6dcd37fc3bff381f978354e00221f284937d5066bb92d58bf79952f9d21deb934e8ec9a7
+  checksum: 10c0/38d01fc79a9a87166253b8c548bb401599424c57a818bea1b47a68be6dcd37fc3bff381f978354e00221f284937d5066bb92d58bf79952f9d21deb934e8ec9a7
   languageName: node
   linkType: hard
 
 "@types/trusted-types@npm:^2.0.2":
   version: 2.0.3
   resolution: "@types/trusted-types@npm:2.0.3"
-  checksum: 25eae736a8a6d24353c3e0108138935250f79d1d239f6fd6f3eb52d88476456ba946f8cb8f3130c6841d40534cafc2dd2326358d86966327c3c4a3d3eecaf585
+  checksum: 10c0/25eae736a8a6d24353c3e0108138935250f79d1d239f6fd6f3eb52d88476456ba946f8cb8f3130c6841d40534cafc2dd2326358d86966327c3c4a3d3eecaf585
   languageName: node
   linkType: hard
 
@@ -3603,28 +4046,35 @@ __metadata:
   resolution: "@types/uglify-js@npm:3.17.3"
   dependencies:
     source-map: "npm:^0.6.1"
-  checksum: 718b7d6170acf2c2bb95e7cc9a1958c319d7d8f46633b3b9123a77bcf4801fd7c5d5719ebdb73e8fe1bfe261748bdd2238e65e2dfefc8f4632fa223542646821
+  checksum: 10c0/718b7d6170acf2c2bb95e7cc9a1958c319d7d8f46633b3b9123a77bcf4801fd7c5d5719ebdb73e8fe1bfe261748bdd2238e65e2dfefc8f4632fa223542646821
   languageName: node
   linkType: hard
 
 "@types/use-sync-external-store@npm:^0.0.3":
   version: 0.0.3
   resolution: "@types/use-sync-external-store@npm:0.0.3"
-  checksum: 82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547
+  checksum: 10c0/82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547
   languageName: node
   linkType: hard
 
 "@types/uuid@npm:^9.0.0":
-  version: 9.0.7
-  resolution: "@types/uuid@npm:9.0.7"
-  checksum: b329ebd4f9d1d8e08d4f2cc211be4922d70d1149f73d5772630e4a3acfb5170c6d37b3d7a39a0412f1a56e86e8a844c7f297c798b082f90380608bf766688787
+  version: 9.0.8
+  resolution: "@types/uuid@npm:9.0.8"
+  checksum: 10c0/b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489
   languageName: node
   linkType: hard
 
 "@types/warning@npm:^3.0.0":
   version: 3.0.2
   resolution: "@types/warning@npm:3.0.2"
-  checksum: 84b76cea7b9455bd2a47129f27a5be1cc7a33f54466930abb3c220c93bbeae997c8b08a7b8d6569152a2f8b615b5b865bf4548556c09d2c61ca356a888bc522c
+  checksum: 10c0/84b76cea7b9455bd2a47129f27a5be1cc7a33f54466930abb3c220c93bbeae997c8b08a7b8d6569152a2f8b615b5b865bf4548556c09d2c61ca356a888bc522c
+  languageName: node
+  linkType: hard
+
+"@types/webpack-env@npm:^1.18.4":
+  version: 1.18.5
+  resolution: "@types/webpack-env@npm:1.18.5"
+  checksum: 10c0/b9e4876e8c7cae419896249f9ed795db283c008fe1d38efa679cbbf05194fc2eea2a5bfb4ff4393d109e3a9895416dadf5f3ddd5c22931b678062230f860454e
   languageName: node
   linkType: hard
 
@@ -3635,7 +4085,7 @@ __metadata:
     "@types/node": "npm:*"
     "@types/source-list-map": "npm:*"
     source-map: "npm:^0.7.3"
-  checksum: 4c7a0bfdaa7c8dbed505c1de5bb3cc4a3d7a2f00f982948bc2f1795d46920465d412d62f8fc344a09b78a2c47a2782aad525b651be4018ae40be0f31748dfaf5
+  checksum: 10c0/4c7a0bfdaa7c8dbed505c1de5bb3cc4a3d7a2f00f982948bc2f1795d46920465d412d62f8fc344a09b78a2c47a2782aad525b651be4018ae40be0f31748dfaf5
   languageName: node
   linkType: hard
 
@@ -3649,7 +4099,7 @@ __metadata:
     "@types/webpack-sources": "npm:*"
     anymatch: "npm:^3.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
+  checksum: 10c0/5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
   languageName: node
   linkType: hard
 
@@ -3658,126 +4108,126 @@ __metadata:
   resolution: "@types/ws@npm:8.5.10"
   dependencies:
     "@types/node": "npm:*"
-  checksum: e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
+  checksum: 10c0/e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
   languageName: node
   linkType: hard
 
 "@types/yargs-parser@npm:*":
   version: 21.0.2
   resolution: "@types/yargs-parser@npm:21.0.2"
-  checksum: 422b8c59e21d9594e5a94afa45a3692d96c14f8fc7554bb1c1c390276815f09996ce0f8ed11893b6f8b2efc4ced686231dca5be6d76a4c4ceb56534474e95aca
+  checksum: 10c0/422b8c59e21d9594e5a94afa45a3692d96c14f8fc7554bb1c1c390276815f09996ce0f8ed11893b6f8b2efc4ced686231dca5be6d76a4c4ceb56534474e95aca
   languageName: node
   linkType: hard
 
-"@types/yargs@npm:^17.0.24, @types/yargs@npm:^17.0.8":
+"@types/yargs@npm:^17.0.8":
   version: 17.0.32
   resolution: "@types/yargs@npm:17.0.32"
   dependencies:
     "@types/yargs-parser": "npm:*"
-  checksum: 2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
+  checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0"
+"@typescript-eslint/eslint-plugin@npm:^7.0.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.8.0"
   dependencies:
-    "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.16.0"
-    "@typescript-eslint/type-utils": "npm:6.16.0"
-    "@typescript-eslint/utils": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+    "@eslint-community/regexpp": "npm:^4.10.0"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/type-utils": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.2.4"
+    ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
-    eslint: ^7.0.0 || ^8.0.0
+    "@typescript-eslint/parser": ^7.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c8a68e0953d8b94f6b85d3a82090e61e670bcb0945cbee4d741321c56db727429ad47c48b8403ad1dab3b0842689bd2d4b85c99b76c51ac4f5be7f5f61c4c314
+  checksum: 10c0/37ca22620d1834ff0baa28fa4b8fd92039a3903cb95748353de32d56bae2a81ce50d1bbaed27487eebc884e0a0f9387fcb0f1647593e4e6df5111ef674afa9f0
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/parser@npm:6.17.0"
+"@typescript-eslint/parser@npm:^7.0.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/parser@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 66b53159688083eb48259de5b4daf076f3de284ac3b4d2618bda3f7ab2d8ee27b01ae851b08e8487047e33ff3668424f17d677d66413164cb231f1519dcff82f
+  checksum: 10c0/0dd994c1b31b810c25e1b755b8d352debb7bf21a31f9a91acaec34acf4e471320bcceaa67cf64c110c0b8f5fac10a037dbabac6ec423e17adf037e59a7bce9c1
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.16.0"
+"@typescript-eslint/scope-manager@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
-  checksum: 3b275e528d19f4f36c4acd6cb872b5f004175512dce30cef0ac7a9121bb23d21e5e0f4b62658dbfea2b15851e7fa930372696f25a6c87492f863171ab56f5364
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
+  checksum: 10c0/eaf868938d811cbbea33e97e44ba7050d2b6892202cea6a9622c486b85ab1cf801979edf78036179a8ba4ac26f1dfdf7fcc83a68c1ff66be0b3a8e9a9989b526
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.17.0"
+"@typescript-eslint/scope-manager@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
-  checksum: b7ac7d9c39515c2a1b3844577fab967bf126ec25ccf28076240748b3f42d60ab3e64131bfffee61f66251bdf2d59e50e39f5cb0bee7987c85c49140c75d26b5f
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
+  checksum: 10c0/c253b98e96d4bf0375f473ca2c4d081726f1fd926cdfa65ee14c9ee99cca8eddb763b2d238ac365daa7246bef21b0af38180d04e56e9df7443c0e6f8474d097c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/type-utils@npm:6.16.0"
+"@typescript-eslint/type-utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/type-utils@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.16.0"
-    "@typescript-eslint/utils": "npm:6.16.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    "@typescript-eslint/utils": "npm:7.8.0"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.0.1"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a5339cc1375d12411fcb242249143b28401fb18890bb2a1cff5275ba946affb4a2066cd8203e83ac383bd9d791a79ea6ee1cbf7a30deed5c832ed002897bbf82
+  checksum: 10c0/00f6315626b64f7dbc1f7fba6f365321bb8d34141ed77545b2a07970e59a81dbdf768c1e024225ea00953750d74409ddd8a16782fc4a39261e507c04192dacab
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/types@npm:6.16.0"
-  checksum: 74d9a8b7fd1b85fd1824295c92bc2f506148e450c9897f65ddaa089091017df4e25676c5b098b75c8f00529b84492f303a6b1870bb0ffee83997081325891d53
+"@typescript-eslint/types@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/types@npm:6.21.0"
+  checksum: 10c0/020631d3223bbcff8a0da3efbdf058220a8f48a3de221563996ad1dcc30d6c08dadc3f7608cc08830d21c0d565efd2db19b557b9528921c78aabb605eef2d74d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/types@npm:6.17.0"
-  checksum: c458d985b9ab4f369018536bcb88f0aedafb0c8c4b22ffd376e0c0c768a44e3956475c85ebeef40ae44238841c8df268893477b85873aa2621995c37e738e37e
+"@typescript-eslint/types@npm:7.8.0, @typescript-eslint/types@npm:^7.2.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/types@npm:7.8.0"
+  checksum: 10c0/b2fdbfc21957bfa46f7d8809b607ad8c8b67c51821d899064d09392edc12f28b2318a044f0cd5d523d782e84e8f0558778877944964cf38e139f88790cf9d466
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
+"@typescript-eslint/typescript-estree@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/visitor-keys": "npm:6.21.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3787,70 +4237,87 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c7109e90b40b3c8f1042beb7f1a7a97eeba3b6a903acd82df4947900d68bd31d04b530a190c099666c5ca4886efc162de7b42de754a44b189e41237210797d9e
+  checksum: 10c0/af1438c60f080045ebb330155a8c9bb90db345d5069cdd5d01b67de502abb7449d6c75500519df829f913a6b3f490ade3e8215279b6bdc63d0fb0ae61034df5f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
+"@typescript-eslint/typescript-estree@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/visitor-keys": "npm:7.8.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
-    minimatch: "npm:9.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5a858288bb05f45a2a45b04394115826ff19f85555144bfb67dc281d4e75fc3a1e1aceb3dee68022e86b91f199d1310c15bda3100a4890004b8e474d86afad51
+  checksum: 10c0/1690b62679685073dcb0f62499f0b52b445b37ae6e12d02aa4acbafe3fb023cf999b01f714b6282e88f84fd934fe3e2eefb21a64455d19c348d22bbc68ca8e47
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.16.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/utils@npm:6.16.0"
+"@typescript-eslint/utils@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/utils@npm:7.8.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.15"
+    "@types/semver": "npm:^7.5.8"
+    "@typescript-eslint/scope-manager": "npm:7.8.0"
+    "@typescript-eslint/types": "npm:7.8.0"
+    "@typescript-eslint/typescript-estree": "npm:7.8.0"
+    semver: "npm:^7.6.0"
+  peerDependencies:
+    eslint: ^8.56.0
+  checksum: 10c0/31fb58388d15b082eb7bd5bce889cc11617aa1131dfc6950471541b3df64c82d1c052e2cccc230ca4ae80456d4f63a3e5dccb79899a8f3211ce36c089b7d7640
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:^6.18.1":
+  version: 6.21.0
+  resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.16.0"
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/typescript-estree": "npm:6.16.0"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 586c4c0e1ca249daf9958f0d88df3af010a7592a19db1a7dc198754542b584314896536fe56ea9c93dd0ddd531154e7697002643d46e24a8d3a459721a626e91
+  checksum: 10c0/ab2df3833b2582d4e5467a484d08942b4f2f7208f8e09d67de510008eb8001a9b7460f2f9ba11c12086fd3cdcac0c626761c7995c2c6b5657d5fa6b82030a32d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.16.0"
+"@typescript-eslint/visitor-keys@npm:6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.21.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.21.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 13c4d90355e288eac432d2845e37bb2acc03dab6d8568564558c1914a9aa44352f2a7ff29d0f50e0b3e68d66cca5f27b2732af5ff193b82571b4366309842880
+  checksum: 10c0/7395f69739cfa1cb83c1fb2fad30afa2a814756367302fb4facd5893eff66abc807e8d8f63eba94ed3b0fe0c1c996ac9a1680bcbf0f83717acedc3f2bb724fbf
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.17.0"
+"@typescript-eslint/visitor-keys@npm:7.8.0":
+  version: 7.8.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.8.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 75a48f5810c6a69bc1c082b07d2b840c40895807b1b4ecf9d3ab9eb783176eeb3e7b11eb89d652e8331da79d604f82300f315ffc21cd937819197a8601b48d1d
+    "@typescript-eslint/types": "npm:7.8.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10c0/5892fb5d9c58efaf89adb225f7dbbb77f9363961f2ff420b6b130bdd102dddd7aa8a16c46a5a71c19889d27b781e966119a89270555ea2cb5653a04d8994123d
   languageName: node
   linkType: hard
 
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
+  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
   languageName: node
   linkType: hard
 
@@ -3861,28 +4328,28 @@ __metadata:
     "@webassemblyjs/helper-module-context": "npm:1.9.0"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
     "@webassemblyjs/wast-parser": "npm:1.9.0"
-  checksum: 8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4
+  checksum: 10c0/8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4
   languageName: node
   linkType: hard
 
 "@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
-  checksum: 17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77
+  checksum: 10c0/17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-api-error@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
-  checksum: 892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc
+  checksum: 10c0/892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-buffer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
-  checksum: b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8
+  checksum: 10c0/b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8
   languageName: node
   linkType: hard
 
@@ -3891,14 +4358,14 @@ __metadata:
   resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0"
   dependencies:
     "@webassemblyjs/wast-printer": "npm:1.9.0"
-  checksum: 010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec
+  checksum: 10c0/010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-fsm@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-fsm@npm:1.9.0"
-  checksum: ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94
+  checksum: 10c0/ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94
   languageName: node
   linkType: hard
 
@@ -3907,14 +4374,14 @@ __metadata:
   resolution: "@webassemblyjs/helper-module-context@npm:1.9.0"
   dependencies:
     "@webassemblyjs/ast": "npm:1.9.0"
-  checksum: 130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3
+  checksum: 10c0/130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3
   languageName: node
   linkType: hard
 
 "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
-  checksum: 1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9
+  checksum: 10c0/1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9
   languageName: node
   linkType: hard
 
@@ -3926,7 +4393,7 @@ __metadata:
     "@webassemblyjs/helper-buffer": "npm:1.9.0"
     "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
     "@webassemblyjs/wasm-gen": "npm:1.9.0"
-  checksum: 2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8
+  checksum: 10c0/2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8
   languageName: node
   linkType: hard
 
@@ -3935,7 +4402,7 @@ __metadata:
   resolution: "@webassemblyjs/ieee754@npm:1.9.0"
   dependencies:
     "@xtuc/ieee754": "npm:^1.2.0"
-  checksum: 0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819
+  checksum: 10c0/0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819
   languageName: node
   linkType: hard
 
@@ -3944,14 +4411,14 @@ __metadata:
   resolution: "@webassemblyjs/leb128@npm:1.9.0"
   dependencies:
     "@xtuc/long": "npm:4.2.2"
-  checksum: 441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f
+  checksum: 10c0/441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f
   languageName: node
   linkType: hard
 
 "@webassemblyjs/utf8@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/utf8@npm:1.9.0"
-  checksum: 9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19
+  checksum: 10c0/9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19
   languageName: node
   linkType: hard
 
@@ -3967,7 +4434,7 @@ __metadata:
     "@webassemblyjs/wasm-opt": "npm:1.9.0"
     "@webassemblyjs/wasm-parser": "npm:1.9.0"
     "@webassemblyjs/wast-printer": "npm:1.9.0"
-  checksum: 07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058
+  checksum: 10c0/07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058
   languageName: node
   linkType: hard
 
@@ -3980,7 +4447,7 @@ __metadata:
     "@webassemblyjs/ieee754": "npm:1.9.0"
     "@webassemblyjs/leb128": "npm:1.9.0"
     "@webassemblyjs/utf8": "npm:1.9.0"
-  checksum: 876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600
+  checksum: 10c0/876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600
   languageName: node
   linkType: hard
 
@@ -3992,7 +4459,7 @@ __metadata:
     "@webassemblyjs/helper-buffer": "npm:1.9.0"
     "@webassemblyjs/wasm-gen": "npm:1.9.0"
     "@webassemblyjs/wasm-parser": "npm:1.9.0"
-  checksum: 3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190
+  checksum: 10c0/3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190
   languageName: node
   linkType: hard
 
@@ -4006,7 +4473,7 @@ __metadata:
     "@webassemblyjs/ieee754": "npm:1.9.0"
     "@webassemblyjs/leb128": "npm:1.9.0"
     "@webassemblyjs/utf8": "npm:1.9.0"
-  checksum: 1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2
+  checksum: 10c0/1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2
   languageName: node
   linkType: hard
 
@@ -4020,7 +4487,7 @@ __metadata:
     "@webassemblyjs/helper-code-frame": "npm:1.9.0"
     "@webassemblyjs/helper-fsm": "npm:1.9.0"
     "@xtuc/long": "npm:4.2.2"
-  checksum: c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc
+  checksum: 10c0/c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc
   languageName: node
   linkType: hard
 
@@ -4031,35 +4498,35 @@ __metadata:
     "@webassemblyjs/ast": "npm:1.9.0"
     "@webassemblyjs/wast-parser": "npm:1.9.0"
     "@xtuc/long": "npm:4.2.2"
-  checksum: f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd
+  checksum: 10c0/f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd
   languageName: node
   linkType: hard
 
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
+  checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
   languageName: node
   linkType: hard
 
 "@xtuc/long@npm:4.2.2":
   version: 4.2.2
   resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
+  checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
   languageName: node
   linkType: hard
 
 "abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
-  checksum: 0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
+  checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
   languageName: node
   linkType: hard
 
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
-  checksum: f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
   languageName: node
   linkType: hard
 
@@ -4068,7 +4535,7 @@ __metadata:
   resolution: "abort-controller@npm:3.0.0"
   dependencies:
     event-target-shim: "npm:^5.0.0"
-  checksum: 90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
+  checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5
   languageName: node
   linkType: hard
 
@@ -4078,7 +4545,7 @@ __metadata:
   dependencies:
     mime-types: "npm:~2.1.34"
     negotiator: "npm:0.6.3"
-  checksum: 3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
+  checksum: 10c0/3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
   languageName: node
   linkType: hard
 
@@ -4088,7 +4555,7 @@ __metadata:
   dependencies:
     acorn: "npm:^8.1.0"
     acorn-walk: "npm:^8.0.2"
-  checksum: 7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
+  checksum: 10c0/7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
   languageName: node
   linkType: hard
 
@@ -4097,14 +4564,14 @@ __metadata:
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
     acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
+  checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
   languageName: node
   linkType: hard
 
 "acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
-  checksum: dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2
+  checksum: 10c0/dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2
   languageName: node
   linkType: hard
 
@@ -4113,7 +4580,7 @@ __metadata:
   resolution: "acorn@npm:6.4.2"
   bin:
     acorn: bin/acorn
-  checksum: 52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b
+  checksum: 10c0/52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b
   languageName: node
   linkType: hard
 
@@ -4122,7 +4589,7 @@ __metadata:
   resolution: "acorn@npm:8.11.2"
   bin:
     acorn: bin/acorn
-  checksum: a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017
+  checksum: 10c0/a3ed76c761b75ec54b1ec3068fb7f113a182e95aea7f322f65098c2958d232e3d211cb6dac35ff9c647024b63714bc528a26d54a925d1fef2c25585b4c8e4017
   languageName: node
   linkType: hard
 
@@ -4131,7 +4598,7 @@ __metadata:
   resolution: "agent-base@npm:6.0.2"
   dependencies:
     debug: "npm:4"
-  checksum: dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
+  checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
   languageName: node
   linkType: hard
 
@@ -4140,7 +4607,7 @@ __metadata:
   resolution: "agent-base@npm:7.1.0"
   dependencies:
     debug: "npm:^4.3.4"
-  checksum: fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
+  checksum: 10c0/fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
   languageName: node
   linkType: hard
 
@@ -4150,7 +4617,7 @@ __metadata:
   dependencies:
     clean-stack: "npm:^2.0.0"
     indent-string: "npm:^4.0.0"
-  checksum: a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
+  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
   languageName: node
   linkType: hard
 
@@ -4159,7 +4626,7 @@ __metadata:
   resolution: "ajv-errors@npm:1.0.1"
   peerDependencies:
     ajv: ">=5.0.0"
-  checksum: de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1
+  checksum: 10c0/de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1
   languageName: node
   linkType: hard
 
@@ -4168,7 +4635,7 @@ __metadata:
   resolution: "ajv-keywords@npm:3.5.2"
   peerDependencies:
     ajv: ^6.9.1
-  checksum: 0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
+  checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
   languageName: node
   linkType: hard
 
@@ -4180,7 +4647,7 @@ __metadata:
     fast-json-stable-stringify: "npm:^2.0.0"
     json-schema-traverse: "npm:^0.4.1"
     uri-js: "npm:^4.2.2"
-  checksum: 41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
+  checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
   languageName: node
   linkType: hard
 
@@ -4192,14 +4659,14 @@ __metadata:
     json-schema-traverse: "npm:^1.0.0"
     require-from-string: "npm:^2.0.2"
     uri-js: "npm:^4.2.2"
-  checksum: ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
+  checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
   languageName: node
   linkType: hard
 
 "ansi-colors@npm:^3.0.0":
   version: 3.2.4
   resolution: "ansi-colors@npm:3.2.4"
-  checksum: 1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b
+  checksum: 10c0/1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b
   languageName: node
   linkType: hard
 
@@ -4208,7 +4675,7 @@ __metadata:
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
     type-fest: "npm:^0.21.3"
-  checksum: da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
+  checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
   languageName: node
   linkType: hard
 
@@ -4217,7 +4684,7 @@ __metadata:
   resolution: "ansi-escapes@npm:6.2.0"
   dependencies:
     type-fest: "npm:^3.0.0"
-  checksum: 3eec75deedd8b10192c5f98e4cd9715cc3ff268d33fc463c24b7d22446668bfcd4ad1803993ea89c0f51f88b5a3399572bacb7c8cb1a067fc86e189c5f3b0c7e
+  checksum: 10c0/3eec75deedd8b10192c5f98e4cd9715cc3ff268d33fc463c24b7d22446668bfcd4ad1803993ea89c0f51f88b5a3399572bacb7c8cb1a067fc86e189c5f3b0c7e
   languageName: node
   linkType: hard
 
@@ -4226,35 +4693,35 @@ __metadata:
   resolution: "ansi-html-community@npm:0.0.8"
   bin:
     ansi-html: bin/ansi-html
-  checksum: 45d3a6f0b4f10b04fdd44bef62972e2470bfd917bf00439471fa7473d92d7cbe31369c73db863cc45dda115cb42527f39e232e9256115534b8ee5806b0caeed4
+  checksum: 10c0/45d3a6f0b4f10b04fdd44bef62972e2470bfd917bf00439471fa7473d92d7cbe31369c73db863cc45dda115cb42527f39e232e9256115534b8ee5806b0caeed4
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^2.0.0":
   version: 2.1.1
   resolution: "ansi-regex@npm:2.1.1"
-  checksum: 78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b
+  checksum: 10c0/78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^4.1.0":
   version: 4.1.1
   resolution: "ansi-regex@npm:4.1.1"
-  checksum: d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da
+  checksum: 10c0/d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^5.0.1":
   version: 5.0.1
   resolution: "ansi-regex@npm:5.0.1"
-  checksum: 9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
+  checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
   languageName: node
   linkType: hard
 
 "ansi-regex@npm:^6.0.1":
   version: 6.0.1
   resolution: "ansi-regex@npm:6.0.1"
-  checksum: cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
   languageName: node
   linkType: hard
 
@@ -4263,7 +4730,7 @@ __metadata:
   resolution: "ansi-styles@npm:3.2.1"
   dependencies:
     color-convert: "npm:^1.9.0"
-  checksum: ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
+  checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
   languageName: node
   linkType: hard
 
@@ -4272,21 +4739,21 @@ __metadata:
   resolution: "ansi-styles@npm:4.3.0"
   dependencies:
     color-convert: "npm:^2.0.1"
-  checksum: 895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
+  checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^5.0.0":
   version: 5.2.0
   resolution: "ansi-styles@npm:5.2.0"
-  checksum: 9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
+  checksum: 10c0/9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
   languageName: node
   linkType: hard
 
 "ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.1":
   version: 6.2.1
   resolution: "ansi-styles@npm:6.2.1"
-  checksum: 5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
+  checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
   languageName: node
   linkType: hard
 
@@ -4296,7 +4763,7 @@ __metadata:
   dependencies:
     micromatch: "npm:^3.1.4"
     normalize-path: "npm:^2.1.1"
-  checksum: a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e
+  checksum: 10c0/a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e
   languageName: node
   linkType: hard
 
@@ -4306,31 +4773,14 @@ __metadata:
   dependencies:
     normalize-path: "npm:^3.0.0"
     picomatch: "npm:^2.0.4"
-  checksum: 57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
-  languageName: node
-  linkType: hard
-
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5
+  checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
   languageName: node
   linkType: hard
 
 "are-docs-informative@npm:^0.0.2":
   version: 0.0.2
   resolution: "are-docs-informative@npm:0.0.2"
-  checksum: f0326981bd699c372d268b526b170a28f2e1aec2cf99d7de0686083528427ecdf6ae41fef5d9988e224a5616298af747ad8a76e7306b0a7c97cc085a99636d60
-  languageName: node
-  linkType: hard
-
-"are-we-there-yet@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "are-we-there-yet@npm:4.0.0"
-  dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^4.1.0"
-  checksum: 760008e32948e9f738c5a288792d187e235fee0f170e042850bc7ff242f2a499f3f2874d6dd43ac06f5d9f5306137bc51bbdd4ae0bb11379c58b01678e0f684d
+  checksum: 10c0/f0326981bd699c372d268b526b170a28f2e1aec2cf99d7de0686083528427ecdf6ae41fef5d9988e224a5616298af747ad8a76e7306b0a7c97cc085a99636d60
   languageName: node
   linkType: hard
 
@@ -4339,77 +4789,68 @@ __metadata:
   resolution: "argparse@npm:1.0.10"
   dependencies:
     sprintf-js: "npm:~1.0.2"
-  checksum: b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
+  checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
   languageName: node
   linkType: hard
 
 "argparse@npm:^2.0.1":
   version: 2.0.1
   resolution: "argparse@npm:2.0.1"
-  checksum: c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
+  checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.1.3":
-  version: 5.1.3
-  resolution: "aria-query@npm:5.1.3"
-  dependencies:
-    deep-equal: "npm:^2.0.5"
-  checksum: edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf
-  languageName: node
-  linkType: hard
-
-"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
+"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
     dequal: "npm:^2.0.3"
-  checksum: 2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
+  checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
   languageName: node
   linkType: hard
 
 "arr-diff@npm:^4.0.0":
   version: 4.0.0
   resolution: "arr-diff@npm:4.0.0"
-  checksum: 67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7
+  checksum: 10c0/67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7
   languageName: node
   linkType: hard
 
 "arr-flatten@npm:^1.1.0":
   version: 1.1.0
   resolution: "arr-flatten@npm:1.1.0"
-  checksum: bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a
+  checksum: 10c0/bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a
   languageName: node
   linkType: hard
 
 "arr-union@npm:^3.1.0":
   version: 3.1.0
   resolution: "arr-union@npm:3.1.0"
-  checksum: 7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51
+  checksum: 10c0/7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-buffer-byte-length@npm:1.0.0"
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    is-array-buffer: "npm:^3.0.1"
-  checksum: 12f84f6418b57a954caa41654e5e63e019142a4bbb2c6829ba86d1ba65d31ccfaf1461d1743556fd32b091fac34ff44d9dfbdb001402361c45c373b2c86f5c20
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917
   languageName: node
   linkType: hard
 
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
-  checksum: 806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91
+  checksum: 10c0/806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91
   languageName: node
   linkType: hard
 
 "array-flatten@npm:^2.1.0":
   version: 2.1.2
   resolution: "array-flatten@npm:2.1.2"
-  checksum: bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f
+  checksum: 10c0/bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f
   languageName: node
   linkType: hard
 
@@ -4422,7 +4863,7 @@ __metadata:
     es-abstract: "npm:^1.22.1"
     get-intrinsic: "npm:^1.2.1"
     is-string: "npm:^1.0.7"
-  checksum: 692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b
+  checksum: 10c0/692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b
   languageName: node
   linkType: hard
 
@@ -4431,28 +4872,41 @@ __metadata:
   resolution: "array-union@npm:1.0.2"
   dependencies:
     array-uniq: "npm:^1.0.1"
-  checksum: 18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7
+  checksum: 10c0/18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7
   languageName: node
   linkType: hard
 
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
-  checksum: 429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
+  checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
   languageName: node
   linkType: hard
 
 "array-uniq@npm:^1.0.1":
   version: 1.0.3
   resolution: "array-uniq@npm:1.0.3"
-  checksum: 3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6
+  checksum: 10c0/3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6
   languageName: node
   linkType: hard
 
 "array-unique@npm:^0.3.2":
   version: 0.3.2
   resolution: "array-unique@npm:0.3.2"
-  checksum: dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121
+  checksum: 10c0/dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlast@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "array.prototype.findlast@npm:1.2.4"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.3.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/4b5145a68ebaa00ef3d61de07c6694cad73d60763079f1e7662b948e5a167b5121b0c1e6feae8df1e42ead07c21699e25242b95cd5c48e094fd530b192aa4150
   languageName: node
   linkType: hard
 
@@ -4465,7 +4919,7 @@ __metadata:
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
     get-intrinsic: "npm:^1.2.1"
-  checksum: 2c5c4d3f07512d6729f728f6260a314c00f2eb0a243123092661fa1bc65dce90234c3b483b5f978396eccef6f69c50f0bea248448aaf9cdfcd1cedad6217acbb
+  checksum: 10c0/2c5c4d3f07512d6729f728f6260a314c00f2eb0a243123092661fa1bc65dce90234c3b483b5f978396eccef6f69c50f0bea248448aaf9cdfcd1cedad6217acbb
   languageName: node
   linkType: hard
 
@@ -4477,11 +4931,11 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
-  checksum: a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2":
+"array.prototype.flatmap@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
@@ -4489,7 +4943,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     es-shim-unscopables: "npm:^1.0.0"
-  checksum: 67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
+  checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
   languageName: node
   linkType: hard
 
@@ -4502,42 +4956,55 @@ __metadata:
     es-abstract: "npm:^1.20.4"
     es-array-method-boxes-properly: "npm:^1.0.0"
     is-string: "npm:^1.0.7"
-  checksum: 0c6c589d22d6cda4a32458c6fd57a41f420a4fa6cd184a3f6fe7b507f457bc4a073aff6accd595bcd6ac29cad856e7ac306549f127acdb098f401eea13c54901
+  checksum: 10c0/0c6c589d22d6cda4a32458c6fd57a41f420a4fa6cd184a3f6fe7b507f457bc4a073aff6accd595bcd6ac29cad856e7ac306549f127acdb098f401eea13c54901
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+"array.prototype.toreversed@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "array.prototype.toreversed@npm:1.1.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.1.3"
-  checksum: fd5f57aca3c7ddcd1bb83965457b625f3a67d8f334f5cbdb8ac8ef33d5b0d38281524114db2936f8c08048115d5158af216c94e6ae1eb966241b9b6f4ab8a7e8
-  languageName: node
-  linkType: hard
-
-"arraybuffer.prototype.slice@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
-  dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-    is-array-buffer: "npm:^3.0.2"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10c0/2b7627ea85eae1e80ecce665a500cc0f3355ac83ee4a1a727562c7c2a1d5f1c0b4dd7b65c468ec6867207e452ba01256910a2c0b41486bfdd11acf875a7a3435
+  languageName: node
+  linkType: hard
+
+"array.prototype.tosorted@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "array.prototype.tosorted@npm:1.1.3"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.1.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
     is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 96b6e40e439678ffb7fa266398510074d33c3980fbb475490b69980cca60adec3b0777047ef377068a29862157f83edef42efc64ce48ce38977d04d68de5b7fb
+  checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36
   languageName: node
   linkType: hard
 
 "arrow-key-navigation@npm:^1.2.0":
   version: 1.2.0
   resolution: "arrow-key-navigation@npm:1.2.0"
-  checksum: 6a6ae0aa65cc1aeb2970fcd0ef855b3a4ba8366e785c20d2228e739c08364a2aac62aac09dc3224066aa9bc5fde1a95e7daf5084775fc71abb724649c54da68b
+  checksum: 10c0/6a6ae0aa65cc1aeb2970fcd0ef855b3a4ba8366e785c20d2228e739c08364a2aac62aac09dc3224066aa9bc5fde1a95e7daf5084775fc71abb724649c54da68b
   languageName: node
   linkType: hard
 
@@ -4549,7 +5016,7 @@ __metadata:
     inherits: "npm:^2.0.1"
     minimalistic-assert: "npm:^1.0.0"
     safer-buffer: "npm:^2.1.0"
-  checksum: b577232fa6069cc52bb128e564002c62b2b1fe47f7137bdcd709c0b8495aa79cee0f8cc458a831b2d8675900eea0d05781b006be5e1aa4f0ae3577a73ec20324
+  checksum: 10c0/b577232fa6069cc52bb128e564002c62b2b1fe47f7137bdcd709c0b8495aa79cee0f8cc458a831b2d8675900eea0d05781b006be5e1aa4f0ae3577a73ec20324
   languageName: node
   linkType: hard
 
@@ -4559,51 +5026,51 @@ __metadata:
   dependencies:
     object-assign: "npm:^4.1.1"
     util: "npm:0.10.3"
-  checksum: 188da37d63be479a3b14657c01080db90cdf7fa004e346af916cf8beebcaffb11359c596d0c9c3cd8174c9125a6225796ef1ce533487edc97f8ce3b18c1ab590
+  checksum: 10c0/188da37d63be479a3b14657c01080db90cdf7fa004e346af916cf8beebcaffb11359c596d0c9c3cd8174c9125a6225796ef1ce533487edc97f8ce3b18c1ab590
   languageName: node
   linkType: hard
 
 "assign-symbols@npm:^1.0.0":
   version: 1.0.0
   resolution: "assign-symbols@npm:1.0.0"
-  checksum: 29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775
+  checksum: 10c0/29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775
   languageName: node
   linkType: hard
 
 "ast-types-flow@npm:^0.0.8":
   version: 0.0.8
   resolution: "ast-types-flow@npm:0.0.8"
-  checksum: f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e
+  checksum: 10c0/f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e
   languageName: node
   linkType: hard
 
 "astral-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "astral-regex@npm:2.0.0"
-  checksum: f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25
+  checksum: 10c0/f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25
   languageName: node
   linkType: hard
 
 "async-each@npm:^1.0.1":
   version: 1.0.6
   resolution: "async-each@npm:1.0.6"
-  checksum: d4e45e8f077e20e015952c065ceae75f82b30ee2d4a8e56a5c454ae44331aaa009d8c94fe043ba254c177bffae9f6ebeefebb7daf9f7ce4d27fac0274dc328ae
+  checksum: 10c0/d4e45e8f077e20e015952c065ceae75f82b30ee2d4a8e56a5c454ae44331aaa009d8c94fe043ba254c177bffae9f6ebeefebb7daf9f7ce4d27fac0274dc328ae
   languageName: node
   linkType: hard
 
 "async-limiter@npm:~1.0.0":
   version: 1.0.1
   resolution: "async-limiter@npm:1.0.1"
-  checksum: 0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969
+  checksum: 10c0/0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969
   languageName: node
   linkType: hard
 
-"async-mutex@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "async-mutex@npm:0.4.0"
+"async-mutex@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "async-mutex@npm:0.5.0"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 6541695f80c1d6c5acbf3f7f04e8ff0733b3e029312c48d77bb95243fbe21fc5319f45ac3d72ce08551e6df83dc32440285ce9a3ac17bfc5d385ff0cc8ccd62a
+  checksum: 10c0/9096e6ad6b674c894d8ddd5aa4c512b09bb05931b8746ebd634952b05685608b2b0820ed5c406e6569919ff5fe237ab3c491e6f2887d6da6b6ba906db3ee9c32
   languageName: node
   linkType: hard
 
@@ -4612,14 +5079,14 @@ __metadata:
   resolution: "async@npm:2.6.4"
   dependencies:
     lodash: "npm:^4.17.14"
-  checksum: 0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0
+  checksum: 10c0/0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0
   languageName: node
   linkType: hard
 
 "async@npm:^3.2.3":
   version: 3.2.4
   resolution: "async@npm:3.2.4"
-  checksum: b5d02fed64717edf49e35b2b156debd9cf524934ea670108fa5528e7615ed66a5e0bf6c65f832c9483b63aa7f0bffe3e588ebe8d58a539b833798d324516e1c9
+  checksum: 10c0/b5d02fed64717edf49e35b2b156debd9cf524934ea670108fa5528e7615ed66a5e0bf6c65f832c9483b63aa7f0bffe3e588ebe8d58a539b833798d324516e1c9
   languageName: node
   linkType: hard
 
@@ -4628,21 +5095,21 @@ __metadata:
   resolution: "asynciterator.prototype@npm:1.0.0"
   dependencies:
     has-symbols: "npm:^1.0.3"
-  checksum: fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204
+  checksum: 10c0/fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204
   languageName: node
   linkType: hard
 
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
-  checksum: d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
+  checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
   languageName: node
   linkType: hard
 
 "at-least-node@npm:^1.0.0":
   version: 1.0.0
   resolution: "at-least-node@npm:1.0.0"
-  checksum: 4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef
+  checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef
   languageName: node
   linkType: hard
 
@@ -4651,17 +5118,24 @@ __metadata:
   resolution: "atob@npm:2.1.2"
   bin:
     atob: bin/atob.js
-  checksum: ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e
+  checksum: 10c0/ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.14":
-  version: 10.4.16
-  resolution: "autoprefixer@npm:10.4.16"
+"atomic-sleep@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "atomic-sleep@npm:1.0.0"
+  checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+  languageName: node
+  linkType: hard
+
+"autoprefixer@npm:^10.4.14, autoprefixer@npm:^10.4.19":
+  version: 10.4.19
+  resolution: "autoprefixer@npm:10.4.19"
   dependencies:
-    browserslist: "npm:^4.21.10"
-    caniuse-lite: "npm:^1.0.30001538"
-    fraction.js: "npm:^4.3.6"
+    browserslist: "npm:^4.23.0"
+    caniuse-lite: "npm:^1.0.30001599"
+    fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
@@ -4669,32 +5143,34 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: e00256e754d481a026d928bca729b25954074dd142dbec022f0a7db0d3bbc0dc2e2dc7542e94fec22eff81e21fe140e6856448e2d9a002660cb1e2ad434daee0
+  checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660
+"available-typed-arrays@npm:^1.0.6, available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2
   languageName: node
   linkType: hard
 
 "axe-core@npm:=4.7.0":
   version: 4.7.0
   resolution: "axe-core@npm:4.7.0"
-  checksum: 89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
+  checksum: 10c0/89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
   languageName: node
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.5
-  resolution: "axios@npm:1.6.5"
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
   dependencies:
-    follow-redirects: "npm:^1.15.4"
+    follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: aeb9acf87590d8aa67946072ced38e01ca71f5dfe043782c0ccea667e5dd5c45830c08afac9be3d7c894f09684b8ab2a458f497d197b73621233bcf202d9d468
+  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
   languageName: node
   linkType: hard
 
@@ -4703,7 +5179,7 @@ __metadata:
   resolution: "axobject-query@npm:3.2.1"
   dependencies:
     dequal: "npm:^2.0.3"
-  checksum: f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
+  checksum: 10c0/f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
   languageName: node
   linkType: hard
 
@@ -4720,7 +5196,7 @@ __metadata:
     slash: "npm:^3.0.0"
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: 2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
+  checksum: 10c0/2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
   languageName: node
   linkType: hard
 
@@ -4735,26 +5211,26 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0
     webpack: ">=2"
-  checksum: 7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f
+  checksum: 10c0/7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f
   languageName: node
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.10
-  resolution: "babel-plugin-formatjs@npm:10.5.10"
+  version: 10.5.14
+  resolution: "babel-plugin-formatjs@npm:10.5.14"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
     "@babel/plugin-syntax-jsx": "npm:7"
     "@babel/traverse": "npm:7"
     "@babel/types": "npm:^7.12.11"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/ts-transformer": "npm:3.13.9"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/babel__core": "npm:^7.1.7"
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: bff65cd2a88a0ae00eabab1d022ffc44c4385b7e529cac42375bb1828c678c7a71a78f644512e5d1dd8cd532d418c16acdbabcef2bf6670e24404f4f164a74ce
+  checksum: 10c0/78d33f0304c7b6e36334b2f32bacd144cbbe08cb22318ff994e7adc7705b7f8208354c9af9f87b4390d11aee1ea81cfee9f224a57fe5265173b92ee7de921359
   languageName: node
   linkType: hard
 
@@ -4767,7 +5243,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-instrument: "npm:^5.0.4"
     test-exclude: "npm:^6.0.0"
-  checksum: 1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
+  checksum: 10c0/1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
   languageName: node
   linkType: hard
 
@@ -4779,7 +5255,7 @@ __metadata:
     "@babel/types": "npm:^7.3.3"
     "@types/babel__core": "npm:^7.1.14"
     "@types/babel__traverse": "npm:^7.0.6"
-  checksum: 7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
+  checksum: 10c0/7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
   languageName: node
   linkType: hard
 
@@ -4792,7 +5268,7 @@ __metadata:
     glob: "npm:^7.1.1"
     lodash: "npm:^4.17.10"
     require-package-name: "npm:^2.0.1"
-  checksum: 1a1db624f70c1e9badd3ca112bc6819157e75768aab949c424cfabe562765d7f22cf93e5e088e820d5d5b1da7b2bd9d045cb54a5790616b65da1f84eda2ecc08
+  checksum: 10c0/1a1db624f70c1e9badd3ca112bc6819157e75768aab949c424cfabe562765d7f22cf93e5e088e820d5d5b1da7b2bd9d045cb54a5790616b65da1f84eda2ecc08
   languageName: node
   linkType: hard
 
@@ -4805,7 +5281,7 @@ __metadata:
     glob: "npm:^7.1.1"
     lodash: "npm:^4.17.10"
     require-package-name: "npm:^2.0.1"
-  checksum: 61fe073dcb381141d5cce766582750f487609bea3ad1c6725d736287f2ccd270e14d14190a7bd2700945a39acf8d58fdbee3ab7f80a7eb2a65980cf77185226c
+  checksum: 10c0/61fe073dcb381141d5cce766582750f487609bea3ad1c6725d736287f2ccd270e14d14190a7bd2700945a39acf8d58fdbee3ab7f80a7eb2a65980cf77185226c
   languageName: node
   linkType: hard
 
@@ -4816,43 +5292,43 @@ __metadata:
     "@babel/runtime": "npm:^7.12.5"
     cosmiconfig: "npm:^7.0.0"
     resolve: "npm:^1.19.0"
-  checksum: c6dfb15de96f67871d95bd2e8c58b0c81edc08b9b087dc16755e7157f357dc1090a8dc60ebab955e92587a9101f02eba07e730adc253a1e4cf593ca3ebd3839c
+  checksum: 10c0/c6dfb15de96f67871d95bd2e8c58b0c81edc08b9b087dc16755e7157f357dc1090a8dc60ebab955e92587a9101f02eba07e730adc253a1e4cf593ca3ebd3839c
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.7":
-  version: 0.4.7
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
+"babel-plugin-polyfill-corejs2@npm:^0.4.10":
+  version: 0.4.10
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.10"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: f80f7284ec72c63e7dd751e0bdf25e9978df195a79e0887470603bfdea13ee518d62573cf360bb1bc01b80819e54915dd5edce9cff14c52d0af5f984aa3d36a3
+  checksum: 10c0/910bfb1d809cae49cf43348f9b1e4a5e4c895aa25686fdd2ff8af7b7a996b88ad39597707905d097e08d4e70e14340ac935082ef4e035e77f68741f813f2a80d
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.8.7":
-  version: 0.8.7
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
+"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4":
+  version: 0.10.4
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
-    core-js-compat: "npm:^3.33.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    core-js-compat: "npm:^3.36.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 094e40f4ab9f131408202063964d63740609fd4fdb70a5b6332b371761921b540ffbcee7a434c0199b8317dfb2ba4675eef674867215fd3b85e24054607c1501
+  checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.4":
-  version: 0.5.4
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
+"babel-plugin-polyfill-regenerator@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.1"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 0b903f5fe2f8c487b4260935dfe60bd9a95bcaee7ae63958f063045093b16d4e8288c232199d411261300aa21f6b106a3cb83c42cc996de013b337f5825a79fe
+  checksum: 10c0/0b55a35a75a261f62477d8d0f0c4a8e3b66f109323ce301d7de6898e168c41224de3bc26a92f48f2c7fcc19dfd1fc60fe71098bfd4f804a0463ff78586892403
   languageName: node
   linkType: hard
 
@@ -4864,14 +5340,14 @@ __metadata:
     "@types/babel__core": "npm:^7.1.12"
     babel-plugin-macros: "npm:^3.0.1"
     require-from-string: "npm:^2.0.2"
-  checksum: d40814ca18f24df818a87e71ad8c1dc559cf69c0e44218bb9f5aef24680431a04e4bad8e96dc2679282b50b16a55c9597e37130d6bd5489b3eddab97d020ae5e
+  checksum: 10c0/d40814ca18f24df818a87e71ad8c1dc559cf69c0e44218bb9f5aef24680431a04e4bad8e96dc2679282b50b16a55c9597e37130d6bd5489b3eddab97d020ae5e
   languageName: node
   linkType: hard
 
 "babel-plugin-transform-react-remove-prop-types@npm:^0.4.24":
   version: 0.4.24
   resolution: "babel-plugin-transform-react-remove-prop-types@npm:0.4.24"
-  checksum: 713441fd9fb663cc95709cb52d9c2c6228ea6d5406092a8a50094c810bcb13c3c347f8fca703d45b20cc401782743a91d7272025950147f9247d53360267f107
+  checksum: 10c0/713441fd9fb663cc95709cb52d9c2c6228ea6d5406092a8a50094c810bcb13c3c347f8fca703d45b20cc401782743a91d7272025950147f9247d53360267f107
   languageName: node
   linkType: hard
 
@@ -4893,7 +5369,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
+  checksum: 10c0/5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
   languageName: node
   linkType: hard
 
@@ -4905,28 +5381,28 @@ __metadata:
     babel-preset-current-node-syntax: "npm:^1.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
+  checksum: 10c0/ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^1.0.0":
   version: 1.0.2
   resolution: "balanced-match@npm:1.0.2"
-  checksum: 9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
+  checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
   languageName: node
   linkType: hard
 
 "balanced-match@npm:^2.0.0":
   version: 2.0.0
   resolution: "balanced-match@npm:2.0.0"
-  checksum: 60a54e0b75a61674e16a7a336b805f06c72d6f8fc457639c24efc512ba2bf9cb5744b9f6f5225afcefb99da39714440c83c737208cc65c5d9ecd1f3093331ca3
+  checksum: 10c0/60a54e0b75a61674e16a7a336b805f06c72d6f8fc457639c24efc512ba2bf9cb5744b9f6f5225afcefb99da39714440c83c737208cc65c5d9ecd1f3093331ca3
   languageName: node
   linkType: hard
 
 "base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":
   version: 1.5.1
   resolution: "base64-js@npm:1.5.1"
-  checksum: f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
+  checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
   languageName: node
   linkType: hard
 
@@ -4941,51 +5417,35 @@ __metadata:
     isobject: "npm:^3.0.1"
     mixin-deep: "npm:^1.2.0"
     pascalcase: "npm:^0.1.1"
-  checksum: 30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d
+  checksum: 10c0/30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d
   languageName: node
   linkType: hard
 
 "batch@npm:0.6.1":
   version: 0.6.1
   resolution: "batch@npm:0.6.1"
-  checksum: 925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5
-  languageName: node
-  linkType: hard
-
-"bidi-js@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "bidi-js@npm:1.0.3"
-  dependencies:
-    require-from-string: "npm:^2.0.2"
-  checksum: fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
-  languageName: node
-  linkType: hard
-
-"big-integer@npm:^1.6.44":
-  version: 1.6.51
-  resolution: "big-integer@npm:1.6.51"
-  checksum: c8139662d57f8833a44802f4b65be911679c569535ea73c5cfd3c1c8994eaead1b84b6f63e1db63833e4d4cacb6b6a9e5522178113dfdc8e4c81ed8436f1e8cc
+  checksum: 10c0/925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5
   languageName: node
   linkType: hard
 
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
-  checksum: 230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
+  checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
   languageName: node
   linkType: hard
 
 "binary-extensions@npm:^1.0.0":
   version: 1.13.1
   resolution: "binary-extensions@npm:1.13.1"
-  checksum: 2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9
+  checksum: 10c0/2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9
   languageName: node
   linkType: hard
 
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
-  checksum: d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d
+  checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d
   languageName: node
   linkType: hard
 
@@ -4994,58 +5454,58 @@ __metadata:
   resolution: "bindings@npm:1.5.0"
   dependencies:
     file-uri-to-path: "npm:1.0.0"
-  checksum: 3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
+  checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
   languageName: node
   linkType: hard
 
 "bintrees@npm:1.0.2":
   version: 1.0.2
   resolution: "bintrees@npm:1.0.2"
-  checksum: 132944b20c93c1a8f97bf8aa25980a76c6eb4291b7f2df2dbcd01cb5b417c287d3ee0847c7260c9f05f3d5a4233aaa03dec95114e97f308abe9cc3f72bed4a44
+  checksum: 10c0/132944b20c93c1a8f97bf8aa25980a76c6eb4291b7f2df2dbcd01cb5b417c287d3ee0847c7260c9f05f3d5a4233aaa03dec95114e97f308abe9cc3f72bed4a44
   languageName: node
   linkType: hard
 
 "blueimp-load-image@npm:^3.0.0":
   version: 3.0.0
   resolution: "blueimp-load-image@npm:3.0.0"
-  checksum: e860da4113afd8e58bc026fb17240007e15dc155287a70fb57b3048fc8f0aa5f7dbd052efed8bff19d1208eeab4d058dc6788684a721c50ccd08b68d836a8d18
+  checksum: 10c0/e860da4113afd8e58bc026fb17240007e15dc155287a70fb57b3048fc8f0aa5f7dbd052efed8bff19d1208eeab4d058dc6788684a721c50ccd08b68d836a8d18
   languageName: node
   linkType: hard
 
 "blurhash@npm:^2.0.5":
   version: 2.0.5
   resolution: "blurhash@npm:2.0.5"
-  checksum: 75d5f042b5bb8ead977524a985048378a033af866534abbaee73c80030cc9fc34e6c5b7d483c68bbdb600e0ae438f2ea6140b1f46d75fcfa57a902208ae8b85e
+  checksum: 10c0/75d5f042b5bb8ead977524a985048378a033af866534abbaee73c80030cc9fc34e6c5b7d483c68bbdb600e0ae438f2ea6140b1f46d75fcfa57a902208ae8b85e
   languageName: node
   linkType: hard
 
 "bmp-js@npm:^0.1.0":
   version: 0.1.0
   resolution: "bmp-js@npm:0.1.0"
-  checksum: c651bd5936dcf8d67900050fac14dcbe30baf87c3d21c58f4934fcdf46172e152a87d8c0c3ca25caa2b4b2c7780ef3b5fcc6cd20afd8f0351856cadb1bef9694
+  checksum: 10c0/c651bd5936dcf8d67900050fac14dcbe30baf87c3d21c58f4934fcdf46172e152a87d8c0c3ca25caa2b4b2c7780ef3b5fcc6cd20afd8f0351856cadb1bef9694
   languageName: node
   linkType: hard
 
 "bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
   version: 4.12.0
   resolution: "bn.js@npm:4.12.0"
-  checksum: 9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21
+  checksum: 10c0/9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21
   languageName: node
   linkType: hard
 
 "bn.js@npm:^5.0.0, bn.js@npm:^5.1.1":
   version: 5.2.1
   resolution: "bn.js@npm:5.2.1"
-  checksum: bed3d8bd34ec89dbcf9f20f88bd7d4a49c160fda3b561c7bb227501f974d3e435a48fb9b61bc3de304acab9215a3bda0803f7017ffb4d0016a0c3a740a283caa
+  checksum: 10c0/bed3d8bd34ec89dbcf9f20f88bd7d4a49c160fda3b561c7bb227501f974d3e435a48fb9b61bc3de304acab9215a3bda0803f7017ffb4d0016a0c3a740a283caa
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
+"body-parser@npm:1.20.2":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
   dependencies:
     bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.4"
+    content-type: "npm:~1.0.5"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
     destroy: "npm:1.2.0"
@@ -5053,10 +5513,10 @@ __metadata:
     iconv-lite: "npm:0.4.24"
     on-finished: "npm:2.4.1"
     qs: "npm:6.11.0"
-    raw-body: "npm:2.5.1"
+    raw-body: "npm:2.5.2"
     type-is: "npm:~1.6.18"
     unpipe: "npm:1.0.0"
-  checksum: a202d493e2c10a33fb7413dac7d2f713be579c4b88343cd814b6df7a38e5af1901fc31044e04de176db56b16d9772aa25a7723f64478c20f4d91b1ac223bf3b8
+  checksum: 10c0/06f1438fff388a2e2354c96aa3ea8147b79bfcb1262dfcc2aae68ec13723d01d5781680657b74e9f83c808266d5baf52804032fbde2b7382b89bd8cdb273ace9
   languageName: node
   linkType: hard
 
@@ -5070,23 +5530,14 @@ __metadata:
     dns-txt: "npm:^2.0.2"
     multicast-dns: "npm:^6.0.1"
     multicast-dns-service-types: "npm:^1.1.0"
-  checksum: 0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241
+  checksum: 10c0/0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241
   languageName: node
   linkType: hard
 
 "boolbase@npm:^1.0.0, boolbase@npm:~1.0.0":
   version: 1.0.0
   resolution: "boolbase@npm:1.0.0"
-  checksum: e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf
-  languageName: node
-  linkType: hard
-
-"bplist-parser@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "bplist-parser@npm:0.2.0"
-  dependencies:
-    big-integer: "npm:^1.6.44"
-  checksum: ce79c69e0f6efe506281e7c84e3712f7d12978991675b6e3a58a295b16f13ca81aa9b845c335614a545e0af728c8311b6aa3142af76ba1cb616af9bbac5c4a9f
+  checksum: 10c0/e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf
   languageName: node
   linkType: hard
 
@@ -5096,7 +5547,7 @@ __metadata:
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
   languageName: node
   linkType: hard
 
@@ -5105,7 +5556,7 @@ __metadata:
   resolution: "brace-expansion@npm:2.0.1"
   dependencies:
     balanced-match: "npm:^1.0.0"
-  checksum: b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
   languageName: node
   linkType: hard
 
@@ -5123,7 +5574,7 @@ __metadata:
     snapdragon-node: "npm:^2.0.1"
     split-string: "npm:^3.0.2"
     to-regex: "npm:^3.0.1"
-  checksum: 72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728
+  checksum: 10c0/72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728
   languageName: node
   linkType: hard
 
@@ -5132,14 +5583,14 @@ __metadata:
   resolution: "braces@npm:3.0.2"
   dependencies:
     fill-range: "npm:^7.0.1"
-  checksum: 321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
   languageName: node
   linkType: hard
 
 "brorand@npm:^1.0.1, brorand@npm:^1.1.0":
   version: 1.1.0
   resolution: "brorand@npm:1.1.0"
-  checksum: 6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571
+  checksum: 10c0/6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571
   languageName: node
   linkType: hard
 
@@ -5153,7 +5604,7 @@ __metadata:
     evp_bytestokey: "npm:^1.0.3"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
-  checksum: 967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18
+  checksum: 10c0/967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18
   languageName: node
   linkType: hard
 
@@ -5164,7 +5615,7 @@ __metadata:
     browserify-aes: "npm:^1.0.4"
     browserify-des: "npm:^1.0.0"
     evp_bytestokey: "npm:^1.0.0"
-  checksum: aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d
+  checksum: 10c0/aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d
   languageName: node
   linkType: hard
 
@@ -5176,7 +5627,7 @@ __metadata:
     des.js: "npm:^1.0.0"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: 943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d
+  checksum: 10c0/943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d
   languageName: node
   linkType: hard
 
@@ -5186,7 +5637,7 @@ __metadata:
   dependencies:
     bn.js: "npm:^5.0.0"
     randombytes: "npm:^2.0.1"
-  checksum: fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a
+  checksum: 10c0/fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a
   languageName: node
   linkType: hard
 
@@ -5203,7 +5654,7 @@ __metadata:
     parse-asn1: "npm:^5.1.5"
     readable-stream: "npm:^3.6.0"
     safe-buffer: "npm:^5.2.0"
-  checksum: 8f00a370e3e97060977dc58e51251d3ca398ee73523994a44430321e8de2c7d85395362d59014b2b07efe4190f369baee2ff28eb8f405ff4660b776651cf052d
+  checksum: 10c0/8f00a370e3e97060977dc58e51251d3ca398ee73523994a44430321e8de2c7d85395362d59014b2b07efe4190f369baee2ff28eb8f405ff4660b776651cf052d
   languageName: node
   linkType: hard
 
@@ -5212,21 +5663,21 @@ __metadata:
   resolution: "browserify-zlib@npm:0.2.0"
   dependencies:
     pako: "npm:~1.0.5"
-  checksum: 9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9
+  checksum: 10c0/9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
-  version: 4.22.2
-  resolution: "browserslist@npm:4.22.2"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "browserslist@npm:4.23.0"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001565"
-    electron-to-chromium: "npm:^1.4.601"
+    caniuse-lite: "npm:^1.0.30001587"
+    electron-to-chromium: "npm:^1.4.668"
     node-releases: "npm:^2.0.14"
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465
+  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
   languageName: node
   linkType: hard
 
@@ -5235,35 +5686,28 @@ __metadata:
   resolution: "bser@npm:2.1.1"
   dependencies:
     node-int64: "npm:^0.4.0"
-  checksum: 24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
+  checksum: 10c0/24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
   languageName: node
   linkType: hard
 
 "buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
-  checksum: 124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
+  checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
   languageName: node
   linkType: hard
 
 "buffer-indexof@npm:^1.0.0":
   version: 1.1.1
   resolution: "buffer-indexof@npm:1.1.1"
-  checksum: 67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae
-  languageName: node
-  linkType: hard
-
-"buffer-writer@npm:2.0.0":
-  version: 2.0.0
-  resolution: "buffer-writer@npm:2.0.0"
-  checksum: c91b2ab09a200cf0862237e5a4dbd5077003b42d26d4f0c596ec7149f82ef83e0751d670bcdf379ed988d1a08c0fac7759a8cb928cf1a4710a1988a7618b1190
+  checksum: 10c0/67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae
   languageName: node
   linkType: hard
 
 "buffer-xor@npm:^1.0.3":
   version: 1.0.3
   resolution: "buffer-xor@npm:1.0.3"
-  checksum: fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c
+  checksum: 10c0/fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c
   languageName: node
   linkType: hard
 
@@ -5274,7 +5718,7 @@ __metadata:
     base64-js: "npm:^1.0.2"
     ieee754: "npm:^1.1.4"
     isarray: "npm:^1.0.0"
-  checksum: dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21
+  checksum: 10c0/dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21
   languageName: node
   linkType: hard
 
@@ -5284,7 +5728,7 @@ __metadata:
   dependencies:
     base64-js: "npm:^1.3.1"
     ieee754: "npm:^1.2.1"
-  checksum: 2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
+  checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
   languageName: node
   linkType: hard
 
@@ -5294,44 +5738,35 @@ __metadata:
   dependencies:
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.3.0"
-  checksum: 36cdc5b53a38d9f61f89fdbe62029a2ebcd020599862253fefebe31566155726df9ff961f41b8c97b02b4c12b391ef97faf94e2383392654cf8f0ed68f76e47c
+  checksum: 10c0/36cdc5b53a38d9f61f89fdbe62029a2ebcd020599862253fefebe31566155726df9ff961f41b8c97b02b4c12b391ef97faf94e2383392654cf8f0ed68f76e47c
   languageName: node
   linkType: hard
 
-"builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
+"builtin-modules@npm:^3.3.0":
   version: 3.3.0
   resolution: "builtin-modules@npm:3.3.0"
-  checksum: 2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
+  checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
   languageName: node
   linkType: hard
 
 "builtin-status-codes@npm:^3.0.0":
   version: 3.0.0
   resolution: "builtin-status-codes@npm:3.0.0"
-  checksum: c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c
-  languageName: node
-  linkType: hard
-
-"bundle-name@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "bundle-name@npm:3.0.0"
-  dependencies:
-    run-applescript: "npm:^5.0.0"
-  checksum: 57bc7f8b025d83961b04db2f1eff6a87f2363c2891f3542a4b82471ff8ebb5d484af48e9784fcdb28ef1d48bb01f03d891966dc3ef58758e46ea32d750ce40f8
+  checksum: 10c0/c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c
   languageName: node
   linkType: hard
 
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
-  checksum: 91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60
+  checksum: 10c0/91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60
   languageName: node
   linkType: hard
 
 "bytes@npm:3.1.2":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
-  checksum: 76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
+  checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
   languageName: node
   linkType: hard
 
@@ -5357,7 +5792,7 @@ __metadata:
     ssri: "npm:^8.0.1"
     tar: "npm:^6.0.2"
     unique-filename: "npm:^1.1.1"
-  checksum: 886fcc0acc4f6fd5cd142d373d8276267bc6d655d7c4ce60726fbbec10854de3395ee19bbf9e7e73308cdca9fdad0ad55060ff3bd16c6d4165c5b8d21515e1d8
+  checksum: 10c0/886fcc0acc4f6fd5cd142d373d8276267bc6d655d7c4ce60726fbbec10854de3395ee19bbf9e7e73308cdca9fdad0ad55060ff3bd16c6d4165c5b8d21515e1d8
   languageName: node
   linkType: hard
 
@@ -5377,7 +5812,7 @@ __metadata:
     ssri: "npm:^10.0.0"
     tar: "npm:^6.1.11"
     unique-filename: "npm:^3.0.0"
-  checksum: e359823778d712ad365740cef3f488d4f74c62cc79be5935896d9597a7d81033e50c54c15898fa9cc018620879307ab30d1dddc476ae705bfd5b29c145ae6938
+  checksum: 10c0/e359823778d712ad365740cef3f488d4f74c62cc79be5935896d9597a7d81033e50c54c15898fa9cc018620879307ab30d1dddc476ae705bfd5b29c145ae6938
   languageName: node
   linkType: hard
 
@@ -5394,39 +5829,41 @@ __metadata:
     to-object-path: "npm:^0.3.0"
     union-value: "npm:^1.0.0"
     unset-value: "npm:^1.0.0"
-  checksum: a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c
+  checksum: 10c0/a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "call-bind@npm:1.0.5"
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
   dependencies:
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
     function-bind: "npm:^1.1.2"
-    get-intrinsic: "npm:^1.2.1"
-    set-function-length: "npm:^1.1.1"
-  checksum: a6172c168fd6dacf744fcde745099218056bd755c50415b592655dcd6562157ed29f130f56c3f6db2250f67e4bd62e5c218cdc56d7bfd76e0bda50770fce2d10
+    get-intrinsic: "npm:^1.2.4"
+    set-function-length: "npm:^1.2.1"
+  checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d
   languageName: node
   linkType: hard
 
 "callsites@npm:^3.0.0":
   version: 3.1.0
   resolution: "callsites@npm:3.1.0"
-  checksum: fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
+  checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
   languageName: node
   linkType: hard
 
 "camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
-  checksum: 92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
+  checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
   languageName: node
   linkType: hard
 
 "camelcase@npm:^6.2.0":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
-  checksum: 0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
+  checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
   languageName: node
   linkType: hard
 
@@ -5438,21 +5875,21 @@ __metadata:
     caniuse-lite: "npm:^1.0.0"
     lodash.memoize: "npm:^4.1.2"
     lodash.uniq: "npm:^4.5.0"
-  checksum: 60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c
+  checksum: 10c0/60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
-  version: 1.0.30001568
-  resolution: "caniuse-lite@npm:1.0.30001568"
-  checksum: 13f01e5a2481134bd61cf565ce9fecbd8e107902927a0dcf534230a92191a81f1715792170f5f39719c767c3a96aa6df9917a8d5601f15bbd5e4041a8cfecc99
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
+  version: 1.0.30001599
+  resolution: "caniuse-lite@npm:1.0.30001599"
+  checksum: 10c0/8b3b9610b5be88533a3c8d0770d6896f7b1a9fee3dbeb7339e4ee119a514c81e5e07a628a5a289a6541ca291ac78a9402f5a99cf6012139e91f379083488a8eb
   languageName: node
   linkType: hard
 
 "chalk@npm:5.3.0":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
-  checksum: 8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
+  checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09
   languageName: node
   linkType: hard
 
@@ -5463,7 +5900,7 @@ __metadata:
     ansi-styles: "npm:^3.2.1"
     escape-string-regexp: "npm:^1.0.5"
     supports-color: "npm:^5.3.0"
-  checksum: e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
+  checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
   languageName: node
   linkType: hard
 
@@ -5473,7 +5910,7 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^4.1.0"
     supports-color: "npm:^7.1.0"
-  checksum: ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
+  checksum: 10c0/ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
   languageName: node
   linkType: hard
 
@@ -5483,14 +5920,14 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^4.1.0"
     supports-color: "npm:^7.1.0"
-  checksum: 4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
+  checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
   languageName: node
   linkType: hard
 
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
-  checksum: 57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
+  checksum: 10c0/57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
   languageName: node
   linkType: hard
 
@@ -5509,7 +5946,7 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1
+  checksum: 10c0/1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1
   languageName: node
   linkType: hard
 
@@ -5532,28 +5969,28 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7
+  checksum: 10c0/5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7
   languageName: node
   linkType: hard
 
 "chownr@npm:^2.0.0":
   version: 2.0.0
   resolution: "chownr@npm:2.0.0"
-  checksum: 594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
   languageName: node
   linkType: hard
 
 "chrome-trace-event@npm:^1.0.2":
   version: 1.0.3
   resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: 080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
+  checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
   languageName: node
   linkType: hard
 
 "ci-info@npm:^3.2.0":
   version: 3.9.0
   resolution: "ci-info@npm:3.9.0"
-  checksum: 6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
+  checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
   languageName: node
   linkType: hard
 
@@ -5563,7 +6000,7 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
-  checksum: d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b
+  checksum: 10c0/d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b
   languageName: node
   linkType: hard
 
@@ -5572,14 +6009,14 @@ __metadata:
   resolution: "circular-dependency-plugin@npm:5.2.2"
   peerDependencies:
     webpack: ">=4.0.1"
-  checksum: a2227a7d76c6110f818d364d280406d9dc79c99f7d18f7c643b0a72a2694399195e68ace32115b2bb2da6e53328fda0cadd4fa9535dd67c884567daa3e5a9560
+  checksum: 10c0/a2227a7d76c6110f818d364d280406d9dc79c99f7d18f7c643b0a72a2694399195e68ace32115b2bb2da6e53328fda0cadd4fa9535dd67c884567daa3e5a9560
   languageName: node
   linkType: hard
 
 "cjs-module-lexer@npm:^1.0.0":
   version: 1.2.3
   resolution: "cjs-module-lexer@npm:1.2.3"
-  checksum: 0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
+  checksum: 10c0/0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
   languageName: node
   linkType: hard
 
@@ -5591,21 +6028,21 @@ __metadata:
     define-property: "npm:^0.2.5"
     isobject: "npm:^3.0.0"
     static-extend: "npm:^0.1.1"
-  checksum: d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42
+  checksum: 10c0/d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42
   languageName: node
   linkType: hard
 
 "classnames@npm:^2.2.5, classnames@npm:^2.3.2":
   version: 2.5.1
   resolution: "classnames@npm:2.5.1"
-  checksum: afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
+  checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
   languageName: node
   linkType: hard
 
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
-  checksum: 1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
+  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
   languageName: node
   linkType: hard
 
@@ -5614,7 +6051,7 @@ __metadata:
   resolution: "cli-cursor@npm:4.0.0"
   dependencies:
     restore-cursor: "npm:^4.0.0"
-  checksum: e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
+  checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c
   languageName: node
   linkType: hard
 
@@ -5624,7 +6061,7 @@ __metadata:
   dependencies:
     slice-ansi: "npm:^5.0.0"
     string-width: "npm:^7.0.0"
-  checksum: d7f0b73e3d9b88cb496e6c086df7410b541b56a43d18ade6a573c9c18bd001b1c3fba1ad578f741a4218fdc794d042385f8ac02c25e1c295a2d8b9f3cb86eb4c
+  checksum: 10c0/d7f0b73e3d9b88cb496e6c086df7410b541b56a43d18ade6a573c9c18bd001b1c3fba1ad578f741a4218fdc794d042385f8ac02c25e1c295a2d8b9f3cb86eb4c
   languageName: node
   linkType: hard
 
@@ -5635,7 +6072,7 @@ __metadata:
     string-width: "npm:^3.1.0"
     strip-ansi: "npm:^5.2.0"
     wrap-ansi: "npm:^5.1.0"
-  checksum: 76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8
+  checksum: 10c0/76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8
   languageName: node
   linkType: hard
 
@@ -5646,7 +6083,7 @@ __metadata:
     string-width: "npm:^4.2.0"
     strip-ansi: "npm:^6.0.1"
     wrap-ansi: "npm:^7.0.0"
-  checksum: 4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
+  checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
   languageName: node
   linkType: hard
 
@@ -5657,21 +6094,21 @@ __metadata:
     is-plain-object: "npm:^2.0.4"
     kind-of: "npm:^6.0.2"
     shallow-clone: "npm:^3.0.0"
-  checksum: 637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
+  checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
   languageName: node
   linkType: hard
 
 "cluster-key-slot@npm:^1.1.0":
   version: 1.1.2
   resolution: "cluster-key-slot@npm:1.1.2"
-  checksum: d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3
+  checksum: 10c0/d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3
   languageName: node
   linkType: hard
 
 "co@npm:^4.6.0":
   version: 4.6.0
   resolution: "co@npm:4.6.0"
-  checksum: c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
+  checksum: 10c0/c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
   languageName: node
   linkType: hard
 
@@ -5682,21 +6119,21 @@ __metadata:
     "@types/q": "npm:^1.5.1"
     chalk: "npm:^2.4.1"
     q: "npm:^1.1.2"
-  checksum: 0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43
+  checksum: 10c0/0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43
   languageName: node
   linkType: hard
 
 "cocoon-js-vanilla@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "cocoon-js-vanilla@npm:1.3.0"
-  checksum: 12adec293ba625c608518ef504c24f4b5906873713092e55d28343dd12fbc9ab7940d8c2bbe02a320bd56120d3768ae90a8d8bc5a6a82e604a56c216b66027e1
+  version: 1.5.1
+  resolution: "cocoon-js-vanilla@npm:1.5.1"
+  checksum: 10c0/0449084ef5864fc4159aa127592995657224bfcec6b7fd6270f2f9af545fc711e7ddbeb673a7cafc9dc0985be4c20b76ba413905fcaeddc3c6f6a5397d80cdd6
   languageName: node
   linkType: hard
 
 "collect-v8-coverage@npm:^1.0.0":
   version: 1.0.2
   resolution: "collect-v8-coverage@npm:1.0.2"
-  checksum: ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
+  checksum: 10c0/ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
   languageName: node
   linkType: hard
 
@@ -5706,14 +6143,14 @@ __metadata:
   dependencies:
     map-visit: "npm:^1.0.0"
     object-visit: "npm:^1.0.0"
-  checksum: add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a
+  checksum: 10c0/add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a
   languageName: node
   linkType: hard
 
 "color-blend@npm:^4.0.0":
   version: 4.0.0
   resolution: "color-blend@npm:4.0.0"
-  checksum: d046f3b017e7b0e70a130e49f4bfb2867ebf41d7cf1e816bd6cbcf1c492cdbb795b204743ce099ebe3fa17d9b24114555ce174d211c741e06bf7db91a633ab24
+  checksum: 10c0/d046f3b017e7b0e70a130e49f4bfb2867ebf41d7cf1e816bd6cbcf1c492cdbb795b204743ce099ebe3fa17d9b24114555ce174d211c741e06bf7db91a633ab24
   languageName: node
   linkType: hard
 
@@ -5722,7 +6159,7 @@ __metadata:
   resolution: "color-convert@npm:1.9.3"
   dependencies:
     color-name: "npm:1.1.3"
-  checksum: 5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
+  checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
   languageName: node
   linkType: hard
 
@@ -5731,51 +6168,42 @@ __metadata:
   resolution: "color-convert@npm:2.0.1"
   dependencies:
     color-name: "npm:~1.1.4"
-  checksum: 37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
   languageName: node
   linkType: hard
 
 "color-name@npm:1.1.3":
   version: 1.1.3
   resolution: "color-name@npm:1.1.3"
-  checksum: 566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
+  checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
   languageName: node
   linkType: hard
 
 "color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
-  checksum: a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
   languageName: node
   linkType: hard
 
-"color-support@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "color-support@npm:1.1.3"
-  bin:
-    color-support: bin.js
-  checksum: 8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6
-  languageName: node
-  linkType: hard
-
-"colord@npm:^2.9.1, colord@npm:^2.9.3":
+"colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
-  checksum: 9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
+  checksum: 10c0/9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.20":
+"colorette@npm:^2.0.20, colorette@npm:^2.0.7":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
-  checksum: e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
+  checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
   languageName: node
   linkType: hard
 
 "colors@npm:^1.4.0":
   version: 1.4.0
   resolution: "colors@npm:1.4.0"
-  checksum: 9af357c019da3c5a098a301cf64e3799d27549d8f185d86f79af23069e4f4303110d115da98483519331f6fb71c8568d5688fa1c6523600044fd4a54e97c4efb
+  checksum: 10c0/9af357c019da3c5a098a301cf64e3799d27549d8f185d86f79af23069e4f4303110d115da98483519331f6fb71c8568d5688fa1c6523600044fd4a54e97c4efb
   languageName: node
   linkType: hard
 
@@ -5784,56 +6212,56 @@ __metadata:
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
     delayed-stream: "npm:~1.0.0"
-  checksum: 0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
+  checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
   languageName: node
   linkType: hard
 
 "commander@npm:11.1.0":
   version: 11.1.0
   resolution: "commander@npm:11.1.0"
-  checksum: 13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
+  checksum: 10c0/13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179
   languageName: node
   linkType: hard
 
 "commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
-  checksum: 74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
+  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
   languageName: node
   linkType: hard
 
 "commander@npm:^7.2.0":
   version: 7.2.0
   resolution: "commander@npm:7.2.0"
-  checksum: 8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
+  checksum: 10c0/8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
   languageName: node
   linkType: hard
 
 "comment-parser@npm:1.4.1":
   version: 1.4.1
   resolution: "comment-parser@npm:1.4.1"
-  checksum: d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd
+  checksum: 10c0/d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd
   languageName: node
   linkType: hard
 
 "common-tags@npm:^1.8.0":
   version: 1.8.2
   resolution: "common-tags@npm:1.8.2"
-  checksum: 23efe47ff0a1a7c91489271b3a1e1d2a171c12ec7f9b35b29b2fce51270124aff0ec890087e2bc2182c1cb746e232ab7561aaafe05f1e7452aea733d2bfe3f63
+  checksum: 10c0/23efe47ff0a1a7c91489271b3a1e1d2a171c12ec7f9b35b29b2fce51270124aff0ec890087e2bc2182c1cb746e232ab7561aaafe05f1e7452aea733d2bfe3f63
   languageName: node
   linkType: hard
 
 "commondir@npm:^1.0.1":
   version: 1.0.1
   resolution: "commondir@npm:1.0.1"
-  checksum: 33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6
+  checksum: 10c0/33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6
   languageName: node
   linkType: hard
 
 "component-emitter@npm:^1.2.1":
   version: 1.3.0
   resolution: "component-emitter@npm:1.3.0"
-  checksum: 68774a0a3754fb6c0ba53c2e88886dfbd0c773931066abb1d7fd1b0c893b2a838d8f088ab4dca1f18cc1a4fc2e6932019eba3ded2d931b5ba2241ce40e93a24f
+  checksum: 10c0/68774a0a3754fb6c0ba53c2e88886dfbd0c773931066abb1d7fd1b0c893b2a838d8f088ab4dca1f18cc1a4fc2e6932019eba3ded2d931b5ba2241ce40e93a24f
   languageName: node
   linkType: hard
 
@@ -5842,7 +6270,7 @@ __metadata:
   resolution: "compressible@npm:2.0.18"
   dependencies:
     mime-db: "npm:>= 1.43.0 < 2"
-  checksum: 8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7
+  checksum: 10c0/8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7
   languageName: node
   linkType: hard
 
@@ -5857,7 +6285,7 @@ __metadata:
     webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e
+  checksum: 10c0/966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e
   languageName: node
   linkType: hard
 
@@ -5872,42 +6300,35 @@ __metadata:
     on-headers: "npm:~1.0.2"
     safe-buffer: "npm:5.1.2"
     vary: "npm:~1.1.2"
-  checksum: 138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc
+  checksum: 10c0/138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc
   languageName: node
   linkType: hard
 
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
-  checksum: c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
+  checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
   languageName: node
   linkType: hard
 
 "connect-history-api-fallback@npm:^1.6.0":
   version: 1.6.0
   resolution: "connect-history-api-fallback@npm:1.6.0"
-  checksum: 6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
+  checksum: 10c0/6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
   languageName: node
   linkType: hard
 
 "console-browserify@npm:^1.1.0":
   version: 1.2.0
   resolution: "console-browserify@npm:1.2.0"
-  checksum: 89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226
-  languageName: node
-  linkType: hard
-
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50
+  checksum: 10c0/89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226
   languageName: node
   linkType: hard
 
 "constants-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
-  checksum: ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5
+  checksum: 10c0/ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5
   languageName: node
   linkType: hard
 
@@ -5916,79 +6337,79 @@ __metadata:
   resolution: "content-disposition@npm:0.5.4"
   dependencies:
     safe-buffer: "npm:5.2.1"
-  checksum: bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
+  checksum: 10c0/bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
   languageName: node
   linkType: hard
 
-"content-type@npm:~1.0.4":
+"content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
-  checksum: b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
+  checksum: 10c0/b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
   languageName: node
   linkType: hard
 
 "convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0":
   version: 1.9.0
   resolution: "convert-source-map@npm:1.9.0"
-  checksum: 281da55454bf8126cbc6625385928c43479f2060984180c42f3a86c8b8c12720a24eac260624a7d1e090004028d2dee78602330578ceec1a08e27cb8bb0a8a5b
+  checksum: 10c0/281da55454bf8126cbc6625385928c43479f2060984180c42f3a86c8b8c12720a24eac260624a7d1e090004028d2dee78602330578ceec1a08e27cb8bb0a8a5b
   languageName: node
   linkType: hard
 
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
-  checksum: 8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
+  checksum: 10c0/8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
   languageName: node
   linkType: hard
 
 "cookie-signature@npm:1.0.6":
   version: 1.0.6
   resolution: "cookie-signature@npm:1.0.6"
-  checksum: b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221
+  checksum: 10c0/b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221
   languageName: node
   linkType: hard
 
-"cookie@npm:0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+"cookie@npm:0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686
   languageName: node
   linkType: hard
 
 "copy-descriptor@npm:^0.1.0":
   version: 0.1.1
   resolution: "copy-descriptor@npm:0.1.1"
-  checksum: 161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181
+  checksum: 10c0/161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
-  version: 3.35.0
-  resolution: "core-js-compat@npm:3.35.0"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
+  version: 3.36.1
+  resolution: "core-js-compat@npm:3.36.1"
   dependencies:
-    browserslist: "npm:^4.22.2"
-  checksum: 8c4379240b8decb94b21e81d5ba6f768418721061923b28c9dfc97574680c35d778d39c010207402fc7c8308a68a4cf6d5e02bcbcb96e931c52e6e0dce29a68c
+    browserslist: "npm:^4.23.0"
+  checksum: 10c0/70fba18a4095cd8ac04e5ba8cee251e328935859cf2851c1f67770068ea9f9fe71accb1b7de17cd3c9a28d304a4c41712bd9aa895110ebb6e3be71b666b029d1
   languageName: node
   linkType: hard
 
 "core-js@npm:^2.5.0":
   version: 2.6.12
   resolution: "core-js@npm:2.6.12"
-  checksum: 00128efe427789120a06b819adc94cc72b96955acb331cb71d09287baf9bd37bebd191d91f1ee4939c893a050307ead4faea08876f09115112612b6a05684b63
+  checksum: 10c0/00128efe427789120a06b819adc94cc72b96955acb331cb71d09287baf9bd37bebd191d91f1ee4939c893a050307ead4faea08876f09115112612b6a05684b63
   languageName: node
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.35.0
-  resolution: "core-js@npm:3.35.0"
-  checksum: 1d545ff4406f2afa5e681f44b45ed5f7f119d158b380234d5aa7787ce7e47fc7a635b98b74c28c766ba8191e3db8c2316ad6ab4ff1ddecbc3fd618413a52c29c
+  version: 3.37.1
+  resolution: "core-js@npm:3.37.1"
+  checksum: 10c0/440eb51a7a39128a320225fe349f870a3641b96c9ecd26470227db730ef8c161ea298eaea621db66ec0ff622a85299efb4e23afebf889c0a1748616102307675
   languageName: node
   linkType: hard
 
 "core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
-  checksum: 90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
+  checksum: 10c0/90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
   languageName: node
   linkType: hard
 
@@ -5998,7 +6419,7 @@ __metadata:
   dependencies:
     object-assign: "npm:^4"
     vary: "npm:^1"
-  checksum: 373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
+  checksum: 10c0/373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
   languageName: node
   linkType: hard
 
@@ -6011,7 +6432,7 @@ __metadata:
     parse-json: "npm:^5.0.0"
     path-type: "npm:^4.0.0"
     yaml: "npm:^1.10.0"
-  checksum: b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03
+  checksum: 10c0/b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03
   languageName: node
   linkType: hard
 
@@ -6028,7 +6449,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee
+  checksum: 10c0/1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee
   languageName: node
   linkType: hard
 
@@ -6038,7 +6459,7 @@ __metadata:
   dependencies:
     bn.js: "npm:^4.1.0"
     elliptic: "npm:^6.5.3"
-  checksum: 77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f
+  checksum: 10c0/77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f
   languageName: node
   linkType: hard
 
@@ -6051,7 +6472,7 @@ __metadata:
     md5.js: "npm:^1.3.4"
     ripemd160: "npm:^2.0.1"
     sha.js: "npm:^2.4.0"
-  checksum: d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915
+  checksum: 10c0/d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915
   languageName: node
   linkType: hard
 
@@ -6065,7 +6486,7 @@ __metadata:
     ripemd160: "npm:^2.0.0"
     safe-buffer: "npm:^5.0.1"
     sha.js: "npm:^2.4.8"
-  checksum: 24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835
+  checksum: 10c0/24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835
   languageName: node
   linkType: hard
 
@@ -6082,7 +6503,7 @@ __metadata:
     prompts: "npm:^2.0.1"
   bin:
     create-jest: bin/create-jest.js
-  checksum: e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
+  checksum: 10c0/e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
   languageName: node
   linkType: hard
 
@@ -6094,7 +6515,7 @@ __metadata:
   bin:
     cross-env: src/bin/cross-env.js
     cross-env-shell: src/bin/cross-env-shell.js
-  checksum: f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
+  checksum: 10c0/f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
   languageName: node
   linkType: hard
 
@@ -6107,7 +6528,7 @@ __metadata:
     semver: "npm:^5.5.0"
     shebang-command: "npm:^1.2.0"
     which: "npm:^1.2.9"
-  checksum: e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012
+  checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012
   languageName: node
   linkType: hard
 
@@ -6118,7 +6539,7 @@ __metadata:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: 5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
   languageName: node
   linkType: hard
 
@@ -6137,30 +6558,63 @@ __metadata:
     public-encrypt: "npm:^4.0.0"
     randombytes: "npm:^2.0.0"
     randomfill: "npm:^1.0.3"
-  checksum: 0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92
+  checksum: 10c0/0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92
   languageName: node
   linkType: hard
 
 "crypto-random-string@npm:^2.0.0":
   version: 2.0.0
   resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37
+  checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "css-declaration-sorter@npm:7.1.1"
+"css-blank-pseudo@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "css-blank-pseudo@npm:6.0.2"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/609303551c2a518ca23ed12fed43945ca4f7af04140da68a5536f5dc9d42f33412c13ac3fe5c616d7401a9e13a23d80b4cfa87149a45f94b244d8067bb11f3dd
+  languageName: node
+  linkType: hard
+
+"css-box-model@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "css-box-model@npm:1.2.1"
+  dependencies:
+    tiny-invariant: "npm:^1.0.6"
+  checksum: 10c0/611e56d76b16e4e21956ed9fa53f1936fbbfaccd378659587e9c929f342037fc6c062f8af9447226e11fe7c95e31e6c007a37e592f9bff4c2d40e6915553104a
+  languageName: node
+  linkType: hard
+
+"css-declaration-sorter@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "css-declaration-sorter@npm:7.2.0"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
+  checksum: 10c0/d8516be94f8f2daa233ef021688b965c08161624cbf830a4d7ee1099429437c0ee124d35c91b1c659cfd891a68e8888aa941726dab12279bc114aaed60a94606
   languageName: node
   linkType: hard
 
-"css-functions-list@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "css-functions-list@npm:3.2.1"
-  checksum: e6e2d9580437ad6df9f2cf18cff3f941691ec5cbbaebd4cb17a5da40d8d5dac50004807ddd05c00a121d2f21a224e2c5d339fe8e13614af21c00181d7d1c22b9
+"css-functions-list@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "css-functions-list@npm:3.2.2"
+  checksum: 10c0/8638a63d0cf1bdc50d4a752ec1c94a57e9953c3b03eace4f5526db20bec3c061e95089f905dbb4999c44b9780ce777ba856967560f6d15119a303f6030901c10
+  languageName: node
+  linkType: hard
+
+"css-has-pseudo@npm:^6.0.5":
+  version: 6.0.5
+  resolution: "css-has-pseudo@npm:6.0.5"
+  dependencies:
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    postcss-selector-parser: "npm:^6.0.13"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9
   languageName: node
   linkType: hard
 
@@ -6180,14 +6634,23 @@ __metadata:
     semver: "npm:^7.3.5"
   peerDependencies:
     webpack: ^4.27.0 || ^5.0.0
-  checksum: 02fbdb0dca92e4a4d2aa27b2817ea51d0af3d662d3295c61f2aa37537b29f9a46a9c2e87d8f5e40a1a97159f35d5c7b9a325f27761b59a38c8e15e8ca3988d2b
+  checksum: 10c0/02fbdb0dca92e4a4d2aa27b2817ea51d0af3d662d3295c61f2aa37537b29f9a46a9c2e87d8f5e40a1a97159f35d5c7b9a325f27761b59a38c8e15e8ca3988d2b
+  languageName: node
+  linkType: hard
+
+"css-prefers-color-scheme@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "css-prefers-color-scheme@npm:9.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b94da00d84c4ebb56eb8fce96d4fdb20d2e622a7cd8cd6d7b87d1d2b718a55ce88bccc9d871771bfe77c5107de06132ba87190e3656f049e45f19f652d50136c
   languageName: node
   linkType: hard
 
 "css-select-base-adapter@npm:^0.1.1":
   version: 0.1.1
   resolution: "css-select-base-adapter@npm:0.1.1"
-  checksum: 17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc
+  checksum: 10c0/17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc
   languageName: node
   linkType: hard
 
@@ -6199,7 +6662,7 @@ __metadata:
     css-what: "npm:^3.2.1"
     domutils: "npm:^1.7.0"
     nth-check: "npm:^1.0.2"
-  checksum: 47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7
+  checksum: 10c0/47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7
   languageName: node
   linkType: hard
 
@@ -6212,7 +6675,7 @@ __metadata:
     domhandler: "npm:^5.0.2"
     domutils: "npm:^3.0.1"
     nth-check: "npm:^2.0.1"
-  checksum: 551c60dba5b54054741032c1793b5734f6ba45e23ae9e82761a3c0ed1acbb8cfedfa443aaba3a3c1a54cac12b456d2012a09d2cd5f0e82e430454c1b9d84d500
+  checksum: 10c0/551c60dba5b54054741032c1793b5734f6ba45e23ae9e82761a3c0ed1acbb8cfedfa443aaba3a3c1a54cac12b456d2012a09d2cd5f0e82e430454c1b9d84d500
   languageName: node
   linkType: hard
 
@@ -6222,7 +6685,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.4"
     source-map: "npm:^0.6.1"
-  checksum: 8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8
+  checksum: 10c0/8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8
   languageName: node
   linkType: hard
 
@@ -6232,7 +6695,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.14"
     source-map: "npm:^0.6.1"
-  checksum: 499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c
+  checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c
   languageName: node
   linkType: hard
 
@@ -6242,7 +6705,7 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.30"
     source-map-js: "npm:^1.0.1"
-  checksum: 6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24
+  checksum: 10c0/6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24
   languageName: node
   linkType: hard
 
@@ -6252,28 +6715,35 @@ __metadata:
   dependencies:
     mdn-data: "npm:2.0.28"
     source-map-js: "npm:^1.0.1"
-  checksum: 47e87b0f02f8ac22f57eceb65c58011dd142d2158128882a0bf963cf2eabb81a4ebbc2e3790c8289be7919fa8b83750c7b69272bd66772c708143b772ba3c186
+  checksum: 10c0/47e87b0f02f8ac22f57eceb65c58011dd142d2158128882a0bf963cf2eabb81a4ebbc2e3790c8289be7919fa8b83750c7b69272bd66772c708143b772ba3c186
   languageName: node
   linkType: hard
 
 "css-what@npm:^3.2.1":
   version: 3.4.2
   resolution: "css-what@npm:3.4.2"
-  checksum: 454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf
+  checksum: 10c0/454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf
   languageName: node
   linkType: hard
 
 "css-what@npm:^6.1.0":
   version: 6.1.0
   resolution: "css-what@npm:6.1.0"
-  checksum: a09f5a6b14ba8dcf57ae9a59474722e80f20406c53a61e9aedb0eedc693b135113ffe2983f4efc4b5065ae639442e9ae88df24941ef159c218b231011d733746
+  checksum: 10c0/a09f5a6b14ba8dcf57ae9a59474722e80f20406c53a61e9aedb0eedc693b135113ffe2983f4efc4b5065ae639442e9ae88df24941ef159c218b231011d733746
   languageName: node
   linkType: hard
 
 "css.escape@npm:^1.5.1":
   version: 1.5.1
   resolution: "css.escape@npm:1.5.1"
-  checksum: 5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
+  checksum: 10c0/5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
+  languageName: node
+  linkType: hard
+
+"cssdb@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "cssdb@npm:8.0.0"
+  checksum: 10c0/d9a31b760214624352000b16a8f7194c357f66b6c445e663ab58dd03b6f0f53efaaca6d6f96200d666e205894d2d1c346664ad993d9522ff9fc1c331804a8d62
   languageName: node
   linkType: hard
 
@@ -6282,67 +6752,68 @@ __metadata:
   resolution: "cssesc@npm:3.0.0"
   bin:
     cssesc: bin/cssesc
-  checksum: 6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
+  checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "cssnano-preset-default@npm:6.0.3"
+"cssnano-preset-default@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "cssnano-preset-default@npm:7.0.1"
   dependencies:
-    css-declaration-sorter: "npm:^7.1.1"
-    cssnano-utils: "npm:^4.0.1"
-    postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.0.2"
-    postcss-convert-values: "npm:^6.0.2"
-    postcss-discard-comments: "npm:^6.0.1"
-    postcss-discard-duplicates: "npm:^6.0.1"
-    postcss-discard-empty: "npm:^6.0.1"
-    postcss-discard-overridden: "npm:^6.0.1"
-    postcss-merge-longhand: "npm:^6.0.2"
-    postcss-merge-rules: "npm:^6.0.3"
-    postcss-minify-font-values: "npm:^6.0.1"
-    postcss-minify-gradients: "npm:^6.0.1"
-    postcss-minify-params: "npm:^6.0.2"
-    postcss-minify-selectors: "npm:^6.0.2"
-    postcss-normalize-charset: "npm:^6.0.1"
-    postcss-normalize-display-values: "npm:^6.0.1"
-    postcss-normalize-positions: "npm:^6.0.1"
-    postcss-normalize-repeat-style: "npm:^6.0.1"
-    postcss-normalize-string: "npm:^6.0.1"
-    postcss-normalize-timing-functions: "npm:^6.0.1"
-    postcss-normalize-unicode: "npm:^6.0.2"
-    postcss-normalize-url: "npm:^6.0.1"
-    postcss-normalize-whitespace: "npm:^6.0.1"
-    postcss-ordered-values: "npm:^6.0.1"
-    postcss-reduce-initial: "npm:^6.0.2"
-    postcss-reduce-transforms: "npm:^6.0.1"
-    postcss-svgo: "npm:^6.0.2"
-    postcss-unique-selectors: "npm:^6.0.2"
+    browserslist: "npm:^4.23.0"
+    css-declaration-sorter: "npm:^7.2.0"
+    cssnano-utils: "npm:^5.0.0"
+    postcss-calc: "npm:^10.0.0"
+    postcss-colormin: "npm:^7.0.0"
+    postcss-convert-values: "npm:^7.0.0"
+    postcss-discard-comments: "npm:^7.0.0"
+    postcss-discard-duplicates: "npm:^7.0.0"
+    postcss-discard-empty: "npm:^7.0.0"
+    postcss-discard-overridden: "npm:^7.0.0"
+    postcss-merge-longhand: "npm:^7.0.0"
+    postcss-merge-rules: "npm:^7.0.0"
+    postcss-minify-font-values: "npm:^7.0.0"
+    postcss-minify-gradients: "npm:^7.0.0"
+    postcss-minify-params: "npm:^7.0.0"
+    postcss-minify-selectors: "npm:^7.0.0"
+    postcss-normalize-charset: "npm:^7.0.0"
+    postcss-normalize-display-values: "npm:^7.0.0"
+    postcss-normalize-positions: "npm:^7.0.0"
+    postcss-normalize-repeat-style: "npm:^7.0.0"
+    postcss-normalize-string: "npm:^7.0.0"
+    postcss-normalize-timing-functions: "npm:^7.0.0"
+    postcss-normalize-unicode: "npm:^7.0.0"
+    postcss-normalize-url: "npm:^7.0.0"
+    postcss-normalize-whitespace: "npm:^7.0.0"
+    postcss-ordered-values: "npm:^7.0.0"
+    postcss-reduce-initial: "npm:^7.0.0"
+    postcss-reduce-transforms: "npm:^7.0.0"
+    postcss-svgo: "npm:^7.0.0"
+    postcss-unique-selectors: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
+  checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "cssnano-utils@npm:4.0.1"
+"cssnano-utils@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cssnano-utils@npm:5.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
+  checksum: 10c0/492593fb45151e8622357bb958d0d80475372de38523ef0587d77e9c5f386beb55c30b41f2f3c735a374a230bc61404eb7ae9c2beeab0666afb499442c62ecba
   languageName: node
   linkType: hard
 
-"cssnano@npm:^6.0.1":
-  version: 6.0.3
-  resolution: "cssnano@npm:6.0.3"
+"cssnano@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "cssnano@npm:7.0.1"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.3"
-    lilconfig: "npm:^3.0.0"
+    cssnano-preset-default: "npm:^7.0.1"
+    lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
+  checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e
   languageName: node
   linkType: hard
 
@@ -6351,7 +6822,7 @@ __metadata:
   resolution: "csso@npm:4.2.0"
   dependencies:
     css-tree: "npm:^1.1.2"
-  checksum: f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903
+  checksum: 10c0/f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903
   languageName: node
   linkType: hard
 
@@ -6360,21 +6831,21 @@ __metadata:
   resolution: "csso@npm:5.0.5"
   dependencies:
     css-tree: "npm:~2.2.0"
-  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
+  checksum: 10c0/ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
   languageName: node
   linkType: hard
 
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
-  checksum: 8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
+  checksum: 10c0/8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
   languageName: node
   linkType: hard
 
 "cssom@npm:~0.3.6":
   version: 0.3.8
   resolution: "cssom@npm:0.3.8"
-  checksum: d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
+  checksum: 10c0/d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
   languageName: node
   linkType: hard
 
@@ -6383,7 +6854,7 @@ __metadata:
   resolution: "cssstyle@npm:2.3.0"
   dependencies:
     cssom: "npm:~0.3.6"
-  checksum: 863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
+  checksum: 10c0/863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
   languageName: node
   linkType: hard
 
@@ -6392,21 +6863,21 @@ __metadata:
   resolution: "cssstyle@npm:4.0.1"
   dependencies:
     rrweb-cssom: "npm:^0.6.0"
-  checksum: cadf9a8b23e11f4c6d63f21291096a0b0be868bd4ab9c799daa2c5b18330e39e5281605f01da906e901b42f742df0f3b3645af6465e83377ff7d15a88ee432a0
+  checksum: 10c0/cadf9a8b23e11f4c6d63f21291096a0b0be868bd4ab9c799daa2c5b18330e39e5281605f01da906e901b42f742df0f3b3645af6465e83377ff7d15a88ee432a0
   languageName: node
   linkType: hard
 
 "csstype@npm:^3.0.2":
   version: 3.1.2
   resolution: "csstype@npm:3.1.2"
-  checksum: 32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6
+  checksum: 10c0/32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6
   languageName: node
   linkType: hard
 
 "damerau-levenshtein@npm:^1.0.8":
   version: 1.0.8
   resolution: "damerau-levenshtein@npm:1.0.8"
-  checksum: 4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3
+  checksum: 10c0/4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3
   languageName: node
   linkType: hard
 
@@ -6417,7 +6888,7 @@ __metadata:
     abab: "npm:^2.0.6"
     whatwg-mimetype: "npm:^3.0.0"
     whatwg-url: "npm:^11.0.0"
-  checksum: 051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
+  checksum: 10c0/051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
   languageName: node
   linkType: hard
 
@@ -6427,14 +6898,21 @@ __metadata:
   dependencies:
     whatwg-mimetype: "npm:^4.0.0"
     whatwg-url: "npm:^14.0.0"
-  checksum: 1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+  checksum: 10c0/1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+  languageName: node
+  linkType: hard
+
+"dateformat@npm:^4.6.3":
+  version: 4.6.3
+  resolution: "dateformat@npm:4.6.3"
+  checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
   languageName: node
   linkType: hard
 
 "debounce@npm:^1.2.1":
   version: 1.2.1
   resolution: "debounce@npm:1.2.1"
-  checksum: 6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
+  checksum: 10c0/6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
   languageName: node
   linkType: hard
 
@@ -6443,7 +6921,7 @@ __metadata:
   resolution: "debug@npm:2.6.9"
   dependencies:
     ms: "npm:2.0.0"
-  checksum: 121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589
+  checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589
   languageName: node
   linkType: hard
 
@@ -6455,7 +6933,7 @@ __metadata:
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
   languageName: node
   linkType: hard
 
@@ -6464,28 +6942,28 @@ __metadata:
   resolution: "debug@npm:3.2.7"
   dependencies:
     ms: "npm:^2.1.1"
-  checksum: 37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a
+  checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a
   languageName: node
   linkType: hard
 
 "decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
-  checksum: 85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
+  checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
   languageName: node
   linkType: hard
 
 "decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3":
   version: 10.4.3
   resolution: "decimal.js@npm:10.4.3"
-  checksum: 6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
+  checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
   languageName: node
   linkType: hard
 
 "decode-uri-component@npm:^0.2.0":
   version: 0.2.2
   resolution: "decode-uri-component@npm:0.2.2"
-  checksum: 1f4fa54eb740414a816b3f6c24818fbfcabd74ac478391e9f4e2282c994127db02010ce804f3d08e38255493cfe68608b3f5c8e09fd6efc4ae46c807691f7a31
+  checksum: 10c0/1f4fa54eb740414a816b3f6c24818fbfcabd74ac478391e9f4e2282c994127db02010ce804f3d08e38255493cfe68608b3f5c8e09fd6efc4ae46c807691f7a31
   languageName: node
   linkType: hard
 
@@ -6497,7 +6975,7 @@ __metadata:
   peerDependenciesMeta:
     babel-plugin-macros:
       optional: true
-  checksum: f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
+  checksum: 10c0/f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
   languageName: node
   linkType: hard
 
@@ -6511,69 +6989,21 @@ __metadata:
     object-is: "npm:^1.0.1"
     object-keys: "npm:^1.1.1"
     regexp.prototype.flags: "npm:^1.2.0"
-  checksum: 473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212
-  languageName: node
-  linkType: hard
-
-"deep-equal@npm:^2.0.5":
-  version: 2.2.1
-  resolution: "deep-equal@npm:2.2.1"
-  dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
-    es-get-iterator: "npm:^1.1.3"
-    get-intrinsic: "npm:^1.2.0"
-    is-arguments: "npm:^1.1.1"
-    is-array-buffer: "npm:^3.0.2"
-    is-date-object: "npm:^1.0.5"
-    is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
-    isarray: "npm:^2.0.5"
-    object-is: "npm:^1.1.5"
-    object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.4"
-    regexp.prototype.flags: "npm:^1.5.0"
-    side-channel: "npm:^1.0.4"
-    which-boxed-primitive: "npm:^1.0.2"
-    which-collection: "npm:^1.0.1"
-    which-typed-array: "npm:^1.1.9"
-  checksum: 9e32606f0e24ef4d6b100c68cadae81495c3638944e933afc4b8389b042e95c5fe1381492cf7a6d385bcbae564c9cfb7086f37f277e37521a632b008a6b208dc
+  checksum: 10c0/473d5dd1d707afd5ad3068864765590591b049d0e0d9a01931599dbbd820e35f09d0a42faa6e4644deb7cf6b7dc90f7bfdf5559f42279d67f714209b62036212
   languageName: node
   linkType: hard
 
 "deep-is@npm:^0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
-  checksum: 7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
+  checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
   languageName: node
   linkType: hard
 
 "deepmerge@npm:^4.0, deepmerge@npm:^4.2.2":
   version: 4.3.1
   resolution: "deepmerge@npm:4.3.1"
-  checksum: e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
-  languageName: node
-  linkType: hard
-
-"default-browser-id@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "default-browser-id@npm:3.0.0"
-  dependencies:
-    bplist-parser: "npm:^0.2.0"
-    untildify: "npm:^4.0.0"
-  checksum: 8db3ab882eb3e1e8b59d84c8641320e6c66d8eeb17eb4bb848b7dd549b1e6fd313988e4a13542e95fbaeff03f6e9dedc5ad191ad4df7996187753eb0d45c00b7
-  languageName: node
-  linkType: hard
-
-"default-browser@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "default-browser@npm:4.0.0"
-  dependencies:
-    bundle-name: "npm:^3.0.0"
-    default-browser-id: "npm:^3.0.0"
-    execa: "npm:^7.1.1"
-    titleize: "npm:^3.0.0"
-  checksum: 7c8848badc139ecf9d878e562bc4e7ab4301e51ba120b24d8dcb14739c30152115cc612065ac3ab73c02aace4afa29db5a044257b2f0cf234f16e3a58f6c925e
+  checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
   languageName: node
   linkType: hard
 
@@ -6583,25 +7013,18 @@ __metadata:
   dependencies:
     execa: "npm:^1.0.0"
     ip-regex: "npm:^2.1.0"
-  checksum: 2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d
+  checksum: 10c0/2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "define-data-property@npm:1.1.1"
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
   dependencies:
-    get-intrinsic: "npm:^1.2.1"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: 77ef6e0bceb515e05b5913ab635a84d537cee84f8a7c37c77fdcb31fc5b80f6dbe81b33375e4b67d96aa04e6a0d8d4ea099e431d83f089af8d93adfb584bcb94
-  languageName: node
-  linkType: hard
-
-"define-lazy-prop@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "define-lazy-prop@npm:3.0.0"
-  checksum: 5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49
+  checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37
   languageName: node
   linkType: hard
 
@@ -6612,7 +7035,7 @@ __metadata:
     define-data-property: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.0"
     object-keys: "npm:^1.1.1"
-  checksum: 88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
+  checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
   languageName: node
   linkType: hard
 
@@ -6621,7 +7044,7 @@ __metadata:
   resolution: "define-property@npm:0.2.5"
   dependencies:
     is-descriptor: "npm:^0.1.0"
-  checksum: 9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750
+  checksum: 10c0/9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750
   languageName: node
   linkType: hard
 
@@ -6630,7 +7053,7 @@ __metadata:
   resolution: "define-property@npm:1.0.0"
   dependencies:
     is-descriptor: "npm:^1.0.0"
-  checksum: d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e
+  checksum: 10c0/d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e
   languageName: node
   linkType: hard
 
@@ -6640,7 +7063,7 @@ __metadata:
   dependencies:
     is-descriptor: "npm:^1.0.2"
     isobject: "npm:^3.0.1"
-  checksum: f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969
+  checksum: 10c0/f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969
   languageName: node
   linkType: hard
 
@@ -6655,49 +7078,42 @@ __metadata:
     p-map: "npm:^2.0.0"
     pify: "npm:^4.0.1"
     rimraf: "npm:^2.6.3"
-  checksum: ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061
+  checksum: 10c0/ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061
   languageName: node
   linkType: hard
 
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
-  checksum: d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
-  languageName: node
-  linkType: hard
-
-"delegates@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "delegates@npm:1.0.0"
-  checksum: ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5
+  checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
   languageName: node
   linkType: hard
 
 "denque@npm:^2.1.0":
   version: 2.1.0
   resolution: "denque@npm:2.1.0"
-  checksum: f9ef81aa0af9c6c614a727cb3bd13c5d7db2af1abf9e6352045b86e85873e629690f6222f4edd49d10e4ccf8f078bbeec0794fafaf61b659c0589d0c511ec363
+  checksum: 10c0/f9ef81aa0af9c6c614a727cb3bd13c5d7db2af1abf9e6352045b86e85873e629690f6222f4edd49d10e4ccf8f078bbeec0794fafaf61b659c0589d0c511ec363
   languageName: node
   linkType: hard
 
 "depd@npm:2.0.0":
   version: 2.0.0
   resolution: "depd@npm:2.0.0"
-  checksum: 58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
+  checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
   languageName: node
   linkType: hard
 
 "depd@npm:~1.1.2":
   version: 1.1.2
   resolution: "depd@npm:1.1.2"
-  checksum: acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249
+  checksum: 10c0/acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249
   languageName: node
   linkType: hard
 
 "dequal@npm:^2.0.2, dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
-  checksum: f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
+  checksum: 10c0/f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
   languageName: node
   linkType: hard
 
@@ -6707,42 +7123,42 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.1"
     minimalistic-assert: "npm:^1.0.0"
-  checksum: 671354943ad67493e49eb4c555480ab153edd7cee3a51c658082fcde539d2690ed2a4a0b5d1f401f9cde822edf3939a6afb2585f32c091f2d3a1b1665cd45236
+  checksum: 10c0/671354943ad67493e49eb4c555480ab153edd7cee3a51c658082fcde539d2690ed2a4a0b5d1f401f9cde822edf3939a6afb2585f32c091f2d3a1b1665cd45236
   languageName: node
   linkType: hard
 
 "destroy@npm:1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
-  checksum: bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643
+  checksum: 10c0/bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643
   languageName: node
   linkType: hard
 
 "detect-file@npm:^1.0.0":
   version: 1.0.0
   resolution: "detect-file@npm:1.0.0"
-  checksum: c782a5f992047944c39d337c82f5d1d21d65d1378986d46c354df9d9ec6d5f356bca0182969c11b08b9b8a7af8727b3c2d5a9fad0b022be4a3bf4c216f63ed07
+  checksum: 10c0/c782a5f992047944c39d337c82f5d1d21d65d1378986d46c354df9d9ec6d5f356bca0182969c11b08b9b8a7af8727b3c2d5a9fad0b022be4a3bf4c216f63ed07
   languageName: node
   linkType: hard
 
 "detect-it@npm:^4.0.1":
   version: 4.0.1
   resolution: "detect-it@npm:4.0.1"
-  checksum: 9633dcafaa28dfd61b5e8f2925ec5cd09fda19d99ff7ea062e22d7cc8b3a8dfccf5c5118b6e72940f15d8371bd5d696ea66cc0972d1a6cbee918d4b06448c359
+  checksum: 10c0/9633dcafaa28dfd61b5e8f2925ec5cd09fda19d99ff7ea062e22d7cc8b3a8dfccf5c5118b6e72940f15d8371bd5d696ea66cc0972d1a6cbee918d4b06448c359
   languageName: node
   linkType: hard
 
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
-  checksum: c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
+  checksum: 10c0/c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
   languageName: node
   linkType: hard
 
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
-  checksum: f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09
+  checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09
   languageName: node
   linkType: hard
 
@@ -6751,14 +7167,14 @@ __metadata:
   resolution: "detect-passive-events@npm:2.0.3"
   dependencies:
     detect-it: "npm:^4.0.1"
-  checksum: 92a20249ef379f0119a8c76de7cbfc3e50ad95515debae028c27349023af1f29646dc0ba928be4aaff94ec4d5da10c20444b16fc3db407caf68ba200a96e9aea
+  checksum: 10c0/92a20249ef379f0119a8c76de7cbfc3e50ad95515debae028c27349023af1f29646dc0ba928be4aaff94ec4d5da10c20444b16fc3db407caf68ba200a96e9aea
   languageName: node
   linkType: hard
 
 "diff-sequences@npm:^29.6.3":
   version: 29.6.3
   resolution: "diff-sequences@npm:29.6.3"
-  checksum: 32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
+  checksum: 10c0/32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
   languageName: node
   linkType: hard
 
@@ -6769,7 +7185,7 @@ __metadata:
     bn.js: "npm:^4.1.0"
     miller-rabin: "npm:^4.0.0"
     randombytes: "npm:^2.0.0"
-  checksum: ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf
+  checksum: 10c0/ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf
   languageName: node
   linkType: hard
 
@@ -6778,14 +7194,14 @@ __metadata:
   resolution: "dir-glob@npm:3.0.1"
   dependencies:
     path-type: "npm:^4.0.0"
-  checksum: dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
+  checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
   languageName: node
   linkType: hard
 
 "dns-equal@npm:^1.0.0":
   version: 1.0.0
   resolution: "dns-equal@npm:1.0.0"
-  checksum: da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1
+  checksum: 10c0/da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1
   languageName: node
   linkType: hard
 
@@ -6795,7 +7211,7 @@ __metadata:
   dependencies:
     ip: "npm:^1.1.0"
     safe-buffer: "npm:^5.0.1"
-  checksum: ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608
+  checksum: 10c0/ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608
   languageName: node
   linkType: hard
 
@@ -6804,7 +7220,7 @@ __metadata:
   resolution: "dns-txt@npm:2.0.2"
   dependencies:
     buffer-indexof: "npm:^1.0.0"
-  checksum: 71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca
+  checksum: 10c0/71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca
   languageName: node
   linkType: hard
 
@@ -6813,7 +7229,7 @@ __metadata:
   resolution: "doctrine@npm:2.1.0"
   dependencies:
     esutils: "npm:^2.0.2"
-  checksum: b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
+  checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
   languageName: node
   linkType: hard
 
@@ -6822,14 +7238,21 @@ __metadata:
   resolution: "doctrine@npm:3.0.0"
   dependencies:
     esutils: "npm:^2.0.2"
-  checksum: c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
+  checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
   languageName: node
   linkType: hard
 
-"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.9":
   version: 0.5.16
   resolution: "dom-accessibility-api@npm:0.5.16"
-  checksum: b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
+  checksum: 10c0/b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
+  languageName: node
+  linkType: hard
+
+"dom-accessibility-api@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "dom-accessibility-api@npm:0.6.3"
+  checksum: 10c0/10bee5aa514b2a9a37c87cd81268db607a2e933a050074abc2f6fa3da9080ebed206a320cbc123567f2c3087d22292853bdfdceaffdd4334ffe2af9510b29360
   languageName: node
   linkType: hard
 
@@ -6838,7 +7261,7 @@ __metadata:
   resolution: "dom-helpers@npm:3.4.0"
   dependencies:
     "@babel/runtime": "npm:^7.1.2"
-  checksum: 1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1
+  checksum: 10c0/1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1
   languageName: node
   linkType: hard
 
@@ -6848,7 +7271,7 @@ __metadata:
   dependencies:
     "@babel/runtime": "npm:^7.8.7"
     csstype: "npm:^3.0.2"
-  checksum: f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c
+  checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c
   languageName: node
   linkType: hard
 
@@ -6858,7 +7281,7 @@ __metadata:
   dependencies:
     domelementtype: "npm:^2.0.1"
     entities: "npm:^2.0.0"
-  checksum: 5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b
+  checksum: 10c0/5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b
   languageName: node
   linkType: hard
 
@@ -6869,28 +7292,28 @@ __metadata:
     domelementtype: "npm:^2.3.0"
     domhandler: "npm:^5.0.2"
     entities: "npm:^4.2.0"
-  checksum: d5ae2b7110ca3746b3643d3ef60ef823f5f078667baf530cec096433f1627ec4b6fa8c072f09d079d7cda915fd2c7bc1b7b935681e9b09e591e1e15f4040b8e2
+  checksum: 10c0/d5ae2b7110ca3746b3643d3ef60ef823f5f078667baf530cec096433f1627ec4b6fa8c072f09d079d7cda915fd2c7bc1b7b935681e9b09e591e1e15f4040b8e2
   languageName: node
   linkType: hard
 
 "domain-browser@npm:^1.1.1":
   version: 1.2.0
   resolution: "domain-browser@npm:1.2.0"
-  checksum: a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b
+  checksum: 10c0/a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b
   languageName: node
   linkType: hard
 
 "domelementtype@npm:1":
   version: 1.3.1
   resolution: "domelementtype@npm:1.3.1"
-  checksum: 6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0
+  checksum: 10c0/6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0
   languageName: node
   linkType: hard
 
 "domelementtype@npm:^2.0.1, domelementtype@npm:^2.3.0":
   version: 2.3.0
   resolution: "domelementtype@npm:2.3.0"
-  checksum: 686f5a9ef0fff078c1412c05db73a0dce096190036f33e400a07e2a4518e9f56b1e324f5c576a0a747ef0e75b5d985c040b0d51945ce780c0dd3c625a18cd8c9
+  checksum: 10c0/686f5a9ef0fff078c1412c05db73a0dce096190036f33e400a07e2a4518e9f56b1e324f5c576a0a747ef0e75b5d985c040b0d51945ce780c0dd3c625a18cd8c9
   languageName: node
   linkType: hard
 
@@ -6899,7 +7322,7 @@ __metadata:
   resolution: "domexception@npm:4.0.0"
   dependencies:
     webidl-conversions: "npm:^7.0.0"
-  checksum: 774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
+  checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
   languageName: node
   linkType: hard
 
@@ -6908,7 +7331,7 @@ __metadata:
   resolution: "domhandler@npm:5.0.3"
   dependencies:
     domelementtype: "npm:^2.3.0"
-  checksum: bba1e5932b3e196ad6862286d76adc89a0dbf0c773e5ced1eb01f9af930c50093a084eff14b8de5ea60b895c56a04d5de8bbc4930c5543d029091916770b2d2a
+  checksum: 10c0/bba1e5932b3e196ad6862286d76adc89a0dbf0c773e5ced1eb01f9af930c50093a084eff14b8de5ea60b895c56a04d5de8bbc4930c5543d029091916770b2d2a
   languageName: node
   linkType: hard
 
@@ -6918,7 +7341,7 @@ __metadata:
   dependencies:
     dom-serializer: "npm:0"
     domelementtype: "npm:1"
-  checksum: 437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb
+  checksum: 10c0/437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb
   languageName: node
   linkType: hard
 
@@ -6929,35 +7352,35 @@ __metadata:
     dom-serializer: "npm:^2.0.0"
     domelementtype: "npm:^2.3.0"
     domhandler: "npm:^5.0.3"
-  checksum: 342d64cf4d07b8a0573fb51e0a6312a88fb520c7fefd751870bf72fa5fc0f2e0cb9a3958a573610b1d608c6e2a69b8e9b4b40f0bfb8f87a71bce4f180cca1887
+  checksum: 10c0/342d64cf4d07b8a0573fb51e0a6312a88fb520c7fefd751870bf72fa5fc0f2e0cb9a3958a573610b1d608c6e2a69b8e9b4b40f0bfb8f87a71bce4f180cca1887
   languageName: node
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.3.1
-  resolution: "dotenv@npm:16.3.1"
-  checksum: b95ff1bbe624ead85a3cd70dbd827e8e06d5f05f716f2d0cbc476532d54c7c9469c3bc4dd93ea519f6ad711cb522c00ac9a62b6eb340d5affae8008facc3fbd7
+  version: 16.4.5
+  resolution: "dotenv@npm:16.4.5"
+  checksum: 10c0/48d92870076832af0418b13acd6e5a5a3e83bb00df690d9812e94b24aff62b88ade955ac99a05501305b8dc8f1b0ee7638b18493deb6fe93d680e5220936292f
   languageName: node
   linkType: hard
 
 "duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
-  checksum: c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
+  checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
   languageName: node
   linkType: hard
 
 "eastasianwidth@npm:^0.2.0":
   version: 0.2.0
   resolution: "eastasianwidth@npm:0.2.0"
-  checksum: 26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
+  checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
   languageName: node
   linkType: hard
 
 "ee-first@npm:1.1.1":
   version: 1.1.1
   resolution: "ee-first@npm:1.1.1"
-  checksum: b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7
+  checksum: 10c0/b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7
   languageName: node
   linkType: hard
 
@@ -6968,14 +7391,14 @@ __metadata:
     jake: "npm:^10.8.5"
   bin:
     ejs: bin/cli.js
-  checksum: f0e249c79128810f5f6d5cbf347fc906d86bb9384263db0b2a9004aea649f2bc2d112736de5716c509c80afb4721c47281bd5b57c757d3b63f1bf5ac5f885893
+  checksum: 10c0/f0e249c79128810f5f6d5cbf347fc906d86bb9384263db0b2a9004aea649f2bc2d112736de5716c509c80afb4721c47281bd5b57c757d3b63f1bf5ac5f885893
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.601":
-  version: 1.4.609
-  resolution: "electron-to-chromium@npm:1.4.609"
-  checksum: 9675a79388acbaff5953a4c61589af7da93e0d1f9d6a3b284c7630f10126eb0998557b07448514214d5a3d19025310039b55f405ab701b1253130fc94907f743
+"electron-to-chromium@npm:^1.4.668":
+  version: 1.4.681
+  resolution: "electron-to-chromium@npm:1.4.681"
+  checksum: 10c0/5b2558dfb8bb82c20fb5fa1d9bbe06a3add47431dc3e1e4815e997be6ad387787047d9e534ed96839a9e7012520a5281c865158b09db41d10c029af003f05f94
   languageName: node
   linkType: hard
 
@@ -6990,14 +7413,14 @@ __metadata:
     inherits: "npm:^2.0.4"
     minimalistic-assert: "npm:^1.0.1"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: 5f361270292c3b27cf0843e84526d11dec31652f03c2763c6c2b8178548175ff5eba95341dd62baff92b2265d1af076526915d8af6cc9cb7559c44a62f8ca6e2
+  checksum: 10c0/5f361270292c3b27cf0843e84526d11dec31652f03c2763c6c2b8178548175ff5eba95341dd62baff92b2265d1af076526915d8af6cc9cb7559c44a62f8ca6e2
   languageName: node
   linkType: hard
 
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
-  checksum: 1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
+  checksum: 10c0/1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
   languageName: node
   linkType: hard
 
@@ -7010,49 +7433,49 @@ __metadata:
     prop-types: "npm:^15.6.0"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0-0 || ^16.0.0 || ^17.0.0
-  checksum: be673a03292d6a79db38fa0f5ad525a82a642ee5211b8ff32630dfce70988627bb9724695c60f11d635a5631a539beabbddd1185f0986f06890f4266e9cedee2
+  checksum: 10c0/be673a03292d6a79db38fa0f5ad525a82a642ee5211b8ff32630dfce70988627bb9724695c60f11d635a5631a539beabbddd1185f0986f06890f4266e9cedee2
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:10.3.0, emoji-regex@npm:^10.2.1, emoji-regex@npm:^10.3.0":
   version: 10.3.0
   resolution: "emoji-regex@npm:10.3.0"
-  checksum: b4838e8dcdceb44cf47f59abe352c25ff4fe7857acaf5fb51097c427f6f75b44d052eb907a7a3b86f86bc4eae3a93f5c2b7460abe79c407307e6212d65c91163
+  checksum: 10c0/b4838e8dcdceb44cf47f59abe352c25ff4fe7857acaf5fb51097c427f6f75b44d052eb907a7a3b86f86bc4eae3a93f5c2b7460abe79c407307e6212d65c91163
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^7.0.1":
   version: 7.0.3
   resolution: "emoji-regex@npm:7.0.3"
-  checksum: a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f
+  checksum: 10c0/a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
-  checksum: b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
+  checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
   languageName: node
   linkType: hard
 
 "emoji-regex@npm:^9.2.2":
   version: 9.2.2
   resolution: "emoji-regex@npm:9.2.2"
-  checksum: af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
+  checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
   languageName: node
   linkType: hard
 
 "emojis-list@npm:^3.0.0":
   version: 3.0.0
   resolution: "emojis-list@npm:3.0.0"
-  checksum: 7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
+  checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
   languageName: node
   linkType: hard
 
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
-  checksum: f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec
+  checksum: 10c0/f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec
   languageName: node
   linkType: hard
 
@@ -7061,7 +7484,7 @@ __metadata:
   resolution: "encoding@npm:0.1.13"
   dependencies:
     iconv-lite: "npm:^0.6.2"
-  checksum: 36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
   languageName: node
   linkType: hard
 
@@ -7070,7 +7493,7 @@ __metadata:
   resolution: "end-of-stream@npm:1.4.4"
   dependencies:
     once: "npm:^1.4.0"
-  checksum: 870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
+  checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
   languageName: node
   linkType: hard
 
@@ -7081,7 +7504,7 @@ __metadata:
     graceful-fs: "npm:^4.1.2"
     memory-fs: "npm:^0.5.0"
     tapable: "npm:^1.0.0"
-  checksum: d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64
+  checksum: 10c0/d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64
   languageName: node
   linkType: hard
 
@@ -7091,35 +7514,35 @@ __metadata:
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
+  checksum: 10c0/69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a
   languageName: node
   linkType: hard
 
 "entities@npm:^2.0.0":
   version: 2.2.0
   resolution: "entities@npm:2.2.0"
-  checksum: 7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3
+  checksum: 10c0/7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3
   languageName: node
   linkType: hard
 
 "entities@npm:^4.2.0, entities@npm:^4.4.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
-  checksum: 5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
   languageName: node
   linkType: hard
 
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
-  checksum: 285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
+  checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
   languageName: node
   linkType: hard
 
 "err-code@npm:^2.0.2":
   version: 2.0.3
   resolution: "err-code@npm:2.0.3"
-  checksum: b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
   languageName: node
   linkType: hard
 
@@ -7130,7 +7553,7 @@ __metadata:
     prr: "npm:~1.0.1"
   bin:
     errno: cli.js
-  checksum: 83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936
+  checksum: 10c0/83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936
   languageName: node
   linkType: hard
 
@@ -7139,7 +7562,7 @@ __metadata:
   resolution: "error-ex@npm:1.3.2"
   dependencies:
     is-arrayish: "npm:^0.2.1"
-  checksum: ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
+  checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
   languageName: node
   linkType: hard
 
@@ -7148,120 +7571,122 @@ __metadata:
   resolution: "error-stack-parser@npm:2.1.4"
   dependencies:
     stackframe: "npm:^1.3.4"
-  checksum: 7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9
+  checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1":
-  version: 1.22.3
-  resolution: "es-abstract@npm:1.22.3"
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.22.4":
+  version: 1.22.5
+  resolution: "es-abstract@npm:1.22.5"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    arraybuffer.prototype.slice: "npm:^1.0.2"
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.5"
-    es-set-tostringtag: "npm:^2.0.1"
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
     es-to-primitive: "npm:^1.2.1"
     function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.2"
-    get-symbol-description: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
     globalthis: "npm:^1.0.3"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-    has-proto: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.0"
-    internal-slot: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.2"
+    hasown: "npm:^2.0.1"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
     is-callable: "npm:^1.2.7"
-    is-negative-zero: "npm:^2.0.2"
+    is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
+    is-shared-array-buffer: "npm:^1.0.3"
     is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.12"
+    is-typed-array: "npm:^1.1.13"
     is-weakref: "npm:^1.0.2"
     object-inspect: "npm:^1.13.1"
     object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.4"
-    regexp.prototype.flags: "npm:^1.5.1"
-    safe-array-concat: "npm:^1.0.1"
-    safe-regex-test: "npm:^1.0.0"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.0"
+    safe-regex-test: "npm:^1.0.3"
     string.prototype.trim: "npm:^1.2.8"
     string.prototype.trimend: "npm:^1.0.7"
     string.prototype.trimstart: "npm:^1.0.7"
-    typed-array-buffer: "npm:^1.0.0"
-    typed-array-byte-length: "npm:^1.0.0"
-    typed-array-byte-offset: "npm:^1.0.0"
-    typed-array-length: "npm:^1.0.4"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.5"
     unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.13"
-  checksum: da31ec43b1c8eb47ba8a17693cac143682a1078b6c3cd883ce0e2062f135f532e93d873694ef439670e1f6ca03195118f43567ba6f33fb0d6c7daae750090236
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10c0/4bca5a60f0dff6c0a5690d8e51374cfcb8760d5dbbb1069174b4d41461cf4e0c3e0c1993bccbc5aa0799ff078199f1bcde2122b8709e0d17c2beffafff01010a
   languageName: node
   linkType: hard
 
 "es-array-method-boxes-properly@npm:^1.0.0":
   version: 1.0.0
   resolution: "es-array-method-boxes-properly@npm:1.0.0"
-  checksum: 4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d
+  checksum: 10c0/4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
-    has-symbols: "npm:^1.0.3"
-    is-arguments: "npm:^1.1.1"
-    is-map: "npm:^2.0.2"
-    is-set: "npm:^2.0.2"
-    is-string: "npm:^1.0.7"
-    isarray: "npm:^2.0.5"
-    stop-iteration-iterator: "npm:^1.0.0"
-  checksum: ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15":
-  version: 1.0.15
-  resolution: "es-iterator-helpers@npm:1.0.15"
+"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.17":
+  version: 1.0.17
+  resolution: "es-iterator-helpers@npm:1.0.17"
   dependencies:
     asynciterator.prototype: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.1"
-    es-set-tostringtag: "npm:^2.0.1"
-    function-bind: "npm:^1.1.1"
-    get-intrinsic: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.4"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.2"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
     globalthis: "npm:^1.0.3"
-    has-property-descriptors: "npm:^1.0.0"
+    has-property-descriptors: "npm:^1.0.2"
     has-proto: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.5"
+    internal-slot: "npm:^1.0.7"
     iterator.prototype: "npm:^1.1.2"
-    safe-array-concat: "npm:^1.0.1"
-  checksum: b4c83f94bfe624260d5238092de3173989f76f1416b1d02c388aea3b2024174e5f5f0e864057311ac99790b57e836ca3545b6e77256b26066dac944519f5e6d6
+    safe-array-concat: "npm:^1.1.0"
+  checksum: 10c0/d0f281257e7165f068fd4fc3beb63d07ae4f18fbef02a2bbe4a39272b764164c1ce3311ae7c5429ac30003aef290fcdf569050e4a9ba3560e044440f68e9a47c
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "es-set-tostringtag@npm:2.0.1"
+"es-set-tostringtag@npm:^2.0.2, es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
   dependencies:
-    get-intrinsic: "npm:^1.1.3"
-    has: "npm:^1.0.3"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 9af096365e3861bb29755cc5f76f15f66a7eab0e83befca396129090c1d9737e54090278b8e5357e97b5f0a5b0459fca07c40c6740884c2659cbf90ef8e508cc
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-shim-unscopables@npm:1.0.0"
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
   dependencies:
-    has: "npm:^1.0.3"
-  checksum: d54a66239fbd19535b3e50333913260394f14d2d7adb136a95396a13ca584bab400cf9cb2ffd9232f3fe2f0362540bd3a708240c493e46e13fe0b90cfcfedc3d
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
   languageName: node
   linkType: hard
 
@@ -7272,42 +7697,42 @@ __metadata:
     is-callable: "npm:^1.1.4"
     is-date-object: "npm:^1.0.1"
     is-symbol: "npm:^1.0.2"
-  checksum: 0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
+  checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
   languageName: node
   linkType: hard
 
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
-  checksum: afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
+  checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
   languageName: node
   linkType: hard
 
 "escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
   version: 1.0.3
   resolution: "escape-html@npm:1.0.3"
-  checksum: 524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
+  checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
+  checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^2.0.0":
   version: 2.0.0
   resolution: "escape-string-regexp@npm:2.0.0"
-  checksum: 2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
+  checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
   languageName: node
   linkType: hard
 
 "escape-string-regexp@npm:^4.0.0":
   version: 4.0.0
   resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
+  checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
   languageName: node
   linkType: hard
 
@@ -7325,25 +7750,14 @@ __metadata:
   bin:
     escodegen: bin/escodegen.js
     esgenerate: bin/esgenerate.js
-  checksum: e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
-  languageName: node
-  linkType: hard
-
-"eslint-config-prettier@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "eslint-config-prettier@npm:9.1.0"
-  peerDependencies:
-    eslint: ">=7.0.0"
-  bin:
-    eslint-config-prettier: bin/cli.js
-  checksum: 6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
+  checksum: 10c0/e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
   languageName: node
   linkType: hard
 
 "eslint-define-config@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "eslint-define-config@npm:2.0.0"
-  checksum: 617c3143bc1ed8df0b20ae632d428d5f241dbb04483631e1410c58fe65ba3e503cf94631c5973115482b58ba464d052422a718c0f4d49182f8d13ffbb36bf1d6
+  version: 2.1.0
+  resolution: "eslint-define-config@npm:2.1.0"
+  checksum: 10c0/034bd6bfbfec2db6c720a51815de6b072efeef7afbf99d90c23a1871f9cd741bb77f9d34e0bc2465262298c6110c5c45b704714d8575c6567fd2df963fb792ea
   languageName: node
   linkType: hard
 
@@ -7354,7 +7768,7 @@ __metadata:
     debug: "npm:^3.2.7"
     is-core-module: "npm:^2.13.0"
     resolve: "npm:^1.22.4"
-  checksum: 0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61
+  checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61
   languageName: node
   linkType: hard
 
@@ -7372,7 +7786,7 @@ __metadata:
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
-  checksum: cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86
+  checksum: 10c0/cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86
   languageName: node
   linkType: hard
 
@@ -7384,28 +7798,28 @@ __metadata:
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
+  checksum: 10c0/c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df
   languageName: node
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^4.10.1":
-  version: 4.11.3
-  resolution: "eslint-plugin-formatjs@npm:4.11.3"
+  version: 4.13.1
+  resolution: "eslint-plugin-formatjs@npm:4.13.1"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/ts-transformer": "npm:3.13.9"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/ts-transformer": "npm:3.13.12"
     "@types/eslint": "npm:7 || 8"
     "@types/picomatch": "npm:^2.3.0"
-    "@typescript-eslint/utils": "npm:^6.5.0"
+    "@typescript-eslint/utils": "npm:^6.18.1"
     emoji-regex: "npm:^10.2.1"
     magic-string: "npm:^0.30.0"
     picomatch: "npm:^2.3.1"
     tslib: "npm:2.6.2"
     typescript: "npm:5"
-    unicode-emoji-utils: "npm:^1.1.1"
+    unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: 7 || 8
-  checksum: 66481e0b5af5738bdb2b164ac1c74216c5c26f7c7400456a58387e71424bb30554aef39da43ce29bfd551f7dad678818d9af029022edadc4e1024349339f6984
+  checksum: 10c0/ce18141dff84e8fe026127085c1a63279acb3a1bc0b70dc1ddce2fc65bb37d68ccf6d097231428745eda2caea42080e1c80a01a1895803155c15123a01bfeee3
   languageName: node
   linkType: hard
 
@@ -7432,26 +7846,26 @@ __metadata:
     tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
+  checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.1
-  resolution: "eslint-plugin-jsdoc@npm:48.0.1"
+  version: 48.2.4
+  resolution: "eslint-plugin-jsdoc@npm:48.2.4"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.41.0"
+    "@es-joy/jsdoccomment": "npm:~0.43.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
     debug: "npm:^4.3.4"
     escape-string-regexp: "npm:^4.0.0"
     esquery: "npm:^1.5.0"
     is-builtin-module: "npm:^3.2.1"
-    semver: "npm:^7.5.4"
+    semver: "npm:^7.6.0"
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 9b211cfb2e07e076dad12681cd2045c65766dd24fe9399fd0adeaf6f8785f9a4dd58608f1183195f63d3c6c91013aa1cf9edc9101580cff9cb60e1e688f456f9
+  checksum: 10c0/601c9d6ee41de56102c7813106ceb0b8b8342223670f7add010a8f89753c250cde4cc93e353e3911b7b29677f2634f3f4be45f27abb7a95c6fdbd058adfa3343
   languageName: node
   linkType: hard
 
@@ -7477,27 +7891,7 @@ __metadata:
     object.fromentries: "npm:^2.0.7"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-prettier@npm:^5.0.0":
-  version: 5.1.2
-  resolution: "eslint-plugin-prettier@npm:5.1.2"
-  dependencies:
-    prettier-linter-helpers: "npm:^1.0.0"
-    synckit: "npm:^0.8.6"
-  peerDependencies:
-    "@types/eslint": ">=8.0.0"
-    eslint: ">=8.0.0"
-    eslint-config-prettier: "*"
-    prettier: ">=3.0.0"
-  peerDependenciesMeta:
-    "@types/eslint":
-      optional: true
-    eslint-config-prettier:
-      optional: true
-  checksum: e16c9fbb0e9f8da45bdbb1cf6e4a190266235c3686deede3815196d2604bbe2bac531d1fc9adc3c0b9a03d88b55bd3bfaa4f9d85e34e73dc040d545a1931fab9
+  checksum: 10c0/199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
   languageName: node
   linkType: hard
 
@@ -7506,42 +7900,44 @@ __metadata:
   resolution: "eslint-plugin-promise@npm:6.1.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: ec705741c110cd1cb4d702776e1c7f7fe60b671b71f706c88054ab443cf2767aae5a663928fb426373ba1095eaeda312a740a4f880546631f0e0727f298b3393
+  checksum: 10c0/ec705741c110cd1cb4d702776e1c7f7fe60b671b71f706c88054ab443cf2767aae5a663928fb426373ba1095eaeda312a740a4f880546631f0e0727f298b3393
   languageName: node
   linkType: hard
 
 "eslint-plugin-react-hooks@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
+  version: 4.6.2
+  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 58c7e10ea5792c33346fcf5cb4024e14837035ce412ff99c2dcb7c4f903dc9b17939078f80bfef826301ce326582c396c00e8e0ac9d10ac2cde2b42d33763c65
+  checksum: 10c0/4844e58c929bc05157fb70ba1e462e34f1f4abcbc8dd5bbe5b04513d33e2699effb8bca668297976ceea8e7ebee4e8fc29b9af9d131bcef52886feaa2308b2cc
   languageName: node
   linkType: hard
 
 "eslint-plugin-react@npm:^7.33.2":
-  version: 7.33.2
-  resolution: "eslint-plugin-react@npm:7.33.2"
+  version: 7.34.1
+  resolution: "eslint-plugin-react@npm:7.34.1"
   dependencies:
-    array-includes: "npm:^3.1.6"
-    array.prototype.flatmap: "npm:^1.3.1"
-    array.prototype.tosorted: "npm:^1.1.1"
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlast: "npm:^1.2.4"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.toreversed: "npm:^1.1.2"
+    array.prototype.tosorted: "npm:^1.1.3"
     doctrine: "npm:^2.1.0"
-    es-iterator-helpers: "npm:^1.0.12"
+    es-iterator-helpers: "npm:^1.0.17"
     estraverse: "npm:^5.3.0"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.6"
-    object.fromentries: "npm:^2.0.6"
-    object.hasown: "npm:^1.1.2"
-    object.values: "npm:^1.1.6"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
+    object.hasown: "npm:^1.1.3"
+    object.values: "npm:^1.1.7"
     prop-types: "npm:^15.8.1"
-    resolve: "npm:^2.0.0-next.4"
+    resolve: "npm:^2.0.0-next.5"
     semver: "npm:^6.3.1"
-    string.prototype.matchall: "npm:^4.0.8"
+    string.prototype.matchall: "npm:^4.0.10"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001
+  checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c
   languageName: node
   linkType: hard
 
@@ -7551,7 +7947,7 @@ __metadata:
   dependencies:
     esrecurse: "npm:^4.1.0"
     estraverse: "npm:^4.1.1"
-  checksum: a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc
+  checksum: 10c0/a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc
   languageName: node
   linkType: hard
 
@@ -7561,26 +7957,26 @@ __metadata:
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
+  checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
   languageName: node
   linkType: hard
 
 "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
   version: 3.4.3
   resolution: "eslint-visitor-keys@npm:3.4.3"
-  checksum: 92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
+  checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
   languageName: node
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.56.0"
-    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
     "@ungap/structured-clone": "npm:^1.2.0"
@@ -7616,7 +8012,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
+  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
   languageName: node
   linkType: hard
 
@@ -7627,7 +8023,7 @@ __metadata:
     acorn: "npm:^8.9.0"
     acorn-jsx: "npm:^5.3.2"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
+  checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
   languageName: node
   linkType: hard
 
@@ -7637,7 +8033,7 @@ __metadata:
   bin:
     esparse: ./bin/esparse.js
     esvalidate: ./bin/esvalidate.js
-  checksum: ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
+  checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
   languageName: node
   linkType: hard
 
@@ -7646,7 +8042,7 @@ __metadata:
   resolution: "esquery@npm:1.5.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
   languageName: node
   linkType: hard
 
@@ -7655,77 +8051,84 @@ __metadata:
   resolution: "esrecurse@npm:4.3.0"
   dependencies:
     estraverse: "npm:^5.2.0"
-  checksum: 81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
+  checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
   languageName: node
   linkType: hard
 
 "estraverse@npm:^4.1.1":
   version: 4.3.0
   resolution: "estraverse@npm:4.3.0"
-  checksum: 9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
+  checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
   languageName: node
   linkType: hard
 
 "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
   version: 5.3.0
   resolution: "estraverse@npm:5.3.0"
-  checksum: 1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
+  checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
   languageName: node
   linkType: hard
 
 "estree-walker@npm:^1.0.1":
   version: 1.0.1
   resolution: "estree-walker@npm:1.0.1"
-  checksum: fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55
+  checksum: 10c0/fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 10c0/53a6c54e2019b8c914dc395890153ffdc2322781acf4bd7d1a32d7aedc1710807bdcd866ac133903d5629ec601fbb50abe8c2e5553c7f5a0afdd9b6af6c945af
   languageName: node
   linkType: hard
 
 "esutils@npm:^2.0.2":
   version: 2.0.3
   resolution: "esutils@npm:2.0.3"
-  checksum: 9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
+  checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
   languageName: node
   linkType: hard
 
 "etag@npm:~1.8.1":
   version: 1.8.1
   resolution: "etag@npm:1.8.1"
-  checksum: 12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84
+  checksum: 10c0/12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84
   languageName: node
   linkType: hard
 
 "event-target-shim@npm:^5.0.0":
   version: 5.0.1
   resolution: "event-target-shim@npm:5.0.1"
-  checksum: 0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
+  checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:^4.0.0":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
-  checksum: 5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
+  checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
   languageName: node
   linkType: hard
 
 "eventemitter3@npm:^5.0.1":
   version: 5.0.1
   resolution: "eventemitter3@npm:5.0.1"
-  checksum: 4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
+  checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
   languageName: node
   linkType: hard
 
 "events@npm:^3.0.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
-  checksum: d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
   languageName: node
   linkType: hard
 
 "eventsource@npm:^2.0.2":
   version: 2.0.2
   resolution: "eventsource@npm:2.0.2"
-  checksum: 0b8c70b35e45dd20f22ff64b001be9d530e33b92ca8bdbac9e004d0be00d957ab02ef33c917315f59bf2f20b178c56af85c52029bc8e6cc2d61c31d87d943573
+  checksum: 10c0/0b8c70b35e45dd20f22ff64b001be9d530e33b92ca8bdbac9e004d0be00d957ab02ef33c917315f59bf2f20b178c56af85c52029bc8e6cc2d61c31d87d943573
   languageName: node
   linkType: hard
 
@@ -7736,7 +8139,7 @@ __metadata:
     md5.js: "npm:^1.3.4"
     node-gyp: "npm:latest"
     safe-buffer: "npm:^5.1.1"
-  checksum: 77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99
+  checksum: 10c0/77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99
   languageName: node
   linkType: hard
 
@@ -7753,7 +8156,7 @@ __metadata:
     onetime: "npm:^6.0.0"
     signal-exit: "npm:^4.1.0"
     strip-final-newline: "npm:^3.0.0"
-  checksum: 2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
+  checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
   languageName: node
   linkType: hard
 
@@ -7768,7 +8171,7 @@ __metadata:
     p-finally: "npm:^1.0.0"
     signal-exit: "npm:^3.0.0"
     strip-eof: "npm:^1.0.0"
-  checksum: cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590
+  checksum: 10c0/cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590
   languageName: node
   linkType: hard
 
@@ -7785,31 +8188,14 @@ __metadata:
     onetime: "npm:^5.1.2"
     signal-exit: "npm:^3.0.3"
     strip-final-newline: "npm:^2.0.0"
-  checksum: c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
-  languageName: node
-  linkType: hard
-
-"execa@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "execa@npm:7.2.0"
-  dependencies:
-    cross-spawn: "npm:^7.0.3"
-    get-stream: "npm:^6.0.1"
-    human-signals: "npm:^4.3.0"
-    is-stream: "npm:^3.0.0"
-    merge-stream: "npm:^2.0.0"
-    npm-run-path: "npm:^5.1.0"
-    onetime: "npm:^6.0.0"
-    signal-exit: "npm:^3.0.7"
-    strip-final-newline: "npm:^3.0.0"
-  checksum: 098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885
+  checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
   languageName: node
   linkType: hard
 
 "exit@npm:^0.1.2":
   version: 0.1.2
   resolution: "exit@npm:0.1.2"
-  checksum: 71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
+  checksum: 10c0/71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
   languageName: node
   linkType: hard
 
@@ -7824,7 +8210,7 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: 3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87
+  checksum: 10c0/3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87
   languageName: node
   linkType: hard
 
@@ -7833,7 +8219,7 @@ __metadata:
   resolution: "expand-tilde@npm:2.0.2"
   dependencies:
     homedir-polyfill: "npm:^1.0.1"
-  checksum: 205a60497422746d1c3acbc1d65bd609b945066f239a2b785e69a7a651ac4cbeb4e08555b1ea0023abbe855e6fcb5bbf27d0b371367fdccd303d4fb2b4d66845
+  checksum: 10c0/205a60497422746d1c3acbc1d65bd609b945066f239a2b785e69a7a651ac4cbeb4e08555b1ea0023abbe855e6fcb5bbf27d0b371367fdccd303d4fb2b4d66845
   languageName: node
   linkType: hard
 
@@ -7846,27 +8232,27 @@ __metadata:
     jest-matcher-utils: "npm:^29.7.0"
     jest-message-util: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: 2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
+  checksum: 10c0/2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
   languageName: node
   linkType: hard
 
 "exponential-backoff@npm:^3.1.1":
   version: 3.1.1
   resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
   languageName: node
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
+  version: 4.19.2
+  resolution: "express@npm:4.19.2"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.1"
+    body-parser: "npm:1.20.2"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.5.0"
+    cookie: "npm:0.6.0"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
@@ -7892,7 +8278,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 75af556306b9241bc1d7bdd40c9744b516c38ce50ae3210658efcbf96e3aed4ab83b3432f06215eae5610c123bc4136957dc06e50dfc50b7d4d775af56c4c59c
+  checksum: 10c0/e82e2662ea9971c1407aea9fc3c16d6b963e55e3830cd0ef5e00b533feda8b770af4e3be630488ef8a752d7c75c4fcefb15892868eeaafe7353cb9e3e269fdcb
   languageName: node
   linkType: hard
 
@@ -7901,7 +8287,7 @@ __metadata:
   resolution: "extend-shallow@npm:2.0.1"
   dependencies:
     is-extendable: "npm:^0.1.0"
-  checksum: ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9
+  checksum: 10c0/ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9
   languageName: node
   linkType: hard
 
@@ -7911,7 +8297,7 @@ __metadata:
   dependencies:
     assign-symbols: "npm:^1.0.0"
     is-extendable: "npm:^1.0.1"
-  checksum: f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a
+  checksum: 10c0/f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a
   languageName: node
   linkType: hard
 
@@ -7927,25 +8313,25 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c
+  checksum: 10c0/e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c
+  languageName: node
+  linkType: hard
+
+"fast-copy@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "fast-copy@npm:3.0.1"
+  checksum: 10c0/a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
   languageName: node
   linkType: hard
 
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: 40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
+  checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
   languageName: node
   linkType: hard
 
-"fast-diff@npm:^1.1.2":
-  version: 1.3.0
-  resolution: "fast-diff@npm:1.3.0"
-  checksum: 5c19af237edb5d5effda008c891a18a585f74bf12953be57923f17a3a4d0979565fc64dbc73b9e20926b9d895f5b690c618cbb969af0cf022e3222471220ad29
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
+"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
   dependencies:
@@ -7954,28 +8340,42 @@ __metadata:
     glob-parent: "npm:^5.1.2"
     merge2: "npm:^1.3.0"
     micromatch: "npm:^4.0.4"
-  checksum: 42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+  checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
   languageName: node
   linkType: hard
 
 "fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: 7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
+  checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
   languageName: node
   linkType: hard
 
 "fast-levenshtein@npm:^2.0.6":
   version: 2.0.6
   resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
+  checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
+  languageName: node
+  linkType: hard
+
+"fast-redact@npm:^3.1.1":
+  version: 3.3.0
+  resolution: "fast-redact@npm:3.3.0"
+  checksum: 10c0/d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
+  languageName: node
+  linkType: hard
+
+"fast-safe-stringify@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "fast-safe-stringify@npm:2.1.1"
+  checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
   languageName: node
   linkType: hard
 
 "fastest-levenshtein@npm:^1.0.16":
   version: 1.0.16
   resolution: "fastest-levenshtein@npm:1.0.16"
-  checksum: 7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
+  checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
   languageName: node
   linkType: hard
 
@@ -7984,7 +8384,7 @@ __metadata:
   resolution: "fastq@npm:1.15.0"
   dependencies:
     reusify: "npm:^1.0.4"
-  checksum: 5ce4f83afa5f88c9379e67906b4d31bc7694a30826d6cc8d0f0473c966929017fda65c2174b0ec89f064ede6ace6c67f8a4fe04cef42119b6a55b0d465554c24
+  checksum: 10c0/5ce4f83afa5f88c9379e67906b4d31bc7694a30826d6cc8d0f0473c966929017fda65c2174b0ec89f064ede6ace6c67f8a4fe04cef42119b6a55b0d465554c24
   languageName: node
   linkType: hard
 
@@ -7993,7 +8393,7 @@ __metadata:
   resolution: "faye-websocket@npm:0.11.4"
   dependencies:
     websocket-driver: "npm:>=0.5.1"
-  checksum: c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420
+  checksum: 10c0/c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420
   languageName: node
   linkType: hard
 
@@ -8002,7 +8402,7 @@ __metadata:
   resolution: "fb-watchman@npm:2.0.2"
   dependencies:
     bser: "npm:2.1.1"
-  checksum: feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
+  checksum: 10c0/feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
   languageName: node
   linkType: hard
 
@@ -8011,7 +8411,7 @@ __metadata:
   resolution: "file-entry-cache@npm:6.0.1"
   dependencies:
     flat-cache: "npm:^3.0.4"
-  checksum: 58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
+  checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
   languageName: node
   linkType: hard
 
@@ -8020,7 +8420,7 @@ __metadata:
   resolution: "file-entry-cache@npm:8.0.0"
   dependencies:
     flat-cache: "npm:^4.0.0"
-  checksum: 9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
+  checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
   languageName: node
   linkType: hard
 
@@ -8032,21 +8432,21 @@ __metadata:
     schema-utils: "npm:^3.0.0"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
+  checksum: 10c0/e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
   languageName: node
   linkType: hard
 
 "file-type@npm:^12.4.1":
   version: 12.4.2
   resolution: "file-type@npm:12.4.2"
-  checksum: 26a307262a2a0b41ea83136550fbe83d8b502d080778b6577e0336fbfe9e919e1f871a286a6eb59f668425f60ebb19402fcb6c0443af58446d33c63362554e1d
+  checksum: 10c0/26a307262a2a0b41ea83136550fbe83d8b502d080778b6577e0336fbfe9e919e1f871a286a6eb59f668425f60ebb19402fcb6c0443af58446d33c63362554e1d
   languageName: node
   linkType: hard
 
 "file-uri-to-path@npm:1.0.0":
   version: 1.0.0
   resolution: "file-uri-to-path@npm:1.0.0"
-  checksum: 3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
+  checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
   languageName: node
   linkType: hard
 
@@ -8055,7 +8455,7 @@ __metadata:
   resolution: "filelist@npm:1.0.4"
   dependencies:
     minimatch: "npm:^5.0.1"
-  checksum: 426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41
+  checksum: 10c0/426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41
   languageName: node
   linkType: hard
 
@@ -8067,7 +8467,7 @@ __metadata:
     is-number: "npm:^3.0.0"
     repeat-string: "npm:^1.6.1"
     to-regex-range: "npm:^2.1.0"
-  checksum: ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089
+  checksum: 10c0/ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089
   languageName: node
   linkType: hard
 
@@ -8076,7 +8476,7 @@ __metadata:
   resolution: "fill-range@npm:7.0.1"
   dependencies:
     to-regex-range: "npm:^5.0.1"
-  checksum: 7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
   languageName: node
   linkType: hard
 
@@ -8091,7 +8491,7 @@ __metadata:
     parseurl: "npm:~1.3.3"
     statuses: "npm:2.0.1"
     unpipe: "npm:~1.0.0"
-  checksum: 64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
+  checksum: 10c0/64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
   languageName: node
   linkType: hard
 
@@ -8102,14 +8502,14 @@ __metadata:
     commondir: "npm:^1.0.1"
     make-dir: "npm:^3.0.2"
     pkg-dir: "npm:^4.1.0"
-  checksum: 92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
+  checksum: 10c0/92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
   languageName: node
   linkType: hard
 
 "find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
-  checksum: 1abc7f3bf2f8d78ff26d9e00ce9d0f7b32e5ff6d1da2857bcdf4746134c422282b091c672cde0572cac3840713487e0a7a636af9aa1b74cb11894b447a521efa
+  checksum: 10c0/1abc7f3bf2f8d78ff26d9e00ce9d0f7b32e5ff6d1da2857bcdf4746134c422282b091c672cde0572cac3840713487e0a7a636af9aa1b74cb11894b447a521efa
   languageName: node
   linkType: hard
 
@@ -8118,7 +8518,7 @@ __metadata:
   resolution: "find-up@npm:3.0.0"
   dependencies:
     locate-path: "npm:^3.0.0"
-  checksum: 2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
+  checksum: 10c0/2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
   languageName: node
   linkType: hard
 
@@ -8128,7 +8528,7 @@ __metadata:
   dependencies:
     locate-path: "npm:^5.0.0"
     path-exists: "npm:^4.0.0"
-  checksum: 0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
+  checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
   languageName: node
   linkType: hard
 
@@ -8138,7 +8538,7 @@ __metadata:
   dependencies:
     locate-path: "npm:^6.0.0"
     path-exists: "npm:^4.0.0"
-  checksum: 062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
+  checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
   languageName: node
   linkType: hard
 
@@ -8150,7 +8550,7 @@ __metadata:
     is-glob: "npm:^4.0.0"
     micromatch: "npm:^3.0.4"
     resolve-dir: "npm:^1.0.1"
-  checksum: ff6f37328a7629775db2abf0fcd40e7c117baf37f23006f206c18bcd9ca0ce99d8c24ae86df540370ec76c1080ab59fe82cb71d2c7c1ad819ccccee726af7e92
+  checksum: 10c0/ff6f37328a7629775db2abf0fcd40e7c117baf37f23006f206c18bcd9ca0ce99d8c24ae86df540370ec76c1080ab59fe82cb71d2c7c1ad819ccccee726af7e92
   languageName: node
   linkType: hard
 
@@ -8161,7 +8561,7 @@ __metadata:
     flatted: "npm:^3.2.9"
     keyv: "npm:^4.5.3"
     rimraf: "npm:^3.0.2"
-  checksum: b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
+  checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
   languageName: node
   linkType: hard
 
@@ -8172,7 +8572,7 @@ __metadata:
     flatted: "npm:^3.2.9"
     keyv: "npm:^4.5.4"
     rimraf: "npm:^5.0.5"
-  checksum: 8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
+  checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
   languageName: node
   linkType: hard
 
@@ -8181,31 +8581,31 @@ __metadata:
   resolution: "flat@npm:5.0.2"
   bin:
     flat: cli.js
-  checksum: f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
+  checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
   languageName: node
   linkType: hard
 
 "flatted@npm:^3.2.9":
   version: 3.2.9
   resolution: "flatted@npm:3.2.9"
-  checksum: 5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
+  checksum: 10c0/5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4":
-  version: 1.15.4
-  resolution: "follow-redirects@npm:1.15.4"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a
+  checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071
   languageName: node
   linkType: hard
 
 "font-awesome@npm:^4.7.0":
   version: 4.7.0
   resolution: "font-awesome@npm:4.7.0"
-  checksum: 1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
+  checksum: 10c0/1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
   languageName: node
   linkType: hard
 
@@ -8214,14 +8614,14 @@ __metadata:
   resolution: "for-each@npm:0.3.3"
   dependencies:
     is-callable: "npm:^1.1.3"
-  checksum: 22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
   languageName: node
   linkType: hard
 
 "for-in@npm:^1.0.2":
   version: 1.0.2
   resolution: "for-in@npm:1.0.2"
-  checksum: 42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6
+  checksum: 10c0/42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6
   languageName: node
   linkType: hard
 
@@ -8231,7 +8631,7 @@ __metadata:
   dependencies:
     cross-spawn: "npm:^7.0.0"
     signal-exit: "npm:^4.0.1"
-  checksum: 9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
   languageName: node
   linkType: hard
 
@@ -8242,21 +8642,21 @@ __metadata:
     asynckit: "npm:^0.4.0"
     combined-stream: "npm:^1.0.8"
     mime-types: "npm:^2.1.12"
-  checksum: cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
+  checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
   languageName: node
   linkType: hard
 
 "forwarded@npm:0.2.0":
   version: 0.2.0
   resolution: "forwarded@npm:0.2.0"
-  checksum: 9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
+  checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
   languageName: node
   linkType: hard
 
-"fraction.js@npm:^4.3.6":
-  version: 4.3.6
-  resolution: "fraction.js@npm:4.3.6"
-  checksum: d224bf62e350c4dbe66c6ac5ad9c4ec6d3c8e64c13323686dbebe7c8cc118491c297dca4961d3c93f847670794cb05e6d8b706f0e870846ab66a9c4491d0e914
+"fraction.js@npm:^4.3.7":
+  version: 4.3.7
+  resolution: "fraction.js@npm:4.3.7"
+  checksum: 10c0/df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711
   languageName: node
   linkType: hard
 
@@ -8265,14 +8665,14 @@ __metadata:
   resolution: "fragment-cache@npm:0.2.1"
   dependencies:
     map-cache: "npm:^0.2.2"
-  checksum: 5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf
+  checksum: 10c0/5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf
   languageName: node
   linkType: hard
 
 "fresh@npm:0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
-  checksum: c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a
+  checksum: 10c0/c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a
   languageName: node
   linkType: hard
 
@@ -8284,7 +8684,7 @@ __metadata:
     graceful-fs: "npm:^4.2.0"
     jsonfile: "npm:^6.0.1"
     universalify: "npm:^2.0.0"
-  checksum: 9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92
+  checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92
   languageName: node
   linkType: hard
 
@@ -8293,7 +8693,7 @@ __metadata:
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
+  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
   languageName: node
   linkType: hard
 
@@ -8302,14 +8702,14 @@ __metadata:
   resolution: "fs-minipass@npm:3.0.3"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
+  checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
   languageName: node
   linkType: hard
 
 "fs.realpath@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs.realpath@npm:1.0.0"
-  checksum: 444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
+  checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
   languageName: node
   linkType: hard
 
@@ -8319,7 +8719,7 @@ __metadata:
   dependencies:
     bindings: "npm:^1.5.0"
     nan: "npm:^2.12.1"
-  checksum: 4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02
+  checksum: 10c0/4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02
   conditions: os=darwin
   languageName: node
   linkType: hard
@@ -8329,7 +8729,7 @@ __metadata:
   resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
+  checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
   conditions: os=darwin
   languageName: node
   linkType: hard
@@ -8353,10 +8753,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
+"function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
-  checksum: d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
+  checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
   languageName: node
   linkType: hard
 
@@ -8368,84 +8768,69 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     functions-have-names: "npm:^1.2.3"
-  checksum: 9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
+  checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
   languageName: node
   linkType: hard
 
 "functions-have-names@npm:^1.2.3":
   version: 1.2.3
   resolution: "functions-have-names@npm:1.2.3"
-  checksum: 33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
+  checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
   languageName: node
   linkType: hard
 
 "fuzzysort@npm:^2.0.4":
   version: 2.0.4
   resolution: "fuzzysort@npm:2.0.4"
-  checksum: 3170d16fccc0f4ac5e31323dbab7d0da7b1a4024878ed4d6b4ec86c0df94e12dc335f8d4181e38d97ca7919ac51bc5de4a9c2ec94914a4e51f9e9c05208c9ea9
-  languageName: node
-  linkType: hard
-
-"gauge@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "gauge@npm:5.0.1"
-  dependencies:
-    aproba: "npm:^1.0.3 || ^2.0.0"
-    color-support: "npm:^1.1.3"
-    console-control-strings: "npm:^1.1.0"
-    has-unicode: "npm:^2.0.1"
-    signal-exit: "npm:^4.0.1"
-    string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    wide-align: "npm:^1.1.5"
-  checksum: 845f9a2534356cd0e9c1ae590ed471bbe8d74c318915b92a34e8813b8d3441ca8e0eb0fa87a48081e70b63b84d398c5e66a13b8e8040181c10b9d77e9fe3287f
+  checksum: 10c0/3170d16fccc0f4ac5e31323dbab7d0da7b1a4024878ed4d6b4ec86c0df94e12dc335f8d4181e38d97ca7919ac51bc5de4a9c2ec94914a4e51f9e9c05208c9ea9
   languageName: node
   linkType: hard
 
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: 782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
+  checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
   languageName: node
   linkType: hard
 
 "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
   version: 2.0.5
   resolution: "get-caller-file@npm:2.0.5"
-  checksum: c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
+  checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
   languageName: node
   linkType: hard
 
 "get-east-asian-width@npm:^1.0.0":
   version: 1.2.0
   resolution: "get-east-asian-width@npm:1.2.0"
-  checksum: 914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
+  checksum: 10c0/914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "get-intrinsic@npm:1.2.2"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
+    es-errors: "npm:^1.3.0"
     function-bind: "npm:^1.1.2"
     has-proto: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
     hasown: "npm:^2.0.0"
-  checksum: 4e7fb8adc6172bae7c4fe579569b4d5238b3667c07931cd46b4eee74bbe6ff6b91329bec311a638d8e60f5b51f44fe5445693c6be89ae88d4b5c49f7ff12db0b
+  checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7
   languageName: node
   linkType: hard
 
 "get-own-enumerable-property-symbols@npm:^3.0.0":
   version: 3.0.2
   resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
-  checksum: 103999855f3d1718c631472437161d76962cbddcd95cc642a34c07bfb661ed41b6c09a9c669ccdff89ee965beb7126b80eec7b2101e20e31e9cc6c4725305e10
+  checksum: 10c0/103999855f3d1718c631472437161d76962cbddcd95cc642a34c07bfb661ed41b6c09a9c669ccdff89ee965beb7126b80eec7b2101e20e31e9cc6c4725305e10
   languageName: node
   linkType: hard
 
 "get-package-type@npm:^0.1.0":
   version: 0.1.0
   resolution: "get-package-type@npm:0.1.0"
-  checksum: e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
+  checksum: 10c0/e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
   languageName: node
   linkType: hard
 
@@ -8454,31 +8839,32 @@ __metadata:
   resolution: "get-stream@npm:4.1.0"
   dependencies:
     pump: "npm:^3.0.0"
-  checksum: 294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539
+  checksum: 10c0/294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539
   languageName: node
   linkType: hard
 
-"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
+"get-stream@npm:^6.0.0":
   version: 6.0.1
   resolution: "get-stream@npm:6.0.1"
-  checksum: 49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
+  checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
   languageName: node
   linkType: hard
 
 "get-stream@npm:^8.0.1":
   version: 8.0.1
   resolution: "get-stream@npm:8.0.1"
-  checksum: 5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
+  checksum: 10c0/5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.1"
-  checksum: 23bc3b44c221cdf7669a88230c62f4b9e30393b61eb21ba4400cb3e346801bd8f95fe4330ee78dbae37aecd874646d53e3e76a17a654d0c84c77f6690526d6bb
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc
   languageName: node
   linkType: hard
 
@@ -8487,14 +8873,14 @@ __metadata:
   resolution: "get-tsconfig@npm:4.7.2"
   dependencies:
     resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 169b2beababfbb16e8a0ae813ee59d3e14d4960231c816615161ab5be68ec07a394dce59695742ac84295e2efab8d9e89bcf3abaf5e253dfbec3496e01bb9a65
+  checksum: 10c0/169b2beababfbb16e8a0ae813ee59d3e14d4960231c816615161ab5be68ec07a394dce59695742ac84295e2efab8d9e89bcf3abaf5e253dfbec3496e01bb9a65
   languageName: node
   linkType: hard
 
 "get-value@npm:^2.0.3, get-value@npm:^2.0.6":
   version: 2.0.6
   resolution: "get-value@npm:2.0.6"
-  checksum: f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9
+  checksum: 10c0/f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9
   languageName: node
   linkType: hard
 
@@ -8504,7 +8890,7 @@ __metadata:
   dependencies:
     is-glob: "npm:^3.1.0"
     path-dirname: "npm:^1.0.0"
-  checksum: bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d
+  checksum: 10c0/bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d
   languageName: node
   linkType: hard
 
@@ -8513,7 +8899,7 @@ __metadata:
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
     is-glob: "npm:^4.0.1"
-  checksum: cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
+  checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
   languageName: node
   linkType: hard
 
@@ -8522,22 +8908,22 @@ __metadata:
   resolution: "glob-parent@npm:6.0.2"
   dependencies:
     is-glob: "npm:^4.0.3"
-  checksum: 317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
+  checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
   languageName: node
   linkType: hard
 
 "glob@npm:^10.2.2, glob@npm:^10.2.6, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
+  version: 10.3.15
+  resolution: "glob@npm:10.3.15"
   dependencies:
     foreground-child: "npm:^3.1.0"
-    jackspeak: "npm:^2.3.5"
+    jackspeak: "npm:^2.3.6"
     minimatch: "npm:^9.0.1"
-    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry: "npm:^1.10.1"
+    minipass: "npm:^7.0.4"
+    path-scurry: "npm:^1.11.0"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
+  checksum: 10c0/cda748ddc181b31b3df9548c0991800406d5cc3b3f8110e37a8751ec1e39f37cdae7d7782d5422d7df92775121cdf00599992dff22f7ff1260344843af227c2b
   languageName: node
   linkType: hard
 
@@ -8551,7 +8937,7 @@ __metadata:
     minimatch: "npm:^3.1.1"
     once: "npm:^1.3.0"
     path-is-absolute: "npm:^1.0.0"
-  checksum: 65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
+  checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
   languageName: node
   linkType: hard
 
@@ -8562,7 +8948,7 @@ __metadata:
     global-prefix: "npm:^1.0.1"
     is-windows: "npm:^1.0.1"
     resolve-dir: "npm:^1.0.0"
-  checksum: 7d91ecf78d4fcbc966b2d89c1400df273afea795bc8cadf39857ee1684e442065621fd79413ff5fcd9e90c6f1b2dc0123e644fa0b7811f987fd54c6b9afad858
+  checksum: 10c0/7d91ecf78d4fcbc966b2d89c1400df273afea795bc8cadf39857ee1684e442065621fd79413ff5fcd9e90c6f1b2dc0123e644fa0b7811f987fd54c6b9afad858
   languageName: node
   linkType: hard
 
@@ -8571,7 +8957,7 @@ __metadata:
   resolution: "global-modules@npm:2.0.0"
   dependencies:
     global-prefix: "npm:^3.0.0"
-  checksum: 43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9
+  checksum: 10c0/43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9
   languageName: node
   linkType: hard
 
@@ -8584,7 +8970,7 @@ __metadata:
     ini: "npm:^1.3.4"
     is-windows: "npm:^1.0.1"
     which: "npm:^1.2.14"
-  checksum: d8037e300f1dc04d5d410d16afa662e71bfad22dcceba6c9727bb55cc273b8988ca940b3402f62e5392fd261dd9924a9a73a865ef2000219461f31f3fc86be06
+  checksum: 10c0/d8037e300f1dc04d5d410d16afa662e71bfad22dcceba6c9727bb55cc273b8988ca940b3402f62e5392fd261dd9924a9a73a865ef2000219461f31f3fc86be06
   languageName: node
   linkType: hard
 
@@ -8595,14 +8981,14 @@ __metadata:
     ini: "npm:^1.3.5"
     kind-of: "npm:^6.0.2"
     which: "npm:^1.3.1"
-  checksum: 510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269
+  checksum: 10c0/510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269
   languageName: node
   linkType: hard
 
 "globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
-  checksum: 758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
+  checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
   languageName: node
   linkType: hard
 
@@ -8611,7 +8997,7 @@ __metadata:
   resolution: "globals@npm:13.23.0"
   dependencies:
     type-fest: "npm:^0.20.2"
-  checksum: fc05e184b3be59bffa2580f28551a12a758c3a18df4be91444202982c76f13f52821ad54ffaf7d3f2a4d2498fdf54aeaca8d4540fd9e860a9edb09d34ef4c507
+  checksum: 10c0/fc05e184b3be59bffa2580f28551a12a758c3a18df4be91444202982c76f13f52821ad54ffaf7d3f2a4d2498fdf54aeaca8d4540fd9e860a9edb09d34ef4c507
   languageName: node
   linkType: hard
 
@@ -8620,7 +9006,7 @@ __metadata:
   resolution: "globalthis@npm:1.0.3"
   dependencies:
     define-properties: "npm:^1.1.3"
-  checksum: 0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
+  checksum: 10c0/0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
   languageName: node
   linkType: hard
 
@@ -8634,7 +9020,7 @@ __metadata:
     ignore: "npm:^5.2.0"
     merge2: "npm:^1.4.1"
     slash: "npm:^3.0.0"
-  checksum: b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
+  checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
   languageName: node
   linkType: hard
 
@@ -8647,14 +9033,14 @@ __metadata:
     object-assign: "npm:^4.0.1"
     pify: "npm:^2.0.0"
     pinkie-promise: "npm:^2.0.0"
-  checksum: 656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84
+  checksum: 10c0/656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84
   languageName: node
   linkType: hard
 
 "globjoin@npm:^0.1.4":
   version: 0.1.4
   resolution: "globjoin@npm:0.1.4"
-  checksum: 236e991b48f1a9869fe2aa7bb5141fb1f32973940567a3c012f8ccb58c3c85ab78ce594d374fa819410fff3b48cfd24584d7ef726939f8a3c3772890e62ea16b
+  checksum: 10c0/236e991b48f1a9869fe2aa7bb5141fb1f32973940567a3c012f8ccb58c3c85ab78ce594d374fa819410fff3b48cfd24584d7ef726939f8a3c3772890e62ea16b
   languageName: node
   linkType: hard
 
@@ -8663,21 +9049,21 @@ __metadata:
   resolution: "gopd@npm:1.0.1"
   dependencies:
     get-intrinsic: "npm:^1.1.3"
-  checksum: 505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
+  checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
   languageName: node
   linkType: hard
 
 "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
-  checksum: 386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
+  checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
   languageName: node
   linkType: hard
 
 "graphemer@npm:^1.4.0":
   version: 1.4.0
   resolution: "graphemer@npm:1.4.0"
-  checksum: e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
+  checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
   languageName: node
   linkType: hard
 
@@ -8686,74 +9072,67 @@ __metadata:
   resolution: "gzip-size@npm:6.0.0"
   dependencies:
     duplexer: "npm:^0.1.2"
-  checksum: 4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
+  checksum: 10c0/4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
   languageName: node
   linkType: hard
 
 "handle-thing@npm:^2.0.0":
   version: 2.0.1
   resolution: "handle-thing@npm:2.0.1"
-  checksum: 7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998
+  checksum: 10c0/7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998
   languageName: node
   linkType: hard
 
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
-  checksum: 724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
+  checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
   languageName: node
   linkType: hard
 
 "has-flag@npm:^3.0.0":
   version: 3.0.0
   resolution: "has-flag@npm:3.0.0"
-  checksum: 1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
+  checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
   languageName: node
   linkType: hard
 
 "has-flag@npm:^4.0.0":
   version: 4.0.0
   resolution: "has-flag@npm:4.0.0"
-  checksum: 2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
+  checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.1, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
-    get-intrinsic: "npm:^1.1.1"
-  checksum: d4ca882b6960d6257bd28baa3ddfa21f068d260411004a093b30ca357c740e11e985771c85216a6d1eef4161e862657f48c4758ec8ab515223b3895200ad164b
+    es-define-property: "npm:^1.0.0"
+  checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: c8a8fe411f810b23a564bd5546a8f3f0fff6f1b692740eb7a2fdc9df716ef870040806891e2f23ff4653f1083e3895bf12088703dd1a0eac3d9202d3a4768cd0
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205
   languageName: node
   linkType: hard
 
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
-  checksum: e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
+  checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
-    has-symbols: "npm:^1.0.2"
-  checksum: 1cdba76b7d13f65198a92b8ca1560ba40edfa09e85d182bf436d928f3588a9ebd260451d569f0ed1b849c4bf54f49c862aa0d0a77f9552b1855bb6deb526c011
-  languageName: node
-  linkType: hard
-
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c
+    has-symbols: "npm:^1.0.3"
+  checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c
   languageName: node
   linkType: hard
 
@@ -8764,7 +9143,7 @@ __metadata:
     get-value: "npm:^2.0.3"
     has-values: "npm:^0.1.4"
     isobject: "npm:^2.0.0"
-  checksum: 7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432
+  checksum: 10c0/7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432
   languageName: node
   linkType: hard
 
@@ -8775,14 +9154,14 @@ __metadata:
     get-value: "npm:^2.0.6"
     has-values: "npm:^1.0.0"
     isobject: "npm:^3.0.0"
-  checksum: 17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d
+  checksum: 10c0/17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d
   languageName: node
   linkType: hard
 
 "has-values@npm:^0.1.4":
   version: 0.1.4
   resolution: "has-values@npm:0.1.4"
-  checksum: a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2
+  checksum: 10c0/a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2
   languageName: node
   linkType: hard
 
@@ -8792,14 +9171,7 @@ __metadata:
   dependencies:
     is-number: "npm:^3.0.0"
     kind-of: "npm:^4.0.0"
-  checksum: a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e
-  languageName: node
-  linkType: hard
-
-"has@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "has@npm:1.0.4"
-  checksum: 82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b
+  checksum: 10c0/a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e
   languageName: node
   linkType: hard
 
@@ -8810,7 +9182,7 @@ __metadata:
     inherits: "npm:^2.0.4"
     readable-stream: "npm:^3.6.0"
     safe-buffer: "npm:^5.2.0"
-  checksum: 663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0
+  checksum: 10c0/663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0
   languageName: node
   linkType: hard
 
@@ -8820,16 +9192,23 @@ __metadata:
   dependencies:
     inherits: "npm:^2.0.3"
     minimalistic-assert: "npm:^1.0.1"
-  checksum: 41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4
+  checksum: 10c0/41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "hasown@npm:2.0.1"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc
+  checksum: 10c0/9e27e70e8e4204f4124c8f99950d1ba2b1f5174864fd39ff26da190f9ea6488c1b3927dcc64981c26d1f637a971783c9489d62c829d393ea509e6f1ba20370bb
+  languageName: node
+  linkType: hard
+
+"help-me@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "help-me@npm:5.0.0"
+  checksum: 10c0/054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
   languageName: node
   linkType: hard
 
@@ -8843,7 +9222,7 @@ __metadata:
     tiny-invariant: "npm:^1.0.2"
     tiny-warning: "npm:^1.0.0"
     value-equal: "npm:^1.0.1"
-  checksum: 35377694e4f10f2cf056a9cb1a8ee083e04e4b4717a63baeee4afd565658a62c7e73700bf9e82aa53dbe1ec94e0a25a83c080d63bad8ee6b274a98d2fbc5ed4c
+  checksum: 10c0/35377694e4f10f2cf056a9cb1a8ee083e04e4b4717a63baeee4afd565658a62c7e73700bf9e82aa53dbe1ec94e0a25a83c080d63bad8ee6b274a98d2fbc5ed4c
   languageName: node
   linkType: hard
 
@@ -8854,7 +9233,7 @@ __metadata:
     hash.js: "npm:^1.0.3"
     minimalistic-assert: "npm:^1.0.0"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d
+  checksum: 10c0/f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d
   languageName: node
   linkType: hard
 
@@ -8863,7 +9242,7 @@ __metadata:
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
     react-is: "npm:^16.7.0"
-  checksum: fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74
+  checksum: 10c0/fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74
   languageName: node
   linkType: hard
 
@@ -8872,7 +9251,7 @@ __metadata:
   resolution: "homedir-polyfill@npm:1.0.3"
   dependencies:
     parse-passwd: "npm:^1.0.0"
-  checksum: 3c099844f94b8b438f124bd5698bdcfef32b2d455115fb8050d7148e7f7b95fc89ba9922586c491f0e1cdebf437b1053c84ecddb8d596e109e9ac69c5b4a9e27
+  checksum: 10c0/3c099844f94b8b438f124bd5698bdcfef32b2d455115fb8050d7148e7f7b95fc89ba9922586c491f0e1cdebf437b1053c84ecddb8d596e109e9ac69c5b4a9e27
   languageName: node
   linkType: hard
 
@@ -8884,7 +9263,7 @@ __metadata:
     obuf: "npm:^1.0.0"
     readable-stream: "npm:^2.0.1"
     wbuf: "npm:^1.1.0"
-  checksum: 55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0
+  checksum: 10c0/55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0
   languageName: node
   linkType: hard
 
@@ -8893,7 +9272,7 @@ __metadata:
   resolution: "html-encoding-sniffer@npm:3.0.0"
   dependencies:
     whatwg-encoding: "npm:^2.0.0"
-  checksum: b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
+  checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
   languageName: node
   linkType: hard
 
@@ -8902,42 +9281,42 @@ __metadata:
   resolution: "html-encoding-sniffer@npm:4.0.0"
   dependencies:
     whatwg-encoding: "npm:^3.1.1"
-  checksum: 523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140
+  checksum: 10c0/523398055dc61ac9b34718a719cb4aa691e4166f29187e211e1607de63dc25ac7af52ca7c9aead0c4b3c0415ffecb17326396e1202e2e86ff4bca4c0ee4c6140
   languageName: node
   linkType: hard
 
 "html-entities@npm:^1.3.1":
   version: 1.4.0
   resolution: "html-entities@npm:1.4.0"
-  checksum: eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85
+  checksum: 10c0/eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85
   languageName: node
   linkType: hard
 
 "html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
   version: 2.0.2
   resolution: "html-escaper@npm:2.0.2"
-  checksum: 208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
+  checksum: 10c0/208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
   languageName: node
   linkType: hard
 
 "html-tags@npm:^3.3.1":
   version: 3.3.1
   resolution: "html-tags@npm:3.3.1"
-  checksum: 680165e12baa51bad7397452d247dbcc5a5c29dac0e6754b1187eee3bf26f514bc1907a431dd2f7eb56207611ae595ee76a0acc8eaa0d931e72c791dd6463d79
+  checksum: 10c0/680165e12baa51bad7397452d247dbcc5a5c29dac0e6754b1187eee3bf26f514bc1907a431dd2f7eb56207611ae595ee76a0acc8eaa0d931e72c791dd6463d79
   languageName: node
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
   languageName: node
   linkType: hard
 
 "http-deceiver@npm:^1.2.7":
   version: 1.2.7
   resolution: "http-deceiver@npm:1.2.7"
-  checksum: 8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03
+  checksum: 10c0/8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03
   languageName: node
   linkType: hard
 
@@ -8950,7 +9329,7 @@ __metadata:
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
     toidentifier: "npm:1.0.1"
-  checksum: fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
+  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
   languageName: node
   linkType: hard
 
@@ -8962,21 +9341,21 @@ __metadata:
     inherits: "npm:2.0.3"
     setprototypeof: "npm:1.1.0"
     statuses: "npm:>= 1.4.0 < 2"
-  checksum: 17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78
+  checksum: 10c0/17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78
   languageName: node
   linkType: hard
 
 "http-link-header@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "http-link-header@npm:1.1.1"
-  checksum: a97b679e01e9f0860c823917c2c6637e3f0c06aa6cc0de4da98e1a433690e19b21323595889aa9347618134600bc7e2b0ff3cbeea7e4cea2f8cdae65dd9cc7f1
+  version: 1.1.3
+  resolution: "http-link-header@npm:1.1.3"
+  checksum: 10c0/56698a9d3aee4d5319d1cdfe62ef5d7179f179ec1e6432d23c9e6a0c896be642ba47a4985a45419cff91008032aef920aca9df94ff9e763e646c83bf54b7243d
   languageName: node
   linkType: hard
 
 "http-parser-js@npm:>=0.5.1":
   version: 0.5.8
   resolution: "http-parser-js@npm:0.5.8"
-  checksum: 4ed89f812c44f84c4ae5d43dd3a0c47942b875b63be0ed2ccecbe6b0018af867d806495fc6e12474aff868721163699c49246585bddea4f0ecc6d2b02e19faf1
+  checksum: 10c0/4ed89f812c44f84c4ae5d43dd3a0c47942b875b63be0ed2ccecbe6b0018af867d806495fc6e12474aff868721163699c49246585bddea4f0ecc6d2b02e19faf1
   languageName: node
   linkType: hard
 
@@ -8987,7 +9366,7 @@ __metadata:
     "@tootallnate/once": "npm:2"
     agent-base: "npm:6"
     debug: "npm:4"
-  checksum: 32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
+  checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
   languageName: node
   linkType: hard
 
@@ -8997,7 +9376,7 @@ __metadata:
   dependencies:
     agent-base: "npm:^7.1.0"
     debug: "npm:^4.3.4"
-  checksum: a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
+  checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
   languageName: node
   linkType: hard
 
@@ -9009,7 +9388,7 @@ __metadata:
     is-glob: "npm:^4.0.0"
     lodash: "npm:^4.17.11"
     micromatch: "npm:^3.1.10"
-  checksum: b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1
+  checksum: 10c0/b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1
   languageName: node
   linkType: hard
 
@@ -9020,14 +9399,14 @@ __metadata:
     eventemitter3: "npm:^4.0.0"
     follow-redirects: "npm:^1.0.0"
     requires-port: "npm:^1.0.0"
-  checksum: 148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94
+  checksum: 10c0/148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94
   languageName: node
   linkType: hard
 
 "https-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "https-browserify@npm:1.0.0"
-  checksum: e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae
+  checksum: 10c0/e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae
   languageName: node
   linkType: hard
 
@@ -9037,7 +9416,7 @@ __metadata:
   dependencies:
     agent-base: "npm:6"
     debug: "npm:4"
-  checksum: 6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
+  checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
   languageName: node
   linkType: hard
 
@@ -9047,37 +9426,30 @@ __metadata:
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
+  checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
   languageName: node
   linkType: hard
 
 "human-signals@npm:^2.1.0":
   version: 2.1.0
   resolution: "human-signals@npm:2.1.0"
-  checksum: 695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "human-signals@npm:4.3.1"
-  checksum: 40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c
+  checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
   languageName: node
   linkType: hard
 
 "human-signals@npm:^5.0.0":
   version: 5.0.0
   resolution: "human-signals@npm:5.0.0"
-  checksum: 5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
+  checksum: 10c0/5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
   languageName: node
   linkType: hard
 
-"husky@npm:^8.0.3":
-  version: 8.0.3
-  resolution: "husky@npm:8.0.3"
+"husky@npm:^9.0.11":
+  version: 9.0.11
+  resolution: "husky@npm:9.0.11"
   bin:
-    husky: lib/bin.js
-  checksum: 6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668
+    husky: bin.mjs
+  checksum: 10c0/2c787dcf74a837fc9a4fea7da907509d4bd9a289f4ea10ecc9d86279e4d4542b0f5f6443a619bccae19e265f2677172cc2b86aae5c932a35a330cc227d914605
   languageName: node
   linkType: hard
 
@@ -9086,7 +9458,7 @@ __metadata:
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
     safer-buffer: "npm:>= 2.1.2 < 3"
-  checksum: c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4
+  checksum: 10c0/c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4
   languageName: node
   linkType: hard
 
@@ -9095,7 +9467,7 @@ __metadata:
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
     safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
   languageName: node
   linkType: hard
 
@@ -9104,56 +9476,56 @@ __metadata:
   resolution: "icss-utils@npm:5.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
+  checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
   languageName: node
   linkType: hard
 
 "idb-keyval@npm:^3.2.0":
   version: 3.2.0
   resolution: "idb-keyval@npm:3.2.0"
-  checksum: 9b1f65d5f08630ef444a89334370c394175b1543f157621b36a3bc5e5208946f3f0ab5d5e24c74e81f2ef54b55b742b4e5b439c561f62695ffb69a06b0bce8e1
+  checksum: 10c0/9b1f65d5f08630ef444a89334370c394175b1543f157621b36a3bc5e5208946f3f0ab5d5e24c74e81f2ef54b55b742b4e5b439c561f62695ffb69a06b0bce8e1
   languageName: node
   linkType: hard
 
 "idb@npm:^7.0.1":
   version: 7.1.1
   resolution: "idb@npm:7.1.1"
-  checksum: 72418e4397638797ee2089f97b45fc29f937b830bc0eb4126f4a9889ecf10320ceacf3a177fe5d7ffaf6b4fe38b20bbd210151549bfdc881db8081eed41c870d
+  checksum: 10c0/72418e4397638797ee2089f97b45fc29f937b830bc0eb4126f4a9889ecf10320ceacf3a177fe5d7ffaf6b4fe38b20bbd210151549bfdc881db8081eed41c870d
   languageName: node
   linkType: hard
 
 "ieee754@npm:^1.1.4, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
-  checksum: b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
+  checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "ignore@npm:5.3.0"
-  checksum: dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
+"ignore@npm:^5.2.0, ignore@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
   languageName: node
   linkType: hard
 
 "immer@npm:^10.0.3":
   version: 10.0.3
   resolution: "immer@npm:10.0.3"
-  checksum: 282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
+  checksum: 10c0/282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
   languageName: node
   linkType: hard
 
 "immutable@npm:^3.8.2":
   version: 3.8.2
   resolution: "immutable@npm:3.8.2"
-  checksum: fb6a2999ad3bda9e51741721e42547076dd492635ee4df9241224055fe953ec843583a700088cc4915f23dc326e5084f4e17f1bbd7388c3e872ef5a242e0ac5e
+  checksum: 10c0/fb6a2999ad3bda9e51741721e42547076dd492635ee4df9241224055fe953ec843583a700088cc4915f23dc326e5084f4e17f1bbd7388c3e872ef5a242e0ac5e
   languageName: node
   linkType: hard
 
 "immutable@npm:^4.0.0, immutable@npm:^4.0.0-rc.1, immutable@npm:^4.3.0":
-  version: 4.3.4
-  resolution: "immutable@npm:4.3.4"
-  checksum: c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f
+  version: 4.3.6
+  resolution: "immutable@npm:4.3.6"
+  checksum: 10c0/7d0952a768b4fadcee47230ed86dc9505a4517095eceaf5a47e65288571c42400c6e4a2ae21eca4eda957cb7bc50720213135b62cf6a181639111f8acae128c3
   languageName: node
   linkType: hard
 
@@ -9163,7 +9535,7 @@ __metadata:
   dependencies:
     parent-module: "npm:^1.0.0"
     resolve-from: "npm:^4.0.0"
-  checksum: 7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
+  checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
   languageName: node
   linkType: hard
 
@@ -9175,7 +9547,7 @@ __metadata:
     resolve-cwd: "npm:^2.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: 68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e
+  checksum: 10c0/68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e
   languageName: node
   linkType: hard
 
@@ -9187,7 +9559,7 @@ __metadata:
     resolve-cwd: "npm:^3.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
+  checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
   languageName: node
   linkType: hard
 
@@ -9201,28 +9573,28 @@ __metadata:
     strip-comments: "npm:^2.0.1"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: b77a0016808ebe6e5eec083a3afb94879b03653922dd4bc2b9c9aae13093e804d4089f7da171d1395f78d357de581ca3a4aea9100293dcbe02cf6c1e861085bf
+  checksum: 10c0/b77a0016808ebe6e5eec083a3afb94879b03653922dd4bc2b9c9aae13093e804d4089f7da171d1395f78d357de581ca3a4aea9100293dcbe02cf6c1e861085bf
   languageName: node
   linkType: hard
 
 "imurmurhash@npm:^0.1.4":
   version: 0.1.4
   resolution: "imurmurhash@npm:0.1.4"
-  checksum: 8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
+  checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
   languageName: node
   linkType: hard
 
 "indent-string@npm:^4.0.0":
   version: 4.0.0
   resolution: "indent-string@npm:4.0.0"
-  checksum: 1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
   languageName: node
   linkType: hard
 
 "infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
-  checksum: a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
+  checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
   languageName: node
   linkType: hard
 
@@ -9232,35 +9604,35 @@ __metadata:
   dependencies:
     once: "npm:^1.3.0"
     wrappy: "npm:1"
-  checksum: 7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
+  checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
   languageName: node
   linkType: hard
 
 "inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
-  checksum: 4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
+  checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
   languageName: node
   linkType: hard
 
 "inherits@npm:2.0.1":
   version: 2.0.1
   resolution: "inherits@npm:2.0.1"
-  checksum: bfc7b37c21a2cddb272adc65b053b1716612d408bb2c9a4e5c32679dc2b08032aadd67880c405be3dff060a62e45b353fc3d9fa79a3067ad7a3deb6a283cc5c6
+  checksum: 10c0/bfc7b37c21a2cddb272adc65b053b1716612d408bb2c9a4e5c32679dc2b08032aadd67880c405be3dff060a62e45b353fc3d9fa79a3067ad7a3deb6a283cc5c6
   languageName: node
   linkType: hard
 
 "inherits@npm:2.0.3":
   version: 2.0.3
   resolution: "inherits@npm:2.0.3"
-  checksum: 6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7
+  checksum: 10c0/6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7
   languageName: node
   linkType: hard
 
 "ini@npm:^1.3.4, ini@npm:^1.3.5":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
-  checksum: ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a
+  checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a
   languageName: node
   linkType: hard
 
@@ -9270,44 +9642,44 @@ __metadata:
   dependencies:
     default-gateway: "npm:^4.2.0"
     ipaddr.js: "npm:^1.9.0"
-  checksum: c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b
+  checksum: 10c0/c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "internal-slot@npm:1.0.5"
+"internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
   dependencies:
-    get-intrinsic: "npm:^1.2.0"
-    has: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.0"
     side-channel: "npm:^1.0.4"
-  checksum: 66d8a66b4b5310c042e8ad00ce895dc55cb25165a3a7da0d7862ca18d69d3b1ba86511b4bf3baf4273d744d3f6e9154574af45189ef11135a444945309e39e4a
+  checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c
   languageName: node
   linkType: hard
 
 "interpret@npm:^1.4.0":
   version: 1.4.0
   resolution: "interpret@npm:1.4.0"
-  checksum: 08c5ad30032edeec638485bc3f6db7d0094d9b3e85e0f950866600af3c52e9fd69715416d29564731c479d9f4d43ff3e4d302a178196bdc0e6837ec147640450
+  checksum: 10c0/08c5ad30032edeec638485bc3f6db7d0094d9b3e85e0f950866600af3c52e9fd69715416d29564731c479d9f4d43ff3e4d302a178196bdc0e6837ec147640450
   languageName: node
   linkType: hard
 
 "intersection-observer@npm:^0.12.0":
   version: 0.12.2
   resolution: "intersection-observer@npm:0.12.2"
-  checksum: 9591f46b2b742f5801ed69dbc8860f487771b4af8361e7a5dcb28a377beff2ba56336a2b090af261825430d225dae9417121496d2e6925e000e4a469958843ff
+  checksum: 10c0/9591f46b2b742f5801ed69dbc8860f487771b4af8361e7a5dcb28a377beff2ba56336a2b090af261825430d225dae9417121496d2e6925e000e4a469958843ff
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.8, intl-messageformat@npm:^10.3.5":
-  version: 10.5.8
-  resolution: "intl-messageformat@npm:10.5.8"
+"intl-messageformat@npm:10.5.12, intl-messageformat@npm:^10.3.5":
+  version: 10.5.12
+  resolution: "intl-messageformat@npm:10.5.12"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
     tslib: "npm:^2.4.0"
-  checksum: 1d2854aae8471ec48165ca265760d6c5b1814eca831c88db698eb29b5ed20bee21ca8533090c9d28d9c6f1d844dda210b0bc58a2e036446158fae0845e5eed4f
+  checksum: 10c0/f95734e98a05ef7f51de0c27904d3a994528e3a174963bd1b3a6db9416b5fd84bbd8f7d26d84fc547d51af69ccf46dd3f73a3f4f20a2ccef5c9cd90e946ad82c
   languageName: node
   linkType: hard
 
@@ -9316,13 +9688,13 @@ __metadata:
   resolution: "invariant@npm:2.2.4"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: 5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc
+  checksum: 10c0/5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc
   languageName: node
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "ioredis@npm:5.3.2"
+  version: 5.4.1
+  resolution: "ioredis@npm:5.4.1"
   dependencies:
     "@ioredis/commands": "npm:^1.1.1"
     cluster-key-slot: "npm:^1.1.0"
@@ -9333,42 +9705,42 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 0dd2b5b8004e891f5b62edf18ac223194f1f5204698ec827c903e789ea05b0b36f73395491749ec63c66470485bdfb228ccdf1714fbf631a0f78f33211f2c883
+  checksum: 10c0/5d28b7c89a3cab5b76d75923d7d4ce79172b3a1ca9be690133f6e8e393a7a4b4ffd55513e618bbb5504fed80d9e1395c9d9531a7c5c5c84aa4c4e765cca75456
   languageName: node
   linkType: hard
 
 "ip-regex@npm:^2.1.0":
   version: 2.1.0
   resolution: "ip-regex@npm:2.1.0"
-  checksum: 3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541
+  checksum: 10c0/3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541
   languageName: node
   linkType: hard
 
 "ip@npm:^1.1.0, ip@npm:^1.1.5":
   version: 1.1.8
   resolution: "ip@npm:1.1.8"
-  checksum: ab32a5ecfa678d4c158c1381c4c6744fce89a1d793e1b6635ba79d0753c069030b672d765887b6fff55670c711dfa47475895e5d6013efbbcf04687c51cb8db9
+  checksum: 10c0/ab32a5ecfa678d4c158c1381c4c6744fce89a1d793e1b6635ba79d0753c069030b672d765887b6fff55670c711dfa47475895e5d6013efbbcf04687c51cb8db9
   languageName: node
   linkType: hard
 
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
-  checksum: 8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958
+  checksum: 10c0/8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958
   languageName: node
   linkType: hard
 
 "ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0":
   version: 1.9.1
   resolution: "ipaddr.js@npm:1.9.1"
-  checksum: 0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
+  checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
   languageName: node
   linkType: hard
 
 "is-absolute-url@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-absolute-url@npm:3.0.3"
-  checksum: 04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0
+  checksum: 10c0/04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0
   languageName: node
   linkType: hard
 
@@ -9377,7 +9749,7 @@ __metadata:
   resolution: "is-accessor-descriptor@npm:0.1.6"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: f2c314b314ec6e8a6e559351bff3c7ee9aed7a5e9c6f61dd8cb9e1382c8bfe33dca3f0e0af13daf9ded9e6e66390ff23b4acfb615d7a249009a51506a7b0f151
+  checksum: 10c0/f2c314b314ec6e8a6e559351bff3c7ee9aed7a5e9c6f61dd8cb9e1382c8bfe33dca3f0e0af13daf9ded9e6e66390ff23b4acfb615d7a249009a51506a7b0f151
   languageName: node
   linkType: hard
 
@@ -9386,35 +9758,34 @@ __metadata:
   resolution: "is-accessor-descriptor@npm:1.0.0"
   dependencies:
     kind-of: "npm:^6.0.0"
-  checksum: d68edafd8ef133e9003837f3c80f4e5b82b12ab5456c772d1796857671ae83e3a426ed225a28a7e35bceabbce68c1f1ffdabf47e6d53f5a4d6c4558776ad3c20
+  checksum: 10c0/d68edafd8ef133e9003837f3c80f4e5b82b12ab5456c772d1796857671ae83e3a426ed225a28a7e35bceabbce68c1f1ffdabf47e6d53f5a4d6c4558776ad3c20
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+"is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 5ff1f341ee4475350adfc14b2328b38962564b7c2076be2f5bac7bd9b61779efba99b9f844a7b82ba7654adccf8e8eb19d1bb0cc6d1c1a085e498f6793d4328f
+  checksum: 10c0/5ff1f341ee4475350adfc14b2328b38962564b7c2076be2f5bac7bd9b61779efba99b9f844a7b82ba7654adccf8e8eb19d1bb0cc6d1c1a085e498f6793d4328f
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "is-array-buffer@npm:3.0.2"
+"is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
     call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.0"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 40ed13a5f5746ac3ae2f2e463687d9b5a3f5fd0086f970fb4898f0253c2a5ec2e3caea2d664dd8f54761b1c1948609702416921a22faebe160c7640a9217c80e
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860
   languageName: node
   linkType: hard
 
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
-  checksum: e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
+  checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
   languageName: node
   linkType: hard
 
@@ -9423,7 +9794,7 @@ __metadata:
   resolution: "is-async-function@npm:2.0.0"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: 787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
+  checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
   languageName: node
   linkType: hard
 
@@ -9432,7 +9803,7 @@ __metadata:
   resolution: "is-bigint@npm:1.0.4"
   dependencies:
     has-bigints: "npm:^1.0.1"
-  checksum: eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
+  checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
   languageName: node
   linkType: hard
 
@@ -9441,7 +9812,7 @@ __metadata:
   resolution: "is-binary-path@npm:1.0.1"
   dependencies:
     binary-extensions: "npm:^1.0.0"
-  checksum: 16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643
+  checksum: 10c0/16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643
   languageName: node
   linkType: hard
 
@@ -9450,7 +9821,7 @@ __metadata:
   resolution: "is-binary-path@npm:2.1.0"
   dependencies:
     binary-extensions: "npm:^2.0.0"
-  checksum: a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
+  checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
   languageName: node
   linkType: hard
 
@@ -9460,7 +9831,7 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: 6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
+  checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
   languageName: node
   linkType: hard
 
@@ -9469,23 +9840,23 @@ __metadata:
   resolution: "is-builtin-module@npm:3.2.1"
   dependencies:
     builtin-modules: "npm:^3.3.0"
-  checksum: 5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1
+  checksum: 10c0/5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1
   languageName: node
   linkType: hard
 
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
-  checksum: ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
+  checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
     hasown: "npm:^2.0.0"
-  checksum: 2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
   languageName: node
   linkType: hard
 
@@ -9494,7 +9865,7 @@ __metadata:
   resolution: "is-data-descriptor@npm:0.1.4"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: 32fda7e966b2c1f093230d5ef2aad1bb86e43e7280da50961e38ec31dbd8a50570a2911fd45277d321074a0762adc98e8462bb62820462594128857225e90d21
+  checksum: 10c0/32fda7e966b2c1f093230d5ef2aad1bb86e43e7280da50961e38ec31dbd8a50570a2911fd45277d321074a0762adc98e8462bb62820462594128857225e90d21
   languageName: node
   linkType: hard
 
@@ -9503,7 +9874,7 @@ __metadata:
   resolution: "is-data-descriptor@npm:1.0.0"
   dependencies:
     kind-of: "npm:^6.0.0"
-  checksum: bed31385d7d1a0dbb2ab3077faf2188acf42609192dca4e320ed7b3dc14a9d70c00658956cdaa2c0402be136c6b56e183973ad81b730fd90ab427fb6fd3608be
+  checksum: 10c0/bed31385d7d1a0dbb2ab3077faf2188acf42609192dca4e320ed7b3dc14a9d70c00658956cdaa2c0402be136c6b56e183973ad81b730fd90ab427fb6fd3608be
   languageName: node
   linkType: hard
 
@@ -9512,7 +9883,7 @@ __metadata:
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
+  checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
   languageName: node
   linkType: hard
 
@@ -9523,7 +9894,7 @@ __metadata:
     is-accessor-descriptor: "npm:^0.1.6"
     is-data-descriptor: "npm:^0.1.4"
     kind-of: "npm:^5.0.0"
-  checksum: 6b8f5617b764ef8c6be3d54830184357e6cdedd8e0eddf1b97d0658616ac170bfdbc7c1ad00e0aa9f5b767acdb9d6c63d4df936501784b34936bd0f9acf3b665
+  checksum: 10c0/6b8f5617b764ef8c6be3d54830184357e6cdedd8e0eddf1b97d0658616ac170bfdbc7c1ad00e0aa9f5b767acdb9d6c63d4df936501784b34936bd0f9acf3b665
   languageName: node
   linkType: hard
 
@@ -9534,39 +9905,21 @@ __metadata:
     is-accessor-descriptor: "npm:^1.0.0"
     is-data-descriptor: "npm:^1.0.0"
     kind-of: "npm:^6.0.2"
-  checksum: a05169c7a87feb88fc155e3ada469090cfabb5a548a3f794358b511cc47a0871b8b95e7345be4925a22ef3df585c3923b31943b3ad6255ce563a9d97f2e221e0
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "is-docker@npm:2.2.1"
-  bin:
-    is-docker: cli.js
-  checksum: e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc
-  languageName: node
-  linkType: hard
-
-"is-docker@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-docker@npm:3.0.0"
-  bin:
-    is-docker: cli.js
-  checksum: d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856
+  checksum: 10c0/a05169c7a87feb88fc155e3ada469090cfabb5a548a3f794358b511cc47a0871b8b95e7345be4925a22ef3df585c3923b31943b3ad6255ce563a9d97f2e221e0
   languageName: node
   linkType: hard
 
 "is-electron@npm:^2.2.0":
   version: 2.2.2
   resolution: "is-electron@npm:2.2.2"
-  checksum: 327bb373f7be01b16cdff3998b5ddaa87d28f576092affaa7fe0659571b3306fdd458afbf0683a66841e7999af13f46ad0e1b51647b469526cd05a4dd736438a
+  checksum: 10c0/327bb373f7be01b16cdff3998b5ddaa87d28f576092affaa7fe0659571b3306fdd458afbf0683a66841e7999af13f46ad0e1b51647b469526cd05a4dd736438a
   languageName: node
   linkType: hard
 
 "is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
   version: 0.1.1
   resolution: "is-extendable@npm:0.1.1"
-  checksum: dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879
+  checksum: 10c0/dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879
   languageName: node
   linkType: hard
 
@@ -9575,14 +9928,14 @@ __metadata:
   resolution: "is-extendable@npm:1.0.1"
   dependencies:
     is-plain-object: "npm:^2.0.4"
-  checksum: 1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f
+  checksum: 10c0/1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f
   languageName: node
   linkType: hard
 
 "is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
-  checksum: 5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
+  checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
   languageName: node
   linkType: hard
 
@@ -9591,28 +9944,28 @@ __metadata:
   resolution: "is-finalizationregistry@npm:1.0.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-  checksum: 81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
+  checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-fullwidth-code-point@npm:2.0.0"
-  checksum: e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9
+  checksum: 10c0/e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
+  checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
   languageName: node
   linkType: hard
 
 "is-fullwidth-code-point@npm:^4.0.0":
   version: 4.0.0
   resolution: "is-fullwidth-code-point@npm:4.0.0"
-  checksum: df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8
+  checksum: 10c0/df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8
   languageName: node
   linkType: hard
 
@@ -9621,14 +9974,14 @@ __metadata:
   resolution: "is-fullwidth-code-point@npm:5.0.0"
   dependencies:
     get-east-asian-width: "npm:^1.0.0"
-  checksum: cd591b27d43d76b05fa65ed03eddce57a16e1eca0b7797ff7255de97019bcaf0219acfc0c4f7af13319e13541f2a53c0ace476f442b13267b9a6a7568f2b65c8
+  checksum: 10c0/cd591b27d43d76b05fa65ed03eddce57a16e1eca0b7797ff7255de97019bcaf0219acfc0c4f7af13319e13541f2a53c0ace476f442b13267b9a6a7568f2b65c8
   languageName: node
   linkType: hard
 
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
-  checksum: 2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
+  checksum: 10c0/2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
   languageName: node
   linkType: hard
 
@@ -9637,7 +9990,7 @@ __metadata:
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
+  checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
   languageName: node
   linkType: hard
 
@@ -9646,7 +9999,7 @@ __metadata:
   resolution: "is-glob@npm:3.1.0"
   dependencies:
     is-extglob: "npm:^2.1.0"
-  checksum: ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4
+  checksum: 10c0/ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4
   languageName: node
   linkType: hard
 
@@ -9655,46 +10008,35 @@ __metadata:
   resolution: "is-glob@npm:4.0.3"
   dependencies:
     is-extglob: "npm:^2.1.1"
-  checksum: 17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
-  languageName: node
-  linkType: hard
-
-"is-inside-container@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-inside-container@npm:1.0.0"
-  dependencies:
-    is-docker: "npm:^3.0.0"
-  bin:
-    is-inside-container: cli.js
-  checksum: a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd
+  checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
   languageName: node
   linkType: hard
 
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
-  checksum: 85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+"is-map@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-map@npm:2.0.2"
-  checksum: 119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
+  checksum: 10c0/119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5
   languageName: node
   linkType: hard
 
 "is-module@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-module@npm:1.0.0"
-  checksum: 795a3914bcae7c26a1c23a1e5574c42eac13429625045737bf3e324ce865c0601d61aee7a5afbca1bee8cb300c7d9647e7dc98860c9bdbc3b7fdc51d8ac0bffc
+  checksum: 10c0/795a3914bcae7c26a1c23a1e5574c42eac13429625045737bf3e324ce865c0601d61aee7a5afbca1bee8cb300c7d9647e7dc98860c9bdbc3b7fdc51d8ac0bffc
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-negative-zero@npm:2.0.2"
-  checksum: eda024c158f70f2017f3415e471b818d314da5ef5be68f801b16314d4a4b6304a74cbed778acf9e2f955bb9c1c5f2935c1be0c7c99e1ad12286f45366217b6a3
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
   languageName: node
   linkType: hard
 
@@ -9703,7 +10045,7 @@ __metadata:
   resolution: "is-number-object@npm:1.0.7"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
+  checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
   languageName: node
   linkType: hard
 
@@ -9712,28 +10054,28 @@ __metadata:
   resolution: "is-number@npm:3.0.0"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
+  checksum: 10c0/e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
   languageName: node
   linkType: hard
 
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
-  checksum: b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
+  checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
   languageName: node
   linkType: hard
 
 "is-obj@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-obj@npm:1.0.1"
-  checksum: 5003acba0af7aa47dfe0760e545a89bbac89af37c12092c3efadc755372cdaec034f130e7a3653a59eb3c1843cfc72ca71eaf1a6c3bafe5a0bab3611a47f9945
+  checksum: 10c0/5003acba0af7aa47dfe0760e545a89bbac89af37c12092c3efadc755372cdaec034f130e7a3653a59eb3c1843cfc72ca71eaf1a6c3bafe5a0bab3611a47f9945
   languageName: node
   linkType: hard
 
 "is-path-cwd@npm:^2.0.0":
   version: 2.2.0
   resolution: "is-path-cwd@npm:2.2.0"
-  checksum: afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a
+  checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a
   languageName: node
   linkType: hard
 
@@ -9742,7 +10084,7 @@ __metadata:
   resolution: "is-path-in-cwd@npm:2.1.0"
   dependencies:
     is-path-inside: "npm:^2.1.0"
-  checksum: 674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a
+  checksum: 10c0/674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a
   languageName: node
   linkType: hard
 
@@ -9751,14 +10093,14 @@ __metadata:
   resolution: "is-path-inside@npm:2.1.0"
   dependencies:
     path-is-inside: "npm:^1.0.2"
-  checksum: 50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51
+  checksum: 10c0/50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51
   languageName: node
   linkType: hard
 
 "is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
-  checksum: cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
+  checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
   languageName: node
   linkType: hard
 
@@ -9767,21 +10109,21 @@ __metadata:
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
     isobject: "npm:^3.0.1"
-  checksum: f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
+  checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
   languageName: node
   linkType: hard
 
 "is-plain-object@npm:^5.0.0":
   version: 5.0.0
   resolution: "is-plain-object@npm:5.0.0"
-  checksum: 893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
+  checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
   languageName: node
   linkType: hard
 
 "is-potential-custom-element-name@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
+  checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
   languageName: node
   linkType: hard
 
@@ -9791,51 +10133,51 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     has-tostringtag: "npm:^1.0.0"
-  checksum: bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
+  checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
   languageName: node
   linkType: hard
 
 "is-regexp@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-regexp@npm:1.0.0"
-  checksum: 34cacda1901e00f6e44879378f1d2fa96320ea956c1bec27713130aaf1d44f6e7bd963eed28945bfe37e600cb27df1cf5207302680dad8bdd27b9baff8ecf611
+  checksum: 10c0/34cacda1901e00f6e44879378f1d2fa96320ea956c1bec27713130aaf1d44f6e7bd963eed28945bfe37e600cb27df1cf5207302680dad8bdd27b9baff8ecf611
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+"is-set@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
-  checksum: 5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
+  checksum: 10c0/5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-shared-array-buffer@npm:1.0.2"
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: cfeee6f171f1b13e6cbc6f3b6cc44e192b93df39f3fcb31aa66ffb1d2df3b91e05664311659f9701baba62f5e98c83b0673c628e7adc30f55071c4874fcdccec
+    call-bind: "npm:^1.0.7"
+  checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7
   languageName: node
   linkType: hard
 
 "is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
-  checksum: b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002
+  checksum: 10c0/b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002
   languageName: node
   linkType: hard
 
 "is-stream@npm:^2.0.0":
   version: 2.0.1
   resolution: "is-stream@npm:2.0.1"
-  checksum: 7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
+  checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
   languageName: node
   linkType: hard
 
 "is-stream@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-stream@npm:3.0.0"
-  checksum: eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
+  checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
   languageName: node
   linkType: hard
 
@@ -9844,7 +10186,7 @@ __metadata:
   resolution: "is-string@npm:1.0.7"
   dependencies:
     has-tostringtag: "npm:^1.0.0"
-  checksum: 905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
+  checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
   languageName: node
   linkType: hard
 
@@ -9853,30 +10195,30 @@ __metadata:
   resolution: "is-symbol@npm:1.0.4"
   dependencies:
     has-symbols: "npm:^1.0.2"
-  checksum: 9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
+  checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
+"is-typed-array@npm:^1.1.13":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
   dependencies:
-    which-typed-array: "npm:^1.1.11"
-  checksum: 9863e9cc7223c6fc1c462a2c3898a7beff6b41b1ee0fabb03b7d278ae7de670b5bcbc8627db56bb66ed60902fa37d53fe5cce0fd2f7d73ac64fe5da6f409b6ae
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca
   languageName: node
   linkType: hard
 
 "is-url@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-url@npm:1.2.4"
-  checksum: 0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3
+  checksum: 10c0/0157a79874f8f95fdd63540e3f38c8583c2ef572661cd0693cda80ae3e42dfe8e9a4a972ec1b827f861d9a9acf75b37f7d58a37f94a8a053259642912c252bc3
   languageName: node
   linkType: hard
 
 "is-weakmap@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-weakmap@npm:2.0.1"
-  checksum: 9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987
+  checksum: 10c0/9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987
   languageName: node
   linkType: hard
 
@@ -9885,7 +10227,7 @@ __metadata:
   resolution: "is-weakref@npm:1.0.2"
   dependencies:
     call-bind: "npm:^1.0.2"
-  checksum: 1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
+  checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
   languageName: node
   linkType: hard
 
@@ -9895,65 +10237,56 @@ __metadata:
   dependencies:
     call-bind: "npm:^1.0.2"
     get-intrinsic: "npm:^1.1.1"
-  checksum: ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1
+  checksum: 10c0/ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1
   languageName: node
   linkType: hard
 
 "is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-windows@npm:1.0.2"
-  checksum: b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5
+  checksum: 10c0/b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5
   languageName: node
   linkType: hard
 
 "is-wsl@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-wsl@npm:1.1.0"
-  checksum: 7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a
-  languageName: node
-  linkType: hard
-
-"is-wsl@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "is-wsl@npm:2.2.0"
-  dependencies:
-    is-docker: "npm:^2.0.0"
-  checksum: a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e
+  checksum: 10c0/7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a
   languageName: node
   linkType: hard
 
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
-  checksum: ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
+  checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
   languageName: node
   linkType: hard
 
 "isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "isarray@npm:1.0.0"
-  checksum: 18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d
+  checksum: 10c0/18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d
   languageName: node
   linkType: hard
 
 "isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
-  checksum: 4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
+  checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
   languageName: node
   linkType: hard
 
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
-  checksum: 228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
   languageName: node
   linkType: hard
 
 "isexe@npm:^3.1.1":
   version: 3.1.1
   resolution: "isexe@npm:3.1.1"
-  checksum: 9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
+  checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
   languageName: node
   linkType: hard
 
@@ -9962,21 +10295,21 @@ __metadata:
   resolution: "isobject@npm:2.1.0"
   dependencies:
     isarray: "npm:1.0.0"
-  checksum: c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b
+  checksum: 10c0/c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b
   languageName: node
   linkType: hard
 
 "isobject@npm:^3.0.0, isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
-  checksum: 03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
+  checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
   languageName: node
   linkType: hard
 
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
-  checksum: 10ecb00a50cac2f506af8231ce523ffa1ac1310db0435c8ffaabb50c1d72539906583aa13c84f8835dc103998b9989edc3c1de989d2e2a96a91a9ba44e5db6b9
+  checksum: 10c0/10ecb00a50cac2f506af8231ce523ffa1ac1310db0435c8ffaabb50c1d72539906583aa13c84f8835dc103998b9989edc3c1de989d2e2a96a91a9ba44e5db6b9
   languageName: node
   linkType: hard
 
@@ -9989,7 +10322,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-coverage: "npm:^3.2.0"
     semver: "npm:^6.3.0"
-  checksum: 8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
+  checksum: 10c0/8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
   languageName: node
   linkType: hard
 
@@ -10002,7 +10335,7 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     istanbul-lib-coverage: "npm:^3.2.0"
     semver: "npm:^7.5.4"
-  checksum: 313d61aca3f82a04ad9377841d05061d603ea3d4a4dd281fdda2479ec4ddbc86dc1792c73651f21c93480570d1ecadc5f63011e2df86f30ee662b62c0c00e3d8
+  checksum: 10c0/313d61aca3f82a04ad9377841d05061d603ea3d4a4dd281fdda2479ec4ddbc86dc1792c73651f21c93480570d1ecadc5f63011e2df86f30ee662b62c0c00e3d8
   languageName: node
   linkType: hard
 
@@ -10013,7 +10346,7 @@ __metadata:
     istanbul-lib-coverage: "npm:^3.0.0"
     make-dir: "npm:^4.0.0"
     supports-color: "npm:^7.1.0"
-  checksum: 84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
+  checksum: 10c0/84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
   languageName: node
   linkType: hard
 
@@ -10024,7 +10357,7 @@ __metadata:
     debug: "npm:^4.1.1"
     istanbul-lib-coverage: "npm:^3.0.0"
     source-map: "npm:^0.6.1"
-  checksum: 19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
+  checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
   languageName: node
   linkType: hard
 
@@ -10034,7 +10367,7 @@ __metadata:
   dependencies:
     html-escaper: "npm:^2.0.0"
     istanbul-lib-report: "npm:^3.0.0"
-  checksum: ec3f1bdbc51b3e0b325a5b9f4ad31a247697f31001df4e81075f7980413f14da1b5adfec574fd156efd3b0464023f61320f6718efc66ee72b32d89611cef99dd
+  checksum: 10c0/ec3f1bdbc51b3e0b325a5b9f4ad31a247697f31001df4e81075f7980413f14da1b5adfec574fd156efd3b0464023f61320f6718efc66ee72b32d89611cef99dd
   languageName: node
   linkType: hard
 
@@ -10047,11 +10380,11 @@ __metadata:
     has-symbols: "npm:^1.0.3"
     reflect.getprototypeof: "npm:^1.0.4"
     set-function-name: "npm:^2.0.1"
-  checksum: a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
+  checksum: 10c0/a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.5":
+"jackspeak@npm:^2.3.6":
   version: 2.3.6
   resolution: "jackspeak@npm:2.3.6"
   dependencies:
@@ -10060,7 +10393,7 @@ __metadata:
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
   languageName: node
   linkType: hard
 
@@ -10074,7 +10407,7 @@ __metadata:
     minimatch: "npm:^3.1.2"
   bin:
     jake: bin/cli.js
-  checksum: 89326d01a8bc110d02d973729a66394c79a34b34461116f5c530a2a2dbc30265683fe6737928f75df9178e9d369ff1442f5753fb983d525e740eefdadc56a103
+  checksum: 10c0/89326d01a8bc110d02d973729a66394c79a34b34461116f5c530a2a2dbc30265683fe6737928f75df9178e9d369ff1442f5753fb983d525e740eefdadc56a103
   languageName: node
   linkType: hard
 
@@ -10085,7 +10418,7 @@ __metadata:
     execa: "npm:^5.0.0"
     jest-util: "npm:^29.7.0"
     p-limit: "npm:^3.1.0"
-  checksum: e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
+  checksum: 10c0/e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
   languageName: node
   linkType: hard
 
@@ -10113,7 +10446,7 @@ __metadata:
     pure-rand: "npm:^6.0.0"
     slash: "npm:^3.0.0"
     stack-utils: "npm:^2.0.3"
-  checksum: 8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
+  checksum: 10c0/8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
   languageName: node
   linkType: hard
 
@@ -10139,7 +10472,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
+  checksum: 10c0/a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
   languageName: node
   linkType: hard
 
@@ -10177,7 +10510,7 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
+  checksum: 10c0/bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
   languageName: node
   linkType: hard
 
@@ -10189,7 +10522,7 @@ __metadata:
     diff-sequences: "npm:^29.6.3"
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
+  checksum: 10c0/89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
   languageName: node
   linkType: hard
 
@@ -10198,7 +10531,7 @@ __metadata:
   resolution: "jest-docblock@npm:29.7.0"
   dependencies:
     detect-newline: "npm:^3.0.0"
-  checksum: d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
+  checksum: 10c0/d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
   languageName: node
   linkType: hard
 
@@ -10211,7 +10544,7 @@ __metadata:
     jest-get-type: "npm:^29.6.3"
     jest-util: "npm:^29.7.0"
     pretty-format: "npm:^29.7.0"
-  checksum: f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
+  checksum: 10c0/f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
   languageName: node
   linkType: hard
 
@@ -10232,7 +10565,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
+  checksum: 10c0/139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
   languageName: node
   linkType: hard
 
@@ -10246,14 +10579,14 @@ __metadata:
     "@types/node": "npm:*"
     jest-mock: "npm:^29.7.0"
     jest-util: "npm:^29.7.0"
-  checksum: 61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
+  checksum: 10c0/61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
   languageName: node
   linkType: hard
 
 "jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
-  checksum: 552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
+  checksum: 10c0/552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
   languageName: node
   linkType: hard
 
@@ -10276,7 +10609,7 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
+  checksum: 10c0/2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
   languageName: node
   linkType: hard
 
@@ -10286,7 +10619,7 @@ __metadata:
   dependencies:
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
+  checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
   languageName: node
   linkType: hard
 
@@ -10298,7 +10631,7 @@ __metadata:
     jest-diff: "npm:^29.7.0"
     jest-get-type: "npm:^29.6.3"
     pretty-format: "npm:^29.7.0"
-  checksum: 0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
+  checksum: 10c0/0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
   languageName: node
   linkType: hard
 
@@ -10315,7 +10648,7 @@ __metadata:
     pretty-format: "npm:^29.7.0"
     slash: "npm:^3.0.0"
     stack-utils: "npm:^2.0.3"
-  checksum: 850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
+  checksum: 10c0/850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
   languageName: node
   linkType: hard
 
@@ -10326,7 +10659,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@types/node": "npm:*"
     jest-util: "npm:^29.7.0"
-  checksum: 7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
+  checksum: 10c0/7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
   languageName: node
   linkType: hard
 
@@ -10338,14 +10671,14 @@ __metadata:
   peerDependenciesMeta:
     jest-resolve:
       optional: true
-  checksum: 86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
+  checksum: 10c0/86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
   languageName: node
   linkType: hard
 
 "jest-regex-util@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-regex-util@npm:29.6.3"
-  checksum: 4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
+  checksum: 10c0/4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
   languageName: node
   linkType: hard
 
@@ -10355,7 +10688,7 @@ __metadata:
   dependencies:
     jest-regex-util: "npm:^29.6.3"
     jest-snapshot: "npm:^29.7.0"
-  checksum: b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
+  checksum: 10c0/b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
   languageName: node
   linkType: hard
 
@@ -10372,7 +10705,7 @@ __metadata:
     resolve: "npm:^1.20.0"
     resolve.exports: "npm:^2.0.0"
     slash: "npm:^3.0.0"
-  checksum: 59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
+  checksum: 10c0/59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
   languageName: node
   linkType: hard
 
@@ -10401,7 +10734,7 @@ __metadata:
     jest-worker: "npm:^29.7.0"
     p-limit: "npm:^3.1.0"
     source-map-support: "npm:0.5.13"
-  checksum: 2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
+  checksum: 10c0/2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
   languageName: node
   linkType: hard
 
@@ -10431,7 +10764,7 @@ __metadata:
     jest-util: "npm:^29.7.0"
     slash: "npm:^3.0.0"
     strip-bom: "npm:^4.0.0"
-  checksum: 7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
+  checksum: 10c0/7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
   languageName: node
   linkType: hard
 
@@ -10459,7 +10792,7 @@ __metadata:
     natural-compare: "npm:^1.4.0"
     pretty-format: "npm:^29.7.0"
     semver: "npm:^7.5.3"
-  checksum: 6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
+  checksum: 10c0/6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
   languageName: node
   linkType: hard
 
@@ -10473,7 +10806,7 @@ __metadata:
     ci-info: "npm:^3.2.0"
     graceful-fs: "npm:^4.2.9"
     picomatch: "npm:^2.2.3"
-  checksum: bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
+  checksum: 10c0/bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
   languageName: node
   linkType: hard
 
@@ -10487,7 +10820,7 @@ __metadata:
     jest-get-type: "npm:^29.6.3"
     leven: "npm:^3.1.0"
     pretty-format: "npm:^29.7.0"
-  checksum: a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
+  checksum: 10c0/a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
   languageName: node
   linkType: hard
 
@@ -10503,18 +10836,18 @@ __metadata:
     emittery: "npm:^0.13.1"
     jest-util: "npm:^29.7.0"
     string-length: "npm:^4.0.1"
-  checksum: ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
+  checksum: 10c0/ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^26.2.1, jest-worker@npm:^26.5.0":
+"jest-worker@npm:^26.5.0":
   version: 26.6.2
   resolution: "jest-worker@npm:26.6.2"
   dependencies:
     "@types/node": "npm:*"
     merge-stream: "npm:^2.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
+  checksum: 10c0/07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
   languageName: node
   linkType: hard
 
@@ -10526,7 +10859,7 @@ __metadata:
     jest-util: "npm:^29.7.0"
     merge-stream: "npm:^2.0.0"
     supports-color: "npm:^8.0.0"
-  checksum: 5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
+  checksum: 10c0/5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
   languageName: node
   linkType: hard
 
@@ -10545,7 +10878,14 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
+  checksum: 10c0/f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
+  languageName: node
+  linkType: hard
+
+"joycon@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "joycon@npm:3.1.1"
+  checksum: 10c0/131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
   languageName: node
   linkType: hard
 
@@ -10560,21 +10900,21 @@ __metadata:
     yargs-parser: "npm:^20.2.1"
   bin:
     jpeg-autorotate: src/cli.js
-  checksum: 75328e15b7abcaf8b36c980495cb0b37ffabeb8921e8576312deac8139a9e8a66f85d9196f314120e4633c76623d1b595e65ca7a87b679511ffb804f880a1644
+  checksum: 10c0/75328e15b7abcaf8b36c980495cb0b37ffabeb8921e8576312deac8139a9e8a66f85d9196f314120e4633c76623d1b595e65ca7a87b679511ffb804f880a1644
   languageName: node
   linkType: hard
 
 "jpeg-js@npm:^0.4.2":
   version: 0.4.4
   resolution: "jpeg-js@npm:0.4.4"
-  checksum: 4d0d5097f8e55d8bbce6f1dc32ffaf3f43f321f6222e4e6490734fdc6d005322e3bd6fb992c2df7f5b587343b1441a1c333281dc3285bc9116e369fd2a2b43a7
+  checksum: 10c0/4d0d5097f8e55d8bbce6f1dc32ffaf3f43f321f6222e4e6490734fdc6d005322e3bd6fb992c2df7f5b587343b1441a1c333281dc3285bc9116e369fd2a2b43a7
   languageName: node
   linkType: hard
 
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
-  checksum: e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
+  checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
   languageName: node
   linkType: hard
 
@@ -10586,7 +10926,7 @@ __metadata:
     esprima: "npm:^4.0.0"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
+  checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
   languageName: node
   linkType: hard
 
@@ -10597,14 +10937,14 @@ __metadata:
     argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
+  checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
   languageName: node
   linkType: hard
 
 "jsdoc-type-pratt-parser@npm:~4.0.0":
   version: 4.0.0
   resolution: "jsdoc-type-pratt-parser@npm:4.0.0"
-  checksum: b23ef7bbbe2f56d72630d1c5a233dc9fecaff399063d373c57bef136908c1b05e723dac107177303c03ccf8d75aa51507510b282aa567600477479c5ea0c36d1
+  checksum: 10c0/b23ef7bbbe2f56d72630d1c5a233dc9fecaff399063d373c57bef136908c1b05e723dac107177303c03ccf8d75aa51507510b282aa567600477479c5ea0c36d1
   languageName: node
   linkType: hard
 
@@ -10643,15 +10983,14 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
+  checksum: 10c0/b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
   languageName: node
   linkType: hard
 
-"jsdom@npm:^23.0.0":
-  version: 23.2.0
-  resolution: "jsdom@npm:23.2.0"
+"jsdom@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "jsdom@npm:24.0.0"
   dependencies:
-    "@asamuzakjp/dom-selector": "npm:^2.0.1"
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
@@ -10660,6 +10999,7 @@ __metadata:
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.2"
     is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.7"
     parse5: "npm:^7.1.2"
     rrweb-cssom: "npm:^0.6.0"
     saxes: "npm:^6.0.0"
@@ -10677,7 +11017,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: b062af50f7be59d914ba75236b7817c848ef3cd007aea1d6b8020a41eb263b7d5bd2652298106e9756b56892f773d990598778d02adab7d0d0d8e58726fc41d3
+  checksum: 10c0/7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
   languageName: node
   linkType: hard
 
@@ -10686,7 +11026,7 @@ __metadata:
   resolution: "jsesc@npm:2.5.2"
   bin:
     jsesc: bin/jsesc
-  checksum: dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
+  checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
   languageName: node
   linkType: hard
 
@@ -10695,56 +11035,56 @@ __metadata:
   resolution: "jsesc@npm:0.5.0"
   bin:
     jsesc: bin/jsesc
-  checksum: f93792440ae1d80f091b65f8ceddf8e55c4bb7f1a09dee5dcbdb0db5612c55c0f6045625aa6b7e8edb2e0a4feabd80ee48616dbe2d37055573a84db3d24f96d9
+  checksum: 10c0/f93792440ae1d80f091b65f8ceddf8e55c4bb7f1a09dee5dcbdb0db5612c55c0f6045625aa6b7e8edb2e0a4feabd80ee48616dbe2d37055573a84db3d24f96d9
   languageName: node
   linkType: hard
 
 "json-buffer@npm:3.0.1":
   version: 3.0.1
   resolution: "json-buffer@npm:3.0.1"
-  checksum: 0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
+  checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
   languageName: node
   linkType: hard
 
 "json-parse-better-errors@npm:^1.0.2":
   version: 1.0.2
   resolution: "json-parse-better-errors@npm:1.0.2"
-  checksum: 2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb
+  checksum: 10c0/2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb
   languageName: node
   linkType: hard
 
 "json-parse-even-better-errors@npm:^2.3.0":
   version: 2.3.1
   resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
+  checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^0.4.1":
   version: 0.4.1
   resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
+  checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
   languageName: node
   linkType: hard
 
 "json-schema-traverse@npm:^1.0.0":
   version: 1.0.0
   resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
+  checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
   languageName: node
   linkType: hard
 
 "json-schema@npm:^0.4.0":
   version: 0.4.0
   resolution: "json-schema@npm:0.4.0"
-  checksum: d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3
+  checksum: 10c0/d4a637ec1d83544857c1c163232f3da46912e971d5bf054ba44fdb88f07d8d359a462b4aec46f2745efbc57053365608d88bc1d7b1729f7b4fc3369765639ed3
   languageName: node
   linkType: hard
 
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
+  checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
   languageName: node
   linkType: hard
 
@@ -10753,7 +11093,7 @@ __metadata:
   resolution: "json-stable-stringify@npm:1.0.2"
   dependencies:
     jsonify: "npm:^0.0.1"
-  checksum: 502d021c3c59c09587faa40d7693d77c00460fd6c68bae95d6e35804909ec8c4aec71b136d3a09df61a7ebf803eb6e820f23ede76b77e74b8b02c76afb2ada8c
+  checksum: 10c0/502d021c3c59c09587faa40d7693d77c00460fd6c68bae95d6e35804909ec8c4aec71b136d3a09df61a7ebf803eb6e820f23ede76b77e74b8b02c76afb2ada8c
   languageName: node
   linkType: hard
 
@@ -10764,7 +11104,7 @@ __metadata:
     minimist: "npm:^1.2.0"
   bin:
     json5: lib/cli.js
-  checksum: 9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f
+  checksum: 10c0/9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f
   languageName: node
   linkType: hard
 
@@ -10773,7 +11113,7 @@ __metadata:
   resolution: "json5@npm:2.2.3"
   bin:
     json5: lib/cli.js
-  checksum: 5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
+  checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
   languageName: node
   linkType: hard
 
@@ -10786,21 +11126,21 @@ __metadata:
   dependenciesMeta:
     graceful-fs:
       optional: true
-  checksum: 4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865
+  checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865
   languageName: node
   linkType: hard
 
 "jsonify@npm:^0.0.1":
   version: 0.0.1
   resolution: "jsonify@npm:0.0.1"
-  checksum: 7f5499cdd59a0967ed35bda48b7cec43d850bbc8fb955cdd3a1717bb0efadbe300724d5646de765bb7a99fc1c3ab06eb80d93503c6faaf99b4ff50a3326692f6
+  checksum: 10c0/7f5499cdd59a0967ed35bda48b7cec43d850bbc8fb955cdd3a1717bb0efadbe300724d5646de765bb7a99fc1c3ab06eb80d93503c6faaf99b4ff50a3326692f6
   languageName: node
   linkType: hard
 
 "jsonpointer@npm:^5.0.0":
   version: 5.0.1
   resolution: "jsonpointer@npm:5.0.1"
-  checksum: 89929e58b400fcb96928c0504fcf4fc3f919d81e9543ceb055df125538470ee25290bb4984251e172e6ef8fcc55761eb998c118da763a82051ad89d4cb073fe7
+  checksum: 10c0/89929e58b400fcb96928c0504fcf4fc3f919d81e9543ceb055df125538470ee25290bb4984251e172e6ef8fcc55761eb998c118da763a82051ad89d4cb073fe7
   languageName: node
   linkType: hard
 
@@ -10812,14 +11152,14 @@ __metadata:
     array.prototype.flat: "npm:^1.3.1"
     object.assign: "npm:^4.1.4"
     object.values: "npm:^1.1.6"
-  checksum: a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
+  checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
   languageName: node
   linkType: hard
 
 "keycode@npm:^2.1.7":
   version: 2.2.1
   resolution: "keycode@npm:2.2.1"
-  checksum: e38ecbdc62f57e18ef9f7ad88aefded84e05b89115a40eea3081a7002d7c055765ddb5f5c3e2dd36ac2b2ab3901053c8286c9db082fd807b3abeb7e44034d96a
+  checksum: 10c0/e38ecbdc62f57e18ef9f7ad88aefded84e05b89115a40eea3081a7002d7c055765ddb5f5c3e2dd36ac2b2ab3901053c8286c9db082fd807b3abeb7e44034d96a
   languageName: node
   linkType: hard
 
@@ -10828,49 +11168,56 @@ __metadata:
   resolution: "keyv@npm:4.5.4"
   dependencies:
     json-buffer: "npm:3.0.1"
-  checksum: aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
+  checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
   languageName: node
   linkType: hard
 
 "killable@npm:^1.0.1":
   version: 1.0.1
   resolution: "killable@npm:1.0.1"
-  checksum: 1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6
+  checksum: 10c0/1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6
   languageName: node
   linkType: hard
 
 "kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
-  checksum: 61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
+  checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
   languageName: node
   linkType: hard
 
 "kleur@npm:^3.0.3":
   version: 3.0.3
   resolution: "kleur@npm:3.0.3"
-  checksum: cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
+  checksum: 10c0/cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
   languageName: node
   linkType: hard
 
 "klona@npm:^2.0.4":
   version: 2.0.6
   resolution: "klona@npm:2.0.6"
-  checksum: 94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01
+  checksum: 10c0/94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01
   languageName: node
   linkType: hard
 
 "known-css-properties@npm:^0.29.0":
   version: 0.29.0
   resolution: "known-css-properties@npm:0.29.0"
-  checksum: f66e9992097b8f54e97dbe729943d4a11b8d3ba15f68dbb3deb8bb0122cb89c22c90c9221ecb1e3f2e236838fe3c0faae319b43908c81b6e254ac43cafde2906
+  checksum: 10c0/f66e9992097b8f54e97dbe729943d4a11b8d3ba15f68dbb3deb8bb0122cb89c22c90c9221ecb1e3f2e236838fe3c0faae319b43908c81b6e254ac43cafde2906
+  languageName: node
+  linkType: hard
+
+"known-css-properties@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "known-css-properties@npm:0.30.0"
+  checksum: 10c0/8b487a6b33487affcec41eb392ceb77acf4d093558dde5c88b5ea06b9a3c81781876d7cb09872e0518b9602f27c8f4112c9ac333e02c90a91c8fbd12e202ed48
   languageName: node
   linkType: hard
 
 "language-subtag-registry@npm:^0.3.20":
   version: 0.3.22
   resolution: "language-subtag-registry@npm:0.3.22"
-  checksum: d1e09971260a7cd3b9fdeb190d33af0b6e99c8697013537d9aaa15f7856d9d83aee128ba8078e219df0a7cf4b8dd18d1a0c188f6543b500d92a2689d2d114b70
+  checksum: 10c0/d1e09971260a7cd3b9fdeb190d33af0b6e99c8697013537d9aaa15f7856d9d83aee128ba8078e219df0a7cf4b8dd18d1a0c188f6543b500d92a2689d2d114b70
   languageName: node
   linkType: hard
 
@@ -10879,14 +11226,14 @@ __metadata:
   resolution: "language-tags@npm:1.0.9"
   dependencies:
     language-subtag-registry: "npm:^0.3.20"
-  checksum: 9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff
+  checksum: 10c0/9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff
   languageName: node
   linkType: hard
 
 "leven@npm:^3.1.0":
   version: 3.1.0
   resolution: "leven@npm:3.1.0"
-  checksum: cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
+  checksum: 10c0/cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
   languageName: node
   linkType: hard
 
@@ -10896,47 +11243,54 @@ __metadata:
   dependencies:
     prelude-ls: "npm:^1.2.1"
     type-check: "npm:~0.4.0"
-  checksum: effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
+  checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
   languageName: node
   linkType: hard
 
-"lilconfig@npm:3.0.0, lilconfig@npm:^3.0.0":
+"lilconfig@npm:3.0.0":
   version: 3.0.0
   resolution: "lilconfig@npm:3.0.0"
-  checksum: 7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
+  checksum: 10c0/7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
+  languageName: node
+  linkType: hard
+
+"lilconfig@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "lilconfig@npm:3.1.1"
+  checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
   languageName: node
   linkType: hard
 
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
-  checksum: 3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
+  checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
   languageName: node
   linkType: hard
 
 "lint-staged@npm:^15.0.0":
-  version: 15.2.0
-  resolution: "lint-staged@npm:15.2.0"
+  version: 15.2.2
+  resolution: "lint-staged@npm:15.2.2"
   dependencies:
     chalk: "npm:5.3.0"
     commander: "npm:11.1.0"
     debug: "npm:4.3.4"
     execa: "npm:8.0.1"
     lilconfig: "npm:3.0.0"
-    listr2: "npm:8.0.0"
+    listr2: "npm:8.0.1"
     micromatch: "npm:4.0.5"
     pidtree: "npm:0.6.0"
     string-argv: "npm:0.3.2"
     yaml: "npm:2.3.4"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 4a1ff25dd06dbd4346fd244c9a0ebb936532ba18c0caedeb895c2e232f3c6c5fd08f6667624716660bc29e3e0f9f0440a9175114394616e991ebd5fab4b1f092
+  checksum: 10c0/a1ba6c7ee53e30a0f6ea9a351d95d3d0d2be916a41b561e22907e9ea513eb18cb3dbe65bff3ec13fad15777999efe56b2e2a95427e31d12a9b7e7948c3630ee2
   languageName: node
   linkType: hard
 
-"listr2@npm:8.0.0":
-  version: 8.0.0
-  resolution: "listr2@npm:8.0.0"
+"listr2@npm:8.0.1":
+  version: 8.0.1
+  resolution: "listr2@npm:8.0.1"
   dependencies:
     cli-truncate: "npm:^4.0.0"
     colorette: "npm:^2.0.20"
@@ -10944,14 +11298,14 @@ __metadata:
     log-update: "npm:^6.0.0"
     rfdc: "npm:^1.3.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 6e356df9127c68b69186c927c993645223557e941a76b0bb210e35786aedc53f577df437251db804606ff37ac509c5d945289a84b3daee7fadf2e3dcb889ecc9
+  checksum: 10c0/b565d6ceb3a4c2dbe0c1735c0fd907afd0d6f89de21aced8e05187b2d88ca2f8f9ebc5d743885396a00f05f13146f6be744d098a56ce0402cf1cd131485a7ff1
   languageName: node
   linkType: hard
 
 "loader-runner@npm:^2.4.0":
   version: 2.4.0
   resolution: "loader-runner@npm:2.4.0"
-  checksum: 1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e
+  checksum: 10c0/1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e
   languageName: node
   linkType: hard
 
@@ -10962,7 +11316,7 @@ __metadata:
     big.js: "npm:^5.2.2"
     emojis-list: "npm:^3.0.0"
     json5: "npm:^1.0.1"
-  checksum: 2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53
+  checksum: 10c0/2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53
   languageName: node
   linkType: hard
 
@@ -10973,7 +11327,7 @@ __metadata:
     big.js: "npm:^5.2.2"
     emojis-list: "npm:^3.0.0"
     json5: "npm:^2.1.2"
-  checksum: d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
+  checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
   languageName: node
   linkType: hard
 
@@ -10983,7 +11337,7 @@ __metadata:
   dependencies:
     p-locate: "npm:^3.0.0"
     path-exists: "npm:^3.0.0"
-  checksum: 3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
+  checksum: 10c0/3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
   languageName: node
   linkType: hard
 
@@ -10992,7 +11346,7 @@ __metadata:
   resolution: "locate-path@npm:5.0.0"
   dependencies:
     p-locate: "npm:^4.1.0"
-  checksum: 33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
+  checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
   languageName: node
   linkType: hard
 
@@ -11001,7 +11355,7 @@ __metadata:
   resolution: "locate-path@npm:6.0.0"
   dependencies:
     p-locate: "npm:^5.0.0"
-  checksum: d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
+  checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
   languageName: node
   linkType: hard
 
@@ -11010,105 +11364,105 @@ __metadata:
   resolution: "lockfile@npm:1.0.4"
   dependencies:
     signal-exit: "npm:^3.0.2"
-  checksum: 80b7777ceb43105d9e588733c3efc2514653a5e3a0dae3e61347a1f5381da34dcaa2caaa60c39ed5d4ad31c1735a4831e5639a0ba1c508bfea8dbc9c89777b37
+  checksum: 10c0/80b7777ceb43105d9e588733c3efc2514653a5e3a0dae3e61347a1f5381da34dcaa2caaa60c39ed5d4ad31c1735a4831e5639a0ba1c508bfea8dbc9c89777b37
   languageName: node
   linkType: hard
 
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
-  checksum: 762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987
+  checksum: 10c0/762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987
   languageName: node
   linkType: hard
 
 "lodash.defaults@npm:^4.2.0":
   version: 4.2.0
   resolution: "lodash.defaults@npm:4.2.0"
-  checksum: d5b77aeb702caa69b17be1358faece33a84497bcca814897383c58b28a2f8dfc381b1d9edbec239f8b425126a3bbe4916223da2a576bb0411c2cefd67df80707
+  checksum: 10c0/d5b77aeb702caa69b17be1358faece33a84497bcca814897383c58b28a2f8dfc381b1d9edbec239f8b425126a3bbe4916223da2a576bb0411c2cefd67df80707
   languageName: node
   linkType: hard
 
 "lodash.get@npm:^4.0":
   version: 4.4.2
   resolution: "lodash.get@npm:4.4.2"
-  checksum: 48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
+  checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
   languageName: node
   linkType: hard
 
 "lodash.has@npm:^4.0":
   version: 4.5.2
   resolution: "lodash.has@npm:4.5.2"
-  checksum: 3ffa9e549f321996a5fdf6204494c035ff550b2df703f936a448c553131bbb55492b4e7995bb13500648b50b268ed8afc974a7a0c0a43744d28d61cc95cb1ffe
+  checksum: 10c0/3ffa9e549f321996a5fdf6204494c035ff550b2df703f936a448c553131bbb55492b4e7995bb13500648b50b268ed8afc974a7a0c0a43744d28d61cc95cb1ffe
   languageName: node
   linkType: hard
 
 "lodash.isarguments@npm:^3.1.0":
   version: 3.1.0
   resolution: "lodash.isarguments@npm:3.1.0"
-  checksum: 5e8f95ba10975900a3920fb039a3f89a5a79359a1b5565e4e5b4310ed6ebe64011e31d402e34f577eca983a1fc01ff86c926e3cbe602e1ddfc858fdd353e62d8
+  checksum: 10c0/5e8f95ba10975900a3920fb039a3f89a5a79359a1b5565e4e5b4310ed6ebe64011e31d402e34f577eca983a1fc01ff86c926e3cbe602e1ddfc858fdd353e62d8
   languageName: node
   linkType: hard
 
 "lodash.isboolean@npm:^3.0.3":
   version: 3.0.3
   resolution: "lodash.isboolean@npm:3.0.3"
-  checksum: 0aac604c1ef7e72f9a6b798e5b676606042401dd58e49f051df3cc1e3adb497b3d7695635a5cbec4ae5f66456b951fdabe7d6b387055f13267cde521f10ec7f7
+  checksum: 10c0/0aac604c1ef7e72f9a6b798e5b676606042401dd58e49f051df3cc1e3adb497b3d7695635a5cbec4ae5f66456b951fdabe7d6b387055f13267cde521f10ec7f7
   languageName: node
   linkType: hard
 
 "lodash.isequal@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.isequal@npm:4.5.0"
-  checksum: dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
+  checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
   languageName: node
   linkType: hard
 
 "lodash.isobject@npm:^3.0.2":
   version: 3.0.2
   resolution: "lodash.isobject@npm:3.0.2"
-  checksum: da4c8480d98b16835b59380b2fbd43c54081acd9466febb788ba77c434384349e0bec162d1c4e89f613f21687b2b6d8384d8a112b80da00c78d28d9915a5cdde
+  checksum: 10c0/da4c8480d98b16835b59380b2fbd43c54081acd9466febb788ba77c434384349e0bec162d1c4e89f613f21687b2b6d8384d8a112b80da00c78d28d9915a5cdde
   languageName: node
   linkType: hard
 
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
-  checksum: c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8
+  checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8
   languageName: node
   linkType: hard
 
 "lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
-  checksum: 402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
+  checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
   languageName: node
   linkType: hard
 
 "lodash.sortby@npm:^4.7.0":
   version: 4.7.0
   resolution: "lodash.sortby@npm:4.7.0"
-  checksum: fc48fb54ff7669f33bb32997cab9460757ee99fafaf72400b261c3e10fde21538e47d8cfcbe6a25a31bcb5b7b727c27d52626386fc2de24eb059a6d64a89cdf5
+  checksum: 10c0/fc48fb54ff7669f33bb32997cab9460757ee99fafaf72400b261c3e10fde21538e47d8cfcbe6a25a31bcb5b7b727c27d52626386fc2de24eb059a6d64a89cdf5
   languageName: node
   linkType: hard
 
 "lodash.truncate@npm:^4.4.2":
   version: 4.4.2
   resolution: "lodash.truncate@npm:4.4.2"
-  checksum: 4e870d54e8a6c86c8687e057cec4069d2e941446ccab7f40b4d9555fa5872d917d0b6aa73bece7765500a3123f1723bcdba9ae881b679ef120bba9e1a0b0ed70
+  checksum: 10c0/4e870d54e8a6c86c8687e057cec4069d2e941446ccab7f40b4d9555fa5872d917d0b6aa73bece7765500a3123f1723bcdba9ae881b679ef120bba9e1a0b0ed70
   languageName: node
   linkType: hard
 
 "lodash.uniq@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.uniq@npm:4.5.0"
-  checksum: 262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e
+  checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
+"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
-  checksum: d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
+  checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
   languageName: node
   linkType: hard
 
@@ -11121,14 +11475,14 @@ __metadata:
     slice-ansi: "npm:^7.0.0"
     strip-ansi: "npm:^7.1.0"
     wrap-ansi: "npm:^9.0.0"
-  checksum: e0b3c3401ef49ce3eb17e2f83d644765e4f7988498fc1344eaa4f31ab30e510dcc469a7fb64dc01bd1c8d9237d917598fa677a9818705fb3774c10f6e9d4b27c
+  checksum: 10c0/e0b3c3401ef49ce3eb17e2f83d644765e4f7988498fc1344eaa4f31ab30e510dcc469a7fb64dc01bd1c8d9237d917598fa677a9818705fb3774c10f6e9d4b27c
   languageName: node
   linkType: hard
 
 "loglevel@npm:^1.6.8":
   version: 1.8.1
   resolution: "loglevel@npm:1.8.1"
-  checksum: 21069436c97448a1801b154a77d19ada212225c513d94f0471bfe299c981ffd4dc0d21e6211f9250bd6209ba9837bfe0d40d9295c673d73e3c543ec6b1c5d9ef
+  checksum: 10c0/21069436c97448a1801b154a77d19ada212225c513d94f0471bfe299c981ffd4dc0d21e6211f9250bd6209ba9837bfe0d40d9295c673d73e3c543ec6b1c5d9ef
   languageName: node
   linkType: hard
 
@@ -11139,14 +11493,14 @@ __metadata:
     js-tokens: "npm:^3.0.0 || ^4.0.0"
   bin:
     loose-envify: cli.js
-  checksum: 655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
+  checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.0.1
-  resolution: "lru-cache@npm:10.0.1"
-  checksum: 982dabfb227b9a2daf56d712ae0e72e01115a28c0a2068cd71277bca04568f3417bbf741c6c7941abc5c620fd8059e34f15607f90ebccbfa0a17533322d27a8e
+"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
   languageName: node
   linkType: hard
 
@@ -11155,7 +11509,7 @@ __metadata:
   resolution: "lru-cache@npm:5.1.1"
   dependencies:
     yallist: "npm:^3.0.2"
-  checksum: 89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
+  checksum: 10c0/89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
   languageName: node
   linkType: hard
 
@@ -11164,7 +11518,7 @@ __metadata:
   resolution: "lru-cache@npm:6.0.0"
   dependencies:
     yallist: "npm:^4.0.0"
-  checksum: cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
+  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
   languageName: node
   linkType: hard
 
@@ -11173,7 +11527,7 @@ __metadata:
   resolution: "lz-string@npm:1.5.0"
   bin:
     lz-string: bin/bin.js
-  checksum: 36128e4de34791838abe979b19927c26e67201ca5acf00880377af7d765b38d1c60847e01c5ec61b1a260c48029084ab3893a3925fd6e48a04011364b089991b
+  checksum: 10c0/36128e4de34791838abe979b19927c26e67201ca5acf00880377af7d765b38d1c60847e01c5ec61b1a260c48029084ab3893a3925fd6e48a04011364b089991b
   languageName: node
   linkType: hard
 
@@ -11182,7 +11536,7 @@ __metadata:
   resolution: "magic-string@npm:0.25.9"
   dependencies:
     sourcemap-codec: "npm:^1.4.8"
-  checksum: 37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
+  checksum: 10c0/37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
   languageName: node
   linkType: hard
 
@@ -11191,7 +11545,7 @@ __metadata:
   resolution: "magic-string@npm:0.30.5"
   dependencies:
     "@jridgewell/sourcemap-codec": "npm:^1.4.15"
-  checksum: 38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520
+  checksum: 10c0/38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520
   languageName: node
   linkType: hard
 
@@ -11200,7 +11554,7 @@ __metadata:
   resolution: "make-dir@npm:3.1.0"
   dependencies:
     semver: "npm:^6.0.0"
-  checksum: 56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa
+  checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa
   languageName: node
   linkType: hard
 
@@ -11209,7 +11563,7 @@ __metadata:
   resolution: "make-dir@npm:4.0.0"
   dependencies:
     semver: "npm:^7.5.3"
-  checksum: 69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
+  checksum: 10c0/69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
   languageName: node
   linkType: hard
 
@@ -11228,7 +11582,7 @@ __metadata:
     negotiator: "npm:^0.6.3"
     promise-retry: "npm:^2.0.1"
     ssri: "npm:^10.0.0"
-  checksum: 43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
   languageName: node
   linkType: hard
 
@@ -11237,14 +11591,14 @@ __metadata:
   resolution: "makeerror@npm:1.0.12"
   dependencies:
     tmpl: "npm:1.0.5"
-  checksum: b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
+  checksum: 10c0/b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
   languageName: node
   linkType: hard
 
 "map-cache@npm:^0.2.2":
   version: 0.2.2
   resolution: "map-cache@npm:0.2.2"
-  checksum: 05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290
+  checksum: 10c0/05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290
   languageName: node
   linkType: hard
 
@@ -11253,28 +11607,28 @@ __metadata:
   resolution: "map-visit@npm:1.0.0"
   dependencies:
     object-visit: "npm:^1.0.0"
-  checksum: fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73
+  checksum: 10c0/fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73
   languageName: node
   linkType: hard
 
 "mark-loader@npm:^0.1.6":
   version: 0.1.6
   resolution: "mark-loader@npm:0.1.6"
-  checksum: 873d75bc87179f95b1059c0f00ecea7419b83a3b42a95a951f9e8157f0d2b3a6ce8313c8a0d7e68dbe534fe668d307c218c69b465cebb1a49e3fde5375d30d15
+  checksum: 10c0/873d75bc87179f95b1059c0f00ecea7419b83a3b42a95a951f9e8157f0d2b3a6ce8313c8a0d7e68dbe534fe668d307c218c69b465cebb1a49e3fde5375d30d15
   languageName: node
   linkType: hard
 
 "marky@npm:^1.2.5":
   version: 1.2.5
   resolution: "marky@npm:1.2.5"
-  checksum: ca8a011f287dab1ac3291df720fc32b366c4cd767347b63722966650405ce71ec6566f71d1e22e1768bf6461a7fd689b9038e7df0fcfb62eacf3a5a6dcac249e
+  checksum: 10c0/ca8a011f287dab1ac3291df720fc32b366c4cd767347b63722966650405ce71ec6566f71d1e22e1768bf6461a7fd689b9038e7df0fcfb62eacf3a5a6dcac249e
   languageName: node
   linkType: hard
 
 "mathml-tag-names@npm:^2.1.3":
   version: 2.1.3
   resolution: "mathml-tag-names@npm:2.1.3"
-  checksum: e2b094658a2618433efd2678a5a3e551645e09ba17c7c777783cd8dfa0178b0195fda0a5c46a6be5e778923662cf8dde891c894c869ff14fbb4ea3208c31bc4d
+  checksum: 10c0/e2b094658a2618433efd2678a5a3e551645e09ba17c7c777783cd8dfa0178b0195fda0a5c46a6be5e778923662cf8dde891c894c869ff14fbb4ea3208c31bc4d
   languageName: node
   linkType: hard
 
@@ -11285,49 +11639,49 @@ __metadata:
     hash-base: "npm:^3.0.0"
     inherits: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5
+  checksum: 10c0/b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
-  checksum: 67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd
+  checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.28":
   version: 2.0.28
   resolution: "mdn-data@npm:2.0.28"
-  checksum: 20000932bc4cd1cde9cba4e23f08cc4f816398af4c15ec81040ed25421d6bf07b5cf6b17095972577fb498988f40f4cb589e3169b9357bb436a12d8e07e5ea7b
+  checksum: 10c0/20000932bc4cd1cde9cba4e23f08cc4f816398af4c15ec81040ed25421d6bf07b5cf6b17095972577fb498988f40f4cb589e3169b9357bb436a12d8e07e5ea7b
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.30":
   version: 2.0.30
   resolution: "mdn-data@npm:2.0.30"
-  checksum: a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9
+  checksum: 10c0/a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9
   languageName: node
   linkType: hard
 
 "mdn-data@npm:2.0.4":
   version: 2.0.4
   resolution: "mdn-data@npm:2.0.4"
-  checksum: a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a
+  checksum: 10c0/a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a
   languageName: node
   linkType: hard
 
 "media-typer@npm:0.3.0":
   version: 0.3.0
   resolution: "media-typer@npm:0.3.0"
-  checksum: d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928
+  checksum: 10c0/d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928
   languageName: node
   linkType: hard
 
 "memoize-one@npm:^6.0.0":
   version: 6.0.0
   resolution: "memoize-one@npm:6.0.0"
-  checksum: 45c88e064fd715166619af72e8cf8a7a17224d6edf61f7a8633d740ed8c8c0558a4373876c9b8ffc5518c2b65a960266adf403cc215cb1e90f7e262b58991f54
+  checksum: 10c0/45c88e064fd715166619af72e8cf8a7a17224d6edf61f7a8633d740ed8c8c0558a4373876c9b8ffc5518c2b65a960266adf403cc215cb1e90f7e262b58991f54
   languageName: node
   linkType: hard
 
@@ -11337,7 +11691,7 @@ __metadata:
   dependencies:
     errno: "npm:^0.1.3"
     readable-stream: "npm:^2.0.1"
-  checksum: f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2
+  checksum: 10c0/f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2
   languageName: node
   linkType: hard
 
@@ -11347,42 +11701,42 @@ __metadata:
   dependencies:
     errno: "npm:^0.1.3"
     readable-stream: "npm:^2.0.1"
-  checksum: 2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b
+  checksum: 10c0/2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b
   languageName: node
   linkType: hard
 
-"meow@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "meow@npm:13.0.0"
-  checksum: fab0f91578154c048e792a81704f3f28099ffff900f364df8a85f6e770a57e1c124859a25e186186e149dad30692c7893af0dfd71517bea343bfe5d749b1fa04
+"meow@npm:^13.2.0":
+  version: 13.2.0
+  resolution: "meow@npm:13.2.0"
+  checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce
   languageName: node
   linkType: hard
 
 "merge-descriptors@npm:1.0.1":
   version: 1.0.1
   resolution: "merge-descriptors@npm:1.0.1"
-  checksum: b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
+  checksum: 10c0/b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
   languageName: node
   linkType: hard
 
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
-  checksum: 867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
+  checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
   languageName: node
   linkType: hard
 
 "merge2@npm:^1.3.0, merge2@npm:^1.4.1":
   version: 1.4.1
   resolution: "merge2@npm:1.4.1"
-  checksum: 254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
+  checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
   languageName: node
   linkType: hard
 
 "methods@npm:~1.1.2":
   version: 1.1.2
   resolution: "methods@npm:1.1.2"
-  checksum: bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2
+  checksum: 10c0/bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2
   languageName: node
   linkType: hard
 
@@ -11392,7 +11746,7 @@ __metadata:
   dependencies:
     braces: "npm:^3.0.2"
     picomatch: "npm:^2.3.1"
-  checksum: 3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
+  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
   languageName: node
   linkType: hard
 
@@ -11413,7 +11767,7 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.2"
-  checksum: 531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f
+  checksum: 10c0/531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f
   languageName: node
   linkType: hard
 
@@ -11425,14 +11779,14 @@ __metadata:
     brorand: "npm:^1.0.1"
   bin:
     miller-rabin: bin/miller-rabin
-  checksum: 26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346
+  checksum: 10c0/26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346
   languageName: node
   linkType: hard
 
 "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
   version: 1.52.0
   resolution: "mime-db@npm:1.52.0"
-  checksum: 0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
+  checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
   languageName: node
   linkType: hard
 
@@ -11441,7 +11795,7 @@ __metadata:
   resolution: "mime-types@npm:2.1.35"
   dependencies:
     mime-db: "npm:1.52.0"
-  checksum: 82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
+  checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
   languageName: node
   linkType: hard
 
@@ -11450,7 +11804,7 @@ __metadata:
   resolution: "mime@npm:1.6.0"
   bin:
     mime: cli.js
-  checksum: b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0
+  checksum: 10c0/b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0
   languageName: node
   linkType: hard
 
@@ -11459,28 +11813,28 @@ __metadata:
   resolution: "mime@npm:2.6.0"
   bin:
     mime: cli.js
-  checksum: a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
+  checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
   languageName: node
   linkType: hard
 
 "mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
-  checksum: b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
+  checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
   languageName: node
   linkType: hard
 
 "mimic-fn@npm:^4.0.0":
   version: 4.0.0
   resolution: "mimic-fn@npm:4.0.0"
-  checksum: de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
+  checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
   languageName: node
   linkType: hard
 
 "min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
-  checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
+  checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
   languageName: node
   linkType: hard
 
@@ -11493,30 +11847,30 @@ __metadata:
     webpack-sources: "npm:^1.1.0"
   peerDependencies:
     webpack: ^4.4.0 || ^5.0.0
-  checksum: 138c008f8a510012266d2834227e75181feeffd09e89e9cde0a63f17be3d64ea3ddbba01036aac9c8a969462c0142285659a20c294e8d01ba948aa1124affdc2
+  checksum: 10c0/138c008f8a510012266d2834227e75181feeffd09e89e9cde0a63f17be3d64ea3ddbba01036aac9c8a969462c0142285659a20c294e8d01ba948aa1124affdc2
   languageName: node
   linkType: hard
 
 "minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
-  checksum: 96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd
+  checksum: 10c0/96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd
   languageName: node
   linkType: hard
 
 "minimalistic-crypto-utils@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-crypto-utils@npm:1.0.1"
-  checksum: 790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8
+  checksum: 10c0/790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8
   languageName: node
   linkType: hard
 
-"minimatch@npm:9.0.3, minimatch@npm:^9.0.1":
+"minimatch@npm:9.0.3":
   version: 9.0.3
   resolution: "minimatch@npm:9.0.3"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
   languageName: node
   linkType: hard
 
@@ -11525,7 +11879,7 @@ __metadata:
   resolution: "minimatch@npm:3.1.2"
   dependencies:
     brace-expansion: "npm:^1.1.7"
-  checksum: 0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
+  checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
   languageName: node
   linkType: hard
 
@@ -11534,14 +11888,23 @@ __metadata:
   resolution: "minimatch@npm:5.1.6"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
+  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^9.0.1, minimatch@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
   languageName: node
   linkType: hard
 
 "minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
-  checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
+  checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
   languageName: node
   linkType: hard
 
@@ -11550,7 +11913,7 @@ __metadata:
   resolution: "minipass-collect@npm:1.0.2"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
+  checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
   languageName: node
   linkType: hard
 
@@ -11565,7 +11928,7 @@ __metadata:
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
   languageName: node
   linkType: hard
 
@@ -11574,7 +11937,7 @@ __metadata:
   resolution: "minipass-flush@npm:1.0.5"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
+  checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
   languageName: node
   linkType: hard
 
@@ -11583,7 +11946,7 @@ __metadata:
   resolution: "minipass-pipeline@npm:1.2.4"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
+  checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
   languageName: node
   linkType: hard
 
@@ -11592,7 +11955,7 @@ __metadata:
   resolution: "minipass-sized@npm:1.0.3"
   dependencies:
     minipass: "npm:^3.0.0"
-  checksum: 298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
+  checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
   languageName: node
   linkType: hard
 
@@ -11601,21 +11964,21 @@ __metadata:
   resolution: "minipass@npm:3.3.6"
   dependencies:
     yallist: "npm:^4.0.0"
-  checksum: a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
+  checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
   languageName: node
   linkType: hard
 
 "minipass@npm:^5.0.0":
   version: 5.0.0
   resolution: "minipass@npm:5.0.0"
-  checksum: a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
+  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
   version: 7.0.4
   resolution: "minipass@npm:7.0.4"
-  checksum: 6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
   languageName: node
   linkType: hard
 
@@ -11625,7 +11988,7 @@ __metadata:
   dependencies:
     minipass: "npm:^3.0.0"
     yallist: "npm:^4.0.0"
-  checksum: 64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
+  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
   languageName: node
   linkType: hard
 
@@ -11635,7 +11998,7 @@ __metadata:
   dependencies:
     for-in: "npm:^1.0.2"
     is-extendable: "npm:^1.0.1"
-  checksum: cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b
+  checksum: 10c0/cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b
   languageName: node
   linkType: hard
 
@@ -11646,7 +12009,7 @@ __metadata:
     minimist: "npm:^1.2.6"
   bin:
     mkdirp: bin/cmd.js
-  checksum: e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01
+  checksum: 10c0/e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01
   languageName: node
   linkType: hard
 
@@ -11655,58 +12018,49 @@ __metadata:
   resolution: "mkdirp@npm:1.0.4"
   bin:
     mkdirp: bin/cmd.js
-  checksum: 46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mkdirp@npm:3.0.1"
-  bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 9f2b975e9246351f5e3a40dcfac99fcd0baa31fbfab615fe059fb11e51f10e4803c63de1f384c54d656e4db31d000e4767e9ef076a22e12a641357602e31d57d
+  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
   languageName: node
   linkType: hard
 
 "mousetrap@npm:^1.5.2":
   version: 1.6.5
   resolution: "mousetrap@npm:1.6.5"
-  checksum: 5c361bdbbff3966fd58d70f39b9fe1f8e32c78f3ce65989d83af7aad32a3a95313ce835a8dd8a55cb5de9eeb7c1f0c2b9048631a3073b5606241589e8fc0ba53
+  checksum: 10c0/5c361bdbbff3966fd58d70f39b9fe1f8e32c78f3ce65989d83af7aad32a3a95313ce835a8dd8a55cb5de9eeb7c1f0c2b9048631a3073b5606241589e8fc0ba53
   languageName: node
   linkType: hard
 
 "mrmime@npm:^1.0.0":
   version: 1.0.1
   resolution: "mrmime@npm:1.0.1"
-  checksum: ab071441da76fd23b3b0d1823d77aacf8679d379a4a94cacd83e487d3d906763b277f3203a594c613602e31ab5209c26a8119b0477c4541ef8555b293a9db6d3
+  checksum: 10c0/ab071441da76fd23b3b0d1823d77aacf8679d379a4a94cacd83e487d3d906763b277f3203a594c613602e31ab5209c26a8119b0477c4541ef8555b293a9db6d3
   languageName: node
   linkType: hard
 
 "ms@npm:2.0.0":
   version: 2.0.0
   resolution: "ms@npm:2.0.0"
-  checksum: f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d
+  checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.2":
   version: 2.1.2
   resolution: "ms@npm:2.1.2"
-  checksum: a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
   languageName: node
   linkType: hard
 
 "ms@npm:2.1.3, ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
-  checksum: d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
+  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
   languageName: node
   linkType: hard
 
 "multicast-dns-service-types@npm:^1.1.0":
   version: 1.1.0
   resolution: "multicast-dns-service-types@npm:1.1.0"
-  checksum: 25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660
+  checksum: 10c0/25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660
   languageName: node
   linkType: hard
 
@@ -11718,7 +12072,7 @@ __metadata:
     thunky: "npm:^1.0.2"
   bin:
     multicast-dns: cli.js
-  checksum: 972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513
+  checksum: 10c0/972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513
   languageName: node
   linkType: hard
 
@@ -11727,7 +12081,7 @@ __metadata:
   resolution: "nan@npm:2.17.0"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: 4a231a62dba025f4c4fa814c1e6ffeb450c5cd0852b780f19fe4ea22b86ba0f1f394406dfd628c67fb7f0987e982fa230da1fbd3632258f927b8defd7046c1ad
+  checksum: 10c0/4a231a62dba025f4c4fa814c1e6ffeb450c5cd0852b780f19fe4ea22b86ba0f1f394406dfd628c67fb7f0987e982fa230da1fbd3632258f927b8defd7046c1ad
   languageName: node
   linkType: hard
 
@@ -11736,7 +12090,7 @@ __metadata:
   resolution: "nanoid@npm:3.3.7"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
+  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
   languageName: node
   linkType: hard
 
@@ -11755,35 +12109,35 @@ __metadata:
     regex-not: "npm:^1.0.0"
     snapdragon: "npm:^0.8.1"
     to-regex: "npm:^3.0.1"
-  checksum: 0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a
+  checksum: 10c0/0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a
   languageName: node
   linkType: hard
 
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
-  checksum: f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
+  checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
   languageName: node
   linkType: hard
 
 "negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
-  checksum: 3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
+  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
 "neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
-  checksum: c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
+  checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
   languageName: node
   linkType: hard
 
 "nice-try@npm:^1.0.4":
   version: 1.0.5
   resolution: "nice-try@npm:1.0.5"
-  checksum: 95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f
+  checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f
   languageName: node
   linkType: hard
 
@@ -11797,14 +12151,14 @@ __metadata:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: 3ec847ca43f678d07b80abfd85bdf06523c2554ee9a494c992c5fc61f5d9cde9f9f16aa33ff09a62f19eee9d54813b8850d7f054cdfee8b2daf789c57f8eeaea
+  checksum: 10c0/3ec847ca43f678d07b80abfd85bdf06523c2554ee9a494c992c5fc61f5d9cde9f9f16aa33ff09a62f19eee9d54813b8850d7f054cdfee8b2daf789c57f8eeaea
   languageName: node
   linkType: hard
 
 "node-forge@npm:^0.10.0":
   version: 0.10.0
   resolution: "node-forge@npm:0.10.0"
-  checksum: 9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663
+  checksum: 10c0/9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663
   languageName: node
   linkType: hard
 
@@ -11815,7 +12169,7 @@ __metadata:
     node-gyp-build: bin.js
     node-gyp-build-optional: optional.js
     node-gyp-build-test: build-test.js
-  checksum: bd7738c96608c1fa056344623b93d4bbdc63fec05862061e5489284639e3a53daa407b9158c45bfc2e33d0b419851ed5c1f03f4c9ba34726361e2a7b765c0ddc
+  checksum: 10c0/bd7738c96608c1fa056344623b93d4bbdc63fec05862061e5489284639e3a53daa407b9158c45bfc2e33d0b419851ed5c1f03f4c9ba34726361e2a7b765c0ddc
   languageName: node
   linkType: hard
 
@@ -11835,14 +12189,14 @@ __metadata:
     which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
+  checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
   languageName: node
   linkType: hard
 
 "node-int64@npm:^0.4.0":
   version: 0.4.0
   resolution: "node-int64@npm:0.4.0"
-  checksum: a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
+  checksum: 10c0/a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
   languageName: node
   linkType: hard
 
@@ -11873,14 +12227,14 @@ __metadata:
     url: "npm:^0.11.0"
     util: "npm:^0.11.0"
     vm-browserify: "npm:^1.0.1"
-  checksum: 0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986
+  checksum: 10c0/0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986
   languageName: node
   linkType: hard
 
 "node-releases@npm:^2.0.14":
   version: 2.0.14
   resolution: "node-releases@npm:2.0.14"
-  checksum: 199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
+  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
   languageName: node
   linkType: hard
 
@@ -11891,7 +12245,7 @@ __metadata:
     abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
   languageName: node
   linkType: hard
 
@@ -11900,21 +12254,21 @@ __metadata:
   resolution: "normalize-path@npm:2.1.1"
   dependencies:
     remove-trailing-separator: "npm:^1.0.1"
-  checksum: db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b
+  checksum: 10c0/db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b
   languageName: node
   linkType: hard
 
 "normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
-  checksum: e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
+  checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
   languageName: node
   linkType: hard
 
 "normalize-range@npm:^0.1.2":
   version: 0.1.2
   resolution: "normalize-range@npm:0.1.2"
-  checksum: bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
+  checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
   languageName: node
   linkType: hard
 
@@ -11923,7 +12277,7 @@ __metadata:
   resolution: "npm-run-path@npm:2.0.2"
   dependencies:
     path-key: "npm:^2.0.0"
-  checksum: 95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de
+  checksum: 10c0/95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de
   languageName: node
   linkType: hard
 
@@ -11932,7 +12286,7 @@ __metadata:
   resolution: "npm-run-path@npm:4.0.1"
   dependencies:
     path-key: "npm:^3.0.0"
-  checksum: 6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
+  checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
   languageName: node
   linkType: hard
 
@@ -11941,19 +12295,7 @@ __metadata:
   resolution: "npm-run-path@npm:5.1.0"
   dependencies:
     path-key: "npm:^4.0.0"
-  checksum: ff6d77514489f47fa1c3b1311d09cd4b6d09a874cc1866260f9dea12cbaabda0436ed7f8c2ee44d147bf99a3af29307c6f63b0f83d242b0b6b0ab25dff2629e3
-  languageName: node
-  linkType: hard
-
-"npmlog@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "npmlog@npm:7.0.1"
-  dependencies:
-    are-we-there-yet: "npm:^4.0.0"
-    console-control-strings: "npm:^1.1.0"
-    gauge: "npm:^5.0.0"
-    set-blocking: "npm:^2.0.0"
-  checksum: d4e6a2aaa7b5b5d2e2ed8f8ac3770789ca0691a49f3576b6a8c97d560a4c3305d2c233a9173d62be737e6e4506bf9e89debd6120a3843c1d37315c34f90fef71
+  checksum: 10c0/ff6d77514489f47fa1c3b1311d09cd4b6d09a874cc1866260f9dea12cbaabda0436ed7f8c2ee44d147bf99a3af29307c6f63b0f83d242b0b6b0ab25dff2629e3
   languageName: node
   linkType: hard
 
@@ -11962,7 +12304,7 @@ __metadata:
   resolution: "nth-check@npm:1.0.2"
   dependencies:
     boolbase: "npm:~1.0.0"
-  checksum: 1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd
+  checksum: 10c0/1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd
   languageName: node
   linkType: hard
 
@@ -11971,21 +12313,21 @@ __metadata:
   resolution: "nth-check@npm:2.1.1"
   dependencies:
     boolbase: "npm:^1.0.0"
-  checksum: 5fee7ff309727763689cfad844d979aedd2204a817fbaaf0e1603794a7c20db28548d7b024692f953557df6ce4a0ee4ae46cd8ebd9b36cfb300b9226b567c479
+  checksum: 10c0/5fee7ff309727763689cfad844d979aedd2204a817fbaaf0e1603794a7c20db28548d7b024692f953557df6ce4a0ee4ae46cd8ebd9b36cfb300b9226b567c479
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2":
+"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
-  checksum: 44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
+  checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
   languageName: node
   linkType: hard
 
 "object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
-  checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
+  checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
   languageName: node
   linkType: hard
 
@@ -11996,31 +12338,31 @@ __metadata:
     copy-descriptor: "npm:^0.1.0"
     define-property: "npm:^0.2.5"
     kind-of: "npm:^3.0.3"
-  checksum: 79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293
+  checksum: 10c0/79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293
   languageName: node
   linkType: hard
 
 "object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0":
   version: 1.13.1
   resolution: "object-inspect@npm:1.13.1"
-  checksum: fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
+  checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+"object-is@npm:^1.0.1":
   version: 1.1.5
   resolution: "object-is@npm:1.1.5"
   dependencies:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.1.3"
-  checksum: 8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886
+  checksum: 10c0/8c263fb03fc28f1ffb54b44b9147235c5e233dc1ca23768e7d2569740b5d860154d7cc29a30220fe28ed6d8008e2422aefdebfe987c103e1c5d190cf02d9d886
   languageName: node
   linkType: hard
 
 "object-keys@npm:^1.1.1":
   version: 1.1.1
   resolution: "object-keys@npm:1.1.1"
-  checksum: b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
+  checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
   languageName: node
   linkType: hard
 
@@ -12029,41 +12371,41 @@ __metadata:
   resolution: "object-visit@npm:1.0.1"
   dependencies:
     isobject: "npm:^3.0.0"
-  checksum: 086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029
+  checksum: 10c0/086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
+"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
     object-keys: "npm:^1.1.1"
-  checksum: 2f286118c023e557757620e647b02e7c88d3d417e0c568fca0820de8ec9cca68928304854d5b03e99763eddad6e78a6716e2930f7e6372e4b9b843f3fd3056f3
+  checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
+"object.entries@npm:^1.1.7":
   version: 1.1.7
   resolution: "object.entries@npm:1.1.7"
   dependencies:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86
+  checksum: 10c0/3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7":
+"object.fromentries@npm:^2.0.7":
   version: 2.0.7
   resolution: "object.fromentries@npm:2.0.7"
   dependencies:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b
+  checksum: 10c0/071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b
   languageName: node
   linkType: hard
 
@@ -12076,7 +12418,7 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.21.2"
     safe-array-concat: "npm:^1.0.0"
-  checksum: 9c401557a1cd47d873810b8df61dba350bc39848753180a2c7bdc8b9a67907b7c12e5aa9318fde7fe68d3b62c88b9cbd729b3cc8bbdf02655619b9d2a99b5c2a
+  checksum: 10c0/9c401557a1cd47d873810b8df61dba350bc39848753180a2c7bdc8b9a67907b7c12e5aa9318fde7fe68d3b62c88b9cbd729b3cc8bbdf02655619b9d2a99b5c2a
   languageName: node
   linkType: hard
 
@@ -12088,17 +12430,17 @@ __metadata:
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
     get-intrinsic: "npm:^1.2.1"
-  checksum: 61e41fbf08cc04ed860363db9629eedeaa590fce243c0960e948fd7b11f78a9d4350065c339936d118a2dd8775d7259e26207340cc8ce688bec66cb615fec6fe
+  checksum: 10c0/61e41fbf08cc04ed860363db9629eedeaa590fce243c0960e948fd7b11f78a9d4350065c339936d118a2dd8775d7259e26207340cc8ce688bec66cb615fec6fe
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+"object.hasown@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "object.hasown@npm:1.1.3"
   dependencies:
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-  checksum: 419fc1c74a2aea7ebb4d49b79d5b1599a010b26c18eae35bd061ccdd013ccb749c499d8dd6ee21a91e6d7264ccc592573d0f13562970f76e25fc844d8c1b02ce
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+  checksum: 10c0/8a41ba4fb1208a85c2275e9b5098071beacc24345b9a71ab98ef0a1c61b34dc74c6b460ff1e1884c33843d8f2553df64a10eec2b74b3ed009e3b2710c826bd2c
   languageName: node
   linkType: hard
 
@@ -12107,7 +12449,7 @@ __metadata:
   resolution: "object.pick@npm:1.3.0"
   dependencies:
     isobject: "npm:^3.0.1"
-  checksum: cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e
+  checksum: 10c0/cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e
   languageName: node
   linkType: hard
 
@@ -12118,14 +12460,21 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b
+  checksum: 10c0/e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b
   languageName: node
   linkType: hard
 
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
-  checksum: 520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81
+  checksum: 10c0/520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81
+  languageName: node
+  linkType: hard
+
+"on-exit-leak-free@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "on-exit-leak-free@npm:2.1.2"
+  checksum: 10c0/faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
   languageName: node
   linkType: hard
 
@@ -12134,14 +12483,14 @@ __metadata:
   resolution: "on-finished@npm:2.4.1"
   dependencies:
     ee-first: "npm:1.1.1"
-  checksum: 46fb11b9063782f2d9968863d9cbba33d77aa13c17f895f56129c274318b86500b22af3a160fe9995aa41317efcd22941b6eba747f718ced08d9a73afdb087b4
+  checksum: 10c0/46fb11b9063782f2d9968863d9cbba33d77aa13c17f895f56129c274318b86500b22af3a160fe9995aa41317efcd22941b6eba747f718ced08d9a73afdb087b4
   languageName: node
   linkType: hard
 
 "on-headers@npm:~1.0.2":
   version: 1.0.2
   resolution: "on-headers@npm:1.0.2"
-  checksum: f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f
+  checksum: 10c0/f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f
   languageName: node
   linkType: hard
 
@@ -12150,7 +12499,7 @@ __metadata:
   resolution: "once@npm:1.4.0"
   dependencies:
     wrappy: "npm:1"
-  checksum: 5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
+  checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
   languageName: node
   linkType: hard
 
@@ -12159,7 +12508,7 @@ __metadata:
   resolution: "onetime@npm:5.1.2"
   dependencies:
     mimic-fn: "npm:^2.1.0"
-  checksum: ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
+  checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
   languageName: node
   linkType: hard
 
@@ -12168,19 +12517,7 @@ __metadata:
   resolution: "onetime@npm:6.0.0"
   dependencies:
     mimic-fn: "npm:^4.0.0"
-  checksum: 4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
-  languageName: node
-  linkType: hard
-
-"open@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "open@npm:9.1.0"
-  dependencies:
-    default-browser: "npm:^4.0.0"
-    define-lazy-prop: "npm:^3.0.0"
-    is-inside-container: "npm:^1.0.0"
-    is-wsl: "npm:^2.2.0"
-  checksum: 8073ec0dd8994a7a7d9bac208bd17d093993a65ce10f2eb9b62b6d3a91c9366ae903938a237c275493c130171d339f6dcbdd2a2de7e32953452c0867b97825af
+  checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
   languageName: node
   linkType: hard
 
@@ -12189,7 +12526,7 @@ __metadata:
   resolution: "opencollective-postinstall@npm:2.0.3"
   bin:
     opencollective-postinstall: index.js
-  checksum: 8a0104a218bc1afaae943f0af378461eeb2836f9848bad872bbd067ec5d1d9791636f307454ab77d0746f10341366f295384656a340ebdb87a2585058e8567e5
+  checksum: 10c0/8a0104a218bc1afaae943f0af378461eeb2836f9848bad872bbd067ec5d1d9791636f307454ab77d0746f10341366f295384656a340ebdb87a2585058e8567e5
   languageName: node
   linkType: hard
 
@@ -12198,7 +12535,7 @@ __metadata:
   resolution: "opener@npm:1.5.2"
   bin:
     opener: bin/opener-bin.js
-  checksum: dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
+  checksum: 10c0/dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
   languageName: node
   linkType: hard
 
@@ -12207,7 +12544,7 @@ __metadata:
   resolution: "opn@npm:5.5.0"
   dependencies:
     is-wsl: "npm:^1.1.0"
-  checksum: 03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c
+  checksum: 10c0/03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c
   languageName: node
   linkType: hard
 
@@ -12221,21 +12558,21 @@ __metadata:
     levn: "npm:^0.4.1"
     prelude-ls: "npm:^1.2.1"
     type-check: "npm:^0.4.0"
-  checksum: 66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
+  checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
   languageName: node
   linkType: hard
 
 "os-browserify@npm:^0.3.0":
   version: 0.3.0
   resolution: "os-browserify@npm:0.3.0"
-  checksum: 6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52
+  checksum: 10c0/6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52
   languageName: node
   linkType: hard
 
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
-  checksum: 6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7
+  checksum: 10c0/6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7
   languageName: node
   linkType: hard
 
@@ -12244,7 +12581,7 @@ __metadata:
   resolution: "p-limit@npm:2.3.0"
   dependencies:
     p-try: "npm:^2.0.0"
-  checksum: 8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
+  checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
   languageName: node
   linkType: hard
 
@@ -12253,7 +12590,7 @@ __metadata:
   resolution: "p-limit@npm:3.1.0"
   dependencies:
     yocto-queue: "npm:^0.1.0"
-  checksum: 9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
+  checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
   languageName: node
   linkType: hard
 
@@ -12262,7 +12599,7 @@ __metadata:
   resolution: "p-locate@npm:3.0.0"
   dependencies:
     p-limit: "npm:^2.0.0"
-  checksum: 7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
+  checksum: 10c0/7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
   languageName: node
   linkType: hard
 
@@ -12271,7 +12608,7 @@ __metadata:
   resolution: "p-locate@npm:4.1.0"
   dependencies:
     p-limit: "npm:^2.2.0"
-  checksum: 1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
+  checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
   languageName: node
   linkType: hard
 
@@ -12280,14 +12617,14 @@ __metadata:
   resolution: "p-locate@npm:5.0.0"
   dependencies:
     p-limit: "npm:^3.0.2"
-  checksum: 2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
+  checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
   languageName: node
   linkType: hard
 
 "p-map@npm:^2.0.0":
   version: 2.1.0
   resolution: "p-map@npm:2.1.0"
-  checksum: 735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043
+  checksum: 10c0/735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043
   languageName: node
   linkType: hard
 
@@ -12296,7 +12633,7 @@ __metadata:
   resolution: "p-map@npm:4.0.0"
   dependencies:
     aggregate-error: "npm:^3.0.0"
-  checksum: 592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
+  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
   languageName: node
   linkType: hard
 
@@ -12305,28 +12642,21 @@ __metadata:
   resolution: "p-retry@npm:3.0.1"
   dependencies:
     retry: "npm:^0.12.0"
-  checksum: 4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b
+  checksum: 10c0/4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b
   languageName: node
   linkType: hard
 
 "p-try@npm:^2.0.0":
   version: 2.2.0
   resolution: "p-try@npm:2.2.0"
-  checksum: c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
-  languageName: node
-  linkType: hard
-
-"packet-reader@npm:1.0.0":
-  version: 1.0.0
-  resolution: "packet-reader@npm:1.0.0"
-  checksum: c86c3321bb07e0f03cc2db59f7701184e0bbfcb914f1fdc963993b03262486deb402292adcef39b64e3530ea66b3b2e2163d6da7b3792a730bdd1c6df3175aaa
+  checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
   languageName: node
   linkType: hard
 
 "pako@npm:~1.0.5":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
-  checksum: 86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
+  checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
   languageName: node
   linkType: hard
 
@@ -12335,7 +12665,7 @@ __metadata:
   resolution: "parent-module@npm:1.0.1"
   dependencies:
     callsites: "npm:^3.0.0"
-  checksum: c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
+  checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
   languageName: node
   linkType: hard
 
@@ -12348,7 +12678,7 @@ __metadata:
     evp_bytestokey: "npm:^1.0.0"
     pbkdf2: "npm:^3.0.3"
     safe-buffer: "npm:^5.1.1"
-  checksum: 4ed1d9b9e120c5484d29d67bb90171aac0b73422bc016d6294160aea983275c28a27ab85d862059a36a86a97dd31b7ddd97486802ca9fac67115fe3409e9dcbd
+  checksum: 10c0/4ed1d9b9e120c5484d29d67bb90171aac0b73422bc016d6294160aea983275c28a27ab85d862059a36a86a97dd31b7ddd97486802ca9fac67115fe3409e9dcbd
   languageName: node
   linkType: hard
 
@@ -12360,14 +12690,14 @@ __metadata:
     error-ex: "npm:^1.3.1"
     json-parse-even-better-errors: "npm:^2.3.0"
     lines-and-columns: "npm:^1.1.6"
-  checksum: 77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
+  checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
   languageName: node
   linkType: hard
 
 "parse-passwd@npm:^1.0.0":
   version: 1.0.0
   resolution: "parse-passwd@npm:1.0.0"
-  checksum: 1c05c05f95f184ab9ca604841d78e4fe3294d46b8e3641d305dcc28e930da0e14e602dbda9f3811cd48df5b0e2e27dbef7357bf0d7c40e41b18c11c3a8b8d17b
+  checksum: 10c0/1c05c05f95f184ab9ca604841d78e4fe3294d46b8e3641d305dcc28e930da0e14e602dbda9f3811cd48df5b0e2e27dbef7357bf0d7c40e41b18c11c3a8b8d17b
   languageName: node
   linkType: hard
 
@@ -12376,115 +12706,115 @@ __metadata:
   resolution: "parse5@npm:7.1.2"
   dependencies:
     entities: "npm:^4.4.0"
-  checksum: 297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
+  checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
   languageName: node
   linkType: hard
 
 "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
-  checksum: 90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5
+  checksum: 10c0/90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5
   languageName: node
   linkType: hard
 
 "pascalcase@npm:^0.1.1":
   version: 0.1.1
   resolution: "pascalcase@npm:0.1.1"
-  checksum: 48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b
+  checksum: 10c0/48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b
   languageName: node
   linkType: hard
 
 "path-browserify@npm:0.0.1":
   version: 0.0.1
   resolution: "path-browserify@npm:0.0.1"
-  checksum: 3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3
+  checksum: 10c0/3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3
   languageName: node
   linkType: hard
 
 "path-complete-extname@npm:^1.0.0":
   version: 1.0.0
   resolution: "path-complete-extname@npm:1.0.0"
-  checksum: 06139eff7acc24a5ca1521d61571fe2a52e9a69a1a417dd6ad28f0a6fb046f623ff2480a1ef2de623d1e051b5dc988b610f263ebbb6352e0c53b3e24d706cc18
+  checksum: 10c0/06139eff7acc24a5ca1521d61571fe2a52e9a69a1a417dd6ad28f0a6fb046f623ff2480a1ef2de623d1e051b5dc988b610f263ebbb6352e0c53b3e24d706cc18
   languageName: node
   linkType: hard
 
 "path-dirname@npm:^1.0.0":
   version: 1.0.2
   resolution: "path-dirname@npm:1.0.2"
-  checksum: 71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b
+  checksum: 10c0/71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b
   languageName: node
   linkType: hard
 
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
-  checksum: 17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
+  checksum: 10c0/17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
   languageName: node
   linkType: hard
 
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
-  checksum: 8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
+  checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
   languageName: node
   linkType: hard
 
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
+  checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
   languageName: node
   linkType: hard
 
 "path-is-inside@npm:^1.0.2":
   version: 1.0.2
   resolution: "path-is-inside@npm:1.0.2"
-  checksum: 7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c
+  checksum: 10c0/7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c
   languageName: node
   linkType: hard
 
 "path-key@npm:^2.0.0, path-key@npm:^2.0.1":
   version: 2.0.1
   resolution: "path-key@npm:2.0.1"
-  checksum: dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b
+  checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b
   languageName: node
   linkType: hard
 
 "path-key@npm:^3.0.0, path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
-  checksum: 748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
+  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
   languageName: node
   linkType: hard
 
 "path-key@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-key@npm:4.0.0"
-  checksum: 794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3
+  checksum: 10c0/794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3
   languageName: node
   linkType: hard
 
 "path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
-  checksum: 11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
+  checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.11.0":
+  version: 1.11.0
+  resolution: "path-scurry@npm:1.11.0"
   dependencies:
-    lru-cache: "npm:^9.1.1 || ^10.0.0"
+    lru-cache: "npm:^10.2.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
+  checksum: 10c0/a5cd5dfbc6d5bb01d06bc2eb16ccdf303d617865438a21fe15431b8ad334f23351f73259abeb7e4be56f9c68d237b26b4dba51c78b508586035dfc2b55085493
   languageName: node
   linkType: hard
 
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
+  checksum: 10c0/50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
   languageName: node
   linkType: hard
 
@@ -12493,14 +12823,14 @@ __metadata:
   resolution: "path-to-regexp@npm:1.8.0"
   dependencies:
     isarray: "npm:0.0.1"
-  checksum: 7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c
+  checksum: 10c0/7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c
   languageName: node
   linkType: hard
 
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
-  checksum: 666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
+  checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
   languageName: node
   linkType: hard
 
@@ -12513,65 +12843,65 @@ __metadata:
     ripemd160: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
     sha.js: "npm:^2.4.8"
-  checksum: 5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd
+  checksum: 10c0/5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd
   languageName: node
   linkType: hard
 
 "performance-now@npm:^0.2.0":
   version: 0.2.0
   resolution: "performance-now@npm:0.2.0"
-  checksum: d7f3824e443491208f7124b45d3280dbff889f8f048c3aee507109c24644d51a226eb07fd7ac51dd0eef144639590c57410c2d167bd4fdf0c5caa0101a449c3d
+  checksum: 10c0/d7f3824e443491208f7124b45d3280dbff889f8f048c3aee507109c24644d51a226eb07fd7ac51dd0eef144639590c57410c2d167bd4fdf0c5caa0101a449c3d
   languageName: node
   linkType: hard
 
 "performance-now@npm:^2.1.0":
   version: 2.1.0
   resolution: "performance-now@npm:2.1.0"
-  checksum: 22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9
+  checksum: 10c0/22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9
   languageName: node
   linkType: hard
 
 "pg-cloudflare@npm:^1.1.1":
   version: 1.1.1
   resolution: "pg-cloudflare@npm:1.1.1"
-  checksum: a68b957f755be6af813d68ccaf4c906a000fd2ecb362cd281220052cc9e2f6c26da3b88792742387008c30b3bf0d2fa3a0eff04aeb8af4414023c99ae78e07bd
+  checksum: 10c0/a68b957f755be6af813d68ccaf4c906a000fd2ecb362cd281220052cc9e2f6c26da3b88792742387008c30b3bf0d2fa3a0eff04aeb8af4414023c99ae78e07bd
   languageName: node
   linkType: hard
 
-"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "pg-connection-string@npm:2.6.2"
-  checksum: e8fdea74fcc8bdc3d7c5c6eadd9425fdba7e67fb7fe836f9c0cecad94c8984e435256657d1d8ce0483d1fedef667e7a57e32449a63cb805cb0289fc34b62da35
+"pg-connection-string@npm:^2.6.0, pg-connection-string@npm:^2.6.4":
+  version: 2.6.4
+  resolution: "pg-connection-string@npm:2.6.4"
+  checksum: 10c0/0d0b617df0fc6507bf6a94bdcd56c7a305788a1402d69bff9773350947c8f525d6d8136128065370749a3325e99658ae40fbdcce620fb8e60126181f0591a6a6
   languageName: node
   linkType: hard
 
 "pg-int8@npm:1.0.1":
   version: 1.0.1
   resolution: "pg-int8@npm:1.0.1"
-  checksum: be6a02d851fc2a4ae3e9de81710d861de3ba35ac927268973eb3cb618873a05b9424656df464dd43bd7dc3fc5295c3f5b3c8349494f87c7af50ec59ef14e0b98
+  checksum: 10c0/be6a02d851fc2a4ae3e9de81710d861de3ba35ac927268973eb3cb618873a05b9424656df464dd43bd7dc3fc5295c3f5b3c8349494f87c7af50ec59ef14e0b98
   languageName: node
   linkType: hard
 
 "pg-numeric@npm:1.0.2":
   version: 1.0.2
   resolution: "pg-numeric@npm:1.0.2"
-  checksum: 43dd9884e7b52c79ddc28d2d282d7475fce8bba13452d33c04ceb2e0a65f561edf6699694e8e1c832ff9093770496363183c950dd29608e1bdd98f344b25bca9
+  checksum: 10c0/43dd9884e7b52c79ddc28d2d282d7475fce8bba13452d33c04ceb2e0a65f561edf6699694e8e1c832ff9093770496363183c950dd29608e1bdd98f344b25bca9
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.6.1":
-  version: 3.6.1
-  resolution: "pg-pool@npm:3.6.1"
+"pg-pool@npm:^3.6.2":
+  version: 3.6.2
+  resolution: "pg-pool@npm:3.6.2"
   peerDependencies:
     pg: ">=8.0"
-  checksum: 47837c4e4c2b9e195cec01bd58b6e276acc915537191707ad4d6ed975fd9bc03c73f63cb7fde4cb0e08ed059e35faf60fbd03744dee3af71d4b4631ab40eeb7f
+  checksum: 10c0/14c524549490954b5e48457a4b808df8f619f6deeb3b395b0cd184a8f4ed65a9273fe0697ba0341a41d6745af197f1437eb1cf51fff0cbbf5b0fb3852ebe5392
   languageName: node
   linkType: hard
 
-"pg-protocol@npm:*, pg-protocol@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "pg-protocol@npm:1.6.0"
-  checksum: 318a4d1e9cebd3927b10a8bc412f5017117a1f9a5fafb628d75847da7d1ab81c33250de58596bd0990029e14e92a995a851286d60fc236692299faf509572213
+"pg-protocol@npm:*, pg-protocol@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "pg-protocol@npm:1.6.1"
+  checksum: 10c0/7eadef4010ac0a3925c460be7332ca4098a5c6d5181725a62193fcfa800000ae6632d98d814f3989b42cf5fdc3b45e34c714a1959d29174e81e30730e140ae5f
   languageName: node
   linkType: hard
 
@@ -12584,7 +12914,7 @@ __metadata:
     postgres-bytea: "npm:~1.0.0"
     postgres-date: "npm:~1.0.4"
     postgres-interval: "npm:^1.1.0"
-  checksum: ab3f8069a323f601cd2d2279ca8c425447dab3f9b61d933b0601d7ffc00d6200df25e26a4290b2b0783b59278198f7dd2ed03e94c4875797919605116a577c65
+  checksum: 10c0/ab3f8069a323f601cd2d2279ca8c425447dab3f9b61d933b0601d7ffc00d6200df25e26a4290b2b0783b59278198f7dd2ed03e94c4875797919605116a577c65
   languageName: node
   linkType: hard
 
@@ -12599,20 +12929,18 @@ __metadata:
     postgres-date: "npm:~2.0.1"
     postgres-interval: "npm:^3.0.0"
     postgres-range: "npm:^1.1.1"
-  checksum: e2126b2775554ae8bacb3b104814487c2af2caff44cc52bee786b3887c65fe4c1fe031237e51e30ffed1cbb13b71776bd60cc1e65ac800c9946df4030849a074
+  checksum: 10c0/e2126b2775554ae8bacb3b104814487c2af2caff44cc52bee786b3887c65fe4c1fe031237e51e30ffed1cbb13b71776bd60cc1e65ac800c9946df4030849a074
   languageName: node
   linkType: hard
 
 "pg@npm:^8.5.0":
-  version: 8.11.3
-  resolution: "pg@npm:8.11.3"
+  version: 8.11.5
+  resolution: "pg@npm:8.11.5"
   dependencies:
-    buffer-writer: "npm:2.0.0"
-    packet-reader: "npm:1.0.0"
     pg-cloudflare: "npm:^1.1.1"
-    pg-connection-string: "npm:^2.6.2"
-    pg-pool: "npm:^3.6.1"
-    pg-protocol: "npm:^1.6.0"
+    pg-connection-string: "npm:^2.6.4"
+    pg-pool: "npm:^3.6.2"
+    pg-protocol: "npm:^1.6.1"
     pg-types: "npm:^2.1.0"
     pgpass: "npm:1.x"
   peerDependencies:
@@ -12623,7 +12951,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 07e6967fc8bd5d72bab9be6620626e8e3ab59128ebf56bf0de83d67f10801a19221d88b3317e90b93339ba48d0498b39967b782ae39686aabda6bc647bceb438
+  checksum: 10c0/20f29a41a99bad5931faf4d4a01e7be7fb27e5b5338fdfb06d2368e295c3d3d4ef49958ad57d2b17bad108e5c84574db6244ed8221e6b77a767f64ef12564119
   languageName: node
   linkType: hard
 
@@ -12632,21 +12960,21 @@ __metadata:
   resolution: "pgpass@npm:1.0.5"
   dependencies:
     split2: "npm:^4.1.0"
-  checksum: 5ea6c9b2de04c33abb08d33a2dded303c4a3c7162a9264519cbe85c0a9857d712463140ba42fad0c7cd4b21f644dd870b45bb2e02fcbe505b4de0744fd802c1d
+  checksum: 10c0/5ea6c9b2de04c33abb08d33a2dded303c4a3c7162a9264519cbe85c0a9857d712463140ba42fad0c7cd4b21f644dd870b45bb2e02fcbe505b4de0744fd802c1d
   languageName: node
   linkType: hard
 
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
-  checksum: 20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
   languageName: node
   linkType: hard
 
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
-  checksum: 26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
+  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
   languageName: node
   linkType: hard
 
@@ -12655,28 +12983,28 @@ __metadata:
   resolution: "pidtree@npm:0.6.0"
   bin:
     pidtree: bin/pidtree.js
-  checksum: 0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9
+  checksum: 10c0/0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9
   languageName: node
   linkType: hard
 
 "piexifjs@npm:^1.0.6":
   version: 1.0.6
   resolution: "piexifjs@npm:1.0.6"
-  checksum: 69a10fe09c08f1e67e653844ac79e720324a7fa34689b020359d60d98b3a601c070e1759df8f2d97d022298bd2f5b79eed4c92de86c5f215300c8a63adf947b1
+  checksum: 10c0/69a10fe09c08f1e67e653844ac79e720324a7fa34689b020359d60d98b3a601c070e1759df8f2d97d022298bd2f5b79eed4c92de86c5f215300c8a63adf947b1
   languageName: node
   linkType: hard
 
 "pify@npm:^2.0.0":
   version: 2.3.0
   resolution: "pify@npm:2.3.0"
-  checksum: 551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc
+  checksum: 10c0/551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc
   languageName: node
   linkType: hard
 
 "pify@npm:^4.0.1":
   version: 4.0.1
   resolution: "pify@npm:4.0.1"
-  checksum: 6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf
+  checksum: 10c0/6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf
   languageName: node
   linkType: hard
 
@@ -12685,21 +13013,95 @@ __metadata:
   resolution: "pinkie-promise@npm:2.0.1"
   dependencies:
     pinkie: "npm:^2.0.0"
-  checksum: 11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a
+  checksum: 10c0/11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a
   languageName: node
   linkType: hard
 
 "pinkie@npm:^2.0.0":
   version: 2.0.4
   resolution: "pinkie@npm:2.0.4"
-  checksum: 25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6
+  checksum: 10c0/25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6
+  languageName: node
+  linkType: hard
+
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "pino-abstract-transport@npm:1.2.0"
+  dependencies:
+    readable-stream: "npm:^4.0.0"
+    split2: "npm:^4.0.0"
+  checksum: 10c0/b4ab59529b7a91f488440147fc58ee0827a6c1c5ca3627292339354b1381072c1a6bfa9b46d03ad27872589e8477ecf74da12cf286e1e6b665ac64a3b806bf07
+  languageName: node
+  linkType: hard
+
+"pino-http@npm:^10.0.0":
+  version: 10.1.0
+  resolution: "pino-http@npm:10.1.0"
+  dependencies:
+    get-caller-file: "npm:^2.0.5"
+    pino: "npm:^9.0.0"
+    pino-std-serializers: "npm:^7.0.0"
+    process-warning: "npm:^3.0.0"
+  checksum: 10c0/d97691f2ee248b0aca0e49169d0c7ca0d4c604ee57b63ae264a6f9914fc7277cace74686d5088a876f8152a8d5b8211af904b2d24a516728a662de0e9cc79e9f
+  languageName: node
+  linkType: hard
+
+"pino-pretty@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "pino-pretty@npm:11.0.0"
+  dependencies:
+    colorette: "npm:^2.0.7"
+    dateformat: "npm:^4.6.3"
+    fast-copy: "npm:^3.0.0"
+    fast-safe-stringify: "npm:^2.1.1"
+    help-me: "npm:^5.0.0"
+    joycon: "npm:^3.1.1"
+    minimist: "npm:^1.2.6"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^1.0.0"
+    pump: "npm:^3.0.0"
+    readable-stream: "npm:^4.0.0"
+    secure-json-parse: "npm:^2.4.0"
+    sonic-boom: "npm:^3.0.0"
+    strip-json-comments: "npm:^3.1.1"
+  bin:
+    pino-pretty: bin.js
+  checksum: 10c0/d42213f3fdf19d92152b0a14683b2bb8443423739c81ab7c1181a5dac0e0ca7621d232c8264ece81edc01106ca2a8e165783daca0a902f0fde480027075d5540
+  languageName: node
+  linkType: hard
+
+"pino-std-serializers@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pino-std-serializers@npm:7.0.0"
+  checksum: 10c0/73e694d542e8de94445a03a98396cf383306de41fd75ecc07085d57ed7a57896198508a0dec6eefad8d701044af21eb27253ccc352586a03cf0d4a0bd25b4133
+  languageName: node
+  linkType: hard
+
+"pino@npm:^9.0.0":
+  version: 9.1.0
+  resolution: "pino@npm:9.1.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+    fast-redact: "npm:^3.1.1"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^1.2.0"
+    pino-std-serializers: "npm:^7.0.0"
+    process-warning: "npm:^3.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    real-require: "npm:^0.2.0"
+    safe-stable-stringify: "npm:^2.3.1"
+    sonic-boom: "npm:^4.0.1"
+    thread-stream: "npm:^3.0.0"
+  bin:
+    pino: bin.js
+  checksum: 10c0/d060530ae2e4e8f21d04bb0f44f009f94d207d7f4337f508f618416514214ddaf1b29f8c5c265153a19ce3b6480b451461f40020f916ace9d53a5aa07624b79c
   languageName: node
   linkType: hard
 
 "pirates@npm:^4.0.4":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
-  checksum: 00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
+  checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
   languageName: node
   linkType: hard
 
@@ -12708,7 +13110,7 @@ __metadata:
   resolution: "pkg-dir@npm:3.0.0"
   dependencies:
     find-up: "npm:^3.0.0"
-  checksum: 902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847
+  checksum: 10c0/902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847
   languageName: node
   linkType: hard
 
@@ -12717,7 +13119,7 @@ __metadata:
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
     find-up: "npm:^4.0.0"
-  checksum: c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
+  checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
   languageName: node
   linkType: hard
 
@@ -12728,88 +13130,290 @@ __metadata:
     async: "npm:^2.6.4"
     debug: "npm:^3.2.7"
     mkdirp: "npm:^0.5.6"
-  checksum: cef8b567b78aabccc59fe8e103bac8b394bb45a6a69be626608f099f454124c775aaf47b274c006332c07ab3f501cde55e49aaeb9d49d78d90362d776a565cbf
+  checksum: 10c0/cef8b567b78aabccc59fe8e103bac8b394bb45a6a69be626608f099f454124c775aaf47b274c006332c07ab3f501cde55e49aaeb9d49d78d90362d776a565cbf
   languageName: node
   linkType: hard
 
 "posix-character-classes@npm:^0.1.0":
   version: 0.1.1
   resolution: "posix-character-classes@npm:0.1.1"
-  checksum: cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc
+  checksum: 10c0/cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-calc@npm:9.0.1"
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd
+  languageName: node
+  linkType: hard
+
+"postcss-attribute-case-insensitive@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-attribute-case-insensitive@npm:6.0.3"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.11"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/6161a625356db17ea23daa50797e23fa830a15629fa45e7438b5ac72a389f81ba51088503c5893a941d34d287857882867199584c5f03bf7762258c74570f456
+  languageName: node
+  linkType: hard
+
+"postcss-calc@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-calc@npm:10.0.0"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.16"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.2
-  checksum: e0df07337162dbcaac5d6e030c7fd289e21da8766a9daca5d6b2b3c8094bb524ae5d74c70048ea7fe5fe4960ce048c60ac97922d917c3bbff34f58e9d2b0eb0e
+    postcss: ^8.4.38
+  checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-colormin@npm:6.0.2"
+"postcss-clamp@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "postcss-clamp@npm:4.1.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4.6
+  checksum: 10c0/701261026b38a4c27b3c3711635fac96005f36d3270adb76dbdb1eebc950fc841db45283ee66068a7121565592e9d7967d5534e15b6e4dd266afcabf9eafa905
+  languageName: node
+  linkType: hard
+
+"postcss-color-functional-notation@npm:^6.0.11":
+  version: 6.0.11
+  resolution: "postcss-color-functional-notation@npm:6.0.11"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/7fd75e6881cf62f536f79dfc0ae1b709ea0b8b84833cce1671372711f6019ab4360c6a17089b654b2d376b87e7f9455b94f0d13b45ab0ab767e547b604709b3d
+  languageName: node
+  linkType: hard
+
+"postcss-color-hex-alpha@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "postcss-color-hex-alpha@npm:9.0.4"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/57b5cfe17e0b659d5444f267c485462b8b25f6ab087b810c7dd44662af4828e1e8f9c4a9169b8635a4755509ca7c0f3463c2e96444764c4e6ff9f4036aad05e5
+  languageName: node
+  linkType: hard
+
+"postcss-color-rebeccapurple@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "postcss-color-rebeccapurple@npm:9.0.3"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/ab36d29df23dd475a2a540101427640ef9c7936bbf941816e8582caea05feced26c65f795a849e2ad17469cee6682d1bbccd2f8ab0da07fe91efcc0649568038
+  languageName: node
+  linkType: hard
+
+"postcss-colormin@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-colormin@npm:7.0.0"
+  dependencies:
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    colord: "npm:^2.9.1"
+    colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
+  checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-convert-values@npm:6.0.2"
+"postcss-convert-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-convert-values@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
+  checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-comments@npm:6.0.1"
+"postcss-custom-media@npm:^10.0.6":
+  version: 10.0.6
+  resolution: "postcss-custom-media@npm:10.0.6"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
   peerDependencies:
-    postcss: ^8.4.31
-  checksum: 5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
+    postcss: ^8.4
+  checksum: 10c0/98a524bc46b780a86094bbe8007f1e577137da5490823631a683d4b3df4a13e40c5e1ab52380275a54f7011abfd98bb597c6293d964c14f9f22ec6cf9d75c550
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-duplicates@npm:6.0.1"
+"postcss-custom-properties@npm:^13.3.10":
+  version: 13.3.10
+  resolution: "postcss-custom-properties@npm:13.3.10"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.4.31
-  checksum: b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
+    postcss: ^8.4
+  checksum: 10c0/52688fd0aaadccfdf4a3d86d3a2ab988163e8108088c5e33fc9145d261f75b92b8321c044a8161345abda10df5715d674330309dcc0c17f2980db5515f6a76d6
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-empty@npm:6.0.1"
+"postcss-custom-selectors@npm:^7.1.10":
+  version: 7.1.10
+  resolution: "postcss-custom-selectors@npm:7.1.10"
+  dependencies:
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
-    postcss: ^8.4.31
-  checksum: 6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
+    postcss: ^8.4
+  checksum: 10c0/11311ae6f306420223c6bf926fb1798738f3aa525a267de204de8e8ee9de467bf63b580d9ad5dbb0fff4bd9266770a3fa7e27a24af08a2e0a4115d0727d1d043
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-overridden@npm:6.0.1"
+"postcss-dir-pseudo-class@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-dir-pseudo-class@npm:8.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/8c096e096b09e4041818bd2edf5581b5172375621f5eeca013633166ea100ab98e71bf60fccd92fa20cfa7b55c57598605a1655c6bcbe54a80728a7d4e36859e
+  languageName: node
+  linkType: hard
+
+"postcss-discard-comments@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-comments@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
+  checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a
+  languageName: node
+  linkType: hard
+
+"postcss-discard-duplicates@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-duplicates@npm:7.0.0"
+  peerDependencies:
+    postcss: ^8.4.31
+  checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8
+  languageName: node
+  linkType: hard
+
+"postcss-discard-empty@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-empty@npm:7.0.0"
+  peerDependencies:
+    postcss: ^8.4.31
+  checksum: 10c0/b54fc9ad59a6015f6b82b8c826717a4a2f82b272608f6ae37a0b568f4f6c503f5ac7d13d415853a946a0422cb37b9fe1d5ddcee91fe0c2086001138710600d8b
+  languageName: node
+  linkType: hard
+
+"postcss-discard-overridden@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-overridden@npm:7.0.0"
+  peerDependencies:
+    postcss: ^8.4.31
+  checksum: 10c0/ca00ed1d4e8793fc780039f235fa2caef123d3aa28cae47cc1472ca03b21386c39fae1f11fbf319dcb94c6bda923824067254c7e20e8b00354b47015dc754658
+  languageName: node
+  linkType: hard
+
+"postcss-double-position-gradients@npm:^5.0.6":
+  version: 5.0.6
+  resolution: "postcss-double-position-gradients@npm:5.0.6"
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/9b24b13043fe506c0ddd94e707fe4f21f4f9a6c05ca49a4f45e23412951fd6a4cfa0095002d10b322ca8be60df0badae3715a27eefdeb7bf8da4fdd1ecd5d7a2
+  languageName: node
+  linkType: hard
+
+"postcss-focus-visible@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-focus-visible@npm:9.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b8eb14ef51df62969559a7b2b4a4b6313a802fc2de225de293ad484ed6528833fc6bb7574aad5fabe7eeb27e8cd62663c2d547b25ff058d31c06d3d066abd904
+  languageName: node
+  linkType: hard
+
+"postcss-focus-within@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-focus-within@npm:8.0.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/cb0380d89f3b9313345dbea65c78c7ad16a6e6ab2ba9e90451d5b14f05ee691a0cdf458376368061327182e031644da21eee7e6e9ae508d195f083e0a20c0502
+  languageName: node
+  linkType: hard
+
+"postcss-font-variant@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-font-variant@npm:5.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/ccc96460cf6a52b5439c26c9a5ea0589882e46161e3c2331d4353de7574448f5feef667d1a68f7f39b9fe3ee75d85957383ae82bbfcf87c3162c7345df4a444e
+  languageName: node
+  linkType: hard
+
+"postcss-gap-properties@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "postcss-gap-properties@npm:5.0.1"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/3b28c38819add37a2fc7decd7e3bdda1cab1de861af228abfb3e4310d87786eff4572a693bec6cea1c435bcd3dd0bb58bc9a58f1dde3a1c7def9feaf800762b8
+  languageName: node
+  linkType: hard
+
+"postcss-image-set-function@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-image-set-function@npm:6.0.3"
+  dependencies:
+    "@csstools/utilities": "npm:^1.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b35ce25aeca95f7abc5e5820f2398588150f5be02209054d714e870ae2fa01a8482fd10600fe1f847add898c39690275a60a5999f83f6bed6c66be9b0444b704
+  languageName: node
+  linkType: hard
+
+"postcss-lab-function@npm:^6.0.16":
+  version: 6.0.16
+  resolution: "postcss-lab-function@npm:6.0.16"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^2.0.2"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/ba8717cd8a197ec17acaac1b61631cd4403f07bd406b0c92f2e430a55e3f786cd6c338b626c3326e9178a0f3e58ff838ebaded19f480f39197a9cb17349ecdcd
   languageName: node
   linkType: hard
 
@@ -12825,88 +13429,99 @@ __metadata:
   peerDependencies:
     postcss: ^7.0.0 || ^8.0.1
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 3405584e571ec4d66d7c2b665a2a4823eaa7208433fd40eb6b669ac441f23398bc81fc18fe631c7d7805a303ad31f284a5066c4097dd082c1faba7edf13db8aa
+  checksum: 10c0/3405584e571ec4d66d7c2b665a2a4823eaa7208433fd40eb6b669ac441f23398bc81fc18fe631c7d7805a303ad31f284a5066c4097dd082c1faba7edf13db8aa
+  languageName: node
+  linkType: hard
+
+"postcss-logical@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-logical@npm:7.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/66a06b5d3cb31181dd76c80286addd219205066a4a8c216076869fc54769ee0011cdaa8063e1b2c19c114cdc5ad12a2e2e8b730f6971960dc77d55f25f290223
   languageName: node
   linkType: hard
 
 "postcss-media-query-parser@npm:^0.2.3":
   version: 0.2.3
   resolution: "postcss-media-query-parser@npm:0.2.3"
-  checksum: 252c8cf24f0e9018516b0d70b7b3d6f5b52e81c4bab2164b49a4e4c1b87bb11f5dbe708c0076990665cb24c70d5fd2f3aee9c922b0f67c7c619e051801484688
+  checksum: 10c0/252c8cf24f0e9018516b0d70b7b3d6f5b52e81c4bab2164b49a4e4c1b87bb11f5dbe708c0076990665cb24c70d5fd2f3aee9c922b0f67c7c619e051801484688
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-merge-longhand@npm:6.0.2"
+"postcss-merge-longhand@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-longhand@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.2"
+    stylehacks: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
+  checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-merge-rules@npm:6.0.3"
+"postcss-merge-rules@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-rules@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    cssnano-utils: "npm:^4.0.1"
-    postcss-selector-parser: "npm:^6.0.15"
+    cssnano-utils: "npm:^5.0.0"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
+  checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-font-values@npm:6.0.1"
+"postcss-minify-font-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-font-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
+  checksum: 10c0/f8be40099a6986d96b9cd2eb9c32a9c681efc6ecd6504c9ab7e01feb9e688c8b9656dfd7f35aa6de2585a86d607f62152ee81d0175e712e4658d184d25f63d58
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-gradients@npm:6.0.1"
+"postcss-minify-gradients@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-gradients@npm:7.0.0"
   dependencies:
-    colord: "npm:^2.9.1"
-    cssnano-utils: "npm:^4.0.1"
+    colord: "npm:^2.9.3"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
+  checksum: 10c0/15d162192b598242e14def81a62e30cf273ab14f1db702c391e6bdd442c570a1aa76fc326874253a2d67f75b4d4fe73ba4f664e85dbff883f24b7090c340bfad
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-params@npm:6.0.2"
+"postcss-minify-params@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-params@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    cssnano-utils: "npm:^4.0.1"
+    browserslist: "npm:^4.23.0"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
+  checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-selectors@npm:6.0.2"
+"postcss-minify-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-selectors@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
+  checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36
   languageName: node
   linkType: hard
 
@@ -12915,7 +13530,7 @@ __metadata:
   resolution: "postcss-modules-extract-imports@npm:3.0.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
+  checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
   languageName: node
   linkType: hard
 
@@ -12928,7 +13543,7 @@ __metadata:
     postcss-value-parser: "npm:^4.1.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: be49b86efbfb921f42287e227584aac91af9826fc1083db04958ae283dfe215ca539421bfba71f9da0f0b10651f28e95a64b5faca7166f578a1933b8646051f7
+  checksum: 10c0/be49b86efbfb921f42287e227584aac91af9826fc1083db04958ae283dfe215ca539421bfba71f9da0f0b10651f28e95a64b5faca7166f578a1933b8646051f7
   languageName: node
   linkType: hard
 
@@ -12939,7 +13554,7 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.4"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: 60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a
+  checksum: 10c0/60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a
   languageName: node
   linkType: hard
 
@@ -12950,147 +13565,290 @@ __metadata:
     icss-utils: "npm:^5.0.0"
   peerDependencies:
     postcss: ^8.1.0
-  checksum: dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
+  checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-charset@npm:6.0.1"
+"postcss-nesting@npm:^12.1.4":
+  version: 12.1.4
+  resolution: "postcss-nesting@npm:12.1.4"
+  dependencies:
+    "@csstools/selector-resolve-nested": "npm:^1.1.0"
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-charset@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-charset@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
+  checksum: 10c0/06d9c4487a4b0e195133a1fb7a115db7014e49d2567cce73e24c59f473f0e65a1999850a726afb3bdb2d36017a3e5c92ac4fd2a7ecc427da4ff79522765fabdd
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-display-values@npm:6.0.1"
+"postcss-normalize-display-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-display-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
+  checksum: 10c0/439524e1d3ed36d6265c05da10540e17aa8605e1b396f71ca4364ab3b8b98ca97763c58c211fb9492662429d43613a7fe7009a8638c84a8db327e572c382272a
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-positions@npm:6.0.1"
+"postcss-normalize-positions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-positions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
+  checksum: 10c0/428763c937cd178c8ee544cd93a9d1fef667dc9a8700ffe2e61b0beeea7f64f712492b9aeb8a1ef927ab752ec34be7ddeb23d2b50e4bc6eba02b0e58312b27a7
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-repeat-style@npm:6.0.1"
+"postcss-normalize-repeat-style@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-repeat-style@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
+  checksum: 10c0/cf7cd9f355fd26f1c9b0c11a923029ac5ea3020520db5a9778dd19c5ee1f48a1f1f368b4ae75fc6b63cb5761eef72333e486ab0de1537b9cb62d213a8c5576d0
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-string@npm:6.0.1"
+"postcss-normalize-string@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-string@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
+  checksum: 10c0/8857563f85841ce432bb9a5a9ba129847890b61693adff96d565b69dc2d5456f54dec33f4f6ce5b0abf0a484dbfb0145846d99f988959c5ac875a86a2a180576
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-timing-functions@npm:6.0.1"
+"postcss-normalize-timing-functions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-timing-functions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
+  checksum: 10c0/bc5f6999b4c9e28e5be785ef90fe68fd48d44059ecc73ee194c2603260597d685b13a1e1751df9a2cee100fea7abb7e1b1cbcf1a7a428a576961705c9d426788
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-unicode@npm:6.0.2"
+"postcss-normalize-unicode@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-unicode@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
+  checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-url@npm:6.0.1"
+"postcss-normalize-url@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-url@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
+  checksum: 10c0/3050e228be48fe0121d1316c267e629b232e8401a547128d142c3dea55eeae1e232c9beeea5c76439009188993b14925c5cf40e3a44856d076a7b8fcf4721f86
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-whitespace@npm:6.0.1"
+"postcss-normalize-whitespace@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-whitespace@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
+  checksum: 10c0/8d61234962a4850fc61292592171e1d13de2e90d96a2eaed8c85672a05caceda02a3bd1cb495cb72414741f99d50083362df14923efaca1b3e09657d24cea34b
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-ordered-values@npm:6.0.1"
+"postcss-opacity-percentage@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-opacity-percentage@npm:2.0.0"
+  peerDependencies:
+    postcss: ^8.2
+  checksum: 10c0/f031f3281060c4c0ede8f9a5832f65a3d8c2a1896ff324c41de42016e092635f0e0abee07545b01db93dc430a9741674a1d09c377c6c01cd8c2f4be65f889161
+  languageName: node
+  linkType: hard
+
+"postcss-ordered-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-ordered-values@npm:7.0.0"
   dependencies:
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
+  checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-reduce-initial@npm:6.0.2"
+"postcss-overflow-shorthand@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "postcss-overflow-shorthand@npm:5.0.1"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/328407adffae084c096b3ea2c03037f0083a0000cae744872bb1168fdd317eef12bb049cdfef749343c3ed65b4275dc6eefe577d99cbc78e3617cb36d07e8717
+  languageName: node
+  linkType: hard
+
+"postcss-page-break@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "postcss-page-break@npm:3.0.4"
+  peerDependencies:
+    postcss: ^8
+  checksum: 10c0/eaaf4d8922b35f2acd637eb059f7e2510b24d65eb8f31424799dd5a98447b6ef010b41880c26e78f818e00f842295638ec75f89d5d489067f53e3dd3db74a00f
+  languageName: node
+  linkType: hard
+
+"postcss-place@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-place@npm:9.0.1"
+  dependencies:
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/d0fb5b0416fd15d5ac7da5fcc1829b9b78c5a90caba5bd045052c6ac0467910cbbeb2fff6c5257190affa656be27168c94ff339f86c0b7df54f9bea04bcadba7
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:^9.5.2":
+  version: 9.5.13
+  resolution: "postcss-preset-env@npm:9.5.13"
+  dependencies:
+    "@csstools/postcss-cascade-layers": "npm:^4.0.6"
+    "@csstools/postcss-color-function": "npm:^3.0.16"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.16"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.7"
+    "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.9"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.17"
+    "@csstools/postcss-hwb-function": "npm:^3.0.15"
+    "@csstools/postcss-ic-unit": "npm:^3.0.6"
+    "@csstools/postcss-initial": "npm:^1.0.1"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.5"
+    "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
+    "@csstools/postcss-logical-overflow": "npm:^1.0.1"
+    "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
+    "@csstools/postcss-logical-resize": "npm:^2.0.1"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.9"
+    "@csstools/postcss-media-minmax": "npm:^1.1.6"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.9"
+    "@csstools/postcss-nested-calc": "npm:^3.0.2"
+    "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
+    "@csstools/postcss-oklab-function": "npm:^3.0.16"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.16"
+    "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.8"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.6"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.8"
+    "@csstools/postcss-unset-value": "npm:^3.0.1"
+    autoprefixer: "npm:^10.4.19"
+    browserslist: "npm:^4.22.3"
+    css-blank-pseudo: "npm:^6.0.2"
+    css-has-pseudo: "npm:^6.0.5"
+    css-prefers-color-scheme: "npm:^9.0.1"
+    cssdb: "npm:^8.0.0"
+    postcss-attribute-case-insensitive: "npm:^6.0.3"
+    postcss-clamp: "npm:^4.1.0"
+    postcss-color-functional-notation: "npm:^6.0.11"
+    postcss-color-hex-alpha: "npm:^9.0.4"
+    postcss-color-rebeccapurple: "npm:^9.0.3"
+    postcss-custom-media: "npm:^10.0.6"
+    postcss-custom-properties: "npm:^13.3.10"
+    postcss-custom-selectors: "npm:^7.1.10"
+    postcss-dir-pseudo-class: "npm:^8.0.1"
+    postcss-double-position-gradients: "npm:^5.0.6"
+    postcss-focus-visible: "npm:^9.0.1"
+    postcss-focus-within: "npm:^8.0.1"
+    postcss-font-variant: "npm:^5.0.0"
+    postcss-gap-properties: "npm:^5.0.1"
+    postcss-image-set-function: "npm:^6.0.3"
+    postcss-lab-function: "npm:^6.0.16"
+    postcss-logical: "npm:^7.0.1"
+    postcss-nesting: "npm:^12.1.4"
+    postcss-opacity-percentage: "npm:^2.0.0"
+    postcss-overflow-shorthand: "npm:^5.0.1"
+    postcss-page-break: "npm:^3.0.4"
+    postcss-place: "npm:^9.0.1"
+    postcss-pseudo-class-any-link: "npm:^9.0.2"
+    postcss-replace-overflow-wrap: "npm:^4.0.0"
+    postcss-selector-not: "npm:^7.0.2"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
+  languageName: node
+  linkType: hard
+
+"postcss-pseudo-class-any-link@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "postcss-pseudo-class-any-link@npm:9.0.2"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/cc2cb455a793b1f5dc0ac290e02296eafb317d9ce987dc9f2102027e22f265299666dbd1e78f1d7836fce549dead73f41e24251c08a2dd0cf482f3cc43cf7909
+  languageName: node
+  linkType: hard
+
+"postcss-reduce-initial@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-initial@npm:7.0.0"
+  dependencies:
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
+  checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-reduce-transforms@npm:6.0.1"
+"postcss-reduce-transforms@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-transforms@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
+  checksum: 10c0/b2d4b65e71d38b604b41937850d1d64794964d6eced90f05891cfae8a78c7a9fed49911f51da9dcc5d715ac18e8bc7eacf691f2c5321dfe4d781f3e4442dfea9
+  languageName: node
+  linkType: hard
+
+"postcss-replace-overflow-wrap@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-replace-overflow-wrap@npm:4.0.0"
+  peerDependencies:
+    postcss: ^8.0.3
+  checksum: 10c0/451361b714528cd3632951256ef073769cde725a46cda642a6864f666fb144921fa55e614aec1bcf5946f37d6ffdcca3b932b76f3d997c07b076e8db152b128d
   languageName: node
   linkType: hard
 
 "postcss-resolve-nested-selector@npm:^0.1.1":
   version: 0.1.1
   resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
+  checksum: 10c0/e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
   languageName: node
   linkType: hard
 
@@ -13099,7 +13857,7 @@ __metadata:
   resolution: "postcss-safe-parser@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
+  checksum: 10c0/4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
   languageName: node
   linkType: hard
 
@@ -13108,79 +13866,90 @@ __metadata:
   resolution: "postcss-scss@npm:4.0.9"
   peerDependencies:
     postcss: ^8.4.29
-  checksum: f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714
+  checksum: 10c0/f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.15
-  resolution: "postcss-selector-parser@npm:6.0.15"
+"postcss-selector-not@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-selector-not@npm:7.0.2"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.13"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/624b6e516d37d43406ff1414b3413fe7a5dc34eccadd6a6082fe7df13c5c2fab3e244af33ff0916f9be0a4f7db91d1c22102f5166d7a6e6595e7c00e11e20281
+  languageName: node
+  linkType: hard
+
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+  version: 6.0.16
+  resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b
+  checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-svgo@npm:6.0.2"
+"postcss-svgo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-svgo@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
     svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
+  checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-unique-selectors@npm:6.0.2"
+"postcss-unique-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-unique-selectors@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
+  checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce
   languageName: node
   linkType: hard
 
 "postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
-  checksum: f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
+  checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.32":
-  version: 8.4.33
-  resolution: "postcss@npm:8.4.33"
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
+  version: 8.4.38
+  resolution: "postcss@npm:8.4.38"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
-    source-map-js: "npm:^1.0.2"
-  checksum: 16eda83458fcd8a91bece287b5920c7f57164c3ea293e6c80d0ea71ce7843007bcd8592260a5160b9a7f02693e6ac93e2495b02d8c7596d3f3f72c1447e3ba79
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
   languageName: node
   linkType: hard
 
 "postgres-array@npm:~2.0.0":
   version: 2.0.0
   resolution: "postgres-array@npm:2.0.0"
-  checksum: cbd56207e4141d7fbf08c86f2aebf21fa7064943d3f808ec85f442ff94b48d891e7a144cc02665fb2de5dbcb9b8e3183a2ac749959e794b4a4cfd379d7a21d08
+  checksum: 10c0/cbd56207e4141d7fbf08c86f2aebf21fa7064943d3f808ec85f442ff94b48d891e7a144cc02665fb2de5dbcb9b8e3183a2ac749959e794b4a4cfd379d7a21d08
   languageName: node
   linkType: hard
 
 "postgres-array@npm:~3.0.1":
   version: 3.0.2
   resolution: "postgres-array@npm:3.0.2"
-  checksum: 644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4
+  checksum: 10c0/644aa071f67a66a59f641f8e623887d2b915bc102a32643e2aa8b54c11acd343c5ad97831ea444dd37bd4b921ba35add4aa2cb0c6b76700a8252c2324aeba5b4
   languageName: node
   linkType: hard
 
 "postgres-bytea@npm:~1.0.0":
   version: 1.0.0
   resolution: "postgres-bytea@npm:1.0.0"
-  checksum: febf2364b8a8953695cac159eeb94542ead5886792a9627b97e33f6b5bb6e263bc0706ab47ec221516e79fbd6b2452d668841830fb3b49ec6c0fc29be61892ce
+  checksum: 10c0/febf2364b8a8953695cac159eeb94542ead5886792a9627b97e33f6b5bb6e263bc0706ab47ec221516e79fbd6b2452d668841830fb3b49ec6c0fc29be61892ce
   languageName: node
   linkType: hard
 
@@ -13189,21 +13958,21 @@ __metadata:
   resolution: "postgres-bytea@npm:3.0.0"
   dependencies:
     obuf: "npm:~1.1.2"
-  checksum: 41c79cc48aa730c5ba3eda6ab989a940034f07a1f57b8f2777dce56f1b8cca16c5870582932b5b10cc605048aef9b6157e06253c871b4717cafc6d00f55376aa
+  checksum: 10c0/41c79cc48aa730c5ba3eda6ab989a940034f07a1f57b8f2777dce56f1b8cca16c5870582932b5b10cc605048aef9b6157e06253c871b4717cafc6d00f55376aa
   languageName: node
   linkType: hard
 
 "postgres-date@npm:~1.0.4":
   version: 1.0.7
   resolution: "postgres-date@npm:1.0.7"
-  checksum: 0ff91fccc64003e10b767fcfeefb5eaffbc522c93aa65d5051c49b3c4ce6cb93ab091a7d22877a90ad60b8874202c6f1d0f935f38a7235ed3b258efd54b97ca9
+  checksum: 10c0/0ff91fccc64003e10b767fcfeefb5eaffbc522c93aa65d5051c49b3c4ce6cb93ab091a7d22877a90ad60b8874202c6f1d0f935f38a7235ed3b258efd54b97ca9
   languageName: node
   linkType: hard
 
 "postgres-date@npm:~2.0.1":
   version: 2.0.1
   resolution: "postgres-date@npm:2.0.1"
-  checksum: 2d3698958f858b7d1df0a3929fb8750ccb43fa2c8ee9fec7a021e7926291f6c85ddd9d94d87cd6529d70bd2444f3e14fb5bb323af19ceaa733542cc05c5c653a
+  checksum: 10c0/2d3698958f858b7d1df0a3929fb8750ccb43fa2c8ee9fec7a021e7926291f6c85ddd9d94d87cd6529d70bd2444f3e14fb5bb323af19ceaa733542cc05c5c653a
   languageName: node
   linkType: hard
 
@@ -13212,53 +13981,44 @@ __metadata:
   resolution: "postgres-interval@npm:1.2.0"
   dependencies:
     xtend: "npm:^4.0.0"
-  checksum: c1734c3cb79e7f22579af0b268a463b1fa1d084e742a02a7a290c4f041e349456f3bee3b4ee0bb3f226828597f7b76deb615c1b857db9a742c45520100456272
+  checksum: 10c0/c1734c3cb79e7f22579af0b268a463b1fa1d084e742a02a7a290c4f041e349456f3bee3b4ee0bb3f226828597f7b76deb615c1b857db9a742c45520100456272
   languageName: node
   linkType: hard
 
 "postgres-interval@npm:^3.0.0":
   version: 3.0.0
   resolution: "postgres-interval@npm:3.0.0"
-  checksum: 8b570b30ea37c685e26d136d34460f246f98935a1533defc4b53bb05ee23ae3dc7475b718ec7ea607a57894d8c6b4f1adf67ca9cc83a75bdacffd427d5c68de8
+  checksum: 10c0/8b570b30ea37c685e26d136d34460f246f98935a1533defc4b53bb05ee23ae3dc7475b718ec7ea607a57894d8c6b4f1adf67ca9cc83a75bdacffd427d5c68de8
   languageName: node
   linkType: hard
 
 "postgres-range@npm:^1.1.1":
   version: 1.1.3
   resolution: "postgres-range@npm:1.1.3"
-  checksum: f46bc379a198a9e3282a222c8e432d77494854bd4fa0706dff01641846db0bf4f09a9723e7fbb202da34ec3b2d88fc50e26e4bbeded7df19646e3acd6a7465ce
+  checksum: 10c0/f46bc379a198a9e3282a222c8e432d77494854bd4fa0706dff01641846db0bf4f09a9723e7fbb202da34ec3b2d88fc50e26e4bbeded7df19646e3acd6a7465ce
   languageName: node
   linkType: hard
 
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
-  checksum: b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd
-  languageName: node
-  linkType: hard
-
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: "npm:^1.1.2"
-  checksum: 81e0027d731b7b3697ccd2129470ed9913ecb111e4ec175a12f0fcfab0096516373bf0af2fef132af50cafb0a905b74ff57996d615f59512bb9ac7378fcc64ab
+  checksum: 10c0/b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd
   languageName: node
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
+  version: 3.2.5
+  resolution: "prettier@npm:3.2.5"
   bin:
     prettier: bin/prettier.cjs
-  checksum: facc944ba20e194ff4db765e830ffbcb642803381f0d2033ed397e79904fa4ccc877dc25ad68f42d36985c01d051c990ca1b905fb83d2d7d65fe69e4386fa1a3
+  checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6
   languageName: node
   linkType: hard
 
 "pretty-bytes@npm:^5.3.0, pretty-bytes@npm:^5.4.1":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
-  checksum: f69f494dcc1adda98dbe0e4a36d301e8be8ff99bfde7a637b2ee2820e7cb583b0fc0f3a63b0e3752c01501185a5cf38602c7be60da41bdf84ef5b70e89c370f3
+  checksum: 10c0/f69f494dcc1adda98dbe0e4a36d301e8be8ff99bfde7a637b2ee2820e7cb583b0fc0f3a63b0e3752c01501185a5cf38602c7be60da41bdf84ef5b70e89c370f3
   languageName: node
   linkType: hard
 
@@ -13269,7 +14029,7 @@ __metadata:
     ansi-regex: "npm:^5.0.1"
     ansi-styles: "npm:^5.0.0"
     react-is: "npm:^17.0.1"
-  checksum: 0cbda1031aa30c659e10921fa94e0dd3f903ecbbbe7184a729ad66f2b6e7f17891e8c7d7654c458fa4ccb1a411ffb695b4f17bbcd3fe075fabe181027c4040ed
+  checksum: 10c0/0cbda1031aa30c659e10921fa94e0dd3f903ecbbbe7184a729ad66f2b6e7f17891e8c7d7654c458fa4ccb1a411ffb695b4f17bbcd3fe075fabe181027c4040ed
   languageName: node
   linkType: hard
 
@@ -13280,45 +14040,52 @@ __metadata:
     "@jest/schemas": "npm:^29.6.3"
     ansi-styles: "npm:^5.0.0"
     react-is: "npm:^18.0.0"
-  checksum: edc5ff89f51916f036c62ed433506b55446ff739358de77207e63e88a28ca2894caac6e73dcb68166a606e51c8087d32d400473e6a9fdd2dbe743f46c9c0276f
+  checksum: 10c0/edc5ff89f51916f036c62ed433506b55446ff739358de77207e63e88a28ca2894caac6e73dcb68166a606e51c8087d32d400473e6a9fdd2dbe743f46c9c0276f
   languageName: node
   linkType: hard
 
 "proc-log@npm:^3.0.0":
   version: 3.0.0
   resolution: "proc-log@npm:3.0.0"
-  checksum: f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
+  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
   languageName: node
   linkType: hard
 
 "process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
-  checksum: bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367
+  checksum: 10c0/bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367
+  languageName: node
+  linkType: hard
+
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 10c0/60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
   languageName: node
   linkType: hard
 
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
-  checksum: 40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
+  checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
   languageName: node
   linkType: hard
 
 "prom-client@npm:^15.0.0":
-  version: 15.1.0
-  resolution: "prom-client@npm:15.1.0"
+  version: 15.1.2
+  resolution: "prom-client@npm:15.1.2"
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: c10781adbf49225298e44da5396a51a0bd4d0cddc3c7e237ba50e888e12ead26a8f98261f362a442f1bbcdaddd6e7302d5675b37beac67ea9b6f82e4d39fb3cc
+  checksum: 10c0/a221db148fa64e29dfd4c6cdcaaae14635495a4272b68917e2b44fcfd988bc57027d275b04489ceeea4d0c4d64d058af842c1300966d2c1ffa255f1fa6af1277
   languageName: node
   linkType: hard
 
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
-  checksum: d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc
+  checksum: 10c0/d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc
   languageName: node
   linkType: hard
 
@@ -13328,7 +14095,7 @@ __metadata:
   dependencies:
     err-code: "npm:^2.0.2"
     retry: "npm:^0.12.0"
-  checksum: 9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
+  checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
   languageName: node
   linkType: hard
 
@@ -13338,7 +14105,7 @@ __metadata:
   dependencies:
     kleur: "npm:^3.0.3"
     sisteransi: "npm:^1.0.5"
-  checksum: 16f1ac2977b19fe2cf53f8411cc98db7a3c8b115c479b2ca5c82b5527cd937aa405fa04f9a5960abeb9daef53191b53b4d13e35c1f5d50e8718c76917c5f1ea4
+  checksum: 10c0/16f1ac2977b19fe2cf53f8411cc98db7a3c8b115c479b2ca5c82b5527cd937aa405fa04f9a5960abeb9daef53191b53b4d13e35c1f5d50e8718c76917c5f1ea4
   languageName: node
   linkType: hard
 
@@ -13349,7 +14116,7 @@ __metadata:
     loose-envify: "npm:^1.4.0"
     object-assign: "npm:^4.1.1"
     react-is: "npm:^16.13.1"
-  checksum: 59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077
+  checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077
   languageName: node
   linkType: hard
 
@@ -13359,28 +14126,28 @@ __metadata:
   dependencies:
     forwarded: "npm:0.2.0"
     ipaddr.js: "npm:1.9.1"
-  checksum: c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210
+  checksum: 10c0/c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210
   languageName: node
   linkType: hard
 
 "proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
-  checksum: fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+  checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
   languageName: node
   linkType: hard
 
 "prr@npm:~1.0.1":
   version: 1.0.1
   resolution: "prr@npm:1.0.1"
-  checksum: 5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f
+  checksum: 10c0/5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f
   languageName: node
   linkType: hard
 
 "psl@npm:^1.1.33":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
-  checksum: 6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
+  checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
   languageName: node
   linkType: hard
 
@@ -13394,7 +14161,7 @@ __metadata:
     parse-asn1: "npm:^5.0.0"
     randombytes: "npm:^2.0.1"
     safe-buffer: "npm:^5.1.2"
-  checksum: 6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700
+  checksum: 10c0/6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700
   languageName: node
   linkType: hard
 
@@ -13404,35 +14171,35 @@ __metadata:
   dependencies:
     end-of-stream: "npm:^1.1.0"
     once: "npm:^1.3.1"
-  checksum: bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
+  checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
   languageName: node
   linkType: hard
 
 "punycode@npm:1.4.1, punycode@npm:^1.2.4, punycode@npm:^1.4.1":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
-  checksum: 354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08
+  checksum: 10c0/354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08
   languageName: node
   linkType: hard
 
 "punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
-  checksum: 14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
+  checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
   languageName: node
   linkType: hard
 
 "pure-rand@npm:^6.0.0":
   version: 6.0.2
   resolution: "pure-rand@npm:6.0.2"
-  checksum: 0556bee2e16a8d081a2b7630d9cb4e5dafd4e6bd6e4c61de1cf1ef5974f127847523e3d0e62884f6f5d64b66a5e93b05bd8f37ed009f3a4fe5089899e05914aa
+  checksum: 10c0/0556bee2e16a8d081a2b7630d9cb4e5dafd4e6bd6e4c61de1cf1ef5974f127847523e3d0e62884f6f5d64b66a5e93b05bd8f37ed009f3a4fe5089899e05914aa
   languageName: node
   linkType: hard
 
 "q@npm:^1.1.2":
   version: 1.5.1
   resolution: "q@npm:1.5.1"
-  checksum: 7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4
+  checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4
   languageName: node
   linkType: hard
 
@@ -13441,7 +14208,7 @@ __metadata:
   resolution: "qs@npm:6.11.0"
   dependencies:
     side-channel: "npm:^1.0.4"
-  checksum: 4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
+  checksum: 10c0/4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
   languageName: node
   linkType: hard
 
@@ -13450,28 +14217,42 @@ __metadata:
   resolution: "qs@npm:6.11.2"
   dependencies:
     side-channel: "npm:^1.0.4"
-  checksum: 4f95d4ff18ed480befcafa3390022817ffd3087fc65f146cceb40fc5edb9fa96cb31f648cae2fa96ca23818f0798bd63ad4ca369a0e22702fcd41379b3ab6571
+  checksum: 10c0/4f95d4ff18ed480befcafa3390022817ffd3087fc65f146cceb40fc5edb9fa96cb31f648cae2fa96ca23818f0798bd63ad4ca369a0e22702fcd41379b3ab6571
   languageName: node
   linkType: hard
 
 "querystring-es3@npm:^0.2.0":
   version: 0.2.1
   resolution: "querystring-es3@npm:0.2.1"
-  checksum: 476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580
+  checksum: 10c0/476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580
   languageName: node
   linkType: hard
 
 "querystringify@npm:^2.1.1":
   version: 2.2.0
   resolution: "querystringify@npm:2.2.0"
-  checksum: 3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
+  checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
   languageName: node
   linkType: hard
 
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
-  checksum: 900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102
+  checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102
+  languageName: node
+  linkType: hard
+
+"quick-format-unescaped@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "quick-format-unescaped@npm:4.0.4"
+  checksum: 10c0/fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
+  languageName: node
+  linkType: hard
+
+"raf-schd@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "raf-schd@npm:4.0.3"
+  checksum: 10c0/ecabf0957c05fad059779bddcd992f1a9d3a35dfea439a6f0935c382fcf4f7f7fa60489e467b4c2db357a3665167d2a379782586b59712bb36c766e02824709b
   languageName: node
   linkType: hard
 
@@ -13480,7 +14261,7 @@ __metadata:
   resolution: "raf@npm:3.4.1"
   dependencies:
     performance-now: "npm:^2.1.0"
-  checksum: 337f0853c9e6a77647b0f499beedafea5d6facfb9f2d488a624f88b03df2be72b8a0e7f9118a3ff811377d534912039a3311815700d2b6d2313f82f736f9eb6e
+  checksum: 10c0/337f0853c9e6a77647b0f499beedafea5d6facfb9f2d488a624f88b03df2be72b8a0e7f9118a3ff811377d534912039a3311815700d2b6d2313f82f736f9eb6e
   languageName: node
   linkType: hard
 
@@ -13489,7 +14270,7 @@ __metadata:
   resolution: "randombytes@npm:2.1.0"
   dependencies:
     safe-buffer: "npm:^5.1.0"
-  checksum: 50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3
+  checksum: 10c0/50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3
   languageName: node
   linkType: hard
 
@@ -13499,26 +14280,26 @@ __metadata:
   dependencies:
     randombytes: "npm:^2.0.5"
     safe-buffer: "npm:^5.1.0"
-  checksum: 11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c
+  checksum: 10c0/11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c
   languageName: node
   linkType: hard
 
 "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
-  checksum: 96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0
+  checksum: 10c0/96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
   dependencies:
     bytes: "npm:3.1.2"
     http-errors: "npm:2.0.0"
     iconv-lite: "npm:0.4.24"
     unpipe: "npm:1.0.0"
-  checksum: 5dad5a3a64a023b894ad7ab4e5c7c1ce34d3497fc7138d02f8c88a3781e68d8a55aa7d4fd3a458616fa8647cc228be314a1c03fb430a07521de78b32c4dd09d2
+  checksum: 10c0/b201c4b66049369a60e766318caff5cb3cc5a900efd89bdac431463822d976ad0670912c931fdbdcf5543207daf6f6833bca57aa116e1661d2ea91e12ca692c4
   languageName: node
   linkType: hard
 
@@ -13530,7 +14311,7 @@ __metadata:
     scheduler: "npm:^0.23.0"
   peerDependencies:
     react: ^18.2.0
-  checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
+  checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a
   languageName: node
   linkType: hard
 
@@ -13543,14 +14324,14 @@ __metadata:
     warning: "npm:^4.0.1"
   peerDependencies:
     react: ^16.3.0
-  checksum: 07ca093d74b7963cb6048953517f881a0fdee9b485d31dabd49814cda51543eee20e714dd423e25946984b0ac26dbcb80aaf1211b0170e9b0cfa92fa85b0984e
+  checksum: 10c0/07ca093d74b7963cb6048953517f881a0fdee9b485d31dabd49814cda51543eee20e714dd423e25946984b0ac26dbcb80aaf1211b0170e9b0cfa92fa85b0984e
   languageName: node
   linkType: hard
 
 "react-fast-compare@npm:^3.1.1":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
-  checksum: 0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367
+  checksum: 10c0/0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367
   languageName: node
   linkType: hard
 
@@ -13564,7 +14345,7 @@ __metadata:
     react-side-effect: "npm:^2.1.0"
   peerDependencies:
     react: ">=16.3.0"
-  checksum: 1d2831d9c3b4f5c91f020076aeb6502437a4788077d0c438421e466eb9633d5dc2aacedf7b779a970b807d61cf87793c5ff76ee3190a185d71c90b5cfb367e96
+  checksum: 10c0/1d2831d9c3b4f5c91f020076aeb6502437a4788077d0c438421e466eb9633d5dc2aacedf7b779a970b807d61cf87793c5ff76ee3190a185d71c90b5cfb367e96
   languageName: node
   linkType: hard
 
@@ -13580,7 +14361,7 @@ __metadata:
   peerDependencies:
     react: ">= 0.14.0"
     react-dom: ">= 0.14.0"
-  checksum: 6bd566ea97e00058749d43d768ee843e5132f988571536e090b564d5dbaa71093695255514fc5b9fcf9fbd03fcb0603f6e135dcab6dcaaffe43dedbfe742a163
+  checksum: 10c0/6bd566ea97e00058749d43d768ee843e5132f988571536e090b564d5dbaa71093695255514fc5b9fcf9fbd03fcb0603f6e135dcab6dcaaffe43dedbfe742a163
   languageName: node
   linkType: hard
 
@@ -13591,7 +14372,7 @@ __metadata:
     invariant: "npm:^2.2.2"
   peerDependencies:
     immutable: ">=3.6.2"
-  checksum: 4f3e147303be418d157a00246c9988068df0d21cb92e40f9d78a09538da71b967f5ddbd7f7facf54f05b5ddb011cc717afa82c8c490b0188bf90a6251acc9fb9
+  checksum: 10c0/4f3e147303be418d157a00246c9988068df0d21cb92e40f9d78a09538da71b967f5ddbd7f7facf54f05b5ddb011cc717afa82c8c490b0188bf90a6251acc9fb9
   languageName: node
   linkType: hard
 
@@ -13602,59 +14383,59 @@ __metadata:
     immutable: ">= 2 || >= 4.0.0-rc"
     react: ">= 16.6"
     react-dom: ">= 16.6"
-  checksum: d13dc10069bd13059ab91741169c6adaa2a44efb425fc3cf7506925f8cfcde40ef8c7d88f0ac5977a9b1eb5b6456f7fe530a1c670df727424dd72a1642163675
+  checksum: 10c0/d13dc10069bd13059ab91741169c6adaa2a44efb425fc3cf7506925f8cfcde40ef8c7d88f0ac5977a9b1eb5b6456f7fe530a1c670df727424dd72a1642163675
   languageName: node
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.5.5
-  resolution: "react-intl@npm:6.5.5"
+  version: 6.6.6
+  resolution: "react-intl@npm:6.6.6"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/intl": "npm:2.9.9"
-    "@formatjs/intl-displaynames": "npm:6.6.4"
-    "@formatjs/intl-listformat": "npm:7.5.3"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.6"
+    "@formatjs/intl": "npm:2.10.2"
+    "@formatjs/intl-displaynames": "npm:6.6.6"
+    "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.8"
+    intl-messageformat: "npm:10.5.12"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
-    typescript: 5
+    typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9ff6200f195557804b735d618ee593aed7848e84213ac4eb9c57708f55c0d93232e0dd338c990348ba3b1d73dca071502a2051d4a2790838d962c3ccde87fa6c
+  checksum: 10c0/04c1d1ca783f2a5e605544290c93e57629500be6811d7c2c3342903bf9f9a720d2e4c9cf3924133bf84e510ee879bf3d870a3ff269f5b197f894a49047bd089d
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-is@npm:18.2.0"
-  checksum: 6eb5e4b28028c23e2bfcf73371e72cd4162e4ac7ab445ddae2afe24e347a37d6dc22fae6e1748632cd43c6d4f9b8f86dcf26bf9275e1874f436d129952528ae0
+"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072
   languageName: node
   linkType: hard
 
 "react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
-  checksum: 33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
+  checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
   languageName: node
   linkType: hard
 
 "react-is@npm:^17.0.1":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
-  checksum: 2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
+  checksum: 10c0/2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
   languageName: node
   linkType: hard
 
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"
-  checksum: 1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27
+  checksum: 10c0/1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27
   languageName: node
   linkType: hard
 
@@ -13667,7 +14448,7 @@ __metadata:
     raf: "npm:^3.1.0"
   peerDependencies:
     react: ^0.14.9 || ^15.3.0 || ^16.0.0
-  checksum: 4ea6f1cc7079f0161fd786cc755133a822d87d9c0510369b8fb348d9ad602111efa2e3496dbcc390c967229e39e3eb5f6dd5dd6d3d124289443de31d6035a6c8
+  checksum: 10c0/4ea6f1cc7079f0161fd786cc755133a822d87d9c0510369b8fb348d9ad602111efa2e3496dbcc390c967229e39e3eb5f6dd5dd6d3d124289443de31d6035a6c8
   languageName: node
   linkType: hard
 
@@ -13678,11 +14459,11 @@ __metadata:
     prop-types: "npm:^15.6.2"
   peerDependencies:
     react: ^0.14.0 || ^15.0.0 || ^16.0.0
-  checksum: 14ffb71a5b18301830699b814d1de2421f4f43f31df5b95efd95cd47548a0d7597ec58abc16a12191958cad398495eba9274193af3294863e2864d32ea79f2c6
+  checksum: 10c0/14ffb71a5b18301830699b814d1de2421f4f43f31df5b95efd95cd47548a0d7597ec58abc16a12191958cad398495eba9274193af3294863e2864d32ea79f2c6
   languageName: node
   linkType: hard
 
-"react-overlays@npm:*, react-overlays@npm:^5.2.1":
+"react-overlays@npm:^5.2.1":
   version: 5.2.1
   resolution: "react-overlays@npm:5.2.1"
   dependencies:
@@ -13697,7 +14478,7 @@ __metadata:
   peerDependencies:
     react: ">=16.3.0"
     react-dom: ">=16.3.0"
-  checksum: 61836490040cfcdebc792b6eddcfac47b7b7e159f99304165371e9eb389a6875f20ddba3433421413ccfb918e8da6042ab2829f9b1f6f5dd9f8476aa16ddcfbe
+  checksum: 10c0/61836490040cfcdebc792b6eddcfac47b7b7e159f99304165371e9eb389a6875f20ddba3433421413ccfb918e8da6042ab2829f9b1f6f5dd9f8476aa16ddcfbe
   languageName: node
   linkType: hard
 
@@ -13712,29 +14493,58 @@ __metadata:
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     redux: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 797c1abf8bcc947feb127380e6d363db264c12bc94e578d635f86f1d806b0ec714dc3723e54c884937448b17f9042cfc995fe7a1deaf558efc01681e43e4669c
+  checksum: 10c0/797c1abf8bcc947feb127380e6d363db264c12bc94e578d635f86f1d806b0ec714dc3723e54c884937448b17f9042cfc995fe7a1deaf558efc01681e43e4669c
+  languageName: node
+  linkType: hard
+
+"react-redux@npm:^8.1.3":
+  version: 8.1.3
+  resolution: "react-redux@npm:8.1.3"
+  dependencies:
+    "@babel/runtime": "npm:^7.12.1"
+    "@types/hoist-non-react-statics": "npm:^3.3.1"
+    "@types/use-sync-external-store": "npm:^0.0.3"
+    hoist-non-react-statics: "npm:^3.3.2"
+    react-is: "npm:^18.0.0"
+    use-sync-external-store: "npm:^1.0.0"
+  peerDependencies:
+    "@types/react": ^16.8 || ^17.0 || ^18.0
+    "@types/react-dom": ^16.8 || ^17.0 || ^18.0
+    react: ^16.8 || ^17.0 || ^18.0
+    react-dom: ^16.8 || ^17.0 || ^18.0
+    react-native: ">=0.59"
+    redux: ^4 || ^5.0.0-beta.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+    react-dom:
+      optional: true
+    react-native:
+      optional: true
+    redux:
+      optional: true
+  checksum: 10c0/64c8be2765568dc66a3c442a41dd0ed74fe048d5ceb7a4fe72e5bac3d3687996a7115f57b5156af7406521087065a0e60f9194318c8ca99c55e9ce48558980ce
   languageName: node
   linkType: hard
 
 "react-redux@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "react-redux@npm:9.0.4"
+  version: 9.1.2
+  resolution: "react-redux@npm:9.1.2"
   dependencies:
     "@types/use-sync-external-store": "npm:^0.0.3"
     use-sync-external-store: "npm:^1.0.0"
   peerDependencies:
     "@types/react": ^18.2.25
     react: ^18.0
-    react-native: ">=0.69"
     redux: ^5.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-    react-native:
-      optional: true
     redux:
       optional: true
-  checksum: 23af10014b129aeb051de729bde01de21175170b860deefb7ad83483feab5816253f770a4cea93333fc22a53ac9ac699b27f5c3705c388dab53dbcb2906a571a
+  checksum: 10c0/56ac98228e011b26e0202346af9c8dd408ad5ea8235d8761c8e05ea0953b8ca801cdf9d1f481fdec7b285d7f30ceef7238b46b3df7636ef77dd5c2ea8c5be5b2
   languageName: node
   linkType: hard
 
@@ -13751,7 +14561,7 @@ __metadata:
     tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: f04f727e2ed2e9d1d3830af02cc61690ff67b1524c0d18690582bfba0f4d14142ccc88fb6da6befad644fddf086f5ae4c2eb7048c67da8a0b0929c19426421b0
+  checksum: 10c0/f04f727e2ed2e9d1d3830af02cc61690ff67b1524c0d18690582bfba0f4d14142ccc88fb6da6befad644fddf086f5ae4c2eb7048c67da8a0b0929c19426421b0
   languageName: node
   linkType: hard
 
@@ -13766,7 +14576,7 @@ __metadata:
     react: ^15.0.0 || ^16.0.0
     react-dom: ^15.0.0 || ^16.0.0
     react-router-dom: ^4.0
-  checksum: ad195b7359fd3146530cf299ec437f0a619c577b2cacfb2c76a156d3cd9d5d3e97af56e17c300c37ca8c485041e93124fe63f0c86db6aea468caf838281e62cb
+  checksum: 10c0/ad195b7359fd3146530cf299ec437f0a619c577b2cacfb2c76a156d3cd9d5d3e97af56e17c300c37ca8c485041e93124fe63f0c86db6aea468caf838281e62cb
   languageName: node
   linkType: hard
 
@@ -13785,11 +14595,11 @@ __metadata:
     tiny-warning: "npm:^1.0.0"
   peerDependencies:
     react: ">=15"
-  checksum: e15c00dfef199249b4c6e6d98e5e76cc352ce66f3270f13df37cc069ddf7c05e43281e8c308fc407e4435d72924373baef1d2890e0f6b0b1eb423cf47315a053
+  checksum: 10c0/e15c00dfef199249b4c6e6d98e5e76cc352ce66f3270f13df37cc069ddf7c05e43281e8c308fc407e4435d72924373baef1d2890e0f6b0b1eb423cf47315a053
   languageName: node
   linkType: hard
 
-"react-select@npm:*, react-select@npm:^5.7.3":
+"react-select@npm:^5.7.3":
   version: 5.8.0
   resolution: "react-select@npm:5.8.0"
   dependencies:
@@ -13805,7 +14615,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: b4b98aaf117ee5cc4642871b7bd51fd0e2697988d0b880f30b21e933ca90258959147117d8aada36713b622e0e4cb06bd18ec02069f3f108896e0d31e69e3c16
+  checksum: 10c0/b4b98aaf117ee5cc4642871b7bd51fd0e2697988d0b880f30b21e933ca90258959147117d8aada36713b622e0e4cb06bd18ec02069f3f108896e0d31e69e3c16
   languageName: node
   linkType: hard
 
@@ -13817,7 +14627,7 @@ __metadata:
     react-is: "npm:^16.12.0 || ^17.0.0 || ^18.0.0"
   peerDependencies:
     react: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
+  checksum: 10c0/c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
   languageName: node
   linkType: hard
 
@@ -13826,7 +14636,7 @@ __metadata:
   resolution: "react-side-effect@npm:2.1.2"
   peerDependencies:
     react: ^16.3.0 || ^17.0.0 || ^18.0.0
-  checksum: 5d934cae438f701ce646f566750ae6a445e99185ce1a026108f9db728147f7962a22ecf8db79ff26089953a3799b3607766904f4f10194ce42bcd5a1aa0215e8
+  checksum: 10c0/5d934cae438f701ce646f566750ae6a445e99185ce1a026108f9db728147f7962a22ecf8db79ff26089953a3799b3607766904f4f10194ce42bcd5a1aa0215e8
   languageName: node
   linkType: hard
 
@@ -13838,7 +14648,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 06545f917abfd2a24168cc717f396b4451185275db66118d39026f4a189e6376ad73dbc89492c612a87262561783e038a19f9f3f36fb60b14ba53e29a2b29b35
+  checksum: 10c0/06545f917abfd2a24168cc717f396b4451185275db66118d39026f4a189e6376ad73dbc89492c612a87262561783e038a19f9f3f36fb60b14ba53e29a2b29b35
   languageName: node
   linkType: hard
 
@@ -13848,7 +14658,7 @@ __metadata:
   dependencies:
     "@babel/runtime": "npm:7.0.0"
     warning: "npm:^4.0.1"
-  checksum: ca015701587ca9cf5329088809ad5897b0344c1cd377f8f0d21277128c95019dd67aefa64d19b40bc1c171a375c003dbe3343111d9ce12b7327d72e9e98dce7e
+  checksum: 10c0/ca015701587ca9cf5329088809ad5897b0344c1cd377f8f0d21277128c95019dd67aefa64d19b40bc1c171a375c003dbe3343111d9ce12b7327d72e9e98dce7e
   languageName: node
   linkType: hard
 
@@ -13862,7 +14672,7 @@ __metadata:
     react-event-listener: "npm:^0.6.0"
     react-swipeable-views-core: "npm:^0.14.0"
     shallow-equal: "npm:^1.2.1"
-  checksum: acc1b1d7f0bc81485e44aa2a465adc13cd89865add87bf32b88dc0986f1556c8b227b79763a7c0b197bf6eeacc333451c7b8ab5c40517809d1a913f7b9742588
+  checksum: 10c0/acc1b1d7f0bc81485e44aa2a465adc13cd89865add87bf32b88dc0986f1556c8b227b79763a7c0b197bf6eeacc333451c7b8ab5c40517809d1a913f7b9742588
   languageName: node
   linkType: hard
 
@@ -13877,24 +14687,24 @@ __metadata:
     warning: "npm:^4.0.1"
   peerDependencies:
     react: ^15.3.0 || ^16.0.0 || ^17.0.0
-  checksum: 032e7a1ff49e6e57eb755e133968eb207a4acc67c68ed8d0b09b4fe0826b290344454da5d420f17d8f4c049d900f3c12594ba5b97a79f20ef3b30bc62e866aa1
+  checksum: 10c0/032e7a1ff49e6e57eb755e133968eb207a4acc67c68ed8d0b09b4fe0826b290344454da5d420f17d8f4c049d900f3c12594ba5b97a79f20ef3b30bc62e866aa1
   languageName: node
   linkType: hard
 
 "react-test-renderer@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-test-renderer@npm:18.2.0"
+  version: 18.3.1
+  resolution: "react-test-renderer@npm:18.3.1"
   dependencies:
-    react-is: "npm:^18.2.0"
+    react-is: "npm:^18.3.1"
     react-shallow-renderer: "npm:^16.15.0"
-    scheduler: "npm:^0.23.0"
+    scheduler: "npm:^0.23.2"
   peerDependencies:
-    react: ^18.2.0
-  checksum: 53dfada1da1e8dd0498a5601e9eea3dc6ca23c6c2694d1cab9712faea869c11e4ce1c9a618d674cb668a668b41fb6bcf9a7b0a078cd853b1922f002fa22f42c8
+    react: ^18.3.1
+  checksum: 10c0/c633558ef9af33bc68f0c4dbb5163a004c4fb9eade7bd0a7cfc0355fb367f36bd9d96533c90b7e85a146be6c525113a15f58683d269e0177ad77e2b04d4fe51c
   languageName: node
   linkType: hard
 
-"react-textarea-autosize@npm:*, react-textarea-autosize@npm:^8.4.1":
+"react-textarea-autosize@npm:^8.4.1":
   version: 8.5.3
   resolution: "react-textarea-autosize@npm:8.5.3"
   dependencies:
@@ -13903,7 +14713,7 @@ __metadata:
     use-latest: "npm:^1.2.1"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 33d38a6d96cf584842695b50c341980944ece23a42155bf0bd1958f02396adb185c7720b88678dc677817fe111783059c0ebcdf7761644006892583b10e258ee
+  checksum: 10c0/33d38a6d96cf584842695b50c341980944ece23a42155bf0bd1958f02396adb185c7720b88678dc677817fe111783059c0ebcdf7761644006892583b10e258ee
   languageName: node
   linkType: hard
 
@@ -13916,7 +14726,7 @@ __metadata:
     prop-types: ">= 15.3.0 < 19"
     react: ">= 15.3.0 < 19"
     react-dom: ">= 15.3.0 < 19"
-  checksum: afae643981d6fb922d66830ec0e9c793e729d7a55e3974edf212965acc8dc51f0d098ae6e409461d3ff2f87fe027dc3556a1a746f8472ed3a79c8878bf338fee
+  checksum: 10c0/afae643981d6fb922d66830ec0e9c793e729d7a55e3974edf212965acc8dc51f0d098ae6e409461d3ff2f87fe027dc3556a1a746f8472ed3a79c8878bf338fee
   languageName: node
   linkType: hard
 
@@ -13931,7 +14741,7 @@ __metadata:
   peerDependencies:
     react: ">=16.6.0"
     react-dom: ">=16.6.0"
-  checksum: 2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82
+  checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82
   languageName: node
   linkType: hard
 
@@ -13940,7 +14750,7 @@ __metadata:
   resolution: "react@npm:18.2.0"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
+  checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8
   languageName: node
   linkType: hard
 
@@ -13955,7 +14765,7 @@ __metadata:
     safe-buffer: "npm:~5.1.1"
     string_decoder: "npm:~1.1.1"
     util-deprecate: "npm:~1.0.1"
-  checksum: 7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa
+  checksum: 10c0/7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa
   languageName: node
   linkType: hard
 
@@ -13966,19 +14776,20 @@ __metadata:
     inherits: "npm:^2.0.3"
     string_decoder: "npm:^1.1.1"
     util-deprecate: "npm:^1.0.1"
-  checksum: e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7
+  checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^4.1.0":
-  version: 4.4.0
-  resolution: "readable-stream@npm:4.4.0"
+"readable-stream@npm:^4.0.0":
+  version: 4.4.2
+  resolution: "readable-stream@npm:4.4.2"
   dependencies:
     abort-controller: "npm:^3.0.0"
     buffer: "npm:^6.0.3"
     events: "npm:^3.3.0"
     process: "npm:^0.11.10"
-  checksum: 83f5a11285e5ebefb7b22a43ea77a2275075639325b4932a328a1fb0ee2475b83b9cc94326724d71c6aa3b60fa87e2b16623530b1cac34f3825dcea0996fdbe4
+    string_decoder: "npm:^1.3.0"
+  checksum: 10c0/cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
   languageName: node
   linkType: hard
 
@@ -13989,7 +14800,7 @@ __metadata:
     graceful-fs: "npm:^4.1.11"
     micromatch: "npm:^3.1.10"
     readable-stream: "npm:^2.0.2"
-  checksum: 770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797
+  checksum: 10c0/770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797
   languageName: node
   linkType: hard
 
@@ -13998,7 +14809,14 @@ __metadata:
   resolution: "readdirp@npm:3.6.0"
   dependencies:
     picomatch: "npm:^2.2.1"
-  checksum: 6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b
+  checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b
+  languageName: node
+  linkType: hard
+
+"real-require@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "real-require@npm:0.2.0"
+  checksum: 10c0/23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
   languageName: node
   linkType: hard
 
@@ -14008,14 +14826,14 @@ __metadata:
   dependencies:
     indent-string: "npm:^4.0.0"
     strip-indent: "npm:^3.0.0"
-  checksum: d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae
+  checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae
   languageName: node
   linkType: hard
 
 "redis-errors@npm:^1.0.0, redis-errors@npm:^1.2.0":
   version: 1.2.0
   resolution: "redis-errors@npm:1.2.0"
-  checksum: 5b316736e9f532d91a35bff631335137a4f974927bb2fb42bf8c2f18879173a211787db8ac4c3fde8f75ed6233eb0888e55d52510b5620e30d69d7d719c8b8a7
+  checksum: 10c0/5b316736e9f532d91a35bff631335137a4f974927bb2fb42bf8c2f18879173a211787db8ac4c3fde8f75ed6233eb0888e55d52510b5620e30d69d7d719c8b8a7
   languageName: node
   linkType: hard
 
@@ -14024,7 +14842,7 @@ __metadata:
   resolution: "redis-parser@npm:3.0.0"
   dependencies:
     redis-errors: "npm:^1.0.0"
-  checksum: ee16ac4c7b2a60b1f42a2cdaee22b005bd4453eb2d0588b8a4939718997ae269da717434da5d570fe0b05030466eeb3f902a58cf2e8e1ca058bf6c9c596f632f
+  checksum: 10c0/ee16ac4c7b2a60b1f42a2cdaee22b005bd4453eb2d0588b8a4939718997ae269da717434da5d570fe0b05030466eeb3f902a58cf2e8e1ca058bf6c9c596f632f
   languageName: node
   linkType: hard
 
@@ -14033,7 +14851,7 @@ __metadata:
   resolution: "redux-immutable@npm:4.0.0"
   peerDependencies:
     immutable: ^3.8.1 || ^4.0.0-rc.1
-  checksum: c706c9f72a1fbce92d54ab9117ab641b6d7ee69f2860ec6de827dbed5bed918d4677a0895e6564bb59011202bb5e639cf69f4e2d2d14086053b32e5c4e35f512
+  checksum: 10c0/c706c9f72a1fbce92d54ab9117ab641b6d7ee69f2860ec6de827dbed5bed918d4677a0895e6564bb59011202bb5e639cf69f4e2d2d14086053b32e5c4e35f512
   languageName: node
   linkType: hard
 
@@ -14042,23 +14860,23 @@ __metadata:
   resolution: "redux-thunk@npm:3.1.0"
   peerDependencies:
     redux: ^5.0.0
-  checksum: 21557f6a30e1b2e3e470933247e51749be7f1d5a9620069a3125778675ce4d178d84bdee3e2a0903427a5c429e3aeec6d4df57897faf93eb83455bc1ef7b66fd
+  checksum: 10c0/21557f6a30e1b2e3e470933247e51749be7f1d5a9620069a3125778675ce4d178d84bdee3e2a0903427a5c429e3aeec6d4df57897faf93eb83455bc1ef7b66fd
   languageName: node
   linkType: hard
 
-"redux@npm:^4.0.0":
+"redux@npm:^4.0.0, redux@npm:^4.2.1":
   version: 4.2.1
   resolution: "redux@npm:4.2.1"
   dependencies:
     "@babel/runtime": "npm:^7.9.2"
-  checksum: 136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742
+  checksum: 10c0/136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742
   languageName: node
   linkType: hard
 
-"redux@npm:^5.0.0":
+"redux@npm:^5.0.1":
   version: 5.0.1
   resolution: "redux@npm:5.0.1"
-  checksum: b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c
+  checksum: 10c0/b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c
   languageName: node
   linkType: hard
 
@@ -14072,7 +14890,7 @@ __metadata:
     get-intrinsic: "npm:^1.2.1"
     globalthis: "npm:^1.0.3"
     which-builtin-type: "npm:^1.1.3"
-  checksum: 02104cdd22658b637efe6b1df73658edab539268347327c8250a72d0cb273dcdf280c284e2d94155d22601d022d16be1a816a8616d679e447cbcbde9860d15cb
+  checksum: 10c0/02104cdd22658b637efe6b1df73658edab539268347327c8250a72d0cb273dcdf280c284e2d94155d22601d022d16be1a816a8616d679e447cbcbde9860d15cb
   languageName: node
   linkType: hard
 
@@ -14081,35 +14899,35 @@ __metadata:
   resolution: "regenerate-unicode-properties@npm:10.1.1"
   dependencies:
     regenerate: "npm:^1.4.2"
-  checksum: 89adb5ee5ba081380c78f9057c02e156a8181969f6fcca72451efc45612e0c3df767b4333f8d8479c274d9c6fe52ec4854f0d8a22ef95dccbe87da8e5f2ac77d
+  checksum: 10c0/89adb5ee5ba081380c78f9057c02e156a8181969f6fcca72451efc45612e0c3df767b4333f8d8479c274d9c6fe52ec4854f0d8a22ef95dccbe87da8e5f2ac77d
   languageName: node
   linkType: hard
 
 "regenerate@npm:^1.4.2":
   version: 1.4.2
   resolution: "regenerate@npm:1.4.2"
-  checksum: f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8
+  checksum: 10c0/f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.12.0":
   version: 0.12.1
   resolution: "regenerator-runtime@npm:0.12.1"
-  checksum: dbefbb38f5d6d55261aec1182d7c97ac93f2eec6ef9c756d9656eb5152f5cb3f8d873df020ddb4a3a8126c2ac1a3c2e534413cffe18d8f89b1c2a480a0a38601
+  checksum: 10c0/dbefbb38f5d6d55261aec1182d7c97ac93f2eec6ef9c756d9656eb5152f5cb3f8d873df020ddb4a3a8126c2ac1a3c2e534413cffe18d8f89b1c2a480a0a38601
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.13.3":
   version: 0.13.11
   resolution: "regenerator-runtime@npm:0.13.11"
-  checksum: 12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24
+  checksum: 10c0/12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24
   languageName: node
   linkType: hard
 
 "regenerator-runtime@npm:^0.14.0":
   version: 0.14.1
   resolution: "regenerator-runtime@npm:0.14.1"
-  checksum: 1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
+  checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
   languageName: node
   linkType: hard
 
@@ -14118,7 +14936,7 @@ __metadata:
   resolution: "regenerator-transform@npm:0.15.2"
   dependencies:
     "@babel/runtime": "npm:^7.8.4"
-  checksum: 7cfe6931ec793269701994a93bab89c0cc95379191fad866270a7fea2adfec67ea62bb5b374db77058b60ba4509319d9b608664d0d288bd9989ca8dbd08fae90
+  checksum: 10c0/7cfe6931ec793269701994a93bab89c0cc95379191fad866270a7fea2adfec67ea62bb5b374db77058b60ba4509319d9b608664d0d288bd9989ca8dbd08fae90
   languageName: node
   linkType: hard
 
@@ -14128,18 +14946,19 @@ __metadata:
   dependencies:
     extend-shallow: "npm:^3.0.2"
     safe-regex: "npm:^1.1.0"
-  checksum: a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6
+  checksum: 10c0/a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "regexp.prototype.flags@npm:1.5.1"
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    set-function-name: "npm:^2.0.0"
-  checksum: 1de7d214c0a726c7c874a7023e47b0e27b9f7fdb64175bfe1861189de1704aaeca05c3d26c35aa375432289b99946f3cf86651a92a8f7601b90d8c226a23bcd8
+    call-bind: "npm:^1.0.6"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10c0/0f3fc4f580d9c349f8b560b012725eb9c002f36daa0041b3fbf6f4238cb05932191a4d7d5db3b5e2caa336d5150ad0402ed2be81f711f9308fe7e1a9bf9bd552
   languageName: node
   linkType: hard
 
@@ -14153,7 +14972,7 @@ __metadata:
     regjsparser: "npm:^0.9.1"
     unicode-match-property-ecmascript: "npm:^2.0.0"
     unicode-match-property-value-ecmascript: "npm:^2.1.0"
-  checksum: 7945d5ab10c8bbed3ca383d4274687ea825aee4ab93a9c51c6e31e1365edd5ea807f6908f800ba017b66c462944ba68011164e7055207747ab651f8111ef3770
+  checksum: 10c0/7945d5ab10c8bbed3ca383d4274687ea825aee4ab93a9c51c6e31e1365edd5ea807f6908f800ba017b66c462944ba68011164e7055207747ab651f8111ef3770
   languageName: node
   linkType: hard
 
@@ -14164,77 +14983,77 @@ __metadata:
     jsesc: "npm:~0.5.0"
   bin:
     regjsparser: bin/parser
-  checksum: fe44fcf19a99fe4f92809b0b6179530e5ef313ff7f87df143b08ce9a2eb3c4b6189b43735d645be6e8f4033bfb015ed1ca54f0583bc7561bed53fd379feb8225
+  checksum: 10c0/fe44fcf19a99fe4f92809b0b6179530e5ef313ff7f87df143b08ce9a2eb3c4b6189b43735d645be6e8f4033bfb015ed1ca54f0583bc7561bed53fd379feb8225
   languageName: node
   linkType: hard
 
 "remove-trailing-separator@npm:^1.0.1":
   version: 1.1.0
   resolution: "remove-trailing-separator@npm:1.1.0"
-  checksum: 3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc
+  checksum: 10c0/3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc
   languageName: node
   linkType: hard
 
 "repeat-element@npm:^1.1.2":
   version: 1.1.4
   resolution: "repeat-element@npm:1.1.4"
-  checksum: 81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69
+  checksum: 10c0/81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69
   languageName: node
   linkType: hard
 
 "repeat-string@npm:^1.6.1":
   version: 1.6.1
   resolution: "repeat-string@npm:1.6.1"
-  checksum: 87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
+  checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
   languageName: node
   linkType: hard
 
 "requestidlecallback@npm:^0.3.0":
   version: 0.3.0
   resolution: "requestidlecallback@npm:0.3.0"
-  checksum: 68a2ff3154788643ccf96436cfaf8ad5bbe2f4d3f4b4d7858ec74681bf7d6a487d17df6a238130ff1e73d0a4a85bdc44b5f945eb79ef7d5552e23fc6288e795f
+  checksum: 10c0/68a2ff3154788643ccf96436cfaf8ad5bbe2f4d3f4b4d7858ec74681bf7d6a487d17df6a238130ff1e73d0a4a85bdc44b5f945eb79ef7d5552e23fc6288e795f
   languageName: node
   linkType: hard
 
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
-  checksum: 83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99
+  checksum: 10c0/83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99
   languageName: node
   linkType: hard
 
 "require-from-string@npm:^2.0.2":
   version: 2.0.2
   resolution: "require-from-string@npm:2.0.2"
-  checksum: aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2
+  checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2
   languageName: node
   linkType: hard
 
 "require-main-filename@npm:^2.0.0":
   version: 2.0.0
   resolution: "require-main-filename@npm:2.0.0"
-  checksum: db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6
+  checksum: 10c0/db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6
   languageName: node
   linkType: hard
 
 "require-package-name@npm:^2.0.1":
   version: 2.0.1
   resolution: "require-package-name@npm:2.0.1"
-  checksum: 2da87caecdd2157489deaf8add246696dc9cbcebd89ef49b062ad1183594b979f96f8194d4b0f5447a92ad72d39b9fae2df38ec5b9ecef9c7c0157af38eeecbc
+  checksum: 10c0/2da87caecdd2157489deaf8add246696dc9cbcebd89ef49b062ad1183594b979f96f8194d4b0f5447a92ad72d39b9fae2df38ec5b9ecef9c7c0157af38eeecbc
   languageName: node
   linkType: hard
 
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
-  checksum: b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
+  checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
   languageName: node
   linkType: hard
 
-"reselect@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "reselect@npm:5.0.1"
-  checksum: 0724b4555cd6411849de334a75177780f127af849eb71c4b709966d07ade8090d125c0c926dc6cf936866d23ebadda6aad1da93cd8340525323b889f25d56d51
+"reselect@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "reselect@npm:5.1.0"
+  checksum: 10c0/b0ed789f4f6f10dfbd23741823726793384932969aa7ce8f584c882ad87620a02b09b5d1146cd2ea6eaa0953b3fd9f7df22f113893af73f35f28432a8a4294de
   languageName: node
   linkType: hard
 
@@ -14243,7 +15062,7 @@ __metadata:
   resolution: "resolve-cwd@npm:2.0.0"
   dependencies:
     resolve-from: "npm:^3.0.0"
-  checksum: 10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12
+  checksum: 10c0/10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12
   languageName: node
   linkType: hard
 
@@ -14252,7 +15071,7 @@ __metadata:
   resolution: "resolve-cwd@npm:3.0.0"
   dependencies:
     resolve-from: "npm:^5.0.0"
-  checksum: e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4
+  checksum: 10c0/e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4
   languageName: node
   linkType: hard
 
@@ -14262,60 +15081,60 @@ __metadata:
   dependencies:
     expand-tilde: "npm:^2.0.0"
     global-modules: "npm:^1.0.0"
-  checksum: 8197ed13e4a51d9cd786ef6a09fc83450db016abe7ef3311ca39389b3e508d77c26fe0cf0483a9b407b8caa2764bb5ccc52cf6a017ded91492a416475a56066f
+  checksum: 10c0/8197ed13e4a51d9cd786ef6a09fc83450db016abe7ef3311ca39389b3e508d77c26fe0cf0483a9b407b8caa2764bb5ccc52cf6a017ded91492a416475a56066f
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-from@npm:3.0.0"
-  checksum: 24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc
+  checksum: 10c0/24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
-  checksum: 8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190
+  checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190
   languageName: node
   linkType: hard
 
 "resolve-from@npm:^5.0.0":
   version: 5.0.0
   resolution: "resolve-from@npm:5.0.0"
-  checksum: b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2
+  checksum: 10c0/b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2
   languageName: node
   linkType: hard
 
 "resolve-pathname@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-pathname@npm:3.0.0"
-  checksum: c6ec49b670dc35b9a303c47fa83ba9348a71e92d64a4c4bb85e1b659a29b407aa1ac1cb14a9b5b502982132ca77482bd80534bca147439d66880d35a137fe723
+  checksum: 10c0/c6ec49b670dc35b9a303c47fa83ba9348a71e92d64a4c4bb85e1b659a29b407aa1ac1cb14a9b5b502982132ca77482bd80534bca147439d66880d35a137fe723
   languageName: node
   linkType: hard
 
 "resolve-pkg-maps@npm:^1.0.0":
   version: 1.0.0
   resolution: "resolve-pkg-maps@npm:1.0.0"
-  checksum: fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab
+  checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab
   languageName: node
   linkType: hard
 
 "resolve-url@npm:^0.2.1":
   version: 0.2.1
   resolution: "resolve-url@npm:0.2.1"
-  checksum: c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54
+  checksum: 10c0/c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54
   languageName: node
   linkType: hard
 
 "resolve.exports@npm:^2.0.0":
   version: 2.0.2
   resolution: "resolve.exports@npm:2.0.2"
-  checksum: cc4cffdc25447cf34730f388dca5021156ba9302a3bad3d7f168e790dc74b2827dff603f1bc6ad3d299bac269828dca96dd77e036dc9fba6a2a1807c47ab5c98
+  checksum: 10c0/cc4cffdc25447cf34730f388dca5021156ba9302a3bad3d7f168e790dc74b2827dff603f1bc6ad3d299bac269828dca96dd77e036dc9fba6a2a1807c47ab5c98
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
+"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -14324,24 +15143,24 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
+  checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+"resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 1de92669e7c46cfe125294c66d5405e13288bb87b97e9bdab71693ceebbcc0255c789bde30e2834265257d330d8ff57414d7d88e3097d8f69951f3ce978bf045
+  checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -14350,20 +15169,20 @@ __metadata:
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
+  checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10
+  checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355
   languageName: node
   linkType: hard
 
@@ -14373,35 +15192,35 @@ __metadata:
   dependencies:
     onetime: "npm:^5.1.0"
     signal-exit: "npm:^3.0.2"
-  checksum: 6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
+  checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318
   languageName: node
   linkType: hard
 
 "ret@npm:~0.1.10":
   version: 0.1.15
   resolution: "ret@npm:0.1.15"
-  checksum: 01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f
+  checksum: 10c0/01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f
   languageName: node
   linkType: hard
 
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
-  checksum: 59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
+  checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
   languageName: node
   linkType: hard
 
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"
-  checksum: c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107
+  checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107
   languageName: node
   linkType: hard
 
 "rfdc@npm:^1.3.0":
   version: 1.3.0
   resolution: "rfdc@npm:1.3.0"
-  checksum: a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667
+  checksum: 10c0/a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667
   languageName: node
   linkType: hard
 
@@ -14412,7 +15231,7 @@ __metadata:
     glob: "npm:^7.1.3"
   bin:
     rimraf: ./bin.js
-  checksum: 4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40
+  checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40
   languageName: node
   linkType: hard
 
@@ -14423,18 +15242,18 @@ __metadata:
     glob: "npm:^7.1.3"
   bin:
     rimraf: bin.js
-  checksum: 9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8
+  checksum: 10c0/9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.1, rimraf@npm:^5.0.5":
+"rimraf@npm:^5.0.5":
   version: 5.0.5
   resolution: "rimraf@npm:5.0.5"
   dependencies:
     glob: "npm:^10.3.7"
   bin:
     rimraf: dist/esm/bin.mjs
-  checksum: d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
+  checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
   languageName: node
   linkType: hard
 
@@ -14444,21 +15263,7 @@ __metadata:
   dependencies:
     hash-base: "npm:^3.0.0"
     inherits: "npm:^2.0.1"
-  checksum: f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a
-  languageName: node
-  linkType: hard
-
-"rollup-plugin-terser@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "rollup-plugin-terser@npm:7.0.2"
-  dependencies:
-    "@babel/code-frame": "npm:^7.10.4"
-    jest-worker: "npm:^26.2.1"
-    serialize-javascript: "npm:^4.0.0"
-    terser: "npm:^5.0.0"
-  peerDependencies:
-    rollup: ^2.0.0
-  checksum: f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d
+  checksum: 10c0/f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a
   languageName: node
   linkType: hard
 
@@ -14472,23 +15277,14 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9
+  checksum: 10c0/421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9
   languageName: node
   linkType: hard
 
 "rrweb-cssom@npm:^0.6.0":
   version: 0.6.0
   resolution: "rrweb-cssom@npm:0.6.0"
-  checksum: 3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3
-  languageName: node
-  linkType: hard
-
-"run-applescript@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "run-applescript@npm:5.0.0"
-  dependencies:
-    execa: "npm:^5.0.0"
-  checksum: f9977db5770929f3f0db434b8e6aa266498c70dec913c84320c0a06add510cf44e3a048c44da088abee312006f9cbf572fd065cdc8f15d7682afda8755f4114c
+  checksum: 10c0/3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3
   languageName: node
   linkType: hard
 
@@ -14497,44 +15293,44 @@ __metadata:
   resolution: "run-parallel@npm:1.2.0"
   dependencies:
     queue-microtask: "npm:^1.2.2"
-  checksum: 200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39
+  checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "safe-array-concat@npm:1.0.1"
+"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-array-concat@npm:1.1.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.5"
+    get-intrinsic: "npm:^1.2.2"
     has-symbols: "npm:^1.0.3"
     isarray: "npm:^2.0.5"
-  checksum: 4b15ce5fce5ce4d7e744a63592cded88d2f27806ed229eadb2e42629cbcd40e770f7478608e75f455e7fe341acd8c0a01bdcd7146b10645ea7411c5e3c1d1dd8
+  checksum: 10c0/833d3d950fc7507a60075f9bfaf41ec6dac7c50c7a9d62b1e6b071ecc162185881f92e594ff95c1a18301c881352dd6fd236d56999d5819559db7b92da9c28af
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
   version: 5.1.2
   resolution: "safe-buffer@npm:5.1.2"
-  checksum: 780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21
+  checksum: 10c0/780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21
   languageName: node
   linkType: hard
 
 "safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
-  checksum: 6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
+  checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "safe-regex-test@npm:1.0.0"
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
     is-regex: "npm:^1.1.4"
-  checksum: 14a81a7e683f97b2d6e9c8be61fddcf8ed7a02f4e64a825515f96bb1738eb007145359313741d2704d28b55b703a0f6300c749dde7c1dbc13952a2b85048ede2
+  checksum: 10c0/900bf7c98dc58f08d8523b7012b468e4eb757afa624f198902c0643d7008ba777b0bdc35810ba0b758671ce887617295fb742b3f3968991b178ceca54cb07603
   languageName: node
   linkType: hard
 
@@ -14543,14 +15339,21 @@ __metadata:
   resolution: "safe-regex@npm:1.1.0"
   dependencies:
     ret: "npm:~0.1.10"
-  checksum: 547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a
+  checksum: 10c0/547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a
+  languageName: node
+  linkType: hard
+
+"safe-stable-stringify@npm:^2.3.1":
+  version: 2.4.3
+  resolution: "safe-stable-stringify@npm:2.4.3"
+  checksum: 10c0/81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
   languageName: node
   linkType: hard
 
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
-  checksum: 7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
+  checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
   languageName: node
   linkType: hard
 
@@ -14575,27 +15378,27 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: 5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
+  checksum: 10c0/5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
   languageName: node
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.69.7
-  resolution: "sass@npm:1.69.7"
+  version: 1.77.1
+  resolution: "sass@npm:1.77.1"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 773d0938e7d4ff3972d3fda3132f34fe98a2f712e028a58e28fecd615434795eff3266eddc38d5e13f03b90c0d6360d0e737b30bff2949a47280c64a18e0fb18
+  checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364
   languageName: node
   linkType: hard
 
 "sax@npm:~1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
-  checksum: 6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3
+  checksum: 10c0/6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3
   languageName: node
   linkType: hard
 
@@ -14604,16 +15407,16 @@ __metadata:
   resolution: "saxes@npm:6.0.0"
   dependencies:
     xmlchars: "npm:^2.2.0"
-  checksum: 3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74
+  checksum: 10c0/3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "scheduler@npm:0.23.0"
+"scheduler@npm:^0.23.0, scheduler@npm:^0.23.2":
+  version: 0.23.2
+  resolution: "scheduler@npm:0.23.2"
   dependencies:
     loose-envify: "npm:^1.1.0"
-  checksum: b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd
+  checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78
   languageName: node
   linkType: hard
 
@@ -14624,7 +15427,7 @@ __metadata:
     ajv: "npm:^6.1.0"
     ajv-errors: "npm:^1.0.0"
     ajv-keywords: "npm:^3.1.0"
-  checksum: 670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f
+  checksum: 10c0/670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f
   languageName: node
   linkType: hard
 
@@ -14635,7 +15438,7 @@ __metadata:
     "@types/json-schema": "npm:^7.0.5"
     ajv: "npm:^6.12.4"
     ajv-keywords: "npm:^3.5.2"
-  checksum: f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f
+  checksum: 10c0/f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f
   languageName: node
   linkType: hard
 
@@ -14646,7 +15449,7 @@ __metadata:
     "@types/json-schema": "npm:^7.0.8"
     ajv: "npm:^6.12.5"
     ajv-keywords: "npm:^3.5.2"
-  checksum: fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500
+  checksum: 10c0/fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500
   languageName: node
   linkType: hard
 
@@ -14656,14 +15459,21 @@ __metadata:
   dependencies:
     dom-helpers: "npm:^3.4.0"
     invariant: "npm:^2.2.4"
-  checksum: 4f438c48b93a1dcc2ab51a18670fac6f5ce41885291d8aa13251b4a187be9d0c6dd518ee974eb52ac9bbe227b9811c2615ecca73192a1a190b78dfdadb9c2cf2
+  checksum: 10c0/4f438c48b93a1dcc2ab51a18670fac6f5ce41885291d8aa13251b4a187be9d0c6dd518ee974eb52ac9bbe227b9811c2615ecca73192a1a190b78dfdadb9c2cf2
+  languageName: node
+  linkType: hard
+
+"secure-json-parse@npm:^2.4.0":
+  version: 2.7.0
+  resolution: "secure-json-parse@npm:2.7.0"
+  checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
   languageName: node
   linkType: hard
 
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
-  checksum: 01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67
+  checksum: 10c0/01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67
   languageName: node
   linkType: hard
 
@@ -14672,7 +15482,7 @@ __metadata:
   resolution: "selfsigned@npm:1.10.14"
   dependencies:
     node-forge: "npm:^0.10.0"
-  checksum: cb7c92e28a3e8a34e91a3b20b9dd7d237a1bffccd9890c434f74eef65ae8bfffe7c1ab3379faac017b957ea44522923e06e2b41e0858c643edb01137a507cd16
+  checksum: 10c0/cb7c92e28a3e8a34e91a3b20b9dd7d237a1bffccd9890c434f74eef65ae8bfffe7c1ab3379faac017b957ea44522923e06e2b41e0858c643edb01137a507cd16
   languageName: node
   linkType: hard
 
@@ -14681,7 +15491,7 @@ __metadata:
   resolution: "semver@npm:5.7.1"
   bin:
     semver: ./bin/semver
-  checksum: d4884f2aeca28bff35d0bd40ff0a9b2dfc4b36a883bf0ea5dc15d10d9a01bdc9041035b05f825d4b5ac8a56e490703dbf0d986d054de82cc5e9bad3f02ca6e00
+  checksum: 10c0/d4884f2aeca28bff35d0bd40ff0a9b2dfc4b36a883bf0ea5dc15d10d9a01bdc9041035b05f825d4b5ac8a56e490703dbf0d986d054de82cc5e9bad3f02ca6e00
   languageName: node
   linkType: hard
 
@@ -14690,18 +15500,18 @@ __metadata:
   resolution: "semver@npm:6.3.1"
   bin:
     semver: bin/semver.js
-  checksum: e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d
+  checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
+"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
   dependencies:
     lru-cache: "npm:^6.0.0"
   bin:
     semver: bin/semver.js
-  checksum: 5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e
+  checksum: 10c0/fbfe717094ace0aa8d6332d7ef5ce727259815bd8d8815700853f4faf23aacbd7192522f0dc5af6df52ef4fa85a355ebd2f5d39f554bd028200d6cf481ab9b53
   languageName: node
   linkType: hard
 
@@ -14722,16 +15532,7 @@ __metadata:
     on-finished: "npm:2.4.1"
     range-parser: "npm:~1.2.1"
     statuses: "npm:2.0.1"
-  checksum: 0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
-  languageName: node
-  linkType: hard
-
-"serialize-javascript@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "serialize-javascript@npm:4.0.0"
-  dependencies:
-    randombytes: "npm:^2.1.0"
-  checksum: 510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
+  checksum: 10c0/0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
   languageName: node
   linkType: hard
 
@@ -14740,7 +15541,16 @@ __metadata:
   resolution: "serialize-javascript@npm:5.0.1"
   dependencies:
     randombytes: "npm:^2.1.0"
-  checksum: 646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
+  checksum: 10c0/646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
+  languageName: node
+  linkType: hard
+
+"serialize-javascript@npm:^6.0.1":
+  version: 6.0.2
+  resolution: "serialize-javascript@npm:6.0.2"
+  dependencies:
+    randombytes: "npm:^2.1.0"
+  checksum: 10c0/2dd09ef4b65a1289ba24a788b1423a035581bef60817bea1f01eda8e3bda623f86357665fe7ac1b50f6d4f583f97db9615b3f07b2a2e8cbcb75033965f771dd2
   languageName: node
   linkType: hard
 
@@ -14755,7 +15565,7 @@ __metadata:
     http-errors: "npm:~1.6.2"
     mime-types: "npm:~2.1.17"
     parseurl: "npm:~1.3.2"
-  checksum: a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c
+  checksum: 10c0/a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c
   languageName: node
   linkType: hard
 
@@ -14767,26 +15577,28 @@ __metadata:
     escape-html: "npm:~1.0.3"
     parseurl: "npm:~1.3.3"
     send: "npm:0.18.0"
-  checksum: fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
+  checksum: 10c0/fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
   languageName: node
   linkType: hard
 
 "set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
-  checksum: 9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454
+  checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454
   languageName: node
   linkType: hard
 
-"set-function-length@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "set-function-length@npm:1.1.1"
+"set-function-length@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "set-function-length@npm:1.2.1"
   dependencies:
-    define-data-property: "npm:^1.1.1"
-    get-intrinsic: "npm:^1.2.1"
+    define-data-property: "npm:^1.1.2"
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.3"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: a29e255c116c29e3323b851c4f46c58c91be9bb8b065f191e2ea1807cb2c839df56e3175732a498e0c6d54626ba6b6fef896bf699feb7ab70c42dc47eb247c95
+    has-property-descriptors: "npm:^1.0.1"
+  checksum: 10c0/1927e296599f2c04d210c1911f1600430a5e49e04a6d8bb03dca5487b95a574da9968813a2ced9a774bd3e188d4a6208352c8f64b8d4674cdb021dca21e190ca
   languageName: node
   linkType: hard
 
@@ -14797,7 +15609,7 @@ __metadata:
     define-data-property: "npm:^1.0.1"
     functions-have-names: "npm:^1.2.3"
     has-property-descriptors: "npm:^1.0.0"
-  checksum: 6be7d3e15be47f4db8a5a563a35c60b5e7c4af91cc900e8972ffad33d3aaa227900faa55f60121cdb04b85866a734bb7fe4cd91f654c632861cc86121a48312a
+  checksum: 10c0/6be7d3e15be47f4db8a5a563a35c60b5e7c4af91cc900e8972ffad33d3aaa227900faa55f60121cdb04b85866a734bb7fe4cd91f654c632861cc86121a48312a
   languageName: node
   linkType: hard
 
@@ -14809,28 +15621,28 @@ __metadata:
     is-extendable: "npm:^0.1.1"
     is-plain-object: "npm:^2.0.3"
     split-string: "npm:^3.0.1"
-  checksum: 4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b
+  checksum: 10c0/4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b
   languageName: node
   linkType: hard
 
 "setimmediate@npm:^1.0.4":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
-  checksum: 5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
+  checksum: 10c0/5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.1.0":
   version: 1.1.0
   resolution: "setprototypeof@npm:1.1.0"
-  checksum: a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872
+  checksum: 10c0/a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872
   languageName: node
   linkType: hard
 
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
-  checksum: 68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
+  checksum: 10c0/68733173026766fa0d9ecaeb07f0483f4c2dc70ca376b3b7c40b7cda909f94b0918f6c5ad5ce27a9160bdfb475efaa9d5e705a11d8eaae18f9835d20976028bc
   languageName: node
   linkType: hard
 
@@ -14842,7 +15654,7 @@ __metadata:
     safe-buffer: "npm:^5.0.1"
   bin:
     sha.js: ./bin.js
-  checksum: b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5
+  checksum: 10c0/b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5
   languageName: node
   linkType: hard
 
@@ -14851,14 +15663,14 @@ __metadata:
   resolution: "shallow-clone@npm:3.0.1"
   dependencies:
     kind-of: "npm:^6.0.2"
-  checksum: 7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e
+  checksum: 10c0/7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e
   languageName: node
   linkType: hard
 
 "shallow-equal@npm:^1.2.1":
   version: 1.2.1
   resolution: "shallow-equal@npm:1.2.1"
-  checksum: 51e03abadd97c9ebe590547d92db9148446962a3f23a3a0fb1ba2fccab80af881eef0ff1f8ccefd3f066c0bc5a4c8ca53706194813b95c8835fa66448a843a26
+  checksum: 10c0/51e03abadd97c9ebe590547d92db9148446962a3f23a3a0fb1ba2fccab80af881eef0ff1f8ccefd3f066c0bc5a4c8ca53706194813b95c8835fa66448a843a26
   languageName: node
   linkType: hard
 
@@ -14867,7 +15679,7 @@ __metadata:
   resolution: "shebang-command@npm:1.2.0"
   dependencies:
     shebang-regex: "npm:^1.0.0"
-  checksum: 7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d
+  checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d
   languageName: node
   linkType: hard
 
@@ -14876,21 +15688,21 @@ __metadata:
   resolution: "shebang-command@npm:2.0.0"
   dependencies:
     shebang-regex: "npm:^3.0.0"
-  checksum: a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
+  checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
   languageName: node
   linkType: hard
 
 "shebang-regex@npm:^1.0.0":
   version: 1.0.0
   resolution: "shebang-regex@npm:1.0.0"
-  checksum: 9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2
+  checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2
   languageName: node
   linkType: hard
 
 "shebang-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "shebang-regex@npm:3.0.0"
-  checksum: 1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
+  checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
   languageName: node
   linkType: hard
 
@@ -14901,21 +15713,21 @@ __metadata:
     call-bind: "npm:^1.0.0"
     get-intrinsic: "npm:^1.0.2"
     object-inspect: "npm:^1.9.0"
-  checksum: 054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5
+  checksum: 10c0/054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5
   languageName: node
   linkType: hard
 
 "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
-  checksum: 25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
+  checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
   languageName: node
   linkType: hard
 
 "signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0":
   version: 4.1.0
   resolution: "signal-exit@npm:4.1.0"
-  checksum: 41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
+  checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
   languageName: node
   linkType: hard
 
@@ -14926,21 +15738,21 @@ __metadata:
     "@polka/url": "npm:^1.0.0-next.20"
     mrmime: "npm:^1.0.0"
     totalist: "npm:^3.0.0"
-  checksum: 333bd665ee5ac3805047ea47757e04e2b18ca562749b9a07f5bbbee6dabd99ff00011604689b1ada3d22e46a4198c61e05e2d1abd5454d94da483ce3a3813205
+  checksum: 10c0/333bd665ee5ac3805047ea47757e04e2b18ca562749b9a07f5bbbee6dabd99ff00011604689b1ada3d22e46a4198c61e05e2d1abd5454d94da483ce3a3813205
   languageName: node
   linkType: hard
 
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
-  checksum: 230ac975cca485b7f6fe2b96a711aa62a6a26ead3e6fb8ba17c5a00d61b8bed0d7adc21f5626b70d7c33c62ff4e63933017a6462942c719d1980bb0b1207ad46
+  checksum: 10c0/230ac975cca485b7f6fe2b96a711aa62a6a26ead3e6fb8ba17c5a00d61b8bed0d7adc21f5626b70d7c33c62ff4e63933017a6462942c719d1980bb0b1207ad46
   languageName: node
   linkType: hard
 
 "slash@npm:^3.0.0":
   version: 3.0.0
   resolution: "slash@npm:3.0.0"
-  checksum: e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b
+  checksum: 10c0/e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b
   languageName: node
   linkType: hard
 
@@ -14951,7 +15763,7 @@ __metadata:
     ansi-styles: "npm:^4.0.0"
     astral-regex: "npm:^2.0.0"
     is-fullwidth-code-point: "npm:^3.0.0"
-  checksum: 6c25678db1270d4793e0327620f1e0f9f5bea4630123f51e9e399191bc52c87d6e6de53ed33538609e5eacbd1fab769fae00f3705d08d029f02102a540648918
+  checksum: 10c0/6c25678db1270d4793e0327620f1e0f9f5bea4630123f51e9e399191bc52c87d6e6de53ed33538609e5eacbd1fab769fae00f3705d08d029f02102a540648918
   languageName: node
   linkType: hard
 
@@ -14961,7 +15773,7 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^6.0.0"
     is-fullwidth-code-point: "npm:^4.0.0"
-  checksum: 2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f
+  checksum: 10c0/2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f
   languageName: node
   linkType: hard
 
@@ -14971,14 +15783,21 @@ __metadata:
   dependencies:
     ansi-styles: "npm:^6.2.1"
     is-fullwidth-code-point: "npm:^5.0.0"
-  checksum: 631c971d4abf56cf880f034d43fcc44ff883624867bf11ecbd538c47343911d734a4656d7bc02362b40b89d765652a7f935595441e519b59e2ad3f4d5d6fe7ca
+  checksum: 10c0/631c971d4abf56cf880f034d43fcc44ff883624867bf11ecbd538c47343911d734a4656d7bc02362b40b89d765652a7f935595441e519b59e2ad3f4d5d6fe7ca
   languageName: node
   linkType: hard
 
 "smart-buffer@npm:^4.2.0":
   version: 4.2.0
   resolution: "smart-buffer@npm:4.2.0"
-  checksum: a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539
+  checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539
+  languageName: node
+  linkType: hard
+
+"smob@npm:^1.0.0":
+  version: 1.5.0
+  resolution: "smob@npm:1.5.0"
+  checksum: 10c0/a1067f23265812de8357ed27312101af49b89129eb973e3f26ab5856ea774f88cace13342e66e32470f933ccfa916e0e9d0f7ca8bbd4f92dfab2af45c15956c2
   languageName: node
   linkType: hard
 
@@ -14989,7 +15808,7 @@ __metadata:
     define-property: "npm:^1.0.0"
     isobject: "npm:^3.0.0"
     snapdragon-util: "npm:^3.0.1"
-  checksum: 7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f
+  checksum: 10c0/7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f
   languageName: node
   linkType: hard
 
@@ -14998,7 +15817,7 @@ __metadata:
   resolution: "snapdragon-util@npm:3.0.1"
   dependencies:
     kind-of: "npm:^3.2.0"
-  checksum: 4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3
+  checksum: 10c0/4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3
   languageName: node
   linkType: hard
 
@@ -15014,7 +15833,7 @@ __metadata:
     source-map: "npm:^0.5.6"
     source-map-resolve: "npm:^0.5.0"
     use: "npm:^3.1.0"
-  checksum: dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca
+  checksum: 10c0/dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca
   languageName: node
   linkType: hard
 
@@ -15027,7 +15846,7 @@ __metadata:
     faye-websocket: "npm:^0.11.4"
     inherits: "npm:^2.0.4"
     url-parse: "npm:^1.5.10"
-  checksum: c1b55470aac0a31b0fc87806535b0e5cf5d6289584bcd03ffa9f50328a74a40098be63292d6862bd6f483ac9ef487ad60a8a5082feb1f9d0caee5bad6e50f3a9
+  checksum: 10c0/c1b55470aac0a31b0fc87806535b0e5cf5d6289584bcd03ffa9f50328a74a40098be63292d6862bd6f483ac9ef487ad60a8a5082feb1f9d0caee5bad6e50f3a9
   languageName: node
   linkType: hard
 
@@ -15038,7 +15857,7 @@ __metadata:
     faye-websocket: "npm:^0.11.3"
     uuid: "npm:^8.3.2"
     websocket-driver: "npm:^0.7.4"
-  checksum: aa102c7d921bf430215754511c81ea7248f2dcdf268fbdb18e4d8183493a86b8793b164c636c52f474a886f747447c962741df2373888823271efdb9d2594f33
+  checksum: 10c0/aa102c7d921bf430215754511c81ea7248f2dcdf268fbdb18e4d8183493a86b8793b164c636c52f474a886f747447c962741df2373888823271efdb9d2594f33
   languageName: node
   linkType: hard
 
@@ -15049,7 +15868,7 @@ __metadata:
     agent-base: "npm:^7.0.2"
     debug: "npm:^4.3.4"
     socks: "npm:^2.7.1"
-  checksum: a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
+  checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
   languageName: node
   linkType: hard
 
@@ -15059,21 +15878,39 @@ __metadata:
   dependencies:
     ip: "npm:^2.0.0"
     smart-buffer: "npm:^4.2.0"
-  checksum: 43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
+  checksum: 10c0/43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
+  languageName: node
+  linkType: hard
+
+"sonic-boom@npm:^3.0.0":
+  version: 3.7.0
+  resolution: "sonic-boom@npm:3.7.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+  checksum: 10c0/57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
+  languageName: node
+  linkType: hard
+
+"sonic-boom@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "sonic-boom@npm:4.0.1"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+  checksum: 10c0/7b467f2bc8af7ff60bf210382f21c59728cc4b769af9b62c31dd88723f5cc472752d2320736cc366acc7c765ddd5bec3072c033b0faf249923f576a7453ba9d3
   languageName: node
   linkType: hard
 
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
-  checksum: 2e5e421b185dcd857f46c3c70e2e711a65d717b78c5f795e2e248c9d67757882ea989b80ebc08cf164eeeda5f4be8aa95d3b990225070b2daaaf3257c5958149
+  checksum: 10c0/2e5e421b185dcd857f46c3c70e2e711a65d717b78c5f795e2e248c9d67757882ea989b80ebc08cf164eeeda5f4be8aa95d3b990225070b2daaaf3257c5958149
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "source-map-js@npm:1.0.2"
-  checksum: 32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
   languageName: node
   linkType: hard
 
@@ -15086,7 +15923,7 @@ __metadata:
     resolve-url: "npm:^0.2.1"
     source-map-url: "npm:^0.4.0"
     urix: "npm:^0.1.0"
-  checksum: 410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57
+  checksum: 10c0/410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57
   languageName: node
   linkType: hard
 
@@ -15096,7 +15933,7 @@ __metadata:
   dependencies:
     buffer-from: "npm:^1.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
+  checksum: 10c0/137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
   languageName: node
   linkType: hard
 
@@ -15106,42 +15943,42 @@ __metadata:
   dependencies:
     buffer-from: "npm:^1.0.0"
     source-map: "npm:^0.6.0"
-  checksum: 9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
+  checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
   languageName: node
   linkType: hard
 
 "source-map-url@npm:^0.4.0":
   version: 0.4.1
   resolution: "source-map-url@npm:0.4.1"
-  checksum: f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58
+  checksum: 10c0/f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58
   languageName: node
   linkType: hard
 
 "source-map@npm:0.5.6":
   version: 0.5.6
   resolution: "source-map@npm:0.5.6"
-  checksum: beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d
+  checksum: 10c0/beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
-  checksum: 904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599
+  checksum: 10c0/904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
-  checksum: ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
+  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
   languageName: node
   linkType: hard
 
 "source-map@npm:^0.7.3":
   version: 0.7.4
   resolution: "source-map@npm:0.7.4"
-  checksum: dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
+  checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
   languageName: node
   linkType: hard
 
@@ -15150,21 +15987,21 @@ __metadata:
   resolution: "source-map@npm:0.8.0-beta.0"
   dependencies:
     whatwg-url: "npm:^7.0.0"
-  checksum: fb4d9bde9a9fdb2c29b10e5eae6c71d10e09ef467e1afb75fdec2eb7e11fa5b343a2af553f74f18b695dbc0b81f9da2e9fa3d7a317d5985e9939499ec6087835
+  checksum: 10c0/fb4d9bde9a9fdb2c29b10e5eae6c71d10e09ef467e1afb75fdec2eb7e11fa5b343a2af553f74f18b695dbc0b81f9da2e9fa3d7a317d5985e9939499ec6087835
   languageName: node
   linkType: hard
 
 "sourcemap-codec@npm:^1.4.8":
   version: 1.4.8
   resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
+  checksum: 10c0/f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
   languageName: node
   linkType: hard
 
 "spdx-exceptions@npm:^2.1.0":
   version: 2.3.0
   resolution: "spdx-exceptions@npm:2.3.0"
-  checksum: 83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a
+  checksum: 10c0/83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a
   languageName: node
   linkType: hard
 
@@ -15174,14 +16011,14 @@ __metadata:
   dependencies:
     spdx-exceptions: "npm:^2.1.0"
     spdx-license-ids: "npm:^3.0.0"
-  checksum: 965c487e77f4fb173f1c471f3eef4eb44b9f0321adc7f93d95e7620da31faa67d29356eb02523cd7df8a7fc1ec8238773cdbf9e45bd050329d2b26492771b736
+  checksum: 10c0/965c487e77f4fb173f1c471f3eef4eb44b9f0321adc7f93d95e7620da31faa67d29356eb02523cd7df8a7fc1ec8238773cdbf9e45bd050329d2b26492771b736
   languageName: node
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
   version: 3.0.15
   resolution: "spdx-license-ids@npm:3.0.15"
-  checksum: 1d44fa43d2024d4533816ceffac983149f9c76214698033496e13f6224d7fe6e61649a2bb9eb6c88b5f7f71bc19cc5f0aed3dba75b430e27c06e0f71cc251959
+  checksum: 10c0/1d44fa43d2024d4533816ceffac983149f9c76214698033496e13f6224d7fe6e61649a2bb9eb6c88b5f7f71bc19cc5f0aed3dba75b430e27c06e0f71cc251959
   languageName: node
   linkType: hard
 
@@ -15195,7 +16032,7 @@ __metadata:
     obuf: "npm:^1.1.2"
     readable-stream: "npm:^3.0.6"
     wbuf: "npm:^1.7.3"
-  checksum: eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb
+  checksum: 10c0/eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb
   languageName: node
   linkType: hard
 
@@ -15208,7 +16045,7 @@ __metadata:
     http-deceiver: "npm:^1.2.7"
     select-hose: "npm:^2.0.0"
     spdy-transport: "npm:^3.0.0"
-  checksum: 983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf
+  checksum: 10c0/983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf
   languageName: node
   linkType: hard
 
@@ -15217,21 +16054,21 @@ __metadata:
   resolution: "split-string@npm:3.1.0"
   dependencies:
     extend-shallow: "npm:^3.0.0"
-  checksum: 72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70
+  checksum: 10c0/72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70
   languageName: node
   linkType: hard
 
-"split2@npm:^4.1.0":
+"split2@npm:^4.0.0, split2@npm:^4.1.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
-  checksum: b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
+  checksum: 10c0/b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
   languageName: node
   linkType: hard
 
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
-  checksum: ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb
+  checksum: 10c0/ecadcfe4c771890140da5023d43e190b7566d9cf8b2d238600f31bec0fc653f328da4450eb04bd59a431771a8e9cc0e118f0aa3974b683a4981b4e07abc2a5bb
   languageName: node
   linkType: hard
 
@@ -15240,7 +16077,7 @@ __metadata:
   resolution: "ssri@npm:10.0.5"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
+  checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
   languageName: node
   linkType: hard
 
@@ -15249,14 +16086,14 @@ __metadata:
   resolution: "ssri@npm:8.0.1"
   dependencies:
     minipass: "npm:^3.1.1"
-  checksum: 5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2
+  checksum: 10c0/5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2
   languageName: node
   linkType: hard
 
 "stable@npm:^0.1.8":
   version: 0.1.8
   resolution: "stable@npm:0.1.8"
-  checksum: df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d
+  checksum: 10c0/df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d
   languageName: node
   linkType: hard
 
@@ -15265,7 +16102,7 @@ __metadata:
   resolution: "stack-generator@npm:2.0.10"
   dependencies:
     stackframe: "npm:^1.3.4"
-  checksum: c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce
+  checksum: 10c0/c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce
   languageName: node
   linkType: hard
 
@@ -15274,14 +16111,14 @@ __metadata:
   resolution: "stack-utils@npm:2.0.6"
   dependencies:
     escape-string-regexp: "npm:^2.0.0"
-  checksum: 651c9f87667e077584bbe848acaecc6049bc71979f1e9a46c7b920cad4431c388df0f51b8ad7cfd6eed3db97a2878d0fc8b3122979439ea8bac29c61c95eec8a
+  checksum: 10c0/651c9f87667e077584bbe848acaecc6049bc71979f1e9a46c7b920cad4431c388df0f51b8ad7cfd6eed3db97a2878d0fc8b3122979439ea8bac29c61c95eec8a
   languageName: node
   linkType: hard
 
 "stackframe@npm:^1.3.4":
   version: 1.3.4
   resolution: "stackframe@npm:1.3.4"
-  checksum: 18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989
+  checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989
   languageName: node
   linkType: hard
 
@@ -15291,7 +16128,7 @@ __metadata:
   dependencies:
     source-map: "npm:0.5.6"
     stackframe: "npm:^1.3.4"
-  checksum: 0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9
+  checksum: 10c0/0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9
   languageName: node
   linkType: hard
 
@@ -15302,14 +16139,14 @@ __metadata:
     error-stack-parser: "npm:^2.0.6"
     stack-generator: "npm:^2.0.5"
     stacktrace-gps: "npm:^3.0.4"
-  checksum: 9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec
+  checksum: 10c0/9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec
   languageName: node
   linkType: hard
 
 "standard-as-callback@npm:^2.1.0":
   version: 2.1.0
   resolution: "standard-as-callback@npm:2.1.0"
-  checksum: 012677236e3d3fdc5689d29e64ea8a599331c4babe86956bf92fc5e127d53f85411c5536ee0079c52c43beb0026b5ce7aa1d834dd35dd026e82a15d1bcaead1f
+  checksum: 10c0/012677236e3d3fdc5689d29e64ea8a599331c4babe86956bf92fc5e127d53f85411c5536ee0079c52c43beb0026b5ce7aa1d834dd35dd026e82a15d1bcaead1f
   languageName: node
   linkType: hard
 
@@ -15319,30 +16156,21 @@ __metadata:
   dependencies:
     define-property: "npm:^0.2.5"
     object-copy: "npm:^0.1.0"
-  checksum: 284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653
+  checksum: 10c0/284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653
   languageName: node
   linkType: hard
 
 "statuses@npm:2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
-  checksum: 34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
+  checksum: 10c0/34378b207a1620a24804ce8b5d230fea0c279f00b18a7209646d5d47e419d1cc23e7cbf33a25a1e51ac38973dc2ac2e1e9c647a8e481ef365f77668d72becfd0
   languageName: node
   linkType: hard
 
 "statuses@npm:>= 1.4.0 < 2":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
-  checksum: e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940
-  languageName: node
-  linkType: hard
-
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: "npm:^1.0.4"
-  checksum: c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9
+  checksum: 10c0/e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940
   languageName: node
   linkType: hard
 
@@ -15352,7 +16180,7 @@ __metadata:
   dependencies:
     inherits: "npm:~2.0.1"
     readable-stream: "npm:^2.0.2"
-  checksum: 485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac
+  checksum: 10c0/485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac
   languageName: node
   linkType: hard
 
@@ -15365,14 +16193,14 @@ __metadata:
     readable-stream: "npm:^2.3.6"
     to-arraybuffer: "npm:^1.0.0"
     xtend: "npm:^4.0.0"
-  checksum: fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4
+  checksum: 10c0/fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4
   languageName: node
   linkType: hard
 
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
-  checksum: 75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
+  checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
   languageName: node
   linkType: hard
 
@@ -15382,18 +16210,18 @@ __metadata:
   dependencies:
     char-regex: "npm:^1.0.2"
     strip-ansi: "npm:^6.0.0"
-  checksum: 1cd77409c3d7db7bc59406f6bcc9ef0783671dcbabb23597a1177c166906ef2ee7c8290f78cae73a8aec858768f189d2cb417797df5e15ec4eb5e16b3346340c
+  checksum: 10c0/1cd77409c3d7db7bc59406f6bcc9ef0783671dcbabb23597a1177c166906ef2ee7c8290f78cae73a8aec858768f189d2cb417797df5e15ec4eb5e16b3346340c
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
     emoji-regex: "npm:^8.0.0"
     is-fullwidth-code-point: "npm:^3.0.0"
     strip-ansi: "npm:^6.0.1"
-  checksum: 1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b
+  checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b
   languageName: node
   linkType: hard
 
@@ -15404,7 +16232,7 @@ __metadata:
     emoji-regex: "npm:^7.0.1"
     is-fullwidth-code-point: "npm:^2.0.0"
     strip-ansi: "npm:^5.1.0"
-  checksum: 85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91
+  checksum: 10c0/85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91
   languageName: node
   linkType: hard
 
@@ -15415,7 +16243,7 @@ __metadata:
     eastasianwidth: "npm:^0.2.0"
     emoji-regex: "npm:^9.2.2"
     strip-ansi: "npm:^7.0.1"
-  checksum: ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca
+  checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca
   languageName: node
   linkType: hard
 
@@ -15426,23 +16254,24 @@ __metadata:
     emoji-regex: "npm:^10.3.0"
     get-east-asian-width: "npm:^1.0.0"
     strip-ansi: "npm:^7.1.0"
-  checksum: 8ffaeeccf4a56ccce5b6235d0b99ee3a581e3e3e5d453708efe7aa8e264fa3a858b4fe2244310cb71c6a20d8c05921cedc8b2ccd88cbaad9f5c92051ff68edc6
+  checksum: 10c0/8ffaeeccf4a56ccce5b6235d0b99ee3a581e3e3e5d453708efe7aa8e264fa3a858b4fe2244310cb71c6a20d8c05921cedc8b2ccd88cbaad9f5c92051ff68edc6
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.6, string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.matchall@npm:^4.0.10, string.prototype.matchall@npm:^4.0.6":
+  version: 4.0.10
+  resolution: "string.prototype.matchall@npm:4.0.10"
   dependencies:
     call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    get-intrinsic: "npm:^1.1.3"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    get-intrinsic: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.3"
-    regexp.prototype.flags: "npm:^1.4.3"
+    internal-slot: "npm:^1.0.5"
+    regexp.prototype.flags: "npm:^1.5.0"
+    set-function-name: "npm:^2.0.0"
     side-channel: "npm:^1.0.4"
-  checksum: 644523d05c1ee93bab7474e999a5734ee5f6ad2d7ad24ed6ea8706c270dc92b352bde0f2a5420bfbeed54e28cb6a770c3800e1988a5267a70fd5e677c7750abc
+  checksum: 10c0/cd7495fb0de16d43efeee3887b98701941f3817bd5f09351ad1825b023d307720c86394d56d56380563d97767ab25bf5448db239fcecbb85c28e2180f23e324a
   languageName: node
   linkType: hard
 
@@ -15453,7 +16282,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34
+  checksum: 10c0/4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34
   languageName: node
   linkType: hard
 
@@ -15464,7 +16293,7 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57
+  checksum: 10c0/53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57
   languageName: node
   linkType: hard
 
@@ -15475,16 +16304,16 @@ __metadata:
     call-bind: "npm:^1.0.2"
     define-properties: "npm:^1.2.0"
     es-abstract: "npm:^1.22.1"
-  checksum: 0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f
+  checksum: 10c0/0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
     safe-buffer: "npm:~5.2.0"
-  checksum: 810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d
+  checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d
   languageName: node
   linkType: hard
 
@@ -15493,7 +16322,7 @@ __metadata:
   resolution: "string_decoder@npm:1.1.1"
   dependencies:
     safe-buffer: "npm:~5.1.0"
-  checksum: b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e
+  checksum: 10c0/b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e
   languageName: node
   linkType: hard
 
@@ -15504,7 +16333,7 @@ __metadata:
     get-own-enumerable-property-symbols: "npm:^3.0.0"
     is-obj: "npm:^1.0.1"
     is-regexp: "npm:^1.0.0"
-  checksum: ba8078f84128979ee24b3de9a083489cbd3c62cb8572a061b47d4d82601a8ae4b4d86fa8c54dd955593da56bb7c16a6de51c27221fdc6b7139bb4f29d815f35b
+  checksum: 10c0/ba8078f84128979ee24b3de9a083489cbd3c62cb8572a061b47d4d82601a8ae4b4d86fa8c54dd955593da56bb7c16a6de51c27221fdc6b7139bb4f29d815f35b
   languageName: node
   linkType: hard
 
@@ -15513,7 +16342,7 @@ __metadata:
   resolution: "stringz@npm:2.1.0"
   dependencies:
     char-regex: "npm:^1.0.2"
-  checksum: bc4ff36d98469f07cd7d2221067d9480b3460c3b1266585a1dccae0aee75cd3ae1fe72f23816af017585965791e410b19d8f73a75ad7189f2e836c9ee48c49f9
+  checksum: 10c0/bc4ff36d98469f07cd7d2221067d9480b3460c3b1266585a1dccae0aee75cd3ae1fe72f23816af017585965791e410b19d8f73a75ad7189f2e836c9ee48c49f9
   languageName: node
   linkType: hard
 
@@ -15522,7 +16351,7 @@ __metadata:
   resolution: "strip-ansi@npm:6.0.1"
   dependencies:
     ansi-regex: "npm:^5.0.1"
-  checksum: 1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952
+  checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952
   languageName: node
   linkType: hard
 
@@ -15531,7 +16360,7 @@ __metadata:
   resolution: "strip-ansi@npm:3.0.1"
   dependencies:
     ansi-regex: "npm:^2.0.0"
-  checksum: f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f
+  checksum: 10c0/f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f
   languageName: node
   linkType: hard
 
@@ -15540,7 +16369,7 @@ __metadata:
   resolution: "strip-ansi@npm:5.2.0"
   dependencies:
     ansi-regex: "npm:^4.1.0"
-  checksum: de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf
+  checksum: 10c0/de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf
   languageName: node
   linkType: hard
 
@@ -15549,49 +16378,49 @@ __metadata:
   resolution: "strip-ansi@npm:7.1.0"
   dependencies:
     ansi-regex: "npm:^6.0.1"
-  checksum: a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4
+  checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
-  checksum: 51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1
+  checksum: 10c0/51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1
   languageName: node
   linkType: hard
 
 "strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
-  checksum: 26abad1172d6bc48985ab9a5f96c21e440f6e7e476686de49be813b5a59b3566dccb5c525b831ec54fe348283b47f3ffb8e080bc3f965fde12e84df23f6bb7ef
+  checksum: 10c0/26abad1172d6bc48985ab9a5f96c21e440f6e7e476686de49be813b5a59b3566dccb5c525b831ec54fe348283b47f3ffb8e080bc3f965fde12e84df23f6bb7ef
   languageName: node
   linkType: hard
 
 "strip-comments@npm:^2.0.1":
   version: 2.0.1
   resolution: "strip-comments@npm:2.0.1"
-  checksum: 984321b1ec47a531bdcfddd87f217590934e2d2f142198a080ec88588280239a5b58a81ca780730679b6195e52afef83673c6d6466c07c2277f71f44d7d9553d
+  checksum: 10c0/984321b1ec47a531bdcfddd87f217590934e2d2f142198a080ec88588280239a5b58a81ca780730679b6195e52afef83673c6d6466c07c2277f71f44d7d9553d
   languageName: node
   linkType: hard
 
 "strip-eof@npm:^1.0.0":
   version: 1.0.0
   resolution: "strip-eof@npm:1.0.0"
-  checksum: f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45
+  checksum: 10c0/f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45
   languageName: node
   linkType: hard
 
 "strip-final-newline@npm:^2.0.0":
   version: 2.0.0
   resolution: "strip-final-newline@npm:2.0.0"
-  checksum: bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f
+  checksum: 10c0/bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f
   languageName: node
   linkType: hard
 
 "strip-final-newline@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-final-newline@npm:3.0.0"
-  checksum: a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
+  checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
   languageName: node
   linkType: hard
 
@@ -15600,26 +16429,26 @@ __metadata:
   resolution: "strip-indent@npm:3.0.0"
   dependencies:
     min-indent: "npm:^1.0.0"
-  checksum: ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679
+  checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679
   languageName: node
   linkType: hard
 
 "strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
-  checksum: 9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd
+  checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "stylehacks@npm:6.0.2"
+"stylehacks@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "stylehacks@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    postcss-selector-parser: "npm:^6.0.15"
+    browserslist: "npm:^4.23.0"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
+  checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae
   languageName: node
   linkType: hard
 
@@ -15636,7 +16465,7 @@ __metadata:
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 9ddc92e7a5fa131b41cee1ab1f69251934ca35c0e2803dc613329cdead7b8b27d8457048a63db29f61a1442e7cdef14207f88a3abce00ec53fdefe0d604f7de3
+  checksum: 10c0/9ddc92e7a5fa131b41cee1ab1f69251934ca35c0e2803dc613329cdead7b8b27d8457048a63db29f61a1442e7cdef14207f88a3abce00ec53fdefe0d604f7de3
   languageName: node
   linkType: hard
 
@@ -15645,23 +16474,23 @@ __metadata:
   resolution: "stylelint-config-recommended@npm:14.0.0"
   peerDependencies:
     stylelint: ^16.0.0
-  checksum: 4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
+  checksum: 10c0/4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
   languageName: node
   linkType: hard
 
 "stylelint-config-standard-scss@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "stylelint-config-standard-scss@npm:13.0.0"
+  version: 13.1.0
+  resolution: "stylelint-config-standard-scss@npm:13.1.0"
   dependencies:
     stylelint-config-recommended-scss: "npm:^14.0.0"
     stylelint-config-standard: "npm:^36.0.0"
   peerDependencies:
     postcss: ^8.3.3
-    stylelint: ^16.1.0
+    stylelint: ^16.3.1
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 4abf317676184f4aaace6ce72b9fc9e2dffe051d43dd5637afc5803b062ea381e2807ae983c045dff22e96af58388a8b1fe9a8bdda9f97bc3660280cf24fb4d3
+  checksum: 10c0/d07cae806ee8b3e77684f019a8b22cc32642373da8053e6ae7ed716f8ddbe6ea1f7323633a6a1bbc9aa08c6a3dceb1dcf053d83fdd10d076b5a01da6e86801ae
   languageName: node
   linkType: hard
 
@@ -15672,7 +16501,7 @@ __metadata:
     stylelint-config-recommended: "npm:^14.0.0"
   peerDependencies:
     stylelint: ^16.1.0
-  checksum: 1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
+  checksum: 10c0/1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
   languageName: node
   linkType: hard
 
@@ -15687,22 +16516,23 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     stylelint: ^16.0.2
-  checksum: f5e971d19ef6879ae5c18cb8fba8033fe7928f241178e6afd80357cc080d2feddfd6f7fe564aaa696008aa10345df5885d9a4471c926b3e266088e015927782e
+  checksum: 10c0/f5e971d19ef6879ae5c18cb8fba8033fe7928f241178e6afd80357cc080d2feddfd6f7fe564aaa696008aa10345df5885d9a4471c926b3e266088e015927782e
   languageName: node
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.1.0
-  resolution: "stylelint@npm:16.1.0"
+  version: 16.5.0
+  resolution: "stylelint@npm:16.5.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.4.0"
-    "@csstools/css-tokenizer": "npm:^2.2.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.6"
-    "@csstools/selector-specificity": "npm:^3.0.1"
+    "@csstools/css-parser-algorithms": "npm:^2.6.1"
+    "@csstools/css-tokenizer": "npm:^2.2.4"
+    "@csstools/media-query-list-parser": "npm:^2.1.9"
+    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
-    css-functions-list: "npm:^3.2.1"
+    css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
@@ -15712,44 +16542,44 @@ __metadata:
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^5.3.0"
+    ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.29.0"
+    known-css-properties: "npm:^0.30.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^13.0.0"
+    meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.0"
-    postcss: "npm:^8.4.32"
+    postcss: "npm:^8.4.38"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.0.16"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^7.1.0"
     supports-hyperlinks: "npm:^3.0.0"
     svg-tags: "npm:^1.0.0"
-    table: "npm:^6.8.1"
+    table: "npm:^6.8.2"
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 765eea0b07319d1e7989502c07b8b5794938e5a8542bec00990b09ec10c3f7006891689930099e948d06c9ef9982066edb98b1ea64a435138a6b0f0905eb2b87
+  checksum: 10c0/9281693ff6c1918e07fdcf7a950531f79678a28261a0d5bd36ca2fcf524e53d7305158d20ba890f5dd01c0ff90c09a13453dce2fe6887f4c157d8c2c0acf3666
   languageName: node
   linkType: hard
 
 "stylis@npm:4.2.0":
   version: 4.2.0
   resolution: "stylis@npm:4.2.0"
-  checksum: a7128ad5a8ed72652c6eba46bed4f416521bc9745a460ef5741edc725252cebf36ee45e33a8615a7057403c93df0866ab9ee955960792db210bb80abd5ac6543
+  checksum: 10c0/a7128ad5a8ed72652c6eba46bed4f416521bc9745a460ef5741edc725252cebf36ee45e33a8615a7057403c93df0866ab9ee955960792db210bb80abd5ac6543
   languageName: node
   linkType: hard
 
 "substring-trie@npm:^1.0.2":
   version: 1.0.2
   resolution: "substring-trie@npm:1.0.2"
-  checksum: ee1a65a6282f57fc4a97ded6dd057ffc597516ea7a4b0ae7374c0c0313ca4d9f3cb0652ae0294ca52232f2d5dedf13c27e9e442666d8ad51bcf91877cd18c092
+  checksum: 10c0/ee1a65a6282f57fc4a97ded6dd057ffc597516ea7a4b0ae7374c0c0313ca4d9f3cb0652ae0294ca52232f2d5dedf13c27e9e442666d8ad51bcf91877cd18c092
   languageName: node
   linkType: hard
 
@@ -15758,7 +16588,7 @@ __metadata:
   resolution: "supports-color@npm:5.5.0"
   dependencies:
     has-flag: "npm:^3.0.0"
-  checksum: 6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05
+  checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05
   languageName: node
   linkType: hard
 
@@ -15767,7 +16597,7 @@ __metadata:
   resolution: "supports-color@npm:6.1.0"
   dependencies:
     has-flag: "npm:^3.0.0"
-  checksum: ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6
+  checksum: 10c0/ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6
   languageName: node
   linkType: hard
 
@@ -15776,7 +16606,7 @@ __metadata:
   resolution: "supports-color@npm:7.2.0"
   dependencies:
     has-flag: "npm:^4.0.0"
-  checksum: afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124
+  checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124
   languageName: node
   linkType: hard
 
@@ -15785,7 +16615,7 @@ __metadata:
   resolution: "supports-color@npm:8.1.1"
   dependencies:
     has-flag: "npm:^4.0.0"
-  checksum: ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89
+  checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89
   languageName: node
   linkType: hard
 
@@ -15795,28 +16625,28 @@ __metadata:
   dependencies:
     has-flag: "npm:^4.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
+  checksum: 10c0/36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
   languageName: node
   linkType: hard
 
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
-  checksum: 6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39
+  checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39
   languageName: node
   linkType: hard
 
 "svg-parser@npm:^2.0.2":
   version: 2.0.4
   resolution: "svg-parser@npm:2.0.4"
-  checksum: 02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
+  checksum: 10c0/02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
   languageName: node
   linkType: hard
 
 "svg-tags@npm:^1.0.0":
   version: 1.0.0
   resolution: "svg-tags@npm:1.0.0"
-  checksum: 5867e29e8f431bf7aecf5a244d1af5725f80a1086187dbc78f26d8433b5e96b8fe9361aeb10d1699ff483b9afec785a10916b9312fe9d734d1a7afd48226c954
+  checksum: 10c0/5867e29e8f431bf7aecf5a244d1af5725f80a1086187dbc78f26d8433b5e96b8fe9361aeb10d1699ff483b9afec785a10916b9312fe9d734d1a7afd48226c954
   languageName: node
   linkType: hard
 
@@ -15839,7 +16669,7 @@ __metadata:
     util.promisify: "npm:~1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776
+  checksum: 10c0/261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776
   languageName: node
   linkType: hard
 
@@ -15856,51 +16686,41 @@ __metadata:
     picocolors: "npm:^1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
+  checksum: 10c0/28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
   languageName: node
   linkType: hard
 
 "symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
-  checksum: dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509
+  checksum: 10c0/dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.8.6":
-  version: 0.8.6
-  resolution: "synckit@npm:0.8.6"
-  dependencies:
-    "@pkgr/utils": "npm:^2.4.2"
-    tslib: "npm:^2.6.2"
-  checksum: 200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc
-  languageName: node
-  linkType: hard
-
-"table@npm:^6.8.1":
-  version: 6.8.1
-  resolution: "table@npm:6.8.1"
+"table@npm:^6.8.2":
+  version: 6.8.2
+  resolution: "table@npm:6.8.2"
   dependencies:
     ajv: "npm:^8.0.1"
     lodash.truncate: "npm:^4.4.2"
     slice-ansi: "npm:^4.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^6.0.1"
-  checksum: 591ed84b2438b01c9bc02248e2238e21e8bfb73654bc5acca0d469053eb39be3db2f57d600dcf08ac983b6f50f80842c44612c03877567c2afee3aec4a033e5f
+  checksum: 10c0/f8b348af38ee34e419d8ce7306ba00671ce6f20e861ccff22555f491ba264e8416086063ce278a8d81abfa8d23b736ec2cca7ac4029b5472f63daa4b4688b803
   languageName: node
   linkType: hard
 
 "tapable@npm:^1.0, tapable@npm:^1.0.0, tapable@npm:^1.1.3":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
-  checksum: c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50
+  checksum: 10c0/c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50
   languageName: node
   linkType: hard
 
 "tapable@npm:^2.2.0":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
-  checksum: bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9
+  checksum: 10c0/bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9
   languageName: node
   linkType: hard
 
@@ -15914,7 +16734,7 @@ __metadata:
     minizlib: "npm:^2.1.1"
     mkdirp: "npm:^1.0.3"
     yallist: "npm:^4.0.0"
-  checksum: 02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
+  checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
   languageName: node
   linkType: hard
 
@@ -15923,14 +16743,14 @@ __metadata:
   resolution: "tdigest@npm:0.1.2"
   dependencies:
     bintrees: "npm:1.0.2"
-  checksum: 10187b8144b112fcdfd3a5e4e9068efa42c990b1e30cd0d4f35ee8f58f16d1b41bc587e668fa7a6f6ca31308961cbd06cd5d4a4ae1dc388335902ae04f7d57df
+  checksum: 10c0/10187b8144b112fcdfd3a5e4e9068efa42c990b1e30cd0d4f35ee8f58f16d1b41bc587e668fa7a6f6ca31308961cbd06cd5d4a4ae1dc388335902ae04f7d57df
   languageName: node
   linkType: hard
 
 "temp-dir@npm:^2.0.0":
   version: 2.0.0
   resolution: "temp-dir@npm:2.0.0"
-  checksum: b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309
+  checksum: 10c0/b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309
   languageName: node
   linkType: hard
 
@@ -15942,7 +16762,7 @@ __metadata:
     temp-dir: "npm:^2.0.0"
     type-fest: "npm:^0.16.0"
     unique-string: "npm:^2.0.0"
-  checksum: ca0882276732d1313b85006b0427620cb4a8d7a57738a2311a72befae60ed152be7d5b41b951dcb447a01a35404bed76f33eb4e37c55263cd7f807eee1187f8f
+  checksum: 10c0/ca0882276732d1313b85006b0427620cb4a8d7a57738a2311a72befae60ed152be7d5b41b951dcb447a01a35404bed76f33eb4e37c55263cd7f807eee1187f8f
   languageName: node
   linkType: hard
 
@@ -15961,13 +16781,13 @@ __metadata:
     webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 52bd036b72b596b162e65dce314f1ee7ba1e82b97200d919b61ad50592dc72608b5fe50d7e3f6c0934e42183dfc746b98b922c9e1d00d75253933f799687fa4b
+  checksum: 10c0/52bd036b72b596b162e65dce314f1ee7ba1e82b97200d919b61ad50592dc72608b5fe50d7e3f6c0934e42183dfc746b98b922c9e1d00d75253933f799687fa4b
   languageName: node
   linkType: hard
 
-"terser@npm:^5.0.0, terser@npm:^5.3.4":
-  version: 5.19.4
-  resolution: "terser@npm:5.19.4"
+"terser@npm:^5.17.4, terser@npm:^5.3.4":
+  version: 5.31.0
+  resolution: "terser@npm:5.31.0"
   dependencies:
     "@jridgewell/source-map": "npm:^0.3.3"
     acorn: "npm:^8.8.2"
@@ -15975,14 +16795,14 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a
+  checksum: 10c0/cb127a579b03fb9dcee0d293ff24814deedcd430f447933b618e8593b7454f615b5c8493c68e86a4b0188769d5ea2af5251b5d507edb208114f7e8aebdc7c850
   languageName: node
   linkType: hard
 
 "tesseract.js-core@npm:^2.2.0":
   version: 2.2.0
   resolution: "tesseract.js-core@npm:2.2.0"
-  checksum: 9ef569529f1ee96f8bf18388ef086d4940d3f02d28b4252df133a9bd36f6a9d140085e77a12ff1963cf9b4cd85bd1c644b61eca266ecfc51bb83adb30a1f11e3
+  checksum: 10c0/9ef569529f1ee96f8bf18388ef086d4940d3f02d28b4252df133a9bd36f6a9d140085e77a12ff1963cf9b4cd85bd1c644b61eca266ecfc51bb83adb30a1f11e3
   languageName: node
   linkType: hard
 
@@ -16003,7 +16823,7 @@ __metadata:
     resolve-url: "npm:^0.2.1"
     tesseract.js-core: "npm:^2.2.0"
     zlibjs: "npm:^0.3.1"
-  checksum: b3aaee9189f3bc7f4217b83e110d0dd4d9afcafc3045b842f72b7ca9beb00bec732bc6b4b00eca14167c16b014c437fcf83dd272a640c9c8b5e1e9b55ea00ff5
+  checksum: 10c0/b3aaee9189f3bc7f4217b83e110d0dd4d9afcafc3045b842f72b7ca9beb00bec732bc6b4b00eca14167c16b014c437fcf83dd272a640c9c8b5e1e9b55ea00ff5
   languageName: node
   linkType: hard
 
@@ -16014,21 +16834,30 @@ __metadata:
     "@istanbuljs/schema": "npm:^0.1.2"
     glob: "npm:^7.1.4"
     minimatch: "npm:^3.0.4"
-  checksum: 019d33d81adff3f9f1bfcff18125fb2d3c65564f437d9be539270ee74b994986abb8260c7c2ce90e8f30162178b09dbbce33c6389273afac4f36069c48521f57
+  checksum: 10c0/019d33d81adff3f9f1bfcff18125fb2d3c65564f437d9be539270ee74b994986abb8260c7c2ce90e8f30162178b09dbbce33c6389273afac4f36069c48521f57
   languageName: node
   linkType: hard
 
 "text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
-  checksum: 02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
+  checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
+  languageName: node
+  linkType: hard
+
+"thread-stream@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "thread-stream@npm:3.0.0"
+  dependencies:
+    real-require: "npm:^0.2.0"
+  checksum: 10c0/1f4da5a8c93b170cdc7c1ad774af49bb2af43f73cfd9a7f8fb02b766255b483eb6d0b734502c880397baa95c0ce3490088b9a487cff32d4e481aab6fe76560f5
   languageName: node
   linkType: hard
 
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
-  checksum: 369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
+  checksum: 10c0/369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
   languageName: node
   linkType: hard
 
@@ -16037,56 +16866,56 @@ __metadata:
   resolution: "timers-browserify@npm:2.0.12"
   dependencies:
     setimmediate: "npm:^1.0.4"
-  checksum: 98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641
+  checksum: 10c0/98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641
   languageName: node
   linkType: hard
 
 "tiny-invariant@npm:^1.0.2":
   version: 1.3.1
   resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db
+  checksum: 10c0/5b87c1d52847d9452b60d0dcb77011b459044e0361ca8253bfe7b43d6288106e12af926adb709a6fc28900e3864349b91dad9a4ac93c39aa15f360b26c2ff4db
+  languageName: node
+  linkType: hard
+
+"tiny-invariant@npm:^1.0.6":
+  version: 1.3.3
+  resolution: "tiny-invariant@npm:1.3.3"
+  checksum: 10c0/65af4a07324b591a059b35269cd696aba21bef2107f29b9f5894d83cc143159a204b299553435b03874ebb5b94d019afa8b8eff241c8a4cfee95872c2e1c1c4a
   languageName: node
   linkType: hard
 
 "tiny-queue@npm:^0.2.1":
   version: 0.2.1
   resolution: "tiny-queue@npm:0.2.1"
-  checksum: 710c658bf84f5e1fe72f2a2d6fbc8e6d078ede1d367968b7d16ca01639ab34aeae9d200b8228c78fe2346bcb16e1654bd013f501e9f7dea687488479438dc0d1
+  checksum: 10c0/710c658bf84f5e1fe72f2a2d6fbc8e6d078ede1d367968b7d16ca01639ab34aeae9d200b8228c78fe2346bcb16e1654bd013f501e9f7dea687488479438dc0d1
   languageName: node
   linkType: hard
 
 "tiny-warning@npm:^1.0.0":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
-  checksum: ef8531f581b30342f29670cb41ca248001c6fd7975ce22122bd59b8d62b4fc84ad4207ee7faa95cde982fa3357cd8f4be650142abc22805538c3b1392d7084fa
-  languageName: node
-  linkType: hard
-
-"titleize@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "titleize@npm:3.0.0"
-  checksum: 5ae6084ba299b5782f95e3fe85ea9f0fa4d74b8ae722b6b3208157e975589fbb27733aeba4e5080fa9314a856044ef52caa61b87caea4b1baade951a55c06336
+  checksum: 10c0/ef8531f581b30342f29670cb41ca248001c6fd7975ce22122bd59b8d62b4fc84ad4207ee7faa95cde982fa3357cd8f4be650142abc22805538c3b1392d7084fa
   languageName: node
   linkType: hard
 
 "tmpl@npm:1.0.5":
   version: 1.0.5
   resolution: "tmpl@npm:1.0.5"
-  checksum: f935537799c2d1922cb5d6d3805f594388f75338fe7a4a9dac41504dd539704ca4db45b883b52e7b0aa5b2fd5ddadb1452bf95cd23a69da2f793a843f9451cc9
+  checksum: 10c0/f935537799c2d1922cb5d6d3805f594388f75338fe7a4a9dac41504dd539704ca4db45b883b52e7b0aa5b2fd5ddadb1452bf95cd23a69da2f793a843f9451cc9
   languageName: node
   linkType: hard
 
 "to-arraybuffer@npm:^1.0.0":
   version: 1.0.1
   resolution: "to-arraybuffer@npm:1.0.1"
-  checksum: 2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c
+  checksum: 10c0/2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c
   languageName: node
   linkType: hard
 
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
-  checksum: b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7
+  checksum: 10c0/b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7
   languageName: node
   linkType: hard
 
@@ -16095,7 +16924,7 @@ __metadata:
   resolution: "to-object-path@npm:0.3.0"
   dependencies:
     kind-of: "npm:^3.0.2"
-  checksum: 731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3
+  checksum: 10c0/731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3
   languageName: node
   linkType: hard
 
@@ -16105,7 +16934,7 @@ __metadata:
   dependencies:
     is-number: "npm:^3.0.0"
     repeat-string: "npm:^1.6.1"
-  checksum: 440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949
+  checksum: 10c0/440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949
   languageName: node
   linkType: hard
 
@@ -16114,7 +16943,7 @@ __metadata:
   resolution: "to-regex-range@npm:5.0.1"
   dependencies:
     is-number: "npm:^7.0.0"
-  checksum: 487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892
+  checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892
   languageName: node
   linkType: hard
 
@@ -16126,21 +16955,21 @@ __metadata:
     extend-shallow: "npm:^3.0.2"
     regex-not: "npm:^1.0.2"
     safe-regex: "npm:^1.1.0"
-  checksum: 99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120
+  checksum: 10c0/99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120
   languageName: node
   linkType: hard
 
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
-  checksum: 93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
+  checksum: 10c0/93937279934bd66cc3270016dd8d0afec14fb7c94a05c72dc57321f8bd1fa97e5bea6d1f7c89e728d077ca31ea125b78320a616a6c6cd0e6b9cb94cb864381c1
   languageName: node
   linkType: hard
 
 "totalist@npm:^3.0.0":
   version: 3.0.1
   resolution: "totalist@npm:3.0.1"
-  checksum: 4bb1fadb69c3edbef91c73ebef9d25b33bbf69afe1e37ce544d5f7d13854cda15e47132f3e0dc4cafe300ddb8578c77c50a65004d8b6e97e77934a69aa924863
+  checksum: 10c0/4bb1fadb69c3edbef91c73ebef9d25b33bbf69afe1e37ce544d5f7d13854cda15e47132f3e0dc4cafe300ddb8578c77c50a65004d8b6e97e77934a69aa924863
   languageName: node
   linkType: hard
 
@@ -16152,7 +16981,7 @@ __metadata:
     punycode: "npm:^2.1.1"
     universalify: "npm:^0.2.0"
     url-parse: "npm:^1.5.3"
-  checksum: 4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831
+  checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831
   languageName: node
   linkType: hard
 
@@ -16161,7 +16990,7 @@ __metadata:
   resolution: "tr46@npm:1.0.1"
   dependencies:
     punycode: "npm:^2.1.0"
-  checksum: 41525c2ccce86e3ef30af6fa5e1464e6d8bb4286a58ea8db09228f598889581ef62347153f6636cd41553dc41685bdfad0a9d032ef58df9fbb0792b3447d0f04
+  checksum: 10c0/41525c2ccce86e3ef30af6fa5e1464e6d8bb4286a58ea8db09228f598889581ef62347153f6636cd41553dc41685bdfad0a9d032ef58df9fbb0792b3447d0f04
   languageName: node
   linkType: hard
 
@@ -16170,7 +16999,7 @@ __metadata:
   resolution: "tr46@npm:3.0.0"
   dependencies:
     punycode: "npm:^2.1.1"
-  checksum: cdc47cad3a9d0b6cb293e39ccb1066695ae6fdd39b9e4f351b010835a1f8b4f3a6dc3a55e896b421371187f22b48d7dac1b693de4f6551bdef7b6ab6735dfe3b
+  checksum: 10c0/cdc47cad3a9d0b6cb293e39ccb1066695ae6fdd39b9e4f351b010835a1f8b4f3a6dc3a55e896b421371187f22b48d7dac1b693de4f6551bdef7b6ab6735dfe3b
   languageName: node
   linkType: hard
 
@@ -16179,23 +17008,23 @@ __metadata:
   resolution: "tr46@npm:5.0.0"
   dependencies:
     punycode: "npm:^2.3.1"
-  checksum: 1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee
+  checksum: 10c0/1521b6e7bbc8adc825c4561480f9fe48eb2276c81335eed9fa610aa4c44a48a3221f78b10e5f18b875769eb3413e30efbf209ed556a17a42aa8d690df44b7bee
   languageName: node
   linkType: hard
 
 "tr46@npm:~0.0.3":
   version: 0.0.3
   resolution: "tr46@npm:0.0.3"
-  checksum: 047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11
+  checksum: 10c0/047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "ts-api-utils@npm:1.0.3"
+"ts-api-utils@npm:^1.0.1, ts-api-utils@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "ts-api-utils@npm:1.3.0"
   peerDependencies:
     typescript: ">=4.2.0"
-  checksum: 9408338819c3aca2a709f0bc54e3f874227901506cacb1163612a6c8a43df224174feb965a5eafdae16f66fc68fd7bfee8d3275d0fa73fbb8699e03ed26520c9
+  checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c
   languageName: node
   linkType: hard
 
@@ -16207,28 +17036,28 @@ __metadata:
     json5: "npm:^1.0.2"
     minimist: "npm:^1.2.6"
     strip-bom: "npm:^3.0.0"
-  checksum: 5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
+  checksum: 10c0/5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tslib@npm:2.6.2, tslib@npm:^2.4.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
-  checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
+  checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb
   languageName: node
   linkType: hard
 
 "tty-browserify@npm:0.0.0":
   version: 0.0.0
   resolution: "tty-browserify@npm:0.0.0"
-  checksum: c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5
+  checksum: 10c0/c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5
   languageName: node
   linkType: hard
 
 "twemoji-parser@npm:^11.0.2":
   version: 11.0.2
   resolution: "twemoji-parser@npm:11.0.2"
-  checksum: b06116434ef19dcf34fcc44129482dcf561a4f78fd6525aba55329b5a50b525c68125f95d040e9274cd9a1f3e8315b8e6842bb735c68069530a9cb28422130d6
+  checksum: 10c0/b06116434ef19dcf34fcc44129482dcf561a4f78fd6525aba55329b5a50b525c68125f95d040e9274cd9a1f3e8315b8e6842bb735c68069530a9cb28422130d6
   languageName: node
   linkType: hard
 
@@ -16240,7 +17069,7 @@ __metadata:
     core-js: "npm:^2.5.0"
     punycode: "npm:1.4.1"
     twemoji-parser: "npm:^11.0.2"
-  checksum: 34f2b42df7a0cde707ae3d9138b0232eabced946ab9f825b2500fbcc0c8be8a494fdf98ab5f4c44d7c652843c0c3846ab0aba952c7e3ca90aad69edb06dccdf5
+  checksum: 10c0/34f2b42df7a0cde707ae3d9138b0232eabced946ab9f825b2500fbcc0c8be8a494fdf98ab5f4c44d7c652843c0c3846ab0aba952c7e3ca90aad69edb06dccdf5
   languageName: node
   linkType: hard
 
@@ -16249,42 +17078,42 @@ __metadata:
   resolution: "type-check@npm:0.4.0"
   dependencies:
     prelude-ls: "npm:^1.2.1"
-  checksum: 7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58
+  checksum: 10c0/7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58
   languageName: node
   linkType: hard
 
 "type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
-  checksum: 8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd
+  checksum: 10c0/8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.16.0":
   version: 0.16.0
   resolution: "type-fest@npm:0.16.0"
-  checksum: 6b4d846534e7bcb49a6160b068ffaed2b62570d989d909ac3f29df5ef1e993859f890a4242eebe023c9e923f96adbcb3b3e88a198c35a1ee9a731e147a6839c3
+  checksum: 10c0/6b4d846534e7bcb49a6160b068ffaed2b62570d989d909ac3f29df5ef1e993859f890a4242eebe023c9e923f96adbcb3b3e88a198c35a1ee9a731e147a6839c3
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"
-  checksum: dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3
+  checksum: 10c0/dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3
   languageName: node
   linkType: hard
 
 "type-fest@npm:^0.21.3":
   version: 0.21.3
   resolution: "type-fest@npm:0.21.3"
-  checksum: 902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8
+  checksum: 10c0/902bd57bfa30d51d4779b641c2bc403cdf1371fb9c91d3c058b0133694fcfdb817aef07a47f40faf79039eecbaa39ee9d3c532deff244f3a19ce68cea71a61e8
   languageName: node
   linkType: hard
 
 "type-fest@npm:^3.0.0":
   version: 3.13.1
   resolution: "type-fest@npm:3.13.1"
-  checksum: 547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629
+  checksum: 10c0/547d22186f73a8c04590b70dcf63baff390078c75ea8acd366bbd510fd0646e348bd1970e47ecf795b7cff0b41d26e9c475c1fedd6ef5c45c82075fbf916b629
   languageName: node
   linkType: hard
 
@@ -16294,74 +17123,79 @@ __metadata:
   dependencies:
     media-typer: "npm:0.3.0"
     mime-types: "npm:~2.1.24"
-  checksum: a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d
+  checksum: 10c0/a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-buffer@npm:1.0.0"
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: ebad66cdf00c96b1395dffc7873169cf09801fca5954507a484f41f253feb1388d815db297b0b3bb8ce7421eac6f7ff45e2ec68450a3d68408aa4ae02fcf3a6c
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/9e043eb38e1b4df4ddf9dde1aa64919ae8bb909571c1cc4490ba777d55d23a0c74c7d73afcdd29ec98616d91bb3ae0f705fad4421ea147e1daf9528200b562da
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-length@npm:1.0.0"
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 6696435d53ce0e704ff6760c57ccc35138aec5f87859e03eb2a3246336d546feae367952dbc918116f3f0dffbe669734e3cbd8960283c2fa79aac925db50d888
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/fcebeffb2436c9f355e91bd19e2368273b88c11d1acc0948a2a306792f1ab672bce4cfe524ab9f51a0505c9d7cd1c98eff4235c4f6bfef6a198f6cfc4ff3d4f3
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-offset@npm:1.0.0"
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.2"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 4036ce007ae9752931bed3dd61e0d6de2a3e5f6a5a85a05f3adb35388d2c0728f9b1a1e638d75579f168e49c289bfb5417f00e96d4ab081f38b647fc854ff7a5
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/d2628bc739732072e39269389a758025f75339de2ed40c4f91357023c5512d237f255b633e3106c461ced41907c1bf9a533c7e8578066b0163690ca8bc61b22f
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "typed-array-length@npm:1.0.4"
+"typed-array-length@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "typed-array-length@npm:1.0.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    is-typed-array: "npm:^1.1.9"
-  checksum: c5163c0103d07fefc8a2ad0fc151f9ca9a1f6422098c00f695d55f9896e4d63614cd62cf8d8a031c6cee5f418e8980a533796597174da4edff075b3d275a7e23
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10c0/5cc0f79196e70a92f8f40846cfa62b3de6be51e83f73655e137116cf65e3c29a288502b18cc8faf33c943c2470a4569009e1d6da338441649a2db2f135761ad5
   languageName: node
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
+  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
+  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
   languageName: node
   linkType: hard
 
@@ -16373,7 +17207,7 @@ __metadata:
     has-bigints: "npm:^1.0.2"
     has-symbols: "npm:^1.0.3"
     which-boxed-primitive: "npm:^1.0.2"
-  checksum: 81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66
+  checksum: 10c0/81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66
   languageName: node
   linkType: hard
 
@@ -16387,30 +17221,30 @@ __metadata:
     react-lifecycles-compat: "npm:^3.0.4"
   peerDependencies:
     react: ">=15.0.0"
-  checksum: 81473e892027a99f1ead6b9afd16db65097651cd36c4b6db710728f206f1fc4b82ba9170ecb4a1127a23857e01ba51c0194d0a7cfeecfea61ba9418e0276cb56
+  checksum: 10c0/81473e892027a99f1ead6b9afd16db65097651cd36c4b6db710728f206f1fc4b82ba9170ecb4a1127a23857e01ba51c0194d0a7cfeecfea61ba9418e0276cb56
   languageName: node
   linkType: hard
 
 "undici-types@npm:~5.26.4":
   version: 5.26.5
   resolution: "undici-types@npm:5.26.5"
-  checksum: bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
+  checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
   languageName: node
   linkType: hard
 
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
-  checksum: 0fe812641bcfa3ae433025178a64afb5d9afebc21a922dafa7cba971deebb5e4a37350423890750132a85c936c290fb988146d0b1bd86838ad4897f4fc5bd0de
+  checksum: 10c0/0fe812641bcfa3ae433025178a64afb5d9afebc21a922dafa7cba971deebb5e4a37350423890750132a85c936c290fb988146d0b1bd86838ad4897f4fc5bd0de
   languageName: node
   linkType: hard
 
-"unicode-emoji-utils@npm:^1.1.1":
+"unicode-emoji-utils@npm:^1.2.0":
   version: 1.2.0
   resolution: "unicode-emoji-utils@npm:1.2.0"
   dependencies:
     emoji-regex: "npm:10.3.0"
-  checksum: 224413cab5f915abbbbf3e6061878f3c1b67acf7c6ab1d4bf283f13d290677633d614a7fd58b7af8cec54dc3a4e4f51c01f4797caa23c7c83cdaa759fe6de9ce
+  checksum: 10c0/224413cab5f915abbbbf3e6061878f3c1b67acf7c6ab1d4bf283f13d290677633d614a7fd58b7af8cec54dc3a4e4f51c01f4797caa23c7c83cdaa759fe6de9ce
   languageName: node
   linkType: hard
 
@@ -16420,21 +17254,21 @@ __metadata:
   dependencies:
     unicode-canonical-property-names-ecmascript: "npm:^2.0.0"
     unicode-property-aliases-ecmascript: "npm:^2.0.0"
-  checksum: 4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec
+  checksum: 10c0/4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec
   languageName: node
   linkType: hard
 
 "unicode-match-property-value-ecmascript@npm:^2.1.0":
   version: 2.1.0
   resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
-  checksum: f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2
+  checksum: 10c0/f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2
   languageName: node
   linkType: hard
 
 "unicode-property-aliases-ecmascript@npm:^2.0.0":
   version: 2.1.0
   resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
-  checksum: 50ded3f8c963c7785e48c510a3b7c6bc4e08a579551489aa0349680a35b1ceceec122e33b2b6c1b579d0be2250f34bb163ac35f5f8695fe10bbc67fb757f0af8
+  checksum: 10c0/50ded3f8c963c7785e48c510a3b7c6bc4e08a579551489aa0349680a35b1ceceec122e33b2b6c1b579d0be2250f34bb163ac35f5f8695fe10bbc67fb757f0af8
   languageName: node
   linkType: hard
 
@@ -16446,7 +17280,7 @@ __metadata:
     get-value: "npm:^2.0.6"
     is-extendable: "npm:^0.1.1"
     set-value: "npm:^2.0.1"
-  checksum: 8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592
+  checksum: 10c0/8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592
   languageName: node
   linkType: hard
 
@@ -16455,7 +17289,7 @@ __metadata:
   resolution: "unique-filename@npm:1.1.1"
   dependencies:
     unique-slug: "npm:^2.0.0"
-  checksum: d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874
+  checksum: 10c0/d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874
   languageName: node
   linkType: hard
 
@@ -16464,7 +17298,7 @@ __metadata:
   resolution: "unique-filename@npm:3.0.0"
   dependencies:
     unique-slug: "npm:^4.0.0"
-  checksum: 6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
+  checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
   languageName: node
   linkType: hard
 
@@ -16473,7 +17307,7 @@ __metadata:
   resolution: "unique-slug@npm:2.0.2"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: 9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970
+  checksum: 10c0/9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970
   languageName: node
   linkType: hard
 
@@ -16482,7 +17316,7 @@ __metadata:
   resolution: "unique-slug@npm:4.0.0"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
+  checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
   languageName: node
   linkType: hard
 
@@ -16491,35 +17325,35 @@ __metadata:
   resolution: "unique-string@npm:2.0.0"
   dependencies:
     crypto-random-string: "npm:^2.0.0"
-  checksum: 11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b
+  checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b
   languageName: node
   linkType: hard
 
 "universalify@npm:^0.2.0":
   version: 0.2.0
   resolution: "universalify@npm:0.2.0"
-  checksum: cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
+  checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
   languageName: node
   linkType: hard
 
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
-  checksum: 07092b9f46df61b823d8ab5e57f0ee5120c178b39609a95e4a15a98c42f6b0b8e834e66fbb47ff92831786193be42f1fd36347169b88ce8639d0f9670af24a71
+  checksum: 10c0/07092b9f46df61b823d8ab5e57f0ee5120c178b39609a95e4a15a98c42f6b0b8e834e66fbb47ff92831786193be42f1fd36347169b88ce8639d0f9670af24a71
   languageName: node
   linkType: hard
 
 "unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
-  checksum: 193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
+  checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
   languageName: node
   linkType: hard
 
 "unquote@npm:~1.1.1":
   version: 1.1.1
   resolution: "unquote@npm:1.1.1"
-  checksum: de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859
+  checksum: 10c0/de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859
   languageName: node
   linkType: hard
 
@@ -16529,21 +17363,14 @@ __metadata:
   dependencies:
     has-value: "npm:^0.3.1"
     isobject: "npm:^3.0.0"
-  checksum: 68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f
-  languageName: node
-  linkType: hard
-
-"untildify@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "untildify@npm:4.0.0"
-  checksum: d758e624c707d49f76f7511d75d09a8eda7f2020d231ec52b67ff4896bcf7013be3f9522d8375f57e586e9a2e827f5641c7e06ee46ab9c435fc2b2b2e9de517a
+  checksum: 10c0/68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f
   languageName: node
   linkType: hard
 
 "upath@npm:^1.1.1, upath@npm:^1.2.0":
   version: 1.2.0
   resolution: "upath@npm:1.2.0"
-  checksum: 3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa
+  checksum: 10c0/3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa
   languageName: node
   linkType: hard
 
@@ -16557,7 +17384,7 @@ __metadata:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
+  checksum: 10c0/e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
   languageName: node
   linkType: hard
 
@@ -16566,14 +17393,14 @@ __metadata:
   resolution: "uri-js@npm:4.4.1"
   dependencies:
     punycode: "npm:^2.1.0"
-  checksum: 4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c
+  checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c
   languageName: node
   linkType: hard
 
 "urix@npm:^0.1.0":
   version: 0.1.0
   resolution: "urix@npm:0.1.0"
-  checksum: 264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0
+  checksum: 10c0/264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0
   languageName: node
   linkType: hard
 
@@ -16583,7 +17410,7 @@ __metadata:
   dependencies:
     querystringify: "npm:^2.1.1"
     requires-port: "npm:^1.0.0"
-  checksum: bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
+  checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
   languageName: node
   linkType: hard
 
@@ -16593,7 +17420,7 @@ __metadata:
   dependencies:
     punycode: "npm:^1.4.1"
     qs: "npm:^6.11.0"
-  checksum: 9e18c57b854d6a8e0288c4ddf21f9e30273a0ef2efb28a7e3e3d6eac392637dbdecce0d8f616586d58ff43154997150ecc2c9873e6c845d1e742e24c940b6e12
+  checksum: 10c0/9e18c57b854d6a8e0288c4ddf21f9e30273a0ef2efb28a7e3e3d6eac392637dbdecce0d8f616586d58ff43154997150ecc2c9873e6c845d1e742e24c940b6e12
   languageName: node
   linkType: hard
 
@@ -16602,7 +17429,7 @@ __metadata:
   resolution: "use-composed-ref@npm:1.3.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: e64ce52f4b18c020407636784192726807404a2552609acf7497b66a2b7070674fb5d2b950d426c4aa85f353e2bbecb02ebf9c5b865cd06797938c70bcbf5d26
+  checksum: 10c0/e64ce52f4b18c020407636784192726807404a2552609acf7497b66a2b7070674fb5d2b950d426c4aa85f353e2bbecb02ebf9c5b865cd06797938c70bcbf5d26
   languageName: node
   linkType: hard
 
@@ -16614,7 +17441,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: d8deea8b85e55ac6daba237a889630bfdbf0ebf60e9e22b6a78a78c26fabe6025e04ada7abef1e444e6786227d921e648b2707db8b3564daf757264a148a6e23
+  checksum: 10c0/d8deea8b85e55ac6daba237a889630bfdbf0ebf60e9e22b6a78a78c26fabe6025e04ada7abef1e444e6786227d921e648b2707db8b3564daf757264a148a6e23
   languageName: node
   linkType: hard
 
@@ -16628,7 +17455,16 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1958886fc35262d973f5cd4ce16acd6ce3a66707a72761c93abd1b5ae64e1a11efa83f68e6c8c9bf1647628037980ce59df64cba50adb36bd4071851e70527d2
+  checksum: 10c0/1958886fc35262d973f5cd4ce16acd6ce3a66707a72761c93abd1b5ae64e1a11efa83f68e6c8c9bf1647628037980ce59df64cba50adb36bd4071851e70527d2
+  languageName: node
+  linkType: hard
+
+"use-memo-one@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "use-memo-one@npm:1.1.3"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 10c0/3d596e65a6b47b2f1818061599738e00daad1f9a9bb4e5ce1f014b20a35b297e50fe4bf1d8c1699ab43ea97f01f84649a736c15ceff96de83bfa696925f6cc6b
   languageName: node
   linkType: hard
 
@@ -16637,31 +17473,31 @@ __metadata:
   resolution: "use-sync-external-store@npm:1.2.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02
+  checksum: 10c0/ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02
   languageName: node
   linkType: hard
 
 "use@npm:^3.1.0":
   version: 3.1.1
   resolution: "use@npm:3.1.1"
-  checksum: 75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e
+  checksum: 10c0/75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e
   languageName: node
   linkType: hard
 
 "utf-8-validate@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "utf-8-validate@npm:6.0.3"
+  version: 6.0.4
+  resolution: "utf-8-validate@npm:6.0.4"
   dependencies:
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.3.0"
-  checksum: 2ca08b07f4070540b33ff15f3f0632fa30baaee8a766fff993be47b4829b4fb30fd36fdf1270336324d03f65e0936c4608ee719d862230d75311751dcfe27a83
+  checksum: 10c0/f7042d94aec6ca02461b64e725bdc7262266610dbb787331e5bbd49374ef6f75fe9900600df3fc63d97906c23614a965c8989b4bf95d70bf35dc617da99215e7
   languageName: node
   linkType: hard
 
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
-  checksum: 41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942
+  checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942
   languageName: node
   linkType: hard
 
@@ -16673,7 +17509,7 @@ __metadata:
     es-abstract: "npm:^1.17.2"
     has-symbols: "npm:^1.0.1"
     object.getownpropertydescriptors: "npm:^2.1.0"
-  checksum: d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27
+  checksum: 10c0/d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27
   languageName: node
   linkType: hard
 
@@ -16682,7 +17518,7 @@ __metadata:
   resolution: "util@npm:0.10.3"
   dependencies:
     inherits: "npm:2.0.1"
-  checksum: 88bb58fec3b1f5f43dea27795f61f24b3b505bbba6f3ad6e91b32db0cd0928b2acb54ebe21603a75743c6e21a52f954cd2ffb6cddafed5a01169dd1287db3ff3
+  checksum: 10c0/88bb58fec3b1f5f43dea27795f61f24b3b505bbba6f3ad6e91b32db0cd0928b2acb54ebe21603a75743c6e21a52f954cd2ffb6cddafed5a01169dd1287db3ff3
   languageName: node
   linkType: hard
 
@@ -16691,14 +17527,14 @@ __metadata:
   resolution: "util@npm:0.11.1"
   dependencies:
     inherits: "npm:2.0.3"
-  checksum: 8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6
+  checksum: 10c0/8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6
   languageName: node
   linkType: hard
 
 "utils-merge@npm:1.0.1":
   version: 1.0.1
   resolution: "utils-merge@npm:1.0.1"
-  checksum: 02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672
+  checksum: 10c0/02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672
   languageName: node
   linkType: hard
 
@@ -16707,7 +17543,7 @@ __metadata:
   resolution: "uuid@npm:3.4.0"
   bin:
     uuid: ./bin/uuid
-  checksum: 1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
+  checksum: 10c0/1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
   languageName: node
   linkType: hard
 
@@ -16716,7 +17552,7 @@ __metadata:
   resolution: "uuid@npm:8.3.2"
   bin:
     uuid: dist/bin/uuid
-  checksum: bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
+  checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
   languageName: node
   linkType: hard
 
@@ -16725,14 +17561,14 @@ __metadata:
   resolution: "uuid@npm:9.0.1"
   bin:
     uuid: dist/bin/uuid
-  checksum: 1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
+  checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b
   languageName: node
   linkType: hard
 
 "v8-compile-cache@npm:^2.1.1":
   version: 2.3.0
   resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688
+  checksum: 10c0/b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688
   languageName: node
   linkType: hard
 
@@ -16743,28 +17579,28 @@ __metadata:
     "@jridgewell/trace-mapping": "npm:^0.3.12"
     "@types/istanbul-lib-coverage": "npm:^2.0.1"
     convert-source-map: "npm:^1.6.0"
-  checksum: 657ef7c52a514c1a0769663f96dd6f2cd11d2d3f6c8272d1035f4a543dca0b52c84b005beb7f0ca215eb98425c8bc4aa92a62826b1fc76abc1f7228d33ccbc60
+  checksum: 10c0/657ef7c52a514c1a0769663f96dd6f2cd11d2d3f6c8272d1035f4a543dca0b52c84b005beb7f0ca215eb98425c8bc4aa92a62826b1fc76abc1f7228d33ccbc60
   languageName: node
   linkType: hard
 
 "value-equal@npm:^1.0.1":
   version: 1.0.1
   resolution: "value-equal@npm:1.0.1"
-  checksum: 79068098355483ef29f4d3753999ad880875b87625d7e9055cad9346ea4b7662aad3a66f87976801b0dd7a6f828ba973d28b1669ebcd37eaf88cc5f687c1a691
+  checksum: 10c0/79068098355483ef29f4d3753999ad880875b87625d7e9055cad9346ea4b7662aad3a66f87976801b0dd7a6f828ba973d28b1669ebcd37eaf88cc5f687c1a691
   languageName: node
   linkType: hard
 
 "vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
-  checksum: f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f
+  checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f
   languageName: node
   linkType: hard
 
 "vm-browserify@npm:^1.0.1":
   version: 1.1.2
   resolution: "vm-browserify@npm:1.1.2"
-  checksum: 0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b
+  checksum: 10c0/0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b
   languageName: node
   linkType: hard
 
@@ -16773,7 +17609,7 @@ __metadata:
   resolution: "w3c-xmlserializer@npm:4.0.0"
   dependencies:
     xml-name-validator: "npm:^4.0.0"
-  checksum: 02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8
+  checksum: 10c0/02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8
   languageName: node
   linkType: hard
 
@@ -16782,7 +17618,7 @@ __metadata:
   resolution: "w3c-xmlserializer@npm:5.0.0"
   dependencies:
     xml-name-validator: "npm:^5.0.0"
-  checksum: 8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b
+  checksum: 10c0/8712774c1aeb62dec22928bf1cdfd11426c2c9383a1a63f2bcae18db87ca574165a0fbe96b312b73652149167ac6c7f4cf5409f2eb101d9c805efe0e4bae798b
   languageName: node
   linkType: hard
 
@@ -16791,7 +17627,7 @@ __metadata:
   resolution: "walker@npm:1.0.8"
   dependencies:
     makeerror: "npm:1.0.12"
-  checksum: a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
+  checksum: 10c0/a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
   languageName: node
   linkType: hard
 
@@ -16800,7 +17636,7 @@ __metadata:
   resolution: "warning@npm:3.0.0"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: 6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705
+  checksum: 10c0/6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705
   languageName: node
   linkType: hard
 
@@ -16809,7 +17645,7 @@ __metadata:
   resolution: "warning@npm:4.0.3"
   dependencies:
     loose-envify: "npm:^1.0.0"
-  checksum: aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
+  checksum: 10c0/aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
   languageName: node
   linkType: hard
 
@@ -16818,7 +17654,7 @@ __metadata:
   resolution: "watchpack-chokidar2@npm:2.0.1"
   dependencies:
     chokidar: "npm:^2.1.8"
-  checksum: 9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372
+  checksum: 10c0/9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372
   languageName: node
   linkType: hard
 
@@ -16835,7 +17671,7 @@ __metadata:
       optional: true
     watchpack-chokidar2:
       optional: true
-  checksum: 53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86
+  checksum: 10c0/53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86
   languageName: node
   linkType: hard
 
@@ -16844,28 +17680,28 @@ __metadata:
   resolution: "wbuf@npm:1.7.3"
   dependencies:
     minimalistic-assert: "npm:^1.0.0"
-  checksum: 56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7
+  checksum: 10c0/56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
-  checksum: 5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db
+  checksum: 10c0/5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^4.0.2":
   version: 4.0.2
   resolution: "webidl-conversions@npm:4.0.2"
-  checksum: def5c5ac3479286dffcb604547628b2e6b46c5c5b8a8cfaa8c71dc3bafc85859bde5fbe89467ff861f571ab38987cf6ab3d6e7c80b39b999e50e803c12f3164f
+  checksum: 10c0/def5c5ac3479286dffcb604547628b2e6b46c5c5b8a8cfaa8c71dc3bafc85859bde5fbe89467ff861f571ab38987cf6ab3d6e7c80b39b999e50e803c12f3164f
   languageName: node
   linkType: hard
 
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
-  checksum: 228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
+  checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
   languageName: node
   linkType: hard
 
@@ -16884,13 +17720,13 @@ __metadata:
     webpack-sources: "npm:^1.0"
   peerDependencies:
     webpack: ^4.40.0
-  checksum: 718493ccf05b48e95fdef2abc2b9770d88abcc161b3e683fd7004493038947dac3a91cad7632bca4199ee5832e425fee6d49c8d0b72339ccf0c7ee3b9f9bf1dc
+  checksum: 10c0/718493ccf05b48e95fdef2abc2b9770d88abcc161b3e683fd7004493038947dac3a91cad7632bca4199ee5832e425fee6d49c8d0b72339ccf0c7ee3b9f9bf1dc
   languageName: node
   linkType: hard
 
 "webpack-bundle-analyzer@npm:^4.8.0":
-  version: 4.10.1
-  resolution: "webpack-bundle-analyzer@npm:4.10.1"
+  version: 4.10.2
+  resolution: "webpack-bundle-analyzer@npm:4.10.2"
   dependencies:
     "@discoveryjs/json-ext": "npm:0.5.7"
     acorn: "npm:^8.0.4"
@@ -16900,14 +17736,13 @@ __metadata:
     escape-string-regexp: "npm:^4.0.0"
     gzip-size: "npm:^6.0.0"
     html-escaper: "npm:^2.0.2"
-    is-plain-object: "npm:^5.0.0"
     opener: "npm:^1.5.2"
     picocolors: "npm:^1.0.0"
     sirv: "npm:^2.0.3"
     ws: "npm:^7.3.1"
   bin:
     webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: 6a94c8f6aa03296fb2eb00d6ad3b27bd5c551590fd253772bc61debf3177414d42701014079d4f85c74ba1ca685ae9f0cb4063812b58c21f294d108e9908e5cd
+  checksum: 10c0/00603040e244ead15b2d92981f0559fa14216381349412a30070a7358eb3994cd61a8221d34a3b3fb8202dc3d1c5ee1fbbe94c5c52da536e5b410aa1cf279a48
   languageName: node
   linkType: hard
 
@@ -16930,7 +17765,7 @@ __metadata:
     webpack: 4.x.x
   bin:
     webpack-cli: bin/cli.js
-  checksum: d0bb486651af5c438983d82904f6d4d187dfa83d480b493cd0b231d653d2a40aaf48c6bae3620f5d8ad520c08870b8553363e7579cfd7c8c2f7b3a279c454698
+  checksum: 10c0/d0bb486651af5c438983d82904f6d4d187dfa83d480b493cd0b231d653d2a40aaf48c6bae3620f5d8ad520c08870b8553363e7579cfd7c8c2f7b3a279c454698
   languageName: node
   linkType: hard
 
@@ -16945,7 +17780,7 @@ __metadata:
     webpack-log: "npm:^2.0.0"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085
+  checksum: 10c0/f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085
   languageName: node
   linkType: hard
 
@@ -16993,7 +17828,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: 90fe960dc28cc75b501b1fa4ad3eba358a98dbb929658725e74db12326afaf165b6bd54f0cad0381b9771f6c47c92dba573d615b491ceeec4875ffe49143a38a
+  checksum: 10c0/90fe960dc28cc75b501b1fa4ad3eba358a98dbb929658725e74db12326afaf165b6bd54f0cad0381b9771f6c47c92dba573d615b491ceeec4875ffe49143a38a
   languageName: node
   linkType: hard
 
@@ -17003,7 +17838,7 @@ __metadata:
   dependencies:
     ansi-colors: "npm:^3.0.0"
     uuid: "npm:^3.3.2"
-  checksum: 515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60
+  checksum: 10c0/515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60
   languageName: node
   linkType: hard
 
@@ -17014,7 +17849,7 @@ __metadata:
     clone-deep: "npm:^4.0.1"
     flat: "npm:^5.0.2"
     wildcard: "npm:^2.0.0"
-  checksum: b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
+  checksum: 10c0/b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
   languageName: node
   linkType: hard
 
@@ -17024,7 +17859,7 @@ __metadata:
   dependencies:
     source-list-map: "npm:^2.0.0"
     source-map: "npm:~0.6.1"
-  checksum: 78dafb3e1e297d3f4eb6204311e8c64d28cd028f82887ba33aaf03fffc82482d8e1fdf6de25a60f4dde621d3565f4c3b1bfb350f09add8f4e54e00279ff3db5e
+  checksum: 10c0/78dafb3e1e297d3f4eb6204311e8c64d28cd028f82887ba33aaf03fffc82482d8e1fdf6de25a60f4dde621d3565f4c3b1bfb350f09add8f4e54e00279ff3db5e
   languageName: node
   linkType: hard
 
@@ -17062,7 +17897,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: bc90202110a341359c11ead60ea09bd5cfa51e2c93004d7e40b7c2f76208cc6717e39c9d9544825cc44958046ada762c78a8cf9848619ea450315bce98228701
+  checksum: 10c0/bc90202110a341359c11ead60ea09bd5cfa51e2c93004d7e40b7c2f76208cc6717e39c9d9544825cc44958046ada762c78a8cf9848619ea450315bce98228701
   languageName: node
   linkType: hard
 
@@ -17073,14 +17908,14 @@ __metadata:
     http-parser-js: "npm:>=0.5.1"
     safe-buffer: "npm:>=5.1.0"
     websocket-extensions: "npm:>=0.1.1"
-  checksum: 5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
+  checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
   languageName: node
   linkType: hard
 
 "websocket-extensions@npm:>=0.1.1":
   version: 0.1.4
   resolution: "websocket-extensions@npm:0.1.4"
-  checksum: bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0
+  checksum: 10c0/bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0
   languageName: node
   linkType: hard
 
@@ -17089,7 +17924,7 @@ __metadata:
   resolution: "whatwg-encoding@npm:2.0.0"
   dependencies:
     iconv-lite: "npm:0.6.3"
-  checksum: 91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e
+  checksum: 10c0/91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e
   languageName: node
   linkType: hard
 
@@ -17098,21 +17933,21 @@ __metadata:
   resolution: "whatwg-encoding@npm:3.1.1"
   dependencies:
     iconv-lite: "npm:0.6.3"
-  checksum: 273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e
+  checksum: 10c0/273b5f441c2f7fda3368a496c3009edbaa5e43b71b09728f90425e7f487e5cef9eb2b846a31bd760dd8077739c26faf6b5ca43a5f24033172b003b72cf61a93e
   languageName: node
   linkType: hard
 
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
-  checksum: 323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f
+  checksum: 10c0/323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f
   languageName: node
   linkType: hard
 
 "whatwg-mimetype@npm:^4.0.0":
   version: 4.0.0
   resolution: "whatwg-mimetype@npm:4.0.0"
-  checksum: a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
+  checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
   languageName: node
   linkType: hard
 
@@ -17122,7 +17957,7 @@ __metadata:
   dependencies:
     tr46: "npm:^3.0.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: f7ec264976d7c725e0696fcaf9ebe056e14422eacbf92fdbb4462034609cba7d0c85ffa1aab05e9309d42969bcf04632ba5ed3f3882c516d7b093053315bf4c1
+  checksum: 10c0/f7ec264976d7c725e0696fcaf9ebe056e14422eacbf92fdbb4462034609cba7d0c85ffa1aab05e9309d42969bcf04632ba5ed3f3882c516d7b093053315bf4c1
   languageName: node
   linkType: hard
 
@@ -17132,7 +17967,7 @@ __metadata:
   dependencies:
     tr46: "npm:^5.0.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9
+  checksum: 10c0/ac32e9ba9d08744605519bbe9e1371174d36229689ecc099157b6ba102d4251a95e81d81f3d80271eb8da182eccfa65653f07f0ab43ea66a6934e643fd091ba9
   languageName: node
   linkType: hard
 
@@ -17142,7 +17977,7 @@ __metadata:
   dependencies:
     tr46: "npm:~0.0.3"
     webidl-conversions: "npm:^3.0.0"
-  checksum: 1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5
+  checksum: 10c0/1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5
   languageName: node
   linkType: hard
 
@@ -17153,7 +17988,7 @@ __metadata:
     lodash.sortby: "npm:^4.7.0"
     tr46: "npm:^1.0.1"
     webidl-conversions: "npm:^4.0.2"
-  checksum: 2785fe4647690e5a0225a79509ba5e21fdf4a71f9de3eabdba1192483fe006fc79961198e0b99f82751557309f17fc5a07d4d83c251aa5b2f85ba71e674cbee9
+  checksum: 10c0/2785fe4647690e5a0225a79509ba5e21fdf4a71f9de3eabdba1192483fe006fc79961198e0b99f82751557309f17fc5a07d4d83c251aa5b2f85ba71e674cbee9
   languageName: node
   linkType: hard
 
@@ -17166,7 +18001,7 @@ __metadata:
     is-number-object: "npm:^1.0.4"
     is-string: "npm:^1.0.5"
     is-symbol: "npm:^1.0.3"
-  checksum: 0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e
+  checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e
   languageName: node
   linkType: hard
 
@@ -17186,7 +18021,7 @@ __metadata:
     which-boxed-primitive: "npm:^1.0.2"
     which-collection: "npm:^1.0.1"
     which-typed-array: "npm:^1.1.9"
-  checksum: 2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4
+  checksum: 10c0/2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4
   languageName: node
   linkType: hard
 
@@ -17198,27 +18033,27 @@ __metadata:
     is-set: "npm:^2.0.1"
     is-weakmap: "npm:^2.0.1"
     is-weakset: "npm:^2.0.1"
-  checksum: 249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d
+  checksum: 10c0/249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d
   languageName: node
   linkType: hard
 
 "which-module@npm:^2.0.0":
   version: 2.0.1
   resolution: "which-module@npm:2.0.1"
-  checksum: 087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e
+  checksum: 10c0/087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.9":
-  version: 1.1.13
-  resolution: "which-typed-array@npm:1.1.13"
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.9":
+  version: 1.1.14
+  resolution: "which-typed-array@npm:1.1.14"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.4"
+    available-typed-arrays: "npm:^1.0.6"
+    call-bind: "npm:^1.0.5"
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 9f5f1c42918df3d5b91c4315ed0051d5d874370998bf095c9ae0df374f0881f85094e3c384b8fb08ab7b4d4f54ba81c0aff75da6226e7c0589b83dfbec1cd4c9
+    has-tostringtag: "npm:^1.0.1"
+  checksum: 10c0/0960f1e77807058819451b98c51d4cd72031593e8de990b24bd3fc22e176f5eee22921d68d852297c786aec117689f0423ed20aa4fde7ce2704d680677891f56
   languageName: node
   linkType: hard
 
@@ -17229,7 +18064,7 @@ __metadata:
     isexe: "npm:^2.0.0"
   bin:
     which: ./bin/which
-  checksum: e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59
+  checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59
   languageName: node
   linkType: hard
 
@@ -17240,7 +18075,7 @@ __metadata:
     isexe: "npm:^2.0.0"
   bin:
     node-which: ./bin/node-which
-  checksum: 66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
+  checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
   languageName: node
   linkType: hard
 
@@ -17251,63 +18086,55 @@ __metadata:
     isexe: "npm:^3.1.1"
   bin:
     node-which: bin/which.js
-  checksum: 449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
+  checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
   languageName: node
   linkType: hard
 
 "wicg-inert@npm:^3.1.2":
   version: 3.1.2
   resolution: "wicg-inert@npm:3.1.2"
-  checksum: 5b20eaedcb30f1093fb6afd0480a059e40814da56c6052469c6fe95dd2d288b89c55ed1bdbfae4db70fd5ec8148dda8dd3b671a27a26870c8f77626b13cedd1b
-  languageName: node
-  linkType: hard
-
-"wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: 1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95
+  checksum: 10c0/5b20eaedcb30f1093fb6afd0480a059e40814da56c6052469c6fe95dd2d288b89c55ed1bdbfae4db70fd5ec8148dda8dd3b671a27a26870c8f77626b13cedd1b
   languageName: node
   linkType: hard
 
 "wildcard@npm:^2.0.0":
   version: 2.0.1
   resolution: "wildcard@npm:2.0.1"
-  checksum: 08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7
+  checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7
   languageName: node
   linkType: hard
 
-"workbox-background-sync@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-background-sync@npm:7.0.0"
+"workbox-background-sync@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-background-sync@npm:7.1.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.0.0"
-  checksum: 91eb064c608cfb4cf7aa4f062215d8217a99b93d67c4ae571e5abdda1b020c5ab45c7bddab99cb77d334aae8d259f0fe91b7c42ee6e7ad10db32b4a971991489
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/9538c49a377d8eb06acee3848fbca09bac1940a2ca9e904fed765c39aa32f77c20d72c3ba6fa1eb47bee81289b1d527556a1cd3e02728960a4c40400ce6d0e91
   languageName: node
   linkType: hard
 
-"workbox-broadcast-update@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-broadcast-update@npm:7.0.0"
+"workbox-broadcast-update@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-broadcast-update@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 3c3a6e1e72c19d2971d187297b99b242f304b1ec442f6f1ec84ea9c6e125dc01cd626d51e6ecf1c8d89226e6a286dccaa9f950bd5ef6183518af10ba0f4f524e
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/4a6e201cedcbc11b9d2f63f63477ba4564a35ce07bd54640198db6ff6a3b8347a65e0b4973c8f8463e8a622fd1ad93d7b3bab42338608811d23c7db01fef475e
   languageName: node
   linkType: hard
 
-"workbox-build@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-build@npm:7.0.0"
+"workbox-build@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-build@npm:7.1.0"
   dependencies:
     "@apideck/better-ajv-errors": "npm:^0.3.1"
-    "@babel/core": "npm:^7.11.1"
+    "@babel/core": "npm:^7.24.4"
     "@babel/preset-env": "npm:^7.11.0"
     "@babel/runtime": "npm:^7.11.2"
     "@rollup/plugin-babel": "npm:^5.2.0"
-    "@rollup/plugin-node-resolve": "npm:^11.2.1"
+    "@rollup/plugin-node-resolve": "npm:^15.2.3"
     "@rollup/plugin-replace": "npm:^2.4.1"
+    "@rollup/plugin-terser": "npm:^0.4.3"
     "@surma/rollup-plugin-off-main-thread": "npm:^2.2.3"
     ajv: "npm:^8.6.0"
     common-tags: "npm:^1.8.0"
@@ -17317,169 +18144,168 @@ __metadata:
     lodash: "npm:^4.17.20"
     pretty-bytes: "npm:^5.3.0"
     rollup: "npm:^2.43.1"
-    rollup-plugin-terser: "npm:^7.0.0"
     source-map: "npm:^0.8.0-beta.0"
     stringify-object: "npm:^3.3.0"
     strip-comments: "npm:^2.0.1"
     tempy: "npm:^0.6.0"
     upath: "npm:^1.2.0"
-    workbox-background-sync: "npm:7.0.0"
-    workbox-broadcast-update: "npm:7.0.0"
-    workbox-cacheable-response: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-expiration: "npm:7.0.0"
-    workbox-google-analytics: "npm:7.0.0"
-    workbox-navigation-preload: "npm:7.0.0"
-    workbox-precaching: "npm:7.0.0"
-    workbox-range-requests: "npm:7.0.0"
-    workbox-recipes: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-    workbox-streams: "npm:7.0.0"
-    workbox-sw: "npm:7.0.0"
-    workbox-window: "npm:7.0.0"
-  checksum: a090aeee836f59d42ca9eda8b82aa5a0ee8f4ce3f3095b6fcbe157a9a154c492e4ba86b5c4d6aa50ef7c37ea1c38c965442b56d1404911fd0351d0fc9a859a3c
+    workbox-background-sync: "npm:7.1.0"
+    workbox-broadcast-update: "npm:7.1.0"
+    workbox-cacheable-response: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-expiration: "npm:7.1.0"
+    workbox-google-analytics: "npm:7.1.0"
+    workbox-navigation-preload: "npm:7.1.0"
+    workbox-precaching: "npm:7.1.0"
+    workbox-range-requests: "npm:7.1.0"
+    workbox-recipes: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+    workbox-streams: "npm:7.1.0"
+    workbox-sw: "npm:7.1.0"
+    workbox-window: "npm:7.1.0"
+  checksum: 10c0/c482fde713bad582bd7d4861113d7367ab4722eba9c102864c71048815792c623e9117a8f79957e0388d0c08e8303962d1fb23931456da73909e87d06638d101
   languageName: node
   linkType: hard
 
-"workbox-cacheable-response@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-cacheable-response@npm:7.0.0"
+"workbox-cacheable-response@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-cacheable-response@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: ddf123b3461070e215af51d88c672f3302b540b93ecf61ad5f3853f0a997194973eedb2c9ed21e849b7419f68804ef8a8d876dced3836a7eb2c697099e3d408f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/52ea73bb184c9ef9280cc8f00a1ab7d103d495e12a7a6378fae02fd0aa1a9b893aac5d8074f14ed8c198527123e4401f4703fbfd2be98e184ca783b9216cb4c5
   languageName: node
   linkType: hard
 
-"workbox-core@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-core@npm:7.0.0"
-  checksum: aaaf7b66978456bf5d6a90b1068b5acd82bf451f4a23c5a416201524b50ea4e0bc62a01365499bc088b4c18cddc513fdebbe8b048ab15aff960fe7cbbf55d5bd
+"workbox-core@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-core@npm:7.1.0"
+  checksum: 10c0/fb0b6e23a52e085da00b7a74b1f1854f06c695eb2bd4c244aa335165f59156a4febb4f116b9893b9fb7e0e8bac092d32eecceb4d00f930a93f64737cb2be9531
   languageName: node
   linkType: hard
 
-"workbox-expiration@npm:7.0.0, workbox-expiration@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-expiration@npm:7.0.0"
+"workbox-expiration@npm:7.1.0, workbox-expiration@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-expiration@npm:7.1.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.0.0"
-  checksum: 990a6c2c9b177d796c012b0112913621e41b283e2736d83acb58cb9645591ddc7a6aef585145c5686f9b071d73ce12b4b1887765754624322545b0f4125d649f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/669d76f87c1550ce9b425232c3202a26fdea4c4c9bdc1b71c1cee741a5d011423098994452e508576174d3c0b4bec0f4b35012b6d7257e300684c87fdddb7949
   languageName: node
   linkType: hard
 
-"workbox-google-analytics@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-google-analytics@npm:7.0.0"
+"workbox-google-analytics@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-google-analytics@npm:7.1.0"
   dependencies:
-    workbox-background-sync: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: 7656ab4bff15fbcbc7f546d86628ccbc74736a99139ec70a166c465fc4ff59656aecd44cc0aef45b4690fd88a4980d6c9f27ce8c6606fd12d026162259a8069d
+    workbox-background-sync: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/4178d94fb7f3f7b789f117c104b2ff33945256dc550418b0e9c81130c1e2c2bcd72ec6a1661d91326c04de360e6592edd505f0e2142e8e1043fe0c45f9c1a3fe
   languageName: node
   linkType: hard
 
-"workbox-navigation-preload@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-navigation-preload@npm:7.0.0"
+"workbox-navigation-preload@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-navigation-preload@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: f29ac8364c7f7f392daa1f886134adc780057199b218ab6c6eef298841b8825d6cbc4bc88e655299929bdf14c700edfb9f217ca5c0b46094627247528f655011
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/b667a3ba0cae4d43a53a6e211f0f33f6ebc1d9fec6cbb93de83f72a37b81cc39d887b969db9b1cd5c396a1ce34636c89c3b157cc64a5265635d0b274e362db0e
   languageName: node
   linkType: hard
 
-"workbox-precaching@npm:7.0.0, workbox-precaching@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-precaching@npm:7.0.0"
+"workbox-precaching@npm:7.1.0, workbox-precaching@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-precaching@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: 1b47cb151bb6ec7442b2dc8981203feff22527a4383510f2399730338b620ef0d03076bd3dbc1eb9a05272d5d6f4803fb4262f320bf5645f0818981e91077f39
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/53b2d0a658109b4d83ee2b1913f884ee1c757a12b8931a7102272bd1e228d29f9430e7d060f328f465bca2aa24bf0719d026eef4f4d21395fa1f678f8d6a3c06
   languageName: node
   linkType: hard
 
-"workbox-range-requests@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-range-requests@npm:7.0.0"
+"workbox-range-requests@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-range-requests@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 909f0ed7a176e5dc55692792825e67b577dacf1015a3f3775389fcec34ff5b3441b15595109455fe226f0bc4dce4789a7c86e5e9c5963c13b4d6482f6d01d44f
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/bf4aa597d04cbb533796af64f4006a1f472f8a14ea91f96fe37b2d5e63ffe86dcb944dab9a41317e69d368d83bee20f03ff32b339ae5addef50f325703ad4b77
   languageName: node
   linkType: hard
 
-"workbox-recipes@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-recipes@npm:7.0.0"
+"workbox-recipes@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-recipes@npm:7.1.0"
   dependencies:
-    workbox-cacheable-response: "npm:7.0.0"
-    workbox-core: "npm:7.0.0"
-    workbox-expiration: "npm:7.0.0"
-    workbox-precaching: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-    workbox-strategies: "npm:7.0.0"
-  checksum: c024141f24b0778355bdfbfe2b4a24a3f74e279f6f7541635758533e79318e15986f9f556a899c97717a9c25a1738d9e112d17dd36aa19cebf901462ebeeb8e4
+    workbox-cacheable-response: "npm:7.1.0"
+    workbox-core: "npm:7.1.0"
+    workbox-expiration: "npm:7.1.0"
+    workbox-precaching: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+    workbox-strategies: "npm:7.1.0"
+  checksum: 10c0/5a8c2444f6338c6092be87cc6fd69c8b0cbb413bfc0a11a8f10961bfb2b8059359c4be0264ffa0c01deff3ab5dba15bbcf61d4dedbc93d8bfe1f8a2841b1657c
   languageName: node
   linkType: hard
 
-"workbox-routing@npm:7.0.0, workbox-routing@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-routing@npm:7.0.0"
+"workbox-routing@npm:7.1.0, workbox-routing@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-routing@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 74ad651a0643506cfd3ca51eee754f5fe34e3f1460e6b772ed213e0422028cf002d70f91da32d13261bc5ee2160527ffb5436ac209fdbe8d0e7071784aa65190
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/efd630fff594bd50276770840bce274660972587e79c097a9f1a84e8347351736aac13f11c6d7655ff550b13195d370d5c3b81a075bf452f358fc144ee868ad9
   languageName: node
   linkType: hard
 
-"workbox-strategies@npm:7.0.0, workbox-strategies@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-strategies@npm:7.0.0"
+"workbox-strategies@npm:7.1.0, workbox-strategies@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-strategies@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-  checksum: 4fe122b80e547b347bedf187aeb2c2eb34efc3fbde2733b7709530cccb6b6e03b29adcbccecf301e4fcaad0d5cd4a74e1e704f769d949c32439dca358130a613
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/b08712a69b1b13e354345cc228c29f0c759043f7ca7cf6ce9b82fe79c9d423142bfa4a118f91f1a57054047a730127fa4474d59d9306fb2ed42fe9ef568be01a
   languageName: node
   linkType: hard
 
-"workbox-streams@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-streams@npm:7.0.0"
+"workbox-streams@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-streams@npm:7.1.0"
   dependencies:
-    workbox-core: "npm:7.0.0"
-    workbox-routing: "npm:7.0.0"
-  checksum: 9a1a9b8200f5b315523ac49c61a9b88791009377bbdedd44cf19c4b2258e710bd2fbc6f74ef53b72db7849da7ce9965ced5983f167785ccfc7efa1df761e3371
+    workbox-core: "npm:7.1.0"
+    workbox-routing: "npm:7.1.0"
+  checksum: 10c0/1d75c046fcb7b25e1cf85457e3610309dd5513f68752ef333529fcf155df2114b72f3d6f416bb68393e51b5396e3f6df7171e8e2889d0e9e1805e315754b771e
   languageName: node
   linkType: hard
 
-"workbox-sw@npm:7.0.0":
-  version: 7.0.0
-  resolution: "workbox-sw@npm:7.0.0"
-  checksum: 06d9713398ca92d8b2cad70a7d302825ec7650e05e2e0c8e68f453442fdf9a9227350c856484f7b649df6cb429cc03a103f8ecd9596e83bfa52e845bf25ffbcd
+"workbox-sw@npm:7.1.0":
+  version: 7.1.0
+  resolution: "workbox-sw@npm:7.1.0"
+  checksum: 10c0/2084f1b58c8509d7ca53ce8a13d93e57d1f13307e0279fedc87942e83c8cb96bc2e5ed3992a89af6245ad2a66897a92908cb60d0717fb90492056eb6fbf20dc6
   languageName: node
   linkType: hard
 
 "workbox-webpack-plugin@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-webpack-plugin@npm:7.0.0"
+  version: 7.1.0
+  resolution: "workbox-webpack-plugin@npm:7.1.0"
   dependencies:
     fast-json-stable-stringify: "npm:^2.1.0"
     pretty-bytes: "npm:^5.4.1"
     upath: "npm:^1.2.0"
     webpack-sources: "npm:^1.4.3"
-    workbox-build: "npm:7.0.0"
+    workbox-build: "npm:7.1.0"
   peerDependencies:
-    webpack: ^4.4.0 || ^5.9.0
-  checksum: 3d585842bb6f801db5571e4d3e5c1d7c141f91d9ba2ed0c36b617d86a00b37bdefc055e6cc981c557f21f878ff4a9cf8b82e4b0b31084ddf4d9d149673ce8882
+    webpack: ^4.4.0 || ^5.91.0
+  checksum: 10c0/516fa68a6a6958ee1560299dd1146032dda68474a2ab01643cbde78fc65b75a3157aef60cb45dcc1984cc458ce44d4e3090cda08dd7cefd0952351270e963a00
   languageName: node
   linkType: hard
 
-"workbox-window@npm:7.0.0, workbox-window@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "workbox-window@npm:7.0.0"
+"workbox-window@npm:7.1.0, workbox-window@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "workbox-window@npm:7.1.0"
   dependencies:
     "@types/trusted-types": "npm:^2.0.2"
-    workbox-core: "npm:7.0.0"
-  checksum: 8070fb80734a8543248ed6e3b186b8d3ee64419400a6d6d75f78809c44bf16321c5d9739bdf60ee62f631461ebb67a8a7dd78192504678d00bf2a9d3683f1324
+    workbox-core: "npm:7.1.0"
+  checksum: 10c0/c989a6e3a0488f049eead3892f8249387604fb04898aa79d0cf14cd7b684f0758f1edf1996745f4755bd30c31c449f628803e507d39b2ea91cc9c36f7d5e9c72
   languageName: node
   linkType: hard
 
@@ -17490,7 +18316,7 @@ __metadata:
     ansi-styles: "npm:^4.0.0"
     string-width: "npm:^4.1.0"
     strip-ansi: "npm:^6.0.0"
-  checksum: d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da
+  checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da
   languageName: node
   linkType: hard
 
@@ -17501,7 +18327,7 @@ __metadata:
     ansi-styles: "npm:^3.2.0"
     string-width: "npm:^3.0.0"
     strip-ansi: "npm:^5.0.0"
-  checksum: fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb
+  checksum: 10c0/fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb
   languageName: node
   linkType: hard
 
@@ -17512,7 +18338,7 @@ __metadata:
     ansi-styles: "npm:^6.1.0"
     string-width: "npm:^5.0.1"
     strip-ansi: "npm:^7.0.1"
-  checksum: 138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60
+  checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60
   languageName: node
   linkType: hard
 
@@ -17523,14 +18349,14 @@ __metadata:
     ansi-styles: "npm:^6.2.1"
     string-width: "npm:^7.0.0"
     strip-ansi: "npm:^7.1.0"
-  checksum: a139b818da9573677548dd463bd626a5a5286271211eb6e4e82f34a4f643191d74e6d4a9bb0a3c26ec90e6f904f679e0569674ac099ea12378a8b98e20706066
+  checksum: 10c0/a139b818da9573677548dd463bd626a5a5286271211eb6e4e82f34a4f643191d74e6d4a9bb0a3c26ec90e6f904f679e0569674ac099ea12378a8b98e20706066
   languageName: node
   linkType: hard
 
 "wrappy@npm:1":
   version: 1.0.2
   resolution: "wrappy@npm:1.0.2"
-  checksum: 56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0
+  checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0
   languageName: node
   linkType: hard
 
@@ -17540,7 +18366,7 @@ __metadata:
   dependencies:
     imurmurhash: "npm:^0.1.4"
     signal-exit: "npm:^3.0.7"
-  checksum: a2c282c95ef5d8e1c27b335ae897b5eca00e85590d92a3fd69a437919b7b93ff36a69ea04145da55829d2164e724bc62202cdb5f4b208b425aba0807889375c7
+  checksum: 10c0/a2c282c95ef5d8e1c27b335ae897b5eca00e85590d92a3fd69a437919b7b93ff36a69ea04145da55829d2164e724bc62202cdb5f4b208b425aba0807889375c7
   languageName: node
   linkType: hard
 
@@ -17550,7 +18376,7 @@ __metadata:
   dependencies:
     imurmurhash: "npm:^0.1.4"
     signal-exit: "npm:^4.0.1"
-  checksum: e8c850a8e3e74eeadadb8ad23c9d9d63e4e792bd10f4836ed74189ef6e996763959f1249c5650e232f3c77c11169d239cbfc8342fc70f3fe401407d23810505d
+  checksum: 10c0/e8c850a8e3e74eeadadb8ad23c9d9d63e4e792bd10f4836ed74189ef6e996763959f1249c5650e232f3c77c11169d239cbfc8342fc70f3fe401407d23810505d
   languageName: node
   linkType: hard
 
@@ -17559,7 +18385,7 @@ __metadata:
   resolution: "ws@npm:6.2.2"
   dependencies:
     async-limiter: "npm:~1.0.0"
-  checksum: d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
+  checksum: 10c0/d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
   languageName: node
   linkType: hard
 
@@ -17574,13 +18400,13 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: aec4ef4eb65821a7dde7b44790f8699cfafb7978c9b080f6d7a98a7f8fc0ce674c027073a78574c94786ba7112cc90fa2cc94fc224ceba4d4b1030cff9662494
+  checksum: 10c0/aec4ef4eb65821a7dde7b44790f8699cfafb7978c9b080f6d7a98a7f8fc0ce674c027073a78574c94786ba7112cc90fa2cc94fc224ceba4d4b1030cff9662494
   languageName: node
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
+  version: 8.17.0
+  resolution: "ws@npm:8.17.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -17589,77 +18415,77 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
+  checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990
   languageName: node
   linkType: hard
 
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
-  checksum: c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd
+  checksum: 10c0/c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd
   languageName: node
   linkType: hard
 
 "xml-name-validator@npm:^5.0.0":
   version: 5.0.0
   resolution: "xml-name-validator@npm:5.0.0"
-  checksum: 3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5
+  checksum: 10c0/3fcf44e7b73fb18be917fdd4ccffff3639373c7cb83f8fc35df6001fecba7942f1dbead29d91ebb8315e2f2ff786b508f0c9dc0215b6353f9983c6b7d62cb1f5
   languageName: node
   linkType: hard
 
 "xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"
-  checksum: b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593
+  checksum: 10c0/b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593
   languageName: node
   linkType: hard
 
 "xtend@npm:^4.0.0":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
-  checksum: 366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
+  checksum: 10c0/366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
   languageName: node
   linkType: hard
 
 "y18n@npm:^4.0.0":
   version: 4.0.3
   resolution: "y18n@npm:4.0.3"
-  checksum: 308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024
+  checksum: 10c0/308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024
   languageName: node
   linkType: hard
 
 "y18n@npm:^5.0.5":
   version: 5.0.8
   resolution: "y18n@npm:5.0.8"
-  checksum: 4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249
+  checksum: 10c0/4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249
   languageName: node
   linkType: hard
 
 "yallist@npm:^3.0.2":
   version: 3.1.1
   resolution: "yallist@npm:3.1.1"
-  checksum: c66a5c46bc89af1625476f7f0f2ec3653c1a1791d2f9407cfb4c2ba812a1e1c9941416d71ba9719876530e3340a99925f697142989371b72d93b9ee628afd8c1
+  checksum: 10c0/c66a5c46bc89af1625476f7f0f2ec3653c1a1791d2f9407cfb4c2ba812a1e1c9941416d71ba9719876530e3340a99925f697142989371b72d93b9ee628afd8c1
   languageName: node
   linkType: hard
 
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"
-  checksum: 2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
+  checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
   languageName: node
   linkType: hard
 
 "yaml@npm:2.3.4":
   version: 2.3.4
   resolution: "yaml@npm:2.3.4"
-  checksum: cf03b68f8fef5e8516b0f0b54edaf2459f1648317fc6210391cf606d247e678b449382f4bd01f77392538429e306c7cba8ff46ff6b37cac4de9a76aff33bd9e1
+  checksum: 10c0/cf03b68f8fef5e8516b0f0b54edaf2459f1648317fc6210391cf606d247e678b449382f4bd01f77392538429e306c7cba8ff46ff6b37cac4de9a76aff33bd9e1
   languageName: node
   linkType: hard
 
 "yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
-  checksum: 5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f
+  checksum: 10c0/5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f
   languageName: node
   linkType: hard
 
@@ -17669,21 +18495,21 @@ __metadata:
   dependencies:
     camelcase: "npm:^5.0.0"
     decamelize: "npm:^1.2.0"
-  checksum: aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc
+  checksum: 10c0/aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:^20.2.1":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
-  checksum: 0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72
+  checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72
   languageName: node
   linkType: hard
 
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
-  checksum: f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2
+  checksum: 10c0/f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2
   languageName: node
   linkType: hard
 
@@ -17701,11 +18527,11 @@ __metadata:
     which-module: "npm:^2.0.0"
     y18n: "npm:^4.0.0"
     yargs-parser: "npm:^13.1.2"
-  checksum: 6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386
+  checksum: 10c0/6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.7.2":
+"yargs@npm:^17.3.1":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:
@@ -17716,20 +18542,20 @@ __metadata:
     string-width: "npm:^4.2.3"
     y18n: "npm:^5.0.5"
     yargs-parser: "npm:^21.1.1"
-  checksum: ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05
+  checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05
   languageName: node
   linkType: hard
 
 "yocto-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "yocto-queue@npm:0.1.0"
-  checksum: dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f
+  checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f
   languageName: node
   linkType: hard
 
 "zlibjs@npm:^0.3.1":
   version: 0.3.1
   resolution: "zlibjs@npm:0.3.1"
-  checksum: 2d110bfcb0f8b8dbf225423f6556da9c5bca95c8b849c1218983676158a24b5cd0350357e0c4d504e27f8c7e18d471d9712576f35114a81a51bcf83453f02beb
+  checksum: 10c0/2d110bfcb0f8b8dbf225423f6556da9c5bca95c8b849c1218983676158a24b5cd0350357e0c4d504e27f8c7e18d471d9712576f35114a81a51bcf83453f02beb
   languageName: node
   linkType: hard